JBoss Native SVN: r1268 - trunk/build/unix.
by jbossnative-commits＠lists.jboss.org
Author: jfrederic.clere(a)jboss.com
Date: 2007-12-21 06:23:29 -0500 (Fri, 21 Dec 2007)
New Revision: 1268
Modified:
trunk/build/unix/build.sh
trunk/build/unix/buildbin.rhel-httpd.sh
Log:
Add iconv (gnu iconv) because the Solaris package requires libgcc
Modified: trunk/build/unix/build.sh
===================================================================
--- trunk/build/unix/build.sh 2007-12-20 23:03:59 UTC (rev 1267)
+++ trunk/build/unix/build.sh 2007-12-21 11:23:29 UTC (rev 1268)
@@ -48,9 +48,13 @@
has_openssl=true
has_zlib=true
has_jk=true
+has_iconv=true
build_api=false
build_zlib=false
+build_iconv=false
+export build_iconv
+
has_cache=false
has_version=false
has_package=false
@@ -155,6 +159,7 @@
ssl_version=`echo "${parg}" | ${awk} -F'|' '{print $7}'`
zlib_version=`echo "${parg}" | ${awk} -F'|' '{print $8}'`
jk_version=`echo "${parg}" | ${awk} -F'|' '{print $9}'`
+iconv_version=`echo "${parg}" | ${awk} -F'|' '{print $10}'`
if [ "x" = "x${zlib_version}" ]; then
has_zlib=false
@@ -174,6 +179,9 @@
if [ "x" = "x${jk_version}" ]; then
has_jk=false
fi
+if [ "x" = "x${iconv_version}" ]; then
+ has_iconv=false
+fi
# Get plaform information
so_extension=so
@@ -220,6 +228,13 @@
# we need makedepend for make depend (openssl)
PATH=/opt/SUNWspro/bin:/usr/X/bin:/usr/local/bin:$PATH
export PATH
+ CC=cc
+ export CC
+ CPP="cc -E"
+ export CPP
+ if $has_iconv; then
+ build_iconv=true
+ fi
;;
HP-UX*)
BUILD_SYS="hpux"
@@ -265,6 +280,9 @@
if $has_jk; then
echo "using mod_jk: ${jk_version}"
fi
+if $has_iconv; then
+echo "using iconv: ${iconv_version}"
+fi
export so_extension
export NATIVEEOL
@@ -640,6 +658,48 @@
}
#
+# Build any package (standard).
+# $1 directory of the sources directory
+# $2 static or shared
+buildany()
+{
+ any_srcdir=$1
+ any_static=$2
+
+ if $any_static ; then
+ any_common_dir=${build_common_dir}-static
+ else
+ any_common_dir=${build_common_dir}
+ fi
+
+ echo "Configuring ${any_srcdir} with --prefix=${any_common_dir}"
+ if $BUILD_WIN ; then
+ (cd ${any_srcdir}
+ echo "Building in ${any_srcdir} ..."
+ cygwinpath true PREFIX=${any_common_dir} SRCDIR=`pwd`
+ if $any_static ; then
+ # XXX: That won't work probably.
+ nmake -f NMAKEmakefile $wrapped_args ANY_DECLARE_STATIC=true install
+ else
+ nmake -f NMAKEmakefile $wrapped_args install
+ fi
+ )
+ else
+ (cd ${any_srcdir}
+ echo "Building in ${any_srcdir} ..."
+ if $any_static ; then
+ add_static=--enable-static
+ else
+ add_static=""
+ fi
+ ./configure ${add_conf} --prefix=${any_common_dir} ${add_static}
+ make
+ make install
+ )
+ fi
+}
+
+#
# Build zlib
# $1 directory of the sources directory
# $2 static or shared
@@ -696,6 +756,11 @@
fi
fi
+ # build a static libconv.
+ if $build_iconv; then
+ buildany srclib/libiconv-${iconv_version} true || return 1
+ fi
+
if $has_apr; then
buildapr srclib/apr-${apr_version} false || return 1
if $has_static ; then
@@ -797,6 +862,7 @@
fi
SSLURL=http://www.openssl.org/source/openssl-${ssl_version}.tar.gz
ZLIBURL=http://www.zlib.net/zlib-${zlib_version}.tar.gz
+ICONVURL=http://ftp.gnu.org/pub/gnu/libiconv/libiconv-${iconv_version}.tar.gz
rm -rf ${package_src_dir}
mkdir -p ${package_src_dir}/srclib
@@ -816,6 +882,9 @@
if $has_api; then
ckeckdownload apr-iconv-${api_version} $APIURL $APIURLBACK
fi
+if $has_iconv; then
+ ckeckdownload libiconv-${iconv_version} $ICONVURL ""
+fi
#
# Get the repository of what we build.
Modified: trunk/build/unix/buildbin.rhel-httpd.sh
===================================================================
--- trunk/build/unix/buildbin.rhel-httpd.sh 2007-12-20 23:03:59 UTC (rev 1267)
+++ trunk/build/unix/buildbin.rhel-httpd.sh 2007-12-21 11:23:29 UTC (rev 1268)
@@ -102,6 +102,11 @@
add_conf="--with-ssl=no"
add_conf=""
fi
+if $build_iconv; then
+ # Use the static iconv we built before.
+ LDFLAGS="$LDFLAGS -L${build_common_dir}/lib -liconv"
+ export LDFLAGS
+fi
case ${BUILD_SYS} in
linux*)
add_conf="$add_conf --enable-pie"
17 years
JBoss Native SVN: r1267 - in trunk/build/unix: util and 1 other directory.
by jbossnative-commits＠lists.jboss.org
Author: jfrederic.clere(a)jboss.com
Date: 2007-12-20 18:03:59 -0500 (Thu, 20 Dec 2007)
New Revision: 1267
Modified:
trunk/build/unix/build.sh
trunk/build/unix/util/buildroot.linux2.sh
Log:
use su -b otherwise it doesn't in batch mode.
Modified: trunk/build/unix/build.sh
===================================================================
--- trunk/build/unix/build.sh 2007-12-20 16:41:13 UTC (rev 1266)
+++ trunk/build/unix/build.sh 2007-12-20 23:03:59 UTC (rev 1267)
@@ -875,10 +875,10 @@
fi
# generate a list of dependencies
-override ${build_top}/util/builddep $build_output_dir ${PACKAGE}.${build_version}.${BUILD_SYS}.${BUILD_CPU}.depends ${build_working_dir}
+override ${build_top}/util/builddep $build_output_dir ${PACKAGE}.${build_version}.${BUILD_SYS}.${BUILD_CPU}.depends ${package_output_dir}
# create a chrootable environment for testing:
-override ${build_top}/util/buildroot $build_output_dir
+override ${build_top}/util/buildroot ${package_output_dir}
# run a test
-override ${build_top}/buildtest.${PACKAGE}.sh $build_output_dir
+override ${build_top}/buildtest.${PACKAGE}.sh ${package_output_dir}
Modified: trunk/build/unix/util/buildroot.linux2.sh
===================================================================
--- trunk/build/unix/util/buildroot.linux2.sh 2007-12-20 16:41:13 UTC (rev 1266)
+++ trunk/build/unix/util/buildroot.linux2.sh 2007-12-20 23:03:59 UTC (rev 1267)
@@ -39,7 +39,7 @@
# $2 : The executable file to process.
Processlibs()
{
- for lib in `sudo /usr/bin/ldd $2 | awk 'NF==4 { print $3 } ' | sort -u`
+ for lib in `sudo -b /usr/bin/ldd $2 | awk 'NF==4 { print $3 } ' | sort -u`
do
Processfile $1 $lib
done
@@ -53,7 +53,7 @@
{
dir=`dirname $2`
mkdir -p $1/$dir
- sudo cp $2 $1/$dir
+ sudo -b cp $2 $1/$dir
}
#
@@ -82,9 +82,9 @@
# mount proc
mkdir -p $root/proc
-sudo mount -t proc proc $root/proc
+sudo -b mount -t proc proc $root/proc
# Create needed device
mkdir -p $root/dev
-sudo mknod $root/dev/null c 1 3
-sudo mknod $root/dev/random c 1 8
+sudo -b mknod $root/dev/null c 1 3
+sudo -b mknod $root/dev/random c 1 8
17 years
JBoss Native SVN: r1266 - in trunk/build/unix: util and 1 other directory.
by jbossnative-commits＠lists.jboss.org
Author: jfrederic.clere(a)jboss.com
Date: 2007-12-20 11:41:13 -0500 (Thu, 20 Dec 2007)
New Revision: 1266
Added:
trunk/build/unix/buildtest.rhel-httpd.linux2.sh
trunk/build/unix/buildtest.rhel-httpd.sh
Modified:
trunk/build/unix/build.sh
trunk/build/unix/util/buildroot.linux2.sh
Log:
Add a minimal test for httpd on Linux.
Modified: trunk/build/unix/build.sh
===================================================================
--- trunk/build/unix/build.sh 2007-12-20 13:58:12 UTC (rev 1265)
+++ trunk/build/unix/build.sh 2007-12-20 16:41:13 UTC (rev 1266)
@@ -876,3 +876,9 @@
# generate a list of dependencies
override ${build_top}/util/builddep $build_output_dir ${PACKAGE}.${build_version}.${BUILD_SYS}.${BUILD_CPU}.depends ${build_working_dir}
+
+# create a chrootable environment for testing:
+override ${build_top}/util/buildroot $build_output_dir
+
+# run a test
+override ${build_top}/buildtest.${PACKAGE}.sh $build_output_dir
Added: trunk/build/unix/buildtest.rhel-httpd.linux2.sh
===================================================================
--- trunk/build/unix/buildtest.rhel-httpd.linux2.sh (rev 0)
+++ trunk/build/unix/buildtest.rhel-httpd.linux2.sh 2007-12-20 16:41:13 UTC (rev 1266)
@@ -0,0 +1,43 @@
+#!/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
+#
+# Run a test of the httpd.
+#
+root=$1
+
+sudo /usr/sbin/chroot $root /opt/jboss/httpd/sbin/apachectl start
+sleep 5
+curl -v http://localhost | grep "It works\!"
+if [ $? -ne 0 ]; then
+ echo "Test FAILED cant start?"
+ sudo /bin/umount $root/proc
+ exit 1
+fi
+sudo /usr/sbin/chroot $root /opt/jboss/httpd/sbin/apachectl stop
+sleep 5
+sudo /bin/umount $root/proc
+curl -v http://localhost
+if [ $? -eq 0 ]; then
+ echo "Test FAILED can't stop"
+ exit 1
+fi
Property changes on: trunk/build/unix/buildtest.rhel-httpd.linux2.sh
___________________________________________________________________
Name: svn:executable
+ *
Added: trunk/build/unix/buildtest.rhel-httpd.sh
===================================================================
--- trunk/build/unix/buildtest.rhel-httpd.sh (rev 0)
+++ trunk/build/unix/buildtest.rhel-httpd.sh 2007-12-20 16:41:13 UTC (rev 1266)
@@ -0,0 +1,24 @@
+#!/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
+#
+echo "Not yet supported platform"
Property changes on: trunk/build/unix/buildtest.rhel-httpd.sh
___________________________________________________________________
Name: svn:executable
+ *
Modified: trunk/build/unix/util/buildroot.linux2.sh
===================================================================
--- trunk/build/unix/util/buildroot.linux2.sh 2007-12-20 13:58:12 UTC (rev 1265)
+++ trunk/build/unix/util/buildroot.linux2.sh 2007-12-20 16:41:13 UTC (rev 1266)
@@ -23,7 +23,7 @@
#
# Build a chrootable environment.
# $1 : Directory where the chroot will takes place.
-tools="/bin/bash /lib/ld-linux.so.2 /usr/bin/strace /usr/sbin/adduser /etc/passwd /etc/group /etc/hosts"
+tools="/bin/bash /lib/ld-linux.so.2 /usr/bin/strace /etc/passwd /etc/group /etc/hosts"
depfiles="/bin/sh /usr/bin/test"
# tools are the tools we need for the tests.
# depfiles are files the packages needed (to be generated).
@@ -39,11 +39,9 @@
# $2 : The executable file to process.
Processlibs()
{
- for lib in `ldd $2 | awk 'NF==4 { print $3 } ' | sort -u`
+ for lib in `sudo /usr/bin/ldd $2 | awk 'NF==4 { print $3 } ' | sort -u`
do
- dir=`dirname $lib`
- mkdir -p $1/$dir
- cp $lib $1/$dir
+ Processfile $1 $lib
done
}
@@ -55,7 +53,7 @@
{
dir=`dirname $2`
mkdir -p $1/$dir
- cp $2 $1/$dir
+ sudo cp $2 $1/$dir
}
#
@@ -84,9 +82,9 @@
# mount proc
mkdir -p $root/proc
-mount -t proc proc $root/proc
+sudo mount -t proc proc $root/proc
# Create needed device
mkdir -p $root/dev
-mknod $root/dev/null c 1 3
-mknod $root/dev/random c 1 8
+sudo mknod $root/dev/null c 1 3
+sudo mknod $root/dev/random c 1 8
17 years
JBoss Native SVN: r1265 - trunk/build/unix/util.
by jbossnative-commits＠lists.jboss.org
Author: jfrederic.clere(a)jboss.com
Date: 2007-12-20 08:58:12 -0500 (Thu, 20 Dec 2007)
New Revision: 1265
Added:
trunk/build/unix/util/buildroot.sh
Log:
Add the default file.
Added: trunk/build/unix/util/buildroot.sh
===================================================================
--- trunk/build/unix/util/buildroot.sh (rev 0)
+++ trunk/build/unix/util/buildroot.sh 2007-12-20 13:58:12 UTC (rev 1265)
@@ -0,0 +1,27 @@
+#!/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 for testing.
+# $1: binary build directory.
+echo "Not yet supported in this platform"
Property changes on: trunk/build/unix/util/buildroot.sh
___________________________________________________________________
Name: svn:executable
+ *
17 years
JBoss Native SVN: r1264 - trunk/build/unix/util.
by jbossnative-commits＠lists.jboss.org
Author: jfrederic.clere(a)jboss.com
Date: 2007-12-20 08:05:01 -0500 (Thu, 20 Dec 2007)
New Revision: 1264
Added:
trunk/build/unix/util/buildroot.linux2.sh
Log:
Build a chroot environment for testing.
Added: trunk/build/unix/util/buildroot.linux2.sh
===================================================================
--- trunk/build/unix/util/buildroot.linux2.sh (rev 0)
+++ trunk/build/unix/util/buildroot.linux2.sh 2007-12-20 13:05:01 UTC (rev 1264)
@@ -0,0 +1,92 @@
+#!/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 /lib/ld-linux.so.2 /usr/bin/strace /usr/sbin/adduser /etc/passwd /etc/group /etc/hosts"
+depfiles="/bin/sh /usr/bin/test"
+# 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="shadow-utils-4.0.18.1-18.fc8"
+deppackages="glibc-2.7-2 sqlite-3.4.2-3.fc8 expat-2.0.1-2 e2fsprogs-libs-1.40.2-11.fc8 zlib-1.2.3-14.fc8"
+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==4 { print $3 } ' | sort -u`
+ do
+ dir=`dirname $lib`
+ mkdir -p $1/$dir
+ cp $lib $1/$dir
+ 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.
+# $1 : Directory where to put the libraries.
+# $2 : name of the package
+Processpackage()
+{
+ for file in `rpm -ql $2`
+ do
+ Processfile $1 $file
+ done
+}
+
+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
+
+# mount proc
+mkdir -p $root/proc
+mount -t proc proc $root/proc
+
+# Create needed device
+mkdir -p $root/dev
+mknod $root/dev/null c 1 3
+mknod $root/dev/random c 1 8
17 years
JBoss Native SVN: r1263 - trunk/httpd/httpd-2.2/support.
by jbossnative-commits＠lists.jboss.org
Author: mladen.turk(a)jboss.com
Date: 2007-12-20 02:02:04 -0500 (Thu, 20 Dec 2007)
New Revision: 1263
Added:
trunk/httpd/httpd-2.2/support/NMAKEab
Modified:
trunk/httpd/httpd-2.2/support/NMAKEmakefile
Log:
Add ab(s) utility make file
Added: trunk/httpd/httpd-2.2/support/NMAKEab
===================================================================
--- trunk/httpd/httpd-2.2/support/NMAKEab (rev 0)
+++ trunk/httpd/httpd-2.2/support/NMAKEab 2007-12-20 07:02:04 UTC (rev 1263)
@@ -0,0 +1,74 @@
+# Copyright 2001-2007 The Apache Software Foundation or its licensors, as
+# applicable.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+# ====================================================================
+#
+# NMAKEmakefile ApacheBench command line utility makefile.
+#
+# Originally contributed by Mladen Turk <mturk redhat.com>
+#
+# ====================================================================
+#
+
+TARGET=EXE
+PROJECT = ab
+
+!IF !DEFINED(SRCDIR) || "$(SRCDIR)" == ""
+SRCDIR = .
+!ENDIF
+
+!include <..\NMAKEcommon.inc>
+!include <..\NMAKEhttpd.inc>
+
+LDIRS = /libpath:"$(BUILDLIB)"
+LFLAGS = $(LFLAGS) user32.lib psapi.lib gdi32.lib shlwapi.lib wldap32.lib ole32.lib $(APR) $(APU) $(API)
+CFLAGS = $(CFLAGS) -DAPR_DECLARE_STATIC -DAPU_DECLARE_STATIC
+
+INCLUDES = -I$(SRCDIR) -I$(BUILDINC)
+PDBFLAGS = -Fo$(WORKDIR)\ -Fd$(WORKDIR)\$(PROJECT)-src
+
+!IF DEFINED(WITH_OPENSSL) && "$(WITH_OPENSSL)" != "no"
+LONG_NAME="ApacheBench/SSL command line utility"
+LFLAGS = $(LFLAGS) libeay32.lib ssleay32.lib
+CFLAGS = $(CFLAGS) -DZLIB_WINAPI -DNO_IDEA -DNO_RC5 -DNO_MDC2 -DOPENSSL_NO_IDEA \
+ -DOPENSSL_NO_RC5 -DOPENSSL_NO_MDC2 -DHAVE_OPENSSL -DHAVE_SSL_SET_STATE=1
+LDIRS = $(LDIRS) /libpath:"$(WITH_OPENSSL)\lib"
+INCLUDES = -I$(INCLUDES) -I$(WITH_OPENSSL)\include
+!ELSE
+LONG_NAME="ApacheBench command line utility"
+!ENDIF
+
+BUILDBIN = $(WORKDIR)\$(PROJECT).exe
+BUILDPDB = $(WORKDIR)\$(PROJECT).pdb
+BUILDRES = $(WORKDIR)\$(PROJECT).res
+BUILDMFT = $(BUILDBIN).manifest
+
+RCFLAGS = $(RCFLAGS) /d "APP_FILE" /d BIN_NAME="$(PROJECT).so" /d LONG_NAME=$(LONG_NAME)
+
+OBJECTS = \
+ $(WORKDIR)\ab.obj
+
+{$(SRCDIR)}.c{$(WORKDIR)}.obj:
+ $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $<
+
+$(BUILDRES): ..\build\win32\httpd.rc
+ $(RC) $(RCFLAGS) /i "$(BUILDINC)" /fo $(BUILDRES) ..\build\win32\httpd.rc
+
+$(BUILDBIN): $(OBJECTS) $(BUILDRES)
+ $(LINK) $(LFLAGS) $(OBJECTS) $(BUILDRES) $(LIBS) $(LDIRS) /pdb:$(BUILDPDB) /out:$(BUILDBIN)
+ IF EXIST $(BUILDMFT) \
+ mt -nologo -manifest $(BUILDMFT) -outputresource:$(BUILDBIN);2
+
+install: $(BUILDBIN)
Property changes on: trunk/httpd/httpd-2.2/support/NMAKEab
___________________________________________________________________
Name: svn:eol-style
+ native
Modified: trunk/httpd/httpd-2.2/support/NMAKEmakefile
===================================================================
--- trunk/httpd/httpd-2.2/support/NMAKEmakefile 2007-12-20 07:00:26 UTC (rev 1262)
+++ trunk/httpd/httpd-2.2/support/NMAKEmakefile 2007-12-20 07:02:04 UTC (rev 1263)
@@ -36,7 +36,8 @@
$(SRCDIR)\NMAKEhtdigest \
$(SRCDIR)\NMAKEhtpasswd \
$(SRCDIR)\NMAKElogresolve \
- $(SRCDIR)\NMAKErotatelogs
+ $(SRCDIR)\NMAKErotatelogs \
+ $(SRCDIR)\NMAKEab
$(UTILS):
17 years
JBoss Native SVN: r1262 - trunk/httpd/httpd-2.2/modules/mod_jk.
by jbossnative-commits＠lists.jboss.org
Author: mladen.turk(a)jboss.com
Date: 2007-12-20 02:00:26 -0500 (Thu, 20 Dec 2007)
New Revision: 1262
Modified:
trunk/httpd/httpd-2.2/modules/mod_jk/NMAKEmodjk
Log:
Add HAVE_JNI although jni worker is deprecated.
Modified: trunk/httpd/httpd-2.2/modules/mod_jk/NMAKEmodjk
===================================================================
--- trunk/httpd/httpd-2.2/modules/mod_jk/NMAKEmodjk 2007-12-19 16:37:33 UTC (rev 1261)
+++ trunk/httpd/httpd-2.2/modules/mod_jk/NMAKEmodjk 2007-12-20 07:00:26 UTC (rev 1262)
@@ -40,7 +40,7 @@
PDBFLAGS = -Fo$(WORKDIR)\ -Fd$(WORKDIR)\$(PROJECT)-src
BUILDBIN = $(WORKDIR)\$(PROJECT).so
-BUILDPDB = $(WORKDIR)\$(PROJECT).pdb
+BUILDPDB = $(WORKDIR)\$(PROJECT).pdb
BUILDRES = $(WORKDIR)\$(PROJECT).res
BUILDMFT = $(BUILDBIN).manifest
@@ -69,6 +69,11 @@
$(WORKDIR)\jk_worker.obj \
$(WORKDIR)\mod_jk.obj
+!IF DEFINED(HAVE_JNI) && DEFINED(JAVA_HOME)
+OBJECTS = $(OBJECTS) $(WORKDIR)\jk_jni_worker.obj
+INCLUDES = $(INCLUDES) -I$(JAVA_HOME)\include -I$(JAVA_HOME)\include\win32
+!ENDIF
+
{$(SRCDIR)\common}.c{$(WORKDIR)}.obj:
$(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $<
17 years
JBoss Native SVN: r1261 - trunk/build/unix.
by jbossnative-commits＠lists.jboss.org
Author: jfrederic.clere(a)jboss.com
Date: 2007-12-19 11:37:33 -0500 (Wed, 19 Dec 2007)
New Revision: 1261
Modified:
trunk/build/unix/package.list
Log:
Build trunk before releasing. 2.0.3
Modified: trunk/build/unix/package.list
===================================================================
--- trunk/build/unix/package.list 2007-12-19 14:44:46 UTC (rev 1260)
+++ trunk/build/unix/package.list 2007-12-19 16:37:33 UTC (rev 1261)
@@ -2,8 +2,8 @@
# add new versions of package after existing ones.
jboss-native|2.0.1|TOMCAT_NATIVE_1_1_11|1.2.9|1.2.8|1.2.1|0.9.8e|1.2.3
jboss-native|2.0.2|TOMCAT_NATIVE_1_1_11|1.2.9|1.2.8|1.2.1|0.9.8e|1.2.3
+jboss-native|2.0.3|TOMCAT_NATIVE_1_1_11|1.2.8|1.2.8|1.2.1|0.9.8e|1.2.3
jboss-native|2.0.3-dev|trunk|1.2.8|1.2.8|1.2.1|0.9.8e|1.2.3
-jboss-native|2.0.3|TOMCAT_NATIVE_1_1_11|1.2.8|1.2.8|1.2.1|0.9.8e|1.2.3
# SIGHT
jboss-sight|1.0.0|trunk|1.2.9|1.2.8|1.2.1
jboss-sight|1.0.1|trunk|1.2.8|1.2.8|1.2.1
17 years
JBoss Native SVN: r1260 - trunk/build/unix.
by jbossnative-commits＠lists.jboss.org
Author: jfrederic.clere(a)jboss.com
Date: 2007-12-19 09:44:46 -0500 (Wed, 19 Dec 2007)
New Revision: 1260
Modified:
trunk/build/unix/buildbin.asf-jk.sh
Log:
Add LD_LIBRARY_PATH for apxs... Solaris needs that.
Use a temp sed file for script.
Modified: trunk/build/unix/buildbin.asf-jk.sh
===================================================================
--- trunk/build/unix/buildbin.asf-jk.sh 2007-12-19 12:58:09 UTC (rev 1259)
+++ trunk/build/unix/buildbin.asf-jk.sh 2007-12-19 14:44:46 UTC (rev 1260)
@@ -53,8 +53,10 @@
configdir=`dirname $config`
#
# Arrange apxs/config_vars.mk so that we can use it with the httpd we are building.
-sed "/^my \$installbuilddir = / c\
-my \$installbuilddir = \"${configdir}\";" ${apxs} | sed 's:config_vars.mk:config_vars.mk.jk:' > ${apxs}.jk
+echo "/^my \$installbuilddir = / c\\" > $$.sed
+echo "my \$installbuilddir = \"${configdir}\";" >> $$.sed
+
+sed -f $$.sed ${apxs} | sed 's:config_vars.mk:config_vars.mk.jk:' > ${apxs}.jk
chmod a+x ${apxs}.jk
sbindir=`find $output_loc -type d -name sbin`
@@ -92,6 +94,9 @@
mkdir -p $configdir/jk
cp $configdir/config_vars.mk.jk $configdir/jk/config_vars.mk
+libdir=`find $output_loc -type d -name lib`
+LD_LIBRARY_PATH=$libdir
+export LD_LIBRARY_PATH
echo "$native_sources; ./configure --with-apxs=${apxs}.jk"
./configure --with-apxs=${apxs}.jk
make
17 years
JBoss Native SVN: r1259 - trunk/httpd/httpd-2.2/modules/mod_jk.
by jbossnative-commits＠lists.jboss.org
Author: mladen.turk(a)jboss.com
Date: 2007-12-19 07:58:09 -0500 (Wed, 19 Dec 2007)
New Revision: 1259
Added:
trunk/httpd/httpd-2.2/modules/mod_jk/NMAKEmakefile
trunk/httpd/httpd-2.2/modules/mod_jk/NMAKEmodjk
Log:
Add mod_jk module makefiles
Added: trunk/httpd/httpd-2.2/modules/mod_jk/NMAKEmakefile
===================================================================
--- trunk/httpd/httpd-2.2/modules/mod_jk/NMAKEmakefile (rev 0)
+++ trunk/httpd/httpd-2.2/modules/mod_jk/NMAKEmakefile 2007-12-19 12:58:09 UTC (rev 1259)
@@ -0,0 +1,43 @@
+# Copyright 2001-2007 The Apache Software Foundation or its licensors, as
+# applicable.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+# ====================================================================
+#
+# NMAKEmakefile Master mod_jk module makefile.
+#
+# Originally contributed by Mladen Turk <mturk redhat.com>
+#
+# ====================================================================
+#
+
+TARGET=DLL
+!IF !DEFINED(SRCDIR) || "$(SRCDIR)" == ""
+SRCDIR = .
+!ENDIF
+
+!include <..\..\NMAKEcommon.inc>
+!include <..\..\NMAKEhttpd.inc>
+
+MODULES = \
+ $(SRCDIR)\NMAKEmodjk
+
+$(MODULES):
+ @$(MAKE) -nologo -f $@ PREFIX=$(PREFIX) install
+
+$(WORKDIR):
+ @$(MAKEWORKDIR)
+
+install: $(WORKDIR) $(MODULES)
+ @xcopy "$(WORKDIR)\*.so" "$(BUILDMOD)" /Y /Q 2>NUL
Property changes on: trunk/httpd/httpd-2.2/modules/mod_jk/NMAKEmakefile
___________________________________________________________________
Name: svn:eol-style
+ native
Added: trunk/httpd/httpd-2.2/modules/mod_jk/NMAKEmodjk
===================================================================
--- trunk/httpd/httpd-2.2/modules/mod_jk/NMAKEmodjk (rev 0)
+++ trunk/httpd/httpd-2.2/modules/mod_jk/NMAKEmodjk 2007-12-19 12:58:09 UTC (rev 1259)
@@ -0,0 +1,86 @@
+# Copyright 2001-2007 The Apache Software Foundation or its licensors, as
+# applicable.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+# ====================================================================
+#
+# NMAKEmakefile jk module makefile.
+#
+# Originally contributed by Mladen Turk <mturk redhat.com>
+#
+# ====================================================================
+#
+
+TARGET=DLL
+PROJECT = mod_jk
+
+!IF !DEFINED(SRCDIR) || "$(SRCDIR)" == ""
+SRCDIR = .
+!ENDIF
+
+!include <..\..\NMAKEcommon.inc>
+!include <..\..\NMAKEhttpd.inc>
+
+LDIRS = /libpath:"$(BUILDLIB)"
+LFLAGS = $(LFLAGS) user32.lib psapi.lib gdi32.lib shlwapi.lib wldap32.lib ole32.lib $(LIBAPR) $(LIBAPU) $(LIBHTTPD)
+CFLAGS = $(CFLAGS) -DPROXY_DECLARE_EXPORT
+
+INCLUDES = -I$(SRCDIR)\common -I$(BUILDINC)
+PDBFLAGS = -Fo$(WORKDIR)\ -Fd$(WORKDIR)\$(PROJECT)-src
+
+BUILDBIN = $(WORKDIR)\$(PROJECT).so
+BUILDPDB = $(WORKDIR)\$(PROJECT).pdb
+BUILDRES = $(WORKDIR)\$(PROJECT).res
+BUILDMFT = $(BUILDBIN).manifest
+
+RCFLAGS = $(RCFLAGS) /d BIN_NAME="$(PROJECT).so" /d LONG_NAME="jk_module for Apache"
+
+OBJECTS = \
+ $(WORKDIR)\jk_ajp12_worker.obj \
+ $(WORKDIR)\jk_ajp13.obj \
+ $(WORKDIR)\jk_ajp13_worker.obj \
+ $(WORKDIR)\jk_ajp14.obj \
+ $(WORKDIR)\jk_ajp14_worker.obj \
+ $(WORKDIR)\jk_ajp_common.obj \
+ $(WORKDIR)\jk_connect.obj \
+ $(WORKDIR)\jk_context.obj \
+ $(WORKDIR)\jk_lb_worker.obj \
+ $(WORKDIR)\jk_map.obj \
+ $(WORKDIR)\jk_md5.obj \
+ $(WORKDIR)\jk_msg_buff.obj \
+ $(WORKDIR)\jk_pool.obj \
+ $(WORKDIR)\jk_shm.obj \
+ $(WORKDIR)\jk_sockbuf.obj \
+ $(WORKDIR)\jk_status.obj \
+ $(WORKDIR)\jk_uri_worker_map.obj \
+ $(WORKDIR)\jk_url.obj \
+ $(WORKDIR)\jk_util.obj \
+ $(WORKDIR)\jk_worker.obj \
+ $(WORKDIR)\mod_jk.obj
+
+{$(SRCDIR)\common}.c{$(WORKDIR)}.obj:
+ $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $<
+
+{$(SRCDIR)\apache-2.0}.c{$(WORKDIR)}.obj:
+ $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $<
+
+$(BUILDRES): ..\..\build\win32\httpd.rc
+ $(RC) $(RCFLAGS) /i "$(BUILDINC)" /fo $(BUILDRES) ..\..\build\win32\httpd.rc
+
+$(BUILDBIN): $(OBJECTS) $(BUILDRES)
+ $(LINK) $(LFLAGS) $(OBJECTS) $(BUILDRES) $(LIBS) $(LDIRS) /pdb:$(BUILDPDB) /out:$(BUILDBIN)
+ IF EXIST $(BUILDMFT) \
+ mt -nologo -manifest $(BUILDMFT) -outputresource:$(BUILDBIN);2
+
+install: $(BUILDBIN)
Property changes on: trunk/httpd/httpd-2.2/modules/mod_jk/NMAKEmodjk
___________________________________________________________________
Name: svn:eol-style
+ native
17 years