On unix building will automatically substitute the correct SVN Revision :D

(On windows it will just leave it as the default, so we should probably change this to something like -1 or so to make it obvious)
Nightly Build no longer tries to substitue RELEASE_DATE


git-svn-id: http://svn.dmdirc.com/trunk@3611 00569f92-eb28-0410-84fd-f71c24880f

AddSVN.sh

@@ -0,0 +1,26 @@
+#!/bin/sh
+
+SVN=`which svn`
+
+SVNREV=`$SVN info | grep Revision`
+SVNREV=${SVNREV##*: }
+
+PRE='int SVN_REVISION = '
+POST='int SVN_REVISION = '${SVNREV}'; \/\/ '
+
+OLD=""
+
+if [ "${1}" = "--pre" ]; then
+	# Substitute the version string
+	OLD=${PRE}
+	NEW=${POST}
+elif [ "${1}" = "--post" ]; then
+	# Unsubstitute the version string
+	OLD=${POST}
+	NEW=${PRE}
+fi;
+
+if [ "" != "${OLD}" ]; then
+	awk '{gsub(/'"${OLD}"'/,"'"${NEW}"'");print}' ${PWD}/src/com/dmdirc/Main.java > ${PWD}/src/com/dmdirc/Main.java.tmp 2>/dev/null
+	mv ${PWD}/src/com/dmdirc/Main.java.tmp ${PWD}/src/com/dmdirc/Main.java
+fi;

BuildAll.sh

@@ -27,16 +27,17 @@ SVNREV=`$SVN info | grep Revision`
 SVNREV=${SVNREV##*: }
 
 # Substitute the version string
-awk '{gsub(/String VERSION = "SVN"/,"String VERSION = \"Nightly - SVN Rev: '${SVNREV}'\"");print}' ${MYDIR}/src/com/dmdirc/Main.java > ${MYDIR}/src/com/dmdirc/Main.java.tmp
+awk '{gsub(/String VERSION = "SVN ("+SVN_REVISION+")"/,"String VERSION = \"Nightly - SVN Rev: '${SVNREV}'\"");print}' ${MYDIR}/src/com/dmdirc/Main.java > ${MYDIR}/src/com/dmdirc/Main.java.tmp
 mv ${MYDIR}/src/com/dmdirc/Main.java.tmp ${MYDIR}/src/com/dmdirc/Main.java
 
 # Substitute the update channel
 awk '{gsub(/UpdateChannel UPDATE_CHANNEL = UpdateChannel.NONE/,"UpdateChannel UPDATE_CHANNEL = UpdateChannel.NIGHTLY");print}' ${MYDIR}/src/com/dmdirc/Main.java > ${MYDIR}/src/com/dmdirc/Main.java.tmp
 mv ${MYDIR}/src/com/dmdirc/Main.java.tmp ${MYDIR}/src/com/dmdirc/Main.java
 
-# Substitue the release date
-awk '{gsub(/int RELEASE_DATE = 0/,"int RELEASE_DATE = '`date +%Y%m%d`'");print}' ${MYDIR}/src/com/dmdirc/Main.java > ${MYDIR}/src/com/dmdirc/Main.java.tmp
-mv ${MYDIR}/src/com/dmdirc/Main.java.tmp ${MYDIR}/src/com/dmdirc/Main.java
+# This no longer exists
+## Substitue the release date
+#awk '{gsub(/int RELEASE_DATE = 0/,"int RELEASE_DATE = '`date +%Y%m%d`'");print}' ${MYDIR}/src/com/dmdirc/Main.java > ${MYDIR}/src/com/dmdirc/Main.java.tmp
+#mv ${MYDIR}/src/com/dmdirc/Main.java.tmp ${MYDIR}/src/com/dmdirc/Main.java
 
 # Archive old nightlies
 if [ `date +%d` = "01" ]; then

build.xml

@@ -71,10 +71,40 @@
             <fileset dir="${build.classes.dir}"/>
         </jar>
     -->
-    <target name="-post-compile" depends="build-plugins"/>
 
     <available file="/bin/bash" property="has.bash"/>	
 
+    <!--
+        This will revert the svn revision in Main.java to prevent commiting the
+        change everyt time someone builds and causing conflicts.
+      -->
+    <target name="unsvn" depends="unsvn_nobash, unsvn_bash"/>
+    <target name="unsvn_bash" if="has.bash">
+        <exec executable="/bin/bash">
+            <arg value="AddSVN.sh"/>
+            <arg value="--post"/>
+        </exec>
+    </target>
+    <target name="unsvn_nobash" unless="has.bash">
+        <echo message="This task only works on linux"/>
+    </target>
+    <target name="-post-compile" depends="unsvn, build-plugins"/>
+
+    <!--
+        This will add the svn revision to Main.java
+      -->
+    <target name="addsvn" depends="addsvn_nobash, addsvn_bash"/>
+    <target name="addsvn_bash" if="has.bash">
+        <exec executable="/bin/bash">
+            <arg value="AddSVN.sh"/>
+            <arg value="--pre"/>
+        </exec>
+    </target>
+    <target name="addsvn_nobash" unless="has.bash">
+        <echo message="This task only works on linux"/>
+    </target>
+    <target name="-pre-compile" depends="addsvn"/>
+
     <target name="installer" depends="installer-nobuild, installer-build"/>
     
     <target name="installer-build" if="has.bash">