Mailing-List: contact commits-help@apr.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@apr.apache.org
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1613087 - in /apr/apr/branches/1.6.x: NWGNUmakefile
 build/NWGNUenvironment.inc build/NWGNUmakefile build/nw_export.inc
Date: Thu, 24 Jul 2014 12:05:04 -0000
To: commits@apr.apache.org
From: fuankg@apache.org
Message-Id: <20140724120505.15E742388831@eris.apache.org>

Author: fuankg
Date: Thu Jul 24 12:05:04 2014
New Revision: 1613087

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

Modified:
    apr/apr/branches/1.6.x/NWGNUmakefile
    apr/apr/branches/1.6.x/build/NWGNUenvironment.inc
    apr/apr/branches/1.6.x/build/NWGNUmakefile
    apr/apr/branches/1.6.x/build/nw_export.inc

Modified: apr/apr/branches/1.6.x/NWGNUmakefile
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.6.x/NWGNUmakefile?rev=1613087&r1=1613086&r2=1613087&view=diff
==============================================================================
--- apr/apr/branches/1.6.x/NWGNUmakefile (original)
+++ apr/apr/branches/1.6.x/NWGNUmakefile Thu Jul 24 12:05:04 2014
@@ -50,6 +50,7 @@ include $(APR_WORK)/build/NWGNUhead.inc
 #
 XINCDIRS	+= \
 			$(APR)/include \
+			$(APR)/include/private \
 			$(APR)/include/arch/NetWare \
 			$(APR)/include/arch/unix \
 			$(APR)/memory/unix \
@@ -293,6 +294,7 @@ FILES_nlm_exports = \
 FILES_lib_objs = \
 	$(OBJDIR)/apr_atomic.o \
 	$(OBJDIR)/apr_cpystrn.o \
+	$(OBJDIR)/apr_escape.o \
 	$(OBJDIR)/apr_fnmatch.o \
 	$(OBJDIR)/apr_getpass.o \
 	$(OBJDIR)/apr_hash.o \
@@ -407,7 +409,7 @@ endif
 vpath %.c atomic/netware:strings:tables:passwd:lib:time/unix
 vpath %.c file_io/unix:locks/netware:misc/netware:misc/unix:threadproc/netware
 vpath %.c poll/unix:shmem/unix:support/unix:random/unix
-vpath %.c dso/netware:memory/unix:mmap/unix:user/netware
+vpath %.c dso/netware:memory/unix:mmap/unix:user/netware:encoding
 
 # Use the win32 network_io if Winsock is being used
 ifndef USE_STDSOCKETS

Modified: apr/apr/branches/1.6.x/build/NWGNUenvironment.inc
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.6.x/build/NWGNUenvironment.inc?rev=1613087&r1=1613086&r2=1613087&view=diff
==============================================================================
--- apr/apr/branches/1.6.x/build/NWGNUenvironment.inc (original)
+++ apr/apr/branches/1.6.x/build/NWGNUenvironment.inc Thu Jul 24 12:05:04 2014
@@ -141,6 +141,7 @@ CC	= mwccnlm
 CPP	= mwccnlm
 LINK	= mwldnlm
 LIB	= mwldnlm -type library -w nocmdline
+WIN_CC	= mwcc
 
 # Setup build tools
 AWK	= awk
@@ -206,6 +207,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.
 
@@ -222,6 +237,12 @@ PLIB3S	= $(METROWERKS)/Novell Support/Me
 
 CFLAGS = -c -w nocmdline -gccinc -Cpp_exceptions off -RTTI off -align 4 -proc PII
 
+ifdef CC_MAX_ERRORS
+CFLAGS += -maxerrors $(CC_MAX_ERRORS)
+else
+CFLAGS += -maxerrors 1
+endif
+
 ifeq "$(REQUIRE_PROTOTYPES)" "1"
 CFLAGS += -r
 endif
@@ -237,7 +258,7 @@ ifeq "$(RELEASE)" "release"
 CFLAGS += -O4,p
 endif
 
-# -prefix apr_arch_pre_nw.h      #include pre_nw.h for all files
+# -prefix apr_arch_pre_nw.h      #include apr_arch_pre_nw.h for all files
 CFLAGS += -prefix apr_arch_pre_nw.h
 
 

Modified: apr/apr/branches/1.6.x/build/NWGNUmakefile
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.6.x/build/NWGNUmakefile?rev=1613087&r1=1613086&r2=1613087&view=diff
==============================================================================
--- apr/apr/branches/1.6.x/build/NWGNUmakefile (original)
+++ apr/apr/branches/1.6.x/build/NWGNUmakefile Thu Jul 24 12:05:04 2014
@@ -23,6 +23,7 @@ FILES_prebuild_headers = \
 	$(APU)/include/private/apu_config.h \
 	$(APU)/include/private/apu_select_dbm.h \
 	$(APUXML)/expat/lib/expat_config.h \
+	$(APR)/include/private/apr_escape_test_char.h \
 	$(EOLIST) 
     
 nlms :: $(APR)/aprlib.imp
@@ -69,6 +70,14 @@ $(APU)/include/apr_ldap.h: $(APR)/build/
 	@echo $(DL)Creating $@$(DL)
 	$(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
@@ -81,6 +90,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/branches/1.6.x/build/nw_export.inc
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.6.x/build/nw_export.inc?rev=1613087&r1=1613086&r2=1613087&view=diff
==============================================================================
--- apr/apr/branches/1.6.x/build/nw_export.inc (original)
+++ apr/apr/branches/1.6.x/build/nw_export.inc Thu Jul 24 12:05:04 2014
@@ -15,6 +15,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"