The following commit has been merged in the master branch: commit b9303d6068e538b872e5f4e6cc9c4c872114e290 Author: Ludovic Claude <ludovic.cla...@laposte.net> Date: Thu Jan 5 01:22:44 2012 +0100
Fix build -second attempt diff --git a/debian/build-classpath b/debian/build-classpath index 8afb9ab..5bfa9ce 100644 --- a/debian/build-classpath +++ b/debian/build-classpath @@ -1,19 +1 @@ /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 -${basedir}/plexus-compiler-api/target/plexus-compiler-api-${version}.jar -${basedir}/plexus-compiler-test/target/plexus-compiler-test-${version}.jar -${basedir}/plexus-compiler-manager/target/plexus-compiler-manager-${version}.jar -${basedir}/plexus-compilers/plexus-compiler-csharp/target/plexus-compiler-csharp-${version}.jar -${basedir}/plexus-compilers/plexus-compiler-eclipse/target/plexus-compiler-eclipse-${version}.jar -${basedir}/plexus-compilers/plexus-compiler-jikes/target/plexus-compiler-jikes-${version}.jar -${basedir}/plexus-compilers/plexus-compiler-javac/target/plexus-compiler-javac-${version}.jar -${basedir}/plexus-compilers/target/plexus-compilers-${version}.jar diff --git a/debian/build.properties b/debian/build.properties index dd0f8aa..2e4f6c6 100644 --- a/debian/build.properties +++ b/debian/build.properties @@ -1,3 +1,12 @@ build.directory=target javadoc.dir=target/apidocs javadoc.generate=true +classpath.compile=\ + ${basedir}/plexus-compiler-api/target/plexus-compiler-api-${version}.jar:\ + ${basedir}/plexus-compiler-test/target/plexus-compiler-test-${version}.jar:\ + ${basedir}/plexus-compiler-manager/target/plexus-compiler-manager-${version}.jar:\ + ${basedir}/plexus-compilers/plexus-compiler-csharp/target/plexus-compiler-csharp-${version}.jar:\ + ${basedir}/plexus-compilers/plexus-compiler-eclipse/target/plexus-compiler-eclipse-${version}.jar:\ + ${basedir}/plexus-compilers/plexus-compiler-jikes/target/plexus-compiler-jikes-${version}.jar:\ + ${basedir}/plexus-compilers/plexus-compiler-javac/target/plexus-compiler-javac-${version}.jar:\ + target/classes diff --git a/debian/rules b/debian/rules index 9676011..c770461 100755 --- a/debian/rules +++ b/debian/rules @@ -8,7 +8,6 @@ export CLASSPATH=$(shell for jar in `cat debian/build-classpath`; do if [ -f "$$ export ANT_ARGS=-Dbasedir=$(realpath .) -Dpackage=$(DEB_SOURCE_PACKAGE) -f debian/build.xml %: - echo $(CLASSPATH) dh $@ --buildsystem=ant --with maven_repo_helper get-orig-source: -- 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