JBoss Native SVN: r1228 - in trunk/build/unix: util and 1 other directory.
by jbossnative-commits＠lists.jboss.org
Author: jfrederic.clere(a)jboss.com
Date: 2007-12-17 14:20:11 -0500 (Mon, 17 Dec 2007)
New Revision: 1228
Modified:
trunk/build/unix/buildsrc.asf-jk.sh
trunk/build/unix/util/ckeckdownload.sh
Log:
Typos.
Modified: trunk/build/unix/buildsrc.asf-jk.sh
===================================================================
--- trunk/build/unix/buildsrc.asf-jk.sh 2007-12-17 17:16:25 UTC (rev 1227)
+++ trunk/build/unix/buildsrc.asf-jk.sh 2007-12-17 19:20:11 UTC (rev 1228)
@@ -48,6 +48,7 @@
*)
URL=${URLBASE}.tar.gz
URLBACK=${URLBASEBACK}.tar.gz
+ ;;
esac
util/ckeckdownload.sh $build_cache_dir $package_src_dir $build_top tomcat-connectors-${native_tag}-src $URL $URLBACK
Modified: trunk/build/unix/util/ckeckdownload.sh
===================================================================
--- trunk/build/unix/util/ckeckdownload.sh 2007-12-17 17:16:25 UTC (rev 1227)
+++ trunk/build/unix/util/ckeckdownload.sh 2007-12-17 19:20:11 UTC (rev 1228)
@@ -95,5 +95,7 @@
url=$5
urlback=$6
+echo "url: $url urlback: $urlback"
+
# Call the internal functions.
-ckeckdownload $src_dir $url $url_back
+ckeckdownload $src_dir $url $urlback
16 years, 5 months
JBoss Native SVN: r1227 - trunk/build/unix.
by jbossnative-commits＠lists.jboss.org
Author: jfrederic.clere(a)jboss.com
Date: 2007-12-17 12:16:25 -0500 (Mon, 17 Dec 2007)
New Revision: 1227
Modified:
trunk/build/unix/buildbin.asf-jk.sh
Log:
Trick environment to build mod_jk.
Modified: trunk/build/unix/buildbin.asf-jk.sh
===================================================================
--- trunk/build/unix/buildbin.asf-jk.sh 2007-12-17 14:19:28 UTC (rev 1226)
+++ trunk/build/unix/buildbin.asf-jk.sh 2007-12-17 17:16:25 UTC (rev 1227)
@@ -49,7 +49,45 @@
cd $native_sources
apxs=`find $output_loc -name apxs`
-echo "$native_sources; ./configure --with-apxs=${apxs}"
-./configure --with-apxs=${apxs}
+config=`find $output_loc -name config_vars.mk`
+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
+chmod a+x ${apxs}.jk
+
+sbindir=`find $output_loc -type d -name sbin`
+bindir=`find $output_loc -type d -name bin`
+APR_CONFIG=`find $output_loc -type f -name apr-1-config`
+APU_CONFIG=`find $output_loc -type f -name apu-1-config`
+LIBTOOL=`find $output_loc -type f -name libtool`
+APR_INCLUDE=`find $output_loc -type f -name apr_lib.h`
+APR_INCLUDEDIR=`dirname $APR_INCLUDE`
+APU_INCLUDE=`find $output_loc -type f -name apu.h`
+APU_INCLUDEDIR=`dirname $APU_INCLUDE`
+exp_installbuild=`find $output_loc -type f -name config_vars.mk`
+exp_installbuilddir=`dirname $exp_installbuild`
+modules_dir=`find $output_loc -type d -name modules`
+sed "/^sbindir = / c\
+sbindir = ${sbindir}" $configdir/config_vars.mk > $$.mk
+sed "/^bindir = / c\
+bindir = ${bindir}" $$.mk > $$.mk2
+sed "/^APR_CONFIG = / c\
+APR_CONFIG = ${APR_CONFIG}" $$.mk2 > $$.mk
+sed "/^APU_CONFIG = / c\
+APU_CONFIG = ${APU_CONFIG}" $$.mk > $$.mk2
+sed "/^LIBTOOL = / c\
+LIBTOOL = ${LIBTOOL}" $$.mk2 > $$.mk
+sed "/^APR_INCLUDEDIR = / c\
+APR_INCLUDEDIR = ${APR_INCLUDEDIR}" $$.mk > $$.mk2
+sed "/^APU_INCLUDEDIR = / c\
+APU_INCLUDEDIR = ${APU_INCLUDEDIR}" $$.mk2 > $$.mk
+
+echo "$native_sources; ./configure --with-apxs=${apxs}.jk"
+./configure --with-apxs=${apxs}.jk
make
-make DESTDIR=$output_loc install
+(cd apache-2.0
+ ../scripts/build/instdso.sh SH_LIBTOOL=${LIBTOOL} mod_jk.la `pwd`
+ cp mod_jk.${so_extension} ${modules_dir}
+)
16 years, 5 months
JBoss Native SVN: r1226 - trunk/build/unix.
by jbossnative-commits＠lists.jboss.org
Author: jfrederic.clere(a)jboss.com
Date: 2007-12-17 09:19:28 -0500 (Mon, 17 Dec 2007)
New Revision: 1226
Modified:
trunk/build/unix/build.sh
trunk/build/unix/buildbin.rhel-httpd.sh
Log:
Improve the handling of return codes.
Modified: trunk/build/unix/build.sh
===================================================================
--- trunk/build/unix/build.sh 2007-12-17 14:18:16 UTC (rev 1225)
+++ trunk/build/unix/build.sh 2007-12-17 14:19:28 UTC (rev 1226)
@@ -327,14 +327,14 @@
shift
echo "Running ${basedir}/$run $@"
${basedir}/$run $@
- if [ $? -eq 2 ]; then
+ ret=$?
+ if [ ${ret} -eq 2 ]; then
echo "$run not supported on this platform"
- exit 0
+ return 0
+ elif [ ${ret} -ne 0 ]; then
+ echo "$run returned ${ret}"
+ return 1
fi
- if [ $? -eq 1 ]; then
- echo "$run failed"
- exit 1
- fi
}
# Download the sources. It guess how to do it.
@@ -682,41 +682,45 @@
dst_dir=$1
if $has_zlib; then
- buildzlib srclib/zlib-${zlib_version} false
+ buildzlib srclib/zlib-${zlib_version} false || return 1
if $has_static ; then
- builzlib srclib/zlib-${zlib_version} true
+ builzlib srclib/zlib-${zlib_version} true || return 1
fi
fi
# apr-util has a --with-openssl=DIR so we must be build openssl before apu.
ls srclib | grep openssl >/dev/null
if [ $? -eq 0 ]; then
- buildopenssl srclib/openssl-${ssl_version} false
+ buildopenssl srclib/openssl-${ssl_version} false || return 1
if $has_static ; then
- buildopenssl srclib/openssl-${ssl_version} false
+ buildopenssl srclib/openssl-${ssl_version} false || return 1
fi
fi
if $has_apr; then
- buildapr srclib/apr-${apr_version} false
+ buildapr srclib/apr-${apr_version} false || return 1
if $has_static ; then
- buildapr srclib/apr-${apr_version} true
+ buildapr srclib/apr-${apr_version} true || return 1
fi
if $build_api; then
- buildapi srclib/apr-iconv-${api_version} false
+ buildapi srclib/apr-iconv-${api_version} false || return 1
if $has_static ; then
- buildapi srclib/apr-iconv-${api_version} true
+ buildapi srclib/apr-iconv-${api_version} true || return 1
fi
fi
if $has_apu; then
- buildapu srclib/apr-util-${apu_version} false
+ buildapu srclib/apr-util-${apu_version} false || return 1
if $has_static ; then
- buildapu srclib/apr-util-${apu_version} true
+ buildapu srclib/apr-util-${apu_version} true || return 1
fi
fi
fi
# Do our specific part.
override ${package_src_dir}/buildbin.${PACKAGE}.sh ${build_common_dir} ${package_dist_dir} ${package_output_dir} $has_openssl $has_static
+ if [ $? -ne 0 ]; then
+ echo "${package_src_dir}/buildbin.${PACKAGE}.sh failed"
+ return 1
+ fi
# General part
cp JBossORG-EULA.txt ${package_output_dir}
@@ -724,10 +728,18 @@
# mod_jk
if $has_jk; then
override ${package_src_dir}/buildbin.asf-jk.sh ${build_common_dir} ${package_dist_dir} ${package_output_dir} $has_openssl $has_static
+ if [ $? -ne 0 ]; then
+ echo "${package_src_dir}/buildbin.asf-jk.sh failed"
+ return 1
+ fi
fi
# Build the binary distribution tarball
buildtar ${package_output_dir} "*" ${dst_dir} ${package_build_name}
+ if [ $? -ne 0 ]; then
+ echo "buildtar ${package_output_dir} failed"
+ return 1
+ fi
}
# Only buid binaries?
@@ -855,8 +867,12 @@
# Now build the binaries
(cd ${package_src_dir}
- buildbin $build_output_dir
+ buildbin $build_output_dir || exit 1
)
+if [ $? -ne 0 ]; then
+ echo "buildbin $build_output_dir failed"
+ exit 1
+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}
Modified: trunk/build/unix/buildbin.rhel-httpd.sh
===================================================================
--- trunk/build/unix/buildbin.rhel-httpd.sh 2007-12-17 14:18:16 UTC (rev 1225)
+++ trunk/build/unix/buildbin.rhel-httpd.sh 2007-12-17 14:19:28 UTC (rev 1226)
@@ -74,9 +74,9 @@
--with-suexec-bin=${_sbindir}/suexec \
--with-suexec-uidmin=500 --with-suexec-gidmin=100 \
--with-pcre \
- $*
-make
-) || exit 1
+ $* || exit 1
+make || exit 1
+) || return 1
}
#
@@ -119,13 +119,23 @@
--enable-file-cache --enable-disk-cache \
--enable-cgid \
--enable-authn-anon --enable-authn-alias
+if [ $? -ne 0 ]; then
+ echo "mpmbuild prefork failed"
+ exit 1
+fi
# For the other MPMs, just build httpd and no optional modules
mpmbuild worker --enable-modules=none
+if [ $? -ne 0 ]; then
+ echo "mpmbuild worker failed"
+ exit 1
+fi
# Install it
RPM_BUILD_ROOT=$output_loc
(cd prefork
make DESTDIR=$RPM_BUILD_ROOT install
-) || exit 1
+)
install -m 755 worker/httpd ${RPM_BUILD_ROOT}/${_sbindir}/httpd.worker
+echo "Done"
+exit 0
16 years, 5 months
JBoss Native SVN: r1225 - trunk/build/unix.
by jbossnative-commits＠lists.jboss.org
Author: jfrederic.clere(a)jboss.com
Date: 2007-12-17 09:18:16 -0500 (Mon, 17 Dec 2007)
New Revision: 1225
Modified:
trunk/build/unix/buildsrc.rhel-httpd.sh
Log:
Don't regenerate configure... It seems a "special autoconf/autoheader" is needed.
Also remove the patch that needed to regenerate configure.
Modified: trunk/build/unix/buildsrc.rhel-httpd.sh
===================================================================
--- trunk/build/unix/buildsrc.rhel-httpd.sh 2007-12-17 08:37:26 UTC (rev 1224)
+++ trunk/build/unix/buildsrc.rhel-httpd.sh 2007-12-17 14:18:16 UTC (rev 1225)
@@ -92,10 +92,13 @@
# Remove linux specific patches.
case ${BUILD_SYS} in
linux*)
- remove_list=""
+ # XXX: Somehow we can't apply the patches for the moment. (See configure).
+ remove_list="httpd-2.0.45-deplibs.patch httpd-2.0.54-selinux.patch httpd-2.2.2-ac260.patch httpd-2.1.10-apctl.patch httpd-2.1.10-apxs.patch httpd-2.1.10-disablemods.patch"
;;
*)
- remove_list="httpd-2.0.54-selinux.patch httpd-2.1.10-apxs.patch httpd-2.0.45-deplibs.patch"
+ remove_list="httpd-2.0.45-deplibs.patch httpd-2.0.54-selinux.patch httpd-2.2.2-ac260.patch httpd-2.1.10-apctl.patch httpd-2.1.10-apxs.patch httpd-2.1.10-disablemods.patch"
+ # XXX: See above...
+ # remove_list="httpd-2.0.54-selinux.patch httpd-2.1.10-apxs.patch httpd-2.0.45-deplibs.patch"
;;
esac
if [ -z "${remove_list}" ]; then
@@ -114,6 +117,7 @@
#
# regenerate configure scripts
-(cd ${dirsources}
- autoheader && autoconf || exit 1
-)
+# XXX: It seems that produces a destroyed configure (on f8 and hpux at least).
+#(cd ${dirsources}
+# autoheader && autoconf || exit 1
+#)
16 years, 5 months
JBoss Native SVN: r1224 - trunk/build/unix.
by jbossnative-commits＠lists.jboss.org
Author: jfrederic.clere(a)jboss.com
Date: 2007-12-17 03:37:26 -0500 (Mon, 17 Dec 2007)
New Revision: 1224
Modified:
trunk/build/unix/buildbin.asf-jk.sh
Log:
Typo.
Modified: trunk/build/unix/buildbin.asf-jk.sh
===================================================================
--- trunk/build/unix/buildbin.asf-jk.sh 2007-12-15 13:03:14 UTC (rev 1223)
+++ trunk/build/unix/buildbin.asf-jk.sh 2007-12-17 08:37:26 UTC (rev 1224)
@@ -52,4 +52,4 @@
echo "$native_sources; ./configure --with-apxs=${apxs}"
./configure --with-apxs=${apxs}
make
-make DESTDIR=$output_loc` install
+make DESTDIR=$output_loc install
16 years, 5 months
JBoss Native SVN: r1223 - trunk/httpd/httpd-2.2.
by jbossnative-commits＠lists.jboss.org
Author: mladen.turk(a)jboss.com
Date: 2007-12-15 08:03:14 -0500 (Sat, 15 Dec 2007)
New Revision: 1223
Modified:
trunk/httpd/httpd-2.2/NMAKElibhttpd
trunk/httpd/httpd-2.2/NMAKEmakefile
Log:
Be silent when calling nmake
Modified: trunk/httpd/httpd-2.2/NMAKElibhttpd
===================================================================
--- trunk/httpd/httpd-2.2/NMAKElibhttpd 2007-12-15 12:40:57 UTC (rev 1222)
+++ trunk/httpd/httpd-2.2/NMAKElibhttpd 2007-12-15 13:03:14 UTC (rev 1223)
@@ -116,30 +116,30 @@
$(BUILDAPR) :
cd $(SRCDIR)\srclib\apr
- $(MAKE) -f NMAKEmakefile PREFIX=$(PREFIX) install
- $(MAKE) -f NMAKEmakefile PREFIX=$(PREFIX) APR_DECLARE_STATIC=1 install
+ @$(MAKE) -nologo -f NMAKEmakefile PREFIX=$(PREFIX) install
+ @$(MAKE) -nologo -f NMAKEmakefile PREFIX=$(PREFIX) APR_DECLARE_STATIC=1 install
cd ..\..
$(BUILDAPU) :
cd $(SRCDIR)\srclib\apr-util
- $(MAKE) -f NMAKEmakefile PREFIX=$(PREFIX) install
- $(MAKE) -f NMAKEmakefile PREFIX=$(PREFIX) APR_DECLARE_STATIC=1 install
+ @$(MAKE) -nologo -f NMAKEmakefile PREFIX=$(PREFIX) install
+ @$(MAKE) -nologo -f NMAKEmakefile PREFIX=$(PREFIX) APR_DECLARE_STATIC=1 install
cd ..\..
$(BUILDAPI) :
cd $(SRCDIR)\srclib\apr-iconv
- $(MAKE) -f NMAKEmakefile PREFIX=$(PREFIX) install
- $(MAKE) -f NMAKEmakefile PREFIX=$(PREFIX) APR_DECLARE_STATIC=1 install
+ @$(MAKE) -nologo -f NMAKEmakefile PREFIX=$(PREFIX) install
+ @$(MAKE) -nologo -f NMAKEmakefile PREFIX=$(PREFIX) APR_DECLARE_STATIC=1 install
cd ..\..
$(BUILDPCRE) :
cd $(SRCDIR)\srclib\pcre
- $(MAKE) -f NMAKEmakefile PCRE_STATIC=1 PREFIX=$(PREFIX) install
+ @$(MAKE) -nologo -f NMAKEmakefile PCRE_STATIC=1 PREFIX=$(PREFIX) install
cd ..\..
$(BUILDTCHR) :
cd $(SRCDIR)\server
- $(MAKE) -f NMAKEmakefile PREFIX=$(PREFIX)
+ @$(MAKE) -nologo -f NMAKEmakefile PREFIX=$(PREFIX)
cd ..
$(SRCDIR)\server\test_char.h : $(BUILDAPR) $(BUILDTCHR)
Modified: trunk/httpd/httpd-2.2/NMAKEmakefile
===================================================================
--- trunk/httpd/httpd-2.2/NMAKEmakefile 2007-12-15 12:40:57 UTC (rev 1222)
+++ trunk/httpd/httpd-2.2/NMAKEmakefile 2007-12-15 13:03:14 UTC (rev 1223)
@@ -63,7 +63,7 @@
@$(MAKEWORKDIR)
$(BUILDDEP) :
- $(MAKE) -f NMAKElibhttpd PREFIX=$(PREFIX) install
+ @$(MAKE) -nologo -f NMAKElibhttpd PREFIX=$(PREFIX) install
{$(SRCDIR)\server}.c{$(WORKDIR)}.obj:
$(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $<
16 years, 5 months
JBoss Native SVN: r1222 - trunk/httpd/httpd-2.2/modules.
by jbossnative-commits＠lists.jboss.org
Author: mladen.turk(a)jboss.com
Date: 2007-12-15 07:40:57 -0500 (Sat, 15 Dec 2007)
New Revision: 1222
Added:
trunk/httpd/httpd-2.2/modules/aaa/
trunk/httpd/httpd-2.2/modules/arch/
trunk/httpd/httpd-2.2/modules/cache/
trunk/httpd/httpd-2.2/modules/database/
trunk/httpd/httpd-2.2/modules/dav/
trunk/httpd/httpd-2.2/modules/debug/
trunk/httpd/httpd-2.2/modules/echo/
trunk/httpd/httpd-2.2/modules/experimental/
trunk/httpd/httpd-2.2/modules/filters/
trunk/httpd/httpd-2.2/modules/generators/
trunk/httpd/httpd-2.2/modules/http/
trunk/httpd/httpd-2.2/modules/ldap/
trunk/httpd/httpd-2.2/modules/loggers/
trunk/httpd/httpd-2.2/modules/mappers/
trunk/httpd/httpd-2.2/modules/metadata/
trunk/httpd/httpd-2.2/modules/proxy/
trunk/httpd/httpd-2.2/modules/ssl/
Log:
Add module placeholders
16 years, 5 months
JBoss Native SVN: r1221 - in trunk/httpd/httpd-2.2: server and 1 other directory.
by jbossnative-commits＠lists.jboss.org
Author: mladen.turk(a)jboss.com
Date: 2007-12-15 07:33:14 -0500 (Sat, 15 Dec 2007)
New Revision: 1221
Added:
trunk/httpd/httpd-2.2/NMAKEhttpd.inc
trunk/httpd/httpd-2.2/server/
trunk/httpd/httpd-2.2/server/NMAKEmakefile
Log:
Add common and gen_char make files
Added: trunk/httpd/httpd-2.2/NMAKEhttpd.inc
===================================================================
--- trunk/httpd/httpd-2.2/NMAKEhttpd.inc (rev 0)
+++ trunk/httpd/httpd-2.2/NMAKEhttpd.inc 2007-12-15 12:33:14 UTC (rev 1221)
@@ -0,0 +1,81 @@
+# 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.
+#
+# ====================================================================
+#
+# NMAKEhttpd.inc Master HTTPD definitions.
+#
+# Originally contributed by Mladen Turk <mturk redhat.com>
+#
+# ====================================================================
+#
+
+BUILDINC = $(PREFIX)\include
+BUILDLIB = $(PREFIX)\lib
+BUILDOUT = $(PREFIX)\bin
+BUILDMOD = $(PREFIX)\modules
+BUILDMAN = $(PREFIX)\manual
+BUILDDOC = $(PREFIX)\htdocs
+BUILDCFG = $(PREFIX)\conf
+BUILDERR = $(PREFIX)\error
+BUILDICO = $(PREFIX)\icons
+BUILDCGI = $(PREFIX)\cgi-bin
+BUILDLOG = $(PREFIX)\logs
+BUILDINS = $(PREFIX)\LICENSE
+
+LIBAPR = libapr-1.lib
+LIBAPU = libaprutil-1.lib
+LIBAPI = libapriconv-1.lib
+APR = apr-1.lib
+APU = aprutil-1.lib
+API = apriconv-1.lib
+PCRE = pcre.lib
+LIBHTTPD = libhttpd.lib
+
+$(BUILDINC) :
+ @if not exist "$(BUILDINC)\arch\win32\$(NULL)" mkdir "$(BUILDINC)\arch\win32"
+
+$(BUILDLIB) :
+ @if not exist "$(BUILDLIB)\$(NULL)" mkdir "$(BUILDLIB)"
+
+$(BUILDOUT) :
+ @if not exist "$(BUILDOUT)\$(NULL)" mkdir "$(BUILDOUT)"
+
+$(BUILDMOD) :
+ @if not exist "$(BUILDMOD)\$(NULL)" mkdir "$(BUILDMOD)"
+
+$(BUILDMAN) :
+ @if not exist "$(BUILDMAN)\$(NULL)" mkdir "$(BUILDMAN)"
+
+$(BUILDDOC) :
+ @if not exist "$(BUILDDOC)\$(NULL)" mkdir "$(BUILDDOC)"
+
+$(BUILDICO) :
+ @if not exist "$(BUILDICO)\$(NULL)" mkdir "$(BUILDICO)"
+
+$(BUILDCGI) :
+ @if not exist "$(BUILDCGI)\$(NULL)" mkdir "$(BUILDCGI)"
+
+$(BUILDLOG) :
+ @if not exist "$(BUILDLOG)\$(NULL)" mkdir "$(BUILDLOG)"
+
+$(BUILDCFG) :
+ @if not exist "$(BUILDCFG)\extra\$(NULL)" mkdir "$(BUILDCFG)\extra"
+
+$(BUILDERR) :
+ @if not exist "$(BUILDERR)\include\$(NULL)" mkdir "$(BUILDERR)\include"
+
+$(BUILDINS) : $(BUILDINC) $(BUILDLIB) $(BUILDOUT) $(BUILDMOD) $(BUILDMAN) $(BUILDDOC) $(BUILDCFG) $(BUILDERR) $(BUILDICO) $(BUILDCGI) $(BUILDLOG)
+ @copy /Y LICENSE $@ >NUL
Property changes on: trunk/httpd/httpd-2.2/NMAKEhttpd.inc
___________________________________________________________________
Name: svn:eol-style
+ native
Added: trunk/httpd/httpd-2.2/server/NMAKEmakefile
===================================================================
--- trunk/httpd/httpd-2.2/server/NMAKEmakefile (rev 0)
+++ trunk/httpd/httpd-2.2/server/NMAKEmakefile 2007-12-15 12:33:14 UTC (rev 1221)
@@ -0,0 +1,62 @@
+# 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 HTTPD makefile.
+# Usage:
+# DEBUG=1 Build DEBUG version of HTTPD
+#
+# Originally contributed by Mladen Turk <mturk redhat.com>
+#
+# ====================================================================
+#
+
+
+TARGET=EXE
+PROJECT = gen_test_char
+
+!IF !DEFINED(SRCDIR) || "$(SRCDIR)" == ""
+SRCDIR = .
+!ENDIF
+
+!include <..\NMAKEcommon.inc>
+!include <..\NMAKEhttpd.inc>
+
+CFLAGS = $(CFLAGS) -DAPR_DECLARE_STATIC
+LDIRS = /libpath:"$(BUILDLIB)"
+LIBS = $(LIBS) $(APR)
+
+INCLUDES = -I$(BUILDINC)
+PDBFLAGS = -Fo$(WORKDIR)\ -Fd$(WORKDIR)\$(PROJECT)-src
+OBJECTS = \
+ $(WORKDIR)\gen_test_char.obj
+
+BUILDBIN = $(WORKDIR)\$(PROJECT).exe
+BUILDPDB = $(WORKDIR)\$(PROJECT).pdb
+
+all : $(WORKDIR) $(BUILDBIN)
+
+$(WORKDIR) :
+ @$(MAKEWORKDIR)
+
+{$(SRCDIR)}.c{$(WORKDIR)}.obj:
+ $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $<
+
+$(BUILDBIN): $(WORKDIR) $(BUILDDEP) $(OBJECTS)
+ $(LINK) $(LFLAGS) $(OBJECTS) $(BUILDRES) $(LIBS) $(LDIRS) /pdb:$(BUILDPDB) /out:$(BUILDBIN)
+
+clean:
+ @$(CLEANTARGET)
Property changes on: trunk/httpd/httpd-2.2/server/NMAKEmakefile
___________________________________________________________________
Name: svn:eol-style
+ native
16 years, 5 months
JBoss Native SVN: r1220 - in trunk/httpd/httpd-2.2: srclib/apr and 4 other directories.
by jbossnative-commits＠lists.jboss.org
Author: mladen.turk(a)jboss.com
Date: 2007-12-15 07:32:07 -0500 (Sat, 15 Dec 2007)
New Revision: 1220
Modified:
trunk/httpd/httpd-2.2/NMAKElibhttpd
trunk/httpd/httpd-2.2/NMAKEmakefile
trunk/httpd/httpd-2.2/srclib/apr-iconv/NMAKEmakefile
trunk/httpd/httpd-2.2/srclib/apr-util/NMAKEmakefile
trunk/httpd/httpd-2.2/srclib/apr/NMAKEmakefile
trunk/httpd/httpd-2.2/srclib/pcre/NMAKEmakefile
trunk/httpd/httpd-2.2/srclib/zlib/NMAKEmakefile
Log:
Update make files
Modified: trunk/httpd/httpd-2.2/NMAKElibhttpd
===================================================================
--- trunk/httpd/httpd-2.2/NMAKElibhttpd 2007-12-14 17:47:49 UTC (rev 1219)
+++ trunk/httpd/httpd-2.2/NMAKElibhttpd 2007-12-15 12:32:07 UTC (rev 1220)
@@ -15,7 +15,7 @@
#
# ====================================================================
#
-# NMAKEmakefile Master HTTPD makefile.
+# NMAKEmakefile HTTPD core library makefile.
# Usage:
# DEBUG=1 Build DEBUG version of HTTPD
#
@@ -32,48 +32,83 @@
SRCDIR = .
!ENDIF
+CFLAGS = $(CFLAGS) -DAP_DECLARE_EXPORT -DPCRE_STATIC
+
!include <NMAKEcommon.inc>
+!include <NMAKEhttpd.inc>
-LDIRS = /libpath:"$(SRCDIR)\srclib\apr\$(WORKDIR)" /libpath:"$(SRCDIR)\srclib\apr-iconv\$(WORKDIR)" /libpath:"$(SRCDIR)\srclib\apr-util\$(WORKDIR)"
-LFLAGS = $(LFLAGS) user32.lib psapi.lib gdi32.lib shlwapi.lib wldap32.lib ole32.lib libapr-1.lib libapriconv-1.lib libaprutil-1.lib
+LDIRS = /libpath:"$(BUILDLIB)"
+LFLAGS = $(LFLAGS) user32.lib psapi.lib gdi32.lib shlwapi.lib wldap32.lib ole32.lib $(LIBAPR) $(LIBAPU) $(LIBAPI) $(PCRE)
-INCLUDES = -I$(SRCDIR)\include -I$(SRCDIR)\srclib\apr\include -I$(SRCDIR)\srclib\apr-util\include
+INCLUDES = -I$(SRCDIR)\include -I$(BUILDINC)
PDBFLAGS = -Fo$(WORKDIR)\ -Fd$(WORKDIR)\$(PROJECT)-src
OBJECTS = \
- $(WORKDIR)\main.obj
+ $(WORKDIR)\buildmark.obj \
+ $(WORKDIR)\config.obj \
+ $(WORKDIR)\connection.obj \
+ $(WORKDIR)\core.obj \
+ $(WORKDIR)\core_filters.obj \
+ $(WORKDIR)\log.obj \
+ $(WORKDIR)\protocol.obj \
+ $(WORKDIR)\request.obj \
+ $(WORKDIR)\vhost.obj \
+ $(WORKDIR)\eoc_bucket.obj \
+ $(WORKDIR)\error_bucket.obj \
+ $(WORKDIR)\mpm_common.obj \
+ $(WORKDIR)\scoreboard.obj \
+ $(WORKDIR)\util.obj \
+ $(WORKDIR)\util_cfgtree.obj \
+ $(WORKDIR)\util_filter.obj \
+ $(WORKDIR)\util_md5.obj \
+ $(WORKDIR)\util_pcre.obj \
+ $(WORKDIR)\util_script.obj \
+ $(WORKDIR)\util_time.obj \
+ $(WORKDIR)\util_xml.obj \
+ $(WORKDIR)\listen.obj \
+ $(WORKDIR)\byterange_filter.obj \
+ $(WORKDIR)\chunk_filter.obj \
+ $(WORKDIR)\http_core.obj \
+ $(WORKDIR)\http_etag.obj \
+ $(WORKDIR)\http_filters.obj \
+ $(WORKDIR)\http_protocol.obj \
+ $(WORKDIR)\http_request.obj \
+ $(WORKDIR)\modules.obj \
+ $(WORKDIR)\util_win32.obj \
+ $(WORKDIR)\ap_regkey.obj \
+ $(WORKDIR)\mod_win32.obj \
+ $(WORKDIR)\child.obj \
+ $(WORKDIR)\mpm_winnt.obj \
+ $(WORKDIR)\nt_eventlog.obj \
+ $(WORKDIR)\service.obj \
+ $(WORKDIR)\mod_so.obj
HEADERS = \
$(SRCDIR)\include\os.h \
$(SRCDIR)\include\mpm.h \
- $(SRCDIR)\include\mpm_default.h
+ $(SRCDIR)\include\mpm_default.h \
+ $(SRCDIR)\include\mod_cgi.h \
+ $(SRCDIR)\include\mod_core.h \
+ $(SRCDIR)\include\mod_dav.h \
+ $(SRCDIR)\include\mod_include.h \
+ $(SRCDIR)\include\mod_proxy.h \
+ $(SRCDIR)\include\mod_so.h \
+ $(SRCDIR)\server\test_char.h
-BUILDINC = $(PREFIX)\include
-BUILDLIB = $(PREFIX)\lib
-BUILDOUT = $(PREFIX)\bin
-
BUILDBIN = $(WORKDIR)\$(PROJECT).dll
-BUILDPDB = $(WORKDIR)\$(PROJECT).pdb
+BUILDPDB = $(WORKDIR)\$(PROJECT).pdb
BUILDRES = $(WORKDIR)\$(PROJECT).res
-BUILDMAN = $(BUILDBIN).manifest
+BUILDMFT = $(BUILDBIN).manifest
RCFLAGS = $(RCFLAGS) /d BIN_NAME="$(PROJECT).dll" /d LONG_NAME="Apache HTTP Server Core"
-BUILDAPR = $(SRCDIR)\srclib\apr\$(WORKDIR)\libapr-1.dll
-BUILDAPI = $(SRCDIR)\srclib\apr-iconv\$(WORKDIR)\libapriconv-1.dll
-BUILDAPU = $(SRCDIR)\srclib\apr-util\$(WORKDIR)\libaprutil-1.dll
-BUILDPCRE = $(SRCDIR)\srclib\pcre\$(WORKDIR_LIB)\pcre.lib
+BUILDAPR = $(BUILDOUT)\libapr-1.dll
+BUILDAPI = $(BUILDOUT)\libapriconv-1.dll
+BUILDAPU = $(BUILDOUT)\libaprutil-1.dll
+BUILDPCRE = $(BUILDLIB)\pcre.lib
+BUILDTCHR = $(SRCDIR)\server\$(WORKDIR_EXE)\gen_test_char.exe
-all : $(BUILDINC) $(BUILDLIB) $(BUILDOUT) $(WORKDIR) $(HEADERS) $(BUILDAPR) $(BUILDAPI) $(BUILDAPU) $(BUILDPCRE) $(BUILDBIN)
+all : $(BUILDINS) $(WORKDIR) $(HEADERS) $(BUILDAPR) $(BUILDAPI) $(BUILDAPU) $(BUILDPCRE) $(BUILDBIN)
-$(BUILDINC) :
- @if not exist "$(BUILDINC)\arch\win32\$(NULL)" mkdir "$(BUILDINC)\arch\win32"
-
-$(BUILDLIB) :
- @if not exist "$(BUILDLIB)\$(NULL)" mkdir "$(BUILDLIB)"
-
-$(BUILDOUT) :
- @if not exist "$(BUILDOUT)\$(NULL)" mkdir "$(BUILDOUT)"
-
$(WORKDIR) :
@$(MAKEWORKDIR)
@@ -102,30 +137,69 @@
$(MAKE) -f NMAKEmakefile PCRE_STATIC=1 PREFIX=$(PREFIX) install
cd ..\..
+$(BUILDTCHR) :
+ cd $(SRCDIR)\server
+ $(MAKE) -f NMAKEmakefile PREFIX=$(PREFIX)
+ cd ..
+
+$(SRCDIR)\server\test_char.h : $(BUILDAPR) $(BUILDTCHR)
+ $(BUILDTCHR) > $@
+
{$(SRCDIR)\server}.c{$(WORKDIR)}.obj:
$(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $<
-$(SRCDIR)\include\os.h:
- @copy /Y $(SRCDIR)\os\win32\os.h $@ >NUL
+{$(SRCDIR)\modules\http}.c{$(WORKDIR)}.obj:
+ $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $<
-$(SRCDIR)\include\mpm.h:
- @copy /Y $(SRCDIR)\server\mpm\winnt\mpm.h $@ >NUL
+{$(SRCDIR)\os\win32}.c{$(WORKDIR)}.obj:
+ $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $<
-$(SRCDIR)\include\mpm_default.h:
- @copy /Y $(SRCDIR)\server\mpm\winnt\mpm_default.h $@ >NUL
+{$(SRCDIR)\server\mpm\winnt}.c{$(WORKDIR)}.obj:
+ $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $<
+{$(SRCDIR)\modules\arch\win32}.c{$(WORKDIR)}.obj:
+ $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $<
+
+{$(SRCDIR)\modules\mappers}.c{$(WORKDIR)}.obj:
+ $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $<
+
+{$(SRCDIR)\os\win32}.h{$(SRCDIR)\include}.h:
+ @copy /Y $< $@ >NUL
+
+{$(SRCDIR)\modules\arch\win32}.h{$(SRCDIR)\include}.h:
+ @copy /Y $< $@ >NUL
+
+{$(SRCDIR)\server\mpm\winnt}.h{$(SRCDIR)\include}.h:
+ @copy /Y $< $@ >NUL
+
+{$(SRCDIR)\modules\http}.h{$(SRCDIR)\include}.h:
+ @copy /Y $< $@ >NUL
+
+{$(SRCDIR)\modules\filters}.h{$(SRCDIR)\include}.h:
+ @copy /Y $< $@ >NUL
+
+{$(SRCDIR)\modules\generators}.h{$(SRCDIR)\include}.h:
+ @copy /Y $< $@ >NUL
+
+{$(SRCDIR)\modules\proxy}.h{$(SRCDIR)\include}.h:
+ @copy /Y $< $@ >NUL
+
+{$(SRCDIR)\modules\mappers}.h{$(SRCDIR)\include}.h:
+ @copy /Y $< $@ >NUL
+
+{$(SRCDIR)\modules\dav\main}.h{$(SRCDIR)\include}.h:
+ @copy /Y $< $@ >NUL
+
$(BUILDRES): build\win32\httpd.rc
$(RC) $(RCFLAGS) /i "$(SRCDIR)\build\win32" /i "$(SRCDIR)\include" /i "$(SRCDIR)\srclib\apr\include" /fo $(BUILDRES) build\win32\httpd.rc
$(BUILDBIN): $(WORKDIR) $(HEADERS) $(BUILDAPR) $(BUILDAPI) $(BUILDAPU) $(BUILDPCRE) $(OBJECTS) $(BUILDRES)
$(LINK) $(LFLAGS) $(OBJECTS) $(BUILDRES) $(LIBS) $(LDIRS) /pdb:$(BUILDPDB) /out:$(BUILDBIN)
- IF EXIST $(BUILDMAN) \
- mt -nologo -manifest $(BUILDMAN) -outputresource:$(BUILDBIN);2
+ IF EXIST $(BUILDMFT) \
+ mt -nologo -manifest $(BUILDMFT) -outputresource:$(BUILDBIN);2
clean:
@$(CLEANTARGET)
install: $(BUILDINC) $(BUILDLIB) $(BUILDOUT) $(WORKDIR) $(HEADERS) $(BUILDBIN)
@xcopy "$(SRCDIR)\include\*.h" "$(BUILDINC)" /Y /Q
@xcopy "$(WORKDIR)\*.lib" "$(BUILDLIB)" /Y /Q
- @xcopy "$(WORKDIR)\*.exp" "$(BUILDLIB)" /Y /Q 2>NUL
@xcopy "$(WORKDIR)\*.dll" "$(BUILDOUT)" /Y /Q 2>NUL
- @xcopy "$(WORKDIR)\*.pdb" "$(BUILDOUT)" /Y /Q 2>NUL
Modified: trunk/httpd/httpd-2.2/NMAKEmakefile
===================================================================
--- trunk/httpd/httpd-2.2/NMAKEmakefile 2007-12-14 17:47:49 UTC (rev 1219)
+++ trunk/httpd/httpd-2.2/NMAKEmakefile 2007-12-15 12:32:07 UTC (rev 1220)
@@ -37,36 +37,28 @@
!ENDIF
!include <NMAKEcommon.inc>
+!include <NMAKEhttpd.inc>
-LDIRS = /libpath:"$(SRCDIR)\$(WORKDIR_DLL)" /libpath:"$(SRCDIR)\srclib\apr\$(WORKDIR_DLL)" /libpath:"$(SRCDIR)\srclib\apr-util\$(WORKDIR_DLL)"
+LDIRS = /libpath:"$(BUILDLIB)"
LFLAGS = $(LFLAGS) user32.lib psapi.lib gdi32.lib shlwapi.lib wldap32.lib ole32.lib
-LIBS = $(LIBS) libapr-1.lib libaprutil-1.lib libhttpd.lib
+LIBS = $(LIBS) $(LIBAPR) $(LIBAPU) $(LIBHTTPD)
-INCLUDES = -I$(SRCDIR)\include -I$(SRCDIR)\srclib\apr\include -I$(SRCDIR)\srclib\apr-util\include
+INCLUDES = -I$(BUILDINC)
PDBFLAGS = -Fo$(WORKDIR)\ -Fd$(WORKDIR)\$(PROJECT)-src
OBJECTS = \
$(WORKDIR)\main.obj
-BUILDLIB = $(PREFIX)\lib
-BUILDOUT = $(PREFIX)\bin
-
BUILDBIN = $(WORKDIR)\$(PROJECT).exe
BUILDPDB = $(WORKDIR)\$(PROJECT).pdb
BUILDRES = $(WORKDIR)\$(PROJECT).res
-BUILDMAN = $(BUILDBIN).manifest
+BUILDMFT = $(BUILDBIN).manifest
RCFLAGS = $(RCFLAGS) /d BIN_NAME="$(PROJECT).exe" /d LONG_NAME="Apache HTTP Server" /d ICON_FILE="apache.ico"
-BUILDDEP = $(WORKDIR_DLL)\libhttpd.dll
+BUILDDEP = $(BUILDBIN)\libhttpd.dll
-all : $(WORKDIR) $(BUILDLIB) $(BUILDOUT) $(BUILDDEP) $(BUILDBIN)
+all : $(BUILDINS) $(WORKDIR) $(BUILDBIN)
-$(BUILDLIB) :
- @if not exist "$(BUILDLIB)\$(NULL)" mkdir "$(BUILDLIB)"
-
-$(BUILDOUT) :
- @if not exist "$(BUILDOUT)\$(NULL)" mkdir "$(BUILDOUT)"
-
$(WORKDIR) :
@$(MAKEWORKDIR)
@@ -80,11 +72,20 @@
$(RC) $(RCFLAGS) /i "$(SRCDIR)\build\win32" /i "$(SRCDIR)\include" /i "$(SRCDIR)\srclib\apr\include" /fo $(BUILDRES) build\win32\httpd.rc
$(BUILDBIN): $(WORKDIR) $(BUILDDEP) $(OBJECTS) $(BUILDRES)
$(LINK) $(LFLAGS) $(OBJECTS) $(BUILDRES) $(LIBS) $(LDIRS) /pdb:$(BUILDPDB) /out:$(BUILDBIN)
- IF EXIST $(BUILDMAN) \
- mt -nologo -manifest $(BUILDMAN) -outputresource:$(BUILDBIN);2
+ IF EXIST $(BUILDMFT) \
+ mt -nologo -manifest $(BUILDMFT) -outputresource:$(BUILDBIN);2
clean:
@$(CLEANTARGET)
-install: $(BUILDLIB) $(BUILDOUT) $(WORKDIR) $(BUILDBIN)
+install: $(BUILDINS) $(WORKDIR) $(BUILDBIN)
@xcopy "$(WORKDIR)\*.exe" "$(BUILDOUT)" /Y /Q 2>NUL
- @xcopy "$(WORKDIR)\*.pdb" "$(BUILDOUT)" /Y /Q 2>NUL
+ @xcopy "$(SRCDIR)\docs\manual" "$(BUILDMAN)" /Y /Q /E
+ @xcopy "$(SRCDIR)\docs\error" "$(BUILDERR)" /Y /Q /E
+ @xcopy "$(SRCDIR)\docs\icons" "$(BUILDICO)" /Y /Q /E
+ @xcopy "$(SRCDIR)\docs\docroot" "$(BUILDDOC)" /Y /Q /E
+ @xcopy "$(SRCDIR)\docs\conf\extra" "$(BUILDCFG)\extra" /Y /Q
+ @copy /Y "$(SRCDIR)\docs\conf\httpd-win.conf" "$(BUILDCFG)\httpd.conf" >NUL
+ @copy /Y "$(SRCDIR)\docs\conf\charset.conv" "$(BUILDCFG)" >NUL
+ @copy /Y "$(SRCDIR)\docs\conf\mime.types" "$(BUILDCFG)" >NUL
+ @copy /Y "$(SRCDIR)\docs\conf\magic" "$(BUILDCFG)" >NUL
+ @copy /Y "$(SRCDIR)\docs\cgi-examples\printenv" "$(BUILDCGI)\printenv.pl" >NUL
Modified: trunk/httpd/httpd-2.2/srclib/apr/NMAKEmakefile
===================================================================
--- trunk/httpd/httpd-2.2/srclib/apr/NMAKEmakefile 2007-12-14 17:47:49 UTC (rev 1219)
+++ trunk/httpd/httpd-2.2/srclib/apr/NMAKEmakefile 2007-12-15 12:32:07 UTC (rev 1220)
@@ -40,6 +40,7 @@
!ENDIF
!include <..\..\NMAKEcommon.inc>
+!include <..\..\NMAKEhttpd.inc>
INCLUDES = -I$(SRCDIR)\include -I$(SRCDIR)\include\arch -I$(SRCDIR)\include\arch\win32 -I$(SRCDIR)\include\arch\unix
PDBFLAGS = -Fo$(WORKDIR)\ -Fd$(WORKDIR)\$(PROJECT)-src
@@ -113,29 +114,17 @@
HEADERS = $(SRCDIR)\include\apr.h
-BUILDINC = $(PREFIX)\include
-BUILDLIB = $(PREFIX)\lib
-BUILDOUT = $(PREFIX)\bin
!IF "$(TARGET)" == "DLL"
BUILDBIN = $(WORKDIR)\$(PROJECT).dll
BUILDPDB = $(WORKDIR)\$(PROJECT).pdb
BUILDRES = $(WORKDIR)\$(PROJECT).res
-BUILDMAN = $(BUILDBIN).manifest
+BUILDMFT = $(BUILDBIN).manifest
!ELSE
BUILDBIN = $(WORKDIR)\$(PROJECT).lib
!ENDIF
-all : $(BUILDINC) $(BUILDLIB) $(BUILDOUT) $(WORKDIR) $(HEADERS) $(BUILDBIN)
+all : $(BUILDINS) $(WORKDIR) $(HEADERS) $(BUILDBIN)
-$(BUILDINC) :
- @if not exist "$(BUILDINC)\arch\win32\$(NULL)" mkdir "$(BUILDINC)\arch\win32"
-
-$(BUILDLIB) :
- @if not exist "$(BUILDLIB)\$(NULL)" mkdir "$(BUILDLIB)"
-
-$(BUILDOUT) :
- @if not exist "$(BUILDOUT)\$(NULL)" mkdir "$(BUILDOUT)"
-
$(WORKDIR) :
@$(MAKEWORKDIR)
@@ -214,8 +203,8 @@
$(RC) $(RCFLAGS) /i "$(SRCDIR)\include" /d "APR_VERSION_ONLY" /fo $(BUILDRES) libapr.rc
$(BUILDBIN): $(WORKDIR) $(HEADERS) $(OBJECTS) $(BUILDRES)
$(LINK) $(LFLAGS) $(OBJECTS) $(BUILDRES) $(LIBS) /pdb:$(BUILDPDB) /out:$(BUILDBIN)
- IF EXIST $(BUILDMAN) \
- mt -nologo -manifest $(BUILDMAN) -outputresource:$(BUILDBIN);2
+ IF EXIST $(BUILDMFT) \
+ mt -nologo -manifest $(BUILDMFT) -outputresource:$(BUILDBIN);2
!ELSE
$(BUILDBIN): $(WORKDIR) $(OBJECTS)
$(LINK) $(LFLAGS) $(OBJECTS) /out:$(BUILDBIN)
@@ -224,11 +213,9 @@
clean:
@$(CLEANTARGET)
-install: $(BUILDINC) $(BUILDLIB) $(BUILDOUT) $(WORKDIR) $(HEADERS) $(BUILDBIN)
+install: $(BUILDINS) $(WORKDIR) $(HEADERS) $(BUILDBIN)
@xcopy "$(SRCDIR)\include\*.h" "$(BUILDINC)" /Y /Q
@xcopy "$(SRCDIR)\include\arch\apr_private_common.h" "$(BUILDINC)\arch" /Y /Q
@xcopy "$(SRCDIR)\include\arch\win32\*.h" "$(BUILDINC)\arch\win32" /Y /Q
@xcopy "$(WORKDIR)\*.lib" "$(BUILDLIB)" /Y /Q
- @xcopy "$(WORKDIR)\*.exp" "$(BUILDLIB)" /Y /Q 2>NUL
@xcopy "$(WORKDIR)\*.dll" "$(BUILDOUT)" /Y /Q 2>NUL
- @xcopy "$(WORKDIR)\*.pdb" "$(BUILDOUT)" /Y /Q 2>NUL
Modified: trunk/httpd/httpd-2.2/srclib/apr-iconv/NMAKEmakefile
===================================================================
--- trunk/httpd/httpd-2.2/srclib/apr-iconv/NMAKEmakefile 2007-12-14 17:47:49 UTC (rev 1219)
+++ trunk/httpd/httpd-2.2/srclib/apr-iconv/NMAKEmakefile 2007-12-15 12:32:07 UTC (rev 1220)
@@ -43,6 +43,7 @@
!ENDIF
!include <..\..\NMAKEcommon.inc>
+!include <..\..\NMAKEhttpd.inc>
!IFNDEF WITH_APR
WITH_APR = ..\apr
@@ -281,27 +282,17 @@
$(WORKDIR)\iconv_uc.obj
-BUILDOUT = $(PREFIX)\bin
-BUILDLIB = $(PREFIX)\lib
-BUILDINC = $(PREFIX)\include
-
!IF "$(TARGET)" == "DLL"
BUILDBIN = $(WORKDIR)\$(PROJECT).dll
BUILDPDB = $(WORKDIR)\$(PROJECT).pdb
BUILDRES = $(WORKDIR)\$(PROJECT).res
-BUILDMAN = $(BUILDBIN).manifest
+BUILDMFT = $(BUILDBIN).manifest
!ELSE
BUILDBIN = $(WORKDIR)\$(PROJECT).lib
!ENDIF
-all : $(BUILDLIB) $(BUILDOUT) $(WORKDIR) $(BUILDBIN)
+all : $(BUILDINS) $(WORKDIR) $(BUILDBIN)
-$(BUILDLIB) :
- @if not exist "$(BUILDLIB)\$(NULL)" mkdir "$(BUILDLIB)"
-
-$(BUILDOUT) :
- @if not exist "$(BUILDOUT)\$(NULL)" mkdir "$(BUILDOUT)"
-
$(WORKDIR) :
@$(MAKEWORKDIR)
@@ -322,8 +313,8 @@
$(RC) $(RCFLAGS) /i "$(WITH_APR)\include" /i "$(SRCDIR)\include" /d "API_VERSION_ONLY" /fo $(BUILDRES) $(SRCDIR)\libapriconv.rc
$(BUILDBIN): $(WORKDIR) $(OBJECTS) $(BUILDRES)
$(LINK) $(LFLAGS) $(OBJECTS) $(BUILDRES) $(LIBS) $(LDIRS) /pdb:$(BUILDPDB) /out:$(BUILDBIN)
- IF EXIST $(BUILDMAN) \
- mt -nologo -manifest $(BUILDMAN) -outputresource:$(BUILDBIN);2
+ IF EXIST $(BUILDMFT) \
+ mt -nologo -manifest $(BUILDMFT) -outputresource:$(BUILDBIN);2
!ELSE
$(BUILDBIN): $(WORKDIR) $(OBJECTS)
$(LINK) $(LFLAGS) $(OBJECTS) $(LDIRS) /out:$(BUILDBIN)
@@ -332,9 +323,7 @@
clean:
@$(CLEANTARGET)
-install: $(BUILDLIB) $(BUILDOUT) $(WORKDIR) $(BUILDBIN)
+install: $(BUILDINS) $(WORKDIR) $(BUILDBIN)
@xcopy "$(SRCDIR)\include\*.h" "$(BUILDINC)" /Y /Q
@xcopy "$(WORKDIR)\*.lib" "$(BUILDLIB)" /Y /Q
- @xcopy "$(WORKDIR)\*.exp" "$(BUILDLIB)" /Y /Q 2>NUL
@xcopy "$(WORKDIR)\*.dll" "$(BUILDOUT)" /Y /Q 2>NUL
- @xcopy "$(WORKDIR)\*.pdb" "$(BUILDOUT)" /Y /Q 2>NUL
Modified: trunk/httpd/httpd-2.2/srclib/apr-util/NMAKEmakefile
===================================================================
--- trunk/httpd/httpd-2.2/srclib/apr-util/NMAKEmakefile 2007-12-14 17:47:49 UTC (rev 1219)
+++ trunk/httpd/httpd-2.2/srclib/apr-util/NMAKEmakefile 2007-12-15 12:32:07 UTC (rev 1220)
@@ -47,6 +47,7 @@
!ENDIF
!include <..\..\NMAKEcommon.inc>
+!include <..\..\NMAKEhttpd.inc>
!IFNDEF WITH_APR
WITH_APR=..\apr
@@ -122,27 +123,17 @@
$(SRCDIR)\xml\expat\lib\config.h \
$(SRCDIR)\xml\expat\lib\expat.h
-BUILDOUT = $(PREFIX)\bin
-BUILDLIB = $(PREFIX)\lib
-BUILDINC = $(PREFIX)\include
-
!IF "$(TARGET)" == "DLL"
BUILDBIN = $(WORKDIR)\$(PROJECT).dll
BUILDPDB = $(WORKDIR)\$(PROJECT).pdb
BUILDRES = $(WORKDIR)\$(PROJECT).res
-BUILDMAN = $(BUILDBIN).manifest
+BUILDMFT = $(BUILDBIN).manifest
!ELSE
BUILDBIN = $(WORKDIR)\$(PROJECT).lib
!ENDIF
-all : $(BUILDLIB) $(BUILDOUT) $(WORKDIR) $(HEADERS) $(BUILDBIN)
+all : $(BUILDINS) $(WORKDIR) $(HEADERS) $(BUILDBIN)
-$(BUILDLIB) :
- @if not exist "$(BUILDLIB)\$(NULL)" mkdir "$(BUILDLIB)"
-
-$(BUILDOUT) :
- @if not exist "$(BUILDOUT)\$(NULL)" mkdir "$(BUILDOUT)"
-
$(WORKDIR) :
@$(MAKEWORKDIR)
@@ -209,8 +200,8 @@
$(RC) $(RCFLAGS) /i "$(WITH_APR)\include" /i "$(SRCDIR)\include" /d "APU_VERSION_ONLY" /fo $(BUILDRES) libaprutil.rc
$(BUILDBIN): $(WORKDIR) $(HEADERS) $(OBJECTS) $(BUILDRES)
$(LINK) $(LFLAGS) $(OBJECTS) $(BUILDRES) $(LIBS) $(LDIRS) /pdb:$(BUILDPDB) /out:$(BUILDBIN)
- IF EXIST $(BUILDMAN) \
- mt -nologo -manifest $(BUILDMAN) -outputresource:$(BUILDBIN);2
+ IF EXIST $(BUILDMFT) \
+ mt -nologo -manifest $(BUILDMFT) -outputresource:$(BUILDBIN);2
!ELSE
$(BUILDBIN): $(WORKDIR) $(HEADERS) $(OBJECTS)
$(LINK) $(LFLAGS) $(OBJECTS) $(LDIRS) /out:$(BUILDBIN)
@@ -219,9 +210,7 @@
clean:
@$(CLEANTARGET)
-install: $(BUILDLIB) $(BUILDOUT) $(WORKDIR) $(BUILDBIN)
+install: $(BUILDINS) $(WORKDIR) $(BUILDBIN)
@xcopy "$(SRCDIR)\include\*.h" "$(BUILDINC)" /Y /Q
@xcopy "$(WORKDIR)\*.lib" "$(BUILDLIB)" /Y /Q
- @xcopy "$(WORKDIR)\*.exp" "$(BUILDLIB)" /Y /Q 2>NUL
@xcopy "$(WORKDIR)\*.dll" "$(BUILDOUT)" /Y /Q 2>NUL
- @xcopy "$(WORKDIR)\*.pdb" "$(BUILDOUT)" /Y /Q 2>NUL
Modified: trunk/httpd/httpd-2.2/srclib/pcre/NMAKEmakefile
===================================================================
--- trunk/httpd/httpd-2.2/srclib/pcre/NMAKEmakefile 2007-12-14 17:47:49 UTC (rev 1219)
+++ trunk/httpd/httpd-2.2/srclib/pcre/NMAKEmakefile 2007-12-15 12:32:07 UTC (rev 1220)
@@ -41,6 +41,7 @@
!ENDIF
!include <..\..\NMAKEcommon.inc>
+!include <..\..\NMAKEhttpd.inc>
!IF "$(TARGET)" == "DLL"
LFLAGS = $(LFLAGS) user32.lib psapi.lib gdi32.lib shlwapi.lib wldap32.lib ole32.lib
@@ -59,24 +60,17 @@
$(SRCDIR)\config.h
-BUILDOUT = $(PREFIX)\bin
-BUILDLIB = $(PREFIX)\lib
-BUILDINC = $(PREFIX)\include
-
!IF "$(TARGET)" == "DLL"
BUILDBIN = $(WORKDIR)\$(PROJECT).dll
BUILDPDB = $(WORKDIR)\$(PROJECT).pdb
BUILDRES = $(WORKDIR)\$(PROJECT).res
-BUILDMAN = $(BUILDBIN).manifest
+BUILDMFT = $(BUILDBIN).manifest
!ELSE
BUILDBIN = $(WORKDIR)\$(PROJECT).lib
!ENDIF
-all : $(BUILDLIB) $(BUILDOUT) $(WORKDIR) $(HEADERS) $(BUILDBIN)
+all : $(BUILDINS) $(WORKDIR) $(HEADERS) $(BUILDBIN)
-$(BUILDLIB) :
- @if not exist "$(BUILDLIB)\$(NULL)" mkdir "$(BUILDLIB)"
-
$(WORKDIR) :
@$(MAKEWORKDIR)
@@ -92,8 +86,8 @@
!IF "$(TARGET)" == "DLL"
$(BUILDBIN): $(WORKDIR) $(HEADERS) $(OBJECTS)
$(LINK) $(LFLAGS) $(OBJECTS) $(BUILDRES) $(LIBS) $(LDIRS) /pdb:$(BUILDPDB) /out:$(BUILDBIN)
- IF EXIST $(BUILDMAN) \
- mt -nologo -manifest $(BUILDMAN) -outputresource:$(BUILDBIN);2
+ IF EXIST $(BUILDMFT) \
+ mt -nologo -manifest $(BUILDMFT) -outputresource:$(BUILDBIN);2
!ELSE
$(BUILDBIN): $(WORKDIR) $(HEADERS) $(OBJECTS)
$(LINK) $(LFLAGS) $(OBJECTS) $(LDIRS) /out:$(BUILDBIN)
@@ -102,9 +96,7 @@
clean:
@$(CLEANTARGET)
-install: $(BUILDLIB) $(BUILDOUT) $(WORKDIR) $(BUILDBIN)
+install: $(BUILDINS) $(WORKDIR) $(BUILDBIN)
@xcopy "$(SRCDIR)\pcre.h" "$(BUILDINC)" /Y /Q
@xcopy "$(WORKDIR)\*.lib" "$(BUILDLIB)" /Y /Q
- @xcopy "$(WORKDIR)\*.exp" "$(BUILDLIB)" /Y /Q 2>NUL
@xcopy "$(WORKDIR)\*.dll" "$(BUILDOUT)" /Y /Q 2>NUL
- @xcopy "$(WORKDIR)\*.pdb" "$(BUILDOUT)" /Y /Q 2>NUL
Modified: trunk/httpd/httpd-2.2/srclib/zlib/NMAKEmakefile
===================================================================
--- trunk/httpd/httpd-2.2/srclib/zlib/NMAKEmakefile 2007-12-14 17:47:49 UTC (rev 1219)
+++ trunk/httpd/httpd-2.2/srclib/zlib/NMAKEmakefile 2007-12-15 12:32:07 UTC (rev 1220)
@@ -47,6 +47,7 @@
!ENDIF
!include <..\..\NMAKEcommon.inc>
+!include <..\..\NMAKEhttpd.inc>
INCLUDES = -I$(SRCDIR)
PDBFLAGS = -Fo$(WORKDIR)\ -Fd$(WORKDIR)\$(PROJECT)-src
@@ -83,29 +84,17 @@
ASM_OBJECTS =
!ENDIF
-BUILDINC = $(PREFIX)\include\apr-1
-BUILDLIB = $(PREFIX)\lib
-BUILDOUT = $(PREFIX)\lib
!IF "$(TARGET)" == "DLL"
BUILDBIN = $(WORKDIR)\$(PROJECT).dll
BUILDPDB = $(WORKDIR)\$(PROJECT).pdb
BUILDRES = $(WORKDIR)\$(PROJECT).res
-BUILDMAN = $(BUILDBIN).manifest
+BUILDMFT = $(BUILDBIN).manifest
!ELSE
BUILDBIN = $(WORKDIR)\$(PROJECT).lib
!ENDIF
-all : $(BUILDINC) $(BUILDLIB) $(BUILDOUT) $(WORKDIR) $(BUILDBIN)
+all : $(BUILDINS) $(WORKDIR) $(BUILDBIN)
-$(BUILDINC) :
- @if not exist "$(BUILDINC)\arch\win32\$(NULL)" mkdir "$(BUILDINC)\arch\win32"
-
-$(BUILDLIB) :
- @if not exist "$(BUILDLIB)\$(NULL)" mkdir "$(BUILDLIB)"
-
-$(BUILDOUT) :
- @if not exist "$(BUILDOUT)\$(NULL)" mkdir "$(BUILDOUT)"
-
$(WORKDIR) :
@$(MAKEWORKDIR)
@@ -136,8 +125,8 @@
$(RC) $(RCFLAGS) /fo $(BUILDRES) win32/zlib1.rc
$(BUILDBIN): $(WORKDIR) $(OBJECTS) $(ASM_OBJECTS) $(BUILDRES)
$(LINK) $(LFLAGS) $(OBJECTS) $(ASM_OBJECTS) $(BUILDRES) $(LIBS) /def:win32/zlib.def /pdb:$(BUILDPDB) /out:$(BUILDBIN)
- IF EXIST $(BUILDMAN) \
- mt -nologo -manifest $(BUILDMAN) -outputresource:$(BUILDBIN);2
+ IF EXIST $(BUILDMFT) \
+ mt -nologo -manifest $(BUILDMFT) -outputresource:$(BUILDBIN);2
!ELSE
$(BUILDBIN): $(WORKDIR) $(OBJECTS) $(ASM_OBJECTS)
$(LINK) $(LFLAGS) $(OBJECTS) $(ASM_OBJECTS) /out:$(BUILDBIN)
@@ -146,11 +135,9 @@
clean:
@$(CLEANTARGET)
-install: $(BUILDINC) $(BUILDLIB) $(BUILDOUT) $(WORKDIR) $(BUILDBIN)
+install: $(BUILDINS) $(WORKDIR) $(BUILDBIN)
@xcopy "$(SRCDIR)\zlib.h" "$(BUILDINC)" /Y /Q
@xcopy "$(SRCDIR)\zconf.h" "$(BUILDINC)" /Y /Q
@xcopy "$(SRCDIR)\zutil.h" "$(BUILDINC)" /Y /Q
@xcopy "$(WORKDIR)\*.lib" "$(BUILDLIB)" /Y /Q
- @xcopy "$(WORKDIR)\*.exp" "$(BUILDLIB)" /Y /Q 2>NUL
@xcopy "$(WORKDIR)\*.dll" "$(BUILDOUT)" /Y /Q 2>NUL
- @xcopy "$(WORKDIR)\*.pdb" "$(BUILDOUT)" /Y /Q 2>NUL
16 years, 5 months
JBoss Native SVN: r1219 - trunk/build/unix.
by jbossnative-commits＠lists.jboss.org
Author: jfrederic.clere(a)jboss.com
Date: 2007-12-14 12:47:49 -0500 (Fri, 14 Dec 2007)
New Revision: 1219
Added:
trunk/build/unix/buildbin.asf-jk.sh
trunk/build/unix/buildsrc.asf-jk.sh
Modified:
trunk/build/unix/build.sh
trunk/build/unix/buildbin.rhel-httpd.sh
trunk/build/unix/buildsrc.rhel-httpd.sh
trunk/build/unix/package.list
Log:
Add building of mod_jk. (still need fixing).
Modified: trunk/build/unix/build.sh
===================================================================
--- trunk/build/unix/build.sh 2007-12-14 12:52:19 UTC (rev 1218)
+++ trunk/build/unix/build.sh 2007-12-14 17:47:49 UTC (rev 1219)
@@ -721,6 +721,11 @@
# General part
cp JBossORG-EULA.txt ${package_output_dir}
+ # mod_jk
+ if $has_jk; then
+ override ${package_src_dir}/buildbin.asf-jk.sh ${build_common_dir} ${package_dist_dir} ${package_output_dir} $has_openssl $has_static
+ fi
+
# Build the binary distribution tarball
buildtar ${package_output_dir} "*" ${dst_dir} ${package_build_name}
}
@@ -805,15 +810,24 @@
override ${build_top}/buildsrc.${PACKAGE}.sh ${svn_tagname} ${package_src_dir}
#
+# Add mod_jk if needed.
+if $has_jk; then
+ override ${build_top}/buildsrc.asf-jk.sh ${jk_version} ${package_src_dir}
+ cp ./buildbin.asf-jk*.sh ${package_src_dir}
+fi
+
+#
# Copy build files
cp ./build.sh ${package_src_dir}
cp ./buildbin.${PACKAGE}*.sh ${package_src_dir}
+mkdir -p ${package_src_dir}/util
+cp util/*.sh ${package_src_dir}/util
# TODO: Generate package list instead copying
cat > ${package_src_dir}/package.list << EOF
# THIS FILE WAS AUTOGENERATED BY `basename $0`
#
-${PACKAGE}|${build_version}|${apr_version}|${apu_version}|${api_version}|${ssl_version}|${zlib_version}|${svn_tagname}
+${PACKAGE}|${build_version}|${svn_tagname}|${apr_version}|${apu_version}|${api_version}|${ssl_version}|${zlib_version}|${jk_version}
EOF
Added: trunk/build/unix/buildbin.asf-jk.sh
===================================================================
--- trunk/build/unix/buildbin.asf-jk.sh (rev 0)
+++ trunk/build/unix/buildbin.asf-jk.sh 2007-12-14 17:47:49 UTC (rev 1219)
@@ -0,0 +1,55 @@
+#!/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 ""
+echo "Running : `basename $0` $LastChangedDate: 2007-07-02 16:22:00 +0200 (Mon, 02 Jul 2007) $"
+echo ""
+echo "Started : `date`"
+echo "Common : $1"
+echo "Prefix : $2"
+echo "Output : $3"
+echo "OpenSSL : $4"
+echo ""
+
+
+# parameters
+# $1: Location of the common libraries.
+# $2: Destination location.
+# $3: Location where to put the binaries.
+# $4: Use OpenSSL.
+
+common_loc=$1
+prefix_loc=$2
+output_loc=$3
+has_openssl=$4
+current_loc=`pwd`
+
+echo "Building mod_jk in $current_loc"
+native_sources=srclib/`ls srclib | grep tomcat-connectors-`/native
+cd $native_sources
+
+apxs=`find $output_loc -name apxs`
+echo "$native_sources; ./configure --with-apxs=${apxs}"
+./configure --with-apxs=${apxs}
+make
+make DESTDIR=$output_loc` install
Property changes on: trunk/build/unix/buildbin.asf-jk.sh
___________________________________________________________________
Name: svn:executable
+ *
Modified: trunk/build/unix/buildbin.rhel-httpd.sh
===================================================================
--- trunk/build/unix/buildbin.rhel-httpd.sh 2007-12-14 12:52:19 UTC (rev 1218)
+++ trunk/build/unix/buildbin.rhel-httpd.sh 2007-12-14 17:47:49 UTC (rev 1219)
@@ -82,11 +82,12 @@
#
# Set needed variables. (defaulted to hacked values).
PREFIX=/opt/jboss/httpd
+
_sysconfdir=${PREFIX}
_prefix=${PREFIX}
_sbindir=${PREFIX}/sbin
_bindir=${PREFIX}/bin
-_mandir=${PREFIX}/man
+_mandir=${PREFIX}/man
_libdir=${PREFIX}/lib
_includedir=${PREFIX}/include
contentdir=${PREFIX}/htdocs
Added: trunk/build/unix/buildsrc.asf-jk.sh
===================================================================
--- trunk/build/unix/buildsrc.asf-jk.sh (rev 0)
+++ trunk/build/unix/buildsrc.asf-jk.sh 2007-12-14 17:47:49 UTC (rev 1219)
@@ -0,0 +1,53 @@
+#!/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 ""
+echo "Running : `basename $0` $LastChangedDate: 2007-06-01 18:00:27 +0200 (Fri, 01 Jun 2007) $"
+echo ""
+echo "Started : `date`"
+echo "Tag : $1"
+echo "Target : $2"
+echo ""
+
+# parameters
+# $1: The tag to use something like 2.2.6 or trunk
+# $2: Directory where to put the sources.
+
+native_tag=$1
+native_dist=$2
+
+# we need something like:
+# http://archive.apache.org/dist/tomcat/tomcat-connectors/jk/source/jk-1.2....
+URLBASE=http://archive.apache.org/dist/tomcat/tomcat-connectors/jk/source/jk-$1/tomcat-connectors-$1-src
+URLBASEBACK=http://ftp.heanet.ie/mirrors/www.apache.org/dist/tomcat/tomcat-connectors/jk/source/jk-$1/tomcat-connectors-$1-src
+case $BUILD_SYS in
+ windows)
+ URL=${URLBASE}.zip
+ URLBACK=${URLBASEBACK}.zip
+ ;;
+ *)
+ URL=${URLBASE}.tar.gz
+ URLBACK=${URLBASEBACK}.tar.gz
+esac
+
+util/ckeckdownload.sh $build_cache_dir $package_src_dir $build_top tomcat-connectors-${native_tag}-src $URL $URLBACK
Property changes on: trunk/build/unix/buildsrc.asf-jk.sh
___________________________________________________________________
Name: svn:executable
+ *
Modified: trunk/build/unix/buildsrc.rhel-httpd.sh
===================================================================
--- trunk/build/unix/buildsrc.rhel-httpd.sh 2007-12-14 12:52:19 UTC (rev 1218)
+++ trunk/build/unix/buildsrc.rhel-httpd.sh 2007-12-14 17:47:49 UTC (rev 1219)
@@ -95,13 +95,16 @@
remove_list=""
;;
*)
- remove_list="httpd-2.0.54-selinux.patch"
+ remove_list="httpd-2.0.54-selinux.patch httpd-2.1.10-apxs.patch httpd-2.0.45-deplibs.patch"
;;
esac
-if [ -z ${remove_list} ]; then
- echo "Linux applying all the rhel patches"
+if [ -z "${remove_list}" ]; then
+ echo "applying all the rhel patches"
else
- cat ${WHERE}/patch.sh | grep -v ${remove_list} > ${WHERE}/patch.sh
+ for patch in `echo "$remove_list"`
+ do
+ cat ${WHERE}/patch.sh | grep -v ${patch} > ${WHERE}/patch.sh
+ done
fi
echo "Applying the rhel patches to ${dirsources}"
chmod a+x ${WHERE}/patch.sh
Modified: trunk/build/unix/package.list
===================================================================
--- trunk/build/unix/package.list 2007-12-14 12:52:19 UTC (rev 1218)
+++ trunk/build/unix/package.list 2007-12-14 17:47:49 UTC (rev 1219)
@@ -10,4 +10,4 @@
jboss-sight|1.0.2|trunk|1.2.8|1.2.8|1.2.1
# httpd
jboss-httpd|0.0.1|2.2.6
-rhel-httpd|0.0.1|httpd-2_2_3-11_el5
+rhel-httpd|0.0.1|httpd-2_2_3-11_el5||||||1.2.25
16 years, 5 months