svn commit: r1342189 - /subversion/trunk/build/generator/gen_vcnet_vcproj.py

[rh...@apache.org]

Author: rhuijben
Date: Thu May 24 10:33:04 2012
New Revision: 1342189

URL: http://svn.apache.org/viewvc?rev=1342189&view=rev
Log:
Stop generating $(SolutionDir) inside project files where we can just calculate
the relative path. This somehow triggered a bug in more recent VS versions.

* build/generator/gen_vcnet_vcproj.py
  (find_rootpath): Remove function (fall back to base class).
  (write): Calculate relative path.

Modified:
    subversion/trunk/build/generator/gen_vcnet_vcproj.py

Modified: subversion/trunk/build/generator/gen_vcnet_vcproj.py
URL: http://svn.apache.org/viewvc/subversion/trunk/build/generator/gen_vcnet_vcproj.py?rev=1342189&r1=1342188&r2=1342189&view=diff
==============================================================================
--- subversion/trunk/build/generator/gen_vcnet_vcproj.py (original)
+++ subversion/trunk/build/generator/gen_vcnet_vcproj.py Thu May 24 10:33:04 2012
@@ -124,10 +124,6 @@ class Generator(gen_win.WinGeneratorBase
       self.write_with_template(fname, 'templates/vcnet_vcxproj.ezt', data)
       self.write_with_template(fname + '.filters', 'templates/vcnet_vcxproj_filters.ezt', data)
 
-  def find_rootpath(self):
-    "Gets the root path as understand by the project system"
-    return "$(SolutionDir)"
-
   def write(self):
     "Write a Solution (.sln)"
 
@@ -203,7 +199,7 @@ class Generator(gen_win.WinGeneratorBase
         if depends[i].fname.startswith(self.projfilesdir):
           path = depends[i].fname[len(self.projfilesdir) + 1:]
         else:
-          path = '$(SolutionDir)' + depends[i].fname
+          path = os.path.relpath('.', self.projfilesdir) + depends[i].fname
         deplist.append(gen_win.ProjectItem(guid=guids[depends[i].name],
                                            index=i,
                                            path=path,