Author: tomwhite
Date: Fri May 20 00:23:30 2011
New Revision: 1125190
URL: http://svn.apache.org/viewvc?rev=1125190&view=rev
Log:
Include 32-bit and 64-bit native libraries in Jenkins tarball builds
Modified:
hadoop/nightly/hudsonBuildHadoopRelease.sh
hadoop/nightly/tar-munge
Modified: hadoop/nightly/hudsonBuildHadoopRelease.sh
URL:
http://svn.apache.org/viewvc/hadoop/nightly/hudsonBuildHadoopRelease.sh?rev=1125190&r1=1125189&r2=1125190&view=diff
==============================================================================
--- hadoop/nightly/hudsonBuildHadoopRelease.sh (original)
+++ hadoop/nightly/hudsonBuildHadoopRelease.sh Fri May 20 00:23:30 2011
@@ -1,38 +1,55 @@
#!/bin/bash
+set -e
+set -x
+
+bin=`dirname "$0"`
+bin=`cd "$bin"; pwd`
+
VERSION=$1
ANT_HOME=$2
-XERCES_HOME=$3
+XERCES32_HOME=$3
FORREST_HOME=$4
-PYTHON_HOME=$5
-ECLIPSE_HOME=$6
-JDIFF_HOME=$7
-JAVA5_HOME=$8
-JAVA32_HOME=$9
-JAVA64_HOME=$10
-
-set -x
+ECLIPSE_HOME=$5
+JDIFF_HOME=$6
+JAVA5_HOME=$7
+JAVA32_HOME=${8}
+JAVA64_HOME=${9}
+EXTRA_JVM_OPTIONS=${10}
ulimit -n 1024
-### BUILD_ID is set by Hudson
-trunk=`pwd`/trunk
-
-cd $trunk
-
export JAVA_HOME=$JAVA32_HOME
+export XERCES_HOME=$XERCES32_HOME
export CFLAGS=-m32
export CXXFLAGS=-m32
-$ANT_HOME/bin/ant -Dversion=$VERSION -Dcompile.native=true -Dcompile.c++=true
-Dlibhdfs=1 -Dlibrecordio=true -Dxercescroot=$XERCES_HOME
-Declipse.home=$ECLIPSE_HOME -Djdiff.home=$JDIFF_HOME -Djava5.home=$JAVA5_HOME
-Dforrest.home=$FORREST_HOME clean docs package-libhdfs api-report tar test
test-c++-libhdfs
+export COMMON_JVM_OPTIONS="-Dcompile.native=true -Dcompile.c++=true
-Dxercescroot=$XERCES_HOME -Declipse.home=$ECLIPSE_HOME
-Djdiff.home=$JDIFF_HOME -Dforrest.home=$FORREST_HOME -Djava5.home=$JAVA5_HOME
-Dresolvers=internal"
-RESULT=$?
-if [ $RESULT != 0 ] ; then
- echo "Build Failed: 64-bit build not run"
- exit $RESULT
-fi
+pushd hadoop-common
+$ANT_HOME/bin/ant $COMMON_JVM_OPTIONS $EXTRA_JVM_OPTIONS veryclean api-report
compile-core-native tar mvn-install
+popd
+pushd hadoop-hdfs
+$ANT_HOME/bin/ant $COMMON_JVM_OPTIONS $EXTRA_JVM_OPTIONS -Dlibhdfs=1 veryclean
api-report tar mvn-install
+popd
+pushd hadoop-mapreduce
+# librecordio installs into librecordio (with no architecture dir), so we only
build for 32-bit
+# Similarly, the taskcontroller installs into bin
+$ANT_HOME/bin/ant $COMMON_JVM_OPTIONS $EXTRA_JVM_OPTIONS -Dlibrecordio=true
veryclean api-report test-task-controller compile-c++ tar mvn-install
+popd
export JAVA_HOME=$JAVA64_HOME
export CFLAGS=-m64
export CXXFLAGS=-m64
-$ANT_HOME/bin/ant -Dversion=$VERSION -Dcompile.native=true -Dcompile.c++=true
compile-core-native compile-c++ tar
+export COMMON_JVM_OPTIONS="-Dcompile.native=true -Dcompile.c++=true
-Declipse.home=$ECLIPSE_HOME -Djdiff.home=$JDIFF_HOME
-Dforrest.home=$FORREST_HOME -Djava5.home=$JAVA5_HOME -Dresolvers=internal"
+
+pushd hadoop-common
+$ANT_HOME/bin/ant $COMMON_JVM_OPTIONS $EXTRA_JVM_OPTIONS compile-core-native
tar mvn-install
+popd
+pushd hadoop-hdfs
+$ANT_HOME/bin/ant $COMMON_JVM_OPTIONS $EXTRA_JVM_OPTIONS -Dlibhdfs=1
compile-c++-libhdfs tar mvn-install
+popd
+pushd hadoop-mapreduce
+$ANT_HOME/bin/ant $COMMON_JVM_OPTIONS $EXTRA_JVM_OPTIONS compile-c++ tar
mvn-install
+popd
+$bin/tar-munge $VERSION hadoop-{common,hdfs,mapreduce}/build/*.tar.gz
Modified: hadoop/nightly/tar-munge
URL:
http://svn.apache.org/viewvc/hadoop/nightly/tar-munge?rev=1125190&r1=1125189&r2=1125190&view=diff
==============================================================================
--- hadoop/nightly/tar-munge (original)
+++ hadoop/nightly/tar-munge Fri May 20 00:23:30 2011
@@ -69,7 +69,7 @@ for proj in hdfs mapred; do
rm -r $proj/webapps
done
-# get the mapred c++ (if compiled)
+# get the c++ binaries (if compiled)
mkdir c++
for proj in hdfs mapred; do
if [ -d $proj/c++ ]; then
@@ -78,6 +78,13 @@ for proj in hdfs mapred; do
fi
done
+# get librecordio (if compiled)
+if [ -d mapred/librecordio ]; then
+ mkdir librecordio
+ cp -Rp mapred/librecordio/* librecordio
+ rm -r mapred/librecordio
+fi
+
# get our jar files
mv {common,hdfs,mapred}/*.jar .
