incubator-hama-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From edwardy...@apache.org
Subject svn commit: r1085825 - in /incubator/hama/trunk: CHANGES.txt build.xml
Date Sat, 26 Mar 2011 23:17:20 GMT
Author: edwardyoon
Date: Sat Mar 26 23:17:20 2011
New Revision: 1085825

URL: http://svn.apache.org/viewvc?rev=1085825&view=rev
Log:
Add a parameter to build.xml to allow developers deciding to reset content in conf files or
not when building artifacts.

Modified:
    incubator/hama/trunk/CHANGES.txt
    incubator/hama/trunk/build.xml

Modified: incubator/hama/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/incubator/hama/trunk/CHANGES.txt?rev=1085825&r1=1085824&r2=1085825&view=diff
==============================================================================
--- incubator/hama/trunk/CHANGES.txt (original)
+++ incubator/hama/trunk/CHANGES.txt Sat Mar 26 23:17:20 2011
@@ -52,6 +52,8 @@ Trunk (unreleased changes)
 
   IMPROVEMENTS
  
+    HAMA-371: Add a parameter to build.xml to allow developers deciding to reset content

+                       in conf files or not when building artifacts (ChiaHung Lin)
     HAMA-369: Reduce overhead of local communications (Miklos Erdelyi)
     HAMA-366: Remove unnecessary dependencies (Tommaso Teofili)
     HAMA-365: TestBSPPeer doesn't check if the correct 

Modified: incubator/hama/trunk/build.xml
URL: http://svn.apache.org/viewvc/incubator/hama/trunk/build.xml?rev=1085825&r1=1085824&r2=1085825&view=diff
==============================================================================
--- incubator/hama/trunk/build.xml (original)
+++ incubator/hama/trunk/build.xml Sat Mar 26 23:17:20 2011
@@ -79,7 +79,7 @@
 
 	<taskdef name="findbugs" classpathref="classpath" classname="edu.umd.cs.findbugs.anttask.FindBugsTask"
/>
 
-	<target name="init">
+	<target name="pre-init">
 		<mkdir dir="${build.dir}" />
 		<mkdir dir="${build.classes}" />
 		<mkdir dir="${build.test}" />
@@ -92,19 +92,28 @@
 			<fileset dir="${lib.dir}" />
 		</copy>
 		
-	    <tempfile property="touch.temp.file" destDir="${java.io.tmpdir}"/>
-	    <touch millis="0" file="${touch.temp.file}">
-	      <fileset dir="${conf.dir}" includes="**/*.template"/>
-	    </touch>
-	    <delete file="${touch.temp.file}"/>
-
-	    <copy todir="${conf.dir}" verbose="true">
-	      <fileset dir="${conf.dir}" includes="**/*.template"/>
-	      <mapper type="glob" from="*.template" to="*"/>
-	    </copy>
+		<tempfile property="touch.temp.file" destDir="${java.io.tmpdir}"/>
+		<touch millis="0" file="${touch.temp.file}">
+			<fileset dir="${conf.dir}" includes="**/*.template"/>
+		</touch>
+		<delete file="${touch.temp.file}"/>
+	</target>
+
+	<target name="pre-init-reset-conf" unless="to.reset.conf" depends="eval.reset.conf">
+		<copy todir="${conf.dir}" verbose="true">
+			<fileset dir="${conf.dir}" includes="**/*.template"/>
+			<mapper type="glob" from="*.template" to="*"/>
+		</copy>
+	</target>
 
+	<target name="eval.reset.conf" >
+		<condition property="to.reset.conf">
+			<equals arg1="${resetconf}" arg2="false"/>
+		</condition>
 	</target>
 
+	<target name="init" depends="pre-init, pre-init-reset-conf"/>
+
 	<!-- ================================================================== -->
 	<!-- Java Compiler Compiler, generate Parsers                           -->
 	<!-- ================================================================== -->



Mime
View raw message