Generate dynamic classpath in ant, not bash

Change-Id: I71151b953b29df6dc12ec19f3c43f8cf7a6a37ed
Reviewed-on: http://gerrit.dmdirc.com/2198
Automatic-Compile: DMDirc Build Manager
Reviewed-by: Greg Holmes <greg@dmdirc.com>

build-functions.sh

@@ -1,26 +0,0 @@
-#!/bin/bash
-# Provides functions that are used in multiple scripts in the build process
-
-function safe_mktemp {
-	if [ -x "`which mktemp`" ] ; then
-		TMPDIR=`mktemp -d`
-	else
-		if [ -d "$TMP" ] ; then
-			# We're running under Windows then use the global TMP location
-			TMPDIR="$TMP/$1-`date +%s`-$$-$RANDOM"
-		else
-			TMPDIR="`pwd`/build/temp/$1-$$-$RANDOM"
-		fi
-		# this is fragile
-		if [ -d "$TMPDIR" ] ; then
-			echo "no suitable temp folder found"
-			exit 2
-		fi
-		mkdir -p "$TMPDIR"  
-		if [ ! -d "$TMPDIR" ] ; then
-			echo "no suitable temp folder found"
-			exit 2
-		fi
-	fi
-	echo $TMPDIR
-}

build-properties.xml

@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project name="DMDirc-properties" default="default" basedir=".">
+    <description>Automatically initialises build properties</description>
+
+    <condition property="private.property.exists">
+        <available file="nbproject/private/private.properties"/>
+    </condition>
+    
+    <target name="-create-private-properties" unless="private.properties.exists">
+        <mkdir dir="nbproject/private"/>
+        <echo file="nbproject/private/private.properties"/>
+    </target>
+    
+    <target name="-check-private-classpath">
+        <loadfile property="private.properties.old" srcFile="nbproject/private/private.properties"/>
+        <condition property="private.properties.needsinsert">
+            <not>
+                <matches string="${private.properties.old}" pattern="^private.classpath=(.*)$" multiline="true" casesensitive="true"/>
+            </not>
+        </condition>
+    </target>
+    
+    <target name="-create-private-classpath" if="private.properties.needsinsert">
+        <echo append="true" file="nbproject/private/private.properties">${line.separator}private.classpath=${line.separator}</echo>
+    </target>
+
+    <target name="-init-private-properties" depends="-create-private-properties,-check-private-classpath,-create-private-classpath">
+        <propertyregex property="private.classpath.value" input="${toString:plugins.libs}" regexp="\\" replace="/" global="true"/>
+        <replaceregexp file="nbproject/private/private.properties" match="^private.classpath=(.*)$" flags="im" replace="private.classpath=${private.classpath.value}"/>
+    </target>
+    
+</project>

build.xml

@@ -8,6 +8,7 @@
     <import file="build-reports.xml"/>
     <import file="build-tests.xml"/>
     <import file="build-versioning.xml"/>
+    <import file="build-properties.xml"/>
 
     <target name="init-private">
         <echo>Downloading private files, if this fails please pass username and</echo>
@@ -29,6 +30,7 @@
         <delete dir="modules/util/dist"/>
     </target>
 
+    <target name="-pre-init" depends="-init-private-properties"/>
     <target name="-post-compile" depends="-write-version, build-plugins"/>
     <target name="-post-test-run" depends="-do-test-reports"/>
     <target name="-post-jar" depends="-update-bundled-plugins"/>

dynamicProperties.sh

@@ -1,20 +0,0 @@
-#!/bin/bash
-
-SOURCE="${1}"
-TARGET="${2}"
-
-if [ "" = "${TARGET}" -o ! -e "${SOURCE}" ]; then
-	echo "Usage: ${0} dynamic.properties private.properties";
-else
-	# Make sure target exists.
-	if [ ! -e "${TARGET}" ]; then
-		mkdir -p `dirname "${TARGET}"`
-		touch "${TARGET}"
-	fi;
-	
-	# Remove existing private.properties line
-	sed '/^private\.classpath[\s]*=.*$/d' -i "${TARGET}"
-
-	# Add new one.
-	cat "${SOURCE}" | grep "^private\.classpath" >> "${TARGET}"
-fi;

nbproject/build-impl.xml

@@ -29,36 +29,17 @@ is divided into following sections:
     <path id="plugins.libs">
         <fileset dir="modules/plugins/lib" includes="*.jar"/>
     </path>
+    
     <property name="test_profile_dir" value="./test_profile"/>
     <target name="-pre-init">
         <!-- Empty placeholder for easier customization. -->
         <!-- You can override this target in the ../build.xml file. -->
     </target>
-    <condition property="is.windows"><os family="windows"/></condition>
-    <target name="-init-dynamic-properties">
-	<mkdir dir="nbproject/private/" />
-	<delete file="nbproject/private/dynamic.properties" />
-        <echo file="nbproject/private/dynamic.properties" append="true"># DO NOT EDIT THIS FILE, IT WILL BE OVERWRITTEN BY ANT
-</echo>
-        <echo file="nbproject/private/dynamic.properties" append="true">private.classpath=${toString:plugins.libs}
-</echo>
-    </target>
-    <target depends="-init-dynamic-properties" name="-init-dynamic-properties-windows" if="is.windows">
-        <replace file="nbproject/private/dynamic.properties" token="\" value="/"/> <!-- this replaces backslashes with slashes on Windows -->
-    </target>
-    <target depends="-init-dynamic-properties,-init-dynamic-properties-windows" name="-init-dynamic-properties-netbeans">
-        <!-- Netbeans sucks and ignores dynamic.properties, lets hax it into private.properties then -->
-        <exec executable="bash">
-            <arg value="dynamicProperties.sh"/>
-            <arg value="nbproject/private/dynamic.properties"/>
-            <arg value="nbproject/private/private.properties"/>
-       </exec>
-    </target>
-    <target depends="-pre-init,-init-dynamic-properties,-init-dynamic-properties-windows,-init-dynamic-properties-netbeans" name="-init-private">
+    
+    <target depends="-pre-init" name="-init-private">
         <property file="nbproject/private/config.properties"/>
         <property file="nbproject/private/configs/${config}.properties"/>
         <property file="nbproject/private/private.properties"/>
-        <property file="nbproject/private/dynamic.properties"/>
     </target>
     <target depends="-pre-init,-init-private" name="-init-user">
         <property file="${user.properties.file}"/>

nbproject/project.properties

@@ -2,9 +2,40 @@ annotation.processing.enabled=true
 annotation.processing.enabled.in.editor=true
 annotation.processing.run.all.processors=true
 endorsed.classpath=
-file.reference.junit-4.8.1.jar=lib/junit-4.8.1.jar
-file.reference.lombok-pg-0.10.0.jar=lib/lombok-pg-0.10.0.jar
-file.reference.mockito-all-1.8.2.jar=lib/mockito-all-1.8.2.jar
+file.reference.ant-contrib-1.0b3.jar=lib\\ant-contrib-1.0b3.jar
+file.reference.ant-contrib-1.0b3.jar-1=modules\\plugins\\lib\\ant-contrib-1.0b3.jar
+file.reference.asm-3.1.jar=lib\\asm-3.1.jar
+file.reference.checkstyle-5.3-all.jar=lib\\checkstyle-5.3-all.jar
+file.reference.clover.jar=lib\\clover.jar
+file.reference.commons-codec-1.3.jar=lib\\commons-codec-1.3.jar
+file.reference.commons-codec-1.3.jar-1=modules\\plugins\\lib\\commons-codec-1.3.jar
+file.reference.commons-httpclient-3.0-rc1.jar=lib\\commons-httpclient-3.0-rc1.jar
+file.reference.commons-lang-2.4.jar=modules\\plugins\\lib\\commons-lang-2.4.jar
+file.reference.commons-logging-1.0.3.jar=lib\\commons-logging-1.0.3.jar
+file.reference.fikin-ant-1.7.3.jar=lib\\fikin-ant-1.7.3.jar
+file.reference.findbugs-ant.jar=lib\\findbugs-ant.jar
+file.reference.httpcore.jar=modules\\plugins\\lib\\httpcore.jar
+file.reference.jaxen-1.1.1.jar=lib\\jaxen-1.1.1.jar
+file.reference.jetty-6.1.22.jar=modules\\plugins\\lib\\jetty-6.1.22.jar
+file.reference.jetty-util-6.1.22.jar=modules\\plugins\\lib\\jetty-util-6.1.22.jar
+file.reference.jml-1.0b4-full.jar=modules\\plugins\\lib\\jml-1.0b4-full.jar
+file.reference.jna.jar=modules\\plugins\\lib\\jna.jar
+file.reference.junit-4.8.1.jar=lib\\junit-4.8.1.jar
+file.reference.jxlayer.jar=modules\\plugins\\lib\\jxlayer.jar
+file.reference.lombok-pg-0.10.0.jar=lib\\lombok-pg-0.10.0.jar
+file.reference.lombok-pg-0.10.0.jar-1=modules\\plugins\\lib\\lombok-pg-0.10.0.jar
+file.reference.menuscroller.jar=modules\\plugins\\lib\\menuscroller.jar
+file.reference.miglayout-3.7.4-swing.jar=modules\\plugins\\lib\\miglayout-3.7.4-swing.jar
+file.reference.mockito-all-1.8.2.jar=lib\\mockito-all-1.8.2.jar
+file.reference.nsisant-1.3.jar=lib\\nsisant-1.3.jar
+file.reference.platform.jar=modules\\plugins\\lib\\platform.jar
+file.reference.pmd-4.2.5.jar=lib\\pmd-4.2.5.jar
+file.reference.servlet-api-2.5-20081211.jar=modules\\plugins\\lib\\servlet-api-2.5-20081211.jar
+file.reference.signpost-core-1.1-SNAPSHOT.jar=modules\\plugins\\lib\\signpost-core-1.1-SNAPSHOT.jar
+file.reference.smack.jar=modules\\plugins\\lib\\smack.jar
+file.reference.smackx.jar=modules\\plugins\\lib\\smackx.jar
+file.reference.uispec4j-2.2.jar=modules\\plugins\\lib\\uispec4j-2.2.jar
+file.reference.xercesImpl.jar=lib\\xercesImpl.jar
 javac.processorpath=\
     ${javac.classpath}
 jaxbwiz.endorsed.dirs="${netbeans.home}/../ide12/modules/ext/jaxb/api"
@@ -77,7 +108,41 @@ util.test.dir=modules/util/test
 # automatically by ant.
 javac.classpath=\
     ${private.classpath}:\
-    ${file.reference.lombok-pg-0.10.0.jar}
+    ${file.reference.lombok-pg-0.10.0.jar}:\
+    ${file.reference.ant-contrib-1.0b3.jar}:\
+    ${file.reference.asm-3.1.jar}:\
+    ${file.reference.checkstyle-5.3-all.jar}:\
+    ${file.reference.clover.jar}:\
+    ${file.reference.commons-codec-1.3.jar}:\
+    ${file.reference.commons-httpclient-3.0-rc1.jar}:\
+    ${file.reference.commons-logging-1.0.3.jar}:\
+    ${file.reference.fikin-ant-1.7.3.jar}:\
+    ${file.reference.findbugs-ant.jar}:\
+    ${file.reference.jaxen-1.1.1.jar}:\
+    ${file.reference.junit-4.8.1.jar}:\
+    ${file.reference.lombok-pg-0.10.0.jar}:\
+    ${file.reference.mockito-all-1.8.2.jar}:\
+    ${file.reference.nsisant-1.3.jar}:\
+    ${file.reference.pmd-4.2.5.jar}:\
+    ${file.reference.xercesImpl.jar}:\
+    ${file.reference.ant-contrib-1.0b3.jar-1}:\
+    ${file.reference.commons-codec-1.3.jar-1}:\
+    ${file.reference.commons-lang-2.4.jar}:\
+    ${file.reference.httpcore.jar}:\
+    ${file.reference.jetty-6.1.22.jar}:\
+    ${file.reference.jetty-util-6.1.22.jar}:\
+    ${file.reference.jml-1.0b4-full.jar}:\
+    ${file.reference.jna.jar}:\
+    ${file.reference.jxlayer.jar}:\
+    ${file.reference.lombok-pg-0.10.0.jar-1}:\
+    ${file.reference.menuscroller.jar}:\
+    ${file.reference.miglayout-3.7.4-swing.jar}:\
+    ${file.reference.platform.jar}:\
+    ${file.reference.servlet-api-2.5-20081211.jar}:\
+    ${file.reference.signpost-core-1.1-SNAPSHOT.jar}:\
+    ${file.reference.smack.jar}:\
+    ${file.reference.smackx.jar}:\
+    ${file.reference.uispec4j-2.2.jar}
 javac.test.classpath=\
     ${javac.classpath}:\
     ${build.classes.dir}:\