[pkg-java] r4672 - trunk/libjboss-aop-java/debian

[varun-guest at alioth.debian.org]

Author: varun-guest
Date: 2007-11-09 14:57:46 +0000 (Fri, 09 Nov 2007)
New Revision: 4672

Modified:
   trunk/libjboss-aop-java/debian/build.xml
   trunk/libjboss-aop-java/debian/orig-tar.sh
   trunk/libjboss-aop-java/debian/watch
Log:
* Builds now with newer javassist >= 3.6


Modified: trunk/libjboss-aop-java/debian/build.xml
===================================================================
--- trunk/libjboss-aop-java/debian/build.xml	2007-11-09 14:33:01 UTC (rev 4671)
+++ trunk/libjboss-aop-java/debian/build.xml	2007-11-09 14:57:46 UTC (rev 4672)
@@ -23,25 +23,24 @@
       </fileset>
     </jar>
 
+<!--     <mkdir dir="${source.dir}/${aspect-deployer.dir}/${class.dir}"/> -->
+<!--     <javac srcdir="${source.dir}/${aspect-deployer.dir}/main" destdir="${source.dir}/${aspect-deployer.dir}/${class.dir}" -->
+<!--       debug="true" source="1.5" classpath="${aspect-framework.jar}" /> -->
+
+<!--     <jar jarfile="${aspect-deployer.jar}"> -->
+<!--       <fileset dir="${source.dir}/${aspect-deployer.dir}/${class.dir}"> -->
+<!--           <include name="**"/> -->
+<!--       </fileset> -->
+<!--     </jar> -->
+
     <mkdir dir="${source.dir}/${aspects.dir}/${class.dir}"/>
     <javac srcdir="${source.dir}/${aspects.dir}/main" destdir="${source.dir}/${aspects.dir}/${class.dir}"
-      debug="true" source="1.5"/>
+      debug="true" source="1.5" classpath="${aspect-framework.jar}"/>
 
     <jar jarfile="${aspects.jar}">
       <fileset dir="${source.dir}/${aspects.dir}/${class.dir}">
           <include name="**"/>
       </fileset>
     </jar>
-
-    <mkdir dir="${source.dir}/${aspect-deployer.dir}/${class.dir}"/>
-    <javac srcdir="${source.dir}/${aspect-deployer.dir}/main" destdir="${source.dir}/${aspect-deployer.dir}/${class.dir}"
-      debug="true" source="1.5"/>
-
-    <jar jarfile="${aspect-deployer.jar}">
-      <fileset dir="${source.dir}/${aspect-deployer.dir}/${class.dir}">
-          <include name="**"/>
-      </fileset>
-    </jar>
   </target>
-
 </project>

Modified: trunk/libjboss-aop-java/debian/orig-tar.sh
===================================================================
--- trunk/libjboss-aop-java/debian/orig-tar.sh	2007-11-09 14:33:01 UTC (rev 4671)
+++ trunk/libjboss-aop-java/debian/orig-tar.sh	2007-11-09 14:57:46 UTC (rev 4672)
@@ -6,6 +6,7 @@
 
 # clean up the upstream tarball
 unzip $3 -d $DIR
+(cd $DIR;  grep -irl --include '*.java' com.bea.jvm . |xargs rm )
 tar -c -z -f $TAR -X debian/orig-tar.exclude $DIR
 rm -rf $3 $DIR
 

Modified: trunk/libjboss-aop-java/debian/watch
===================================================================
--- trunk/libjboss-aop-java/debian/watch	2007-11-09 14:33:01 UTC (rev 4671)
+++ trunk/libjboss-aop-java/debian/watch	2007-11-09 14:57:46 UTC (rev 4672)
@@ -1,2 +1,2 @@
 version=3
-https://labs.jboss.com/jbossaop/.*jboss-aop-(.*)\.zip debian debian/orig-tar.sh
+https://labs.jboss.com/jbossaop/ .*jboss-aop-(.*)\.zip debian debian/orig-tar.sh