[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.22-985-g3c00f00

[eric at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit 4a4100a7bc54df0837acfc43293bfb704e928f91
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Mar 16 07:08:06 2010 +0000

    2010-03-15  Daniel Bates  <dbates at rim.com>
    
            Reviewed by Eric Seidel.
    
            https://bugs.webkit.org/show_bug.cgi?id=36048
    
            Detect if the Windows Platform SDK is missing when building with
            Visual C++ Express Edition and inform the user to download it.
    
            * Scripts/webkitdirs.pm:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@56044 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index d5d229e..4f7d05e 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,14 @@
+2010-03-15  Daniel Bates  <dbates at rim.com>
+
+        Reviewed by Eric Seidel.
+
+        https://bugs.webkit.org/show_bug.cgi?id=36048
+
+        Detect if the Windows Platform SDK is missing when building with
+        Visual C++ Express Edition and inform the user to download it.
+
+        * Scripts/webkitdirs.pm:
+
 2010-03-15  Adam Barth  <abarth at webkit.org>
 
         Reviewed by Eric Seidel.
diff --git a/WebKitTools/Scripts/webkitdirs.pm b/WebKitTools/Scripts/webkitdirs.pm
index 3f02f71..56af227 100644
--- a/WebKitTools/Scripts/webkitdirs.pm
+++ b/WebKitTools/Scripts/webkitdirs.pm
@@ -1007,6 +1007,19 @@ sub setupCygwinEnv()
             print "*************************************************************\n";
             die;
         }
+
+        my $windowsPlatformSDKPath = "$programFilesPath/Microsoft Platform SDK for Windows Server 2003 R2";
+        if (! -e $windowsPlatformSDKPath) {
+            print "*************************************************************\n";
+            print "Cannot find '$windowsPlatformSDKPath'\n";
+            print "Please download and install the Microsoft Windows Server 2003 R2\n";
+            print "Platform SDK from <http://www.microsoft.com/downloads/details.aspx?\n";
+            print "familyid=0baf2b35-c656-4969-ace8-e4c0c0716adb&displaylang=en>.\n\n";
+            print "Then follow step 2 in the Windows section of the \"Installing Developer\n";
+            print "Tools\" instructions at <http://www.webkit.org/building/tools.html>.\n";
+            print "*************************************************************\n";
+            die;
+        }
     }
 
     my $qtSDKPath = "$programFilesPath/QuickTime SDK";

-- 
WebKit Debian packaging