You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@apr.apache.org by gs...@apache.org on 2013/10/21 09:50:07 UTC
svn commit: r1534053 - in /apr/apr/branches/1.5.x: apr.dsp libapr.dsp
test/Makefile.win
Author: gsmith
Date: Mon Oct 21 07:50:07 2013
New Revision: 1534053
URL: http://svn.apache.org/r1534053
Log:
Add apr_escape, gen_test_char & testescape
to traditional Windows build system
Modified:
apr/apr/branches/1.5.x/apr.dsp
apr/apr/branches/1.5.x/libapr.dsp
apr/apr/branches/1.5.x/test/Makefile.win
Modified: apr/apr/branches/1.5.x/apr.dsp
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.5.x/apr.dsp?rev=1534053&r1=1534052&r2=1534053&view=diff
==============================================================================
--- apr/apr/branches/1.5.x/apr.dsp (original)
+++ apr/apr/branches/1.5.x/apr.dsp Mon Oct 21 07:50:07 2013
@@ -202,6 +202,15 @@ SOURCE=.\atomic\win32\apr_atomic.c
SOURCE=.\dso\win32\dso.c
# End Source File
# End Group
+# Begin Group "encoding"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=.\encoding\apr_escape.c
+
+# End Source File
+# End Group
# Begin Group "file_io"
# PROP Default_Filter ""
@@ -615,61 +624,73 @@ SOURCE=.\include\apr.hw
!IF "$(CFG)" == "apr - Win32 Release"
-# Begin Custom Build - Creating apr.h from apr.hw
+# Begin Custom Build - Creating apr.h from apr.hw, apr_escape_test_char.h from gen_test_char.exe
InputPath=.\include\apr.hw
".\include\apr.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
type .\include\apr.hw > .\include\apr.h
+ cl.exe /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /I ".\include" .\tools\gen_test_char.c
+ .\gen_test_char.exe > .\include\apr_escape_test_char.h
# End Custom Build
!ELSEIF "$(CFG)" == "apr - Win32 Debug"
-# Begin Custom Build - Creating apr.h from apr.hw
+# Begin Custom Build - Creating apr.h from apr.hw, apr_escape_test_char.h from gen_test_char.exe
InputPath=.\include\apr.hw
".\include\apr.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
type .\include\apr.hw > .\include\apr.h
+ cl.exe /nologo /MDd /W3 /EHsc /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /I ".\include" .\tools\gen_test_char.c
+ .\gen_test_char.exe > .\include\apr_escape_test_char.h
# End Custom Build
!ELSEIF "$(CFG)" == "apr - Win32 Release9x"
-# Begin Custom Build - Creating apr.h from apr.hw
+# Begin Custom Build - Creating apr.h from apr.hw, apr_escape_test_char.h from gen_test_char.exe
InputPath=.\include\apr.hw
".\include\apr.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
type .\include\apr.hw > .\include\apr.h
+ cl.exe /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /I ".\include" .\tools\gen_test_char.c
+ .\gen_test_char.exe > .\include\apr_escape_test_char.h
# End Custom Build
!ELSEIF "$(CFG)" == "apr - Win32 Debug9x"
-# Begin Custom Build - Creating apr.h from apr.hw
+# Begin Custom Build - Creating apr.h from apr.hw, apr_escape_test_char.h from gen_test_char.exe
InputPath=.\include\apr.hw
".\include\apr.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
type .\include\apr.hw > .\include\apr.h
+ cl.exe /nologo /MDd /W3 /EHsc /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /I ".\include" .\tools\gen_test_char.c
+ .\gen_test_char.exe > .\include\apr_escape_test_char.h
# End Custom Build
!ELSEIF "$(CFG)" == "apr - x64 Release"
-# Begin Custom Build - Creating apr.h from apr.hw
+# Begin Custom Build - Creating apr.h from apr.hw, apr_escape_test_char.h from gen_test_char.exe
InputPath=.\include\apr.hw
".\include\apr.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
type .\include\apr.hw > .\include\apr.h
+ cl.exe /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /I ".\include" .\tools\gen_test_char.c
+ .\gen_test_char.exe > .\include\apr_escape_test_char.h
# End Custom Build
!ELSEIF "$(CFG)" == "apr - x64 Debug"
-# Begin Custom Build - Creating apr.h from apr.hw
+# Begin Custom Build - Creating apr.h from apr.hw, apr_escape_test_char.h from gen_test_char.exe
InputPath=.\include\apr.hw
".\include\apr.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
type .\include\apr.hw > .\include\apr.h
+ cl.exe /nologo /MDd /W3 /EHsc /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /I ".\include" .\tools\gen_test_char.c
+ .\gen_test_char.exe > .\include\apr_escape_test_char.h
# End Custom Build
@@ -698,6 +719,10 @@ SOURCE=.\include\apr_errno.h
# End Source File
# Begin Source File
+SOURCE=.\include\apr_escape.h
+# End Source File
+# Begin Source File
+
SOURCE=.\include\apr_file_info.h
# End Source File
# Begin Source File
Modified: apr/apr/branches/1.5.x/libapr.dsp
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.5.x/libapr.dsp?rev=1534053&r1=1534052&r2=1534053&view=diff
==============================================================================
--- apr/apr/branches/1.5.x/libapr.dsp (original)
+++ apr/apr/branches/1.5.x/libapr.dsp Mon Oct 21 07:50:07 2013
@@ -254,6 +254,14 @@ SOURCE=.\atomic\win32\apr_atomic.c
SOURCE=.\dso\win32\dso.c
# End Source File
# End Group
+# Begin Group "encoding"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=.\encoding\apr_escape.c
+# End Source File
+# End Group
# Begin Group "file_io"
# PROP Default_Filter ""
@@ -667,61 +675,73 @@ SOURCE=.\include\apr.hw
!IF "$(CFG)" == "libapr - Win32 Release"
-# Begin Custom Build - Creating apr.h from apr.hw
+# Begin Custom Build - Creating apr.h from apr.hw, apr_escape_test_char.h from gen_test_char.exe
InputPath=.\include\apr.hw
".\include\apr.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
type .\include\apr.hw > .\include\apr.h
+ cl.exe /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /I ".\include" .\tools\gen_test_char.c
+ .\gen_test_char.exe > .\include\apr_escape_test_char.h
# End Custom Build
!ELSEIF "$(CFG)" == "libapr - Win32 Debug"
-# Begin Custom Build - Creating apr.h from apr.hw
+# Begin Custom Build - Creating apr.h from apr.hw, apr_escape_test_char.h from gen_test_char.exe
InputPath=.\include\apr.hw
".\include\apr.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
type .\include\apr.hw > .\include\apr.h
+ cl.exe /nologo /MDd /W3 /EHsc /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /I ".\include" .\tools\gen_test_char.c
+ .\gen_test_char.exe > .\include\apr_escape_test_char.h
# End Custom Build
!ELSEIF "$(CFG)" == "libapr - Win32 Release9x"
-# Begin Custom Build - Creating apr.h from apr.hw
+# Begin Custom Build - Creating apr.h from apr.hw, apr_escape_test_char.h from gen_test_char.exe
InputPath=.\include\apr.hw
".\include\apr.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
type .\include\apr.hw > .\include\apr.h
+ cl.exe /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /I ".\include" .\tools\gen_test_char.c
+ .\gen_test_char.exe > .\include\apr_escape_test_char.h
# End Custom Build
!ELSEIF "$(CFG)" == "libapr - Win32 Debug9x"
-# Begin Custom Build - Creating apr.h from apr.hw
+# Begin Custom Build - Creating apr.h from apr.hw, apr_escape_test_char.h from gen_test_char.exe
InputPath=.\include\apr.hw
".\include\apr.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
type .\include\apr.hw > .\include\apr.h
+ cl.exe /nologo /MDd /W3 /EHsc /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /I ".\include" .\tools\gen_test_char.c
+ .\gen_test_char.exe > .\include\apr_escape_test_char.h
# End Custom Build
!ELSEIF "$(CFG)" == "libapr - x64 Release"
-# Begin Custom Build - Creating apr.h from apr.hw
+# Begin Custom Build - Creating apr.h from apr.hw, apr_escape_test_char.h from gen_test_char.exe
InputPath=.\include\apr.hw
".\include\apr.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
type .\include\apr.hw > .\include\apr.h
+ cl.exe /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /I ".\include" .\tools\gen_test_char.c
+ .\gen_test_char.exe > .\include\apr_escape_test_char.h
# End Custom Build
!ELSEIF "$(CFG)" == "libapr - x64 Debug"
-# Begin Custom Build - Creating apr.h from apr.hw
+# Begin Custom Build - Creating apr.h from apr.hw, apr_escape_test_char.h from gen_test_char.exe
InputPath=.\include\apr.hw
".\include\apr.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
type .\include\apr.hw > .\include\apr.h
+ cl.exe /nologo /MDd /W3 /EHsc /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /I ".\include" .\tools\gen_test_char.c
+ .\gen_test_char.exe > .\include\apr_escape_test_char.h
# End Custom Build
@@ -750,6 +770,10 @@ SOURCE=.\include\apr_errno.h
# End Source File
# Begin Source File
+SOURCE=.\include\apr_escape.h
+# End Source File
+# Begin Source File
+
SOURCE=.\include\apr_file_info.h
# End Source File
# Begin Source File
Modified: apr/apr/branches/1.5.x/test/Makefile.win
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.5.x/test/Makefile.win?rev=1534053&r1=1534052&r2=1534053&view=diff
==============================================================================
--- apr/apr/branches/1.5.x/test/Makefile.win (original)
+++ apr/apr/branches/1.5.x/test/Makefile.win Mon Oct 21 07:50:07 2013
@@ -98,7 +98,7 @@ ALL_TESTS = $(INTDIR)\testutil.obj $(INT
$(INTDIR)\testsock.obj $(INTDIR)\testglobalmutex.obj \
$(INTDIR)\teststrnatcmp.obj $(INTDIR)\testfilecopy.obj \
$(INTDIR)\testtemp.obj $(INTDIR)\testlfs.obj \
- $(INTDIR)\testcond.obj
+ $(INTDIR)\testcond.obj $(INTDIR)\testescape.obj
CLEAN_DATA = testfile.tmp lfstests\large.bin \
data\testputs.txt data\testbigfprintf.dat \