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 2014/07/28 23:25:59 UTC
svn commit: r1614186 - in /pig/trunk: build.xml
contrib/piggybank/java/build.xml
Author: daijy
Date: Mon Jul 28 21:25:58 2014
New Revision: 1614186
URL: http://svn.apache.org/r1614186
Log:
PIG-4054: Do not create job.jar when submitting job (PIG-4054-5.patch)
Modified:
pig/trunk/build.xml
pig/trunk/contrib/piggybank/java/build.xml
Modified: pig/trunk/build.xml
URL: http://svn.apache.org/viewvc/pig/trunk/build.xml?rev=1614186&r1=1614185&r2=1614186&view=diff
==============================================================================
--- pig/trunk/build.xml (original)
+++ pig/trunk/build.xml Mon Jul 28 21:25:58 2014
@@ -555,7 +555,7 @@
</copy>
</target>
- <target name="compile-test" depends="compile, ivy-test">
+ <target name="compile-test" depends="jar, ivy-test">
<echo>*** Building Test Sources ***</echo>
<echo>*** To compile with all warnings enabled, supply -Dall.warnings=1 on command line ***</echo>
<echo>*** Else, you will only be warned about deprecations ***</echo>
Modified: pig/trunk/contrib/piggybank/java/build.xml
URL: http://svn.apache.org/viewvc/pig/trunk/contrib/piggybank/java/build.xml?rev=1614186&r1=1614185&r2=1614186&view=diff
==============================================================================
--- pig/trunk/contrib/piggybank/java/build.xml (original)
+++ pig/trunk/contrib/piggybank/java/build.xml Mon Jul 28 21:25:58 2014
@@ -33,8 +33,6 @@
<property name="build.classes" value="${build.dir}/classes" />
<property name="build.docs" value="${build.dir}/docs" />
<property name="build.javadoc" value="${build.docs}/api" />
- <property name="pigjar" value="../../../pig.jar" />
- <property name="pigjar-withouthadoop" value="../../../pig-withouthadoop.jar" />
<property name="pigtest" value="../../../build/test/classes" />
<property name="udfjar" value="piggybank.jar" />
<property name="src.dir" value="src/main/java/org/apache/pig/piggybank" />
@@ -47,7 +45,11 @@
<condition property="test.classes.excludes" value="**/TestHadoopJobHistoryLoader.java" else="">
<equals arg1="${hadoopversion}" arg2="23"/>
</condition>
-
+
+ <condition property="hadoopsuffix" value="2" else="1">
+ <equals arg1="${hadoopversion}" arg2="23"/>
+ </condition>
+
<!-- jar properties -->
<property name=".javadoc" value="${build.docs}/api" />
@@ -62,7 +64,9 @@
<path id="pigudf.classpath">
<pathelement location="../../../build/classes"/>
<pathelement location="${build.classes}"/>
- <pathelement location="${pigjar-withouthadoop}"/>
+ <fileset dir="../../..">
+ <include name="pig-*-core-h${hadoopsuffix}.jar"/>
+ </fileset>
<pathelement location="${pigtest}"/>
<fileset dir="../../../build/ivy/lib">
<include name="**/*.jar"/>