The following commit has been merged in the master branch: commit 8f551bd559fe4d218fec77ae008e9ea94386d4c6 Author: Ludovic Claude <ludovic.cla...@laposte.net> Date: Tue Jan 3 22:39:02 2012 +0100
* d/rules: use debhelper and Ant for the build as Maven is a build dependency of plexus-compiler * d/control: Remove Build-Depends on cdbs, maven-debian-helper, libplexus-component-metadata-java * Add Build-Depends on maven-repo-helper, ant-optional, maven-ant-helper, default-jdk-doc, libmaven2-core-java-doc, libplexus-container-default-java-doc, libplexus-utils-java-doc diff --git a/debian/README.source b/debian/README.source index 957b703..e742305 100644 --- a/debian/README.source +++ b/debian/README.source @@ -4,6 +4,3 @@ Information about plexus-compiler This package was debianized using the mh_make command from the maven-debian-helper package. -The build system uses Maven but prevents it from downloading -anything from the Internet, making the build compliant with -the Debian policy. diff --git a/debian/build-classpath b/debian/build-classpath new file mode 100644 index 0000000..a3d49a2 --- /dev/null +++ b/debian/build-classpath @@ -0,0 +1,11 @@ +/usr/share/java/ant-nodeps.jar +/usr/share/java/ant-junit.jar +/usr/share/java/commons-lang.jar +/usr/share/java/ecj.jar +/usr/share/java/junit.jar +/usr/share/java/maven-core.jar +/usr/share/java/maven-model.jar +/usr/share/java/maven-project.jar +/usr/share/java/maven-repository-metadata.jar +/usr/share/java/plexus-container-default-alpha.jar +/usr/share/java/plexus-utils.jar diff --git a/debian/build.properties b/debian/build.properties new file mode 100644 index 0000000..dd0f8aa --- /dev/null +++ b/debian/build.properties @@ -0,0 +1,3 @@ +build.directory=target +javadoc.dir=target/apidocs +javadoc.generate=true diff --git a/debian/build.xml b/debian/build.xml new file mode 100644 index 0000000..f39c111 --- /dev/null +++ b/debian/build.xml @@ -0,0 +1,58 @@ +<?xml version="1.0"?> + +<project name="pkg-java" default="build-all" basedir=".."> + + <property file="debian/build.properties"/> + <property name="maven.build" value="/usr/share/maven-ant-helper/maven-build.xml"/> + <property file="/usr/share/maven-ant-helper/maven-defaults.properties"/> + + <macrodef name="clean-module"> + <attribute name="dir"/> + <sequential> + <ant target="clean" antfile="${maven.build}" dir="@{dir}"> + <property name="debian.dir" location="debian" /> + <property name="project.dir" value="@{dir}" /> + </ant> + </sequential> + </macrodef> + + <target name="clean"> + <clean-module dir=""/> + <clean-module dir="plexus-compiler-api"/> + <clean-module dir="plexus-compiler-test"/> + <clean-module dir="plexus-compiler-manager"/> + <clean-module dir="plexus-compiler-csharp"/> + <clean-module dir="plexus-compiler-eclipse"/> + <clean-module dir="plexus-compiler-jikes"/> + <clean-module dir="plexus-compiler-javac"/> + <clean-module dir="plexus-compilers"/> + </target> + + <target name="package"> + <package-module dir=""/> + <package-module dir="plexus-compiler-api"/> + <package-module dir="plexus-compiler-test"/> + <package-module dir="plexus-compiler-manager"/> + <package-module dir="plexus-compiler-csharp"/> + <package-module dir="plexus-compiler-eclipse"/> + <package-module dir="plexus-compiler-jikes"/> + <package-module dir="plexus-compiler-javac"/> + <package-module dir="plexus-compilers"/> + </target> + + <target name="javadoc"> + <javadoc destdir="${javadoc.dir}"> + <packageset dir="plexus-compiler-api/src/main/java/"/> + <packageset dir="plexus-compiler-test/src/main/java/"/> + <packageset dir="plexus-compiler-manager/src/main/java/"/> + <packageset dir="plexus-compiler-csharp/src/main/java/"/> + <packageset dir="plexus-compiler-eclipse/src/main/java/"/> + <packageset dir="plexus-compiler-jikes/src/main/java/"/> + <packageset dir="plexus-compiler-javac/src/main/java/"/> + <packageset dir="plexus-compilers/src/main/java/"/> + </javadoc> + </target> + + <target name="build-all" depends="package, javadoc" /> + +</project> \ No newline at end of file diff --git a/debian/changelog b/debian/changelog index 477cf87..287a908 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,13 @@ plexus-compiler (1.8.3-1) UNRELEASED; urgency=low * New upstream version, add myself to Uploaders + * d/rules: use debhelper and Ant for the build as Maven + is a build dependency of plexus-compiler + * d/control: Remove Build-Depends on cdbs, maven-debian-helper, + libplexus-component-metadata-java + * Add Build-Depends on maven-repo-helper, ant-optional, maven-ant-helper, + default-jdk-doc, libmaven2-core-java-doc, + libplexus-container-default-java-doc, libplexus-utils-java-doc * Add dependency on libplexus-components-java, libecj-java, * Remove dependency on libaspectj-java, as plexus-aspectj-compiler cannot compile with AspectJ 1.6 diff --git a/debian/control b/debian/control index cfcbc06..8dee05d 100644 --- a/debian/control +++ b/debian/control @@ -3,12 +3,12 @@ Section: java Priority: optional Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org> Uploaders: Torsten Werner <twer...@debian.org>, Ludovic Claude <ludovic.cla...@laposte.net> -Build-Depends: debhelper (>= 7), cdbs, default-jdk, maven-debian-helper (>= 1.4) -Build-Depends-Indep: libplexus-component-metadata-java, libcommons-lang-java (>= 2.0), +Build-Depends: debhelper (>= 7), default-jdk, maven-repo-helper (>= 1.5), ant-optional, maven-ant-helper (>= 7.1) +Build-Depends-Indep: libcommons-lang-java (>= 2.0), libecj-java, libmaven2-core-java, libplexus-components-java (>= 1.1.16), - libplexus-container-default-java, libplexus-utils-java, junit (>= 3.8.2), - default-jdk-doc, libmaven2-core-java-doc, libplexus-container-default-java-doc, - libplexus-utils-java-doc, libmaven-javadoc-plugin-java + libplexus-container-default-java, libplexus-utils-java (>= 1.5.15, junit (>= 3.8.2), + default-jdk-doc, libmaven2-core-java-doc, libplexus-container-default-java-doc, + libplexus-utils-java-doc Standards-Version: 3.9.2 Vcs-Git: git://anonscm.debian.org/pkg-java/plexus-compiler.git Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-java/plexus-compiler.git diff --git a/debian/libplexus-compiler-java.poms b/debian/libplexus-compiler-java-doc.poms similarity index 52% copy from debian/libplexus-compiler-java.poms copy to debian/libplexus-compiler-java-doc.poms index 8c31adb..1a680c5 100644 --- a/debian/libplexus-compiler-java.poms +++ b/debian/libplexus-compiler-java-doc.poms @@ -25,13 +25,10 @@ # --site-xml=<location>: Optional, the location for site.xml if it needs to be installed. # Empty by default. [mh_install] # -pom.xml --has-package-version -plexus-compiler-api/pom.xml --has-package-version -plexus-compiler-test/pom.xml --has-package-version -plexus-compiler-manager/pom.xml --has-package-version -plexus-compilers/pom.xml --has-package-version -plexus-compilers/plexus-compiler-aspectj/pom.xml --ignore -plexus-compilers/plexus-compiler-csharp/pom.xml --has-package-version -plexus-compilers/plexus-compiler-eclipse/pom.xml --has-package-version -plexus-compilers/plexus-compiler-jikes/pom.xml --has-package-version -plexus-compilers/plexus-compiler-javac/pom.xml --has-package-version +plexus-compiler-api/target/plexus-compiler-api.javadoc.pom --has-package-version --artifact=plexus-compiler-api/target/plexus-compiler-api.javadoc.jar --classifier=javadoc --ignore-pom +plexus-compiler-test/target/plexus-compiler-test.javadoc.pom --has-package-version --artifact=plexus-compiler-test/target/plexus-compiler-test.javadoc.jar --classifier=javadoc --ignore-pom +plexus-compiler-manager/target/plexus-compiler-manager.javadoc.pom --has-package-version --artifact=plexus-compiler-manager/target/plexus-compiler-manager.javadoc.jar --classifier=javadoc --ignore-pom +plexus-compilers/plexus-compiler-csharp/target/plexus-compiler-csharp.javadoc.pom --has-package-version --artifact=plexus-compilers/plexus-compiler-csharp/target/plexus-compiler-csharp.javadoc.jar --classifier=javadoc --ignore-pom +plexus-compilers/plexus-compiler-eclipse/target/plexus-compiler-eclipse.javadoc.pom --has-package-version --artifact=plexus-compilers/plexus-compiler-eclipse/target/plexus-compiler-eclipse.javadoc.jar --classifier=javadoc --ignore-pom +plexus-compilers/plexus-compiler-jikes/target/plexus-compiler-jikes.javadoc.pom --has-package-version --artifact=plexus-compilers/plexus-compiler-jikes/target/plexus-compiler-jikes.javadoc.jar --classifier=javadoc --ignore-pom +plexus-compilers/plexus-compiler-javac/target/plexus-compiler-javac.javadoc.pom --has-package-version --artifact=plexus-compilers/plexus-compiler-javac/target/plexus-compiler-javac.javadoc.jar --classifier=javadoc --ignore-pom diff --git a/debian/libplexus-compiler-java.poms b/debian/libplexus-compiler-java.poms index 8c31adb..5f909e7 100644 --- a/debian/libplexus-compiler-java.poms +++ b/debian/libplexus-compiler-java.poms @@ -26,12 +26,12 @@ # Empty by default. [mh_install] # pom.xml --has-package-version -plexus-compiler-api/pom.xml --has-package-version -plexus-compiler-test/pom.xml --has-package-version -plexus-compiler-manager/pom.xml --has-package-version +plexus-compiler-api/pom.xml --has-package-version --artifact=plexus-compiler-api/target/plexus-compiler-api-*.jar --java-lib +plexus-compiler-test/pom.xml --has-package-version --artifact=plexus-compiler-test/target/plexus-compiler-test-*.jar --java-lib +plexus-compiler-manager/pom.xml --has-package-version --artifact=plexus-compiler-manager/target/plexus-compiler-manager-*.jar --java-lib plexus-compilers/pom.xml --has-package-version plexus-compilers/plexus-compiler-aspectj/pom.xml --ignore -plexus-compilers/plexus-compiler-csharp/pom.xml --has-package-version -plexus-compilers/plexus-compiler-eclipse/pom.xml --has-package-version -plexus-compilers/plexus-compiler-jikes/pom.xml --has-package-version -plexus-compilers/plexus-compiler-javac/pom.xml --has-package-version +plexus-compilers/plexus-compiler-csharp/pom.xml --has-package-version --artifact=plexus-compilers/plexus-compiler-csharp/target/plexus-compiler-csharp-*.jar --java-lib +plexus-compilers/plexus-compiler-eclipse/pom.xml --has-package-version --artifact=plexus-compilers/plexus-compiler-eclipse/target/plexus-compiler-eclipse-*.jar --java-lib +plexus-compilers/plexus-compiler-jikes/pom.xml --has-package-version --artifact=plexus-compilers/plexus-compiler-jikes/target/plexus-compiler-jikes-*.jar --java-lib +plexus-compilers/plexus-compiler-javac/pom.xml --has-package-version --artifact=plexus-compilers/plexus-compiler-javac/target/plexus-compiler-javac-*.jar --java-lib diff --git a/debian/maven.rules b/debian/maven.rules index 3396c38..033d7b0 100644 --- a/debian/maven.rules +++ b/debian/maven.rules @@ -30,5 +30,3 @@ org.codehaus.plexus plexus-compilers pom s/1\..*/1.x/ * * org.codehaus.plexus plexus-components pom s/1\..*/1.x/ * * org.codehaus.plexus plexus-container-default jar s/1\.0-alpha.*/1.0-alpha/ * * s/org.eclipse.jdt/org.eclipse.jdt.core.compiler/ s/core/ecj/ jar s/.*/debian/ * * -#s/aspectj/org.aspectj/ aspectjrt jar s/.*/debian/ * * -#s/aspectj/org.aspectj/ aspectjtools jar s/.*/debian/ * * diff --git a/debian/rules b/debian/rules index 562f1f3..c770461 100755 --- a/debian/rules +++ b/debian/rules @@ -1,10 +1,14 @@ #!/usr/bin/make -f -include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/maven.mk +DEB_SOURCE_PACKAGE := $(shell dpkg-parsechangelog | grep '^Source:' | cut -f 2 -d ' ') +DEB_UPSTREAM_VERSION := $(shell dpkg-parsechangelog | egrep '^Version:' | cut -f 2 -d ' ' | cut -d: -f2- | sed 's/-[^-]*$$//') -JAVA_HOME := /usr/lib/jvm/default-java -DEB_MAVEN_DOC_TARGET := javadoc:jar javadoc:aggregate +export JAVA_HOME=/usr/lib/jvm/default-java +export CLASSPATH=$(shell for jar in `cat debian/build-classpath`; do if [ -f "$$jar" ]; then echo -n "$${jar}:"; fi; done) +export ANT_ARGS=-Dbasedir=$(realpath .) -Dpackage=$(DEB_SOURCE_PACKAGE) -f debian/build.xml + +%: + dh $@ --buildsystem=ant --with maven_repo_helper get-orig-source: uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download --rename -- Plexus Compiler _______________________________________________ pkg-java-commits mailing list pkg-java-comm...@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits