pig-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From da...@apache.org
Subject svn commit: r1173872 - in /pig/trunk: CHANGES.txt bin/pig build.xml
Date Wed, 21 Sep 2011 21:25:55 GMT
Author: daijy
Date: Wed Sep 21 21:25:55 2011
New Revision: 1173872

URL: http://svn.apache.org/viewvc?rev=1173872&view=rev
Log:
PIG-2270: Put jython.jar in classpath

Modified:
    pig/trunk/CHANGES.txt
    pig/trunk/bin/pig
    pig/trunk/build.xml

Modified: pig/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/pig/trunk/CHANGES.txt?rev=1173872&r1=1173871&r2=1173872&view=diff
==============================================================================
--- pig/trunk/CHANGES.txt (original)
+++ pig/trunk/CHANGES.txt Wed Sep 21 21:25:55 2011
@@ -257,6 +257,8 @@ PIG-2221: Couldnt find documentation for
 
 BUG FIXES
 
+PIG-2270: Put jython.jar in classpath (daijy)
+
 PIG-2274: remove pig deb package dependency on sun-java6-jre (gkesavan via daijy)
 
 PIG-2264: Change conf/log4j.properties to conf/log4j.properties.template (daijy)

Modified: pig/trunk/bin/pig
URL: http://svn.apache.org/viewvc/pig/trunk/bin/pig?rev=1173872&r1=1173871&r2=1173872&view=diff
==============================================================================
--- pig/trunk/bin/pig (original)
+++ pig/trunk/bin/pig Wed Sep 21 21:25:55 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/trunk/build.xml
URL: http://svn.apache.org/viewvc/pig/trunk/build.xml?rev=1173872&r1=1173871&r2=1173872&view=diff
==============================================================================
--- pig/trunk/build.xml (original)
+++ pig/trunk/build.xml Wed Sep 21 21:25:55 2011
@@ -795,13 +795,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"
/>
@@ -871,6 +872,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"
/>



Mime
View raw message