jdb/util-classes
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Moved to common build v1.10

Browse Source
This commit is contained in:
Jonathan Bernard 2012-11-21 13:32:07 -06:00
parent d185cfb4dd
commit d2706e30bb
2 changed files with 56 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build.xml
View File

@ -2,7 +2,7 @@
<property file="project.properties"/> <property file="project.properties"/>
<import file="jdb-build-1.6.xml"/> <import file="jdb-build-1.10.xml"/>
<target name="package" depends="-build-modular"> <target name="package" depends="-build-modular">
<copy <copy

63
jdb-build-1.6.xml → jdb-build-1.10.xml
View File

@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<project name="Jonathan Bernard Build Common"> <project name="Jonathan Bernard Build Common"
xmlns:ivy="antlib:org.apache.ivy.ant">
<property environment="env"/> <property environment="env"/>
@ -16,6 +17,7 @@
<property name="build.dir" value="${basedir}/build"/> <property name="build.dir" value="${basedir}/build"/>
<property name="lib.dir" value="${basedir}/lib"/> <property name="lib.dir" value="${basedir}/lib"/>
<property name="resources.dir" value="${basedir}/resources"/> <property name="resources.dir" value="${basedir}/resources"/>
<property name="splash.image" value="splash.png"/>
<!--======== PATHS ========--> <!--======== PATHS ========-->
<path id="groovy.classpath"> <path id="groovy.classpath">
@ -59,9 +61,25 @@
</target> </target>
<!--======== LIBRARY TARGETS ========--> <!--======== LIBRARY TARGETS ========-->
<target name="lib" depends="-lib-local,-lib-ivy"/> <target name="-lib" depends="-lib-local,-lib-ivy,lib"/>
<target name="lib"/>
<target name="-lib-ivy" unless="${lib.local}"/> <target name="-init-ivy">
<ivy:settings id="ivy.settings" file="ivysettings.xml"/>
</target>
<target name="-lib-ivy" depends="-init-ivy" unless="${lib.local}">
<ivy:retrieve settingsRef="ivy.settings"
pattern="${lib.dir}/[conf]/[type]/[artifact]-[revision].[ext]"
conf="compile,runtime"/>
</target>
<target name="-lib-groovy" if="${lib.local}">
<copy todir="${build.dir}/lib/runtime/jar">
<fileset dir="${env.GROOVY_HOME}/embeddable"/>
</copy>
</target>
<target name="-lib-local" if="${lib.local}"> <target name="-lib-local" if="${lib.local}">
<echo message="Resolving libraries locally."/> <echo message="Resolving libraries locally."/>
@ -96,10 +114,10 @@
</target> </target>
<!--======== COMPILATION TARGETS ========--> <!--======== COMPILATION TARGETS ========-->
<target name="-compile-groovy" depends="-init,-init-groovy,lib"> <target name="-compile-groovy" depends="-init,-init-groovy,-lib,-lib-groovy">
<mkdir dir="${build.dir}/main/classes"/> <mkdir dir="${build.dir}/main/classes"/>
<groovyc srcdir="${src.dir}/main" destdir="${build.dir}/main/classes" <groovyc srcdir="${src.dir}/main" destdir="${build.dir}/main/classes"
fork="true" includeAntRuntime="false"> includeAntRuntime="false" fork="true">
<classpath> <classpath>
<path refid="groovy.classpath"/> <path refid="groovy.classpath"/>
@ -109,7 +127,7 @@
</groovyc> </groovyc>
</target> </target>
<target name="-compile-java" depends="-init,lib"> <target name="-compile-java" depends="-init,-lib">
<mkdir dir="${build.dir}/main/classes"/> <mkdir dir="${build.dir}/main/classes"/>
<javac srcdir="${src.dir}/main" destdir="${build.dir}/main/classes" <javac srcdir="${src.dir}/main" destdir="${build.dir}/main/classes"
includeAntRuntime="false" classpathref="compile-libs"/> includeAntRuntime="false" classpathref="compile-libs"/>
@ -121,7 +139,7 @@
<target name="-compile-tests-groovy" depends="-init,compile"> <target name="-compile-tests-groovy" depends="-init,compile">
<mkdir dir="${build.dir}/test/classes"/> <mkdir dir="${build.dir}/test/classes"/>
<groovyc srcdir="${src.dir}/test" destdir="${build.dir}/test/classes" <groovyc srcdir="${src.dir}/test" destdir="${build.dir}/test/classes"
includeAntRuntime="false"> includeAntRuntime="false" fork="true">
<classpath> <classpath>
<path refid="groovy.classpath"/> <path refid="groovy.classpath"/>
@ -178,13 +196,42 @@
</target> </target>
<!--======== BUILD TARGETS ========--> <!--======== BUILD TARGETS ========-->
<target name="-build-modular" <target name="-build-modular-lib" unless="executable.jar"
depends="compile,increment-build-number,resources"> depends="compile,increment-build-number,resources">
<jar destfile="${build.dir}/${name}-${version}.${build.number}.jar" <jar destfile="${build.dir}/${name}-${version}.${build.number}.jar"
basedir="${build.dir}/main/classes"/> basedir="${build.dir}/main/classes"/>
</target> </target>
<target name="-build-modular-executable" if="executable.jar"
depends="compile,increment-build-number,resources">
<pathconvert property="jar.classpath" pathsep=" " refid="runtime-libs">
<mapper>
<chainedmapper>
<!-- remove absolute path -->
<flattenmapper />
<!-- add lib/ prefix -->
<globmapper from="*" to="lib/*" />
</chainedmapper>
</mapper>
</pathconvert>
<jar destfile="${build.dir}/${name}-${version}.${build.number}.jar"
basedir="${build.dir}/main/classes">
<manifest>
<attribute name="Main-Class" value="${main.class}"/>
<attribute name="Class-Path" value="${jar.classpath}"/>
<attribute name="SplashScreen-Image" value="${splash.image}"/>
</manifest>
</jar>
</target>
<target name="-build-modular"
depends="-build-modular-lib,-build-modular-executable"/>
<target name="-build-packed-libs" <target name="-build-packed-libs"
depends="compile,increment-build-number,resources"> depends="compile,increment-build-number,resources">