httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fua...@apache.org
Subject svn commit: r1087563 - in /httpd/httpd: branches/2.2.x/build/NWGNUenvironment.inc branches/2.2.x/modules/ssl/NWGNUmakefile trunk/build/NWGNUenvironment.inc
Date Fri, 01 Apr 2011 03:07:06 GMT
Author: fuankg
Date: Fri Apr  1 03:07:06 2011
New Revision: 1087563

URL: http://svn.apache.org/viewvc?rev=1087563&view=rev
Log:
Added TOUCH macro to kill Win32 dependency on external touch command.

Modified:
    httpd/httpd/branches/2.2.x/build/NWGNUenvironment.inc
    httpd/httpd/branches/2.2.x/modules/ssl/NWGNUmakefile
    httpd/httpd/trunk/build/NWGNUenvironment.inc

Modified: httpd/httpd/branches/2.2.x/build/NWGNUenvironment.inc
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/build/NWGNUenvironment.inc?rev=1087563&r1=1087562&r2=1087563&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/build/NWGNUenvironment.inc (original)
+++ httpd/httpd/branches/2.2.x/build/NWGNUenvironment.inc Fri Apr  1 03:07:06 2011
@@ -132,7 +132,6 @@ WIN_CC	= mwcc
 
 # Setup build tools
 AWK	= awk
-TOUCH	= touch
 
 # Setup distribution tools
 ZIP	= zip -qr9
@@ -149,6 +148,7 @@ MKDIR	= mkdir -p $1
 COPY	= -cp -afv $1 $2
 #COPYR	= -cp -afr $1/* $2
 COPYR	= -rsync -aC $1/* $2
+TOUCH	= -touch $1
 ECHONL	= echo ""
 DL	= '
 CAT	= cat
@@ -164,6 +164,7 @@ ECHONL	= $(ComSpec) /c echo.
 MKDIR	= $(shell if not exist $(subst /,\,$1)\NUL md 2>NUL $(subst /,\,$1))
 COPY	= -copy /y 2>NUL $(subst /,\,$1) $(subst /,\,$2)
 COPYR	= -xcopy /q /y /e 2>NUL $(subst /,\,$1) $(subst /,\,$2)
+TOUCH	= -copy /b 2>NUL $1 +,,
 CAT	= type
 endif
 

Modified: httpd/httpd/branches/2.2.x/modules/ssl/NWGNUmakefile
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/modules/ssl/NWGNUmakefile?rev=1087563&r1=1087562&r2=1087563&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/modules/ssl/NWGNUmakefile (original)
+++ httpd/httpd/branches/2.2.x/modules/ssl/NWGNUmakefile Fri Apr  1 03:07:06 2011
@@ -279,14 +279,14 @@ install :: nlms FORCE
 vpath %.c $(AP_WORK)/modules/arch/netware
 
 # Make sure that the build doesn't attempt to regenerate the shipping files.
-# This requires a 'touch' utility.  Can be downloaded from 'coreutils' at
-#  http://sourceforge.net/projects/gnuwin32/
 ssl_expr_parse.h : ssl_expr_parse.y
-	$(TOUCH) touch ssl_expr_parse.h
+	$(call TOUCH, $@)
+
 ssl_expr_parse.c : ssl_expr_parse.y
-	$(TOUCH) ssl_expr_parse.c
+	$(call TOUCH, $@)
+
 ssl_expr_scan.c : ssl_expr_scan.l
-	$(TOUCH) ssl_expr_scan.c
+	$(call TOUCH, $@)
 
 #
 # Include the 'tail' makefile that has targets that depend on variables defined

Modified: httpd/httpd/trunk/build/NWGNUenvironment.inc
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/build/NWGNUenvironment.inc?rev=1087563&r1=1087562&r2=1087563&view=diff
==============================================================================
--- httpd/httpd/trunk/build/NWGNUenvironment.inc (original)
+++ httpd/httpd/trunk/build/NWGNUenvironment.inc Fri Apr  1 03:07:06 2011
@@ -148,6 +148,7 @@ MKDIR	= mkdir -p $1
 COPY	= -cp -afv $1 $2
 #COPYR	= -cp -afr $1/* $2
 COPYR	= -rsync -aC $1/* $2
+TOUCH	= -touch $1
 ECHONL	= echo ""
 DL	= '
 CAT	= cat
@@ -163,6 +164,7 @@ ECHONL	= $(ComSpec) /c echo.
 MKDIR	= $(shell if not exist $(subst /,\,$1)\NUL md 2>NUL $(subst /,\,$1))
 COPY	= -copy /y 2>NUL $(subst /,\,$1) $(subst /,\,$2)
 COPYR	= -xcopy /q /y /e 2>NUL $(subst /,\,$1) $(subst /,\,$2)
+TOUCH	= -copy /b 2>NUL $1 +,,
 CAT	= type
 endif
 



Mime
View raw message