[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[aroben at apple.com]

The following commit has been merged in the debian/experimental branch:
commit d2d7f766e3c7ebf1ffdf7043b071618ce67d93e6
Author: aroben at apple.com <aroben at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Nov 22 21:17:23 2010 +0000

    Make it possible to run tests on Windows without Visual Studio or VC++ Express installed
    
    webkitdir.pm::setupCygwinEnv dies when Visual Studio and VC++ Express
    are not installed. But this function doesn't need to be called when we
    already have a build available and are just trying to run the tests.
    
    Fixes <http://webkit.org/b/49932> New Windows 7 bot can't run tests
    because Visual Studio/VC++ Express aren't installed
    
    Reviewed by Dave Hyatt.
    
    * Scripts/webkitdirs.pm:
    (determineConfigurationForVisualStudio): Don't call setupCygwinEnv, as
    it is not needed by this function. Also added a FIXME.
    
    (usingVisualStudioExpress): Call setupCygwinEnv directly rather than
    relying on determineConfigurationForVisualStudio doing it.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@72554 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index bf2e4d0..90605bc 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,24 @@
+2010-11-22  Adam Roben  <aroben at apple.com>
+
+        Make it possible to run tests on Windows without Visual Studio or VC++
+        Express installed
+
+        webkitdir.pm::setupCygwinEnv dies when Visual Studio and VC++ Express
+        are not installed. But this function doesn't need to be called when we
+        already have a build available and are just trying to run the tests.
+
+        Fixes <http://webkit.org/b/49932> New Windows 7 bot can't run tests
+        because Visual Studio/VC++ Express aren't installed
+
+        Reviewed by Dave Hyatt.
+
+        * Scripts/webkitdirs.pm:
+        (determineConfigurationForVisualStudio): Don't call setupCygwinEnv, as
+        it is not needed by this function. Also added a FIXME.
+
+        (usingVisualStudioExpress): Call setupCygwinEnv directly rather than
+        relying on determineConfigurationForVisualStudio doing it.
+
 2010-11-19  Hayato Ito  <hayato at chromium.org>
 
         Reviewed by Shinichiro Hamaji.
diff --git a/WebKitTools/Scripts/webkitdirs.pm b/WebKitTools/Scripts/webkitdirs.pm
index 3ccbcb0..1e474e2 100644
--- a/WebKitTools/Scripts/webkitdirs.pm
+++ b/WebKitTools/Scripts/webkitdirs.pm
@@ -282,8 +282,8 @@ sub determineConfigurationForVisualStudio
 {
     return if defined $configurationForVisualStudio;
     determineConfiguration();
+    # FIXME: We should detect when Debug_All or Release_LTCG has been chosen.
     $configurationForVisualStudio = $configuration;
-    setupCygwinEnv();
 }
 
 sub determineConfigurationProductDir
@@ -1184,7 +1184,7 @@ sub buildXCodeProject($$@)
 
 sub usingVisualStudioExpress()
 {
-    determineConfigurationForVisualStudio();
+    setupCygwinEnv();
     return $willUseVCExpressWhenBuilding;
 }
 

-- 
WebKit Debian packaging