Author: jfrederic.clere(a)jboss.com
Date: 2009-02-01 12:24:21 -0500 (Sun, 01 Feb 2009)
New Revision: 2259
Modified:
trunk/build/unix/build.sh
trunk/mod_cluster/test/java/installhttpd.sh
Log:
Using the PACKAGE and version exported by build.sh
Modified: trunk/build/unix/build.sh
===================================================================
--- trunk/build/unix/build.sh 2009-01-31 18:27:39 UTC (rev 2258)
+++ trunk/build/unix/build.sh 2009-02-01 17:24:21 UTC (rev 2259)
@@ -164,6 +164,7 @@
echo "Using version ${build_version} from `basename ${package_list}`"
fi
export build_version
+export PACKAGE
# Check for some gnu mandadory tools.
patch=`util/find_gnu.sh patch`
Modified: trunk/mod_cluster/test/java/installhttpd.sh
===================================================================
--- trunk/mod_cluster/test/java/installhttpd.sh 2009-01-31 18:27:39 UTC (rev 2258)
+++ trunk/mod_cluster/test/java/installhttpd.sh 2009-02-01 17:24:21 UTC (rev 2259)
@@ -109,8 +109,15 @@
ADDMODULES=true
;;
esac
-#PACKAGE=rhel-httpd-2.2.8-1.el5s2
-PACKAGE=mod_cluster-1.0.0.dev
+#PACKVER=rhel-httpd-2.2.8-1.el5s2
+if [ "x${PACKAGE}" = "x" ]
+then
+ PACKVER=mod_cluster-1.0.0.dev
+else
+ # The PACKVER and build_version from the build.sh script.
+ echo "Using ${build_version} for ${PACKVER}"
+ PACKVER=${PACKAGE}-${build_version}
+fi
# Something like (note don't use ssl for the moment.
#
http://hudson.qa.jboss.com/hudson/view/Native/job/mod_cluster-linux-x86_6...
@@ -118,26 +125,26 @@
# The result of the build is something like:
#
/qa/services/hudson/hudson_workspace/workspace/mod_cluster-linux-i686/jbossnative/build/unix/output/mod_cluster-1.0.0.dev-linux2-x86.tar.gz
#
-TARBALL=http://hudson.qa.jboss.com/hudson/view/Native/job/${BASE}/lastSuccessfulBuild/artifact/jbossnative/build/unix/output/${PACKAGE}-${BUILD_SYS}-${BUILD_CPU}.${EXT}
+TARBALL=http://hudson.qa.jboss.com/hudson/view/Native/job/${BASE}/lastSuccessfulBuild/artifact/jbossnative/build/unix/output/${PACKVER}-${BUILD_SYS}-${BUILD_CPU}.${EXT}
BASELOC=`ant base | grep echo | sed 's:\[echo\]::' | sed 's:^ *::'`
if [ "x${BASELOC}" = "x" ]
then
BASELOC=`pwd`
- if [ ! -f ${PACKAGE}-${BUILD_SYS}-${BUILD_CPU}.${EXT} ]
+ if [ ! -f ${PACKVER}-${BUILD_SYS}-${BUILD_CPU}.${EXT} ]
then
- ant downloadfile -Dsourcefile=${TARBALL}
-Ddestfile=${PACKAGE}-${BUILD_SYS}-${BUILD_CPU}.${EXT} -Ddestdir=$BASELOC
+ ant downloadfile -Dsourcefile=${TARBALL}
-Ddestfile=${PACKVER}-${BUILD_SYS}-${BUILD_CPU}.${EXT} -Ddestdir=$BASELOC
fi
else
if [ "x${BUILDTEST}" = "x" ]
then
- rm -f ${PACKAGE}-${BUILD_SYS}-${BUILD_CPU}.${EXT}
- ant downloadfile -Dsourcefile=${TARBALL}
-Ddestfile=${PACKAGE}-${BUILD_SYS}-${BUILD_CPU}.${EXT} -Ddestdir=$BASELOC
+ rm -f ${PACKVER}-${BUILD_SYS}-${BUILD_CPU}.${EXT}
+ ant downloadfile -Dsourcefile=${TARBALL}
-Ddestfile=${PACKVER}-${BUILD_SYS}-${BUILD_CPU}.${EXT} -Ddestdir=$BASELOC
else
echo "Using $root"
EXT=file
fi
fi
-TARBALL=`pwd`/${PACKAGE}-${BUILD_SYS}-${BUILD_CPU}.${EXT}
+TARBALL=`pwd`/${PACKVER}-${BUILD_SYS}-${BUILD_CPU}.${EXT}
export BASELOC
echo "Base is: $BASELOC !!!"