You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@apr.apache.org by fu...@apache.org on 2014/07/24 14:03:25 UTC
svn commit: r1613086 - in /apr/apr/trunk: NWGNUmakefile build/NWGNUenvironment.inc build/NWGNUmakefile build/NWGNUtail.inc build/nw_export.h

Author: fuankg
Date: Thu Jul 24 12:03:25 2014
New Revision: 1613086

URL: http://svn.apache.org/r1613086
Log:
NetWare build fixes.

Modified:
    apr/apr/trunk/NWGNUmakefile
    apr/apr/trunk/build/NWGNUenvironment.inc
    apr/apr/trunk/build/NWGNUmakefile
    apr/apr/trunk/build/NWGNUtail.inc
    apr/apr/trunk/build/nw_export.h

Modified: apr/apr/trunk/NWGNUmakefile
URL: http://svn.apache.org/viewvc/apr/apr/trunk/NWGNUmakefile?rev=1613086&r1=1613085&r2=1613086&view=diff
==============================================================================
--- apr/apr/trunk/NWGNUmakefile (original)
+++ apr/apr/trunk/NWGNUmakefile Thu Jul 24 12:03:25 2014
@@ -309,6 +309,7 @@ FILES_lib_objs = \
 	$(OBJDIR)/apr_dbm.o \
 	$(OBJDIR)/apr_dbm_berkeleydb.o \
 	$(OBJDIR)/apr_dbm_sdbm.o \
+	$(OBJDIR)/apr_escape.o \
 	$(OBJDIR)/apr_fnmatch.o \
 	$(OBJDIR)/apr_getpass.o \
 	$(OBJDIR)/apr_hash.o \

Modified: apr/apr/trunk/build/NWGNUenvironment.inc
URL: http://svn.apache.org/viewvc/apr/apr/trunk/build/NWGNUenvironment.inc?rev=1613086&r1=1613085&r2=1613086&view=diff
==============================================================================
--- apr/apr/trunk/build/NWGNUenvironment.inc (original)
+++ apr/apr/trunk/build/NWGNUenvironment.inc Thu Jul 24 12:03:25 2014
@@ -134,6 +134,7 @@ CPP	= $(CC)
 CPRE	= $(CC) -EP
 LINK	= mwldnlm -w nocmdline
 AR	= $(LINK) -type library -o
+WIN_CC	= mwcc
 
 ifneq ($(findstring /sh,$(SHELL)),/sh)
 PATH:=$(PATH);$(METROWERKS)\bin;$(METROWERKS)\Other Metrowerks Tools\Command Line Tools
@@ -144,6 +145,20 @@ CLIB3S	= $(METROWERKS)/Novell Support/Me
 MATH3S	=
 PLIB3S	= $(METROWERKS)/Novell Support/Metrowerks Support/Libraries/MSL C++/MWCPP.lib
 
+ifeq "$(OS)" "Windows_NT"
+# MetroWerks Win32 build flags to create build tools
+MWCW_MSL         = "$(METROWERKS)/MSL"
+MWCW_W32         = "$(METROWERKS)/Win32-x86 Support"
+CC_FOR_BUILD     = $(WIN_CC)
+CFLAGS_FOR_BUILD =  -O2 -gccinc -nodefaults -proc 586 -w off
+CFLAGS_FOR_BUILD += -ir $(MWCW_MSL) -ir $(MWCW_W32) -lr $(MWCW_MSL) -lr $(MWCW_W32)
+CFLAGS_FOR_BUILD += -lMSL_All_x86.lib -lkernel32.lib -luser32.lib
+else
+# GNUC build flags to create build tools
+CC_FOR_BUILD     = gcc
+CFLAGS_FOR_BUILD = -Wall -O2
+endif
+
 # Base compile flags
 # and prefix or precompiled header added here.
 
@@ -160,6 +175,12 @@ PLIB3S	= $(METROWERKS)/Novell Support/Me
 CFLAGS	= -proc PII -align 4
 CPFLAGS	= -Cpp_exceptions off -RTTI off
 
+ifdef CC_MAX_ERRORS
+CFLAGS += -maxerrors $(CC_MAX_ERRORS)
+else
+CFLAGS += -maxerrors 1
+endif
+
 ifeq "$(REQUIRE_PROTOTYPES)" "1"
 CFLAGS	+= -r
 endif
@@ -216,7 +237,7 @@ PRELUDE	= $(NOVI)/libcpre.gcc.o
 
 endif
 
-# -include apr_arch_pre_nw.h      #include pre_nw.h for all files
+# -include apr_arch_pre_nw.h      #include apr_arch_pre_nw.h for all files
 CFLAGS	+= -include apr_arch_pre_nw.h
 
 

Modified: apr/apr/trunk/build/NWGNUmakefile
URL: http://svn.apache.org/viewvc/apr/apr/trunk/build/NWGNUmakefile?rev=1613086&r1=1613085&r2=1613086&view=diff
==============================================================================
--- apr/apr/trunk/build/NWGNUmakefile (original)
+++ apr/apr/trunk/build/NWGNUmakefile Thu Jul 24 12:03:25 2014
@@ -35,6 +35,7 @@ FILES_prebuild_headers = \
 	$(APR)/include/apr.h \
 	$(APR)/include/apu_want.h \
 	$(APR)/include/private/apu_select_dbm.h \
+	$(APR)/include/private/apr_escape_test_char.h \
 	$(EOLIST)
 
 nlms :: $(APR)/aprlib.imp
@@ -55,6 +56,14 @@ nw_export.i : nw_export.h $(FILES_prebui
 	@echo Creating $@
 	$(call COPY,$<,$@)
 
+$(APR)/include/private/apr_escape_test_char.h: gen_test_char.exe $(APR)/tools/gen_test_char.c
+	@echo $(DL)GEN  $@$(DL)
+	$< > $@
+
+%.exe: $(APR)/tools/%.c
+	@echo $(DL)Creating Build Helper $@$(DL)
+	$(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) -DCROSS_COMPILE $< -o $@
+
 #
 # You can use this target if all that is needed is to copy files to the
 # installation area
@@ -68,6 +77,7 @@ clean ::
 	$(call DEL,NWGNUversion.inc)
 	$(call DEL,$(APR)/aprlib.imp)
 	$(foreach file,$(FILES_prebuild_headers),$(call DEL,$(file)))
+	$(call DEL,gen_test_char.exe)
 
 #
 # Include the 'tail' makefile that has targets that depend on variables defined

Modified: apr/apr/trunk/build/NWGNUtail.inc
URL: http://svn.apache.org/viewvc/apr/apr/trunk/build/NWGNUtail.inc?rev=1613086&r1=1613085&r2=1613086&view=diff
==============================================================================
--- apr/apr/trunk/build/NWGNUtail.inc (original)
+++ apr/apr/trunk/build/NWGNUtail.inc Thu Jul 24 12:03:25 2014
@@ -215,6 +215,7 @@ ifneq "$(strip $(FILES_lib_objs))" ""
 	@echo $(DL)$(wordlist 81, 90, $(FILES_lib_objs))$(DL)>> $@
 	@echo $(DL)$(wordlist 91, 100, $(FILES_lib_objs))$(DL)>> $@
 	@echo $(DL)$(wordlist 101, 110, $(FILES_lib_objs))$(DL)>> $@
+	@echo $(DL)$(wordlist 111, 120, $(FILES_lib_objs))$(DL)>> $@
 endif
 
 $(OBJDIR)/%_lib.lst: $($(LIB_NAME)_LIBLST_DEPENDS)

Modified: apr/apr/trunk/build/nw_export.h
URL: http://svn.apache.org/viewvc/apr/apr/trunk/build/nw_export.h?rev=1613086&r1=1613085&r2=1613086&view=diff
==============================================================================
--- apr/apr/trunk/build/nw_export.h (original)
+++ apr/apr/trunk/build/nw_export.h Thu Jul 24 12:03:25 2014
@@ -22,6 +22,7 @@
 #include "apr_dso.h"
 #include "apr_env.h"
 #include "apr_errno.h"
+#include "apr_escape.h"
 #include "apr_file_info.h"
 #include "apr_file_io.h"
 #include "apr_fnmatch.h"