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/10 11:55:17 UTC
svn commit: r1371633 - in /subversion/trunk/build/generator/templates:
svn_config.vcproj.ezt svn_config.vcxproj.ezt vcnet_vcproj.ezt
vcnet_vcxproj.ezt
Author: brane
Date: Fri Aug 10 09:55:16 2012
New Revision: 1371633
URL: http://svn.apache.org/viewvc?rev=1371633&view=rev
Log:
On Windows, create the generated svn_private_config.h in the intermediate
build directory so that different configurations don't all use the same
canonical host name. This incidentally allows Windows and Unix builds to
share the same working copy in parallel.
* build\generator\templates\svn_config.vcproj.ezt,
build\generator\templates\svn_config.vcxproj.ezt: Change output path
of svn_private_config.h. Add generated SQL headers to project.
* build\generator\templates\vcnet_vcproj.ezt,
build\generator\templates\vcnet_vcxproj.ezt: Add build directory to
list of project-specific include paths.
Modified:
subversion/trunk/build/generator/templates/svn_config.vcproj.ezt
subversion/trunk/build/generator/templates/svn_config.vcxproj.ezt
subversion/trunk/build/generator/templates/vcnet_vcproj.ezt
subversion/trunk/build/generator/templates/vcnet_vcxproj.ezt
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=1371633&r1=1371632&r2=1371633&view=diff
==============================================================================
--- subversion/trunk/build/generator/templates/svn_config.vcproj.ezt (original)
+++ subversion/trunk/build/generator/templates/svn_config.vcproj.ezt Fri Aug 10 09:55:16 2012
@@ -33,7 +33,7 @@
Name="[configs]|[platforms]"
OutputDirectory="."
BuildLogFile="$(IntDir)\BuildLog_$(ProjectName).htm"
- IntermediateDirectory="..\..\$(ConfigurationName)"
+ IntermediateDirectory="..\..\..\$(ConfigurationName)"
ConfigurationType="10"
UseOfMFC="0"
DeleteExtensionsOnClean="*.obj;*.ilk;*.pdb;*.tlb;*.tli;*.tlh;*.tmp;*.rsp;$(TargetPath)"
@@ -53,7 +53,7 @@
</Configurations>
<Files>
<File
- RelativePath="..\..\subversion\svn_private_config.h">
+ RelativePath="$(IntDir)\svn_private_config.h">
[for platforms][for configs] <FileConfiguration
Name="[configs]|[platforms]"
ExcludedFromBuild="TRUE">
@@ -68,12 +68,20 @@
<Tool
Name="VCCustomBuildTool"
Description="Creating svn_private_config.h from svn_private_config.hw."
- CommandLine=""[svn_python]" "$(SolutionDir)\build\transform_config_hw.py" [platforms] ..\..\..\subversion\svn_private_config.hw ..\..\..\subversion\svn_private_config.h
-"
- Outputs="..\..\subversion\svn_private_config.h"/>
+ CommandLine=""[svn_python]" "$(SolutionDir)\build\transform_config_hw.py" [platforms] "$(InputPath)" "$(IntDir)\svn_private_config.h""
+ Outputs="$(IntDir)subversion\svn_private_config.h"/>
</FileConfiguration>
[end][end] </File>
[for sql] <File
+ RelativePath="$(SolutionDir)\[sql.header]">
+[for platforms][for configs] <FileConfiguration
+ Name="[configs]|[platforms]"
+ ExcludedFromBuild="TRUE">
+ <Tool
+ Name="VCCustomBuildTool"/>
+ </FileConfiguration>
+[end][end] </File>
+ <File
RelativePath="../../../[sql.source]">
[for platforms][for configs] <FileConfiguration
Name="[configs]|[platforms]">
@@ -91,4 +99,3 @@
<Globals>
</Globals>
</VisualStudioProject>
-
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=1371633&r1=1371632&r2=1371633&view=diff
==============================================================================
--- subversion/trunk/build/generator/templates/svn_config.vcxproj.ezt (original)
+++ subversion/trunk/build/generator/templates/svn_config.vcxproj.ezt Fri Aug 10 09:55:16 2012
@@ -46,10 +46,10 @@
[end][end] <PropertyGroup Label="UserMacros" />
<PropertyGroup>
[for configs][for platforms] <OutDir Condition="'$(Configuration)|$(Platform)'=='[configs]|[platforms]'">.\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='[configs]|[platforms]'">.\</IntDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='[configs]|[platforms]'">$(SolutionDir)\$(Configuration)\</IntDir>
[end][end] </PropertyGroup>
<ItemGroup>
- <CustomBuild Include="$(SolutionDir)\subversion\svn_private_config.h">
+ <CustomBuild Include="$(IntDir)svn_private_config.h">
[for configs][for platforms] <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='[configs]|[platforms]'">true</ExcludedFromBuild>
[end][end] </CustomBuild>
</ItemGroup>
@@ -57,10 +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>
- <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>
+ <Command Condition="'$(Configuration)|$(Platform)'=='[configs]|[platforms]'">"[svn_python]" "$(SolutionDir)\build\transform_config_hw.py" $(Platform) "%(FullPath)" "$(IntDir)svn_private_config.h"</Command>
+ <Outputs Condition="'$(Configuration)|$(Platform)'=='[configs]|[platforms]'">$(IntDir)svn_private_config.h;%(Outputs)</Outputs>
[end][end] </CustomBuild>
-[for sql] <CustomBuild Include="$(SolutionDir)\[sql.source]">
+[for sql] <CustomBuild Include="$(SolutionDir)\[sql.header]">
+[for configs][for platforms] <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='[configs]|[platforms]'">true</ExcludedFromBuild>
+[end][end] </CustomBuild>
+ <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]'">"[svn_python]" "$(SolutionDir)\build\transform_sql.py" "%(FullPath)" "$(SolutionDir)\[sql.header]"</Command>
Modified: subversion/trunk/build/generator/templates/vcnet_vcproj.ezt
URL: http://svn.apache.org/viewvc/subversion/trunk/build/generator/templates/vcnet_vcproj.ezt?rev=1371633&r1=1371632&r2=1371633&view=diff
==============================================================================
--- subversion/trunk/build/generator/templates/vcnet_vcproj.ezt (original)
+++ subversion/trunk/build/generator/templates/vcnet_vcproj.ezt Fri Aug 10 09:55:16 2012
@@ -45,7 +45,7 @@
EnableIntrinsicFunctions="TRUE"
FavorSizeOrSpeed="1"
OmitFramePointers="TRUE"
-[end] AdditionalIncludeDirectories="[for includes][includes][if-index includes last][else];[end][end]"
+[end] AdditionalIncludeDirectories="..\..\..\[configs.name];[for includes][includes][if-index includes last][else];[end][end]"
PreprocessorDefinitions="[if-any instrument_apr_pools]APR_POOL_DEBUG=[instrument_apr_pools];[end][is platforms "x64"]WIN64;[end][for configs.defines][configs.defines][if-index configs.defines last][else];[end][end];_CRT_SECURE_NO_WARNINGS"
[is configs.name "Debug"] MinimalRebuild="TRUE"
RuntimeLibrary="3"
Modified: subversion/trunk/build/generator/templates/vcnet_vcxproj.ezt
URL: http://svn.apache.org/viewvc/subversion/trunk/build/generator/templates/vcnet_vcxproj.ezt?rev=1371633&r1=1371632&r2=1371633&view=diff
==============================================================================
--- subversion/trunk/build/generator/templates/vcnet_vcxproj.ezt (original)
+++ subversion/trunk/build/generator/templates/vcnet_vcxproj.ezt Fri Aug 10 09:55:16 2012
@@ -57,7 +57,7 @@
<IntrinsicFunctions>true</IntrinsicFunctions>
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
<StringPooling>true</StringPooling>
-[end] <AdditionalIncludeDirectories>[for includes][includes];[end]%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+[end] <AdditionalIncludeDirectories>$(SolutionDir)[configs.name];[for includes][includes];[end];%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>[if-any instrument_apr_pools]APR_POOL_DEBUG=[instrument_apr_pools];[end][is platforms "x64"]WIN64;[end][for configs.defines][configs.defines];[end]%(PreprocessorDefinitions)</PreprocessorDefinitions>
<WarningLevel>Level4</WarningLevel>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
Re: svn commit: r1371633 - in /subversion/trunk/build/generator/templates:
svn_config.vcproj.ezt svn_config.vcxproj.ezt vcnet_vcproj.ezt vcnet_vcxproj.ezt
Posted by Johan Corveleyn <jc...@gmail.com>.
On Sun, Aug 12, 2012 at 10:12 AM, Branko Čibej <br...@wandisco.com> wrote:
> On 12.08.2012 09:47, Branko Čibej wrote:
>> On 12.08.2012 09:32, Johan Corveleyn wrote:
>>> On Sat, Aug 11, 2012 at 12:55 AM, Johan Corveleyn <jc...@gmail.com> wrote:
>>>> [[[
>>>> C:\research\svn\client_build\trunk2>msbuild subversion_vcnet.sln
>>>> /nologo /v:q /p:Configuration=debug /t:__ALL__
>>>> Project : error PRJ0019: A tool returned an error code from "Creating
>>>> svn_private_config.h from svn_private_config.hw."
>>>> ]]]
>>>>
>>>> No idea what error code is returned by the "tool". I did run
>>>> gen-make.py before trying the build.
>>>>
>>>> If I rollback to r1371632 everything works fine.
>>> And it seems it's not only me :-). The windows buildbots are also
>>> failing with the same error. Brane, can you take a look at this?
>> Hm, didn't notice the buildbot failures, sorry. I can only test this
>> with VS 2010 and 2012, which both use the .vcxnet project files; so my
>> changes to the .vcnet template were less than ideal. :)
>>
>> I'll take a look at the generated project files, maybe I can figure
>> something from there.
>
> Should be fixed in r1372056, but as I said, I can't test with VS2008;
> so, waiting for the buildbot to see what happens.
Still failing with the same error here. I don't have time right now to
dig in further, but just wanted to let you know that it's not fixed
yet AFAICS.
--
Johan
Re: svn commit: r1371633 - in /subversion/trunk/build/generator/templates:
svn_config.vcproj.ezt svn_config.vcxproj.ezt vcnet_vcproj.ezt vcnet_vcxproj.ezt
Posted by Branko Čibej <br...@wandisco.com>.
On 12.08.2012 09:47, Branko Čibej wrote:
> On 12.08.2012 09:32, Johan Corveleyn wrote:
>> On Sat, Aug 11, 2012 at 12:55 AM, Johan Corveleyn <jc...@gmail.com> wrote:
>>> [[[
>>> C:\research\svn\client_build\trunk2>msbuild subversion_vcnet.sln
>>> /nologo /v:q /p:Configuration=debug /t:__ALL__
>>> Project : error PRJ0019: A tool returned an error code from "Creating
>>> svn_private_config.h from svn_private_config.hw."
>>> ]]]
>>>
>>> No idea what error code is returned by the "tool". I did run
>>> gen-make.py before trying the build.
>>>
>>> If I rollback to r1371632 everything works fine.
>> And it seems it's not only me :-). The windows buildbots are also
>> failing with the same error. Brane, can you take a look at this?
> Hm, didn't notice the buildbot failures, sorry. I can only test this
> with VS 2010 and 2012, which both use the .vcxnet project files; so my
> changes to the .vcnet template were less than ideal. :)
>
> I'll take a look at the generated project files, maybe I can figure
> something from there.
Should be fixed in r1372056, but as I said, I can't test with VS2008;
so, waiting for the buildbot to see what happens.
-- Brane
--
Certified & Supported Apache Subversion Downloads:
http://www.wandisco.com/subversion/download
Re: svn commit: r1371633 - in /subversion/trunk/build/generator/templates:
svn_config.vcproj.ezt svn_config.vcxproj.ezt vcnet_vcproj.ezt vcnet_vcxproj.ezt
Posted by Branko Čibej <br...@wandisco.com>.
On 12.08.2012 09:32, Johan Corveleyn wrote:
> On Sat, Aug 11, 2012 at 12:55 AM, Johan Corveleyn <jc...@gmail.com> wrote:
>> On Fri, Aug 10, 2012 at 11:55 AM, <br...@apache.org> wrote:
>>> Author: brane
>>> Date: Fri Aug 10 09:55:16 2012
>>> New Revision: 1371633
>>>
>>> URL: http://svn.apache.org/viewvc?rev=1371633&view=rev
>>> Log:
>>> On Windows, create the generated svn_private_config.h in the intermediate
>>> build directory so that different configurations don't all use the same
>>> canonical host name. This incidentally allows Windows and Unix builds to
>>> share the same working copy in parallel.
>>>
>>> * build\generator\templates\svn_config.vcproj.ezt,
>>> build\generator\templates\svn_config.vcxproj.ezt: Change output path
>>> of svn_private_config.h. Add generated SQL headers to project.
>>>
>>> * build\generator\templates\vcnet_vcproj.ezt,
>>> build\generator\templates\vcnet_vcxproj.ezt: Add build directory to
>>> list of project-specific include paths.
>> I don't understand this change, being not very familiar with the build
>> system. But after this commit my build on Windows (XP, with VCExpress
>> 2008) fails:
>>
>> [[[
>> C:\research\svn\client_build\trunk2>msbuild subversion_vcnet.sln
>> /nologo /v:q /p:Configuration=debug /t:__ALL__
>> Project : error PRJ0019: A tool returned an error code from "Creating
>> svn_private_config.h from svn_private_config.hw."
>> ]]]
>>
>> No idea what error code is returned by the "tool". I did run
>> gen-make.py before trying the build.
>>
>> If I rollback to r1371632 everything works fine.
> And it seems it's not only me :-). The windows buildbots are also
> failing with the same error. Brane, can you take a look at this?
Hm, didn't notice the buildbot failures, sorry. I can only test this
with VS 2010 and 2012, which both use the .vcxnet project files; so my
changes to the .vcnet template were less than ideal. :)
I'll take a look at the generated project files, maybe I can figure
something from there.
-- Brane
--
Certified & Supported Apache Subversion Downloads:
http://www.wandisco.com/subversion/download
Re: svn commit: r1371633 - in /subversion/trunk/build/generator/templates:
svn_config.vcproj.ezt svn_config.vcxproj.ezt vcnet_vcproj.ezt vcnet_vcxproj.ezt
Posted by Johan Corveleyn <jc...@gmail.com>.
On Sat, Aug 11, 2012 at 12:55 AM, Johan Corveleyn <jc...@gmail.com> wrote:
> On Fri, Aug 10, 2012 at 11:55 AM, <br...@apache.org> wrote:
>> Author: brane
>> Date: Fri Aug 10 09:55:16 2012
>> New Revision: 1371633
>>
>> URL: http://svn.apache.org/viewvc?rev=1371633&view=rev
>> Log:
>> On Windows, create the generated svn_private_config.h in the intermediate
>> build directory so that different configurations don't all use the same
>> canonical host name. This incidentally allows Windows and Unix builds to
>> share the same working copy in parallel.
>>
>> * build\generator\templates\svn_config.vcproj.ezt,
>> build\generator\templates\svn_config.vcxproj.ezt: Change output path
>> of svn_private_config.h. Add generated SQL headers to project.
>>
>> * build\generator\templates\vcnet_vcproj.ezt,
>> build\generator\templates\vcnet_vcxproj.ezt: Add build directory to
>> list of project-specific include paths.
>
> I don't understand this change, being not very familiar with the build
> system. But after this commit my build on Windows (XP, with VCExpress
> 2008) fails:
>
> [[[
> C:\research\svn\client_build\trunk2>msbuild subversion_vcnet.sln
> /nologo /v:q /p:Configuration=debug /t:__ALL__
> Project : error PRJ0019: A tool returned an error code from "Creating
> svn_private_config.h from svn_private_config.hw."
> ]]]
>
> No idea what error code is returned by the "tool". I did run
> gen-make.py before trying the build.
>
> If I rollback to r1371632 everything works fine.
And it seems it's not only me :-). The windows buildbots are also
failing with the same error. Brane, can you take a look at this?
--
Johan
Re: svn commit: r1371633 - in /subversion/trunk/build/generator/templates: svn_config.vcproj.ezt svn_config.vcxproj.ezt vcnet_vcproj.ezt vcnet_vcxproj.ezt
Posted by Julian Foad <ju...@btopenworld.com>.
I (Julian Foad) wrote:
> I (Julian Foad) wrote:
>> Branko Čibej wrote:
>>> On 13.08.2012 16:21, Julian Foad wrote:
>>>> Johan Corveleyn wrote:
>>>>>> Author: brane
>>>>>>
>>>>>> On Windows, create the generated svn_private_config.h in the
>>>>>> intermediate build directory so that different configurations
>>>>>> don't all use the same canonical host name.
>>>>
>>>> Just for Windows? Are you (Brane) planning to do the same for
>>>> Unix-like builds as well, as that would seem to be equally useful?
>>>
>>> Well, on Unix we don't support different build configurations in the
>>> same tree, which is the norm on Windows. It would make sense to create
>>> svn_private_config.h in the build directory for out-of-tree builds. I
>>> haven't checked if configure.ac already does that.
>>
>> I always do out-of-tree builds, and we currently create that .h file in the
>> source tree not the build tree.
>
> Oops, the other way around: we currently create that .h file in the build tree, not in the source tree.
Just to wrap this up, I can answer my own question: there is nothing needs doing on the Unix side.
- Julian
Re: svn commit: r1371633 - in /subversion/trunk/build/generator/templates: svn_config.vcproj.ezt svn_config.vcxproj.ezt vcnet_vcproj.ezt vcnet_vcxproj.ezt
Posted by Julian Foad <ju...@btopenworld.com>.
I (Julian Foad) wrote:
> Branko Čibej wrote:
>> On 13.08.2012 16:21, Julian Foad wrote:
>>> Johan Corveleyn wrote:
>>>>> Author: brane
>>>>>
>>>>> On Windows, create the generated svn_private_config.h in the
>>>>> intermediate build directory so that different configurations
>>>>> don't all use the same canonical host name.
>>>
>>> Just for Windows? Are you (Brane) planning to do the same for
>>> Unix-like builds as well, as that would seem to be equally useful?
>>
>> Well, on Unix we don't support different build configurations in the
>> same tree, which is the norm on Windows. It would make sense to create
>> svn_private_config.h in the build directory for out-of-tree builds. I
>> haven't checked if configure.ac already does that.
>
> I always do out-of-tree builds, and we currently create that .h file in the
> source tree not the build tree.
Oops, the other way around: we currently create that .h file in the build tree, not in the source tree.
- Julian
Re: svn commit: r1371633 - in /subversion/trunk/build/generator/templates: svn_config.vcproj.ezt svn_config.vcxproj.ezt vcnet_vcproj.ezt vcnet_vcxproj.ezt
Posted by Philip Martin <ph...@wandisco.com>.
Julian Foad <ju...@btopenworld.com> writes:
> I always do out-of-tree builds, and we currently create that .h file
> in the source tree not the build tree.
That's not what I see in my out-of-tree build. The source tree has the
non-versioned svn_private_config.h.in created by autogen.sh. The build
tree has svn_private_config.h created by configure.
--
Certified & Supported Apache Subversion Downloads:
http://www.wandisco.com/subversion/download
Re: svn commit: r1371633 - in /subversion/trunk/build/generator/templates: svn_config.vcproj.ezt svn_config.vcxproj.ezt vcnet_vcproj.ezt vcnet_vcxproj.ezt
Posted by Julian Foad <ju...@btopenworld.com>.
Branko Čibej wrote:
> On 13.08.2012 16:21, Julian Foad wrote:
>> Johan Corveleyn wrote:
>>>> Author: brane
>>>>
>>>> On Windows, create the generated svn_private_config.h in the
>>>> intermediate build directory so that different configurations
>>>> don't all use the same canonical host name.
>>
>> Just for Windows? Are you (Brane) planning to do the same for
>> Unix-like builds as well, as that would seem to be equally useful?
>
> Well, on Unix we don't support different build configurations in the
> same tree, which is the norm on Windows. It would make sense to create
> svn_private_config.h in the build directory for out-of-tree builds. I
> haven't checked if configure.ac already does that.
I always do out-of-tree builds, and we currently create that .h file in the source tree not the build tree.
- Julian
Re: svn commit: r1371633 - in /subversion/trunk/build/generator/templates:
svn_config.vcproj.ezt svn_config.vcxproj.ezt vcnet_vcproj.ezt vcnet_vcxproj.ezt
Posted by Branko Čibej <br...@wandisco.com>.
On 13.08.2012 16:21, Julian Foad wrote:
> Johan Corveleyn wrote:
>
>>> Author: brane
>>> Date: Fri Aug 10 09:55:16 2012
>>> New Revision: 1371633
>>>
>>> URL: http://svn.apache.org/viewvc?rev=1371633&view=rev
>>> Log:
>>> On Windows, create the generated svn_private_config.h in the intermediate
>>> build directory so that different configurations don't all use the same
>>> canonical host name.
> Just for Windows? Are you (Brane) planning to do the same for Unix-like builds as well, as that would seem to be equally useful?
Well, on Unix we don't support different build configurations in the
same tree, which is the norm on Windows. It would make sense to create
svn_private_config.h in the build directory for out-of-tree builds. I
haven't checked if configure.ac already does that.
-- Brane
--
Certified & Supported Apache Subversion Downloads:
http://www.wandisco.com/subversion/download
Re: svn commit: r1371633 - in /subversion/trunk/build/generator/templates: svn_config.vcproj.ezt svn_config.vcxproj.ezt vcnet_vcproj.ezt vcnet_vcxproj.ezt
Posted by Julian Foad <ju...@btopenworld.com>.
Johan Corveleyn wrote:
>> Author: brane
>> Date: Fri Aug 10 09:55:16 2012
>> New Revision: 1371633
>>
>> URL: http://svn.apache.org/viewvc?rev=1371633&view=rev
>> Log:
>> On Windows, create the generated svn_private_config.h in the intermediate
>> build directory so that different configurations don't all use the same
>> canonical host name.
Just for Windows? Are you (Brane) planning to do the same for Unix-like builds as well, as that would seem to be equally useful?
- Julian
>> This incidentally allows Windows and Unix builds to
>> share the same working copy in parallel.
>>
>> * build\generator\templates\svn_config.vcproj.ezt,
>> build\generator\templates\svn_config.vcxproj.ezt: Change
> output path
>> of svn_private_config.h. Add generated SQL headers to project.
>>
>> * build\generator\templates\vcnet_vcproj.ezt,
>> build\generator\templates\vcnet_vcxproj.ezt: Add build
> directory to
>> list of project-specific include paths.
>
> I don't understand this change, being not very familiar with the build
> system. But after this commit my build on Windows (XP, with VCExpress
> 2008) fails:
>
> [[[
> C:\research\svn\client_build\trunk2>msbuild
> subversion_vcnet.sln
> /nologo /v:q /p:Configuration=debug /t:__ALL__
> Project : error PRJ0019: A tool returned an error code from "Creating
> svn_private_config.h from svn_private_config.hw."
> ]]]
>
> No idea what error code is returned by the "tool". I did run
> gen-make.py before trying the build.
>
> If I rollback to r1371632 everything works fine.
>
> --
> Johan
>
Re: svn commit: r1371633 - in /subversion/trunk/build/generator/templates:
svn_config.vcproj.ezt svn_config.vcxproj.ezt vcnet_vcproj.ezt vcnet_vcxproj.ezt
Posted by Johan Corveleyn <jc...@gmail.com>.
On Fri, Aug 10, 2012 at 11:55 AM, <br...@apache.org> wrote:
> Author: brane
> Date: Fri Aug 10 09:55:16 2012
> New Revision: 1371633
>
> URL: http://svn.apache.org/viewvc?rev=1371633&view=rev
> Log:
> On Windows, create the generated svn_private_config.h in the intermediate
> build directory so that different configurations don't all use the same
> canonical host name. This incidentally allows Windows and Unix builds to
> share the same working copy in parallel.
>
> * build\generator\templates\svn_config.vcproj.ezt,
> build\generator\templates\svn_config.vcxproj.ezt: Change output path
> of svn_private_config.h. Add generated SQL headers to project.
>
> * build\generator\templates\vcnet_vcproj.ezt,
> build\generator\templates\vcnet_vcxproj.ezt: Add build directory to
> list of project-specific include paths.
I don't understand this change, being not very familiar with the build
system. But after this commit my build on Windows (XP, with VCExpress
2008) fails:
[[[
C:\research\svn\client_build\trunk2>msbuild subversion_vcnet.sln
/nologo /v:q /p:Configuration=debug /t:__ALL__
Project : error PRJ0019: A tool returned an error code from "Creating
svn_private_config.h from svn_private_config.hw."
]]]
No idea what error code is returned by the "tool". I did run
gen-make.py before trying the build.
If I rollback to r1371632 everything works fine.
--
Johan