hadoop-mapreduce-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cdoug...@apache.org
Subject svn commit: r937922 - in /hadoop/mapreduce/trunk: CHANGES.txt build-utils.xml
Date Mon, 26 Apr 2010 03:53:50 GMT
Author: cdouglas
Date: Mon Apr 26 03:53:49 2010
New Revision: 937922

URL: http://svn.apache.org/viewvc?rev=937922&view=rev
Log:
MAPREDUCE-1515. Accept java5.home from build.properties, not only from the
command line when building forrest docs. Contributed by Al Thompson

Modified:
    hadoop/mapreduce/trunk/CHANGES.txt
    hadoop/mapreduce/trunk/build-utils.xml

Modified: hadoop/mapreduce/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/trunk/CHANGES.txt?rev=937922&r1=937921&r2=937922&view=diff
==============================================================================
--- hadoop/mapreduce/trunk/CHANGES.txt (original)
+++ hadoop/mapreduce/trunk/CHANGES.txt Mon Apr 26 03:53:49 2010
@@ -570,6 +570,9 @@ Trunk (unreleased changes)
 
     MAPREDUCE-1622. Include missing slf4j dependencies. (cdouglas)
 
+    MAPREDUCE-1515. Accept java5.home from build.properties, not only from the
+    command line when building forrest docs. (Al Thompson via cdouglas)
+
 Release 0.21.0 - Unreleased
 
   INCOMPATIBLE CHANGES

Modified: hadoop/mapreduce/trunk/build-utils.xml
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/trunk/build-utils.xml?rev=937922&r1=937921&r2=937922&view=diff
==============================================================================
--- hadoop/mapreduce/trunk/build-utils.xml (original)
+++ hadoop/mapreduce/trunk/build-utils.xml Mon Apr 26 03:53:49 2010
@@ -22,12 +22,16 @@ Contains utilities that are common for t
 -->
 <project name="build-utils">
 
+  <!-- Load properties from build properties file, if available -->
+  <dirname property="build-utils.basedir" file="${ant.file.build-utils}"/>
+  <property file="${build-utils.basedir}/build.properties"/>
+
   <target name="java5.check" unless="java5.home">
-    <fail message="'java5.home' is not defined.  Forrest requires Java 5.  Please pass
-Djava5.home=&lt;base of Java 5 distribution&gt; to Ant on the command-line." />
+    <fail message="'java5.home' is not defined.  Forrest requires Java 5.  Please pass
-Djava5.home=&lt;base of Java 5 distribution&gt; to Ant on the command-line, or set
java5.home in build properties file." />
   </target>
 	
   <target name="forrest.check" unless="forrest.home" depends="java5.check">
-    <fail message="'forrest.home' is not defined. Please pass -Dforrest.home=&lt;base
of Apache Forrest installation&gt; to Ant on the command-line." />
+    <fail message="'forrest.home' is not defined. Please pass -Dforrest.home=&lt;base
of Apache Forrest installation&gt; to Ant on the command-line, or set forest.home in build
properties file." />
   </target>
   
-</project>
\ No newline at end of file
+</project>



Mime
View raw message