JBoss Native SVN: r1396 - trunk/build/unix.
by jbossnative-commits@lists.jboss.org
Author: jfrederic.clere(a)jboss.com
Date: 2008-02-28 09:47:20 -0500 (Thu, 28 Feb 2008)
New Revision: 1396
Removed:
trunk/build/unix/buildtest.rhel-httpd.hpux.sh
Log:
Allow hp-ux testing.
Deleted: trunk/build/unix/buildtest.rhel-httpd.hpux.sh
===================================================================
--- trunk/build/unix/buildtest.rhel-httpd.hpux.sh 2008-02-28 14:45:28 UTC (rev 1395)
+++ trunk/build/unix/buildtest.rhel-httpd.hpux.sh 2008-02-28 14:47:20 UTC (rev 1396)
@@ -1,24 +0,0 @@
-#!/bin/sh
-# Copyright(c) 2008 Red Hat Middleware, LLC,
-# and individual contributors as indicated by the @authors tag.
-# See the copyright.txt in the distribution for a
-# full listing of individual contributors.
-#
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation; either
-# version 2 of the License, or (at your option) any later version.
-#
-# This library is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library in the file COPYING.LIB;
-# if not, write to the Free Software Foundation, Inc.,
-# 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
-#
-# @author Jean-Frederic Clere
-#
-echo "Not yet supported platform"
16 years, 10 months
JBoss Native SVN: r1395 - trunk/build/unix.
by jbossnative-commits@lists.jboss.org
Author: jfrederic.clere(a)jboss.com
Date: 2008-02-28 09:45:28 -0500 (Thu, 28 Feb 2008)
New Revision: 1395
Modified:
trunk/build/unix/build.sh
trunk/build/unix/buildbin.rhel-httpd.sh
Log:
Arrange mod_ssl and libz logic.
Modified: trunk/build/unix/build.sh
===================================================================
--- trunk/build/unix/build.sh 2008-02-28 13:57:11 UTC (rev 1394)
+++ trunk/build/unix/build.sh 2008-02-28 14:45:28 UTC (rev 1395)
@@ -60,6 +60,7 @@
build_expat=false
export build_iconv
export build_expat
+export build_zlib
has_cache=false
has_version=false
@@ -602,7 +603,15 @@
else
make depend || exit 1
make || exit 1
- make install_sw || exit 1
+ # To hack broken openssl Makefiles.
+ case ${BUILD_TAG} in
+ hpux-ia64)
+ gmake install_sw CFLAGS=DSO_DLHACK || exit 1
+ ;;
+ *)
+ make install_sw || exit 1
+ ;;
+ esac
if [ ! $ssl_static ] ; then
(cd ${ssl_common_dir}/lib
ln -s libcrypto.${so_extension}.${SSLNUM} libcrypto.${so_extension}.0
@@ -809,6 +818,18 @@
nmake -f NMAKEmakefile $wrapped_args install
fi
)
+ else
+ (cd ${zlib_srcdir}
+ echo "Building in ${zlib_srcdir} ..."
+ if $any_static ; then
+ add_static=""
+ else
+ add_static="--shared"
+ fi
+ ./configure ${add_conf} --prefix=${zlib_common_dir} ${add_static}
+ make
+ make install
+ )
fi
}
@@ -822,10 +843,9 @@
dst_dir=$1
if $has_zlib; then
+ # build both static and dynamic zlib
buildzlib srclib/zlib-${zlib_version} false || return 1
- if $has_static ; then
- buildzlib srclib/zlib-${zlib_version} true || return 1
- fi
+ buildzlib srclib/zlib-${zlib_version} true || return 1
fi
# apr-util has a --with-openssl=DIR so we must be build openssl before apu.
ls srclib | grep openssl >/dev/null
Modified: trunk/build/unix/buildbin.rhel-httpd.sh
===================================================================
--- trunk/build/unix/buildbin.rhel-httpd.sh 2008-02-28 13:57:11 UTC (rev 1394)
+++ trunk/build/unix/buildbin.rhel-httpd.sh 2008-02-28 14:45:28 UTC (rev 1395)
@@ -122,6 +122,9 @@
else
add_conf="$add_conf --with-expat=builtin"
fi
+if $build_zlib; then
+ add_conf="$add_conf --with-z=${build_common_dir}-static/"
+fi
# Process mod_jk if needed.
native_sources=srclib/`ls srclib | grep httpd-`
cd $native_sources
@@ -146,7 +149,7 @@
add_conf="${add_conf} CFLAGS=-m64"
;;
esac
-echo "Building prefork and mpm"
+echo "Building prefork and mpm with add_conf: $add_conf"
# Build everything and the kitchen sink with the prefork build
# removed because of ldap dependencies.
16 years, 10 months
JBoss Native SVN: r1394 - trunk/build/unix/util.
by jbossnative-commits@lists.jboss.org
Author: jfrederic.clere(a)jboss.com
Date: 2008-02-28 08:57:11 -0500 (Thu, 28 Feb 2008)
New Revision: 1394
Modified:
trunk/build/unix/util/buildroot.hpux.sh
Log:
typo
Modified: trunk/build/unix/util/buildroot.hpux.sh
===================================================================
--- trunk/build/unix/util/buildroot.hpux.sh 2008-02-28 13:06:57 UTC (rev 1393)
+++ trunk/build/unix/util/buildroot.hpux.sh 2008-02-28 13:57:11 UTC (rev 1394)
@@ -75,8 +75,9 @@
# $2 : The node name in /dev
Createdev()
{
- major=`ls -lL /dev/$2 | awk ' { print $5 } ' | sed 's:,::'`:w
+ major=`ls -lL /dev/$2 | awk ' { print $5 } ' | sed 's:,::'`
minor=`ls -lL /dev/$2 | awk ' { print $6 } '`
+ echo "/usr/sbin/mknod $1/$2 c $major $minor"
sudo /usr/sbin/mknod $1/$2 c $major $minor
}
16 years, 10 months
JBoss Native SVN: r1393 - trunk/build/unix/util.
by jbossnative-commits@lists.jboss.org
Author: jfrederic.clere(a)jboss.com
Date: 2008-02-28 08:06:57 -0500 (Thu, 28 Feb 2008)
New Revision: 1393
Added:
trunk/build/unix/util/buildroot.hpux.sh
Log:
Add the chroot logic for HP-UX.
Added: trunk/build/unix/util/buildroot.hpux.sh
===================================================================
--- trunk/build/unix/util/buildroot.hpux.sh (rev 0)
+++ trunk/build/unix/util/buildroot.hpux.sh 2008-02-28 13:06:57 UTC (rev 1393)
@@ -0,0 +1,112 @@
+#!/bin/sh
+# Copyright(c) 2007 Red Hat Middleware, LLC,
+# and individual contributors as indicated by the @authors tag.
+# See the copyright.txt in the distribution for a
+# full listing of individual contributors.
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library in the file COPYING.LIB;
+# if not, write to the Free Software Foundation, Inc.,
+# 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+#
+# @author Jean-Frederic Clere
+#
+# 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"
+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).
+files="$tools $depfiles"
+
+# Those are dependencies (to be generated).
+toolpackages=""
+deppackages="" #Need something?
+packages="$toolpackages $deppackages"
+
+# Copy library need by one file
+# $1 : Directory where to put the libraries.
+# $2 : The executable file to process.
+Processlibs()
+{
+ for lib in `ldd $2 | awk 'NF==3 { print $3 } ' | sort -u`
+ do
+ Processfile $1 $lib
+ done
+}
+
+#
+# Copy one file
+# $1 : Directory where to put the libraries.
+# $2 : The executable file to process.
+Processfile()
+{
+ dir=`dirname $2`
+ mkdir -p $1/$dir
+ cp $2 $1/$dir
+}
+
+#
+# Copy all the files of a package.
+# The package listing tool is /usr/sbin/swlist
+# $1 : Directory where to put the libraries.
+# $2 : name of the package
+Processpackage()
+{
+ for file in `/usr/sbin/swlist -l file $2 | grep -v "^#"`
+ do
+ Processfile $1 $file
+ done
+}
+
+#
+# Create a device in the chrootable directory
+# $1 : Directory where to create the node
+# $2 : The node name in /dev
+Createdev()
+{
+ major=`ls -lL /dev/$2 | awk ' { print $5 } ' | sed 's:,::'`:w
+ minor=`ls -lL /dev/$2 | awk ' { print $6 } '`
+ sudo /usr/sbin/mknod $1/$2 c $major $minor
+}
+
+# Use tmp for mknod
+root=$1
+
+for file in `echo $files`
+do
+ Processlibs $root $file
+ Processfile $root $file
+done
+
+for package in `echo $packages`
+do
+ Processpackage $root $package
+done
+
+# create proc
+mkdir -p $root/proc
+
+# Create needed devices
+devices="ip kmem null random rawip tcp tcp6 zero"
+mkdir -p $root/dev
+sudo chown root $root/dev
+
+for dev in `echo $devices`
+do
+ Createdev $root/dev $dev
+done
+
+# create /tmp
+mkdir $root/tmp
+chmod a+rwx $root/tmp
Property changes on: trunk/build/unix/util/buildroot.hpux.sh
___________________________________________________________________
Name: svn:executable
+ *
16 years, 10 months
JBoss Native SVN: r1392 - trunk/build/unix.
by jbossnative-commits@lists.jboss.org
Author: jfrederic.clere(a)jboss.com
Date: 2008-02-28 05:51:38 -0500 (Thu, 28 Feb 2008)
New Revision: 1392
Modified:
trunk/build/unix/build.sh
Log:
Arrange zlib logic.
Modified: trunk/build/unix/build.sh
===================================================================
--- trunk/build/unix/build.sh 2008-02-28 10:27:10 UTC (rev 1391)
+++ trunk/build/unix/build.sh 2008-02-28 10:51:38 UTC (rev 1392)
@@ -299,8 +299,10 @@
CC=cc
export CC
# http://hpux.cs.utah.edu/ only has a 32 bits one.
- if [ $BUILD_CPU = "ia64" && $has_zlib ]; then
- build_zlib=true
+ if [ $BUILD_CPU = "ia64" ]; then
+ if [ $has_zlib ]; then
+ build_zlib=true
+ fi
fi
;;
windows)
16 years, 10 months
JBoss Native SVN: r1391 - trunk/build/unix/util.
by jbossnative-commits@lists.jboss.org
Author: jfrederic.clere(a)jboss.com
Date: 2008-02-28 05:27:10 -0500 (Thu, 28 Feb 2008)
New Revision: 1391
Modified:
trunk/build/unix/util/buildrhelsrc.sh
Log:
test return code of uncompressing.
Modified: trunk/build/unix/util/buildrhelsrc.sh
===================================================================
--- trunk/build/unix/util/buildrhelsrc.sh 2008-02-28 10:12:34 UTC (rev 1390)
+++ trunk/build/unix/util/buildrhelsrc.sh 2008-02-28 10:27:10 UTC (rev 1391)
@@ -106,10 +106,18 @@
case $fname in
*.tar.bz2)
bzip2 -dc ${build_cache_dir}/${fname} | tar -xf -
+ if [ $? -ne 0 ];then
+ echo "extract $fname failed"
+ exit 1
+ fi
dirsources=`bzip2 -dc ${build_cache_dir}/${fname} | tar -tf - | head -1 | awk '{ print $1 }'`
;;
*.tar.gz)
gunzip -c ${build_cache_dir}/${fname} | tar -xf -
+ if [ $? -ne 0 ];then
+ echo "extract $fname failed"
+ exit 1
+ fi
dirsources=`gunzip -c ${build_cache_dir}/${fname} | tar -tf - | head -1 | awk '{ print $1 }'`
;;
*)
16 years, 10 months
JBoss Native SVN: r1390 - trunk/build/unix.
by jbossnative-commits@lists.jboss.org
Author: jfrederic.clere(a)jboss.com
Date: 2008-02-28 05:12:34 -0500 (Thu, 28 Feb 2008)
New Revision: 1390
Modified:
trunk/build/unix/build.sh
Log:
build zlib as I can't find it in hpux sites.
Modified: trunk/build/unix/build.sh
===================================================================
--- trunk/build/unix/build.sh 2008-02-28 09:04:29 UTC (rev 1389)
+++ trunk/build/unix/build.sh 2008-02-28 10:12:34 UTC (rev 1390)
@@ -298,6 +298,10 @@
has_posix_tar=false
CC=cc
export CC
+ # http://hpux.cs.utah.edu/ only has a 32 bits one.
+ if [ $BUILD_CPU = "ia64" && $has_zlib ]; then
+ build_zlib=true
+ fi
;;
windows)
so_extension=dll
16 years, 10 months
JBoss Native SVN: r1389 - trunk/build/unix.
by jbossnative-commits@lists.jboss.org
Author: jfrederic.clere(a)jboss.com
Date: 2008-02-28 04:04:29 -0500 (Thu, 28 Feb 2008)
New Revision: 1389
Modified:
trunk/build/unix/package.list
Log:
Add a 1.0.3 SIGHT to fix hudson.
Modified: trunk/build/unix/package.list
===================================================================
--- trunk/build/unix/package.list 2008-02-28 08:19:32 UTC (rev 1388)
+++ trunk/build/unix/package.list 2008-02-28 09:04:29 UTC (rev 1389)
@@ -8,6 +8,7 @@
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
# 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: r1388 - trunk/sight/native/share.
by jbossnative-commits@lists.jboss.org
Author: jfrederic.clere(a)jboss.com
Date: 2008-02-28 03:19:32 -0500 (Thu, 28 Feb 2008)
New Revision: 1388
Modified:
trunk/sight/native/share/mutex.c
Log:
Another typo.
Modified: trunk/sight/native/share/mutex.c
===================================================================
--- trunk/sight/native/share/mutex.c 2008-02-28 08:15:44 UTC (rev 1387)
+++ trunk/sight/native/share/mutex.c 2008-02-28 08:19:32 UTC (rev 1388)
@@ -272,7 +272,7 @@
if (no->opaque) {
apr_os_global_mutex_t osm;
apr_os_global_mutex_get(&osm, (apr_global_mutex_t *)no->native);
- RETURN_JCSTR(apr_proc_mutex_name(osm.proc_mutex);
+ RETURN_JCSTR(apr_proc_mutex_name(osm.proc_mutex));
}
else {
RETURN_JCSTR(apr_proc_mutex_name((apr_proc_mutex_t *)no->native));
16 years, 10 months
JBoss Native SVN: r1387 - trunk/sight/native/share.
by jbossnative-commits@lists.jboss.org
Author: jfrederic.clere(a)jboss.com
Date: 2008-02-28 03:15:44 -0500 (Thu, 28 Feb 2008)
New Revision: 1387
Modified:
trunk/sight/native/share/mutex.c
Log:
typo.
Modified: trunk/sight/native/share/mutex.c
===================================================================
--- trunk/sight/native/share/mutex.c 2008-02-22 08:35:30 UTC (rev 1386)
+++ trunk/sight/native/share/mutex.c 2008-02-28 08:15:44 UTC (rev 1387)
@@ -248,7 +248,7 @@
if (no->opaque) {
apr_os_global_mutex_t osm;
apr_os_global_mutex_get(&osm, (apr_global_mutex_t *)no->native);
- RETURN_JCSTR(apr_proc_mutex_lockfile(osm.proc_mutex);
+ RETURN_JCSTR(apr_proc_mutex_lockfile(osm.proc_mutex));
}
else {
RETURN_JCSTR(apr_proc_mutex_lockfile((apr_proc_mutex_t *)no->native));
16 years, 10 months