Moved to JDB common build structure.

jdb-build-1.6.xml

@@ -0,0 +1,201 @@
+<?xml version="1.0" encoding="utf-8"?>
+<project name="Jonathan Bernard Build Common">
+
+    <property environment="env"/>
+
+    <!--======== INIT TARGETS ========-->
+    <target name="-init" depends="-common-init,init"/>
+
+    <target name="-common-init">
+        <!-- Set default values for some key properties. Since properties are
+             write once, any value set before this point takes precedence. -->
+
+        <property name="versioning.file" value="project.properties"/>
+
+        <property name="src.dir" value="${basedir}/src"/>
+        <property name="build.dir" value="${basedir}/build"/>
+        <property name="lib.dir" value="${basedir}/lib"/>
+        <property name="resources.dir" value="${basedir}/resources"/>
+
+        <!--======== PATHS ========-->
+        <path id="groovy.classpath">
+            <fileset dir="${env.GROOVY_HOME}/lib">
+                <include name="*.jar"/>
+            </fileset>
+        </path>
+
+        <path id="groovy.embeddable">
+            <fileset dir="${env.GROOVY_HOME}/embeddable">
+                <include name="*.jar"/>
+            </fileset>
+        </path>
+
+        <path id="compile-libs">
+            <fileset dir="${build.dir}/lib/compile/jar">
+                <include name="*.jar"/>
+            </fileset>
+        </path>
+
+        <path id="runtime-libs">
+            <fileset dir="${build.dir}/lib/runtime/jar">
+                <include name="*.jar"/>
+            </fileset>
+        </path>
+
+    </target>
+
+    <target name="-init-groovy">
+        <taskdef name="groovyc" classpathref="groovy.classpath"
+            classname="org.codehaus.groovy.ant.Groovyc"/>
+
+        <taskdef name="groovy" classpathref="groovy.classpath"
+            classname="org.codehaus.groovy.ant.Groovy"/>
+    </target>
+
+    <target name="init"/>
+
+    <target name="clean" depends="-init">
+        <delete dir="${build.dir}"/>
+    </target>
+
+    <!--======== LIBRARY TARGETS ========-->
+    <target name="lib" depends="-lib-local,-lib-ivy"/>
+
+    <target name="-lib-ivy" unless="${lib.local}"/>
+
+    <target name="-lib-local" if="${lib.local}">
+        <echo message="Resolving libraries locally."/>
+        <mkdir dir="${build.dir}/lib/compile/jar"/>
+        <mkdir dir="${build.dir}/lib/runtime/jar"/>
+        <copy todir="${build.dir}/lib/compile/jar" failonerror="false">
+            <fileset dir="${lib.dir}/compile/jar"/>
+        </copy>
+
+        <copy todir="${build.dir}/lib/runtime/jar" failonerror="false">
+            <fileset dir="${lib.dir}/runtime/jar"/>
+        </copy>
+    </target>
+
+    <!--======== VERSIONING TARGETS ========-->
+    <target name="increment-build-number" depends="-init">
+        <propertyfile file="${versioning.file}">
+            <entry key="build.number" default="0" type="int" value="1"
+                operation="+"/>
+        </propertyfile>
+    </target>
+
+    <target name="set-version" depends="-init">
+        <input
+            message="The current version is ${version}. Enter a new version: "
+            addproperty="new-version"/>
+        <propertyfile file="${versioning.file}">
+            <entry key="version" value="${new-version}" operation="="
+                type="string"/>
+            <entry key="build.number" value="0" type="int" operation="="/>
+        </propertyfile>
+    </target>
+
+    <!--======== COMPILATION TARGETS ========-->
+    <target name="-compile-groovy" depends="-init,-init-groovy,lib">
+        <mkdir dir="${build.dir}/main/classes"/>
+        <groovyc srcdir="${src.dir}/main" destdir="${build.dir}/main/classes"
+            includeAntRuntime="false" fork="yes">
+
+            <classpath>
+                <path refid="groovy.classpath"/>
+                <path refid="compile-libs"/>
+            </classpath>
+            <javac/>
+        </groovyc>
+    </target>
+
+    <target name="-compile-java" depends="-init,lib">
+        <mkdir dir="${build.dir}/main/classes"/>
+        <javac srcdir="${src.dir}/main" destdir="${build.dir}/main/classes"
+            includeAntRuntime="false" classpathref="compile-libs"/>
+    </target>
+
+    <target name="compile" depends="-compile-groovy"/>
+
+    <!--======== JUNIT TARGETS ========-->
+    <target name="-compile-tests-groovy" depends="-init,compile">
+        <mkdir dir="${build.dir}/test/classes"/>
+        <groovyc srcdir="${src.dir}/test" destdir="${build.dir}/test/classes"
+            includeAntRuntime="false" fork="true">
+            
+            <classpath>
+                <path refid="groovy.classpath"/>
+                <path refid="compile-libs"/>
+                <path location="${build.dir}/main/classes"/>
+            </classpath>
+        </groovyc>
+    </target>
+
+    <target name="-compile-tests-java" depends="-init,compile">
+        <mkdir dir="${build.dir}/test/classes"/>
+        <javac srcdir="${src.dir}/test" destdir="${build.dir}/test/classes"
+            includeAntRuntime="false">
+            <classpath>
+                <path refid="compile-libs"/>
+                <path location="${build.dir}/main/classes"/>
+            </classpath>
+        </javac>
+    </target>
+
+    <target name="compile-tests" depends="-compile-tests-groovy"/>
+
+    <target name="run-tests" depends="compile-tests,resources-test">
+        <junit printsummary="true">
+            <classpath>
+                <path refid="groovy.classpath"/>
+                <path refid="compile-libs"/>
+                <path location="${build.dir}/main/classes"/>
+                <path location="${build.dir}/test/classes"/>
+            </classpath>
+            <formatter type="plain" usefile="false"/>
+            <batchtest>
+                <fileset dir="${build.dir}/test/classes">
+                    <include name="**/*"/>
+                </fileset>
+            </batchtest>
+        </junit>
+    </target>
+
+    <!--======== RESOURCES TARGETS ========-->
+    
+    <target name="resources" depends="-init">
+        <mkdir dir="${build.dir}/main/classes"/>
+        <copy todir="${build.dir}/main/classes" failonerror="false">
+            <fileset dir="${resources.dir}/main/"/>
+        </copy>
+    </target>
+
+    <target name="resources-test" depends="-init">
+        <mkdir dir="${build.dir}/test/classes"/>
+        <copy todir="${build.dir}/test/classes" failonerror="false">
+            <fileset dir="${resources.dir}/test/"/>
+        </copy>
+    </target>
+
+    <!--======== BUILD TARGETS ========-->
+    <target name="-build-modular"
+        depends="compile,increment-build-number,resources">
+
+        <jar destfile="${build.dir}/${name}-${version}.${build.number}.jar"
+            basedir="${build.dir}/main/classes"/>
+    </target>
+
+    <target name="-build-packed-libs"
+        depends="compile,increment-build-number,resources">
+
+        <unjar destdir="${build.dir}/main/classes">
+            <fileset dir="${build.dir}/lib/runtime/jar"/>
+        </unjar>
+
+        <jar destfile="${build.dir}/${name}-${version}.${build.number}.jar"
+            basedir="${build.dir}/main/classes"/>
+    </target>
+
+    <target name="build" depends="-build-modular"/>
+
+</project>

libpit/build.xml

@@ -1,30 +1,8 @@
 <project name="Personal Issue Tracker" default="release">
-    <property file="../version.properties"/>
+
     <property file="project.properties"/>
-    <property environment="env"/>
 
-    <path id="groovy.libs">
-        <fileset dir="${env.GROOVY_HOME}/lib">
-            <include name="**/*.jar"/>
-        </fileset>
-    </path>
-
-    <path id="groovyc.classpath">
-        <path refid="groovy.libs"/>
-        <fileset dir="${lib.dir}">
-            <include name="**/*.jar"/>
-        </fileset>
-        <pathelement path="${build.dir}/classes"/>
-    </path>
-
-    <path id="test.classpath">
-        <path refid="groovyc.classpath"/>
-        <pathelement path="${build.dir}/tests"/>
-    </path>
-
-    <taskdef name="groovyc"
-        classname="org.codehaus.groovy.ant.Groovyc"
-        classpathref="groovy.libs"/>
+    <import file="../jdb-build-1.6.xml"/>
 
     <target name="init">
         <fail
@@ -33,79 +11,4 @@
         <echo message="GROOVY_HOME: ${env.GROOVY_HOME}"/>
     </target>
 
-    <target name="increment-build-number" depends="init">
-        <!-- Check to see if the application version has changed.
-             If it has, reset the build number to 0 -->
-        <condition property="build.number.final" 
-            value="${build.number}"
-            else="0" >
-            <equals
-                arg1="${application.version}"
-                arg2="${expected.application.version}"/>
-        </condition>
-
-        <echo message="Version: ${application.version}"/>
-        <echo message="Build number: ${build.number.final}"/>
-
-        <!-- Write the actual application version and build number -->
-        <propertyfile file="project.properties">
-            <entry key="build.number" value="${build.number.final}"/>
-            <entry
-                key="expected.application.version"
-                value="${application.version}"/>
-        </propertyfile>
-
-        <!-- increment build number -->
-        <propertyfile file="project.properties">
-            <entry key="build.number" operation="+" type="int" default="0"/>
-        </propertyfile>
-        <property file="project.properties"/>
-    </target>
-
-    <target name="clean">
-        <delete dir="${build.dir}"/>
-    </target>
-
-    <target name="compile" depends="init,increment-build-number">
-        <mkdir dir="${build.dir}/classes"/>
-        <groovyc
-            srcdir="${src.dir}"
-            destdir="${build.dir}/classes"
-            classpathref="groovyc.classpath"/>
-    </target>
-
-    <target name="compile-tests" depends="init,compile">
-        <mkdir dir="${build.dir}/tests"/>
-        <groovyc
-            srcdir="${test.dir}"
-            destdir="${build.dir}/tests"
-            classpathref="groovyc.classpath"/>
-    </target>
-
-    <target name="test" depends="compile-tests">
-        <junit fork="yes" haltonfailure="yes">
-            <classpath refid="test.classpath"/>
-            <formatter type="brief" usefile="false" />
-            <batchtest>
-                <fileset dir="${build.dir}/tests">
-                    <include name="**/*Test.class"/>
-                </fileset>
-            </batchtest>
-        </junit>
-    </target>
-
-    <target name="build" depends="compile,test">
-        <mkdir dir="${build.dir}/jar"/>
-        <jar
-            destfile="${build.dir}/jar/pit-${application.version}.${build.number.final}.jar"
-            basedir="${build.dir}/classes"
-            compress="on"/>
-    </target>
-
-    <target name="release" depends="build">
-        <delete dir="${release.dir}"/>
-        <mkdir dir="${release.dir}"/>
-        <copy file="${build.dir}/jar/pit-${application.version}.${build.number.final}.jar"
-            tofile="${release.dir}/${release.jar}"/>
-    </target>
 </project>

libpit/doc/grammar.txt

@@ -0,0 +1,7 @@
+IssueFile - Title Body PropertyBlock?
+Title - ONE_LINE TITLE_SEPARATOR
+Body - ANY_LINE+
+Separator - DASH{4} NEW_LINE
+PropertyBlock - HorizontalRule TableSeparator PropertyDefinition+ TableSeparator
+TableSeparator - 
+PropertyDefinition - PropertyKey COLON PropertyValue

libpit/project.properties

@@ -1,11 +1,12 @@
-#Thu, 03 Nov 2011 13:47:05 -0500
+#Sun, 20 Nov 2011 15:56:02 -0600
 #Sat Apr 24 17:08:00 CDT 2010
 build.dir=build
 src.dir=src
 lib.shared.dir=../shared-libs
 test.dir=test
-build.number=11
+build.number=19
 expected.application.version=3.0.0
 lib.dir=lib
+lib.local=true
 release.dir=release
 release.jar=pit-${application.version}.jar