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 2011/09/21 23:27:55 UTC
svn commit: r1173873 - in /pig/branches/branch-0.9: CHANGES.txt bin/pig
build.xml
Author: daijy
Date: Wed Sep 21 21:27:54 2011
New Revision: 1173873
URL: http://svn.apache.org/viewvc?rev=1173873&view=rev
Log:
PIG-2270: Put jython.jar in classpath
Modified:
pig/branches/branch-0.9/CHANGES.txt
pig/branches/branch-0.9/bin/pig
pig/branches/branch-0.9/build.xml
Modified: pig/branches/branch-0.9/CHANGES.txt
URL: http://svn.apache.org/viewvc/pig/branches/branch-0.9/CHANGES.txt?rev=1173873&r1=1173872&r2=1173873&view=diff
==============================================================================
--- pig/branches/branch-0.9/CHANGES.txt (original)
+++ pig/branches/branch-0.9/CHANGES.txt Wed Sep 21 21:27:54 2011
@@ -22,6 +22,8 @@ Release 0.9.1 - Unreleased
IMPROVEMENTS
+PIG-2270: Put jython.jar in classpath (daijy)
+
PIG-2284: Add pig-setup-conf.sh script (eyang via daijy)
PIG-2272: e2e test harness should be able to set HADOOP_HOME (gates via daijy)
@@ -35,6 +37,7 @@ PIG-2213: Pig 0.9.1 Documentation (chand
PIG-2221: Couldnt find documentation for ColumnMapKeyPrune optimization rule (chandec via daijy)
BUG FIXES
+
PIG-2274: remove pig deb package dependency on sun-java6-jre (gkesavan via daijy)
Release 0.9.0 - Unreleased
Modified: pig/branches/branch-0.9/bin/pig
URL: http://svn.apache.org/viewvc/pig/branches/branch-0.9/bin/pig?rev=1173873&r1=1173872&r2=1173873&view=diff
==============================================================================
--- pig/branches/branch-0.9/bin/pig (original)
+++ pig/branches/branch-0.9/bin/pig Wed Sep 21 21:27:54 2011
@@ -73,7 +73,7 @@ fi
if [ ${#PIG_CONF_DIR} -eq 0 ]; then
if [ -d /etc/pig ]; then
# if installed with rpm/deb package
- PIG_CONF_DIR="/etc/pig}"
+ PIG_CONF_DIR="/etc/pig"
fi
fi
@@ -112,6 +112,13 @@ fi
# so that filenames w/ spaces are handled correctly in loops below
IFS=
+for f in $PIG_HOME/lib/*.jar; do
+ CLASSPATH=${CLASSPATH}:$f;
+done
+
+for f in $PIG_HOME/share/pig/lib/*.jar; do
+ CLASSPATH=${CLASSPATH}:$f;
+done
shopt -s nullglob
shopt -s extglob
@@ -216,8 +223,8 @@ if [ ${#HADOOP_BIN} -ne 0 ]; then
exit 1
fi
- HADOOP_CLASSPATH=$CLASSPATH:$HADOOP_CLASSPATH
- HADOOP_OPTS="$JAVA_HEAP_MAX $PIG_OPTS $HADOOP_OPTS"
+ export HADOOP_CLASSPATH=$CLASSPATH:$HADOOP_CLASSPATH
+ export HADOOP_OPTS="$JAVA_HEAP_MAX $PIG_OPTS $HADOOP_OPTS"
COMMAND_LINE="$HADOOP_BIN jar $PIG_JAR ${remaining[@]}"
if [ "$debug" == "true" ]; then
echo "dry run:"
Modified: pig/branches/branch-0.9/build.xml
URL: http://svn.apache.org/viewvc/pig/branches/branch-0.9/build.xml?rev=1173873&r1=1173872&r2=1173873&view=diff
==============================================================================
--- pig/branches/branch-0.9/build.xml (original)
+++ pig/branches/branch-0.9/build.xml Wed Sep 21 21:27:54 2011
@@ -791,13 +791,14 @@
<mkdir dir="${dist.dir}/etc/pig" />
<mkdir dir="${dist.dir}/share/pig/scripts" />
<mkdir dir="${dist.dir}/share/pig/templates/conf" />
+ <mkdir dir="${dist.dir}/share/pig/lib" />
<mkdir dir="${dist.dir}/share/doc/pig" />
<mkdir dir="${dist.dir}/share/doc/pig/api" />
<mkdir dir="${dist.dir}/share/doc/pig/jdiff"/>
<mkdir dir="${dist.dir}/share/doc/pig/license" />
- <copy todir="${dist.dir}/lib/jdiff" includeEmptyDirs="false">
- <fileset dir="${lib.dir}/jdiff"/>
+ <copy todir="${dist.dir}/share/pig/lib">
+ <fileset dir="${ivy.lib.dir}" includes="jython*.jar"/>
</copy>
<copy file="${output.jarfile.backcompat.withouthadoop}" tofile="${dist.dir}/share/pig/${final.name}-withouthadoop.jar" />
@@ -867,6 +868,10 @@
<fileset dir="${lib.dir}"/>
</copy>
+ <copy todir="${dist.dir}/lib">
+ <fileset dir="${ivy.lib.dir}" includes="jython*.jar"/>
+ </copy>
+
<copy file="${output.jarfile.backcompat.withouthadoop}" tofile="${dist.dir}/${final.name}-withouthadoop.jar" />
<copy file="${output.jarfile.backcompat}" tofile="${dist.dir}/${final.name}-all.jar" />