This is an automated email from the git hooks/post-receive script. tjaalton-guest pushed a commit to branch master in repository relaxngcc.
commit 44bfcc7f5227b878db27f86d3a1727bf25127507 Author: Timo Aaltonen <[email protected]> Date: Fri Jan 10 00:48:55 2014 +0200 make the build a bit nicer --- debian/relaxngcc-build.xml | 8 ++++---- debian/rules | 15 ++++++--------- 2 files changed, 10 insertions(+), 13 deletions(-) diff --git a/debian/relaxngcc-build.xml b/debian/relaxngcc-build.xml index cafe05d..09aae45 100644 --- a/debian/relaxngcc-build.xml +++ b/debian/relaxngcc-build.xml @@ -5,10 +5,10 @@ <!-- Compile Java source files: --> <target name="compile"> <mkdir dir="bin"/> - <javacc target="src/relaxngcc/javabody/JavaBodyParser.jj" outputdirectory="src/relaxngcc/javabody" javacchome="lib" static="false"/> - <javac srcdir="src" destdir="bin" debug="on" optimize="off" classpath="lib"> + <javacc target="src/relaxngcc/javabody/JavaBodyParser.jj" outputdirectory="src/relaxngcc/javabody" javacchome="/usr/share/java" static="false"/> + <javac srcdir="src" destdir="bin" debug="on" optimize="off" classpath="/usr/share/java"> <classpath> - <fileset dir="lib" includes="**/*.jar"/> + <fileset dir="/usr/share/java" includes="**/*.jar"/> </classpath> </javac> </target> @@ -19,7 +19,7 @@ <javadoc locale="en_US" sourcepath="src" destdir="javadoc" windowtitle="RelaxNGCC" public="yes"> <package name="relaxngcc.*"/> <classpath> - <fileset dir="lib" includes="*.jar"/> + <fileset dir="/usr/share/java" includes="*.jar"/> </classpath> </javadoc> </target> diff --git a/debian/rules b/debian/rules index 3b78f48..857b5d7 100755 --- a/debian/rules +++ b/debian/rules @@ -15,17 +15,14 @@ ZIP = relaxngcc-$(ZVERSION).zip override_dh_auto_build: ln -s debian/relaxngcc-build.xml build.xml - mkdir lib - ln -sf /usr/share/java/msv-core.jar lib - ln -sf /usr/share/java/relaxngDatatype.jar lib - ln -sf /usr/share/java/xercesImpl.jar lib - ln -sf /usr/share/java/xsdlib.jar lib - ln -sf /usr/share/java/javacc.jar lib - ln -sf /usr/share/java/ant.jar lib - ant jar javadoc + dh_auto_build -- \ + -Dant.build.javac.source=1.5 \ + -Dant.build.javac.target=1.5 \ + jar \ + javadoc override_dh_auto_clean: - dh_clean + dh_auto_clean -rm -rf bin javadoc lib relaxngcc.jar -rm -f src/relaxngcc/javabody/*.java -rm -f build.xml -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/relaxngcc.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
