apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fua...@apache.org
Subject svn commit: r795114 - in /apr/apr/branches/1.3.x: NWGNUmakefile build/NWGNUenvironment.inc build/NWGNUtail.inc
Date Fri, 17 Jul 2009 15:29:31 GMT
Author: fuankg
Date: Fri Jul 17 15:29:27 2009
New Revision: 795114

URL: http://svn.apache.org/viewvc?rev=795114&view=rev
Log:
backport NetWare build improvements.

Modified:
    apr/apr/branches/1.3.x/NWGNUmakefile
    apr/apr/branches/1.3.x/build/NWGNUenvironment.inc
    apr/apr/branches/1.3.x/build/NWGNUtail.inc

Modified: apr/apr/branches/1.3.x/NWGNUmakefile
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.3.x/NWGNUmakefile?rev=795114&r1=795113&r2=795114&view=diff
==============================================================================
--- apr/apr/branches/1.3.x/NWGNUmakefile (original)
+++ apr/apr/branches/1.3.x/NWGNUmakefile Fri Jul 17 15:29:27 2009
@@ -350,23 +350,20 @@
 install :: nlms $(INSTDIRS) FORCE
 	copy $(OBJDIR)\aprlib.nlm                          $(INSTALLBASE)\*.*
 ifndef DEST
-	-copy $(subst /,\,$(APR))\STATUS                   $(INSTALLBASE)\*.apr
-	-copy $(subst /,\,$(APR))\LICENSE                  $(INSTALLBASE)\*
-	-copy $(subst /,\,$(APR))\CHANGES                  $(INSTALLBASE)\*.apr
-	-copy $(subst /,\,$(APRUTIL))\STATUS               $(INSTALLBASE)\*.apu
-	-copy $(subst /,\,$(APRUTIL))\CHANGES              $(INSTALLBASE)\*.apu
-	@echo rem copying the docs directories > xc.bat
-	@echo xcopy docs $(INSTALLBASE)\docs\*.* $(XCOPYSW) >> xc.bat
-	$(CMD) xc.bat
-	$(DEL) xc.bat
+	-$(CP) $(subst /,\,$(APR))\STATUS                  $(INSTALLBASE)\*.apr
+	-$(CP) $(subst /,\,$(APR))\LICENSE                 $(INSTALLBASE)\*
+	-$(CP) $(subst /,\,$(APR))\CHANGES                 $(INSTALLBASE)\*.apr
+	-$(CP) $(subst /,\,$(APRUTIL))\STATUS              $(INSTALLBASE)\*.apu
+	-$(CP) $(subst /,\,$(APRUTIL))\CHANGES             $(INSTALLBASE)\*.apu
+	@-$(XCP) $(subst /,\,$(APR))\docs                  $(INSTALLBASE)\docs\*.*
 endif
 
 ifndef DEST
 installdev :: $(INSTDEVDIRS) FORCE
-	-copy $(subst /,\,$(APR))\include\*.h               $(INSTALLBASE)\include\*.*
-	-copy $(subst /,\,$(APRUTIL))\include\*.h           $(INSTALLBASE)\include\*.*
-	-copy $(subst /,\,$(APR))\*.imp                     $(INSTALLBASE)\lib\*.*
-	-copy $(subst /,\,$(APR))\misc\netware\*.xdc        $(INSTALLBASE)\lib\*.*
+	-$(CP) $(subst /,\,$(APR))\include\*.h             $(INSTALLBASE)\include\*.*
+	-$(CP) $(subst /,\,$(APRUTIL))\include\*.h         $(INSTALLBASE)\include\*.*
+	-$(CP) $(subst /,\,$(APR))\*.imp                   $(INSTALLBASE)\lib\*.*
+	-$(CP) $(subst /,\,$(APR))\misc\netware\*.xdc      $(INSTALLBASE)\lib\*.*
 
 $(INSTDEVDIRS) ::
 	$(CHKNOT) $@\NUL mkdir $@
@@ -382,11 +379,10 @@
 vpath %.c dso/netware:memory/unix:mmap/unix:user/netware
 
 # Use the win32 network_io if Winsock is being used
-ifdef USE_STDSOCKETS
-vpath %.c network_io/unix
-else
-vpath %.c network_io/win32:network_io/unix
+ifndef USE_STDSOCKETS
+vpath %.c network_io/win32
 endif
+vpath %.c network_io/unix
 
 $(OBJDIR)/%.o: file_io/netware/%.c $(OBJDIR)\$(NLM_NAME)_cc.opt
 	@echo Compiling $<

Modified: apr/apr/branches/1.3.x/build/NWGNUenvironment.inc
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.3.x/build/NWGNUenvironment.inc?rev=795114&r1=795113&r2=795114&view=diff
==============================================================================
--- apr/apr/branches/1.3.x/build/NWGNUenvironment.inc (original)
+++ apr/apr/branches/1.3.x/build/NWGNUenvironment.inc Fri Jul 17 15:29:27 2009
@@ -116,6 +116,9 @@
 LINK	= mwldnlm
 LIB	= mwldnlm -type library -w nocmdline
 
+# Setup build tools
+AWK	= awk
+
 ifdef IPV6
 ifndef USE_STDSOCKETS
 USE_STDSOCKETS=1
@@ -265,22 +268,19 @@
 endif
 
 ifeq "$(OS)" "Windows_NT"
-CMD=cmd /C
-CHK=cmd /C if exist
-CHKNOT=cmd /C if not exist
-DEL = del /F
-DELTREE = cmd /C rd /s/q
-WINNT=1
-XCOPYSW = /E
+CMD	= cmd /C
+DEL	= del /F
+DELTREE	= $(CMD) rd /s/q
+WINNT	= 1
 else
-CMD=command /C
-CHK=command /C if exist
-CHKNOT=command /C if not exist
-DEL = del
-DELTREE = deltree /y
-XCOPYSW = /E /Y
-endif
-
+CMD	= command /C
+DEL	= del
+DELTREE	= deltree /y
+endif
+CP	= copy /Y
+XCP	= xcopy /E /Y
+CHK	= $(CMD) if exist
+CHKNOT	= $(CMD) if not exist
 
 #
 # Setup base C compiler flags

Modified: apr/apr/branches/1.3.x/build/NWGNUtail.inc
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.3.x/build/NWGNUtail.inc?rev=795114&r1=795113&r2=795114&view=diff
==============================================================================
--- apr/apr/branches/1.3.x/build/NWGNUtail.inc (original)
+++ apr/apr/branches/1.3.x/build/NWGNUtail.inc Fri Jul 17 15:29:27 2009
@@ -83,17 +83,20 @@
 # Generic compiler rules
 #
 
-$(APR_WORK)\build\NWGNUversion.inc : $(APR_WORK)\include\apr_version.h $(APR_WORK)\build\nw_ver.awk
+ifneq ($(MAKECMDGOALS),clean)
+$(APR_WORK)\build\NWGNUversion.inc : $(APR_WORK)\build\nw_ver.awk $(APR_WORK)\include\apr_version.h
 	@echo Generating $(subst /,\,$@)
-	awk -f $(APR_WORK)\build\nw_ver.awk $(APR_WORK)\include\apr_version.h > $(APR_WORK)\build\NWGNUversion.inc
+	@$(AWK) -f $^ > $@
 
 -include $(APR_WORK)\build\NWGNUversion.inc
 
 ifneq "$(strip $(VERSION_STR))" ""
 VERSION_INC = $(APR_WORK)\build\NWGNUversion.inc
 else
-VERSION		= 1,0,0
-VERSION_STR	= 1.0.0
+VERSION		= 1,3,0
+VERSION_STR	= 1.3.0
+VERSION_MAJMIN	= 13
+endif
 endif
 
 ifeq "$(words $(strip $(TARGET_nlm)))" "1"



Mime
View raw message