From e1b9694a2457aafe8a07122e7dd1ef665c924c20 Mon Sep 17 00:00:00 2001 From: "tony@chromium.org" Date: Tue, 3 Jul 2012 17:28:32 +0000 Subject: [PATCH] [chromium] Handle trailing backslash on %VSINSTALLDIR% https://bugs.webkit.org/show_bug.cgi?id=90410 Reviewed by Ojan Vafai. * Scripts/webkitdirs.pm: (buildChromiumVisualStudioProject): Handle VSINSTALLDIR ending in a backslash, the backslash escapes the closing double quote. git-svn-id: http://svn.webkit.org/repository/webkit/trunk@121785 268f45cc-cd09-0410-ab3c-d52691b4dbfc --- Tools/ChangeLog | 10 ++++++++++ Tools/Scripts/webkitdirs.pm | 1 + 2 files changed, 11 insertions(+) diff --git a/Tools/ChangeLog b/Tools/ChangeLog index dd3c42e..726c629 100644 --- a/Tools/ChangeLog +++ b/Tools/ChangeLog @@ -1,3 +1,13 @@ +2012-07-03 Tony Chang + + [chromium] Handle trailing backslash on %VSINSTALLDIR% + https://bugs.webkit.org/show_bug.cgi?id=90410 + + Reviewed by Ojan Vafai. + + * Scripts/webkitdirs.pm: + (buildChromiumVisualStudioProject): Handle VSINSTALLDIR ending in a backslash, the backslash escapes the closing double quote. + 2012-07-02 Ojan Vafai Make the skia_test_expectations.txt file optional. diff --git a/Tools/Scripts/webkitdirs.pm b/Tools/Scripts/webkitdirs.pm index 3481e9a..ef0b927 100755 --- a/Tools/Scripts/webkitdirs.pm +++ b/Tools/Scripts/webkitdirs.pm @@ -2531,6 +2531,7 @@ sub buildChromiumVisualStudioProject($$) } else { $vsInstallDir = "$programFilesPath/Microsoft Visual Studio 8"; } + $vsInstallDir =~ s,\\,/,g; $vsInstallDir = `cygpath "$vsInstallDir"` if isCygwin(); chomp $vsInstallDir; $vcBuildPath = "$vsInstallDir/Common7/IDE/devenv.com"; -- 2.7.4