Author: rhuijben
Date: Thu Dec 10 12:21:58 2009
New Revision: 889232
URL: http://svn.apache.org/viewvc?rev=889232&view=rev
Log:
Further tweaking of the Visual 2010 project support.
* build/generator/serf.vcxproj.ezt
* build/generator/neon.vcxproj.ezt
* build/generator/zlib.vcxproj.ezt
Fix external project build references to actually
build these projects, instead of using their existing files.
* build/win32
Add *.vcxproj to svn:ignore.
* gen-make.py
(_usage_exit): Document generating for VS2010.
Modified:
subversion/trunk/build/generator/neon.vcxproj.ezt
subversion/trunk/build/generator/serf.vcxproj.ezt
subversion/trunk/build/generator/zlib.vcxproj.ezt
subversion/trunk/build/win32/ (props changed)
subversion/trunk/gen-make.py
Modified: subversion/trunk/build/generator/neon.vcxproj.ezt
URL:
http://svn.apache.org/viewvc/subversion/trunk/build/generator/neon.vcxproj.ezt?rev=889232&r1=889231&r2=889232&view=diff
==============================================================================
--- subversion/trunk/build/generator/neon.vcxproj.ezt (original)
+++ subversion/trunk/build/generator/neon.vcxproj.ezt Thu Dec 10 12:21:58 2009
@@ -45,10 +45,10 @@
<PropertyGroup>
[for configs][for platforms] <OutDir
Condition="'$(Configuration)|$(Platform)'=='[configs]|[platforms]'">.\</OutDir>
<IntDir
Condition="'$(Configuration)|$(Platform)'=='[configs]|[platforms]'">.\</IntDir>
- <NMakeBuildCommandLine
Condition="'$(Configuration)|$(Platform)'=='[configs]|[platforms]'">cmd /c
build_zlib.bat [configs]</NMakeBuildCommandLine>
- <NMakeReBuildCommandLine
Condition="'$(Configuration)|$(Platform)'=='[configs]|[platforms]'">cmd /c
build_zlib.bat [configs] rebuild</NMakeReBuildCommandLine>
- <NMakeCleanCommandLine
Condition="'$(Configuration)|$(Platform)'=='[configs]|[platforms]'">cmd /c
build_zlib.bat [configs] clean</NMakeCleanCommandLine>
- <NMakeOutput
Condition="'$(Configuration)|$(Platform)'=='[configs]|[platforms]'">[zlib_path]\[is
configs "Release"]zlibstat.lib[else]zlibstatD.lib[end]</NMakeOutput>
+ <NMakeBuildCommandLine
Condition="'$(Configuration)|$(Platform)'=='[configs]|[platforms]'">nmake
/nologo /f neon.mak ALL [is configs "Debug"]DEBUG_BUILD=1
[end]EXPAT_INC=[expat_path] [if-any zlib_path]ZLIB_SRC=[zlib_path]
ZLIB_LIBS=[zlib_path]\zlibstat[is configs "Debug"]D[end].lib[end] [if-any
openssl_path]OPENSSL_SRC=[openssl_path][end]</NMakeBuildCommandLine>
+ <NMakeReBuildCommandLine
Condition="'$(Configuration)|$(Platform)'=='[configs]|[platforms]'">nmake
/nologo /f neon.mak CLEAN ALL [is configs "Debug"]DEBUG_BUILD=1
[end]EXPAT_INC=[expat_path] [if-any zlib_path]ZLIB_SRC=[zlib_path]
ZLIB_LIBS=[zlib_path]\zlibstat[is configs "Debug"]D[end].lib[end] [if-any
openssl_path]OPENSSL_SRC=[openssl_path][end]</NMakeReBuildCommandLine>
+ <NMakeCleanCommandLine
Condition="'$(Configuration)|$(Platform)'=='[configs]|[platforms]'">nmake
/nologo /f neon.mak CLEAN [is configs "Debug"]DEBUG_BUILD=1
[end]EXPAT_INC=[expat_path] [if-any zlib_path]ZLIB_SRC=[zlib_path]
ZLIB_LIBS=[zlib_path]\zlibstat[is configs "Debug"]D[end].lib[end] [if-any
openssl_path]OPENSSL_SRC=[openssl_path][end]</NMakeCleanCommandLine>
+ <NMakeOutput
Condition="'$(Configuration)|$(Platform)'=='[configs]|[platforms]'">[is configs
"Release"]libneon.lib[else]libneonD.lib[end]</NMakeOutput>
[end][end] </PropertyGroup>
<ItemDefinitionGroup>
</ItemDefinitionGroup>
Modified: subversion/trunk/build/generator/serf.vcxproj.ezt
URL:
http://svn.apache.org/viewvc/subversion/trunk/build/generator/serf.vcxproj.ezt?rev=889232&r1=889231&r2=889232&view=diff
==============================================================================
--- subversion/trunk/build/generator/serf.vcxproj.ezt (original)
+++ subversion/trunk/build/generator/serf.vcxproj.ezt Thu Dec 10 12:21:58 2009
@@ -43,12 +43,12 @@
</ImportGroup>
[end][end] <PropertyGroup Label="UserMacros" />
<PropertyGroup>
-[for configs][for platforms] <OutDir
Condition="'$(Configuration)|$(Platform)'=='[configs]|[platforms]'">.\</OutDir>
- <IntDir
Condition="'$(Configuration)|$(Platform)'=='[configs]|[platforms]'">.\</IntDir>
- <NMakeBuildCommandLine
Condition="'$(Configuration)|$(Platform)'=='[configs]|[platforms]'">cmd /c
build_zlib.bat [configs]</NMakeBuildCommandLine>
- <NMakeReBuildCommandLine
Condition="'$(Configuration)|$(Platform)'=='[configs]|[platforms]'">cmd /c
build_zlib.bat [configs] rebuild</NMakeReBuildCommandLine>
- <NMakeCleanCommandLine
Condition="'$(Configuration)|$(Platform)'=='[configs]|[platforms]'">cmd /c
build_zlib.bat [configs] clean</NMakeCleanCommandLine>
- <NMakeOutput
Condition="'$(Configuration)|$(Platform)'=='[configs]|[platforms]'">[zlib_path]\[is
configs "Release"]zlibstat.lib[else]zlibstatD.lib[end]</NMakeOutput>
+[for configs][for platforms] <OutDir
Condition="'$(Configuration)|$(Platform)'=='[configs]|[platforms]'">[configs]</OutDir>
+ <IntDir
Condition="'$(Configuration)|$(Platform)'=='[configs]|[platforms]'">[configs]</IntDir>
+ <NMakeBuildCommandLine
Condition="'$(Configuration)|$(Platform)'=='[configs]|[platforms]'">nmake /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]'">nmake /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]'">nmake /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>
[end][end] </PropertyGroup>
<ItemDefinitionGroup>
</ItemDefinitionGroup>
Modified: subversion/trunk/build/generator/zlib.vcxproj.ezt
URL:
http://svn.apache.org/viewvc/subversion/trunk/build/generator/zlib.vcxproj.ezt?rev=889232&r1=889231&r2=889232&view=diff
==============================================================================
--- subversion/trunk/build/generator/zlib.vcxproj.ezt (original)
+++ subversion/trunk/build/generator/zlib.vcxproj.ezt Thu Dec 10 12:21:58 2009
@@ -45,9 +45,9 @@
<PropertyGroup>
[for configs][for platforms] <OutDir
Condition="'$(Configuration)|$(Platform)'=='[configs]|[platforms]'">.\</OutDir>
<IntDir
Condition="'$(Configuration)|$(Platform)'=='[configs]|[platforms]'">.\</IntDir>
- <NMakeBuildCommandLine
Condition="'$(Configuration)|$(Platform)'=='[configs]|[platforms]'">cmd /c
build_zlib.bat [configs]</NMakeBuildCommandLine>
- <NMakeReBuildCommandLine
Condition="'$(Configuration)|$(Platform)'=='[configs]|[platforms]'">cmd /c
build_zlib.bat [configs] rebuild</NMakeReBuildCommandLine>
- <NMakeCleanCommandLine
Condition="'$(Configuration)|$(Platform)'=='[configs]|[platforms]'">cmd /c
build_zlib.bat [configs] clean</NMakeCleanCommandLine>
+ <NMakeBuildCommandLine
Condition="'$(Configuration)|$(Platform)'=='[configs]|[platforms]'">cmd /c
"$(ProjectDir)build_zlib.bat" [configs]</NMakeBuildCommandLine>
+ <NMakeReBuildCommandLine
Condition="'$(Configuration)|$(Platform)'=='[configs]|[platforms]'">cmd /c
"$(ProjectDir)build_zlib.bat" [configs] rebuild</NMakeReBuildCommandLine>
+ <NMakeCleanCommandLine
Condition="'$(Configuration)|$(Platform)'=='[configs]|[platforms]'">cmd /c
"$(ProjectDir)build_zlib.bat" [configs] clean</NMakeCleanCommandLine>
<NMakeOutput
Condition="'$(Configuration)|$(Platform)'=='[configs]|[platforms]'">[zlib_path]\[is
configs "Release"]zlibstat.lib[else]zlibstatD.lib[end]</NMakeOutput>
[end][end] </PropertyGroup>
<ItemDefinitionGroup>
Propchange: subversion/trunk/build/win32/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Thu Dec 10 12:21:58 2009
@@ -6,6 +6,7 @@
*.dsp
msvc-dsp
*.vcproj
+*.vcxproj
vcnet-vcproj
*.user
BuildLog.htm
Modified: subversion/trunk/gen-make.py
URL:
http://svn.apache.org/viewvc/subversion/trunk/gen-make.py?rev=889232&r1=889231&r2=889232&view=diff
==============================================================================
--- subversion/trunk/gen-make.py (original)
+++ subversion/trunk/gen-make.py Thu Dec 10 12:21:58 2009
@@ -203,7 +203,7 @@
print(" only build static libraries")
print("")
print(" --vsnet-version=VER")
- print(" generate for VS.NET version VER (2002, 2003, 2005 or
2008)")
+ print(" generate for VS.NET version VER (2002, 2003, 2005, 2008 or
2010)")
print(" [only valid in combination with '-t vcproj']")
print("")
print(" --with-apr_memcache=DIR")
