[Bigdata-commit] SF.net SVN: bigdata:[4841] branches

[<tho...@us...>]

Revision: 4841
          http://bigdata.svn.sourceforge.net/bigdata/?rev=4841&view=rev
Author:   thompsonbry
Date:     2011-07-05 16:42:44 +0000 (Tue, 05 Jul 2011)

Log Message:
-----------
Modified the "buildinfo" target to be conditional such that we do not (re-)generate the BuildInfo file when building from a release artifact (or an SVN export).

Modified Paths:
--------------
    branches/QUADS_QUERY_BRANCH/build.xml
    branches/TERMS_REFACTOR_BRANCH/build.xml

Modified: branches/QUADS_QUERY_BRANCH/build.xml
===================================================================
--- branches/QUADS_QUERY_BRANCH/build.xml	2011-07-05 16:24:31 UTC (rev 4840)
+++ branches/QUADS_QUERY_BRANCH/build.xml	2011-07-05 16:42:44 UTC (rev 4841)
@@ -105,6 +105,8 @@
 		</condition>
 		<!--<echo message="today=${today}"/>-->
 		<echo message="version=${version}" />
+		<available property="svn.checkout" file="./.svn/entries"/>
+		<echo message="svn.checkout=${svn.checkout}" />
 		<!-- create directories. -->
 		<mkdir dir="${build.dir}" />
 		<mkdir dir="${build.dir}/classes" />
@@ -112,7 +114,7 @@
 		<mkdir dir="${build.dir}/lib" />
 	</target>
 
-	<target name="buildinfo"
+	<target name="buildinfo" depends="prepare" if="svn.checkout"
 		description="Generate a BuildInfo.java file with metadata about this build.">
 		<property name="buildinfo.file" 
 			value="${bigdata.dir}\bigdata\src\java\com\bigdata\BuildInfo.java"/>

Modified: branches/TERMS_REFACTOR_BRANCH/build.xml
===================================================================
--- branches/TERMS_REFACTOR_BRANCH/build.xml	2011-07-05 16:24:31 UTC (rev 4840)
+++ branches/TERMS_REFACTOR_BRANCH/build.xml	2011-07-05 16:42:44 UTC (rev 4841)
@@ -105,6 +105,8 @@
 		</condition>
 		<!--<echo message="today=${today}"/>-->
 		<echo message="version=${version}" />
+		<available property="svn.checkout" file="./.svn/entries"/>
+		<echo message="svn.checkout=${svn.checkout}" />
 		<!-- create directories. -->
 		<mkdir dir="${build.dir}" />
 		<mkdir dir="${build.dir}/classes" />
@@ -112,7 +114,7 @@
 		<mkdir dir="${build.dir}/lib" />
 	</target>
 
-	<target name="buildinfo"
+	<target name="buildinfo" depends="prepare" if="svn.checkout"
 		description="Generate a BuildInfo.java file with metadata about this build.">
 		<property name="buildinfo.file" 
 			value="${bigdata.dir}\bigdata\src\java\com\bigdata\BuildInfo.java"/>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.