httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fua...@apache.org
Subject svn commit: r1001396 - in /httpd/httpd/branches/2.0.x/build: NWGNUenvironment.inc NWGNUmakefile
Date Sun, 26 Sep 2010 09:28:52 GMT
Author: fuankg
Date: Sun Sep 26 09:28:51 2010
New Revision: 1001396

URL: http://svn.apache.org/viewvc?rev=1001396&view=rev
Log:
prepare NetWare build for creating build helpers to run on build platform;
disabled by default until gen_test_char.c is modified to allow for cross-compile.

Modified:
    httpd/httpd/branches/2.0.x/build/NWGNUenvironment.inc
    httpd/httpd/branches/2.0.x/build/NWGNUmakefile

Modified: httpd/httpd/branches/2.0.x/build/NWGNUenvironment.inc
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.0.x/build/NWGNUenvironment.inc?rev=1001396&r1=1001395&r2=1001396&view=diff
==============================================================================
--- httpd/httpd/branches/2.0.x/build/NWGNUenvironment.inc (original)
+++ httpd/httpd/branches/2.0.x/build/NWGNUenvironment.inc Sun Sep 26 09:28:51 2010
@@ -111,10 +111,11 @@ endif
 #
 
 # MetroWerks NLM tools
-CC		= mwccnlm
-CPP		= mwccnlm
+CC	= mwccnlm
+CPP	= mwccnlm
 LINK	= mwldnlm
-LIB		= mwldnlm -type library -w nocmdline
+LIB	= mwldnlm -type library -w nocmdline
+WIN_CC	= mwcc
 
 NOVI	= $(NOVELLLIBC)\imports
 
@@ -131,13 +132,22 @@ ifndef DEBUG
 DEFINES += -DNDEBUG
 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
+MWCW_MSL   = "$(METROWERKS)/MSL"
+MWCW_W32   = "$(METROWERKS)/Win32-x86 Support"
+WIN_CFLAGS =  -O2 -gccinc -nodefaults -proc 586 -w off
+WIN_CFLAGS += -ir $(MWCW_MSL) -ir $(MWCW_W32) -lr $(MWCW_MSL) -lr $(MWCW_W32)
+WIN_CFLAGS += -lMSL_All_x86.lib -lkernel32.lib -luser32.lib
+
+ifndef BUILDTOOL_AS_NLM
+BUILDTOOL_AS_NLM = 1
+endif
+
 # Base compile flags
 # and prefix or precompiled header added here.
 

Modified: httpd/httpd/branches/2.0.x/build/NWGNUmakefile
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.0.x/build/NWGNUmakefile?rev=1001396&r1=1001395&r2=1001396&view=diff
==============================================================================
--- httpd/httpd/branches/2.0.x/build/NWGNUmakefile (original)
+++ httpd/httpd/branches/2.0.x/build/NWGNUmakefile Sun Sep 26 09:28:51 2010
@@ -19,11 +19,12 @@ FILES_prebuild_headers = \
 	$(APR)/include/apr.h \
 	$(APRUTIL)/include/apu.h \
 	$(APRUTIL)/include/apr_ldap.h \
+	$(NWOS)/test_char.h \
 	$(PCRE)/config.h \
 	$(PCRE)/pcre.h \
 	$(EOLIST) 
     
-nlms :: $(NWOS)/httpd.imp
+nlms :: $(NWOS)/httpd.imp $(NWOS)/chartables.c
 
 $(NWOS)/httpd.imp : make_nw_export.awk nw_export.i
 	@echo Generating $(subst /,\,$@)
@@ -62,12 +63,42 @@ $(PCRE)/%.h: $(subst /,\,$(PCRE))\%.hw
 	@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 $(NWOS)/chartables.c not found!)
+endif
+
+ifneq "$(wildcard $(NWOS)/test_char.h)" "$(NWOS)/test_char.h"
+$(error Error: required header $(NWOS)/test_char.h not found!)
+endif
+
+endif
+
 #
 # You can use this target if all that is needed is to copy files to the
 # installation area
 #
 install :: nlms FORCE
-	
+
 
 clean ::
 	$(CHK) nw_export.i                                  $(DEL) nw_export.i
@@ -79,4 +110,10 @@ 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
+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
     



Mime
View raw message