You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@bigtop.apache.org by rv...@apache.org on 2011/10/19 23:55:49 UTC

svn commit: r1186520 - in /incubator/bigtop/trunk: bigtop-packages/src/common/pig/do-component-build bigtop-packages/src/common/pig/install_pig.sh bigtop-packages/src/deb/pig/rules bigtop-packages/src/rpm/pig/SPECS/pig.spec bigtop.mk

Author: rvs
Date: Wed Oct 19 21:55:49 2011
New Revision: 1186520

URL: http://svn.apache.org/viewvc?rev=1186520&view=rev
Log:
BIGTOP-120. Bump version of pig to 0.9.1

Modified:
    incubator/bigtop/trunk/bigtop-packages/src/common/pig/do-component-build
    incubator/bigtop/trunk/bigtop-packages/src/common/pig/install_pig.sh
    incubator/bigtop/trunk/bigtop-packages/src/deb/pig/rules
    incubator/bigtop/trunk/bigtop-packages/src/rpm/pig/SPECS/pig.spec
    incubator/bigtop/trunk/bigtop.mk

Modified: incubator/bigtop/trunk/bigtop-packages/src/common/pig/do-component-build
URL: http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/common/pig/do-component-build?rev=1186520&r1=1186519&r2=1186520&view=diff
==============================================================================
--- incubator/bigtop/trunk/bigtop-packages/src/common/pig/do-component-build (original)
+++ incubator/bigtop/trunk/bigtop-packages/src/common/pig/do-component-build Wed Oct 19 21:55:49 2011
@@ -16,6 +16,6 @@
 
 set -ex
 
-ant -Djavac.version=1.6 -Djava5.home=${JAVA5_HOME} -Dforrest.home=${FORREST_HOME} -Ddist.dir=debian/tmp -Dversion=${PIG_BASE_VERSION} package "$@"
+ant -Djavac.version=1.6 -Djava5.home=${JAVA5_HOME} -Dforrest.home=${FORREST_HOME} -Dversion=${PIG_BASE_VERSION} package "$@"
 
 

Modified: incubator/bigtop/trunk/bigtop-packages/src/common/pig/install_pig.sh
URL: http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/common/pig/install_pig.sh?rev=1186520&r1=1186519&r2=1186520&view=diff
==============================================================================
--- incubator/bigtop/trunk/bigtop-packages/src/common/pig/install_pig.sh (original)
+++ incubator/bigtop/trunk/bigtop-packages/src/common/pig/install_pig.sh Wed Oct 19 21:55:49 2011
@@ -133,6 +133,7 @@ install -d -m 0755 $DOC_DIR
 (cd $BUILD_DIR/docs && tar -cf - .)|(cd $DOC_DIR && tar -xf -)
 
 install -d -m 0755 $EXAMPLES_DIR
+(cd $LIB_DIR ; mv pig*withouthadoop.jar `echo pig*withouthadoop.jar | sed -e 's#withouthadoop#core#'`)
 PIG_JAR=$(basename $(ls $LIB_DIR/pig*core.jar))
 sed -i -e "s|../pig.jar|/usr/lib/pig/$PIG_JAR|" $BUILD_DIR/tutorial/build.xml
 (cd $BUILD_DIR/tutorial && tar -cf - .)|(cd $EXAMPLES_DIR && tar -xf -)

Modified: incubator/bigtop/trunk/bigtop-packages/src/deb/pig/rules
URL: http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/deb/pig/rules?rev=1186520&r1=1186519&r2=1186520&view=diff
==============================================================================
--- incubator/bigtop/trunk/bigtop-packages/src/deb/pig/rules (original)
+++ incubator/bigtop/trunk/bigtop-packages/src/deb/pig/rules Wed Oct 19 21:55:49 2011
@@ -49,7 +49,7 @@ install-indep:	
 	cp debian/*.properties .
 	cp debian/pig.1 .
 	sh -x debian/install_pig.sh \
-	  --build-dir=debian/tmp \
+	  --build-dir=build/pig-${PIG_VERSION} \
 	  --prefix=debian/hadoop-pig \
           --doc-dir=debian/hadoop-pig/usr/share/doc/hadoop-pig \
           --examples-dir=debian/hadoop-pig/usr/share/doc/hadoop-pig/examples

Modified: incubator/bigtop/trunk/bigtop-packages/src/rpm/pig/SPECS/pig.spec
URL: http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/rpm/pig/SPECS/pig.spec?rev=1186520&r1=1186519&r2=1186520&view=diff
==============================================================================
--- incubator/bigtop/trunk/bigtop-packages/src/rpm/pig/SPECS/pig.spec (original)
+++ incubator/bigtop/trunk/bigtop-packages/src/rpm/pig/SPECS/pig.spec Wed Oct 19 21:55:49 2011
@@ -122,7 +122,7 @@ cp $RPM_SOURCE_DIR/log4j.properties .
 cp $RPM_SOURCE_DIR/pig.1 .
 cp $RPM_SOURCE_DIR/pig.properties .
 sh -x %{SOURCE2} \
-          --build-dir=. \
+          --build-dir=build/pig-%{pig_version} \
           --doc-dir=$RPM_BUILD_ROOT%{doc_pig} \
           --prefix=$RPM_BUILD_ROOT
 

Modified: incubator/bigtop/trunk/bigtop.mk
URL: http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop.mk?rev=1186520&r1=1186519&r2=1186520&view=diff
==============================================================================
--- incubator/bigtop/trunk/bigtop.mk (original)
+++ incubator/bigtop/trunk/bigtop.mk Wed Oct 19 21:55:49 2011
@@ -52,7 +52,7 @@ HBASE_SITE=$(APACHE_MIRROR)/hbase/hbase-
 $(eval $(call PACKAGE,hbase,HBASE))
 
 # Pig
-PIG_BASE_VERSION=0.9.0
+PIG_BASE_VERSION=0.9.1
 PIG_PKG_VERSION=$(PIG_BASE_VERSION)
 PIG_RELEASE_VERSION=1
 PIG_NAME=pig