[pkg-java] r4013 - trunk/aspectj/debian

[tgg at alioth.debian.org]

Author: tgg
Date: 2007-08-14 11:56:40 +0000 (Tue, 14 Aug 2007)
New Revision: 4013

Modified:
   trunk/aspectj/debian/bootstrap.xml
   trunk/aspectj/debian/cvs-get.sh
   trunk/aspectj/debian/rules
Log:
revert previous commit: we do not try to generate aspectjrt.jar


Modified: trunk/aspectj/debian/bootstrap.xml
===================================================================
--- trunk/aspectj/debian/bootstrap.xml	2007-08-14 11:07:10 UTC (rev 4012)
+++ trunk/aspectj/debian/bootstrap.xml	2007-08-14 11:56:40 UTC (rev 4013)
@@ -18,11 +18,16 @@
       <fileset dir="${build.src.dir}" includes="**/*.properties"/>
     </jar>
 
+    <!--
+    the generated jar is *not* the same as the one provided
+    in the repo. Keep usptream's for now.
+
     <jar destfile="${aspectjrt.jar}" basedir="${aspectj.bin.dir}">
       <include name="org/aspectj/internal/**"/>
       <include name="org/aspectj/lang/**"/>
       <include name="org/aspectj/runtime/**"/>
     </jar>
+    -->
   </target>
 
   <target name="init-build">
@@ -48,13 +53,15 @@
       <src path="org.aspectj/modules/aspectj5rt/src"/>
     </javac>
 
-    <!-- <javac destdir="${aspectj.bin.dir}" debug="on"
+    <!--
+    <javac destdir="${aspectj.bin.dir}" debug="on"
            classpath="/usr/share/java/ant.jar" source="1.5">
       <src path="org.aspectj/modules/ajde/src"/>
       <src path="org.aspectj/modules/asm/src"/>
       <src path="org.aspectj/modules/util/src"/>
       <src path="org.aspectj/modules/bridge/src"/>
-    </javac> -->
+    </javac>
+    -->
   </target>
 
   <target name="clean">
@@ -62,7 +69,6 @@
     <delete dir="${build.base.dir}" quiet="true"/>
     <delete dir="${aspectj.bin.dir}" quiet="true"/>
     <delete dir="${aspectj.bin.dir}" quiet="true"/>
-    <delete file="${aspectjrt.jar}"/>
 
     <ant antfile="debian/jar_from_src_zip.xml" target="clean">
       <property name="module.dir" value="org.aspectj/modules/lib/bcel"/>

Modified: trunk/aspectj/debian/cvs-get.sh
===================================================================
--- trunk/aspectj/debian/cvs-get.sh	2007-08-14 11:07:10 UTC (rev 4012)
+++ trunk/aspectj/debian/cvs-get.sh	2007-08-14 11:56:40 UTC (rev 4013)
@@ -26,7 +26,6 @@
 # Keep sources only, rebuild them at package build time
 rm -Rf $TMPDIR/org.aspectj/modules/lib/build
 rm -Rf $TMPDIR/org.aspectj/modules/lib/bcel/bcel.jar
-rm -Rf $TMPDIR/org.aspectj/modules/lib/aspectj/lib/aspectjrt.jar
 
 # The LICENSE.TXT here refers to managementapi-jrockit81.jar which is removed as well
 # See http://dev.eclipse.org/viewcvs/index.cgi/org.aspectj/modules/lib/ext/jrockit/LICENSE.TXT?root=Tools_Project&view=co

Modified: trunk/aspectj/debian/rules
===================================================================
--- trunk/aspectj/debian/rules	2007-08-14 11:07:10 UTC (rev 4012)
+++ trunk/aspectj/debian/rules	2007-08-14 11:56:40 UTC (rev 4013)
@@ -77,7 +77,6 @@
 
 	rm -Rf $(MODULES)/lib/build
 	rm -Rf $(MODULES)/lib/bcel/bcel.jar
-	rm -Rf $(MODULES)/lib/asectj/lib/aspectjrt.jar
 	(cd $(MODULES)/lib/ext/jrockit && rm -f jrockit.jar LICENSE.txt managementapi-jrockit81.jar)
 
 	rm -Rf $(MODULES)/lib/asm