diff options
author | Jan Brinkmann <luckyduck@gentoo.org> | 2005-01-05 22:12:05 +0000 |
---|---|---|
committer | Jan Brinkmann <luckyduck@gentoo.org> | 2005-01-05 22:12:05 +0000 |
commit | 72121c89752a3d3f69c1e53a615c1fd4d8284f79 (patch) | |
tree | 2211882c1858118a0928e5aa7ded0f964babc27c /dev-java/aspectwerkz/files | |
parent | slotted asm-1.5.2 as 1.5 and asm-1.4.3 as 1.4 since they are not fully api co... (diff) | |
download | gentoo-2-72121c89752a3d3f69c1e53a615c1fd4d8284f79.tar.gz gentoo-2-72121c89752a3d3f69c1e53a615c1fd4d8284f79.tar.bz2 gentoo-2-72121c89752a3d3f69c1e53a615c1fd4d8284f79.zip |
Initial import. Needed as a dependency of #76738.
Diffstat (limited to 'dev-java/aspectwerkz/files')
-rw-r--r-- | dev-java/aspectwerkz/files/aspectwerkz-2.0_rc2-gentoo.patch | 85 | ||||
-rw-r--r-- | dev-java/aspectwerkz/files/digest-aspectwerkz-2.0_rc2 | 1 |
2 files changed, 86 insertions, 0 deletions
diff --git a/dev-java/aspectwerkz/files/aspectwerkz-2.0_rc2-gentoo.patch b/dev-java/aspectwerkz/files/aspectwerkz-2.0_rc2-gentoo.patch new file mode 100644 index 000000000000..273bb22e7272 --- /dev/null +++ b/dev-java/aspectwerkz/files/aspectwerkz-2.0_rc2-gentoo.patch @@ -0,0 +1,85 @@ +--- build.xml.orig 2005-01-05 22:09:52.421137168 +0100 ++++ build.xml 2005-01-05 22:17:04.298481832 +0100 +@@ -42,8 +42,6 @@ + <!-- <property name="aspectwerkz.classpath" refid="aspectwerkz.classpath" />--> + + <!-- define the jarjar task we use to remap ASM --> +- <taskdef name="jarjar" classname="com.tonicsystems.jarjar.JarJarTask" classpath="${basedir}/lib/jarjar-0.3.jar"/> +- + <target name="cleandist" depends="clean, dist"/> + + <!-- =================================================== --> +@@ -121,7 +119,7 @@ + <!-- ============================================================== --> + <!-- compiles the distribution --> + <!-- ============================================================== --> +- <target name="compile" depends="init"> ++ <target name="compile" depends="clean"> + <mkdir dir="${build.dir}"/> + <mkdir dir="${main.classes}"/> + <javac destdir="${jdk14.classes}" debug="on" source="1.3" target="1.3"> +@@ -153,12 +151,6 @@ + <path refid="project.class.path"/> + </classpath> + </javac> +- <!-- remap ASM since it is used directly in the tests for some --> +- <jarjar destfile="${test.classes}.jar"> +- <fileset dir="${test.classes}" includes="**/*"/> +- <rule pattern="org.objectweb.asm.**" result="org.codehaus.aspectwerkz.@0"/> +- </jarjar> +- <unjar src="${test.classes}.jar" dest="${test.classes}" overwrite="true"/> + </target> + + <!-- ============================================================== --> +@@ -250,42 +242,31 @@ + <!-- ============================================================== --> + <!-- create distribution --> + <!-- ============================================================== --> +- <target name="dist" depends="compile, compile:jdk15, compile:test, compile:extensions"><!-- not samples since Java 1.4 --> ++ <target name="dist" depends="compile, compile:jdk15"><!-- not samples since Java 1.4 --> + <copy file="${src.dir}/main/aspectwerkz2.dtd" todir="${main.classes}"/> + + <!-- we embed jarjar version of ASM in it as well in case the aspectwerkz-core jar is not used --> +- <jarjar destfile="${build.dir}/aspectwerkz-${version}.jar" manifest="${lib.dir}/manifest.mf"> ++ <jar destfile="${build.dir}/aspectwerkz.jar" manifest="${lib.dir}/manifest.mf"> + <fileset dir="${main.classes}"> + <exclude name="**/aspectwerkz/hook/**/*"/> + </fileset> +- <zipfileset src="${basedir}/lib/asm-1.5.2.jar"/> +- <zipfileset src="${basedir}/lib/asm-attrs-1.5.2.jar"/> +- <rule pattern="org.objectweb.asm.**" result="org.codehaus.aspectwerkz.@0"/> +- </jarjar> +- <copy tofile="${lib.dir}/aspectwerkz-${version}.jar" file="${build.dir}/aspectwerkz-${version}.jar" overwrite="true"/> ++ </jar> ++ <copy tofile="${lib.dir}/aspectwerkz.jar" file="${build.dir}/aspectwerkz.jar" overwrite="true"/> + + <!-- JDK 1.4 annotations only --> +- <jar destfile="${build.dir}/aspectwerkz-jdk14-${version}.jar"> ++ <jar destfile="${build.dir}/aspectwerkz-jdk14.jar"> + <fileset dir="${jdk14.classes}"/> + </jar> +- <copy tofile="${lib.dir}/aspectwerkz-jdk14-${version}.jar" file="${build.dir}/aspectwerkz-jdk14-${version}.jar" overwrite="true"/> ++ <copy tofile="${lib.dir}/aspectwerkz-jdk14.jar" file="${build.dir}/aspectwerkz-jdk14.jar" overwrite="true"/> + + <!-- core contains the hook part --> + <!-- we embed jarjar version of ASM in it as well so that it will be in the bootclasspath for the asm hook --> +- <jarjar destfile="${build.dir}/aspectwerkz-core-${version}.jar"> ++ <jar destfile="${build.dir}/aspectwerkz-core.jar"> + <fileset dir="${main.classes}"> + <include name="**/aspectwerkz/hook/**/*"/> + </fileset> +- <zipfileset src="${basedir}/lib/asm-1.5.2.jar"/> +- <zipfileset src="${basedir}/lib/asm-attrs-1.5.2.jar"/> +- <rule pattern="org.objectweb.asm.**" result="org.codehaus.aspectwerkz.@0"/> +- </jarjar> +- <copy tofile="${lib.dir}/aspectwerkz-core-${version}.jar" file="${build.dir}/aspectwerkz-core-${version}.jar" overwrite="true"/> +- +- <jarjar jarfile="${build.dir}/aspectwerkz-extensions-${version}.jar" basedir="${extensions.classes}"> +- <rule pattern="org.objectweb.asm.**" result="org.codehaus.aspectwerkz.@0"/> +- </jarjar> +- <copy tofile="${lib.dir}/aspectwerkz-extensions-${version}.jar" file="${build.dir}/aspectwerkz-extensions-${version}.jar" overwrite="true"/> ++ </jar> ++ <copy tofile="${lib.dir}/aspectwerkz-core.jar" file="${build.dir}/aspectwerkz-core.jar" overwrite="true"/> + + <antcall target="dist:jdk15"/> + </target> diff --git a/dev-java/aspectwerkz/files/digest-aspectwerkz-2.0_rc2 b/dev-java/aspectwerkz/files/digest-aspectwerkz-2.0_rc2 new file mode 100644 index 000000000000..dc8e9a41cbb5 --- /dev/null +++ b/dev-java/aspectwerkz/files/digest-aspectwerkz-2.0_rc2 @@ -0,0 +1 @@ +MD5 7ca18b72216703d52cf1dcfefb87822f aspectwerkz-2.0.RC2.zip 9758873 |