svn commit: r1128250 - in /subversion/trunk/build/generator: gen_win.py templates/vcnet_vcxproj.ezt

[rh...@apache.org]

Author: rhuijben
Date: Fri May 27 10:42:52 2011
New Revision: 1128250

URL: http://svn.apache.org/viewvc?rev=1128250&view=rev
Log:
Remove a few double '\'-s from the constructed paths in MSBuild by
not using a '\' after $(SolutionDir).

* build/generator/gen_win.py
  (find_rootpath): Include the final '\' in the result.
  (path, apath): Assume the rootpath has a final '\'
  
* build/generator/templates/vcnet_vcxproj.ezt
  Assume $(SolutionDir) has a final '\'

Modified:
    subversion/trunk/build/generator/gen_win.py
    subversion/trunk/build/generator/templates/vcnet_vcxproj.ezt

Modified: subversion/trunk/build/generator/gen_win.py
URL: http://svn.apache.org/viewvc/subversion/trunk/build/generator/gen_win.py?rev=1128250&r1=1128249&r2=1128250&view=diff
==============================================================================
--- subversion/trunk/build/generator/gen_win.py (original)
+++ subversion/trunk/build/generator/gen_win.py Fri May 27 10:42:52 2011
@@ -334,7 +334,7 @@ class WinGeneratorBase(GeneratorBase):
       
   def find_rootpath(self):
     "Gets the root path as understand by the project system"
-    return ".." + "\\.." * self.projfilesdir.count(os.sep)
+    return ".." + "\\.." * self.projfilesdir.count(os.sep) + "\\"
 
   def makeguid(self, data):
     "Generate a windows style GUID"
@@ -352,7 +352,7 @@ class WinGeneratorBase(GeneratorBase):
 
   def path(self, *paths):
     """Convert build path to msvc path and prepend root"""
-    return msvc_path_join(self.rootpath, *list(map(msvc_path, paths)))
+    return self.rootpath + msvc_path_join(*list(map(msvc_path, paths)))
 
   def apath(self, path, *paths):
     """Convert build path to msvc path and prepend root if not absolute"""
@@ -361,8 +361,8 @@ class WinGeneratorBase(GeneratorBase):
     if os.path.isabs(path):
       return msvc_path_join(msvc_path(path), *list(map(msvc_path, paths)))
     else:
-      return msvc_path_join(self.rootpath, msvc_path(path),
-                            *list(map(msvc_path, paths)))
+      return self.rootpath + msvc_path_join(msvc_path(path),
+                                            *list(map(msvc_path, paths)))
 
   def get_install_targets(self):
     "Generate the list of targets"

Modified: subversion/trunk/build/generator/templates/vcnet_vcxproj.ezt
URL: http://svn.apache.org/viewvc/subversion/trunk/build/generator/templates/vcnet_vcxproj.ezt?rev=1128250&r1=1128249&r2=1128250&view=diff
==============================================================================
--- subversion/trunk/build/generator/templates/vcnet_vcxproj.ezt (original)
+++ subversion/trunk/build/generator/templates/vcnet_vcxproj.ezt Fri May 27 10:42:52 2011
@@ -42,8 +42,8 @@
   </ImportGroup>
 [end][end]  <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
-[for configs][for platforms]    <OutDir Condition="'$(Configuration)|$(Platform)'=='[configs.name]|[platforms]'">$(SolutionDir)\[configs.name]\[target.output_dir]\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='[configs.name]|[platforms]'">$(SolutionDir)\[configs.name]\[target.intermediate_dir]\[target.proj_name]\</IntDir>
+[for configs][for platforms]    <OutDir Condition="'$(Configuration)|$(Platform)'=='[configs.name]|[platforms]'">$(SolutionDir)[configs.name]\[target.output_dir]\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='[configs.name]|[platforms]'">$(SolutionDir)[configs.name]\[target.intermediate_dir]\[target.proj_name]\</IntDir>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='[configs.name]|[platforms]'">[target.output_name_without_ext]</TargetName>
 [is config_type "DynamicLibrary"][is target.output_ext ".dll"][else]    <TargetExt>[target.output_ext]</TargetExt>
 [end][end][end][end]  </PropertyGroup>