[pkg-java] r3633 - in trunk/aspectj/debian: . patches

tgg at alioth.debian.org tgg at alioth.debian.org
Mon Jun 11 20:49:31 UTC 2007


Author: tgg
Date: 2007-06-11 20:49:31 +0000 (Mon, 11 Jun 2007)
New Revision: 3633

Modified:
   trunk/aspectj/debian/bootstrap.xml
   trunk/aspectj/debian/changelog
   trunk/aspectj/debian/patches/01_dont_override_junit_taskdef.diff
   trunk/aspectj/debian/patches/02_use_gjdoc.diff
   trunk/aspectj/debian/patches/03_use_system_docbook.diff
   trunk/aspectj/debian/patches/04_use_xsltproc_for_doc.diff
   trunk/aspectj/debian/rules
Log:
add org.aspectj/ prefix everywhere


Modified: trunk/aspectj/debian/bootstrap.xml
===================================================================
--- trunk/aspectj/debian/bootstrap.xml	2007-06-10 20:17:14 UTC (rev 3632)
+++ trunk/aspectj/debian/bootstrap.xml	2007-06-11 20:49:31 UTC (rev 3633)
@@ -1,12 +1,12 @@
 <!-- Bootstraps AspectJ build parts                                -->
 <!-- Written by Thomas Girard <thomas.g.girard at free.fr> for Debian -->
 <project name="bootstrap" default="all" basedir="..">
-  <property name="build.src.dir" location="modules/build/src"/>
-  <property name="build.base.dir" location="modules/lib/build"/>
+  <property name="build.src.dir" location="org.aspectj/modules/build/src"/>
+  <property name="build.base.dir" location="org.aspectj/modules/lib/build"/>
   <property name="build.bin.dir" location="${build.base.dir}/classes"/>
   <property name="build.jar" location="${build.base.dir}/build.jar"/>
 
-  <property name="aspectj.base.dir" location="modules/lib/aspectj"/>
+  <property name="aspectj.base.dir" location="org.aspectj/modules/lib/aspectj"/>
   <property name="aspectj.bin.dir" location="${aspectj.base.dir}/classes"/>
   <property name="aspectj.lib.dir" location="${aspectj.base.dir}/lib"/>
   <property name="aspectjrt.jar" location="${aspectj.lib.dir}/aspectjrt.jar"/>
@@ -39,9 +39,9 @@
   <target name="compile-aspectj" depends="init-aspectj">
     <javac destdir="${aspectj.bin.dir}" debug="on"
            classpath="/usr/share/java/ant.jar" source="1.5">
-      <src path="modules/runtime/src"/>
-      <src path="modules/aspectj5rt/java5-src"/>
-      <src path="modules/aspectj5rt/src"/>
+      <src path="org.aspectj/modules/runtime/src"/>
+      <src path="org.aspectj/modules/aspectj5rt/java5-src"/>
+      <src path="org.aspectj/modules/aspectj5rt/src"/>
       <include name="org/**"/>
     </javac>
   </target>
@@ -53,25 +53,25 @@
     <delete dir="${aspectj.lib.dir}" quiet="true"/>
     <delete file="${aspectjrt.jar}"/>
     <ant antfile="debian/jar_from_src_zip.xml" target="clean">
-      <property name="module.dir" value="modules/lib/bcel"/>
+      <property name="module.dir" value="org.aspectj/modules/lib/bcel"/>
       <property name="module.name" value="bcel"/>
     </ant>
     <ant antfile="debian/jar_from_src_zip.xml" target="clean">
-      <property name="module.dir" value="modules/lib/ext/jrockit"/>
+      <property name="module.dir" value="org.aspectj/modules/lib/ext/jrockit"/>
       <property name="module.name" value="jrockit"/>
     </ant>
   </target>
 
   <target name="all" depends="jar">
     <ant antfile="debian/jar_from_src_zip.xml">
-      <property name="module.dir" value="modules/lib/bcel"/>
+      <property name="module.dir" value="org.aspectj/modules/lib/bcel"/>
       <property name="module.name" value="bcel"/>
       <property name="module.deps" value="/usr/share/java/regexp.jar"/>
     </ant>
     <ant antfile="debian/jar_from_src_zip.xml">
-      <property name="module.dir" value="modules/lib/ext/jrockit"/>
+      <property name="module.dir" value="org.aspectj/modules/lib/ext/jrockit"/>
       <property name="module.name" value="jrockit"/>
-      <property name="module.srcdeps" value="modules/loadtime/testsrc"/>
+      <property name="module.srcdeps" value="org.aspectj/modules/loadtime/testsrc"/>
     </ant>
   </target>
 </project>

Modified: trunk/aspectj/debian/changelog
===================================================================
--- trunk/aspectj/debian/changelog	2007-06-10 20:17:14 UTC (rev 3632)
+++ trunk/aspectj/debian/changelog	2007-06-11 20:49:31 UTC (rev 3633)
@@ -2,10 +2,11 @@
 
   * New maintainer. Closes: #352521.
   * New upstream release. Closes: #286087.
-  * AspectJ 5 builds and runs cleanly with gcj/gij. The package can move
-    to main, as it no longer requires contrib dependency. Closes: #397559.
+  * AspectJ 5 builds cleanly with gcj/gij. The package can move to main, as
+    it no longer requires contrib dependency. Closes: #397559.
   * Bump debhelper level to 5.
   * Convert debian/rules to cdbs.
+  * Install ajdoc.
 
  -- Thomas Girard <thomas.g.girard at free.fr>  Fri, 18 May 2007 14:06:35 +0000
 

Modified: trunk/aspectj/debian/patches/01_dont_override_junit_taskdef.diff
===================================================================
--- trunk/aspectj/debian/patches/01_dont_override_junit_taskdef.diff	2007-06-10 20:17:14 UTC (rev 3632)
+++ trunk/aspectj/debian/patches/01_dont_override_junit_taskdef.diff	2007-06-11 20:49:31 UTC (rev 3633)
@@ -1,5 +1,5 @@
---- aspectj.orig/modules/build/build-properties.xml	2007-05-18 16:22:33.000000000 +0000
-+++ aspectj/modules/build/build-properties.xml	2007-05-18 16:24:21.000000000 +0000
+--- aspectj.orig/org.aspectj/modules/build/build-properties.xml
++++ aspectj/org.aspectj/modules/build/build-properties.xml
 @@ -153,26 +153,6 @@
  				<include name="**/*.jar"/>
  			</fileset>

Modified: trunk/aspectj/debian/patches/02_use_gjdoc.diff
===================================================================
--- trunk/aspectj/debian/patches/02_use_gjdoc.diff	2007-06-10 20:17:14 UTC (rev 3632)
+++ trunk/aspectj/debian/patches/02_use_gjdoc.diff	2007-06-11 20:49:31 UTC (rev 3633)
@@ -1,5 +1,5 @@
---- aspectj.orig/modules/ajdoc/src/org/aspectj/tools/ajdoc/JavadocRunner.java	2006-06-01 09:24:04.000000000 +0000
-+++ aspectj/modules/ajdoc/src/org/aspectj/tools/ajdoc/JavadocRunner.java	2007-05-18 16:49:15.000000000 +0000
+--- aspectj.orig/org.aspectj/modules/ajdoc/src/org/aspectj/tools/ajdoc/JavadocRunner.java
++++ aspectj/org.aspectj/modules/ajdoc/src/org/aspectj/tools/ajdoc/JavadocRunner.java
 @@ -24,7 +24,7 @@
  	
  	static boolean has14ToolsAvailable() {
@@ -25,8 +25,8 @@
  //				throw new UnsupportedOperationException("ajdoc requires a tools library from JDK 1.4 or later.");
  			}
  			try {
---- aspectj.orig/modules/ajdoc/.classpath	2005-10-06 15:36:07.000000000 +0000
-+++ aspectj/modules/ajdoc/.classpath	2007-05-18 22:00:43.000000000 +0000
+--- aspectj.orig/org.aspectj/modules/ajdoc/.classpath
++++ aspectj/org.aspectj/modules/ajdoc/.classpath
 @@ -7,6 +7,7 @@
  	<classpathentry kind="src" path="/util"/>
  	<classpathentry kind="src" path="testsrc"/>

Modified: trunk/aspectj/debian/patches/03_use_system_docbook.diff
===================================================================
--- trunk/aspectj/debian/patches/03_use_system_docbook.diff	2007-06-10 20:17:14 UTC (rev 3632)
+++ trunk/aspectj/debian/patches/03_use_system_docbook.diff	2007-06-11 20:49:31 UTC (rev 3633)
@@ -1,5 +1,5 @@
---- aspectj.orig/modules/docs/build.xml
-+++ aspectj/modules/docs/build.xml
+--- aspectj.orig/org.aspectj/modules/docs/build.xml
++++ aspectj/org.aspectj/modules/docs/build.xml
 @@ -64,10 +64,10 @@
  
          <!-- callers of xml-html use these by default -->

Modified: trunk/aspectj/debian/patches/04_use_xsltproc_for_doc.diff
===================================================================
--- trunk/aspectj/debian/patches/04_use_xsltproc_for_doc.diff	2007-06-10 20:17:14 UTC (rev 3632)
+++ trunk/aspectj/debian/patches/04_use_xsltproc_for_doc.diff	2007-06-11 20:49:31 UTC (rev 3633)
@@ -1,5 +1,5 @@
---- aspectj.orig/modules/docs/build.xml
-+++ aspectj/modules/docs/build.xml
+--- aspectj.orig/org.aspectj/modules/docs/build.xml
++++ aspectj/org.aspectj/modules/docs/build.xml
 @@ -500,20 +500,21 @@
                       includes="${xml-html-copy}"
              />

Modified: trunk/aspectj/debian/rules
===================================================================
--- trunk/aspectj/debian/rules	2007-06-10 20:17:14 UTC (rev 3632)
+++ trunk/aspectj/debian/rules	2007-06-11 20:49:31 UTC (rev 3633)
@@ -5,23 +5,24 @@
 include /usr/share/cdbs/1/class/ant.mk
 
 JAVA_HOME := /usr/lib/jvm/java-gcj
-DEB_BUILDDIR = modules/build
+MODULES := org.aspectj/modules
+DEB_BUILDDIR = $(MODULES)/build
 
 MKDIR := mkdir -p
 LN_S := ln -sf
 
-AJ_ANT_HOME := modules/lib/ant
+AJ_ANT_HOME := $(MODULES)/lib/ant
 AJ_ANT_JARS := ant.jar ant-junit.jar
 AJ_XML_JARS := xercesImpl.jar xml-apis.jar
 
-AJ_JUNIT_HOME := modules/lib/junit
+AJ_JUNIT_HOME := $(MODULES)/lib/junit
 AJ_JUNIT_JARS := junit.jar
 
-AJ_COMMONS_HOME := modules/lib/commons
+AJ_COMMONS_HOME := $(MODULES)/lib/commons
 AJ_COMMONS_JAR := commons-logging.jar
 
-AJ_BCEL_HOME := modules/lib/bcel
-AJ_JROCKIT_HOME := modules/lib/ext/jrockit
+AJ_BCEL_HOME := $(MODULES)/lib/bcel
+AJ_JROCKIT_HOME := $(MODULES)/lib/ext/jrockit
 
 pre-build:: bootstrap-stamp
 	# Setup symlinks: ant
@@ -47,7 +48,7 @@
 	cp debian/local.properties $(DEB_BUILDDIR)
 
 	# Also symlink gjdoc.jar
-	$(LN_S) /usr/share/java/gnu-classpath-tools-gjdoc.jar modules/lib
+	$(LN_S) /usr/share/java/gnu-classpath-tools-gjdoc.jar $(MODULES)/lib
 
 .PHONY: bootstrap
 bootstrap: bootstrap-stamp
@@ -70,19 +71,19 @@
 	rm -Rf $(AJ_JUNIT_HOME)
 	rm -Rf $(AJ_COMMONS_HOME)
 
-	rm -Rf modules/lib/build
-	rm -Rf modules/lib/bcel/bcel.jar
-	(cd modules/lib/ext/jrockit && rm -f jrockit.jar LICENSE.txt managementapi-jrockit81.jar)
+	rm -Rf $(MODULES)/lib/build
+	rm -Rf $(MODULES)/lib/bcel/bcel.jar
+	(cd $(MODULES)/lib/ext/jrockit && rm -f jrockit.jar LICENSE.txt managementapi-jrockit81.jar)
 
-	rm -Rf modules/lib/asm
-	rm -Rf modules/lib/docbook
-	rm -Rf modules/lib/jdiff
-	rm -Rf modules/lib/jython
-	rm -Rf modules/lib/regexp
-	rm -Rf modules/lib/saxon
-	rm -Rf modules/lib/test
+	rm -Rf $(MODULES)/lib/asm
+	rm -Rf $(MODULES)/lib/docbook
+	rm -Rf $(MODULES)/lib/jdiff
+	rm -Rf $(MODULES)/lib/jython
+	rm -Rf $(MODULES)/lib/regexp
+	rm -Rf $(MODULES)/lib/saxon
+	rm -Rf $(MODULES)/lib/test
 
-	rm -f modules/lib/gnu-classpath-tools-gjdoc.jar
+	rm -f $(MODULES)/lib/gnu-classpath-tools-gjdoc.jar
 
 	rm -f $(DEB_BUILDDIR)/local.properties
 




More information about the pkg-java-commits mailing list