From d78bd3386e6bf4e0d7b06fa3efd4f176ae589292 Mon Sep 17 00:00:00 2001
From: Jonathan Bernard <jdbernard@gmail.com>
Date: Wed, 7 Dec 2011 17:40:12 -0600
Subject: [PATCH] Added executable modular build options.

* Added a new property 'executable.jar'. When set to true, the build creates an
  executable jar. It expects the fully qualified main class name in the
  'main.class' property. The executable jar expects all the runtime libs to be
  located in a folder called 'lib' next to the jar.
---
 jdb-build-1.7.xml => jdb-build-1.8.xml        | 43 +++++++++++++++++--
 ...ngs-1.7.xml => jdblabs.ivysettings-1.8.xml |  0
 2 files changed, 40 insertions(+), 3 deletions(-)
 rename jdb-build-1.7.xml => jdb-build-1.8.xml (83%)
 rename jdblabs.ivysettings-1.7.xml => jdblabs.ivysettings-1.8.xml (100%)

diff --git a/jdb-build-1.7.xml b/jdb-build-1.8.xml
similarity index 83%
rename from jdb-build-1.7.xml
rename to jdb-build-1.8.xml
index 71daa6d..ba43ed0 100644
--- a/jdb-build-1.7.xml
+++ b/jdb-build-1.8.xml
@@ -1,5 +1,6 @@
 <?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"/>
 
@@ -16,6 +17,7 @@
         <property name="build.dir" value="${basedir}/build"/>
         <property name="lib.dir" value="${basedir}/lib"/>
         <property name="resources.dir" value="${basedir}/resources"/>
+        <property name="splash.image" value="splash.png"/>
 
         <!--======== PATHS ========-->
         <path id="groovy.classpath">
@@ -71,6 +73,12 @@
             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}">
         <echo message="Resolving libraries locally."/>
         <mkdir dir="${build.dir}/lib/compile/jar"/>
@@ -104,7 +112,7 @@
     </target>
 
     <!--======== 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"/>
         <groovyc srcdir="${src.dir}/main" destdir="${build.dir}/main/classes"
             includeAntRuntime="false">
@@ -186,13 +194,42 @@
     </target>
 
     <!--======== BUILD TARGETS ========-->
-    <target name="-build-modular"
+    <target name="-build-modular-lib" unless="executable.jar"
         depends="compile,increment-build-number,resources">
 
         <jar destfile="${build.dir}/${name}-${version}.${build.number}.jar"
             basedir="${build.dir}/main/classes"/>
     </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"
         depends="compile,increment-build-number,resources">
 
diff --git a/jdblabs.ivysettings-1.7.xml b/jdblabs.ivysettings-1.8.xml
similarity index 100%
rename from jdblabs.ivysettings-1.7.xml
rename to jdblabs.ivysettings-1.8.xml