You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pig.apache.org by sz...@apache.org on 2017/08/01 08:57:19 UTC
svn commit: r1803628 - in /pig/trunk: CHANGES.txt build.xml
Author: szita
Date: Tue Aug 1 08:57:19 2017
New Revision: 1803628
URL: http://svn.apache.org/viewvc?rev=1803628&view=rev
Log:
building "jar" should not call "clean" (nkollar via szita)
Modified:
pig/trunk/CHANGES.txt
pig/trunk/build.xml
Modified: pig/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/pig/trunk/CHANGES.txt?rev=1803628&r1=1803627&r2=1803628&view=diff
==============================================================================
--- pig/trunk/CHANGES.txt (original)
+++ pig/trunk/CHANGES.txt Tue Aug 1 08:57:19 2017
@@ -40,6 +40,8 @@ OPTIMIZATIONS
BUG FIXES
+PIG-5276: building "jar" should not call "clean" (nkollar via szita)
+
PIG-5246: Modify bin/pig about SPARK_HOME, SPARK_ASSEMBLY_JAR after upgrading spark to 2 (liyunzhang)
PIG-3655: BinStorage and InterStorage approach to record markers is broken (szita)
Modified: pig/trunk/build.xml
URL: http://svn.apache.org/viewvc/pig/trunk/build.xml?rev=1803628&r1=1803627&r2=1803628&view=diff
==============================================================================
--- pig/trunk/build.xml (original)
+++ pig/trunk/build.xml Tue Aug 1 08:57:19 2017
@@ -454,6 +454,10 @@
<ant dir="${test.e2e.dir}" target="clean"/>
</target>
+ <target name="clean-deps" description="Cleanup dependencies">
+ <delete dir="${lib.dir}" />
+ </target>
+
<target name="very-clean" unless="offline" depends="ivy-clean-cache,jackson-pig-3039-test-clean,clean"
description="Clean build artifacts and flush Ivy cache" />
@@ -798,14 +802,14 @@
<target name="jar" description="Create pig jar with Spark 1 and 2">
<echo>Compiling against Spark 2</echo>
- <antcall target="clean" inheritRefs="true" inheritall="true"/>
+ <antcall target="clean-deps" inheritRefs="true" inheritall="true"/>
<propertyreset name="sparkversion" value="2"/>
<propertyreset name="src.exclude.dir" value="**/Spark1*.java" />
<antcall target="jar-core" inheritRefs="true" inheritall="true"/>
<move file="${output.jarfile.core}" tofile="${basedir}/_pig-shims.jar"/>
<echo>Compiling against Spark 1</echo>
- <antcall target="clean" inheritRefs="true" inheritall="true"/>
+ <antcall target="clean-deps" inheritRefs="true" inheritall="true"/>
<propertyreset name="sparkversion" value="1"/>
<propertyreset name="src.exclude.dir" value="**/Spark2*.java" />
<antcall target="jar-simple" inheritRefs="true" inheritall="true"/>