You are viewing a plain text version of this content. The canonical link for it is here.
Posted to mapreduce-commits@hadoop.apache.org by cd...@apache.org on 2009/11/03 08:50:22 UTC
svn commit: r832327 - in /hadoop/mapreduce/branches/branch-0.21: CHANGES.txt
src/contrib/mumak/build.xml
Author: cdouglas
Date: Tue Nov 3 07:50:22 2009
New Revision: 832327
URL: http://svn.apache.org/viewvc?rev=832327&view=rev
Log:
MAPREDUCE-1038. Weave Mumak aspects only if related files have changed.
Contributed by Aaron Kimball
Modified:
hadoop/mapreduce/branches/branch-0.21/CHANGES.txt
hadoop/mapreduce/branches/branch-0.21/src/contrib/mumak/build.xml
Modified: hadoop/mapreduce/branches/branch-0.21/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.21/CHANGES.txt?rev=832327&r1=832326&r2=832327&view=diff
==============================================================================
--- hadoop/mapreduce/branches/branch-0.21/CHANGES.txt (original)
+++ hadoop/mapreduce/branches/branch-0.21/CHANGES.txt Tue Nov 3 07:50:22 2009
@@ -785,3 +785,6 @@
queue capacity. (Rahul Kumar Singh via yhemanth)
MAPREDUCE-1016. Make the job history log format JSON. (cutting)
+
+ MAPREDUCE-1038. Weave Mumak aspects only if related files have changed.
+ (Aaron Kimball via cdouglas)
Modified: hadoop/mapreduce/branches/branch-0.21/src/contrib/mumak/build.xml
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.21/src/contrib/mumak/build.xml?rev=832327&r1=832326&r2=832327&view=diff
==============================================================================
--- hadoop/mapreduce/branches/branch-0.21/src/contrib/mumak/build.xml (original)
+++ hadoop/mapreduce/branches/branch-0.21/src/contrib/mumak/build.xml Tue Nov 3 07:50:22 2009
@@ -30,6 +30,7 @@
<property name="javac.version" value="1.6"/>
<property name="javac.args.warnings" value="-Xlint:unchecked"/>
<import file="../build-contrib.xml"/>
+ <property name="mumak.stamp.file" value="${build.dir}/mumak.uptodate.stamp"/>
<target name="compile-java-sources" depends="init, ivy-retrieve-common" unless="skip.contrib">
<echo message="contrib: ${name}"/>
@@ -68,6 +69,7 @@
deprecation="${javac.deprecation}">
<classpath refid="contrib-classpath"/>
</iajc>
+ <touch file="${mumak.stamp.file}" mkdirs="true" />
<echo message="Weaving of aspects is finished"/>
</target>
@@ -94,7 +96,7 @@
<include name="*.jar"/>
</fileset>
</copy>
- <exec executable="sed">
+ <exec executable="sed">
<arg value="-i"/>
<arg value="-e"/>
<arg value="s/^HADOOP_VERSION=/HADOOP_VERSION=${version}/"/>
@@ -104,14 +106,13 @@
</target>
<target name="check.aspects">
- <uptodate property="build.unnecessary"
- targetfile="${build.dir}/${dest.jar}" >
- <srcfiles dir="${hadoop.root}/src/java/"
- includes="org/apache/hadoop/**/*.java" />
- <srcfiles dir="${hadoop.root}/build/src/"
- includes="org/apache/hadoop/**/*.java" />
- <srcfiles dir="${src.dir}"
- includes="org/apache/hadoop/**/*.java, org/apache/hadoop/**/*.aj" />
+ <uptodate property="build.unnecessary"
+ targetfile="${mumak.stamp.file}">
+ <srcfiles dir="${hadoop.root}/src/java/"
+ includes="org/apache/hadoop/**/*.java" />
+ <srcfiles dir="${hadoop.root}/src/webapps/"
+ includes="**/*.jsp" />
+ <srcfiles dir="${src.dir}" includes="org/apache/hadoop/**/*.aj" />
</uptodate>
</target>