Author: rhuijben
Date: Tue Jun 28 13:17:36 2011
New Revision: 1140588
URL: http://svn.apache.org/viewvc?rev=1140588&view=rev
Log:
Make Visual C++ link to the right library for serf 1.0.
* build/generator/gen_win.py
(write_serf_project_file): Add serf_lib argument.
* build/generator/templates/serf.dsp.ezt
* build/generator/templates/serf.vcxproj.ezt
* build/generator/templates/serf.vcproj.ezt
Replace serf.lib with [serf_lib].
Modified:
subversion/trunk/build/generator/gen_win.py
subversion/trunk/build/generator/templates/serf.dsp.ezt
subversion/trunk/build/generator/templates/serf.vcproj.ezt
subversion/trunk/build/generator/templates/serf.vcxproj.ezt
Modified: subversion/trunk/build/generator/gen_win.py
URL:
http://svn.apache.org/viewvc/subversion/trunk/build/generator/gen_win.py?rev=1140588&r1=1140587&r2=1140588&view=diff
==============================================================================
--- subversion/trunk/build/generator/gen_win.py (original)
+++ subversion/trunk/build/generator/gen_win.py Tue Jun 28 13:17:36 2011
@@ -1181,6 +1181,11 @@ class WinGeneratorBase(GeneratorBase):
return
serf_path = os.path.abspath(self.serf_path)
+ if self.serf_ver_maj == 1:
+ serflib = 'serf-1.lib'
+ else:
+ serflib = 'serf.lib'
+
self.move_proj_file(self.serf_path, name,
(('serf_sources',
glob.glob(os.path.join(serf_path, '*.c'))
@@ -1201,6 +1206,7 @@ class WinGeneratorBase(GeneratorBase):
('apr_util_path',
os.path.abspath(self.apr_util_path)),
('project_guid', self.makeguid('serf')),
('apr_static', self.static_apr),
+ ('serf_lib', serflib),
))
def move_proj_file(self, path, name, params=()):
Modified: subversion/trunk/build/generator/templates/serf.dsp.ezt
URL:
http://svn.apache.org/viewvc/subversion/trunk/build/generator/templates/serf.dsp.ezt?rev=1140588&r1=1140587&r2=1140588&view=diff
==============================================================================
--- subversion/trunk/build/generator/templates/serf.dsp.ezt (original)
+++ subversion/trunk/build/generator/templates/serf.dsp.ezt Tue Jun 28 13:17:36
2011
@@ -32,7 +32,7 @@ CFG=serf - Win32 Debug
# 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 Target_File "Release/[serf_lib]"
# PROP BASE Bsc_Name ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
@@ -40,7 +40,7 @@ CFG=serf - Win32 Debug
# 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 Target_File "Release/[serf_lib]"
# PROP Bsc_Name ""
!ELSEIF "$(CFG)" == "serf - Win32 Debug"
@@ -50,7 +50,7 @@ CFG=serf - Win32 Debug
# PROP BASE Output_Dir "Debug"
# PROP BASE Intermediate_Dir "Debug"
# PROP BASE Rebuild_Opt "/a"
-# PROP BASE Target_File "Debug/serf.lib"
+# PROP BASE Target_File "Debug/[serf_lib]"
# PROP BASE Bsc_Name ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
@@ -58,7 +58,7 @@ CFG=serf - Win32 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 Target_File "Debug/[serf_lib]"
# PROP Bsc_Name ""
!ENDIF
Modified: subversion/trunk/build/generator/templates/serf.vcproj.ezt
URL:
http://svn.apache.org/viewvc/subversion/trunk/build/generator/templates/serf.vcproj.ezt?rev=1140588&r1=1140587&r2=1140588&view=diff
==============================================================================
--- subversion/trunk/build/generator/templates/serf.vcproj.ezt (original)
+++ subversion/trunk/build/generator/templates/serf.vcproj.ezt Tue Jun 28
13:17:36 2011
@@ -43,7 +43,7 @@
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"/>
+ Output="$(OutDir)\[serf_lib]"/>
</Configuration>
<Configuration
Name="Release|[platforms]"
@@ -59,7 +59,7 @@
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"/>
+ Output="$(OutDir)\[serf_lib]"/>
</Configuration>
[end] </Configurations>
<Files>
Modified: subversion/trunk/build/generator/templates/serf.vcxproj.ezt
URL:
http://svn.apache.org/viewvc/subversion/trunk/build/generator/templates/serf.vcxproj.ezt?rev=1140588&r1=1140587&r2=1140588&view=diff
==============================================================================
--- subversion/trunk/build/generator/templates/serf.vcxproj.ezt (original)
+++ subversion/trunk/build/generator/templates/serf.vcxproj.ezt Tue Jun 28
13:17:36 2011
@@ -48,7 +48,7 @@
<NMakeBuildCommandLine
Condition="'$(Configuration)|$(Platform)'=='[configs]|[platforms]'">"$(VCInstallDir)bin\nmake.exe"
/s /nologo /f serf.mak ALL [is configs "Debug"]DEBUG_BUILD=1
[end]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]</NMakeBuildCommandLine>
<NMakeReBuildCommandLine
Condition="'$(Configuration)|$(Platform)'=='[configs]|[platforms]'">"$(VCInstallDir)bin\nmake.exe"
/s /nologo /f serf.mak CLEAN ALL [is configs "Debug"]DEBUG_BUILD=1
[end]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]</NMakeReBuildCommandLine>
<NMakeCleanCommandLine
Condition="'$(Configuration)|$(Platform)'=='[configs]|[platforms]'">"$(VCInstallDir)bin\nmake.exe"
/s /nologo /f serf.mak CLEAN [is configs "Debug"]DEBUG_BUILD=1
[end]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]</NMakeCleanCommandLine>
- <NMakeOutput
Condition="'$(Configuration)|$(Platform)'=='[configs]|[platforms]'">$(OutDir)\serf.lib</NMakeOutput>
+ <NMakeOutput
Condition="'$(Configuration)|$(Platform)'=='[configs]|[platforms]'">$(OutDir)\[serf_lib]</NMakeOutput>
[end][end] </PropertyGroup>
<ItemDefinitionGroup>
</ItemDefinitionGroup>
