You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by br...@apache.org on 2012/08/08 00:00:18 UTC
svn commit: r1370557 - in /subversion/trunk/build/generator:
gen_vcnet_vcproj.py templates/svn_config.vcproj.ezt
templates/svn_config.vcxproj.ezt
Author: brane
Date: Tue Aug 7 22:00:18 2012
New Revision: 1370557
URL: http://svn.apache.org/viewvc?rev=1370557&view=rev
Log:
Fix breakage from r1370526: expose the svn_python variable to the svn_config
project file generator.
* build/generator/gen_vcnet_vcproj.py (svn_config): Expose svn_python
outside the SQL-file-specific enumeration.
* build/generator/templates/svn_config.vcxproj.ezt,
build/generator/templates/svn_config.vcproj.ezt: Update temppates.
Modified:
subversion/trunk/build/generator/gen_vcnet_vcproj.py
subversion/trunk/build/generator/templates/svn_config.vcproj.ezt
subversion/trunk/build/generator/templates/svn_config.vcxproj.ezt
Modified: subversion/trunk/build/generator/gen_vcnet_vcproj.py
URL: http://svn.apache.org/viewvc/subversion/trunk/build/generator/gen_vcnet_vcproj.py?rev=1370557&r1=1370556&r2=1370557&view=diff
==============================================================================
--- subversion/trunk/build/generator/gen_vcnet_vcproj.py (original)
+++ subversion/trunk/build/generator/gen_vcnet_vcproj.py Tue Aug 7 22:00:18 2012
@@ -138,14 +138,14 @@ class Generator(gen_win.WinGeneratorBase
key=lambda t: t[0]):
sql.append(_eztdata(header=hdrfile.replace('/', '\\'),
source=sqlfile[0].replace('/', '\\'),
- dependencies=[x.replace('/', '\\') for x in sqlfile[1:]],
- svn_python=sys.executable))
+ dependencies=[x.replace('/', '\\') for x in sqlfile[1:]]))
# apr doesn't supply vcproj files, the user must convert them
# manually before loading the generated solution
self.move_proj_file(self.projfilesdir,
'svn_config' + self.vcproj_extension,
(
+ ('svn_python', sys.executable),
('sql', sql),
('project_guid', self.makeguid('__CONFIG__')),
)
Modified: subversion/trunk/build/generator/templates/svn_config.vcproj.ezt
URL: http://svn.apache.org/viewvc/subversion/trunk/build/generator/templates/svn_config.vcproj.ezt?rev=1370557&r1=1370556&r2=1370557&view=diff
==============================================================================
--- subversion/trunk/build/generator/templates/svn_config.vcproj.ezt (original)
+++ subversion/trunk/build/generator/templates/svn_config.vcproj.ezt Tue Aug 7 22:00:18 2012
@@ -68,9 +68,9 @@
<Tool
Name="VCCustomBuildTool"
Description="Creating svn_private_config.h from svn_private_config.hw."
-[for sql] CommandLine=""[sql.svn_python]" "$(SolutionDir)\build\transform_config_hw.py" [platforms] ..\..\..\subversion\svn_private_config.hw ..\..\..\subversion\svn_private_config.h
+ CommandLine=""[svn_python]" "$(SolutionDir)\build\transform_config_hw.py" [platforms] ..\..\..\subversion\svn_private_config.hw ..\..\..\subversion\svn_private_config.h
"
-[end] Outputs="..\..\subversion\svn_private_config.h"/>
+ Outputs="..\..\subversion\svn_private_config.h"/>
</FileConfiguration>
[end][end] </File>
[for sql] <File
@@ -80,7 +80,7 @@
<Tool
Name="VCCustomBuildTool"
Description="Generating [sql.header]"
- CommandLine=""[sql.svn_python]" "$(SolutionDir)\build\transform_sql.py" "$(InputPath)" "$(SolutionDir)\[sql.header]""
+ CommandLine=""[svn_python]" "$(SolutionDir)\build\transform_sql.py" "$(InputPath)" "$(SolutionDir)\[sql.header]""
AdditionalDependencies="[for sql.dependencies]$(SolutionDir)\[sql.dependencies];[end]"
Outputs="$(SolutionDir)\[sql.header]"
/>
Modified: subversion/trunk/build/generator/templates/svn_config.vcxproj.ezt
URL: http://svn.apache.org/viewvc/subversion/trunk/build/generator/templates/svn_config.vcxproj.ezt?rev=1370557&r1=1370556&r2=1370557&view=diff
==============================================================================
--- subversion/trunk/build/generator/templates/svn_config.vcxproj.ezt (original)
+++ subversion/trunk/build/generator/templates/svn_config.vcxproj.ezt Tue Aug 7 22:00:18 2012
@@ -57,13 +57,13 @@
<CustomBuild Include="$(SolutionDir)\subversion\svn_private_config.hw">
<FileType>Document</FileType>
[for configs][for platforms] <Message Condition="'$(Configuration)|$(Platform)'=='[configs]|[platforms]'">Creating svn_private_config.h from svn_private_config.hw.</Message>
-[for sql] <Command Condition="'$(Configuration)|$(Platform)'=='[configs]|[platforms]'">"[sql.svn_python]" "$(SolutionDir)\build\transform_config_hw.py" $(Platform) $(SolutionDir)\subversion\svn_private_config.hw $(SolutionDir)\subversion\svn_private_config.h</Command>
-[end] <Outputs Condition="'$(Configuration)|$(Platform)'=='[configs]|[platforms]'">$(SolutionDir)\subversion\svn_private_config.h;%(Outputs)</Outputs>
+ <Command Condition="'$(Configuration)|$(Platform)'=='[configs]|[platforms]'">"[svn_python]" "$(SolutionDir)\build\transform_config_hw.py" $(Platform) $(SolutionDir)\subversion\svn_private_config.hw $(SolutionDir)\subversion\svn_private_config.h</Command>
+ <Outputs Condition="'$(Configuration)|$(Platform)'=='[configs]|[platforms]'">$(SolutionDir)\subversion\svn_private_config.h;%(Outputs)</Outputs>
[end][end] </CustomBuild>
[for sql] <CustomBuild Include="$(SolutionDir)\[sql.source]">
<FileType>Document</FileType>
[for configs][for platforms] <Message Condition="'$(Configuration)|$(Platform)'=='[configs]|[platforms]'">Generating [sql.header].</Message>
- <Command Condition="'$(Configuration)|$(Platform)'=='[configs]|[platforms]'">"[sql.svn_python]" "$(SolutionDir)\build\transform_sql.py" "%(FullPath)" "$(SolutionDir)\[sql.header]"</Command>
+ <Command Condition="'$(Configuration)|$(Platform)'=='[configs]|[platforms]'">"[svn_python]" "$(SolutionDir)\build\transform_sql.py" "%(FullPath)" "$(SolutionDir)\[sql.header]"</Command>
<Outputs Condition="'$(Configuration)|$(Platform)'=='[configs]|[platforms]'">$(SolutionDir)\[sql.header];%(Outputs)</Outputs>
<AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='[configs]|[platforms]'">[for sql.dependencies]$(SolutionDir)\[sql.dependencies];[end]%(AdditionalInputs)</AdditionalInputs>
[end][end]