[pkg-java] r4366 - in trunk/aspectwerkz2/debian: . patches
twerner at alioth.debian.org
twerner at alioth.debian.org
Fri Oct 12 22:48:51 UTC 2007
Author: twerner
Date: 2007-10-12 22:48:51 +0000 (Fri, 12 Oct 2007)
New Revision: 4366
Added:
trunk/aspectwerkz2/debian/libaspectwerkz2-java.install
Modified:
trunk/aspectwerkz2/debian/patches/01-build.patch
trunk/aspectwerkz2/debian/rules
Log:
* use the dist target instead of the compile target
* clean up build.xml
* really install the jar files
Added: trunk/aspectwerkz2/debian/libaspectwerkz2-java.install
===================================================================
--- trunk/aspectwerkz2/debian/libaspectwerkz2-java.install (rev 0)
+++ trunk/aspectwerkz2/debian/libaspectwerkz2-java.install 2007-10-12 22:48:51 UTC (rev 4366)
@@ -0,0 +1 @@
+lib/*.jar /usr/share/java/
Modified: trunk/aspectwerkz2/debian/patches/01-build.patch
===================================================================
--- trunk/aspectwerkz2/debian/patches/01-build.patch 2007-10-12 22:19:52 UTC (rev 4365)
+++ trunk/aspectwerkz2/debian/patches/01-build.patch 2007-10-12 22:48:51 UTC (rev 4366)
@@ -1,6 +1,6 @@
diff -Nur aspectwerkz2-2.0.dfsg.1/build.xml aspectwerkz2-2.0.dfsg.1.new/build.xml
---- aspectwerkz2-2.0.dfsg.1/build.xml 2005-03-10 12:05:48.000000000 +0100
-+++ aspectwerkz2-2.0.dfsg.1.new/build.xml 2007-10-12 20:46:55.000000000 +0200
+--- aspectwerkz2-2.0.dfsg.1/build.xml 2007-10-13 00:44:49.000000000 +0200
++++ aspectwerkz2-2.0.dfsg.1.new/build.xml 2007-10-13 00:46:00.000000000 +0200
@@ -127,13 +127,15 @@
<target name="compile" depends="init">
<mkdir dir="${build.dir}"/>
@@ -73,3 +73,89 @@
<src>
<pathelement location="src/extensions">
</pathelement>
+@@ -253,18 +255,15 @@
+ <!-- ============================================================== -->
+ <!-- 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-${version}.jar">
+ <fileset dir="${main.classes}">
+ <exclude name="**/aspectwerkz/hook/**/*"/>
+ </fileset>
+- <zipfileset src="${basedir}/lib/asm-1.5.4-snapshot.jar"/>
+- <zipfileset src="${basedir}/lib/asm-attrs-1.5.4-snapshot.jar"/>
+- <rule pattern="org.objectweb.asm.**" result="org.codehaus.aspectwerkz. at 0"/>
+- </jarjar>
++ </jar>
+ <copy tofile="${lib.dir}/aspectwerkz-${version}.jar" file="${build.dir}/aspectwerkz-${version}.jar" overwrite="true"/>
+
+ <!-- JDK 1.4 annotations only -->
+@@ -275,47 +274,12 @@
+
+ <!-- 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-${version}.jar">
+ <fileset dir="${main.classes}">
+ <include name="**/aspectwerkz/hook/**/*"/>
+ </fileset>
+- <zipfileset src="${basedir}/lib/asm-1.5.4-snapshot.jar"/>
+- <zipfileset src="${basedir}/lib/asm-attrs-1.5.4-snapshot.jar"/>
+- <rule pattern="org.objectweb.asm.**" result="org.codehaus.aspectwerkz. at 0"/>
+- </jarjar>
+- <copy tofile="${lib.dir}/aspectwerkz-core-${version}.jar" file="${build.dir}/aspectwerkz-core-${version}.jar" overwrite="true"/>
+-
+- <!-- extensions embeds ASM as well -->
+- <jarjar jarfile="${build.dir}/aspectwerkz-extensions-${version}.jar" basedir="${extensions.classes}">
+- <rule pattern="org.objectweb.asm.**" result="org.codehaus.aspectwerkz. at 0"/>
+- </jarjar>
+- <copy tofile="${lib.dir}/aspectwerkz-extensions-${version}.jar" file="${build.dir}/aspectwerkz-extensions-${version}.jar" overwrite="true"/>
+-
+- <!-- build a jdk neutral nodeps for the main jar (extensions + deps)
+- (not core, jdk14, jdk15, Ant, JUnit,) -->
+- <jar destfile="${build.dir}/aspectwerkz-nodeps-${version}.jar">
+- <zipfileset src="${build.dir}/aspectwerkz-${version}.jar"/>
+- <zipfileset src="${build.dir}/aspectwerkz-extensions-${version}.jar"/>
+- <zipgroupfileset dir="${lib.dir}">
+- <exclude name="jarjar*"/>
+- <exclude name="aspectwerkz*"/>
+- <exclude name="ant*"/>
+- <exclude name="asm*"/>
+- <exclude name="concurrent*"/>
+- <exclude name="junit*"/>
+- <exclude name="managementapi*"/>
+- <exclude name="qdox*"/>
+- <include name="*.jar"/>
+- </zipgroupfileset>
+- <!-- add qdox manually to remove its META-INF/LICENSE.txt that is not the one of AW -->
+- <zipfileset src="${lib.dir}/qdox-1.4.jar" excludes="META-INF/*"/>
+- </jar>
+- <!-- nodeps -->
+- <jar destfile="${build.dir}/aspectwerkz-nodeps-jdk14-${version}.jar">
+- <zipfileset src="${build.dir}/aspectwerkz-nodeps-${version}.jar"/>
+- <zipfileset src="${build.dir}/aspectwerkz-jdk14-${version}.jar"/>
+ </jar>
+- <copy tofile="${lib.dir}/aspectwerkz-nodeps-jdk14-${version}.jar" file="${build.dir}/aspectwerkz-nodeps-jdk14-${version}.jar" overwrite="true"/>
++ <copy tofile="${lib.dir}/aspectwerkz-core-${version}.jar" file="${build.dir}/aspectwerkz-core-${version}.jar" overwrite="true"/>
+
+ <antcall target="dist:jdk15"/>
+
+@@ -327,13 +291,6 @@
+ <fileset dir="${jdk15.classes}"/>
+ </jar>
+ <copy tofile="${lib.dir}/aspectwerkz-jdk5-${version}.jar" file="${build.dir}/aspectwerkz-jdk5-${version}.jar" overwrite="true"/>
+-
+- <!-- nodeps -->
+- <jar destfile="${build.dir}/aspectwerkz-nodeps-jdk5-${version}.jar" manifest="${lib.dir}/manifest-core.mf">
+- <zipfileset src="${build.dir}/aspectwerkz-nodeps-${version}.jar"/>
+- <zipfileset src="${build.dir}/aspectwerkz-jdk5-${version}.jar"/>
+- </jar>
+- <copy tofile="${lib.dir}/aspectwerkz-nodeps-jdk5-${version}.jar" file="${build.dir}/aspectwerkz-nodeps-jdk5-${version}.jar" overwrite="true"/>
+ </target>
+
+ <!-- ============================================================== -->
Modified: trunk/aspectwerkz2/debian/rules
===================================================================
--- trunk/aspectwerkz2/debian/rules 2007-10-12 22:19:52 UTC (rev 4365)
+++ trunk/aspectwerkz2/debian/rules 2007-10-12 22:48:51 UTC (rev 4366)
@@ -13,7 +13,7 @@
DEB_JARS := asm asm-attrs asm-util junit dom4j jrexx jarjar trove qdox javassist concurrent
-DEB_ANT_BUILD_TARGET := compile # javadocs
+DEB_ANT_BUILD_TARGET := dist # javadocs
#clean::
# -rm -rf build
More information about the pkg-java-commits
mailing list