JBoss Native SVN: r1430 - trunk/build/unix.
by jbossnative-commits＠lists.jboss.org
Author: mladen.turk(a)jboss.com
Date: 2008-03-06 14:45:00 -0500 (Thu, 06 Mar 2008)
New Revision: 1430
Modified:
trunk/build/unix/build.sh
Log:
Correctly format package.build file so it reflects new syntax for packages
Modified: trunk/build/unix/build.sh
===================================================================
--- trunk/build/unix/build.sh 2008-03-06 19:44:12 UTC (rev 1429)
+++ trunk/build/unix/build.sh 2008-03-06 19:45:00 UTC (rev 1430)
@@ -200,39 +200,46 @@
if [ "$apu_type" = "v" ]; then
has_apu=true
fi
+ apu_sversion="apu:$apu_type:$apu_version"
export apu_version
;;
api:*)
api_version=`echo "${arg}" | ${awk} -F':' '{print $3}'`
api_type=`echo "${arg}" | ${awk} -F':' '{print $2}'`
has_api=true
+ api_sversion="api:$api_type:$api_version"
export api_version
;;
ssl:*)
ssl_version=`echo "${arg}" | ${awk} -F':' '{print $3}'`
ssl_type=`echo "${arg}" | ${awk} -F':' '{print $2}'`
has_ssl=true
+ ssl_sversion="ssl:$ssl_type:$ssl_version"
;;
zlib:*)
zlib_version=`echo "${arg}" | ${awk} -F':' '{print $3}'`
zlib_type=`echo "${arg}" | ${awk} -F':' '{print $2}'`
has_zlib=true
+ zlib_sversion="zlib:$zlib_type:$zlib_version"
;;
jk:*)
jk_version=`echo "${arg}" | ${awk} -F':' '{print $3}'`
jk_type=`echo "${arg}" | ${awk} -F':' '{print $2}'`
has_jk=true
+ jk_sversion="jk:$jk_type:$jk_version"
export jk_version
;;
iconv:*)
iconv_version=`echo "${arg}" | ${awk} -F':' '{print $3}'`
iconv_type=`echo "${arg}" | ${awk} -F':' '{print $2}'`
has_iconv=true
+ iconv_sversion="iconv:$iconv_type:$iconv_version"
;;
expat:*)
expat_version=`echo "${arg}" | ${awk} -F':' '{print $3}'`
expat_type=`echo "${arg}" | ${awk} -F':' '{print $2}'`
has_expat=true
+ expat_sversion="expat:$expat_type:$expat_version"
;;
esac
fi
@@ -1062,7 +1069,7 @@
cat > ${package_src_dir}/package.build << EOF
# THIS FILE WAS AUTOGENERATED BY `basename $0`
#
-${PACKAGE}|${build_version}|${svn_tagname}|${apr_sversion}|${apu_version}|${api_version}|${ssl_version}|${zlib_version}|${jk_version}
+${PACKAGE}|${build_version}|${svn_tagname}|${apr_sversion}|${apu_sversion}|${api_sversion}|${ssl_sversion}|${zlib_sversion}|${jk_sversion}
EOF
16 years, 10 months
JBoss Native SVN: r1429 - trunk/build/unix.
by jbossnative-commits＠lists.jboss.org
Author: mladen.turk(a)jboss.com
Date: 2008-03-06 14:44:12 -0500 (Thu, 06 Mar 2008)
New Revision: 1429
Modified:
trunk/build/unix/build.sh
Log:
Correctly format package.build file so it reflects new syntax for packages
Modified: trunk/build/unix/build.sh
===================================================================
--- trunk/build/unix/build.sh 2008-03-06 18:56:19 UTC (rev 1428)
+++ trunk/build/unix/build.sh 2008-03-06 19:44:12 UTC (rev 1429)
@@ -191,6 +191,7 @@
if [ "$apr_type" = "v" ]; then
has_apr=true
fi
+ apr_sversion="apr:$apr_type:$apr_version"
export apr_version
;;
apu:*)
@@ -1061,7 +1062,7 @@
cat > ${package_src_dir}/package.build << EOF
# THIS FILE WAS AUTOGENERATED BY `basename $0`
#
-${PACKAGE}|${build_version}|${svn_tagname}|${apr_version}|${apu_version}|${api_version}|${ssl_version}|${zlib_version}|${jk_version}
+${PACKAGE}|${build_version}|${svn_tagname}|${apr_sversion}|${apu_version}|${api_version}|${ssl_version}|${zlib_version}|${jk_version}
EOF
16 years, 10 months
JBoss Native SVN: r1428 - trunk/build/unix.
by jbossnative-commits＠lists.jboss.org
Author: mladen.turk(a)jboss.com
Date: 2008-03-06 13:56:19 -0500 (Thu, 06 Mar 2008)
New Revision: 1428
Modified:
trunk/build/unix/build.sh
Log:
Oops. Copy/paste typo
Modified: trunk/build/unix/build.sh
===================================================================
--- trunk/build/unix/build.sh 2008-03-06 18:55:05 UTC (rev 1427)
+++ trunk/build/unix/build.sh 2008-03-06 18:56:19 UTC (rev 1428)
@@ -122,7 +122,7 @@
has_package=true
has_version=true
- PACKAGE=`grep -v '^#' $package_list | head -n1 | awk -F"|" '{print $2}'`
+ PACKAGE=`grep -v '^#' $package_list | head -n1 | awk -F"|" '{print $1}'`
build_version=`grep -v '^#' $package_list | head -n1 | awk -F"|" '{print $2}'`
echo "build_version : $build_version"
16 years, 10 months
JBoss Native SVN: r1427 - trunk/build/unix.
by jbossnative-commits＠lists.jboss.org
Author: mladen.turk(a)jboss.com
Date: 2008-03-06 13:55:05 -0500 (Thu, 06 Mar 2008)
New Revision: 1427
Modified:
trunk/build/unix/build.sh
Log:
Use package.build when generating standalone source distribution. This allows anything as build version instead depending on fuguring out from directory name
Modified: trunk/build/unix/build.sh
===================================================================
--- trunk/build/unix/build.sh 2008-03-06 18:30:30 UTC (rev 1426)
+++ trunk/build/unix/build.sh 2008-03-06 18:55:05 UTC (rev 1427)
@@ -40,7 +40,13 @@
PACKAGE=""
BUILD_WIN=false
+build_srcp=false
package_list=${build_top}/package.list
+if [ -f ${build_top}/package.build ]; then
+ package_list=${build_top}/package.build
+ build_srcp=true
+fi
+
awk=awk
has_posix_tar=true
@@ -112,17 +118,13 @@
# Check if we just have only to build the binaries
# something like package-version-src or
# package-version-src-ssl (where package is jboss-blalbla).
-if [ -d srclib ]; then
- package_list=${build_top}/package.list
+if $build_srcp; then
has_package=true
has_version=true
- TYPE=`basename ${build_top} | awk -F - '{ print $NF }'`
- if [ $TYPE = "src" ]; then
- build_version=`basename ${build_top} | awk -F - '{ print $(NF-1) }'`
- else
- build_version=`basename ${build_top} | awk -F - '{ print $(NF-2) }'`
- fi
- PACKAGE=`basename ${build_top} | awk -F"-$build_version" '{ print $1 }'`
+
+ PACKAGE=`grep -v '^#' $package_list | head -n1 | awk -F"|" '{print $2}'`
+ build_version=`grep -v '^#' $package_list | head -n1 | awk -F"|" '{print $2}'`
+
echo "build_version : $build_version"
echo "PACKAGE : $PACKAGE"
fi
@@ -395,7 +397,7 @@
if $has_openssl; then
package_build_name=${package_build_name}-ssl
fi
-if [ -d srclib ]; then
+if $build_srcp; then
package_src_dir=${build_top}
export package_src_dir
package_dist_dir=${build_top}/dist/${BUILD_TAG}
@@ -929,7 +931,7 @@
}
# Only build binaries?
-if [ -d srclib ]; then
+if $build_srcp; then
buildbin ${build_output_dir}
exit 0
fi
@@ -1056,7 +1058,7 @@
cp util/*.sh ${package_src_dir}/util
# TODO: Generate package list instead copying
-cat > ${package_src_dir}/package.list << EOF
+cat > ${package_src_dir}/package.build << EOF
# THIS FILE WAS AUTOGENERATED BY `basename $0`
#
${PACKAGE}|${build_version}|${svn_tagname}|${apr_version}|${apu_version}|${api_version}|${ssl_version}|${zlib_version}|${jk_version}
16 years, 10 months
JBoss Native SVN: r1426 - trunk/build/unix.
by jbossnative-commits＠lists.jboss.org
Author: mladen.turk(a)jboss.com
Date: 2008-03-06 13:30:30 -0500 (Thu, 06 Mar 2008)
New Revision: 1426
Modified:
trunk/build/unix/build.sh
Log:
Export build_* after we mangle it not before
Modified: trunk/build/unix/build.sh
===================================================================
--- trunk/build/unix/build.sh 2008-03-06 12:55:43 UTC (rev 1425)
+++ trunk/build/unix/build.sh 2008-03-06 18:30:30 UTC (rev 1426)
@@ -58,9 +58,6 @@
build_zlib=false
build_iconv=false
build_expat=false
-export build_iconv
-export build_expat
-export build_zlib
has_cache=false
has_version=false
@@ -354,6 +351,10 @@
export has_jk
export so_extension
+export build_iconv
+export build_expat
+export build_zlib
+
export NATIVEEOL
export BUILD_SYS
export BUILD_CPU
16 years, 10 months
JBoss Native SVN: r1425 - trunk/build/unix.
by jbossnative-commits＠lists.jboss.org
Author: jfrederic.clere(a)jboss.com
Date: 2008-03-06 07:55:43 -0500 (Thu, 06 Mar 2008)
New Revision: 1425
Modified:
trunk/build/unix/package.list
Log:
Use _ instead - in the developement version.
Modified: trunk/build/unix/package.list
===================================================================
--- trunk/build/unix/package.list 2008-03-06 11:42:57 UTC (rev 1424)
+++ trunk/build/unix/package.list 2008-03-06 12:55:43 UTC (rev 1425)
@@ -3,12 +3,12 @@
jboss-native|2.0.1|TOMCAT_NATIVE_1_1_11|apr:v:1.2.9|apu:v:1.2.8|api:v:1.2.1|ssl:v:0.9.8e|zlib:v:1.2.3
jboss-native|2.0.2|TOMCAT_NATIVE_1_1_11|apr:v:1.2.9|apu:v:1.2.8|api:v:1.2.1|ssl:v:0.9.8e|zlib:v:1.2.3
jboss-native|2.0.3|TOMCAT_NATIVE_1_1_12|apr:v:1.2.8|apu:v:1.2.8|api:v:1.2.1|ssl:v:0.9.8e|zlib:v:1.2.3
-jboss-native|2.0.4-dev|trunk|apr:v:1.2.8|apu:v:1.2.8|api:v:1.2.1|ssl:v:0.9.8e|zlib:v:1.2.3
+jboss-native|2.0.4_dev|trunk|apr:v:1.2.8|apu:v:1.2.8|api:v:1.2.1|ssl:v:0.9.8e|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
jboss-sight|1.0.2|trunk|apr:v:1.2.8|apu:v:1.2.8|api:v:1.2.1
-jboss-sight|1.0.3-dev|trunk|apr:v:1.2.8|apu:v:1.2.8|api:v:1.2.1
+jboss-sight|1.0.3_dev|trunk|apr:v:1.2.8|apu:v:1.2.8|api:v:1.2.1
# httpd
jboss-httpd|0.0.1|2.2.6
rhel-httpd|0.0.1|httpd-2_2_3-11_el5_1_3|apr:r:apr-1_2_7-11|apu:r:apr-util-1_2_7-7_el5|api:v:1.2.1|ssl:r:openssl-0_9_8b-8_3_el5_0_2|zlib:v:1.2.3|jk:v:1.2.26|iconv:v:1.11|expat:v:1.95.8
16 years, 10 months
JBoss Native SVN: r1424 - trunk/build/unix.
by jbossnative-commits＠lists.jboss.org
Author: jfrederic.clere(a)jboss.com
Date: 2008-03-06 06:42:57 -0500 (Thu, 06 Mar 2008)
New Revision: 1424
Modified:
trunk/build/unix/build.sh
trunk/build/unix/buildtest.rhel-httpd.sh
Log:
Add a logic to build from the "tarball" and arrange build.sh
Modified: trunk/build/unix/build.sh
===================================================================
--- trunk/build/unix/build.sh 2008-03-05 18:03:29 UTC (rev 1423)
+++ trunk/build/unix/build.sh 2008-03-06 11:42:57 UTC (rev 1424)
@@ -117,15 +117,15 @@
# package-version-src-ssl (where package is jboss-blalbla).
if [ -d srclib ]; then
package_list=${build_top}/package.list
- PACKAGE=`basename ${build_top} | awk -F - '{ print $1 "-" $2 }'`
has_package=true
has_version=true
TYPE=`basename ${build_top} | awk -F - '{ print $NF }'`
if [ $TYPE = "src" ]; then
build_version=`basename ${build_top} | awk -F - '{ print $(NF-1) }'`
else
- build_version=`basename ${build_top} | awk -F - '{ print $(NF-3) "-" $(NF-2) }'`
+ build_version=`basename ${build_top} | awk -F - '{ print $(NF-2) }'`
fi
+ PACKAGE=`basename ${build_top} | awk -F"-$build_version" '{ print $1 }'`
echo "build_version : $build_version"
echo "PACKAGE : $PACKAGE"
fi
@@ -1101,8 +1101,24 @@
# create a chrootable environment for testing:
if [ ! -d ${TMPROOTBASE}/${package_output_dir} ]; then
override ${build_top}/util/buildroot ${TMPROOTBASE}/${package_output_dir}
+ if [ $? -ne 0 ]; then
+ echo "buildroot ${TMPROOTBASE}/${package_output_dir} failed"
+ exit 1
+ fi
fi
# run a test
override ${build_top}/buildtest.${PACKAGE}.sh ${TMPROOTBASE} ${package_output_dir} ${build_cache_dir} ${IPLOCAL} ${has_ssl}
+ if [ $? -ne 0 ]; then
+ echo "buildtest.${PACKAGE} ${TMPROOTBASE} failed"
+ exit 1
+
+ # try to build from the source tarball
+ override ${build_top}/util/buildfromtar ${TMPROOTBASE}/src ${build_output_dir} ${package_src_name} ${BUILD_WIN} ${has_ssl} ${build_version} ${PACKAGE}
+ if [ $? -ne 0 ]; then
+ echo "buildfromtar in ${TMPROOTBASE}/src failed"
+ exit 1
fi
+echo ""
+echo "SUCCESS : `basename $0` $LastChangedDate$"
+echo ""
Modified: trunk/build/unix/buildtest.rhel-httpd.sh
===================================================================
--- trunk/build/unix/buildtest.rhel-httpd.sh 2008-03-05 18:03:29 UTC (rev 1423)
+++ trunk/build/unix/buildtest.rhel-httpd.sh 2008-03-06 11:42:57 UTC (rev 1424)
@@ -35,6 +35,10 @@
IPLOCAL=$4
loc_has_ssl=$5
+echo ""
+echo "Running : `basename $0` $LastChangedDate$"
+echo ""
+
# Install jboss (as)
util/installjboss.sh $base $root $build_cache_dir
@@ -104,8 +108,12 @@
sudo kill -15 $pid
fi
sleep 30
-curl -v http://${IPLOCAL}
+curl -v http://${IPLOCAL}
if [ $? -eq 0 ]; then
echo "Test FAILED can't stop"
exit 1
fi
+echo ""
+echo "SUCCESS : `basename $0` $LastChangedDate$"
+echo ""
+exit 0
16 years, 10 months
JBoss Native SVN: r1423 - in trunk/utils/windows/native/service: jbosssvc and 1 other directory.
by jbossnative-commits＠lists.jboss.org
Author: mladen.turk(a)jboss.com
Date: 2008-03-05 13:03:29 -0500 (Wed, 05 Mar 2008)
New Revision: 1423
Modified:
trunk/utils/windows/native/service/jbosssch/sch.c
trunk/utils/windows/native/service/jbosssvc/jboss.c
Log:
Use Global prefix for Vista support
Modified: trunk/utils/windows/native/service/jbosssch/sch.c
===================================================================
--- trunk/utils/windows/native/service/jbosssch/sch.c 2008-03-05 16:13:01 UTC (rev 1422)
+++ trunk/utils/windows/native/service/jbosssch/sch.c 2008-03-05 18:03:29 UTC (rev 1423)
@@ -663,7 +663,7 @@
for (i = 1; i < JBSCH_NUM_EVENTS; i++) {
char sb[JBSCH_SIGNAL_SZ+1];
- StringCbPrintfA(sb, JBSCH_SIGNAL_SZ, "PSIGNUM_%s_%d",
+ StringCbPrintfA(sb, JBSCH_SIGNAL_SZ, "Global\\PSIGNUM_%s_%d",
jbsch_service_name, i);
jbsch_ctrl_events[i] = CreateEventA(sa, FALSE, FALSE, sb);
if (IS_INVALID_HANDLE(jbsch_ctrl_events[i])) {
Modified: trunk/utils/windows/native/service/jbosssvc/jboss.c
===================================================================
--- trunk/utils/windows/native/service/jbosssvc/jboss.c 2008-03-05 16:13:01 UTC (rev 1422)
+++ trunk/utils/windows/native/service/jbosssvc/jboss.c 2008-03-05 18:03:29 UTC (rev 1423)
@@ -65,6 +65,7 @@
#endif
#include <windows.h>
+#include <tlhelp32.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
@@ -947,7 +948,7 @@
char kill_name[MAX_PATH + 1];
HANDLE kill_event = NULL;
lstrcpy(kill_name, _service_name);
- wsprintf(kill_name, "PSIGNUM_%s_%d", _service_name, kill_code);
+ wsprintf(kill_name, "Global\\PSIGNUM_%s_%d", _service_name, kill_code);
kill_event = OpenEvent(EVENT_MODIFY_STATE, FALSE, kill_name);
if (kill_event) {
SetEvent(kill_event);
16 years, 10 months
JBoss Native SVN: r1422 - trunk/build/unix.
by jbossnative-commits＠lists.jboss.org
Author: jfrederic.clere(a)jboss.com
Date: 2008-03-05 11:13:01 -0500 (Wed, 05 Mar 2008)
New Revision: 1422
Modified:
trunk/build/unix/build.sh
Log:
Make the patch verbose again.
Modified: trunk/build/unix/build.sh
===================================================================
--- trunk/build/unix/build.sh 2008-03-05 16:12:07 UTC (rev 1421)
+++ trunk/build/unix/build.sh 2008-03-05 16:13:01 UTC (rev 1422)
@@ -943,15 +943,15 @@
basefilename=`basename $DIR`
if [ -f $build_top/../patch/$basefilename.patch ]; then
(cd $DIR
- echo "Applying patch $build_top/../patch/$basefilename.patch"
- $patch -tfs -p0 -i $build_top/../patch/$basefilename.patch
+ echo "Applying patch $build_top/../patch/$basefilename.patch in $DIR"
+ $patch -tf -p0 -i $build_top/../patch/$basefilename.patch
) || return 1
fi
if $isrhel; then
if [ -f $build_top/../patch/$basefilename.rhel.patch ]; then
(cd $DIR
- echo "Applying patch $build_top/../patch/$basefilename.rhel.patch"
- $patch -tfs -p0 -i $build_top/../patch/$basefilename.rhel.patch
+ echo "Applying patch $build_top/../patch/$basefilename.rhel.patch in $DIR"
+ $patch -tf -p0 -i $build_top/../patch/$basefilename.rhel.patch
) || return 1
fi
fi
16 years, 10 months
JBoss Native SVN: r1421 - trunk/build/unix/util.
by jbossnative-commits＠lists.jboss.org
Author: jfrederic.clere(a)jboss.com
Date: 2008-03-05 11:12:07 -0500 (Wed, 05 Mar 2008)
New Revision: 1421
Modified:
trunk/build/unix/util/buildroot.hpux.sh
Log:
Remove broken Postgres library.
Modified: trunk/build/unix/util/buildroot.hpux.sh
===================================================================
--- trunk/build/unix/util/buildroot.hpux.sh 2008-03-05 16:11:01 UTC (rev 1420)
+++ trunk/build/unix/util/buildroot.hpux.sh 2008-03-05 16:12:07 UTC (rev 1421)
@@ -23,7 +23,7 @@
#
# Build a chrootable environment.
# $1 : Directory where the chroot will takes place.
-tools="/bin/bash /etc/passwd /etc/group /etc/hosts /etc/netconfig /etc/resolv.conf /usr/lib/dld.sl /usr/lib/hpux32/uld.so /usr/lib/hpux32/dld.so /usr/lib/hpux32/libm.so.1 /usr/lib/hpux32/libpthread.so.1 /usr/lib/hpux32/libnss_dns.so.1 /usr/lib/libm.2 /usr/lib/libpthread.1 /usr/lib/libpq.sl.4 /usr/lib/libnss_dns.1"
+tools="/bin/bash /etc/passwd /etc/group /etc/hosts /etc/netconfig /etc/resolv.conf /usr/lib/dld.sl /usr/lib/hpux32/uld.so /usr/lib/hpux32/dld.so /usr/lib/hpux32/libm.so.1 /usr/lib/hpux32/libpthread.so.1 /usr/lib/hpux32/libnss_dns.so.1 /usr/lib/libm.2 /usr/lib/libpthread.1 /usr/lib/libnss_dns.1"
depfiles="/bin/sh /usr/bin/test /usr/bin/dirname /usr/bin/basename /usr/bin/uname /usr/bin/grep /usr/bin/sh /usr/bin/expr /usr/bin/false /usr/bin/true"
# tools are the tools we need for the tests.
# depfiles are files the packages needed (to be generated).
16 years, 10 months