svn commit: r1291799 - /subversion/trunk/build/generator/gen_win.py

[rh...@apache.org]

Author: rhuijben
Date: Tue Feb 21 14:26:28 2012
New Revision: 1291799

URL: http://svn.apache.org/viewvc?rev=1291799&view=rev
Log:
Following up on r1291740, use relative paths for zlib in a few more places.

* build/generator/gen_win.py
  (WinGeneratorBase): Use relative paths in .bat file.
  (write_zlib_project_file): Use relative path to output folder.  

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

Modified: subversion/trunk/build/generator/gen_win.py
URL: http://svn.apache.org/viewvc/subversion/trunk/build/generator/gen_win.py?rev=1291799&r1=1291798&r2=1291799&view=diff
==============================================================================
--- subversion/trunk/build/generator/gen_win.py (original)
+++ subversion/trunk/build/generator/gen_win.py Tue Feb 21 14:26:28 2012
@@ -301,7 +301,7 @@ class WinGeneratorBase(GeneratorBase):
 
     # Generate the build_zlib.bat file
     if self.zlib_path:
-      data = {'zlib_path': os.path.abspath(self.zlib_path),
+      data = {'zlib_path': os.path.relpath(self.zlib_path, self.projfilesdir),
               'zlib_version': self.zlib_version,
               'use_ml': self.have_ml and 1 or None}
       bat = os.path.join(self.projfilesdir, 'build_zlib.bat')
@@ -1162,7 +1162,8 @@ class WinGeneratorBase(GeneratorBase):
                        glob.glob(os.path.join(zlib_path, '*.h')))
                        
     self.move_proj_file(self.projfilesdir, name,
-                        (('zlib_path', zlib_path),
+                        (('zlib_path', os.path.relpath(zlib_path,
+                                                       self.projfilesdir)),
                          ('zlib_sources', zlib_sources),
                          ('zlib_headers', zlib_headers),
                          ('zlib_version', self.zlib_version),