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 588AC9A5A for ; Thu, 24 May 2012 10:33:30 +0000 (UTC) Received: (qmail 17687 invoked by uid 500); 24 May 2012 10:33:30 -0000 Delivered-To: apmail-subversion-commits-archive@subversion.apache.org Received: (qmail 17658 invoked by uid 500); 24 May 2012 10:33:29 -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 17633 invoked by uid 99); 24 May 2012 10:33:28 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 24 May 2012 10:33:28 +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; Thu, 24 May 2012 10:33:25 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id D7FB823889BB; Thu, 24 May 2012 10:33:04 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1342189 - /subversion/trunk/build/generator/gen_vcnet_vcproj.py Date: Thu, 24 May 2012 10:33:04 -0000 To: commits@subversion.apache.org From: rhuijben@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120524103304.D7FB823889BB@eris.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,