Author: rvs
Date: Thu Jun 21 18:15:34 2012
New Revision: 1352640
URL: http://svn.apache.org/viewvc?rev=1352640&view=rev
Log:
BIGTOP-608. remove source/build artifacts from the Pig package
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
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=1352640&r1=1352639&r2=1352640&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
Thu Jun 21 18:15:34 2012
@@ -29,4 +29,11 @@ hadoop-hdfs.version=$HADOOP_VERSION
hadoop-mapreduce.version=$HADOOP_VERSION
__EOT__
-ant -Djavac.version=1.6 -Dforrest.home=${FORREST_HOME}
-Dversion=${PIG_VERSION} -Dhadoopversion=23 package "$@"
+BUILD_OPTS="-Djavac.version=1.6 -Dforrest.home=${FORREST_HOME}
-Dversion=${PIG_VERSION} -Dhadoopversion=23"
+
+rm test/org/apache/pig/test/TestHBaseStorage.java
+ant $BUILD_OPTS clean jar jar-withouthadoop pigunit-jar smoketests-jar "$@"
+for build_file in contrib/piggybank/java/build.xml
contrib/penny/java/build.xml contrib/zebra/build.xml ; do
+ ant $BUILD_OPTS -buildfile $build_file clean jar "$@"
+done
+ant $BUILD_OPTS tar "$@"
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=1352640&r1=1352639&r2=1352640&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 Thu
Jun 21 18:15:34 2012
@@ -103,11 +103,14 @@ CONF_DIST_DIR=/etc/pig/conf.dist
# First we'll move everything into lib
install -d -m 0755 $LIB_DIR
-(cd $BUILD_DIR && tar -cf - .) | (cd $LIB_DIR && tar -xf -)
+(cd $BUILD_DIR/tar/pig* && tar -cf - .) | (cd $LIB_DIR && tar -xf -)
-# Remove directories that are going elsewhere
-for dir in conf src lib-src docs tutorial test build.xml contrib/zebra/src
contrib/piggybank ivy contrib/zebra/src-gen
+# Salavage a few files from the contrib &co
+find $LIB_DIR/contrib -name \*.jar -exec cp {} $LIB_DIR \;
+cp $BUILD_DIR/pig-*-smoketests.jar $LIB_DIR/
+# Remove directories that are going elsewhere
+for dir in shims conf src lib-src docs tutorial test build.xml contrib ivy
pig-*.stage.jar
do
rm -rf $LIB_DIR/$dir
done
@@ -143,7 +146,7 @@ gzip -c pig.1 > $MAN_DIR/pig.1.gz
# Copy in the docs
install -d -m 0755 $DOC_DIR
-(cd $BUILD_DIR/docs && tar -cf - .)|(cd $DOC_DIR && tar -xf -)
+(cd $BUILD_DIR/tar/pig*/docs && tar -cf - .)|(cd $DOC_DIR && tar -xf -)
mv $LIB_DIR/license $DOC_DIR
install -d -m 0755 $EXAMPLES_DIR
@@ -151,8 +154,8 @@ install -d -m 0755 $EXAMPLES_DIR
# FIXME: workaround for BIGTOP-161
(cd $LIB_DIR ; ln -s pig-*-core.jar pig-withouthadoop.jar)
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 -)
+(cd $BUILD_DIR/tar/pig*/tutorial && tar -cf - .)|(cd $EXAMPLES_DIR && tar -xf
-)
+sed -i -e "s|../pig.jar|/usr/lib/pig/$PIG_JAR|" $EXAMPLES_DIR/build.xml
# It's somewhat silly that the hadoop jars are included in the pig lib
# dir, since we depend on hadoop in our packages. We can rm them
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=1352640&r1=1352639&r2=1352640&view=diff
==============================================================================
--- incubator/bigtop/trunk/bigtop-packages/src/deb/pig/rules (original)
+++ incubator/bigtop/trunk/bigtop-packages/src/deb/pig/rules Thu Jun 21
18:15:34 2012
@@ -51,7 +51,7 @@ install-indep:
cp debian/*.properties .
cp debian/pig.1 .
sh -x debian/install_pig.sh \
- --build-dir=build/tar/pig-${PIG_BASE_VERSION} \
+ --build-dir=build \
--prefix=debian/${pig_pkg_name} \
--doc-dir=debian/${pig_pkg_name}/usr/share/doc/${pig_pkg_name} \
--examples-dir=debian/${pig_pkg_name}/usr/share/doc/${pig_pkg_name}/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=1352640&r1=1352639&r2=1352640&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 Thu Jun
21 18:15:34 2012
@@ -124,7 +124,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/tar/pig-%{pig_base_version} \
+ --build-dir=build \
--doc-dir=$RPM_BUILD_ROOT%{doc_pig} \
--prefix=$RPM_BUILD_ROOT
