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

Emmanuel Bourg ebourg-guest at moszumanska.debian.org
Fri Apr 25 15:10:19 UTC 2014 

Author: ebourg-guest
Date: 2014-04-25 15:10:19 +0000 (Fri, 25 Apr 2014)
New Revision: 18074

Modified:
   trunk/aspectj/debian/README.source
   trunk/aspectj/debian/aspectj-doc.docs
   trunk/aspectj/debian/bootstrap.xml
   trunk/aspectj/debian/copyright
   trunk/aspectj/debian/libaspectj-java-doc.install
Log:
Updated the paths for the new source layout



Modified: trunk/aspectj/debian/README.source
===================================================================
--- trunk/aspectj/debian/README.source	2014-04-25 15:00:07 UTC (rev 18073)
+++ trunk/aspectj/debian/README.source	2014-04-25 15:10:19 UTC (rev 18074)
@@ -8,53 +8,53 @@
 ------
 Remove unlicenced files:
  * all "testsrc" and "testdata" from orig tarball
- * org.aspectj/modules/tests/
- * org.aspectj/modules/testing/
- * org.aspectj/modules/docs/test/
+ * tests/
+ * testing/
+ * docs/test/
  * org.aspectj/org.aspectj.ajdt.core/scripts/*.py
 
 Remove non-free docs:
- * org.aspectj/modules/docs/dist/doc/examples
- * org.aspectj/modules/docs/sandbox/
- * org.aspectj/modules/docs/teaching/
+ * docs/dist/doc/examples
+ * docs/sandbox/
+ * docs/teaching/
  * all *.ppt/*.vsd/*.doc/*.pdf binary files
 
 Remove binary libs : #1 we use Debian version of them
- * org.aspectj/modules/lib/ant
- * org.aspectj/modules/lib/junit
- * org.aspectj/modules/lib/commons
- * org.aspectj/modules/lib/asm
+ * lib/ant
+ * lib/junit
+ * lib/commons
+ * lib/asm
 
 Remove binary libs : #2 rebuild them during "bootstrap" target
 (see bootstrap.xml)
- * org.aspectj/modules/bcel-builder/
- * org.aspectj/modules/lib/bcel/bcel*.jar
- * org.aspectj/modules/org.eclipse.jdt.core/jdtcore-for-aspectj*.jar
+ * bcel-builder/
+ * lib/bcel/bcel*.jar
+ * org.eclipse.jdt.core/jdtcore-for-aspectj*.jar
 
 Remove binary libs : #3 uneeded
- * org.aspectj/modules/lib/docbook
- * org.aspectj/modules/lib/jdiff
- * org.aspectj/modules/lib/jython
- * org.aspectj/modules/lib/regexp
- * org.aspectj/modules/lib/saxon
- * org.aspectj/modules/lib/test
+ * lib/docbook
+ * lib/jdiff
+ * lib/jython
+ * lib/regexp
+ * lib/saxon
+ * lib/test
 
 Remove binary copy of AspectJ (bootstrap using symlink to existing aspectj):
- * org.aspectj/modules/lib/aspectj/lib/aspectj*.jar
+ * lib/aspectj/lib/aspectj*.jar
 
 Remove (JRockit is non-free JVM):
- * org.aspectj/modules/lib/ext/jrockit
- * org.aspectj/modules/loadtime/src/org/aspectj/weaver/loadtime/JRockitAgent.java
+ * lib/ext/jrockit
+ * loadtime/src/org/aspectj/weaver/loadtime/JRockitAgent.java
 
 
 Keep
 ------
 Empty jars (needed by upstream build but made empty):
- * org.aspectj/modules/build/products/tools/dist/lib/org.aspectj.matcher.jar
- * org.aspectj/modules/build/products/tools/dist/lib/aspectjweaver.jar
- * org.aspectj/modules/build/products/tools/dist/lib/aspectjtools.jar
- * org.aspectj/modules/build/products/tools/dist/lib/aspectjrt.jar
+ * build/products/tools/dist/lib/org.aspectj.matcher.jar
+ * build/products/tools/dist/lib/aspectjweaver.jar
+ * build/products/tools/dist/lib/aspectjtools.jar
+ * build/products/tools/dist/lib/aspectjrt.jar
 
 Bootstrap jars (rebuild and overwritten during "bootstrap" target):
 (see bootstrap.xml)
- * org.aspectj/modules/lib/build/build.jar
+ * lib/build/build.jar

Modified: trunk/aspectj/debian/aspectj-doc.docs
===================================================================
--- trunk/aspectj/debian/aspectj-doc.docs	2014-04-25 15:00:07 UTC (rev 18073)
+++ trunk/aspectj/debian/aspectj-doc.docs	2014-04-25 15:10:19 UTC (rev 18074)
@@ -1,5 +1,5 @@
-org.aspectj/modules/aj-build/dist/docs/doc/README*
-org.aspectj/modules/aj-build/dist/docs/doc/devguide
-org.aspectj/modules/aj-build/dist/docs/doc/progguide
-org.aspectj/modules/aj-build/dist/docs/doc/pdguide
-org.aspectj/modules/aj-build/dist/docs/doc/adk15notebook
+aj-build/dist/docs/doc/README*
+aj-build/dist/docs/doc/devguide
+aj-build/dist/docs/doc/progguide
+aj-build/dist/docs/doc/pdguide
+aj-build/dist/docs/doc/adk15notebook

Modified: trunk/aspectj/debian/bootstrap.xml
===================================================================
--- trunk/aspectj/debian/bootstrap.xml	2014-04-25 15:00:07 UTC (rev 18073)
+++ trunk/aspectj/debian/bootstrap.xml	2014-04-25 15:10:19 UTC (rev 18074)
@@ -5,28 +5,28 @@
 
   <target name="clean">
     <ant antfile="debian/jar_from_src_zip.xml" target="clean">
-      <property name="module.dir" value="org.aspectj/modules/lib/bcel"/>
+      <property name="module.dir" value="lib/bcel"/>
       <property name="module.name" value="bcel"/>
     </ant>
 
     <ant antfile="debian/jar_from_src_zip.xml" target="clean">
-      <property name="module.dir" value="org.aspectj/modules/lib/bcel"/>
+      <property name="module.dir" value="lib/bcel"/>
       <property name="module.name" value="bcel-verifier"/>
     </ant>
 
     <ant antfile="debian/jar_from_src_zip.xml" target="clean">
-      <property name="module.dir" value="org.aspectj/modules/org.eclipse.jdt.core"/>
+      <property name="module.dir" value="org.eclipse.jdt.core"/>
       <property name="module.name" value="jdtcore-for-aspectj"/>
     </ant>
   </target>
 
   <target name="all">
     <!--
-	Build org.aspectj/modules/lib/bcel/bcel.jar
-	from org.aspectj/modules/lib/bcel/bcel-src.zip
+	Build lib/bcel/bcel.jar
+	from lib/bcel/bcel-src.zip
 	-->
     <ant antfile="debian/jar_from_src_zip.xml">
-      <property name="module.dir" value="org.aspectj/modules/lib/bcel"/>
+      <property name="module.dir" value="lib/bcel"/>
       <property name="module.name" value="bcel"/>
       <property name="module.deps" value="/usr/share/java/regexp.jar"/>
 	  <target name="compile"/>
@@ -34,20 +34,20 @@
     </ant>
 	
 	<!--
-	Build org.aspectj/modules/lib/bcel/bcel-verifier.jar
-	from org.aspectj/modules/lib/bcel/bcel-verifier-src.zip
+	Build lib/bcel/bcel-verifier.jar
+	from lib/bcel/bcel-verifier-src.zip
 	-->
     <ant antfile="debian/jar_from_src_zip.xml">
-      <property name="module.dir" value="org.aspectj/modules/lib/bcel"/>
+      <property name="module.dir" value="lib/bcel"/>
       <property name="module.name" value="bcel-verifier"/>
-      <property name="module.deps" value="org.aspectj/modules/lib/bcel/bcel.jar:/usr/share/java/regexp.jar"/>
+      <property name="module.deps" value="lib/bcel/bcel.jar:/usr/share/java/regexp.jar"/>
 	  <target name="compile"/>
 	  <target name="jar"/>
     </ant>
 
 	<!--
-	Build org.aspectj/modules/org.eclipse.jdt.core/jdtcore-for-aspectj.jar
-	from org.aspectj/modules/org.eclipse.jdt.core/jdtcore-for-aspectj-src.zip
+	Build org.eclipse.jdt.core/jdtcore-for-aspectj.jar
+	from org.eclipse.jdt.core/jdtcore-for-aspectj-src.zip
 	-->
     <path id="classpath.jdtcore">
       <fileset dir="/usr/lib/eclipse/plugins/">
@@ -71,7 +71,7 @@
     </path>
 
     <ant antfile="debian/jar_from_src_zip.xml">
-      <property name="module.dir" value="org.aspectj/modules/org.eclipse.jdt.core"/>
+      <property name="module.dir" value="org.eclipse.jdt.core"/>
       <property name="module.name" value="jdtcore-for-aspectj"/>
       <property name="module.deps" value="${toString:classpath.jdtcore}"/>
 	  <target name="compile-aj"/>
@@ -79,14 +79,14 @@
     </ant>
 
 	<!--
-	Rebuild and overwrite org.aspectj/modules/lib/build/build.jar
-	from org.aspectj/modules/build/**/*.java
+	Rebuild and overwrite lib/build/build.jar
+	from build/**/*.java
 	-->
 	<ant antfile="build.xml"
-		dir="org.aspectj/modules/build"
+		dir="build"
 		target="build"/>
-	<copy file="org.aspectj/modules/aj-build/jars/build.jar"
-		tofile="org.aspectj/modules/lib/build/build.jar"/>
+	<copy file="aj-build/jars/build.jar"
+		tofile="lib/build/build.jar"/>
 
   </target>
 </project>

Modified: trunk/aspectj/debian/copyright
===================================================================
--- trunk/aspectj/debian/copyright	2014-04-25 15:00:07 UTC (rev 18073)
+++ trunk/aspectj/debian/copyright	2014-04-25 15:10:19 UTC (rev 18074)
@@ -12,7 +12,7 @@
 =====================
 Embedded code copies:
 
- org.aspectj/modules/org.eclipse.jdt.core/jdtcore-for-aspectj-src.zip
+ org.eclipse.jdt.core/jdtcore-for-aspectj-src.zip
  (also in eclipse-jdt Debian package)
  refered as "modified JDT Core for AspectJ"
 
@@ -22,8 +22,8 @@
    org.aspect.org.eclipse instead of org.eclipse and included during build
    in aspectjtools.jar
 
- org.aspectj/modules/lib/bcel/bcel-src.zip
- org.aspectj/modules/lib/bcel/bcel-verifier-src.zip
+ lib/bcel/bcel-src.zip
+ lib/bcel/bcel-verifier-src.zip
  (also in libbcel-java)
  refered as "modified BCEL for AspectJ"
 
@@ -87,9 +87,9 @@
 	Copyright (c) 2004 IBM Corporation and others
 
 License applicable to "AspectJ"
-(all files in org.aspectj/modules/)
+(all files in )
 and to "modified JDT Core for AspectJ"
-(org.aspectj/modules/org.eclipse.jdt.core/jdtcore-for-aspectj-src.zip):
+(org.eclipse.jdt.core/jdtcore-for-aspectj-src.zip):
 
 	Eclipse Public License - v 1.0
 
@@ -308,8 +308,8 @@
 	a jury trial in any resulting litigation.
 
 License applicable to "modified BCEL for AspectJ"
-(in org.aspectj/modules/lib/bcel/bcel-src.zip
-and org.aspectj/modules/lib/bcel/bcel-verifier-src.zip):
+(in lib/bcel/bcel-src.zip
+and lib/bcel/bcel-verifier-src.zip):
 
 	The Apache Software License, Version 1.1
 

Modified: trunk/aspectj/debian/libaspectj-java-doc.install
===================================================================
--- trunk/aspectj/debian/libaspectj-java-doc.install	2014-04-25 15:00:07 UTC (rev 18073)
+++ trunk/aspectj/debian/libaspectj-java-doc.install	2014-04-25 15:10:19 UTC (rev 18074)
@@ -1,3 +1,3 @@
-org.aspectj/modules/aj-build/dist/docs/doc/aspectj5rt-api/*	/usr/share/doc/libaspectj-java/api-aspectj5rt/
-org.aspectj/modules/aj-build/dist/docs/doc/runtime-api/*		/usr/share/doc/libaspectj-java/api-runtime/
-org.aspectj/modules/aj-build/dist/docs/doc/weaver-api/*			/usr/share/doc/libaspectj-java/api-weaver/
+aj-build/dist/docs/doc/aspectj5rt-api/*	/usr/share/doc/libaspectj-java/api-aspectj5rt/
+aj-build/dist/docs/doc/runtime-api/*	/usr/share/doc/libaspectj-java/api-runtime/
+aj-build/dist/docs/doc/weaver-api/*	/usr/share/doc/libaspectj-java/api-weaver/

More information about the pkg-java-commits mailing list