36048 2010-03-11 21:02:39 -0800 Detect if the Platform SDK is missing when building with Visual C++ Express Edition 2010-03-23 14:47:49 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) PC Windows XP RESOLVED FIXED P2 Normal --- 1 dbates dbates abarth aroben bweinstein commit-queue eric oldest_to_newest 198922 0 dbates 2010-03-11 21:02:39 -0800 As mentioned on the Improving Life on Windows wiki page <http://trac.webkit.org/wiki/ImprovingLifeOnWindows>, we should detect when the Windows Platform SDK is missing and inform the user. This will also fix the first error listed in <http://trac.webkit.org/wiki/BuildingOnWindows#VisualCExpressEdition>. 199042 1 50597 dbates 2010-03-12 07:29:37 -0800 Created attachment 50597 Patch 199861 2 50597 eric 2010-03-15 15:22:44 -0700 Comment on attachment 50597 Patch Yay! 200040 3 50597 commit-queue 2010-03-16 00:08:12 -0700 Comment on attachment 50597 Patch Clearing flags on attachment: 50597 Committed r56044: <http://trac.webkit.org/changeset/56044> 200041 4 commit-queue 2010-03-16 00:08:17 -0700 All reviewed patches have been landed. Closing bug. 200207 5 aroben 2010-03-16 08:37:22 -0700 Sweet! 200597 6 abarth 2010-03-16 23:50:22 -0700 Reverted r56044 for reason: This patch broke Windows Debug (Tests) Committed r56099: <http://trac.webkit.org/changeset/56099> 200782 7 dbates 2010-03-17 07:52:45 -0700 Thanks for rolling this out. Will look into. (In reply to comment #6) > Reverted r56044 for reason: > > This patch broke Windows Debug (Tests) > > Committed r56099: <http://trac.webkit.org/changeset/56099> 202213 8 51221 dbates 2010-03-20 10:16:10 -0700 Created attachment 51221 Patch Moved check for Platform SDK into subroutine buildVisualStudioProject from subroutine setupCygwinEnv so that we only check for its existence when we are are going to build. This resolves the issue observed on the Windows Debug (Test) bot where run-webkit-tests is passed the --root argument and thus does not build DRT (hence, there is no need to check for the Platform SDK). Also, updated the criterion for determining whether the Platform SDK is installed by checking for the existence of its registry entry instead of a fixed install location. 203218 9 51221 aroben 2010-03-23 14:37:00 -0700 Comment on attachment 51221 Patch > +my $isBuildingWithVCExpress = 0; > > # Defined in VCSUtils. > sub exitStatus($); > @@ -1026,6 +1027,7 @@ sub setupCygwinEnv() > print "*************************************************************\n"; > die; > } > + $isBuildingWithVCExpress = 1; > } The name of this variable makes it sound like it will only be set to 1 when a build is actually in progress. Maybe $willUseVCExpressWhenBuilding or something like that would be better? > +sub dieIfWindowsPlatformSDKNotInstalled > +{ > + my $windowsPlatformSDKRegistryEntry = "/proc/registry/HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/MicrosoftSDK/InstalledSDKs/D2FF9F89-8AA2-4373-8A31-C838BF4DBBE1"; > + > + if (-e $windowsPlatformSDKRegistryEntry) { > + return; > + } This can be written as: return if -e $windowsPlatformSDKRegistryEntry; r=me 203219 10 dbates 2010-03-23 14:39:20 -0700 (In reply to comment #9) > (From update of attachment 51221 [details]) > > +my $isBuildingWithVCExpress = 0; > > > > # Defined in VCSUtils. > > sub exitStatus($); > > @@ -1026,6 +1027,7 @@ sub setupCygwinEnv() > > print "*************************************************************\n"; > > die; > > } > > + $isBuildingWithVCExpress = 1; > > } > > The name of this variable makes it sound like it will only be set to 1 when a > build is actually in progress. Maybe $willUseVCExpressWhenBuilding or something > like that would be better? Will change before I land. > > > +sub dieIfWindowsPlatformSDKNotInstalled > > +{ > > + my $windowsPlatformSDKRegistryEntry = "/proc/registry/HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/MicrosoftSDK/InstalledSDKs/D2FF9F89-8AA2-4373-8A31-C838BF4DBBE1"; > > + > > + if (-e $windowsPlatformSDKRegistryEntry) { > > + return; > > + } > > This can be written as: > > return if -e $windowsPlatformSDKRegistryEntry; Will change before I land. 203225 11 dbates 2010-03-23 14:47:49 -0700 Committed r56419: <http://trac.webkit.org/changeset/56419> 50597 2010-03-12 07:29:37 -0800 2010-03-20 10:16:10 -0700 Patch Bug36048.patch text/plain 1915 dbates SW5kZXg6IFdlYktpdFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXRUb29scy9D aGFuZ2VMb2cJKHJldmlzaW9uIDU1ODg1KQorKysgV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCSh3b3Jr aW5nIGNvcHkpCkBAIC0xLDMgKzEsMTQgQEAKKzIwMTAtMDMtMTEgIERhbmllbCBCYXRlcyAgPGRi YXRlc0ByaW0uY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0zNjA0OAorCisg ICAgICAgIERldGVjdCBpZiB0aGUgV2luZG93cyBQbGF0Zm9ybSBTREsgaXMgbWlzc2luZyB3aGVu IGJ1aWxkaW5nIHdpdGgKKyAgICAgICAgVmlzdWFsIEMrKyBFeHByZXNzIEVkaXRpb24gYW5kIGlu Zm9ybSB0aGUgdXNlciB0byBkb3dubG9hZCBpdC4KKworICAgICAgICAqIFNjcmlwdHMvd2Via2l0 ZGlycy5wbToKKwogMjAxMC0wMy0xMSAgRnVtaXRvc2hpIFVrYWkgIDx1a2FpQGNocm9taXVtLm9y Zz4KIAogICAgICAgICBVbnJldmlld2VkLgpJbmRleDogV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJr aXRkaXJzLnBtCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0ZGlycy5w bQkocmV2aXNpb24gNTU4ODUpCisrKyBXZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdGRpcnMucG0J KHdvcmtpbmcgY29weSkKQEAgLTEwMDcsNiArMTAwNywxOSBAQCBzdWIgc2V0dXBDeWd3aW5FbnYo KQogICAgICAgICAgICAgcHJpbnQgIioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq KioqKioqKioqKioqKioqKioqKioqKioqKipcbiI7CiAgICAgICAgICAgICBkaWU7CiAgICAgICAg IH0KKworICAgICAgICBteSAkd2luZG93c1BsYXRmb3JtU0RLUGF0aCA9ICIkcHJvZ3JhbUZpbGVz UGF0aC9NaWNyb3NvZnQgUGxhdGZvcm0gU0RLIGZvciBXaW5kb3dzIFNlcnZlciAyMDAzIFIyIjsK KyAgICAgICAgaWYgKCEgLWUgJHdpbmRvd3NQbGF0Zm9ybVNES1BhdGgpIHsKKyAgICAgICAgICAg IHByaW50ICIqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq KioqKioqKioqKioqXG4iOworICAgICAgICAgICAgcHJpbnQgIkNhbm5vdCBmaW5kICckd2luZG93 c1BsYXRmb3JtU0RLUGF0aCdcbiI7CisgICAgICAgICAgICBwcmludCAiUGxlYXNlIGRvd25sb2Fk IGFuZCBpbnN0YWxsIHRoZSBNaWNyb3NvZnQgV2luZG93cyBTZXJ2ZXIgMjAwMyBSMlxuIjsKKyAg ICAgICAgICAgIHByaW50ICJQbGF0Zm9ybSBTREsgZnJvbSA8aHR0cDovL3d3dy5taWNyb3NvZnQu Y29tL2Rvd25sb2Fkcy9kZXRhaWxzLmFzcHg/XG4iOworICAgICAgICAgICAgcHJpbnQgImZhbWls eWlkPTBiYWYyYjM1LWM2NTYtNDk2OS1hY2U4LWU0YzBjMDcxNmFkYiZkaXNwbGF5bGFuZz1lbj4u XG5cbiI7CisgICAgICAgICAgICBwcmludCAiVGhlbiBmb2xsb3cgc3RlcCAyIGluIHRoZSBXaW5k b3dzIHNlY3Rpb24gb2YgdGhlIFwiSW5zdGFsbGluZyBEZXZlbG9wZXJcbiI7CisgICAgICAgICAg ICBwcmludCAiVG9vbHNcIiBpbnN0cnVjdGlvbnMgYXQgPGh0dHA6Ly93d3cud2Via2l0Lm9yZy9i dWlsZGluZy90b29scy5odG1sPi5cbiI7CisgICAgICAgICAgICBwcmludCAiKioqKioqKioqKioq KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKlxuIjsKKyAg ICAgICAgICAgIGRpZTsKKyAgICAgICAgfQogICAgIH0KIAogICAgIG15ICRxdFNES1BhdGggPSAi JHByb2dyYW1GaWxlc1BhdGgvUXVpY2tUaW1lIFNESyI7Cg== 51221 2010-03-20 10:16:10 -0700 2010-03-23 14:37:00 -0700 Patch Bug36048_2.patch text/plain 2684 dbates SW5kZXg6IFdlYktpdFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXRUb29scy9D aGFuZ2VMb2cJKHJldmlzaW9uIDU2Mjk3KQorKysgV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCSh3b3Jr aW5nIGNvcHkpCkBAIC0xLDMgKzEsMTQgQEAKKzIwMTAtMDMtMjAgIERhbmllbCBCYXRlcyAgPGRi YXRlc0ByaW0uY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0zNjA0OAorCisg ICAgICAgIERldGVjdCBpZiB0aGUgV2luZG93cyBQbGF0Zm9ybSBTREsgaXMgbWlzc2luZyB3aGVu IGJ1aWxkaW5nIHdpdGgKKyAgICAgICAgVmlzdWFsIEMrKyBFeHByZXNzIEVkaXRpb24gYW5kIGlu Zm9ybSB0aGUgdXNlciB0byBkb3dubG9hZCBpdC4KKworICAgICAgICAqIFNjcmlwdHMvd2Via2l0 ZGlycy5wbToKKwogMjAxMC0wMy0xOSAgRGlyayBQcmFua2UgIDxkcHJhbmtlQGNocm9taXVtLm9y Zz4KIAogICAgICAgICBSZXZpZXdlZCBieSBEaW1pdHJpIEdsYXprb3YuCkluZGV4OiBXZWJLaXRU b29scy9TY3JpcHRzL3dlYmtpdGRpcnMucG0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0VG9vbHMvU2Ny aXB0cy93ZWJraXRkaXJzLnBtCShyZXZpc2lvbiA1NjI5NykKKysrIFdlYktpdFRvb2xzL1Njcmlw dHMvd2Via2l0ZGlycy5wbQkod29ya2luZyBjb3B5KQpAQCAtNzIsNiArNzIsNyBAQCBteSAkaXNJ bnNwZWN0b3JGcm9udGVuZDsKIG15ICR2Y0J1aWxkUGF0aDsKIG15ICR3aW5kb3dzVG1wUGF0aDsK IG15ICR3aW5kb3dzU291cmNlRGlyOworbXkgJGlzQnVpbGRpbmdXaXRoVkNFeHByZXNzID0gMDsK IAogIyBEZWZpbmVkIGluIFZDU1V0aWxzLgogc3ViIGV4aXRTdGF0dXMoJCk7CkBAIC0xMDI2LDYg KzEwMjcsNyBAQCBzdWIgc2V0dXBDeWd3aW5FbnYoKQogICAgICAgICAgICAgcHJpbnQgIioqKioq KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKipc biI7CiAgICAgICAgICAgICBkaWU7CiAgICAgICAgIH0KKyAgICAgICAgJGlzQnVpbGRpbmdXaXRo VkNFeHByZXNzID0gMTsKICAgICB9CiAKICAgICBteSAkcXRTREtQYXRoID0gIiRwcm9ncmFtRmls ZXNQYXRoL1F1aWNrVGltZSBTREsiOwpAQCAtMTA0Nyw2ICsxMDQ5LDI1IEBAIHN1YiBzZXR1cEN5 Z3dpbkVudigpCiAgICAgcHJpbnQgIldFQktJVExJQlJBUklFU0RJUiBpcyBzZXQgdG86ICIsICRF TlZ7IldFQktJVExJQlJBUklFU0RJUiJ9LCAiXG4iOwogfQogCitzdWIgZGllSWZXaW5kb3dzUGxh dGZvcm1TREtOb3RJbnN0YWxsZWQKK3sKKyAgICBteSAkd2luZG93c1BsYXRmb3JtU0RLUmVnaXN0 cnlFbnRyeSA9ICIvcHJvYy9yZWdpc3RyeS9IS0VZX0xPQ0FMX01BQ0hJTkUvU09GVFdBUkUvTWlj cm9zb2Z0L01pY3Jvc29mdFNESy9JbnN0YWxsZWRTREtzL0QyRkY5Rjg5LThBQTItNDM3My04QTMx LUM4MzhCRjREQkJFMSI7CisKKyAgICBpZiAoLWUgJHdpbmRvd3NQbGF0Zm9ybVNES1JlZ2lzdHJ5 RW50cnkpIHsKKyAgICAgICAgcmV0dXJuOworICAgIH0KKworICAgIHByaW50ICIqKioqKioqKioq KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqXG4iOwor ICAgIHByaW50ICJDYW5ub3QgZmluZCAnJHdpbmRvd3NQbGF0Zm9ybVNES1JlZ2lzdHJ5RW50cnkn LlxuIjsKKyAgICBwcmludCAiUGxlYXNlIGRvd25sb2FkIGFuZCBpbnN0YWxsIHRoZSBNaWNyb3Nv ZnQgV2luZG93cyBTZXJ2ZXIgMjAwMyBSMlxuIjsKKyAgICBwcmludCAiUGxhdGZvcm0gU0RLIGZy b20gPGh0dHA6Ly93d3cubWljcm9zb2Z0LmNvbS9kb3dubG9hZHMvZGV0YWlscy5hc3B4P1xuIjsK KyAgICBwcmludCAiZmFtaWx5aWQ9MGJhZjJiMzUtYzY1Ni00OTY5LWFjZTgtZTRjMGMwNzE2YWRi JmRpc3BsYXlsYW5nPWVuPi5cblxuIjsKKyAgICBwcmludCAiVGhlbiBmb2xsb3cgc3RlcCAyIGlu IHRoZSBXaW5kb3dzIHNlY3Rpb24gb2YgdGhlIFwiSW5zdGFsbGluZyBEZXZlbG9wZXJcbiI7Cisg ICAgcHJpbnQgIlRvb2xzXCIgaW5zdHJ1Y3Rpb25zIGF0IDxodHRwOi8vd3d3LndlYmtpdC5vcmcv YnVpbGRpbmcvdG9vbHMuaHRtbD4uXG4iOworICAgIHByaW50ICIqKioqKioqKioqKioqKioqKioq KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqXG4iOworICAgIGRpZTsK K30KKwogc3ViIGNvcHlJbnNwZWN0b3JGcm9udGVuZEZpbGVzCiB7CiAgICAgbXkgJHByb2R1Y3RE aXIgPSBwcm9kdWN0RGlyKCk7CkBAIC0xMTAxLDYgKzExMjIsOCBAQCBzdWIgYnVpbGRWaXN1YWxT dHVkaW9Qcm9qZWN0CiAKICAgICBteSAkY29uZmlnID0gY29uZmlndXJhdGlvbkZvclZpc3VhbFN0 dWRpbygpOwogCisgICAgZGllSWZXaW5kb3dzUGxhdGZvcm1TREtOb3RJbnN0YWxsZWQoKSBpZiAk aXNCdWlsZGluZ1dpdGhWQ0V4cHJlc3M7CisKICAgICBjaG9tcChteSAkd2luUHJvamVjdFBhdGgg PSBgY3lncGF0aCAtdyAiJHByb2plY3QiYCk7CiAgICAgCiAgICAgbXkgJGFjdGlvbiA9ICIvYnVp bGQiOwo=