JBoss Native SVN: r1326 - trunk/build/unix.
by jbossnative-commits＠lists.jboss.org
Author: mladen.turk(a)jboss.com
Date: 2008-02-01 06:55:20 -0500 (Fri, 01 Feb 2008)
New Revision: 1326
Modified:
trunk/build/unix/build.sh
Log:
Add build_svn_root variable that points to the root of our build
Modified: trunk/build/unix/build.sh
===================================================================
--- trunk/build/unix/build.sh 2008-02-01 11:47:47 UTC (rev 1325)
+++ trunk/build/unix/build.sh 2008-02-01 11:55:20 UTC (rev 1326)
@@ -31,6 +31,9 @@
# Globals
build_top=`pwd`
+(cd ../../
+ build_svn_root=`pwd`
+)
export build_top
NATIVEEOL=LF
build_version=""
16 years, 11 months
JBoss Native SVN: r1325 - trunk/build/unix.
by jbossnative-commits＠lists.jboss.org
Author: mladen.turk(a)jboss.com
Date: 2008-02-01 06:47:47 -0500 (Fri, 01 Feb 2008)
New Revision: 1325
Modified:
trunk/build/unix/buildsrc.rhel-httpd.sh
Log:
Use svn export insted directory traversal logic for copying our additions to httpd-2.2 sources
Modified: trunk/build/unix/buildsrc.rhel-httpd.sh
===================================================================
--- trunk/build/unix/buildsrc.rhel-httpd.sh 2008-02-01 11:35:33 UTC (rev 1324)
+++ trunk/build/unix/buildsrc.rhel-httpd.sh 2008-02-01 11:47:47 UTC (rev 1325)
@@ -106,14 +106,9 @@
# Copy the windows NMAKE files (and additional stuff).
dirnmake=${build_top}/../../httpd/httpd-2.2/
if [ -d ${dirnmake} ]; then
- for file in `(cd ${dirnmake}; find . -type f | grep -v .svn | sed 's:./::')`
- do
- dir=`dirname $file`
- echo "copying ${dirnmake}/$file to ${dirsources}/${dir}"
- cp -p ${dirnmake}/$file ${dirsources}/${dir}
- done
+ svn export --force ${dirnmake} ${dirsources}
else
- echo "Failed can't find makefiles for NMAKE"
+ echo "Cannot find package sources in ${dirnmake}"
exit 1
fi
16 years, 11 months
JBoss Native SVN: r1324 - trunk/build/unix/util.
by jbossnative-commits＠lists.jboss.org
Author: jfrederic.clere(a)jboss.com
Date: 2008-02-01 06:35:33 -0500 (Fri, 01 Feb 2008)
New Revision: 1324
Modified:
trunk/build/unix/util/buildrhelsrc.sh
Log:
Some more cleaning.
Modified: trunk/build/unix/util/buildrhelsrc.sh
===================================================================
--- trunk/build/unix/util/buildrhelsrc.sh 2008-02-01 11:23:53 UTC (rev 1323)
+++ trunk/build/unix/util/buildrhelsrc.sh 2008-02-01 11:35:33 UTC (rev 1324)
@@ -83,24 +83,26 @@
fname=`cat ${rhel_loc}/sources | awk '{ print $2 }'`
dir=`cat ${rhel_loc}/sources | awk '{ print $1 }'`
sum="NONE"
-if [ -f ${fname} ]; then
- sum=`openssl md5 ${fname} | awk ' { print $2 } '`
+if [ -f ${build_cache_dir}/${fname} ]; then
+ sum=`openssl md5 ${build_cache_dir}/${fname} | awk ' { print $2 } '`
if [ "x${sum}" = "x" ];then
- sum=`md5sum ${fname} | awk ' { print $1 } '`
+ sum=`md5sum ${build_cache_dir}/${fname} | awk ' { print $1 } '`
fi
fi
if [ ${dir} = ${sum} ]; then
- echo "$fname already available"
+ echo "${build_cache_dir}/$fname already available"
else
+ rm -f ${build_cache_dir}/$fname
rm -f $fname
wget --tries=0 --retry-connrefused ${URL}/${fname}/${dir}/${fname}
if [ $? -ne 0 ];then
echo "wget $fname failed"
exit 1
fi
+ mv $fname ${build_cache_dir}
fi
-gunzip -c ${fname} | tar -xf -
-dirsources=`gunzip -c ${fname} | tar -tf - | head -1 | awk '{ print $1 }'`
+gunzip -c ${build_cache_dir}/${fname} | tar -xf -
+dirsources=`gunzip -c ${build_cache_dir}/${fname} | tar -tf - | head -1 | awk '{ print $1 }'`
mv ${dirsources} ${destdir}/srclib
dirsources=${destdir}/srclib/${dirsources}
16 years, 11 months
JBoss Native SVN: r1323 - trunk/build/unix/util.
by jbossnative-commits＠lists.jboss.org
Author: jfrederic.clere(a)jboss.com
Date: 2008-02-01 06:23:53 -0500 (Fri, 01 Feb 2008)
New Revision: 1323
Modified:
trunk/build/unix/util/buildrhelsrc.sh
Log:
Clean up.
Modified: trunk/build/unix/util/buildrhelsrc.sh
===================================================================
--- trunk/build/unix/util/buildrhelsrc.sh 2008-02-01 09:48:52 UTC (rev 1322)
+++ trunk/build/unix/util/buildrhelsrc.sh 2008-02-01 11:23:53 UTC (rev 1323)
@@ -71,6 +71,10 @@
exit 1
fi
mv ${repo} ${rhel_loc}/${compo}
+repobase=`dirname ${repo}`
+if [ "${repobase}" != "." ]; then
+ rm -rf ${repobase}
+fi
rhel_loc=${destdir}/srclib/${compo}/`basename ${repo}`
16 years, 11 months
JBoss Native SVN: r1322 - trunk/build/unix.
by jbossnative-commits＠lists.jboss.org
Author: jfrederic.clere(a)jboss.com
Date: 2008-02-01 04:48:52 -0500 (Fri, 01 Feb 2008)
New Revision: 1322
Modified:
trunk/build/unix/build.sh
trunk/build/unix/buildsrc.rhel-httpd.sh
trunk/build/unix/package.list
Log:
Add apr-iconv for windows.
Modified: trunk/build/unix/build.sh
===================================================================
--- trunk/build/unix/build.sh 2008-02-01 07:45:38 UTC (rev 1321)
+++ trunk/build/unix/build.sh 2008-02-01 09:48:52 UTC (rev 1322)
@@ -318,6 +318,11 @@
echo "using expat: ${expat_version}"
fi
+# XXX: HACK JFCLERE
+if [ ${PACKAGE} == "rhel-httpd" ];then
+ build_api=false
+fi
+
export has_jk
export so_extension
export NATIVEEOL
@@ -903,6 +908,9 @@
ZLIBURL=http://www.zlib.net/zlib-${zlib_version}.tar.gz
ICONVURL=http://ftp.gnu.org/pub/gnu/libiconv/libiconv-${iconv_version}.ta...
EXPATURL=http://belnet.dl.sourceforge.net/sourceforge/expat/expat-${expat...
+export APIURL
+export APIURLBACK
+export api_version
rm -rf ${package_src_dir}
mkdir -p ${package_src_dir}/srclib
Modified: trunk/build/unix/buildsrc.rhel-httpd.sh
===================================================================
--- trunk/build/unix/buildsrc.rhel-httpd.sh 2008-02-01 07:45:38 UTC (rev 1321)
+++ trunk/build/unix/buildsrc.rhel-httpd.sh 2008-02-01 09:48:52 UTC (rev 1322)
@@ -63,16 +63,28 @@
exit 1
fi
+# We get apr-iconv
+if [ "${BUILD_SYS}" == "windows"]; then
+ util/ckeckdownload.sh $build_cache_dir $package_src_dir $build_top apr-iconv-${api_version} $APIURL $APIURLBACK
+ if [ $? -ne 0 ]; then
+ echo "util/ckeckdownload.sh apr-iconv failed"
+ exit 1
+ fi
+ rm -rf ${dirsources}/srclib/apr-iconv
+ apidirsources=`ls ${build_cache_dir}/ | grep apr-iconv-`
+ echo "Replacing ${dirsources}/srclib/apr-iconv by ${build_cache_dir}/${apidirsources}"
+ cp -rp ${build_cache_dir}/${apidirsources} ${dirsources}/srclib/apr-iconv
+fi
+
+
# Copy apr and apr-util to the build location.
-if [ -d ${dirsources}/srclib/apr ]
-then
+if [ -d ${dirsources}/srclib/apr ]; then
rm -rf ${dirsources}/srclib/apr
- aprdirsources=`ls ${native_dist}/srclib/ | grep apr- | grep -v apr-util`
+ aprdirsources=`ls ${native_dist}/srclib/ | grep apr- | grep -v apr-util | grep -v apr-iconv`
echo "Replacing ${dirsources}/srclib/apr by ${native_dist}/srclib/${aprdirsources}"
mv ${native_dist}/srclib/${aprdirsources} ${dirsources}/srclib/apr
fi
-if [ -d ${dirsources}/srclib/apr-util ]
-then
+if [ -d ${dirsources}/srclib/apr-util ]; then
rm -rf ${dirsources}/srclib/apr-util
aprdirsources=`ls ${native_dist}/srclib/ | grep apr-util-`
echo "Replacing ${dirsources}/srclib/apr-util by ${native_dist}/srclib/${aprdirsources}"
Modified: trunk/build/unix/package.list
===================================================================
--- trunk/build/unix/package.list 2008-02-01 07:45:38 UTC (rev 1321)
+++ trunk/build/unix/package.list 2008-02-01 09:48:52 UTC (rev 1322)
@@ -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||||||1.2.26|1.11|1.95.8
+rhel-httpd|0.0.1|httpd-2_2_3-11_el5|||1.2.1|||1.2.26|1.11|1.95.8
16 years, 11 months
JBoss Native SVN: r1321 - trunk/build/unix.
by jbossnative-commits＠lists.jboss.org
Author: mladen.turk(a)jboss.com
Date: 2008-02-01 02:45:38 -0500 (Fri, 01 Feb 2008)
New Revision: 1321
Modified:
trunk/build/unix/package.list
Log:
Use latest stable mod_jk
Modified: trunk/build/unix/package.list
===================================================================
--- trunk/build/unix/package.list 2008-02-01 07:43:14 UTC (rev 1320)
+++ trunk/build/unix/package.list 2008-02-01 07:45:38 UTC (rev 1321)
@@ -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||||||1.2.25|1.11|1.95.8
+rhel-httpd|0.0.1|httpd-2_2_3-11_el5||||||1.2.26|1.11|1.95.8
16 years, 11 months
JBoss Native SVN: r1320 - trunk/httpd/httpd-2.2/modules.
by jbossnative-commits＠lists.jboss.org
Author: mladen.turk(a)jboss.com
Date: 2008-02-01 02:43:14 -0500 (Fri, 01 Feb 2008)
New Revision: 1320
Modified:
trunk/httpd/httpd-2.2/modules/NMAKEmakefile
Log:
Use correct module directory
Modified: trunk/httpd/httpd-2.2/modules/NMAKEmakefile
===================================================================
--- trunk/httpd/httpd-2.2/modules/NMAKEmakefile 2008-02-01 07:41:05 UTC (rev 1319)
+++ trunk/httpd/httpd-2.2/modules/NMAKEmakefile 2008-02-01 07:43:14 UTC (rev 1320)
@@ -46,7 +46,7 @@
metadata\~ \
proxy\~ \
ssl\~ \
- mod_jk\~
+ jk\~
all: $(SUBDIRS)
16 years, 11 months
JBoss Native SVN: r1319 - in trunk/httpd/httpd-2.2/modules: jk and 1 other directory.
by jbossnative-commits＠lists.jboss.org
Author: mladen.turk(a)jboss.com
Date: 2008-02-01 02:41:05 -0500 (Fri, 01 Feb 2008)
New Revision: 1319
Added:
trunk/httpd/httpd-2.2/modules/jk/NMAKEmakefile
trunk/httpd/httpd-2.2/modules/jk/NMAKEmodjk
trunk/httpd/httpd-2.2/modules/jk/VERSION
Removed:
trunk/httpd/httpd-2.2/modules/mod_jk/
Log:
Remove mod_jk to jk
Added: trunk/httpd/httpd-2.2/modules/jk/NMAKEmakefile
===================================================================
--- trunk/httpd/httpd-2.2/modules/jk/NMAKEmakefile (rev 0)
+++ trunk/httpd/httpd-2.2/modules/jk/NMAKEmakefile 2008-02-01 07:41:05 UTC (rev 1319)
@@ -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/jk/NMAKEmakefile
___________________________________________________________________
Name: svn:eol-style
+ native
Added: trunk/httpd/httpd-2.2/modules/jk/NMAKEmodjk
===================================================================
--- trunk/httpd/httpd-2.2/modules/jk/NMAKEmodjk (rev 0)
+++ trunk/httpd/httpd-2.2/modules/jk/NMAKEmodjk 2008-02-01 07:41:05 UTC (rev 1319)
@@ -0,0 +1,91 @@
+# 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
+
+!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) $<
+
+{$(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/jk/NMAKEmodjk
___________________________________________________________________
Name: svn:eol-style
+ native
Added: trunk/httpd/httpd-2.2/modules/jk/VERSION
===================================================================
--- trunk/httpd/httpd-2.2/modules/jk/VERSION (rev 0)
+++ trunk/httpd/httpd-2.2/modules/jk/VERSION 2008-02-01 07:41:05 UTC (rev 1319)
@@ -0,0 +1 @@
+1.2.26
Property changes on: trunk/httpd/httpd-2.2/modules/jk/VERSION
___________________________________________________________________
Name: svn:eol-style
+ native
16 years, 11 months