Author: fuankg
Date: Sat Jul 18 16:54:13 2009
New Revision: 795396
URL: http://svn.apache.org/viewvc?rev=795396&view=rev
Log:
enable building the NetWare build helpers for running on Win32.
Modified:
httpd/httpd/trunk/build/NWGNUenvironment.inc
httpd/httpd/trunk/build/NWGNUmakefile
Modified: httpd/httpd/trunk/build/NWGNUenvironment.inc
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/build/NWGNUenvironment.inc?rev=795396&r1=795395&r2=795396&view=diff
==============================================================================
--- httpd/httpd/trunk/build/NWGNUenvironment.inc (original)
+++ httpd/httpd/trunk/build/NWGNUenvironment.inc Sat Jul 18 16:54:13 2009
@@ -129,6 +129,7 @@
CPP = mwccnlm
LINK = mwldnlm
LIB = mwldnlm -type library -w nocmdline
+WIN_CC = mwcc
# Setup build tools
AWK = awk
@@ -169,13 +170,17 @@
VERSION_SKT = (WINSOCK)
endif
-#
# MetroWerks static Libraries
-
CLIB3S = $(METROWERKS)\Novell Support\Metrowerks Support\Libraries\Runtime\mwcrtl.lib
MATH3S =
PLIB3S = $(METROWERKS)\Novell Support\Metrowerks Support\Libraries\MSL C++\MWCPP.lib
+# MetroWerks Win32 build flags to create build tool
+WIN_CFLAGS = -O2 -gccinc -nodefaults -proc 586 -w off
+WIN_CFLAGS += -ir "$(METROWERKS)/MSL" -ir "$(METROWERKS)/Win32-x86 Support"
+WIN_CFLAGS += -lr "$(METROWERKS)/MSL" -lr "$(METROWERKS)/Win32-x86 Support"
+WIN_CFLAGS += -lMSL_All_x86.lib -lkernel32.lib -luser32.lib
+
# Base compile flags
# and prefix or precompiled header added here.
Modified: httpd/httpd/trunk/build/NWGNUmakefile
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/build/NWGNUmakefile?rev=795396&r1=795395&r2=795396&view=diff
==============================================================================
--- httpd/httpd/trunk/build/NWGNUmakefile (original)
+++ httpd/httpd/trunk/build/NWGNUmakefile Sat Jul 18 16:54:13 2009
@@ -17,11 +17,12 @@
# build this level's files
FILES_prebuild_headers = \
+ $(NWOS)/test_char.h \
$(PCRE)/config.h \
$(PCRE)/pcre.h \
$(EOLIST)
-nlms :: chkapr $(NWOS)/httpd.imp
+nlms :: chkapr $(NWOS)/httpd.imp $(NWOS)/chartables.c
$(NWOS)/httpd.imp : make_nw_export.awk nw_export.i
@echo Generating $(subst /,\,$@)
@@ -53,6 +54,36 @@
@echo Creating $(subst /,\,$@)
copy $< $(subst /,\,$(PCRE))\$(@F)
+ifneq "$(BUILDTOOL_AS_NLM)" "1"
+
+$(NWOS)/chartables.c: dftables.exe $(PCRE)/dftables.c $(FILES_prebuild_headers)
+ @echo Creating $(subst /,\,$@)
+ @$< $@
+
+%.exe: $(PCRE)/%.c
+ @echo Creating Build Helper $@
+ @$(WIN_CC) $(WIN_CFLAGS) $< -o $@
+
+$(NWOS)/test_char.h: gen_test_char.exe $(AP_WORK)/server/gen_test_char.c
+ @echo Creating $(subst /,\,$@)
+ @$< > $@
+
+%.exe: $(AP_WORK)/server/%.c
+ @echo Creating Build Helper $@
+ @$(WIN_CC) $(WIN_CFLAGS) -DCROSS_COMPILE $< -o $@
+
+else
+
+ifneq "$(wildcard $(NWOS)/chartables.c)" "$(NWOS)/chartables.c"
+$(error Error: required source $(abspath $(NWOS)/chartables.c) not found!)
+endif
+
+ifneq "$(wildcard $(NWOS)/test_char.h)" "$(NWOS)/test_char.h"
+$(error Error: required header $(abspath $(NWOS)/test_char.h) not found!)
+endif
+
+endif
+
#
# Check for minimum APR version
#
@@ -67,12 +98,18 @@
install :: nlms FORCE
clean ::
- $(CHK) $(subst /,\,$(PCRE))\config.h $(DEL) $(subst /,\,$(PCRE))\config.h
- $(CHK) $(subst /,\,$(PCRE))\pcre.h $(DEL) $(subst /,\,$(PCRE))\pcre.h
- $(CHK) $(subst /,\,$(NWOS))\httpd.imp $(DEL) $(subst /,\,$(NWOS))\httpd.imp
- $(CHK) nw_export.i $(DEL) nw_export.i
- $(CHK) cc.opt $(DEL) cc.opt
- $(CHK) NWGNUversion.inc $(DEL) NWGNUversion.inc
+ $(CHK) $(subst /,\,$(PCRE))\config.h $(DEL) $(subst /,\,$(PCRE))\config.h
+ $(CHK) $(subst /,\,$(PCRE))\pcre.h $(DEL) $(subst /,\,$(PCRE))\pcre.h
+ $(CHK) $(subst /,\,$(NWOS))\httpd.imp $(DEL) $(subst /,\,$(NWOS))\httpd.imp
+ $(CHK) nw_export.i $(DEL) nw_export.i
+ $(CHK) cc.opt $(DEL) cc.opt
+ $(CHK) NWGNUversion.inc $(DEL) NWGNUversion.inc
+ifneq "$(BUILDTOOL_AS_NLM)" "1"
+ $(CHK) $(subst /,\,$(NWOS))\chartables.c $(DEL) $(subst /,\,$(NWOS))\chartables.c
+ $(CHK) $(subst /,\,$(NWOS))\test_char.h $(DEL) $(subst /,\,$(NWOS))\test_char.h
+ $(CHK) dftables.exe $(DEL) dftables.exe
+ $(CHK) gen_test_char.exe $(DEL) gen_test_char.exe
+endif
#
# Include the 'tail' makefile that has targets that depend on variables defined
|