This is an automated email from the git hooks/post-receive script. eighthave pushed a commit to branch master in repository ivyplusplus.
commit 135a185e4f0b9552689620a0cddf5adc31ae75e9 Author: Hans-Christoph Steiner <[email protected]> Date: Mon Dec 14 23:47:25 2015 +0100 REBASE custom ant build --- debian/.gitignore | 1 + debian/build.xml | 67 ++++++++++++++++++-------------------------------- debian/control | 8 +++--- debian/include-ivy.xml | 5 ++++ debian/rules | 1 + 5 files changed, 36 insertions(+), 46 deletions(-) diff --git a/debian/.gitignore b/debian/.gitignore index a67db05..4dfe054 100644 --- a/debian/.gitignore +++ b/debian/.gitignore @@ -1,5 +1,6 @@ files ivyplusplus.debhelper.log ivyplusplus.substvars +ivyplusplus.version.properties ivyplusplus/ diff --git a/debian/build.xml b/debian/build.xml index ca4a9ff..788c34d 100644 --- a/debian/build.xml +++ b/debian/build.xml @@ -1,43 +1,31 @@ <?xml version="1.0" encoding="UTF-8"?> <project name="com.zwitserloot.ivyplusplus" default="dist"> - <mkdir dir="build/pack" /> - <mkdir dir="lib/build" /> + <property file="debian/ivyplusplus.version.properties" /> <path id="build.path"> - <fileset dir="lib/build"> - <include name="*.jar" /> + <fileset dir="/usr/share/java"> + <include name="ant.jar" /> + <include name="bcpg.jar" /> + <include name="bcprov.jar" /> + <include name="com.zwitserloot.cmdreader.jar" /> + <include name="ivy.jar" /> + <include name="lombok.jar" /> </fileset> </path> - - <path id="runtime.path"> - <fileset dir="lib/runtime"> - <include name="*.jar" /> - </fileset> - </path> - - <path id="pack.path"> - <fileset dir="lib/pack"> - <include name="*.jar" /> - </fileset> - </path> - + <target name="clean"> <delete dir="build" /> <delete dir="dist" /> - <delete dir="lib" /> - <delete file=".project" /> - <delete file=".classpath" /> - <delete dir=".settings" /> </target> <target name="compile"> - <javac srcdir="src" destdir="build/pack"> + <mkdir dir="build/pack" /> + <javac destdir="build/pack"> + <src path="src" /> + <exclude name="com/zwitserloot/ivyplusplus/eclipse/**" /> + <exclude name="com/zwitserloot/ivyplusplus/intellij/**" /> <classpath refid="build.path" /> - <classpath location="/usr/share/java/bcpg.jar" /> - <classpath location="/usr/share/java/bcprov.jar" /> - <classpath location="/usr/share/java/com.zwitserloot.cmdreader.jar" /> - <classpath location="/usr/share/java/ivy.jar" /> </javac> </target> @@ -54,33 +42,26 @@ </target> <target name="dist" depends="isolateBridges, stripeIvy"> - <mkdir dir="dist" /> - <taskdef name="jarjar" classname="com.tonicsystems.jarjar.JarJarTask" classpath="lib/build/jarjar.jar" /> - <jarjar jarfile="dist/ivyplusplus-${ivyplusplus.version}.jar"> + <jar jarfile="dist/ivyplusplus-${ivyplusplus.version}.jar"> <fileset dir="build/pack" /> + <fileset dir="src" includes="com/zwitserloot/ivyplusplus/**/*.template" /> <fileset dir="build/runtimedeps" /> - <rule pattern="com.zwitserloot.cmdreader.**" result="com.zwitserloot.ivyplusplus.libs.com.zwitserloot.cmdreader.@1" /> <manifest> <attribute name="Main-Class" value="com.zwitserloot.ivyplusplus.createProject.CreateProject" /> <attribute name="ivyplusplus-version" value="${ivyplusplus.version}" /> </manifest> - </jarjar> - <copy file="dist/ivyplusplus-${ivyplusplus.version}.jar" tofile="dist/ivyplusplus.jar" /> + </jar> </target> <target name="stripeIvy"> + <delete quiet="true" file="build/pack/com/zwitserloot/ivyplusplus/antlib.xml" /> <mkdir dir="build/pack" /> - <unjar src="lib/build/ivy.jar" dest="build/pack" /> - <move file="build/pack/META-INF/LICENSE" tofile="build/pack/META-INF/LICENSE.ivy" /> - <copy file="LICENSE" tofile="build/pack/META-INF/LICENSE.ivyplusplus" /> - <loadresource property="antlib-ivy.contents"> - <file file="build/pack/org/apache/ivy/ant/antlib.xml" /> - <filterchain> - <linecontainsregexp negate="true"> - <regexp pattern="(?:\b/?antlib[^>]*>)|(?:\?[^>]*\?>)" /> - </linecontainsregexp> - </filterchain> + <copy file="src/com/zwitserloot/ivyplusplus/antlib.xml" tofile="build/pack/com/zwitserloot/ivyplusplus/antlib.xml" /> + <loadresource property="include.ivy"> + <file file="debian/include-ivy.xml" /> </loadresource> - <replace file="build/pack/com/zwitserloot/ivyplusplus/antlib.xml" token="-- insert here -->" value="-- ivy's antlib -->${antlib-ivy.contents}" /> + <replace file="build/pack/com/zwitserloot/ivyplusplus/antlib.xml" + token="-- insert here -->" + value="-- include ivy -->${include.ivy}" /> </target> </project> diff --git a/debian/control b/debian/control index 6326e52..a23bf2f 100644 --- a/debian/control +++ b/debian/control @@ -6,10 +6,12 @@ Uploaders: Hans-Christoph Steiner <[email protected]> Build-Depends: debhelper (>= 9), ant, ant-optional, + cmdreader, default-jdk, ivy, - junit4 (>=4.8.12), - libjarjar-java + libbcpg-java, + libbcprov-java, + liblombok-java Standards-Version: 3.9.6 Homepage: https://github.com/rzwitserloot/ivyplusplus Vcs-Git: https://anonscm.debian.org/git/pkg-java/ivyplusplus.git @@ -17,7 +19,7 @@ Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/ivyplusplus.git Package: ivyplusplus Architecture: all -Depends: ${shlibs:Depends}, ${misc:Depends} +Depends: ${java:Depends}, ${misc:Depends} Description: Adds features to ivy for creating projects ivyplusplus (ipp) adds a few useful features to ivy, such as creating an eclipse project from your deps. Aside from ivy itself, you get a diff --git a/debian/include-ivy.xml b/debian/include-ivy.xml new file mode 100644 index 0000000..743022b --- /dev/null +++ b/debian/include-ivy.xml @@ -0,0 +1,5 @@ +<taskdef resource="org/apache/ivy/ant/antlib.xml"> + <classpath> + <pathelement location="/usr/share/java/ivy.jar"/> + </classpath> +</taskdef> diff --git a/debian/rules b/debian/rules index ff29373..b1830ab 100755 --- a/debian/rules +++ b/debian/rules @@ -11,4 +11,5 @@ override_dh_auto_clean: ant -buildfile debian/build.xml -Dbasedir=`pwd` clean override_dh_auto_build: + echo ivyplusplus.version=$(DEB_VERSION_UPSTREAM) > debian/ivyplusplus.version.properties ant -buildfile debian/build.xml -Dbasedir=`pwd` dist -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/ivyplusplus.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
