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/04/25 00:48:26 UTC
svn commit: r1589902 - in /pig/trunk: CHANGES.txt bin/pig.cmd build.xml
Author: daijy
Date: Thu Apr 24 22:48:25 2014
New Revision: 1589902
URL: http://svn.apache.org/r1589902
Log:
PIG-3737: Bundle dependent jars in distribution in %PIG_HOME%/lib folder
Modified:
pig/trunk/CHANGES.txt
pig/trunk/bin/pig.cmd
pig/trunk/build.xml
Modified: pig/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/pig/trunk/CHANGES.txt?rev=1589902&r1=1589901&r2=1589902&view=diff
==============================================================================
--- pig/trunk/CHANGES.txt (original)
+++ pig/trunk/CHANGES.txt Thu Apr 24 22:48:25 2014
@@ -32,6 +32,8 @@ PIG-2207: Support custom counters for ag
IMPROVEMENTS
+PIG-3737: Bundle dependent jars in distribution in %PIG_HOME%/lib folder (daijy)
+
PIG-3771: Piggybank Avrostorage makes a lot of namenode calls in the backend (rohini)
PIG-3851: Upgrade jline to 2.11 (daijy)
Modified: pig/trunk/bin/pig.cmd
URL: http://svn.apache.org/viewvc/pig/trunk/bin/pig.cmd?rev=1589902&r1=1589901&r2=1589902&view=diff
==============================================================================
--- pig/trunk/bin/pig.cmd (original)
+++ pig/trunk/bin/pig.cmd Thu Apr 24 22:48:25 2014
@@ -93,6 +93,9 @@ set PIGARGS=
for %%i in (%PIG_HOME%\*.jar) do (
set CLASSPATH=!CLASSPATH!;%%i
)
+ for %%i in (%PIG_HOME%\lib\*.jar) do (
+ set CLASSPATH=!CLASSPATH!;%%i
+ )
if not defined PIG_CONF_DIR (
set PIG_CONF_DIR=%PIG_HOME%\conf
)
Modified: pig/trunk/build.xml
URL: http://svn.apache.org/viewvc/pig/trunk/build.xml?rev=1589902&r1=1589901&r2=1589902&view=diff
==============================================================================
--- pig/trunk/build.xml (original)
+++ pig/trunk/build.xml Thu Apr 24 22:48:25 2014
@@ -966,14 +966,24 @@
</copy>
<copy todir="${tar.dist.dir}/lib">
- <fileset dir="${ivy.lib.dir}" includes="jython*.jar"/>
- <fileset dir="${ivy.lib.dir}" includes="jruby*.jar"/>
+ <fileset dir="${ivy.lib.dir}" includes="jython-*.jar"/>
+ <fileset dir="${ivy.lib.dir}" includes="jruby-*.jar"/>
+ <fileset dir="${ivy.lib.dir}" includes="groovy-*.jar"/>
+ <fileset dir="${ivy.lib.dir}" includes="js-*.jar"/>
+ <fileset dir="${ivy.lib.dir}" includes="hbase-*.jar" excludes="hbase-*tests.jar"/>
+ <fileset dir="${ivy.lib.dir}" includes="protobuf-java-*.jar"/>
+ <fileset dir="${ivy.lib.dir}" includes="zookeeper-*.jar"/>
+ <fileset dir="${ivy.lib.dir}" includes="accumulo-*.jar" excludes="accumulo-minicluster*.jar"/>
+ <fileset dir="${ivy.lib.dir}" includes="avro-*.jar" excludes="avro-*tests.jar"/>
+ <fileset dir="${ivy.lib.dir}" includes="json-simple-*.jar"/>
</copy>
<copy file="${output.jarfile.backcompat.withouthadoop}" tofile="${tar.dist.dir}/${final.name}-withouthadoop.jar" />
<copy file="${output.jarfile.backcompat}" tofile="${tar.dist.dir}/${final.name}.jar" />
+ <copy todir="${tar.dist.dir}/lib" file="contrib/piggybank/java/piggybank.jar"/>
+
<copy todir="${tar.dist.dir}/" file="ivy.xml" />
<copy todir="${tar.dist.dir}/ivy">