Return-Path: X-Original-To: apmail-subversion-commits-archive@minotaur.apache.org Delivered-To: apmail-subversion-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id A7AC99619 for ; Tue, 21 Feb 2012 14:26:57 +0000 (UTC) Received: (qmail 61488 invoked by uid 500); 21 Feb 2012 14:26:56 -0000 Delivered-To: apmail-subversion-commits-archive@subversion.apache.org Received: (qmail 61464 invoked by uid 500); 21 Feb 2012 14:26:56 -0000 Mailing-List: contact commits-help@subversion.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@subversion.apache.org Delivered-To: mailing list commits@subversion.apache.org Received: (qmail 61431 invoked by uid 99); 21 Feb 2012 14:26:56 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 21 Feb 2012 14:26:56 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED,T_FRT_PROFILE2 X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 21 Feb 2012 14:26:49 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 691FA2388860 for ; Tue, 21 Feb 2012 14:26:28 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1291799 - /subversion/trunk/build/generator/gen_win.py Date: Tue, 21 Feb 2012 14:26:28 -0000 To: commits@subversion.apache.org From: rhuijben@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120221142628.691FA2388860@eris.apache.org> X-Virus-Checked: Checked by ClamAV on 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),