You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pig.apache.org by da...@apache.org on 2009/10/15 00:13:05 UTC

svn commit: r825309 - in /hadoop/pig/branches/branch-0.5: CHANGES.txt build.xml

Author: daijy
Date: Wed Oct 14 22:13:05 2009
New Revision: 825309

URL: http://svn.apache.org/viewvc?rev=825309&view=rev
Log:
PIG-1020: Include an ant target to build pig.jar without hadoop libraries

Modified:
    hadoop/pig/branches/branch-0.5/CHANGES.txt
    hadoop/pig/branches/branch-0.5/build.xml

Modified: hadoop/pig/branches/branch-0.5/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/pig/branches/branch-0.5/CHANGES.txt?rev=825309&r1=825308&r2=825309&view=diff
==============================================================================
--- hadoop/pig/branches/branch-0.5/CHANGES.txt (original)
+++ hadoop/pig/branches/branch-0.5/CHANGES.txt Wed Oct 14 22:13:05 2009
@@ -23,6 +23,7 @@
 INCOMPATIBLE CHANGES
 
 IMPROVEMENTS
+PIG-1020: Include an ant target to build pig.jar without hadoop libraries (daijy)
 
 OPTIMIZATIONS
 

Modified: hadoop/pig/branches/branch-0.5/build.xml
URL: http://svn.apache.org/viewvc/hadoop/pig/branches/branch-0.5/build.xml?rev=825309&r1=825308&r2=825309&view=diff
==============================================================================
--- hadoop/pig/branches/branch-0.5/build.xml (original)
+++ hadoop/pig/branches/branch-0.5/build.xml Wed Oct 14 22:13:05 2009
@@ -375,6 +375,15 @@
         <antcall target="jarWithOutSvn" inheritRefs="true" inheritall="true"/>
     </target>
     
+    <target name="jar-withouthadoop" depends="compile" description="Create pig jar">
+        <antcall target="jarWithSvn" inheritRefs="true" inheritall="true">
+            <param name="nohadooplib" value="yes" />
+        </antcall>
+        <antcall target="jarWithOutSvn" inheritRefs="true" inheritall="true">
+            <param name="nohadooplib" value="yes" />
+        </antcall>
+    </target>
+
     <target name="jarWithSvn" if="svn.revision">
         <antcall target="buildJar" inheritRefs="true" inheritall="true">
             <param name="svnString" value="${svn.revision}" />
@@ -413,7 +422,9 @@
                     <attribute name="Svn-Revision" value="${svnString}" />
                 </section>
             </manifest>
-            <zipfileset src="${lib.dir}/${hadoop.jarfile}" />
+            <zipfileset src="${lib.dir}/${hadoop.jarfile}">
+                <exclude name="**" if="nohadooplib"/>
+            </zipfileset>
             <zipfileset src="${ivy.lib.dir}/junit-${junit.version}.jar" />
             <zipfileset src="${ivy.lib.dir}/jsch-${jsch.version}.jar" />
             <zipfileset src="${ivy.lib.dir}/jline-${jline.version}.jar" />
@@ -424,11 +435,11 @@
     <!-- ================================================================== -->
     <!-- Run unit tests                                                     -->
     <!-- ================================================================== -->
-    <target name="test-core" depends="compile-test,jar" description="Run full set of unit tests">
+    <target name="test-core" depends="compile-test,jar-withouthadoop" description="Run full set of unit tests">
         <macro-test-runner test.file="${test.all.file}" />
     </target>
 
-    <target name="test-commit" depends="compile-test,jar" description="Run approximate 10-minute set of unit tests prior to commiting">
+    <target name="test-commit" depends="compile-test,jar-withouthadoop" description="Run approximate 10-minute set of unit tests prior to commiting">
         <macro-test-runner test.file="${test.commit.file}" />
     </target>