JBoss Native SVN: r1218 - 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-14 07:52:19 -0500 (Fri, 14 Dec 2007)
New Revision: 1218
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:
Add .exp and .pdb files to the build
Modified: trunk/httpd/httpd-2.2/NMAKElibhttpd
===================================================================
--- trunk/httpd/httpd-2.2/NMAKElibhttpd 2007-12-14 12:44:34 UTC (rev 1217)
+++ trunk/httpd/httpd-2.2/NMAKElibhttpd 2007-12-14 12:52:19 UTC (rev 1218)
@@ -126,4 +126,6 @@
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 12:44:34 UTC (rev 1217)
+++ trunk/httpd/httpd-2.2/NMAKEmakefile 2007-12-14 12:52:19 UTC (rev 1218)
@@ -87,3 +87,4 @@
install: $(BUILDLIB) $(BUILDOUT) $(WORKDIR) $(BUILDBIN)
@xcopy "$(WORKDIR)\*.exe" "$(BUILDOUT)" /Y /Q 2>NUL
+ @xcopy "$(WORKDIR)\*.pdb" "$(BUILDOUT)" /Y /Q 2>NUL
Modified: trunk/httpd/httpd-2.2/srclib/apr/NMAKEmakefile
===================================================================
--- trunk/httpd/httpd-2.2/srclib/apr/NMAKEmakefile 2007-12-14 12:44:34 UTC (rev 1217)
+++ trunk/httpd/httpd-2.2/srclib/apr/NMAKEmakefile 2007-12-14 12:52:19 UTC (rev 1218)
@@ -229,4 +229,6 @@
@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 12:44:34 UTC (rev 1217)
+++ trunk/httpd/httpd-2.2/srclib/apr-iconv/NMAKEmakefile 2007-12-14 12:52:19 UTC (rev 1218)
@@ -335,4 +335,6 @@
install: $(BUILDLIB) $(BUILDOUT) $(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 12:44:34 UTC (rev 1217)
+++ trunk/httpd/httpd-2.2/srclib/apr-util/NMAKEmakefile 2007-12-14 12:52:19 UTC (rev 1218)
@@ -222,4 +222,6 @@
install: $(BUILDLIB) $(BUILDOUT) $(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 12:44:34 UTC (rev 1217)
+++ trunk/httpd/httpd-2.2/srclib/pcre/NMAKEmakefile 2007-12-14 12:52:19 UTC (rev 1218)
@@ -105,4 +105,6 @@
install: $(BUILDLIB) $(BUILDOUT) $(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 12:44:34 UTC (rev 1217)
+++ trunk/httpd/httpd-2.2/srclib/zlib/NMAKEmakefile 2007-12-14 12:52:19 UTC (rev 1218)
@@ -151,4 +151,6 @@
@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
17 years
JBoss Native SVN: r1217 - in trunk/httpd/httpd-2.2: modules and 1 other directories.
by jbossnative-commits＠lists.jboss.org
Author: mladen.turk(a)jboss.com
Date: 2007-12-14 07:44:34 -0500 (Fri, 14 Dec 2007)
New Revision: 1217
Added:
trunk/httpd/httpd-2.2/modules/
trunk/httpd/httpd-2.2/modules/mod_jk/
trunk/httpd/httpd-2.2/modules/mod_jk/VERSION
Log:
Add mod_jk placeholder
Added: trunk/httpd/httpd-2.2/modules/mod_jk/VERSION
===================================================================
--- trunk/httpd/httpd-2.2/modules/mod_jk/VERSION (rev 0)
+++ trunk/httpd/httpd-2.2/modules/mod_jk/VERSION 2007-12-14 12:44:34 UTC (rev 1217)
@@ -0,0 +1 @@
+1.2.26
Property changes on: trunk/httpd/httpd-2.2/modules/mod_jk/VERSION
___________________________________________________________________
Name: svn:eol-style
+ native
17 years
JBoss Native SVN: r1216 - in trunk: httpd and 1 other directory.
by jbossnative-commits＠lists.jboss.org
Author: mladen.turk(a)jboss.com
Date: 2007-12-14 07:40:59 -0500 (Fri, 14 Dec 2007)
New Revision: 1216
Added:
trunk/httpd/httpd-2.2/
Removed:
trunk/httpd2/
Log:
Move step 2
Copied: trunk/httpd/httpd-2.2 (from rev 1214, trunk/httpd2)
17 years
JBoss Native SVN: r1215 - trunk.
by jbossnative-commits＠lists.jboss.org
Author: mladen.turk(a)jboss.com
Date: 2007-12-14 07:40:32 -0500 (Fri, 14 Dec 2007)
New Revision: 1215
Added:
trunk/httpd/
Log:
Move step 2
17 years
JBoss Native SVN: r1214 - in trunk: httpd2 and 1 other directory.
by jbossnative-commits＠lists.jboss.org
Author: mladen.turk(a)jboss.com
Date: 2007-12-14 07:39:44 -0500 (Fri, 14 Dec 2007)
New Revision: 1214
Added:
trunk/httpd2/
Removed:
trunk/httpd/
Modified:
trunk/httpd2/NMAKEmakefile
Log:
Move stapp 1
Copied: trunk/httpd2 (from rev 1213, trunk/httpd)
Modified: trunk/httpd2/NMAKEmakefile
===================================================================
--- trunk/httpd/NMAKEmakefile 2007-12-14 11:54:33 UTC (rev 1213)
+++ trunk/httpd2/NMAKEmakefile 2007-12-14 12:39:44 UTC (rev 1214)
@@ -1,89 +1,89 @@
-# 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 = httpd
-
-!IF !DEFINED(SRCDIR) || "$(SRCDIR)" == ""
-SRCDIR = .
-!ENDIF
-
-!IF !DEFINED(PREFIX) || "$(PREFIX)" == ""
-PREFIX = $(SRCDIR)\dist\WINNT-$(CPU)
-!ENDIF
-
-!include <NMAKEcommon.inc>
-
-LDIRS = /libpath:"$(SRCDIR)\$(WORKDIR_DLL)" /libpath:"$(SRCDIR)\srclib\apr\$(WORKDIR_DLL)" /libpath:"$(SRCDIR)\srclib\apr-util\$(WORKDIR_DLL)"
-LFLAGS = $(LFLAGS) user32.lib psapi.lib gdi32.lib shlwapi.lib wldap32.lib ole32.lib
-LIBS = $(LIBS) libapr-1.lib libaprutil-1.lib libhttpd.lib
-
-INCLUDES = -I$(SRCDIR)\include -I$(SRCDIR)\srclib\apr\include -I$(SRCDIR)\srclib\apr-util\include
-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
-
-RCFLAGS = $(RCFLAGS) /d BIN_NAME="$(PROJECT).exe" /d LONG_NAME="Apache HTTP Server" /d ICON_FILE="apache.ico"
-
-BUILDDEP = $(WORKDIR_DLL)\libhttpd.dll
-
-all : $(WORKDIR) $(BUILDLIB) $(BUILDOUT) $(BUILDDEP) $(BUILDBIN)
-
-$(BUILDLIB) :
- @if not exist "$(BUILDLIB)\$(NULL)" mkdir "$(BUILDLIB)"
-
-$(BUILDOUT) :
- @if not exist "$(BUILDOUT)\$(NULL)" mkdir "$(BUILDOUT)"
-
-$(WORKDIR) :
- @$(MAKEWORKDIR)
-
-$(BUILDDEP) :
- $(MAKE) -f NMAKElibhttpd PREFIX=$(PREFIX) install
-
-{$(SRCDIR)\server}.c{$(WORKDIR)}.obj:
- $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $<
-
-$(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) $(BUILDDEP) $(OBJECTS) $(BUILDRES)
- $(LINK) $(LFLAGS) $(OBJECTS) $(BUILDRES) $(LIBS) $(LDIRS) /pdb:$(BUILDPDB) /out:$(BUILDBIN)
- IF EXIST $(BUILDMAN) \
- mt -nologo -manifest $(BUILDMAN) -outputresource:$(BUILDBIN);2
-clean:
- @$(CLEANTARGET)
-
-install: $(BUILDLIB) $(BUILDOUT) $(WORKDIR) $(BUILDBIN)
- @xcopy "$(WORKDIR)\*.exe" "$(BUILDOUT)" /Y /Q 2>NUL
+# 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 = httpd
+
+!IF !DEFINED(SRCDIR) || "$(SRCDIR)" == ""
+SRCDIR = .
+!ENDIF
+
+!IF !DEFINED(PREFIX) || "$(PREFIX)" == ""
+PREFIX = $(SRCDIR)\dist\WINNT-$(CPU)
+!ENDIF
+
+!include <NMAKEcommon.inc>
+
+LDIRS = /libpath:"$(SRCDIR)\$(WORKDIR_DLL)" /libpath:"$(SRCDIR)\srclib\apr\$(WORKDIR_DLL)" /libpath:"$(SRCDIR)\srclib\apr-util\$(WORKDIR_DLL)"
+LFLAGS = $(LFLAGS) user32.lib psapi.lib gdi32.lib shlwapi.lib wldap32.lib ole32.lib
+LIBS = $(LIBS) libapr-1.lib libaprutil-1.lib libhttpd.lib
+
+INCLUDES = -I$(SRCDIR)\include -I$(SRCDIR)\srclib\apr\include -I$(SRCDIR)\srclib\apr-util\include
+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
+
+RCFLAGS = $(RCFLAGS) /d BIN_NAME="$(PROJECT).exe" /d LONG_NAME="Apache HTTP Server" /d ICON_FILE="apache.ico"
+
+BUILDDEP = $(WORKDIR_DLL)\libhttpd.dll
+
+all : $(WORKDIR) $(BUILDLIB) $(BUILDOUT) $(BUILDDEP) $(BUILDBIN)
+
+$(BUILDLIB) :
+ @if not exist "$(BUILDLIB)\$(NULL)" mkdir "$(BUILDLIB)"
+
+$(BUILDOUT) :
+ @if not exist "$(BUILDOUT)\$(NULL)" mkdir "$(BUILDOUT)"
+
+$(WORKDIR) :
+ @$(MAKEWORKDIR)
+
+$(BUILDDEP) :
+ $(MAKE) -f NMAKElibhttpd PREFIX=$(PREFIX) install
+
+{$(SRCDIR)\server}.c{$(WORKDIR)}.obj:
+ $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $<
+
+$(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) $(BUILDDEP) $(OBJECTS) $(BUILDRES)
+ $(LINK) $(LFLAGS) $(OBJECTS) $(BUILDRES) $(LIBS) $(LDIRS) /pdb:$(BUILDPDB) /out:$(BUILDBIN)
+ IF EXIST $(BUILDMAN) \
+ mt -nologo -manifest $(BUILDMAN) -outputresource:$(BUILDBIN);2
+clean:
+ @$(CLEANTARGET)
+
+install: $(BUILDLIB) $(BUILDOUT) $(WORKDIR) $(BUILDBIN)
+ @xcopy "$(WORKDIR)\*.exe" "$(BUILDOUT)" /Y /Q 2>NUL
17 years
JBoss Native SVN: r1213 - in trunk/httpd: srclib/apr-util and 1 other directory.
by jbossnative-commits＠lists.jboss.org
Author: mladen.turk(a)jboss.com
Date: 2007-12-14 06:54:33 -0500 (Fri, 14 Dec 2007)
New Revision: 1213
Modified:
trunk/httpd/NMAKElibhttpd
trunk/httpd/srclib/apr-util/NMAKEmakefile
Log:
Build static APR versions as well for tool
Modified: trunk/httpd/NMAKElibhttpd
===================================================================
--- trunk/httpd/NMAKElibhttpd 2007-12-14 10:02:17 UTC (rev 1212)
+++ trunk/httpd/NMAKElibhttpd 2007-12-14 11:54:33 UTC (rev 1213)
@@ -82,16 +82,19 @@
$(BUILDAPR) :
cd $(SRCDIR)\srclib\apr
$(MAKE) -f NMAKEmakefile PREFIX=$(PREFIX) install
+ $(MAKE) -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
cd ..\..
$(BUILDAPI) :
cd $(SRCDIR)\srclib\apr-iconv
$(MAKE) -f NMAKEmakefile PREFIX=$(PREFIX) install
+ $(MAKE) -f NMAKEmakefile PREFIX=$(PREFIX) APR_DECLARE_STATIC=1 install
cd ..\..
$(BUILDPCRE) :
Modified: trunk/httpd/srclib/apr-util/NMAKEmakefile
===================================================================
--- trunk/httpd/srclib/apr-util/NMAKEmakefile 2007-12-14 10:02:17 UTC (rev 1212)
+++ trunk/httpd/srclib/apr-util/NMAKEmakefile 2007-12-14 11:54:33 UTC (rev 1213)
@@ -58,9 +58,8 @@
LDIRS = /libpath:"$(WITH_APR)\$(WORKDIR)" /libpath:"$(WITH_API)\$(WORKDIR)"
-LFLAGS = $(LFLAGS) $(APR_LIB) $(API_LIB)
!IF "$(TARGET)" == "DLL"
-LFLAGS = $(LFLAGS) user32.lib psapi.lib gdi32.lib shlwapi.lib wldap32.lib ole32.lib
+LFLAGS = $(LFLAGS) user32.lib psapi.lib gdi32.lib shlwapi.lib wldap32.lib ole32.lib $(APR_LIB) $(API_LIB)
!ENDIF
INCLUDES = -I$(SRCDIR)\include -I$(SRCDIR)\include\private -I$(SRCDIR)\xml\expat\lib -I$(WITH_APR)\include -I$(WITH_API)\include
17 years
JBoss Native SVN: r1212 - trunk/build/unix.
by jbossnative-commits＠lists.jboss.org
Author: jfrederic.clere(a)jboss.com
Date: 2007-12-14 05:02:17 -0500 (Fri, 14 Dec 2007)
New Revision: 1212
Modified:
trunk/build/unix/build.sh
trunk/build/unix/package.list
Log:
Modify the package.list to allow missing subcomponents/dependencies.
Modified: trunk/build/unix/build.sh
===================================================================
--- trunk/build/unix/build.sh 2007-12-14 08:00:33 UTC (rev 1211)
+++ trunk/build/unix/build.sh 2007-12-14 10:02:17 UTC (rev 1212)
@@ -42,11 +42,13 @@
has_posix_tar=true
# parameters
-has_zlib=true
-has_openssl=false
has_apr=true
has_apu=true
has_api=true
+has_openssl=true
+has_zlib=true
+has_jk=true
+
build_api=false
build_zlib=false
has_cache=false
@@ -144,14 +146,15 @@
fi
export patch
-# Read apr and openssl version.
+# Read tag and version of subcomponent/dependencies.
parg=`grep -v '^#' ${package_list} | grep "^$PACKAGE|" | grep "|$build_version|"`
-apr_version=`echo "${parg}" | ${awk} -F'|' '{print $3}'`
-apu_version=`echo "${parg}" | ${awk} -F'|' '{print $4}'`
-api_version=`echo "${parg}" | ${awk} -F'|' '{print $5}'`
-ssl_version=`echo "${parg}" | ${awk} -F'|' '{print $6}'`
-zlib_version=`echo "${parg}" | ${awk} -F'|' '{print $7}'`
-svn_tagname=`echo "${parg}" | ${awk} -F'|' '{print $8}'`
+svn_tagname=`echo "${parg}" | ${awk} -F'|' '{print $3}'`
+apr_version=`echo "${parg}" | ${awk} -F'|' '{print $4}'`
+apu_version=`echo "${parg}" | ${awk} -F'|' '{print $5}'`
+api_version=`echo "${parg}" | ${awk} -F'|' '{print $6}'`
+ssl_version=`echo "${parg}" | ${awk} -F'|' '{print $7}'`
+zlib_version=`echo "${parg}" | ${awk} -F'|' '{print $8}'`
+jk_version=`echo "${parg}" | ${awk} -F'|' '{print $9}'`
if [ "x" = "x${zlib_version}" ]; then
has_zlib=false
@@ -168,6 +171,9 @@
if [ "x" = "x${api_version}" ]; then
has_api=false
fi
+if [ "x" = "x${jk_version}" ]; then
+ has_jk=false
+fi
# Get plaform information
so_extension=so
@@ -237,6 +243,29 @@
BUILD_SYS=windows
;;
esac
+
+#
+# Display what we are going to do.
+echo "Building ${PACKAGE} on ${BUILD_SYS} ${BUILD_CPU}"
+if $has_apr; then
+echo "using apr: ${apr_version}"
+fi
+if $has_apu; then
+echo "using apr-util: ${apu_version}"
+fi
+if $has_api; then
+echo "using apr-iconv: ${api_version}"
+fi
+if $has_openssl; then
+echo "using openSSL: ${ssl_version}"
+fi
+if $has_zlib; then
+echo "using zlib: ${zlib_version}"
+fi
+if $has_jk; then
+echo "using mod_jk: ${jk_version}"
+fi
+
export so_extension
export NATIVEEOL
export BUILD_SYS
Modified: trunk/build/unix/package.list
===================================================================
--- trunk/build/unix/package.list 2007-12-14 08:00:33 UTC (rev 1211)
+++ trunk/build/unix/package.list 2007-12-14 10:02:17 UTC (rev 1212)
@@ -1,13 +1,13 @@
# list of the packages
# add new versions of package after existing ones.
-jboss-native|2.0.1|1.2.9|1.2.8|1.2.1|0.9.8e|1.2.3|TOMCAT_NATIVE_1_1_11
-jboss-native|2.0.2|1.2.9|1.2.8|1.2.1|0.9.8e|1.2.3|TOMCAT_NATIVE_1_1_11
-jboss-native|2.0.3-dev|1.2.8|1.2.8|1.2.1|0.9.8e|1.2.3|trunk
-jboss-native|2.0.3|1.2.8|1.2.8|1.2.1|0.9.8e|1.2.3|TOMCAT_NATIVE_1_1_11
+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-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|1.2.9|1.2.8|1.2.1|||trunk
-jboss-sight|1.0.1|1.2.8|1.2.8|1.2.1|||trunk
-jboss-sight|1.0.2|1.2.8|1.2.8|1.2.1|||trunk
+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
+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
+jboss-httpd|0.0.1|2.2.6
+rhel-httpd|0.0.1|httpd-2_2_3-11_el5
17 years
JBoss Native SVN: r1211 - trunk/httpd.
by jbossnative-commits＠lists.jboss.org
Author: mladen.turk(a)jboss.com
Date: 2007-12-14 03:00:33 -0500 (Fri, 14 Dec 2007)
New Revision: 1211
Modified:
trunk/httpd/NMAKEmakefile
Log:
Add missing macro
Modified: trunk/httpd/NMAKEmakefile
===================================================================
--- trunk/httpd/NMAKEmakefile 2007-12-14 07:52:11 UTC (rev 1210)
+++ trunk/httpd/NMAKEmakefile 2007-12-14 08:00:33 UTC (rev 1211)
@@ -48,6 +48,7 @@
$(WORKDIR)\main.obj
BUILDLIB = $(PREFIX)\lib
+BUILDOUT = $(PREFIX)\bin
BUILDBIN = $(WORKDIR)\$(PROJECT).exe
BUILDPDB = $(WORKDIR)\$(PROJECT).pdb
17 years
JBoss Native SVN: r1210 - in trunk/httpd: srclib/apr and 4 other directories.
by jbossnative-commits＠lists.jboss.org
Author: mladen.turk(a)jboss.com
Date: 2007-12-14 02:52:11 -0500 (Fri, 14 Dec 2007)
New Revision: 1210
Modified:
trunk/httpd/NMAKElibhttpd
trunk/httpd/NMAKEmakefile
trunk/httpd/srclib/apr-iconv/NMAKEmakefile
trunk/httpd/srclib/apr-util/NMAKEmakefile
trunk/httpd/srclib/apr/NMAKEmakefile
trunk/httpd/srclib/pcre/NMAKEmakefile
trunk/httpd/srclib/zlib/NMAKEmakefile
Log:
Add temporary install target
Modified: trunk/httpd/NMAKElibhttpd
===================================================================
--- trunk/httpd/NMAKElibhttpd 2007-12-13 18:37:43 UTC (rev 1209)
+++ trunk/httpd/NMAKElibhttpd 2007-12-14 07:52:11 UTC (rev 1210)
@@ -47,7 +47,9 @@
$(SRCDIR)\include\mpm.h \
$(SRCDIR)\include\mpm_default.h
+BUILDINC = $(PREFIX)\include
BUILDLIB = $(PREFIX)\lib
+BUILDOUT = $(PREFIX)\bin
BUILDBIN = $(WORKDIR)\$(PROJECT).dll
BUILDPDB = $(WORKDIR)\$(PROJECT).pdb
@@ -61,11 +63,17 @@
BUILDAPU = $(SRCDIR)\srclib\apr-util\$(WORKDIR)\libaprutil-1.dll
BUILDPCRE = $(SRCDIR)\srclib\pcre\$(WORKDIR_LIB)\pcre.lib
-all : $(WORKDIR) $(BUILDLIB) $(HEADERS) $(BUILDAPR) $(BUILDAPI) $(BUILDAPU) $(BUILDPCRE) $(BUILDBIN)
+all : $(BUILDINC) $(BUILDLIB) $(BUILDOUT) $(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)
@@ -73,22 +81,22 @@
$(BUILDAPR) :
cd $(SRCDIR)\srclib\apr
- $(MAKE) -f NMAKEmakefile
+ $(MAKE) -f NMAKEmakefile PREFIX=$(PREFIX) install
cd ..\..
$(BUILDAPU) :
cd $(SRCDIR)\srclib\apr-util
- $(MAKE) -f NMAKEmakefile
+ $(MAKE) -f NMAKEmakefile PREFIX=$(PREFIX) install
cd ..\..
$(BUILDAPI) :
cd $(SRCDIR)\srclib\apr-iconv
- $(MAKE) -f NMAKEmakefile
+ $(MAKE) -f NMAKEmakefile PREFIX=$(PREFIX) install
cd ..\..
$(BUILDPCRE) :
cd $(SRCDIR)\srclib\pcre
- $(MAKE) -f NMAKEmakefile PCRE_STATIC=1
+ $(MAKE) -f NMAKEmakefile PCRE_STATIC=1 PREFIX=$(PREFIX) install
cd ..\..
{$(SRCDIR)\server}.c{$(WORKDIR)}.obj:
@@ -112,5 +120,7 @@
clean:
@$(CLEANTARGET)
-install: $(BUILDLIB) $(WORKDIR) $(BUILDBIN)
- @xcopy "$(WORKDIR)\*.dll" "$(BUILDLIB)" /Y /Q 2>NUL
+install: $(BUILDINC) $(BUILDLIB) $(BUILDOUT) $(WORKDIR) $(HEADERS) $(BUILDBIN)
+ @xcopy "$(SRCDIR)\include\*.h" "$(BUILDINC)" /Y /Q
+ @xcopy "$(WORKDIR)\*.lib" "$(BUILDLIB)" /Y /Q
+ @xcopy "$(WORKDIR)\*.dll" "$(BUILDOUT)" /Y /Q 2>NUL
Modified: trunk/httpd/NMAKEmakefile
===================================================================
--- trunk/httpd/NMAKEmakefile 2007-12-13 18:37:43 UTC (rev 1209)
+++ trunk/httpd/NMAKEmakefile 2007-12-14 07:52:11 UTC (rev 1210)
@@ -32,6 +32,10 @@
SRCDIR = .
!ENDIF
+!IF !DEFINED(PREFIX) || "$(PREFIX)" == ""
+PREFIX = $(SRCDIR)\dist\WINNT-$(CPU)
+!ENDIF
+
!include <NMAKEcommon.inc>
LDIRS = /libpath:"$(SRCDIR)\$(WORKDIR_DLL)" /libpath:"$(SRCDIR)\srclib\apr\$(WORKDIR_DLL)" /libpath:"$(SRCDIR)\srclib\apr-util\$(WORKDIR_DLL)"
@@ -54,16 +58,19 @@
BUILDDEP = $(WORKDIR_DLL)\libhttpd.dll
-all : $(WORKDIR) $(BUILDLIB) $(BUILDDEP) $(BUILDBIN)
+all : $(WORKDIR) $(BUILDLIB) $(BUILDOUT) $(BUILDDEP) $(BUILDBIN)
$(BUILDLIB) :
@if not exist "$(BUILDLIB)\$(NULL)" mkdir "$(BUILDLIB)"
+$(BUILDOUT) :
+ @if not exist "$(BUILDOUT)\$(NULL)" mkdir "$(BUILDOUT)"
+
$(WORKDIR) :
@$(MAKEWORKDIR)
$(BUILDDEP) :
- $(MAKE) -f NMAKElibhttpd PREFIX=$(PREFIX)
+ $(MAKE) -f NMAKElibhttpd PREFIX=$(PREFIX) install
{$(SRCDIR)\server}.c{$(WORKDIR)}.obj:
$(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $<
@@ -77,5 +84,5 @@
clean:
@$(CLEANTARGET)
-install: $(BUILDLIB) $(WORKDIR) $(BUILDBIN)
- @xcopy "$(WORKDIR)\*.exe" "$(BUILDLIB)" /Y /Q 2>NUL
+install: $(BUILDLIB) $(BUILDOUT) $(WORKDIR) $(BUILDBIN)
+ @xcopy "$(WORKDIR)\*.exe" "$(BUILDOUT)" /Y /Q 2>NUL
Modified: trunk/httpd/srclib/apr/NMAKEmakefile
===================================================================
--- trunk/httpd/srclib/apr/NMAKEmakefile 2007-12-13 18:37:43 UTC (rev 1209)
+++ trunk/httpd/srclib/apr/NMAKEmakefile 2007-12-14 07:52:11 UTC (rev 1210)
@@ -115,6 +115,7 @@
BUILDINC = $(PREFIX)\include
BUILDLIB = $(PREFIX)\lib
+BUILDOUT = $(PREFIX)\bin
!IF "$(TARGET)" == "DLL"
BUILDBIN = $(WORKDIR)\$(PROJECT).dll
BUILDPDB = $(WORKDIR)\$(PROJECT).pdb
@@ -124,7 +125,7 @@
BUILDBIN = $(WORKDIR)\$(PROJECT).lib
!ENDIF
-all : $(BUILDINC) $(BUILDLIB) $(WORKDIR) $(HEADERS) $(BUILDBIN)
+all : $(BUILDINC) $(BUILDLIB) $(BUILDOUT) $(WORKDIR) $(HEADERS) $(BUILDBIN)
$(BUILDINC) :
@if not exist "$(BUILDINC)\arch\win32\$(NULL)" mkdir "$(BUILDINC)\arch\win32"
@@ -132,6 +133,9 @@
$(BUILDLIB) :
@if not exist "$(BUILDLIB)\$(NULL)" mkdir "$(BUILDLIB)"
+$(BUILDOUT) :
+ @if not exist "$(BUILDOUT)\$(NULL)" mkdir "$(BUILDOUT)"
+
$(WORKDIR) :
@$(MAKEWORKDIR)
@@ -220,9 +224,9 @@
clean:
@$(CLEANTARGET)
-install: $(BUILDINC) $(BUILDLIB) $(WORKDIR) $(HEADERS) $(BUILDBIN)
+install: $(BUILDINC) $(BUILDLIB) $(BUILDOUT) $(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)\*.dll" "$(BUILDLIB)" /Y /Q 2>NUL
+ @xcopy "$(WORKDIR)\*.dll" "$(BUILDOUT)" /Y /Q 2>NUL
Modified: trunk/httpd/srclib/apr-iconv/NMAKEmakefile
===================================================================
--- trunk/httpd/srclib/apr-iconv/NMAKEmakefile 2007-12-13 18:37:43 UTC (rev 1209)
+++ trunk/httpd/srclib/apr-iconv/NMAKEmakefile 2007-12-14 07:52:11 UTC (rev 1210)
@@ -281,6 +281,7 @@
$(WORKDIR)\iconv_uc.obj
+BUILDOUT = $(PREFIX)\bin
BUILDLIB = $(PREFIX)\lib
BUILDINC = $(PREFIX)\include
@@ -293,11 +294,14 @@
BUILDBIN = $(WORKDIR)\$(PROJECT).lib
!ENDIF
-all : $(BUILDLIB) $(WORKDIR) $(BUILDBIN)
+all : $(BUILDLIB) $(BUILDOUT) $(WORKDIR) $(BUILDBIN)
$(BUILDLIB) :
@if not exist "$(BUILDLIB)\$(NULL)" mkdir "$(BUILDLIB)"
+$(BUILDOUT) :
+ @if not exist "$(BUILDOUT)\$(NULL)" mkdir "$(BUILDOUT)"
+
$(WORKDIR) :
@$(MAKEWORKDIR)
@@ -328,7 +332,7 @@
clean:
@$(CLEANTARGET)
-install: $(BUILDLIB) $(WORKDIR) $(BUILDBIN)
+install: $(BUILDLIB) $(BUILDOUT) $(WORKDIR) $(BUILDBIN)
@xcopy "$(SRCDIR)\include\*.h" "$(BUILDINC)" /Y /Q
@xcopy "$(WORKDIR)\*.lib" "$(BUILDLIB)" /Y /Q
- @xcopy "$(WORKDIR)\*.dll" "$(BUILDLIB)" /Y /Q 2>NUL
+ @xcopy "$(WORKDIR)\*.dll" "$(BUILDOUT)" /Y /Q 2>NUL
Modified: trunk/httpd/srclib/apr-util/NMAKEmakefile
===================================================================
--- trunk/httpd/srclib/apr-util/NMAKEmakefile 2007-12-13 18:37:43 UTC (rev 1209)
+++ trunk/httpd/srclib/apr-util/NMAKEmakefile 2007-12-14 07:52:11 UTC (rev 1210)
@@ -123,7 +123,7 @@
$(SRCDIR)\xml\expat\lib\config.h \
$(SRCDIR)\xml\expat\lib\expat.h
-
+BUILDOUT = $(PREFIX)\bin
BUILDLIB = $(PREFIX)\lib
BUILDINC = $(PREFIX)\include
@@ -136,11 +136,14 @@
BUILDBIN = $(WORKDIR)\$(PROJECT).lib
!ENDIF
-all : $(BUILDLIB) $(WORKDIR) $(HEADERS) $(BUILDBIN)
+all : $(BUILDLIB) $(BUILDOUT) $(WORKDIR) $(HEADERS) $(BUILDBIN)
$(BUILDLIB) :
@if not exist "$(BUILDLIB)\$(NULL)" mkdir "$(BUILDLIB)"
+$(BUILDOUT) :
+ @if not exist "$(BUILDOUT)\$(NULL)" mkdir "$(BUILDOUT)"
+
$(WORKDIR) :
@$(MAKEWORKDIR)
@@ -217,7 +220,7 @@
clean:
@$(CLEANTARGET)
-install: $(BUILDLIB) $(WORKDIR) $(BUILDBIN)
+install: $(BUILDLIB) $(BUILDOUT) $(WORKDIR) $(BUILDBIN)
@xcopy "$(SRCDIR)\include\*.h" "$(BUILDINC)" /Y /Q
@xcopy "$(WORKDIR)\*.lib" "$(BUILDLIB)" /Y /Q
- @xcopy "$(WORKDIR)\*.dll" "$(BUILDLIB)" /Y /Q 2>NUL
+ @xcopy "$(WORKDIR)\*.dll" "$(BUILDOUT)" /Y /Q 2>NUL
Modified: trunk/httpd/srclib/pcre/NMAKEmakefile
===================================================================
--- trunk/httpd/srclib/pcre/NMAKEmakefile 2007-12-13 18:37:43 UTC (rev 1209)
+++ trunk/httpd/srclib/pcre/NMAKEmakefile 2007-12-14 07:52:11 UTC (rev 1210)
@@ -59,6 +59,7 @@
$(SRCDIR)\config.h
+BUILDOUT = $(PREFIX)\bin
BUILDLIB = $(PREFIX)\lib
BUILDINC = $(PREFIX)\include
@@ -71,7 +72,7 @@
BUILDBIN = $(WORKDIR)\$(PROJECT).lib
!ENDIF
-all : $(BUILDLIB) $(WORKDIR) $(HEADERS) $(BUILDBIN)
+all : $(BUILDLIB) $(BUILDOUT) $(WORKDIR) $(HEADERS) $(BUILDBIN)
$(BUILDLIB) :
@if not exist "$(BUILDLIB)\$(NULL)" mkdir "$(BUILDLIB)"
@@ -101,7 +102,7 @@
clean:
@$(CLEANTARGET)
-install: $(BUILDLIB) $(WORKDIR) $(BUILDBIN)
+install: $(BUILDLIB) $(BUILDOUT) $(WORKDIR) $(BUILDBIN)
@xcopy "$(SRCDIR)\pcre.h" "$(BUILDINC)" /Y /Q
@xcopy "$(WORKDIR)\*.lib" "$(BUILDLIB)" /Y /Q
- @xcopy "$(WORKDIR)\*.dll" "$(BUILDLIB)" /Y /Q 2>NUL
+ @xcopy "$(WORKDIR)\*.dll" "$(BUILDOUT)" /Y /Q 2>NUL
Modified: trunk/httpd/srclib/zlib/NMAKEmakefile
===================================================================
--- trunk/httpd/srclib/zlib/NMAKEmakefile 2007-12-13 18:37:43 UTC (rev 1209)
+++ trunk/httpd/srclib/zlib/NMAKEmakefile 2007-12-14 07:52:11 UTC (rev 1210)
@@ -85,6 +85,7 @@
BUILDINC = $(PREFIX)\include\apr-1
BUILDLIB = $(PREFIX)\lib
+BUILDOUT = $(PREFIX)\lib
!IF "$(TARGET)" == "DLL"
BUILDBIN = $(WORKDIR)\$(PROJECT).dll
BUILDPDB = $(WORKDIR)\$(PROJECT).pdb
@@ -94,7 +95,7 @@
BUILDBIN = $(WORKDIR)\$(PROJECT).lib
!ENDIF
-all : $(WORKDIR) $(BUILDBIN)
+all : $(BUILDINC) $(BUILDLIB) $(BUILDOUT) $(WORKDIR) $(BUILDBIN)
$(BUILDINC) :
@if not exist "$(BUILDINC)\arch\win32\$(NULL)" mkdir "$(BUILDINC)\arch\win32"
@@ -102,6 +103,9 @@
$(BUILDLIB) :
@if not exist "$(BUILDLIB)\$(NULL)" mkdir "$(BUILDLIB)"
+$(BUILDOUT) :
+ @if not exist "$(BUILDOUT)\$(NULL)" mkdir "$(BUILDOUT)"
+
$(WORKDIR) :
@$(MAKEWORKDIR)
@@ -142,9 +146,9 @@
clean:
@$(CLEANTARGET)
-install: $(BUILDINC) $(BUILDLIB) $(WORKDIR) $(BUILDBIN)
+install: $(BUILDINC) $(BUILDLIB) $(BUILDOUT) $(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)\*.dll" "$(BUILDLIB)" /Y /Q 2>NUL
+ @xcopy "$(WORKDIR)\*.dll" "$(BUILDOUT)" /Y /Q 2>NUL
17 years
JBoss Native SVN: r1209 - trunk/httpd.
by jbossnative-commits＠lists.jboss.org
Author: mladen.turk(a)jboss.com
Date: 2007-12-13 13:37:43 -0500 (Thu, 13 Dec 2007)
New Revision: 1209
Modified:
trunk/httpd/NMAKEmakefile
Log:
Make libhttpd as only dependency (for now)
Modified: trunk/httpd/NMAKEmakefile
===================================================================
--- trunk/httpd/NMAKEmakefile 2007-12-13 18:26:33 UTC (rev 1208)
+++ trunk/httpd/NMAKEmakefile 2007-12-13 18:37:43 UTC (rev 1209)
@@ -1,117 +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.
-#
-# ====================================================================
-#
-# NMAKEmakefile Master HTTPD makefile.
-# Usage:
-# DEBUG=1 Build DEBUG version of HTTPD
-#
-# Originally contributed by Mladen Turk <mturk redhat.com>
-#
-# ====================================================================
-#
-
-
-TARGET=EXE
-PROJECT = httpd
-
-!IF !DEFINED(SRCDIR) || "$(SRCDIR)" == ""
-SRCDIR = .
-!ENDIF
-
-!include <NMAKEcommon.inc>
-
-LDIRS = /libpath:"$(SRCDIR)\srclib\apr\$(WORKDIR_DLL)" /libpath:"$(SRCDIR)\srclib\apr-iconv\$(WORKDIR_DLL)" /libpath:"$(SRCDIR)\srclib\apr-util\$(WORKDIR_DLL)"
-LFLAGS = $(LFLAGS) user32.lib psapi.lib gdi32.lib shlwapi.lib wldap32.lib ole32.lib libapr-1.lib libapriconv-1.lib libaprutil-1.lib
-
-INCLUDES = -I$(SRCDIR)\include -I$(SRCDIR)\srclib\apr\include -I$(SRCDIR)\srclib\apr-util\include
-PDBFLAGS = -Fo$(WORKDIR)\ -Fd$(WORKDIR)\$(PROJECT)-src
-OBJECTS = \
- $(WORKDIR)\main.obj
-
-HEADERS = \
- $(SRCDIR)\include\os.h \
- $(SRCDIR)\include\mpm.h \
- $(SRCDIR)\include\mpm_default.h
-
-BUILDLIB = $(PREFIX)\lib
-
-BUILDBIN = $(WORKDIR)\$(PROJECT).exe
-BUILDPDB = $(WORKDIR)\$(PROJECT).pdb
-BUILDRES = $(WORKDIR)\$(PROJECT).res
-BUILDMAN = $(BUILDBIN).manifest
-
-RCFLAGS = $(RCFLAGS) /d BIN_NAME="$(PROJECT).exe" /d LONG_NAME="Apache HTTP Server" /d ICON_FILE="apache.ico"
-
-BUILDAPR = $(SRCDIR)\srclib\apr\$(WORKDIR_DLL)\libapr-1.dll
-BUILDAPI = $(SRCDIR)\srclib\apr-iconv\$(WORKDIR_DLL)\libapriconv-1.dll
-BUILDAPU = $(SRCDIR)\srclib\apr-util\$(WORKDIR_DLL)\libaprutil-1.dll
-BUILDPCRE = $(SRCDIR)\srclib\pcre\$(WORKDIR_LIB)\pcre.lib
-
-
-all : $(WORKDIR) $(BUILDLIB) $(HEADERS) $(BUILDAPR) $(BUILDAPI) $(BUILDAPU) $(BUILDPCRE) $(BUILDBIN)
-
-$(BUILDLIB) :
- @if not exist "$(BUILDLIB)\$(NULL)" mkdir "$(BUILDLIB)"
-
-$(WORKDIR) :
- @$(MAKEWORKDIR)
-
-.SUFFIXES : .h
-
-$(BUILDAPR) :
- cd $(SRCDIR)\srclib\apr
- $(MAKE) -f NMAKEmakefile
- cd ..\..
-
-$(BUILDAPU) :
- cd $(SRCDIR)\srclib\apr-util
- $(MAKE) -f NMAKEmakefile
- cd ..\..
-
-$(BUILDAPI) :
- cd $(SRCDIR)\srclib\apr-iconv
- $(MAKE) -f NMAKEmakefile
- cd ..\..
-
-$(BUILDPCRE) :
- cd $(SRCDIR)\srclib\pcre
- $(MAKE) -f NMAKEmakefile PCRE_STATIC=1
- cd ..\..
-
-{$(SRCDIR)\server}.c{$(WORKDIR)}.obj:
- $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $<
-
-$(SRCDIR)\include\os.h:
- @copy /Y $(SRCDIR)\os\win32\os.h $@ >NUL
-
-$(SRCDIR)\include\mpm.h:
- @copy /Y $(SRCDIR)\server\mpm\winnt\mpm.h $@ >NUL
-
-$(SRCDIR)\include\mpm_default.h:
- @copy /Y $(SRCDIR)\server\mpm\winnt\mpm_default.h $@ >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
-clean:
- @$(CLEANTARGET)
-
-install: $(BUILDLIB) $(WORKDIR) $(BUILDBIN)
- @xcopy "$(WORKDIR)\*.exe" "$(BUILDLIB)" /Y /Q 2>NUL
+# 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 = httpd
+
+!IF !DEFINED(SRCDIR) || "$(SRCDIR)" == ""
+SRCDIR = .
+!ENDIF
+
+!include <NMAKEcommon.inc>
+
+LDIRS = /libpath:"$(SRCDIR)\$(WORKDIR_DLL)" /libpath:"$(SRCDIR)\srclib\apr\$(WORKDIR_DLL)" /libpath:"$(SRCDIR)\srclib\apr-util\$(WORKDIR_DLL)"
+LFLAGS = $(LFLAGS) user32.lib psapi.lib gdi32.lib shlwapi.lib wldap32.lib ole32.lib
+LIBS = $(LIBS) libapr-1.lib libaprutil-1.lib libhttpd.lib
+
+INCLUDES = -I$(SRCDIR)\include -I$(SRCDIR)\srclib\apr\include -I$(SRCDIR)\srclib\apr-util\include
+PDBFLAGS = -Fo$(WORKDIR)\ -Fd$(WORKDIR)\$(PROJECT)-src
+OBJECTS = \
+ $(WORKDIR)\main.obj
+
+BUILDLIB = $(PREFIX)\lib
+
+BUILDBIN = $(WORKDIR)\$(PROJECT).exe
+BUILDPDB = $(WORKDIR)\$(PROJECT).pdb
+BUILDRES = $(WORKDIR)\$(PROJECT).res
+BUILDMAN = $(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
+
+all : $(WORKDIR) $(BUILDLIB) $(BUILDDEP) $(BUILDBIN)
+
+$(BUILDLIB) :
+ @if not exist "$(BUILDLIB)\$(NULL)" mkdir "$(BUILDLIB)"
+
+$(WORKDIR) :
+ @$(MAKEWORKDIR)
+
+$(BUILDDEP) :
+ $(MAKE) -f NMAKElibhttpd PREFIX=$(PREFIX)
+
+{$(SRCDIR)\server}.c{$(WORKDIR)}.obj:
+ $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $<
+
+$(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) $(BUILDDEP) $(OBJECTS) $(BUILDRES)
+ $(LINK) $(LFLAGS) $(OBJECTS) $(BUILDRES) $(LIBS) $(LDIRS) /pdb:$(BUILDPDB) /out:$(BUILDBIN)
+ IF EXIST $(BUILDMAN) \
+ mt -nologo -manifest $(BUILDMAN) -outputresource:$(BUILDBIN);2
+clean:
+ @$(CLEANTARGET)
+
+install: $(BUILDLIB) $(WORKDIR) $(BUILDBIN)
+ @xcopy "$(WORKDIR)\*.exe" "$(BUILDLIB)" /Y /Q 2>NUL
17 years