Author: tgg
Date: 2007-05-18 15:43:12 +0000 (Fri, 18 May 2007)
New Revision: 3514
Added:
trunk/aspectj/debian/local.properties
trunk/aspectj/debian/patches/02_use_system_junit.diff
Modified:
trunk/aspectj/debian/changelog
trunk/aspectj/debian/control
trunk/aspectj/debian/cvs-get.sh
trunk/aspectj/debian/patches/01_use_system_ant.diff
trunk/aspectj/debian/rules
Log:
transform to cdbs. Put symlinks in place ; they are needed for bootstrapping
Modified: trunk/aspectj/debian/changelog
===================================================================
--- trunk/aspectj/debian/changelog 2007-05-18 14:09:53 UTC (rev 3513)
+++ trunk/aspectj/debian/changelog 2007-05-18 15:43:12 UTC (rev 3514)
@@ -1,12 +1,13 @@
-aspectj (1.5.3-1) unstable; urgency=low
+aspectj (1.5.3-1) UNRELEASED; urgency=low
* 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.
* Bump debhelper level to 5.
+ * Convert debian/rules to cdbs.
- --
+ -- Thomas Girard <[EMAIL PROTECTED]> Fri, 18 May 2007 14:06:35 +0000
aspectj (1.1.1-2) unstable; urgency=low
Modified: trunk/aspectj/debian/control
===================================================================
--- trunk/aspectj/debian/control 2007-05-18 14:09:53 UTC (rev 3513)
+++ trunk/aspectj/debian/control 2007-05-18 15:43:12 UTC (rev 3514)
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Debian Java maintainers <[EMAIL PROTECTED]>
Uploaders: Thomas Girard <[EMAIL PROTECTED]>
-Build-Depends: debhelper (>> 5), gcj, java-gcj-compat-dev (>= 1.0.65-6), ant,
cdbs
+Build-Depends: debhelper (>> 5), gcj, java-gcj-compat-dev (>= 1.0.65-6), ant
(>= 1.6.3), ant-optional (>= 1.6.3), libxalan2-java, cdbs, junit (>= 3.8.1)
Standards-Version: 3.7.2
Package: aspectj
Modified: trunk/aspectj/debian/cvs-get.sh
===================================================================
--- trunk/aspectj/debian/cvs-get.sh 2007-05-18 14:09:53 UTC (rev 3513)
+++ trunk/aspectj/debian/cvs-get.sh 2007-05-18 15:43:12 UTC (rev 3514)
@@ -18,6 +18,12 @@
echo "removing unneeded files"
find $TMPDIR/org.aspectj -name .cvsignore | xargs -r rm
+# Prefer system ant
+rm -Rf $TMPDIR/org.aspectj/modules/lib/ant
+# and system junit
+rm -Rf $TMPDIR/org.aspectj/modules/lib/junit
+# We don't need jython
+rm -Rf $TMPDIR/org.aspectj/modules/lib/jython
echo "generating ../aspectj_$VERSION.orig.tar.gz"
tar -C $TMPDIR -czf ../aspectj_$VERSION.orig.tar.gz org.aspectj
Added: trunk/aspectj/debian/local.properties
===================================================================
--- trunk/aspectj/debian/local.properties (rev 0)
+++ trunk/aspectj/debian/local.properties 2007-05-18 15:43:12 UTC (rev
3514)
@@ -0,0 +1,8 @@
+build.version=1.5.3
+build.version.base=1.5
+build.version.long=1.5.3 (Debian)
+build.version.short=1.5.3
+java11.home=/usr/lib/jvm/java-gcj
+java13.home=/usr/lib/jvm/java-gcj
+java14.home=/usr/lib/jvm/java-gcj
+java15.home=/usr/lib/jvm/java-gcj
Modified: trunk/aspectj/debian/patches/01_use_system_ant.diff
===================================================================
--- trunk/aspectj/debian/patches/01_use_system_ant.diff 2007-05-18 14:09:53 UTC
(rev 3513)
+++ trunk/aspectj/debian/patches/01_use_system_ant.diff 2007-05-18 15:43:12 UTC
(rev 3514)
@@ -1,5 +1,5 @@
---- modules/build/build-properties.xml 2007-05-18 11:35:00.000000000 +0000
-+++ modules/build/build-properties.xml+ 2007-05-18 12:08:17.000000000
+0000
+--- aspectj.orig/modules/build/build-properties.xml 2007-05-18
11:35:00.000000000 +0000
++++ aspectj/modules/build/build-properties.xml 2007-05-18 12:08:17.000000000
+0000
@@ -145,11 +145,11 @@
<jar-property name="aspectj.build.jar"
location="${aspectj.modules.lib.dir}/build/build.jar"/>
Added: trunk/aspectj/debian/patches/02_use_system_junit.diff
===================================================================
--- trunk/aspectj/debian/patches/02_use_system_junit.diff
(rev 0)
+++ trunk/aspectj/debian/patches/02_use_system_junit.diff 2007-05-18
15:43:12 UTC (rev 3514)
@@ -0,0 +1,11 @@
+--- aspectj.orig/modules/build/build-properties.xml 2007-05-18
13:36:32.000000000 +0000
++++ aspectj/modules/build/build-properties.xml 2007-05-18 13:39:29.000000000
+0000
+@@ -128,7 +128,7 @@
+ value="docs,eclipse.plugin"/>
+
+ <jar-property name="junit.jar"
+- location="${aspectj.modules.lib.dir}/junit/junit.jar"/>
++ location="/usr/share/java/junit.jar"/>
+ <!-- TODO need version-specific JDK? -->
+ <guarded-property name="jdk.tools.jar"
+ location="${java.home}/../lib/tools.jar"/>
Modified: trunk/aspectj/debian/rules
===================================================================
--- trunk/aspectj/debian/rules 2007-05-18 14:09:53 UTC (rev 3513)
+++ trunk/aspectj/debian/rules 2007-05-18 15:43:12 UTC (rev 3514)
@@ -1,82 +1,45 @@
#!/usr/bin/make -f
-# Sample debian/rules that uses debhelper.
-# GNU copyright 1997 to 1999 by Joey Hess.
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/cdbs/1/class/ant.mk
-VERSION=1.1.1
+JAVA_HOME := /usr/lib/jvm/java-gcj
+DEB_BUILDDIR := $(CURDIR)/modules/build
-jdk_dirs:=/usr/lib/j2sdk1.4-sun /usr/lib/j2sdk1.4-ibm
/usr/lib/j2sdk1.4-blackdown /usr/lib/j2se/1.4
-JAVA_HOME=$(shell for jdir in $(jdk_dirs); do if [ -d "$$jdir" ]; then echo
$$jdir; exit 0; fi; done)
+MKDIR := mkdir -p
+LN_S := ln -sf
-CLASSPATH=.:${JAVA_HOME}/lib/tools.jar:${JAVA_HOME}/jre/lib/rt.jar
-JAVAC=${JAVA_HOME}/bin/javac
+VERSION := $(shell dpkg-parsechangelog | egrep '^Version:' | cut -f2 -d' ' |
cut -f1 -d-)
+AJ_ANT_HOME := modules/lib/ant
+AJ_ANT_JARS := ant.jar ant-junit.jar
+AJ_XML_JARS := xercesImpl.jar xml-apis.jar
-build: build-stamp
-build-stamp:
- dh_testdir
+AJ_JUNIT_HOME := modules/lib/junit
+AJ_JUNIT_JARS := junit.jar
- mkdir -p build-tree
- cd build-tree && tar zxvf ../org.aspectj-1.1.1-src.tgz
- cd build-tree/org.aspectj/modules/build &&\
- $(JAVA_HOME)/bin/java -classpath
../lib/ant/lib/ant.jar:../lib/ant/lib/optional.jar:$(CLASSPATH):.
org.apache.tools.ant.Main
+pre-build::
+ # We setup Ant symlinks
+ mkdir -p $(AJ_ANT_HOME)/lib
+ for f in $(AJ_ANT_JARS) ; do \
+ $(LN_S) /usr/share/ant/lib/$$f $(AJ_ANT_HOME)/lib ; \
+ done
+ for f in $(AJ_XML_JARS) ; do \
+ $(LN_S) /usr/share/java/$$f $(AJ_ANT_HOME)/lib ; \
+ done
- touch build-stamp
+ # then JUnit symlinks
+ mkdir -p $(AJ_JUNIT_HOME)
+ for f in $(AJ_JUNIT_JARS) ; do \
+ $(LN_S) /usr/share/java/$$f $(AJ_JUNIT_HOME) ; \
+ done
-clean:
- dh_testdir
- dh_testroot
- rm -rf build-stamp build-tree
- dh_clean
+ # Setup our local.properties
+ cp debian/local.properties $(DEB_BUILDDIR)
+clean::
+ rm -Rf $(AJ_ANT_HOME)
+ rm -Rf $(AJ_JUNIT_HOME)
+ rm -Rf modules/lib/jython
-install: build
- dh_testdir
- dh_testroot
- dh_clean -k
- dh_installdirs
-
- mkdir -p $(CURDIR)/debian/aspectj/usr/share/aspectj/lib
- mkdir -p $(CURDIR)/debian/aspectj/usr/bin
- # Add here commands to install the package into debian/aspectj.
- install -m 644 build-tree/org.aspectj/modules/aj-build/jars/*.jar \
- $(CURDIR)/debian/aspectj/usr/share/aspectj/lib
- install -m 755 debian/ajc $(CURDIR)/debian/aspectj/usr/bin
- install -m 755 debian/ajbrowser $(CURDIR)/debian/aspectj/usr/bin
- dh_movefiles --sourcedir=debian/aspectj
-
-# Build architecture-independent files here.
-binary-indep: build install
-# We have nothing to do by default.
-
-# Build architecture-dependent files here.
-binary-arch: build install
- dh_testdir
- dh_testroot
-# dh_installdebconf
- dh_installdocs
- dh_installexamples
-# dh_installemacsen
-# dh_installpam
-# dh_installmime
-# dh_installinit
-# dh_installcron
- dh_installman debian/ajc.1 debian/ajdoc.1 debian/ajbrowser.1
debian/ajdb.1
-# dh_installinfo
-# dh_undocumented
- dh_installchangelogs
- dh_link
- dh_strip
- dh_compress
- dh_fixperms
-# dh_makeshlibs
- dh_installdeb
-# dh_perl
- dh_shlibdeps
- dh_gencontrol
- dh_md5sums
- dh_builddeb
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install
+ rm -f $(DEB_BUILDDIR)/local.properties
_______________________________________________
pkg-java-commits mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits
