subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From svn-r...@apache.org
Subject svn commit: r1615197 - in /subversion/branches/1.8.x: ./ STATUS build/generator/templates/vcnet_vcproj.ezt
Date Fri, 01 Aug 2014 18:58:56 GMT
Author: svn-role
Date: Fri Aug  1 18:58:55 2014
New Revision: 1615197

URL: http://svn.apache.org/r1615197
Log:
Merge r1595431 from trunk:

 * r1595431
   Use a proper intermediate directory when building with VS 2003-2008.
   Justification:
     Reported as a build problem by some of our usual dist signers.
   Votes:
     +1: rhuijben, ivan, breser

Modified:
    subversion/branches/1.8.x/   (props changed)
    subversion/branches/1.8.x/STATUS
    subversion/branches/1.8.x/build/generator/templates/vcnet_vcproj.ezt

Propchange: subversion/branches/1.8.x/
------------------------------------------------------------------------------
  Merged /subversion/trunk:r1595431

Modified: subversion/branches/1.8.x/STATUS
URL: http://svn.apache.org/viewvc/subversion/branches/1.8.x/STATUS?rev=1615197&r1=1615196&r2=1615197&view=diff
==============================================================================
--- subversion/branches/1.8.x/STATUS (original)
+++ subversion/branches/1.8.x/STATUS Fri Aug  1 18:58:55 2014
@@ -189,13 +189,6 @@ Veto-blocked changes:
 Approved changes:
 =================
 
- * r1595431
-   Use a proper intermediate directory when building with VS 2003-2008.
-   Justification:
-     Reported as a build problem by some of our usual dist signers.
-   Votes:
-     +1: rhuijben, ivan, breser
-
  * r1600311, r1600315, r1600323, r1600393
    Properly delete ancestor directories of externals when removing the
    external by changing the svn:externals value.

Modified: subversion/branches/1.8.x/build/generator/templates/vcnet_vcproj.ezt
URL: http://svn.apache.org/viewvc/subversion/branches/1.8.x/build/generator/templates/vcnet_vcproj.ezt?rev=1615197&r1=1615196&r2=1615197&view=diff
==============================================================================
--- subversion/branches/1.8.x/build/generator/templates/vcnet_vcproj.ezt (original)
+++ subversion/branches/1.8.x/build/generator/templates/vcnet_vcproj.ezt Fri Aug  1 18:58:55
2014
@@ -32,7 +32,7 @@
 			Name="[configs.name]|[platforms]"
 			OutputDirectory="..\..\..\[configs.name]\[target.output_dir]"
 			BuildLogFile="$(IntDir)\BuildLog_$(ProjectName).htm"
-			IntermediateDirectory="..\..\..\[configs.name]\[target.intermediate_dir]"
+			IntermediateDirectory="..\..\..\[configs.name]\[target.intermediate_dir]\[target.proj_name]"
 			ConfigurationType="[target_type]"[is configs.name "Release"]
 			WholeProgramOptimization="FALSE"[end]>
 			<Tool



Mime
View raw message