JBoss Native SVN: r2596 - trunk/build/unix.
by jbossnative-commits@lists.jboss.org
Author: jfrederic.clere(a)jboss.com
Date: 2009-11-26 03:38:35 -0500 (Thu, 26 Nov 2009)
New Revision: 2596
Modified:
trunk/build/unix/build.sh
Log:
Arrange location...
Modified: trunk/build/unix/build.sh
===================================================================
--- trunk/build/unix/build.sh 2009-11-26 08:29:11 UTC (rev 2595)
+++ trunk/build/unix/build.sh 2009-11-26 08:38:35 UTC (rev 2596)
@@ -1100,7 +1100,7 @@
cp -rp ${src_dir} ${package_src_dir}/srclib
# also copy common files...
mkdir -p ${package_src_dir}/srclib/common
- cp ${basedir}/common/* ${package_src_dir}/srclib/common
+ cp ${build_top}/../../srclib/common/* ${package_src_dir}/srclib/common
cd $build_top
return 0
}
15 years, 1 month
JBoss Native SVN: r2595 - trunk/build/unix.
by jbossnative-commits@lists.jboss.org
Author: jfrederic.clere(a)jboss.com
Date: 2009-11-26 03:29:11 -0500 (Thu, 26 Nov 2009)
New Revision: 2595
Modified:
trunk/build/unix/build.sh
Log:
Add traces...
Modified: trunk/build/unix/build.sh
===================================================================
--- trunk/build/unix/build.sh 2009-11-24 12:12:10 UTC (rev 2594)
+++ trunk/build/unix/build.sh 2009-11-26 08:29:11 UTC (rev 2595)
@@ -760,7 +760,7 @@
if $BUILD_WIN ; then
(cd ${apr_srcdir}
cp -f include/apr.hw include/apr.h
- echo "Building APR ${apr_version} ..."
+ echo "Building APR ${apr_version} in ${apr_srcdir}"
cygwinpath true PREFIX=${apr_common_dir} SRCDIR=`pwd`
if $apr_static ; then
nmake -f NMAKEmakefile $wrapped_args APR_DECLARE_STATIC=true install
@@ -771,7 +771,7 @@
else
(cd ${apr_srcdir}
./configure ${add_conf} --prefix=${apr_common_dir} || exit 1
- echo "Building APR ${apr_version} ..."
+ echo "Building APR ${apr_version} in ${apr_srcdir}"
make || exit 1
make install || exit 1
) || return 1
15 years, 1 month
JBoss Native SVN: r2594 - trunk/build/unix.
by jbossnative-commits@lists.jboss.org
Author: jfrederic.clere(a)jboss.com
Date: 2009-11-24 07:12:10 -0500 (Tue, 24 Nov 2009)
New Revision: 2594
Modified:
trunk/build/unix/build.sh
Log:
Stop building if download failed...
Modified: trunk/build/unix/build.sh
===================================================================
--- trunk/build/unix/build.sh 2009-11-24 11:03:32 UTC (rev 2593)
+++ trunk/build/unix/build.sh 2009-11-24 12:12:10 UTC (rev 2594)
@@ -502,6 +502,10 @@
if [ $? -ne 0 ]; then
echo "downloadtaredsrc Retrying on $URLBACK"
wget --tries=3 --retry-connrefused $URLBACK
+ if [ $? -ne 0 ]; then
+ echo "downloadtaredsrc FAILED"
+ return 1
+ fi
fi
fname=`basename $URL`
case ${fname} in
@@ -513,6 +517,7 @@
;;
esac
rm -f $fname
+ return 0
}
# Wrap command line arguments to windows
@@ -1085,6 +1090,10 @@
cd $build_cache_dir
if [ ! -d ${src_dir} ]; then
downloadtaredsrc $src_url $src_url_back
+ if [ $? -ne 0 ]; then
+ echo "Can't download $src_url $src_url_back"
+ exit 1
+ fi
$build_top/util/overridecp.sh $build_top/../../srclib/ ${name_prod} ${version_prod} NMAKEmakefile $src_dir
applypatch $src_dir false
fi
@@ -1093,6 +1102,7 @@
mkdir -p ${package_src_dir}/srclib/common
cp ${basedir}/common/* ${package_src_dir}/srclib/common
cd $build_top
+ return 0
}
# set the urls
15 years, 1 month
JBoss Native SVN: r2593 - trunk/build/unix.
by jbossnative-commits@lists.jboss.org
Author: jfrederic.clere(a)jboss.com
Date: 2009-11-24 06:03:32 -0500 (Tue, 24 Nov 2009)
New Revision: 2593
Modified:
trunk/build/unix/build.sh
Log:
Arrange wget retries...
Modified: trunk/build/unix/build.sh
===================================================================
--- trunk/build/unix/build.sh 2009-11-24 09:52:26 UTC (rev 2592)
+++ trunk/build/unix/build.sh 2009-11-24 11:03:32 UTC (rev 2593)
@@ -498,10 +498,10 @@
if [ -z $URLBACK ]; then
URLBACK=$URL
fi
- wget --tries=0 --retry-connrefused $URL
+ wget --tries=3 --retry-connrefused $URL
if [ $? -ne 0 ]; then
echo "downloadtaredsrc Retrying on $URLBACK"
- wget --tries=0 --retry-connrefused $URLBACK
+ wget --tries=3 --retry-connrefused $URLBACK
fi
fname=`basename $URL`
case ${fname} in
15 years, 1 month
JBoss Native SVN: r2592 - trunk/build/unix/util.
by jbossnative-commits@lists.jboss.org
Author: jfrederic.clere(a)jboss.com
Date: 2009-11-24 04:52:26 -0500 (Tue, 24 Nov 2009)
New Revision: 2592
Modified:
trunk/build/unix/util/ckeckdownload.sh
Log:
Arrange the timeout value (0 means retry forever!!!).
Modified: trunk/build/unix/util/ckeckdownload.sh
===================================================================
--- trunk/build/unix/util/ckeckdownload.sh 2009-11-23 17:34:54 UTC (rev 2591)
+++ trunk/build/unix/util/ckeckdownload.sh 2009-11-24 09:52:26 UTC (rev 2592)
@@ -32,10 +32,14 @@
if [ -z $URLBACK ]; then
URLBACK=$URL
fi
- wget --tries=0 --retry-connrefused $URL
+ wget --tries=3 --retry-connrefused $URL
if [ $? -ne 0 ]; then
echo "downloadtaredsrc Retrying on $URLBACK"
- wget --tries=0 --retry-connrefused $URLBACK
+ wget --tries=3 --retry-connrefused $URLBACK
+ if [ $? -ne 0 ]; then
+ echo "downloadtaredsrc $URLBACK failed"
+ return 1
+ fi
fi
fname=`basename $URL`
case ${fname} in
@@ -47,6 +51,7 @@
;;
esac
rm -f $fname
+ return 0
}
# Apply patch for the component
@@ -74,6 +79,9 @@
cd $build_cache_dir
if [ ! -d ${src_dir} ]; then
downloadtaredsrc $src_url $src_url_back
+ if [ $? -ne 0 ]; then
+ return 1
+ fi
applypatch $src_dir
fi
cp -rp ${src_dir} ${package_src_dir}/srclib
@@ -99,3 +107,8 @@
# Call the internal functions.
ckeckdownload $src_dir $url $urlback
+if [ $? -ne 0 ]; then
+ echo "ckeckdownload src_dir: $src_dir url: $url urlback: $urlback FAILED!"
+ exit 1
+fi
+exit 0
15 years, 1 month
JBoss Native SVN: r2591 - trunk/build/unix.
by jbossnative-commits@lists.jboss.org
Author: jfrederic.clere(a)jboss.com
Date: 2009-11-23 12:34:54 -0500 (Mon, 23 Nov 2009)
New Revision: 2591
Modified:
trunk/build/unix/build.sh
Log:
Make sure Darwin finds the JVM.
Modified: trunk/build/unix/build.sh
===================================================================
--- trunk/build/unix/build.sh 2009-11-23 17:12:44 UTC (rev 2590)
+++ trunk/build/unix/build.sh 2009-11-23 17:34:54 UTC (rev 2591)
@@ -327,6 +327,10 @@
if $has_expat; then
build_expat=true
fi
+ if [ "x${JAVA_HOME}" = "x" ]; then
+ JAVA_HOME=/System/Library/Frameworks/JavaVM.framework/Versions/CurrentJDK/
+ export JAVA_HOME
+ fi
;;
HP-UX*)
BUILD_SYS="hpux"
15 years, 1 month
JBoss Native SVN: r2590 - trunk/build/unix.
by jbossnative-commits@lists.jboss.org
Author: jfrederic.clere(a)jboss.com
Date: 2009-11-23 12:12:44 -0500 (Mon, 23 Nov 2009)
New Revision: 2590
Modified:
trunk/build/unix/package.list
Log:
Update apr, apr-util, apr-iconv to lastest (compatible version).
Modified: trunk/build/unix/package.list
===================================================================
--- trunk/build/unix/package.list 2009-11-18 15:04:59 UTC (rev 2589)
+++ trunk/build/unix/package.list 2009-11-23 17:12:44 UTC (rev 2590)
@@ -10,7 +10,7 @@
jboss-native|2.1.0-dev|trunk|apr:v:1.3.3|apu:v:1.3.4|api:v:1.2.1|ssl:v:0.9.8i|zlib:v:1.2.3
jboss-native|2.0.7|TOMCAT_NATIVE_1_1_17|apr:v:1.2.8|apu:v:1.2.8|api:v:1.2.1|ssl:v:0.9.8i|zlib:v:1.2.3
jboss-native|2.0.8-dev|branches/1.1.x|apr:v:1.2.8|apu:v:1.2.8|api:v:1.2.1|ssl:v:0.9.8i|zlib:v:1.2.3
-jboss-native|2.0.8|TOMCAT_NATIVE_1_1_18|apr:v:1.2.8|apu:v:1.2.8|api:v:1.2.1|ssl:v:0.9.8i|zlib:v:1.2.3
+jboss-native|2.0.8|TOMCAT_NATIVE_1_1_18|apr:v:1.3.8|apu:v:1.3.9|api:v:1.2.1|ssl:v:0.9.8i|zlib:v:1.2.3
# SIGHT
jboss-sight|1.0.0|trunk|apr:v:1.2.9|apu:v:1.2.8|api:v:1.2.1
jboss-sight|1.0.1|trunk|apr:v:1.2.8|apu:v:1.2.8|api:v:1.2.1
15 years, 1 month
JBoss Native SVN: r2589 - trunk/build/unix.
by jbossnative-commits@lists.jboss.org
Author: jfrederic.clere(a)jboss.com
Date: 2009-11-18 10:04:59 -0500 (Wed, 18 Nov 2009)
New Revision: 2589
Modified:
trunk/build/unix/package.list
Log:
Prepare 2.0.8 because cve-2009-3555
Modified: trunk/build/unix/package.list
===================================================================
--- trunk/build/unix/package.list 2009-11-18 09:42:43 UTC (rev 2588)
+++ trunk/build/unix/package.list 2009-11-18 15:04:59 UTC (rev 2589)
@@ -10,6 +10,7 @@
jboss-native|2.1.0-dev|trunk|apr:v:1.3.3|apu:v:1.3.4|api:v:1.2.1|ssl:v:0.9.8i|zlib:v:1.2.3
jboss-native|2.0.7|TOMCAT_NATIVE_1_1_17|apr:v:1.2.8|apu:v:1.2.8|api:v:1.2.1|ssl:v:0.9.8i|zlib:v:1.2.3
jboss-native|2.0.8-dev|branches/1.1.x|apr:v:1.2.8|apu:v:1.2.8|api:v:1.2.1|ssl:v:0.9.8i|zlib:v:1.2.3
+jboss-native|2.0.8|TOMCAT_NATIVE_1_1_18|apr:v:1.2.8|apu:v:1.2.8|api:v:1.2.1|ssl:v:0.9.8i|zlib:v:1.2.3
# SIGHT
jboss-sight|1.0.0|trunk|apr:v:1.2.9|apu:v:1.2.8|api:v:1.2.1
jboss-sight|1.0.1|trunk|apr:v:1.2.8|apu:v:1.2.8|api:v:1.2.1
15 years, 1 month
JBoss Native SVN: r2588 - trunk/build/unix.
by jbossnative-commits@lists.jboss.org
Author: jfrederic.clere(a)jboss.com
Date: 2009-11-18 04:42:43 -0500 (Wed, 18 Nov 2009)
New Revision: 2588
Modified:
trunk/build/unix/package.list
Log:
In 2.0.8-dev
Modified: trunk/build/unix/package.list
===================================================================
--- trunk/build/unix/package.list 2009-10-29 07:26:17 UTC (rev 2587)
+++ trunk/build/unix/package.list 2009-11-18 09:42:43 UTC (rev 2588)
@@ -8,8 +8,8 @@
jboss-native|2.0.6-mac|TOMCAT_NATIVE_1_1_16|apr:v:1.3.3|apu:v:1.3.4|api:v:1.2.1|ssl:v:0.9.8i|zlib:v:1.2.3
jboss-native|2.0.6|TOMCAT_NATIVE_1_1_16|apr:v:1.2.8|apu:v:1.2.8|api:v:1.2.1|ssl:v:0.9.8i|zlib:v:1.2.3
jboss-native|2.1.0-dev|trunk|apr:v:1.3.3|apu:v:1.3.4|api:v:1.2.1|ssl:v:0.9.8i|zlib:v:1.2.3
-jboss-native|2.0.7-dev|branches/1.1.x|apr:v:1.2.8|apu:v:1.2.8|api:v:1.2.1|ssl:v:0.9.8i|zlib:v:1.2.3
jboss-native|2.0.7|TOMCAT_NATIVE_1_1_17|apr:v:1.2.8|apu:v:1.2.8|api:v:1.2.1|ssl:v:0.9.8i|zlib:v:1.2.3
+jboss-native|2.0.8-dev|branches/1.1.x|apr:v:1.2.8|apu:v:1.2.8|api:v:1.2.1|ssl:v:0.9.8i|zlib:v:1.2.3
# SIGHT
jboss-sight|1.0.0|trunk|apr:v:1.2.9|apu:v:1.2.8|api:v:1.2.1
jboss-sight|1.0.1|trunk|apr:v:1.2.8|apu:v:1.2.8|api:v:1.2.1
15 years, 1 month