You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by rh...@apache.org on 2012/12/31 13:26:20 UTC
svn commit: r1427103 - in
/subversion/branches/1.6.x-serf-1-win32/build/generator: serf.dsp.ezt
serf.vcproj.ezt
Author: rhuijben
Date: Mon Dec 31 12:26:20 2012
New Revision: 1427103
URL: http://svn.apache.org/viewvc?rev=1427103&view=rev
Log:
On tow templates set eol-style to native in preparation for merging r1140588
Modified:
subversion/branches/1.6.x-serf-1-win32/build/generator/serf.dsp.ezt (contents, props changed)
subversion/branches/1.6.x-serf-1-win32/build/generator/serf.vcproj.ezt (contents, props changed)
Modified: subversion/branches/1.6.x-serf-1-win32/build/generator/serf.dsp.ezt
URL: http://svn.apache.org/viewvc/subversion/branches/1.6.x-serf-1-win32/build/generator/serf.dsp.ezt?rev=1427103&r1=1427102&r2=1427103&view=diff
==============================================================================
--- subversion/branches/1.6.x-serf-1-win32/build/generator/serf.dsp.ezt (original)
+++ subversion/branches/1.6.x-serf-1-win32/build/generator/serf.dsp.ezt Mon Dec 31 12:26:20 2012
@@ -1,96 +1,96 @@
-# Microsoft Developer Studio Project File - Name="serf" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) External Target" 0x0106
-
-CFG=serf - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE
-!MESSAGE NMAKE /f "serf.mak".
-!MESSAGE
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE
-!MESSAGE NMAKE /f "serf.mak" CFG="serf - Win32 Debug"
-!MESSAGE
-!MESSAGE Possible choices for configuration are:
-!MESSAGE
-!MESSAGE "serf - Win32 Release" (based on "Win32 (x86) External Target")
-!MESSAGE "serf - Win32 Debug" (based on "Win32 (x86) External Target")
-!MESSAGE
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-
-!IF "$(CFG)" == "serf - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_File "Release/serf.lib"
-# PROP BASE Bsc_Name ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Cmd_Line "nmake /s /nologo /f serf.mak CLEAN ALL APR_SRC=[apr_path] APRUTIL_SRC=[apr_util_path] [if-any zlib_path]ZLIB_SRC=[zlib_path][end] [if-any openssl_path]OPENSSL_SRC=[openssl_path][end]"
-# PROP Rebuild_Opt "/a"
-# PROP Target_File "Release/serf.lib"
-# PROP Bsc_Name ""
-
-!ELSEIF "$(CFG)" == "serf - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Rebuild_Opt "/a"
-# PROP BASE Target_File "Debug/serf.lib"
-# PROP BASE Bsc_Name ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
-# PROP Cmd_Line "nmake /s /nologo /f serf.mak CLEAN ALL DEBUG_BUILD=1 APR_SRC=[apr_path] APRUTIL_SRC=[apr_util_path] [if-any zlib_path]ZLIB_SRC=[zlib_path] ZLIB_LIBS=[zlib_path]\zlibstatD.lib[end] [if-any openssl_path]OPENSSL_SRC=[openssl_path][end]"
-# PROP Rebuild_Opt "/a"
-# PROP Target_File "Debug/serf.lib"
-# PROP Bsc_Name ""
-
-!ENDIF
-
-# Begin Target
-
-# Name "serf - Win32 Release"
-# Name "serf - Win32 Debug"
-
-!IF "$(CFG)" == "serf - Win32 Release"
-
-!ELSEIF "$(CFG)" == "serf - Win32 Debug"
-
-!ENDIF
-
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-[for serf_sources]# Begin Source File
-
-SOURCE="[serf_sources]"
-# End Source File
-[end]
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
-[for serf_headers]# Begin Source File
-
-SOURCE="[serf_headers]"
-# End Source File
-[end]
-# End Group
-# End Target
-# End Project
+# Microsoft Developer Studio Project File - Name="serf" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) External Target" 0x0106
+
+CFG=serf - Win32 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE
+!MESSAGE NMAKE /f "serf.mak".
+!MESSAGE
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE
+!MESSAGE NMAKE /f "serf.mak" CFG="serf - Win32 Debug"
+!MESSAGE
+!MESSAGE Possible choices for configuration are:
+!MESSAGE
+!MESSAGE "serf - Win32 Release" (based on "Win32 (x86) External Target")
+!MESSAGE "serf - Win32 Debug" (based on "Win32 (x86) External Target")
+!MESSAGE
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+
+!IF "$(CFG)" == "serf - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_File "Release/serf.lib"
+# PROP BASE Bsc_Name ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release"
+# PROP Intermediate_Dir "Release"
+# PROP Cmd_Line "nmake /s /nologo /f serf.mak CLEAN ALL APR_SRC=[apr_path] APRUTIL_SRC=[apr_util_path] [if-any zlib_path]ZLIB_SRC=[zlib_path][end] [if-any openssl_path]OPENSSL_SRC=[openssl_path][end]"
+# PROP Rebuild_Opt "/a"
+# PROP Target_File "Release/serf.lib"
+# PROP Bsc_Name ""
+
+!ELSEIF "$(CFG)" == "serf - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Rebuild_Opt "/a"
+# PROP BASE Target_File "Debug/serf.lib"
+# PROP BASE Bsc_Name ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "Debug"
+# PROP Intermediate_Dir "Debug"
+# PROP Cmd_Line "nmake /s /nologo /f serf.mak CLEAN ALL DEBUG_BUILD=1 APR_SRC=[apr_path] APRUTIL_SRC=[apr_util_path] [if-any zlib_path]ZLIB_SRC=[zlib_path] ZLIB_LIBS=[zlib_path]\zlibstatD.lib[end] [if-any openssl_path]OPENSSL_SRC=[openssl_path][end]"
+# PROP Rebuild_Opt "/a"
+# PROP Target_File "Debug/serf.lib"
+# PROP Bsc_Name ""
+
+!ENDIF
+
+# Begin Target
+
+# Name "serf - Win32 Release"
+# Name "serf - Win32 Debug"
+
+!IF "$(CFG)" == "serf - Win32 Release"
+
+!ELSEIF "$(CFG)" == "serf - Win32 Debug"
+
+!ENDIF
+
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+[for serf_sources]# Begin Source File
+
+SOURCE="[serf_sources]"
+# End Source File
+[end]
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+[for serf_headers]# Begin Source File
+
+SOURCE="[serf_headers]"
+# End Source File
+[end]
+# End Group
+# End Target
+# End Project
Propchange: subversion/branches/1.6.x-serf-1-win32/build/generator/serf.dsp.ezt
------------------------------------------------------------------------------
svn:eol-style = native
Modified: subversion/branches/1.6.x-serf-1-win32/build/generator/serf.vcproj.ezt
URL: http://svn.apache.org/viewvc/subversion/branches/1.6.x-serf-1-win32/build/generator/serf.vcproj.ezt?rev=1427103&r1=1427102&r2=1427103&view=diff
==============================================================================
--- subversion/branches/1.6.x-serf-1-win32/build/generator/serf.vcproj.ezt (original)
+++ subversion/branches/1.6.x-serf-1-win32/build/generator/serf.vcproj.ezt Mon Dec 31 12:26:20 2012
@@ -1,62 +1,62 @@
-<?xml version="1.0" encoding = "Windows-1252"?>
-<VisualStudioProject
- ProjectType="Visual C++"
- Version="[version]"
- Name="serf"
- ProjectGUID="{F1EC01C7-C056-410B-A564-777D73A9AEE8}"
- Keyword="MakeFileProj">
- <Platforms>
-[for platforms] <Platform
- Name="[platforms]"/>
-[end] </Platforms>
- <Configurations>
-[for platforms] <Configuration
- Name="Debug|[platforms]"
- OutputDirectory="Debug"
- IntermediateDirectory="Debug"
- ConfigurationType="0"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="FALSE">
- <Tool
- Name="VCNMakeTool"
- BuildCommandLine="nmake /s /nologo /f serf.mak ALL DEBUG_BUILD=1 APR_SRC=[apr_path] APRUTIL_SRC=[apr_util_path] [if-any zlib_path]ZLIB_SRC=[zlib_path][end] [if-any openssl_path]OPENSSL_SRC=[openssl_path][end]"
- ReBuildCommandLine="nmake /s /nologo /f serf.mak CLEAN ALL DEBUG_BUILD=1 APR_SRC=[apr_path] APRUTIL_SRC=[apr_util_path] [if-any zlib_path]ZLIB_SRC=[zlib_path][end] [if-any openssl_path]OPENSSL_SRC=[openssl_path][end]"
- CleanCommandLine="nmake /s /nologo /f serf.mak CLEAN DEBUG_BUILD=1 APR_SRC=[apr_path] APRUTIL_SRC=[apr_util_path] [if-any zlib_path]ZLIB_SRC=[zlib_path][end] [if-any openssl_path]OPENSSL_SRC=[openssl_path][end]"
- Output="$(OutDir)\serf.lib"/>
- </Configuration>
- <Configuration
- Name="Release|[platforms]"
- OutputDirectory="Release"
- IntermediateDirectory="Release"
- ConfigurationType="0"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="FALSE">
- <Tool
- Name="VCNMakeTool"
- BuildCommandLine="nmake /s /nologo /f serf.mak ALL APR_SRC=[apr_path] APRUTIL_SRC=[apr_util_path] [if-any zlib_path]ZLIB_SRC=[zlib_path][end] [if-any openssl_path]OPENSSL_SRC=[openssl_path][end]"
- ReBuildCommandLine="nmake /s /nologo /f serf.mak CLEAN ALL APR_SRC=[apr_path] APRUTIL_SRC=[apr_util_path] [if-any zlib_path]ZLIB_SRC=[zlib_path][end] [if-any openssl_path]OPENSSL_SRC=[openssl_path][end]"
- CleanCommandLine="nmake /s /nologo /f serf.mak CLEAN APR_SRC=[apr_path] APRUTIL_SRC=[apr_util_path] [if-any zlib_path]ZLIB_SRC=[zlib_path][end] [if-any openssl_path]OPENSSL_SRC=[openssl_path][end]"
- Output="$(OutDir)\serf.lib"/>
- </Configuration>
-[end] </Configurations>
- <Files>
- <Filter
- Name="Source Files"
- Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat">
- [for serf_sources]<File
- RelativePath="[serf_sources]">
- </File>
- [end]
- </Filter>
- <Filter
- Name="Header Files"
- Filter="h;hpp;hxx;hm;inl">
- [for serf_headers]<File
- RelativePath="[serf_headers]">
- </File>
- [end]
- </Filter>
- </Files>
- <Globals>
- </Globals>
-</VisualStudioProject>
+<?xml version="1.0" encoding = "Windows-1252"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="[version]"
+ Name="serf"
+ ProjectGUID="{F1EC01C7-C056-410B-A564-777D73A9AEE8}"
+ Keyword="MakeFileProj">
+ <Platforms>
+[for platforms] <Platform
+ Name="[platforms]"/>
+[end] </Platforms>
+ <Configurations>
+[for platforms] <Configuration
+ Name="Debug|[platforms]"
+ OutputDirectory="Debug"
+ IntermediateDirectory="Debug"
+ ConfigurationType="0"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE">
+ <Tool
+ Name="VCNMakeTool"
+ BuildCommandLine="nmake /s /nologo /f serf.mak ALL DEBUG_BUILD=1 APR_SRC=[apr_path] APRUTIL_SRC=[apr_util_path] [if-any zlib_path]ZLIB_SRC=[zlib_path][end] [if-any openssl_path]OPENSSL_SRC=[openssl_path][end]"
+ ReBuildCommandLine="nmake /s /nologo /f serf.mak CLEAN ALL DEBUG_BUILD=1 APR_SRC=[apr_path] APRUTIL_SRC=[apr_util_path] [if-any zlib_path]ZLIB_SRC=[zlib_path][end] [if-any openssl_path]OPENSSL_SRC=[openssl_path][end]"
+ CleanCommandLine="nmake /s /nologo /f serf.mak CLEAN DEBUG_BUILD=1 APR_SRC=[apr_path] APRUTIL_SRC=[apr_util_path] [if-any zlib_path]ZLIB_SRC=[zlib_path][end] [if-any openssl_path]OPENSSL_SRC=[openssl_path][end]"
+ Output="$(OutDir)\serf.lib"/>
+ </Configuration>
+ <Configuration
+ Name="Release|[platforms]"
+ OutputDirectory="Release"
+ IntermediateDirectory="Release"
+ ConfigurationType="0"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE">
+ <Tool
+ Name="VCNMakeTool"
+ BuildCommandLine="nmake /s /nologo /f serf.mak ALL APR_SRC=[apr_path] APRUTIL_SRC=[apr_util_path] [if-any zlib_path]ZLIB_SRC=[zlib_path][end] [if-any openssl_path]OPENSSL_SRC=[openssl_path][end]"
+ ReBuildCommandLine="nmake /s /nologo /f serf.mak CLEAN ALL APR_SRC=[apr_path] APRUTIL_SRC=[apr_util_path] [if-any zlib_path]ZLIB_SRC=[zlib_path][end] [if-any openssl_path]OPENSSL_SRC=[openssl_path][end]"
+ CleanCommandLine="nmake /s /nologo /f serf.mak CLEAN APR_SRC=[apr_path] APRUTIL_SRC=[apr_util_path] [if-any zlib_path]ZLIB_SRC=[zlib_path][end] [if-any openssl_path]OPENSSL_SRC=[openssl_path][end]"
+ Output="$(OutDir)\serf.lib"/>
+ </Configuration>
+[end] </Configurations>
+ <Files>
+ <Filter
+ Name="Source Files"
+ Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat">
+ [for serf_sources]<File
+ RelativePath="[serf_sources]">
+ </File>
+ [end]
+ </Filter>
+ <Filter
+ Name="Header Files"
+ Filter="h;hpp;hxx;hm;inl">
+ [for serf_headers]<File
+ RelativePath="[serf_headers]">
+ </File>
+ [end]
+ </Filter>
+ </Files>
+ <Globals>
+ </Globals>
+</VisualStudioProject>
Propchange: subversion/branches/1.6.x-serf-1-win32/build/generator/serf.vcproj.ezt
------------------------------------------------------------------------------
svn:eol-style = native