Skip to content
Permalink
Browse files
2010-03-23 Daniel Bates <dbates@rim.com>
        Reviewed by Adam Roben.

        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:


Canonical link: https://commits.webkit.org/47713@main
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@56419 268f45cc-cd09-0410-ab3c-d52691b4dbfc
  • Loading branch information
dydz committed Mar 23, 2010
1 parent e934e23 commit 5932fa69927145f864e89e9f81d2acd1ade23732
Showing 2 changed files with 32 additions and 0 deletions.
@@ -1,3 +1,14 @@
2010-03-23 Daniel Bates <dbates@rim.com>

Reviewed by Adam Roben.

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-23 Darin Adler <darin@apple.com>

Tell Subversion about more directories that expect to have .pyc files.
@@ -72,6 +72,7 @@ my $isInspectorFrontend;
my $vcBuildPath;
my $windowsTmpPath;
my $windowsSourceDir;
my $willUseVCExpressWhenBuilding = 0;

# Defined in VCSUtils.
sub exitStatus($);
@@ -1026,6 +1027,7 @@ sub setupCygwinEnv()
print "*************************************************************\n";
die;
}
$willUseVCExpressWhenBuilding = 1;
}

my $qtSDKPath = "$programFilesPath/QuickTime SDK";
@@ -1047,6 +1049,23 @@ sub setupCygwinEnv()
print "WEBKITLIBRARIESDIR is set to: ", $ENV{"WEBKITLIBRARIESDIR"}, "\n";
}

sub dieIfWindowsPlatformSDKNotInstalled
{
my $windowsPlatformSDKRegistryEntry = "/proc/registry/HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/MicrosoftSDK/InstalledSDKs/D2FF9F89-8AA2-4373-8A31-C838BF4DBBE1";

return if -e $windowsPlatformSDKRegistryEntry;

print "*************************************************************\n";
print "Cannot find '$windowsPlatformSDKRegistryEntry'.\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;
}

sub copyInspectorFrontendFiles
{
my $productDir = productDir();
@@ -1101,6 +1120,8 @@ sub buildVisualStudioProject

my $config = configurationForVisualStudio();

dieIfWindowsPlatformSDKNotInstalled() if $willUseVCExpressWhenBuilding;

chomp(my $winProjectPath = `cygpath -w "$project"`);

my $action = "/build";

0 comments on commit 5932fa6

Please sign in to comment.