39296 2010-05-18 09:13:28 -0700 build-webkit doesn't recognize Platform SDK on win64 2010-05-20 20:43:12 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 1 tonyg webkit-unassigned aroben commit-queue dbates nicholas oldest_to_newest 227330 0 tonyg 2010-05-18 09:13:28 -0700 build-webkit doesn't recognize Platform SDK on win64 227335 1 56383 tonyg 2010-05-18 09:20:46 -0700 Created attachment 56383 Patch 227435 2 56383 aroben 2010-05-18 12:40:50 -0700 Comment on attachment 56383 Patch > - return if -e $windowsPlatformSDKRegistryEntry; > + return if ((-e $windowsPlatformSDKRegistryEntry) || (-e $windows64PlatformSDKRegistryEntry)); Normally we'd omit the outer parentheses here. r=me 227440 3 56383 dbates 2010-05-18 12:46:52 -0700 Comment on attachment 56383 Patch > { > my $windowsPlatformSDKRegistryEntry = "/proc/registry/HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/MicrosoftSDK/InstalledSDKs/D2FF9F89-8AA2-4373-8A31-C838BF4DBBE1"; > + my $windows64PlatformSDKRegistryEntry = "/proc/registry64/HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/MicrosoftSDK/InstalledSDKs/D2FF9F89-8AA2-4373-8A31-C838BF4DBBE1"; Is there no way to detect that we are building Windows 64? Also, these paths diff only in there prefix. It seems extraneous to repeat the value twice just because of the difference in prefix. > > - return if -e $windowsPlatformSDKRegistryEntry; > + return if ((-e $windowsPlatformSDKRegistryEntry) || (-e $windows64PlatformSDKRegistryEntry)); I also agree with Adam Roben about omitting the outer parentheses here. 227876 4 56499 tonyg 2010-05-19 10:37:09 -0700 Created attachment 56499 Patch 227880 5 tonyg 2010-05-19 10:39:13 -0700 (In reply to comment #3) > (From update of attachment 56383 [details]) > > > { > > my $windowsPlatformSDKRegistryEntry = "/proc/registry/HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/MicrosoftSDK/InstalledSDKs/D2FF9F89-8AA2-4373-8A31-C838BF4DBBE1"; > > + my $windows64PlatformSDKRegistryEntry = "/proc/registry64/HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/MicrosoftSDK/InstalledSDKs/D2FF9F89-8AA2-4373-8A31-C838BF4DBBE1"; > > Is there no way to detect that we are building Windows 64? I'm sure there is a way, but I'm not a windows environment or perl expert. I just had to run the layout tests on win and this got me building. I've added a FIXME comment. > Also, these paths diff only in there prefix. It seems extraneous to repeat the value twice just because of the difference in prefix. I've cleaned up that part. > > > > > - return if -e $windowsPlatformSDKRegistryEntry; > > + return if ((-e $windowsPlatformSDKRegistryEntry) || (-e $windows64PlatformSDKRegistryEntry)); > > I also agree with Adam Roben about omitting the outer parentheses here. Done. 228012 6 56499 dbates 2010-05-19 15:08:15 -0700 Comment on attachment 56499 Patch Thanks for going back and creating a new patch. I have some minor nits: > diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog > index 4f06670e4bcfa8824b6e9034642e578ba69ceb0a..f7afb31e53adb55d7c10e2d9549493a78f2c84a4 100644 > --- a/WebKitTools/ChangeLog > +++ b/WebKitTools/ChangeLog > @@ -1,3 +1,17 @@ > +2010-05-18 Tony Gentilcore <tonyg@chromium.org> > + > + Reviewed by NOBODY (OOPS!). > + > + Look in registry64 for Platform SDK. I would change this to read "Look in /proc/registry64 for the Platform SDK on 64-bit Windows." > + > + The build-webkit script failed for me on Vista 64. A web search turned > + up this blog post with a patch that worked for me: > + http://www.nicholaswilson.me.uk/2010/04/hacking-webkit-fail/ > + > + https://bugs.webkit.org/show_bug.cgi?id=39296 I would move the bug URL line so that it appears after the "Reviewed by NOBODY (OOPS!)." line: > + > + * Scripts/webkitdirs.pm: > + > 2010-05-08 Robert Hogan <robert@roberthogan.net> > > Reviewed by Simon Hausmann. > diff --git a/WebKitTools/Scripts/webkitdirs.pm b/WebKitTools/Scripts/webkitdirs.pm > index c512009ecdecd2f9b6c8fc9e82665a2144b0614e..648bce19bdd8233007d97a5abc24e1d82440d03e 100644 > --- a/WebKitTools/Scripts/webkitdirs.pm > +++ b/WebKitTools/Scripts/webkitdirs.pm > @@ -1051,9 +1051,14 @@ sub setupCygwinEnv() > > sub dieIfWindowsPlatformSDKNotInstalled > { > - my $windowsPlatformSDKRegistryEntry = "/proc/registry/HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/MicrosoftSDK/InstalledSDKs/D2FF9F89-8AA2-4373-8A31-C838BF4DBBE1"; > - > - return if -e $windowsPlatformSDKRegistryEntry; > + my $registry32 = "/proc/registry"; > + my $registry64 = "/proc/registry64"; The names of these variables seem a bit vague, maybe rename them to $registry32Path, $registry64Path? I would append "/" to the end of both of these values then remove the "/" at the beginning of the value for $windowsPlatformSDKRegistryEntry so that $windowsPlatformSDKRegistryEntry better resembles a Windows registry path when we print it in the error message "Cannot find ...." > + my $windowsPlatformSDKRegistryEntry = "/HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/MicrosoftSDK/InstalledSDKs/D2FF9F89-8AA2-4373-8A31-C838BF4DBBE1"; As aforementioned, I would remove the leading "/" in the value for $windowsPlatformSDKRegistryEntry. > + > + # FIXME It would be better to detect if this is a 64-bit Windows build > + # and only check the appropriate entry. But for now we just blindly check > + # both. > + return if (-e $registry32 . $windowsPlatformSDKRegistryEntry) || (-e $registry64 . $windowsPlatformSDKRegistryEntry); > > print "*************************************************************\n"; > print "Cannot find '$windowsPlatformSDKRegistryEntry'.\n"; Since we are no longer using a fixed file system path, I would suggest changing the error message line to read: print "Cannot find registry entry '$windowsPlatformSDKRegistryEntry'.\n"; r=me. 228072 7 56535 tonyg 2010-05-19 16:54:32 -0700 Created attachment 56535 Patch 228076 8 tonyg 2010-05-19 16:58:17 -0700 (In reply to comment #6) > (From update of attachment 56499 [details]) > Thanks for going back and creating a new patch. I have some minor nits: > > > diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog > > index 4f06670e4bcfa8824b6e9034642e578ba69ceb0a..f7afb31e53adb55d7c10e2d9549493a78f2c84a4 100644 > > --- a/WebKitTools/ChangeLog > > +++ b/WebKitTools/ChangeLog > > @@ -1,3 +1,17 @@ > > +2010-05-18 Tony Gentilcore <tonyg@chromium.org> > > + > > + Reviewed by NOBODY (OOPS!). > > + > > + Look in registry64 for Platform SDK. > > I would change this to read "Look in /proc/registry64 for the Platform SDK on 64-bit Windows." Done. > > > + > > + The build-webkit script failed for me on Vista 64. A web search turned > > + up this blog post with a patch that worked for me: > > + http://www.nicholaswilson.me.uk/2010/04/hacking-webkit-fail/ > > + > > + https://bugs.webkit.org/show_bug.cgi?id=39296 > > I would move the bug URL line so that it appears after the "Reviewed by NOBODY (OOPS!)." line: > The prepare-ChangeLog script puts the description before the bug URLs. The majority of ChangeLog entries seem to follow that pattern as well. Can you explain the rationale? > > + > > + * Scripts/webkitdirs.pm: > > + > > 2010-05-08 Robert Hogan <robert@roberthogan.net> > > > > Reviewed by Simon Hausmann. > > diff --git a/WebKitTools/Scripts/webkitdirs.pm b/WebKitTools/Scripts/webkitdirs.pm > > index c512009ecdecd2f9b6c8fc9e82665a2144b0614e..648bce19bdd8233007d97a5abc24e1d82440d03e 100644 > > --- a/WebKitTools/Scripts/webkitdirs.pm > > +++ b/WebKitTools/Scripts/webkitdirs.pm > > @@ -1051,9 +1051,14 @@ sub setupCygwinEnv() > > > > sub dieIfWindowsPlatformSDKNotInstalled > > { > > - my $windowsPlatformSDKRegistryEntry = "/proc/registry/HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/MicrosoftSDK/InstalledSDKs/D2FF9F89-8AA2-4373-8A31-C838BF4DBBE1"; > > - > > - return if -e $windowsPlatformSDKRegistryEntry; > > + my $registry32 = "/proc/registry"; > > + my $registry64 = "/proc/registry64"; > > The names of these variables seem a bit vague, maybe rename them to $registry32Path, $registry64Path? Done. > > I would append "/" to the end of both of these values then remove the "/" at the beginning of the value for $windowsPlatformSDKRegistryEntry so that $windowsPlatformSDKRegistryEntry better resembles a Windows registry path when we print it in the error message "Cannot find ...." > > > + my $windowsPlatformSDKRegistryEntry = "/HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/MicrosoftSDK/InstalledSDKs/D2FF9F89-8AA2-4373-8A31-C838BF4DBBE1"; > > As aforementioned, I would remove the leading "/" in the value for $windowsPlatformSDKRegistryEntry. > Done. > > + > > + # FIXME It would be better to detect if this is a 64-bit Windows build > > + # and only check the appropriate entry. But for now we just blindly check > > + # both. > > + return if (-e $registry32 . $windowsPlatformSDKRegistryEntry) || (-e $registry64 . $windowsPlatformSDKRegistryEntry); > > > > print "*************************************************************\n"; > > print "Cannot find '$windowsPlatformSDKRegistryEntry'.\n"; > > Since we are no longer using a fixed file system path, I would suggest changing the error message line to read: > > print "Cannot find registry entry '$windowsPlatformSDKRegistryEntry'.\n"; > Done. > r=me. 228116 9 56535 dbates 2010-05-19 17:58:46 -0700 Comment on attachment 56535 Patch > - return if -e $windowsPlatformSDKRegistryEntry; > + # FIXME It would be better to detect if this is a 64-bit Windows build > + # and only check the appropriate entry. But for now we just blindly check > + # both. You are missing a ':' after FIXME in the comment, which is necessary for some editors, such as Xcode, to notice that this is a special comment. Since the last line of this comment is only one word, I would suggest collapsing it into the second line and push the word "and" (at the start of the second line) into the first line so that the two lines are roughly the same size. Also, I think it might be a bit clearer to write the first sentence as "It would be better to detect whether we are using 32-bit or 64-bit Windows ...": # FIXME: It would be better to detect whether we are using 32- or 64-bit Windows # and only check the appropriate entry. But for now we just blindly check both. 228117 10 dbates 2010-05-19 17:59:59 -0700 I inadvertently left this out of my last comment. (In reply to comment #8) > (In reply to comment #6) > > The prepare-ChangeLog script puts the description before the bug URLs. The majority of ChangeLog entries seem to follow that pattern as well. Can you explain the rationale? > The rationale is that someone does not have to read through the entire description to find the bug URL. From my understanding of <http://webkit.org/coding/contributing.html#changelogs>, and the example it references <http://trac.webkit.org/changeset/43259> the order is bug name, bug URL, then bug description. A more recent example of this ordering is change-set 59798: <http://trac.webkit.org/changeset/59798>. 228121 11 dbates 2010-05-19 18:07:07 -0700 (In reply to comment #10) > I inadvertently left this out of my last comment. > > (In reply to comment #8) > > (In reply to comment #6) > > > > The prepare-ChangeLog script puts the description before the bug URLs. The majority of ChangeLog entries seem to follow that pattern as well. Can you explain the rationale? > > > > The rationale is that someone does not have to read through the entire description to find the bug URL. > > From my understanding of <http://webkit.org/coding/contributing.html#changelogs>, and the example it references <http://trac.webkit.org/changeset/43259> the order is bug name, bug URL, then bug description. A more recent example of this ordering is change-set 59798: <http://trac.webkit.org/changeset/59798>. I meant "description", not "bug description", as the description in the change log does not need (and probably should not be) to be a verbatim copy of the description in the bug. 228122 12 56543 tonyg 2010-05-19 18:12:08 -0700 Created attachment 56543 Patch 228123 13 tonyg 2010-05-19 18:13:03 -0700 (In reply to comment #9) > (From update of attachment 56535 [details]) > > - return if -e $windowsPlatformSDKRegistryEntry; > > + # FIXME It would be better to detect if this is a 64-bit Windows build > > + # and only check the appropriate entry. But for now we just blindly check > > + # both. > > You are missing a ':' after FIXME in the comment, which is necessary for some editors, such as Xcode, to notice that this is a special comment. > > Since the last line of this comment is only one word, I would suggest collapsing it into the second line and push the word "and" (at the start of the second line) into the first line so that the two lines are roughly the same size. > > Also, I think it might be a bit clearer to write the first sentence as "It would be better to detect whether we are using 32-bit or 64-bit Windows ...": > > # FIXME: It would be better to detect whether we are using 32- or 64-bit Windows > # and only check the appropriate entry. But for now we just blindly check both. Done. 228125 14 tonyg 2010-05-19 18:13:44 -0700 (In reply to comment #11) > (In reply to comment #10) > > I inadvertently left this out of my last comment. > > > > (In reply to comment #8) > > > (In reply to comment #6) > > > > > > The prepare-ChangeLog script puts the description before the bug URLs. The majority of ChangeLog entries seem to follow that pattern as well. Can you explain the rationale? > > > > > > > The rationale is that someone does not have to read through the entire description to find the bug URL. > > > > From my understanding of <http://webkit.org/coding/contributing.html#changelogs>, and the example it references <http://trac.webkit.org/changeset/43259> the order is bug name, bug URL, then bug description. A more recent example of this ordering is change-set 59798: <http://trac.webkit.org/changeset/59798>. > > I meant "description", not "bug description", as the description in the change log does not need (and probably should not be) to be a verbatim copy of the description in the bug. Ah, that makes sense to me now, thanks for the explanation. Fixed. 228159 15 56543 dbates 2010-05-19 20:42:50 -0700 Comment on attachment 56543 Patch Thanks Tony. Looks good to me. 228721 16 56543 commit-queue 2010-05-20 20:43:07 -0700 Comment on attachment 56543 Patch Clearing flags on attachment: 56543 Committed r59906: <http://trac.webkit.org/changeset/59906> 228722 17 commit-queue 2010-05-20 20:43:12 -0700 All reviewed patches have been landed. Closing bug. 56383 2010-05-18 09:20:46 -0700 2010-05-19 10:37:05 -0700 Patch bug-39296-20100518092045.patch text/plain 2153 tonyg ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxv ZwppbmRleCA1ODE1MmZiOGQ5MjljYmU3YWExOGEzYmUwYWIzOGMzNTBiMzFkNWNkLi40MzkyMTFk ZDQyYzFmMjA4MWJiZTI5MzQ3MDUwM2MwZTE5MTlkMjYzIDEwMDY0NAotLS0gYS9XZWJLaXRUb29s cy9DaGFuZ2VMb2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTcgQEAK KzIwMTAtMDUtMTggIFRvbnkgR2VudGlsY29yZSAgPHRvbnlnQGNocm9taXVtLm9yZz4KKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBMb29rIGluIHJlZ2lz dHJ5NjQgZm9yIFBsYXRmb3JtIFNESy4KKworICAgICAgICBUaGUgYnVpbGQtd2Via2l0IHNjcmlw dCBmYWlsZWQgZm9yIG1lIG9uIFZpc3RhIDY0LiBBIHdlYiBzZWFyY2ggdHVybmVkCisgICAgICAg IHVwIHRoaXMgYmxvZyBwb3N0IHdpdGggYSBwYXRjaCB0aGF0IHdvcmtlZCBmb3IgbWU6CisgICAg ICAgIGh0dHA6Ly93d3cubmljaG9sYXN3aWxzb24ubWUudWsvMjAxMC8wNC9oYWNraW5nLXdlYmtp dC1mYWlsLworCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD0zOTI5NgorCisgICAgICAgICogU2NyaXB0cy93ZWJraXRkaXJzLnBtOgorCiAyMDEwLTA1LTEw ICBSb2RyaWdvIEJlbGVtICA8cm9kcmlnby5iZWxlbUBvcGVuYm9zc2Eub3JnPgogCiAgICAgICAg IFJldmlld2VkIGJ5IEtlbm5ldGggQ2hyaXN0aWFuc2VuICwgU2ltb24gSGF1c21hbm4gYW5kIEd1 c3Rhdm8gTm9yb25oYS4KZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0ZGly cy5wbSBiL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0ZGlycy5wbQppbmRleCA2MTNjMTMxMDE5 YzdkNzZmNDY2ZmEyOWNkZjcwODAzZmQ4MjRhZGRmLi40NzRlNGRkODZkZTU5Yjk3MmE3Y2FmNzU1 MjhhZDZjMDQzNDE4ZDAyIDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdGRp cnMucG0KKysrIGIvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRkaXJzLnBtCkBAIC0xMDUyLDEx ICsxMDUyLDEzIEBAIHN1YiBzZXR1cEN5Z3dpbkVudigpCiBzdWIgZGllSWZXaW5kb3dzUGxhdGZv cm1TREtOb3RJbnN0YWxsZWQKIHsKICAgICBteSAkd2luZG93c1BsYXRmb3JtU0RLUmVnaXN0cnlF bnRyeSA9ICIvcHJvYy9yZWdpc3RyeS9IS0VZX0xPQ0FMX01BQ0hJTkUvU09GVFdBUkUvTWljcm9z b2Z0L01pY3Jvc29mdFNESy9JbnN0YWxsZWRTREtzL0QyRkY5Rjg5LThBQTItNDM3My04QTMxLUM4 MzhCRjREQkJFMSI7CisgICAgbXkgJHdpbmRvd3M2NFBsYXRmb3JtU0RLUmVnaXN0cnlFbnRyeSA9 ICIvcHJvYy9yZWdpc3RyeTY0L0hLRVlfTE9DQUxfTUFDSElORS9TT0ZUV0FSRS9NaWNyb3NvZnQv TWljcm9zb2Z0U0RLL0luc3RhbGxlZFNES3MvRDJGRjlGODktOEFBMi00MzczLThBMzEtQzgzOEJG NERCQkUxIjsKIAotICAgIHJldHVybiBpZiAtZSAkd2luZG93c1BsYXRmb3JtU0RLUmVnaXN0cnlF bnRyeTsKKyAgICByZXR1cm4gaWYgKCgtZSAkd2luZG93c1BsYXRmb3JtU0RLUmVnaXN0cnlFbnRy eSkgfHwgKC1lICR3aW5kb3dzNjRQbGF0Zm9ybVNES1JlZ2lzdHJ5RW50cnkpKTsKIAogICAgIHBy aW50ICIqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq KioqKioqKioqXG4iOwotICAgIHByaW50ICJDYW5ub3QgZmluZCAnJHdpbmRvd3NQbGF0Zm9ybVNE S1JlZ2lzdHJ5RW50cnknLlxuIjsKKyAgICBwcmludCAiQ2Fubm90IGZpbmQgJyR3aW5kb3dzUGxh dGZvcm1TREtSZWdpc3RyeUVudHJ5JyBvciAiOworICAgIHByaW50ICInJHdpbmRvd3M2NFBsYXRm b3JtU0RLUmVnaXN0cnlFbnRyeScuXG4iOwogICAgIHByaW50ICJQbGVhc2UgZG93bmxvYWQgYW5k IGluc3RhbGwgdGhlIE1pY3Jvc29mdCBXaW5kb3dzIFNlcnZlciAyMDAzIFIyXG4iOwogICAgIHBy aW50ICJQbGF0Zm9ybSBTREsgZnJvbSA8aHR0cDovL3d3dy5taWNyb3NvZnQuY29tL2Rvd25sb2Fk cy9kZXRhaWxzLmFzcHg/XG4iOwogICAgIHByaW50ICJmYW1pbHlpZD0wYmFmMmIzNS1jNjU2LTQ5 NjktYWNlOC1lNGMwYzA3MTZhZGImZGlzcGxheWxhbmc9ZW4+LlxuXG4iOwo= 56499 2010-05-19 10:37:09 -0700 2010-05-19 16:54:28 -0700 Patch bug-39296-20100519103707.patch text/plain 1998 tonyg ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxv ZwppbmRleCA0ZjA2NjcwZTRiY2ZhODgyNGI2ZTkwMzQ2NDJlNTc4YmE2OWNlYjBhLi5mN2FmYjMx ZTUzYWRiNTVkN2MxMGUyZDk1NDk0OTNhNzhmMmM4NGE0IDEwMDY0NAotLS0gYS9XZWJLaXRUb29s cy9DaGFuZ2VMb2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTcgQEAK KzIwMTAtMDUtMTggIFRvbnkgR2VudGlsY29yZSAgPHRvbnlnQGNocm9taXVtLm9yZz4KKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBMb29rIGluIHJlZ2lz dHJ5NjQgZm9yIFBsYXRmb3JtIFNESy4KKworICAgICAgICBUaGUgYnVpbGQtd2Via2l0IHNjcmlw dCBmYWlsZWQgZm9yIG1lIG9uIFZpc3RhIDY0LiBBIHdlYiBzZWFyY2ggdHVybmVkCisgICAgICAg IHVwIHRoaXMgYmxvZyBwb3N0IHdpdGggYSBwYXRjaCB0aGF0IHdvcmtlZCBmb3IgbWU6CisgICAg ICAgIGh0dHA6Ly93d3cubmljaG9sYXN3aWxzb24ubWUudWsvMjAxMC8wNC9oYWNraW5nLXdlYmtp dC1mYWlsLworCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD0zOTI5NgorCisgICAgICAgICogU2NyaXB0cy93ZWJraXRkaXJzLnBtOgorCiAyMDEwLTA1LTA4 ICBSb2JlcnQgSG9nYW4gIDxyb2JlcnRAcm9iZXJ0aG9nYW4ubmV0PgogCiAgICAgICAgIFJldmll d2VkIGJ5IFNpbW9uIEhhdXNtYW5uLgpkaWZmIC0tZ2l0IGEvV2ViS2l0VG9vbHMvU2NyaXB0cy93 ZWJraXRkaXJzLnBtIGIvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRkaXJzLnBtCmluZGV4IGM1 MTIwMDllY2RlY2QyZjliNmM4ZmM5ZTgyNjY1YTIxNDRiMDYxNGUuLjY0OGJjZTE5YmRkODIzMzAw N2Q5N2E1YWJjMjRlMWQ4MjQ0MGQwM2UgMTAwNjQ0Ci0tLSBhL1dlYktpdFRvb2xzL1NjcmlwdHMv d2Via2l0ZGlycy5wbQorKysgYi9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdGRpcnMucG0KQEAg LTEwNTEsOSArMTA1MSwxNCBAQCBzdWIgc2V0dXBDeWd3aW5FbnYoKQogCiBzdWIgZGllSWZXaW5k b3dzUGxhdGZvcm1TREtOb3RJbnN0YWxsZWQKIHsKLSAgICBteSAkd2luZG93c1BsYXRmb3JtU0RL UmVnaXN0cnlFbnRyeSA9ICIvcHJvYy9yZWdpc3RyeS9IS0VZX0xPQ0FMX01BQ0hJTkUvU09GVFdB UkUvTWljcm9zb2Z0L01pY3Jvc29mdFNESy9JbnN0YWxsZWRTREtzL0QyRkY5Rjg5LThBQTItNDM3 My04QTMxLUM4MzhCRjREQkJFMSI7Ci0KLSAgICByZXR1cm4gaWYgLWUgJHdpbmRvd3NQbGF0Zm9y bVNES1JlZ2lzdHJ5RW50cnk7CisgICAgbXkgJHJlZ2lzdHJ5MzIgPSAiL3Byb2MvcmVnaXN0cnki OworICAgIG15ICRyZWdpc3RyeTY0ID0gIi9wcm9jL3JlZ2lzdHJ5NjQiOworICAgIG15ICR3aW5k b3dzUGxhdGZvcm1TREtSZWdpc3RyeUVudHJ5ID0gIi9IS0VZX0xPQ0FMX01BQ0hJTkUvU09GVFdB UkUvTWljcm9zb2Z0L01pY3Jvc29mdFNESy9JbnN0YWxsZWRTREtzL0QyRkY5Rjg5LThBQTItNDM3 My04QTMxLUM4MzhCRjREQkJFMSI7CisKKyAgICAjIEZJWE1FIEl0IHdvdWxkIGJlIGJldHRlciB0 byBkZXRlY3QgaWYgdGhpcyBpcyBhIDY0LWJpdCBXaW5kb3dzIGJ1aWxkCisgICAgIyBhbmQgb25s eSBjaGVjayB0aGUgYXBwcm9wcmlhdGUgZW50cnkuIEJ1dCBmb3Igbm93IHdlIGp1c3QgYmxpbmRs eSBjaGVjaworICAgICMgYm90aC4KKyAgICByZXR1cm4gaWYgKC1lICRyZWdpc3RyeTMyIC4gJHdp bmRvd3NQbGF0Zm9ybVNES1JlZ2lzdHJ5RW50cnkpIHx8ICgtZSAkcmVnaXN0cnk2NCAuICR3aW5k b3dzUGxhdGZvcm1TREtSZWdpc3RyeUVudHJ5KTsKIAogICAgIHByaW50ICIqKioqKioqKioqKioq KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqXG4iOwogICAg IHByaW50ICJDYW5ub3QgZmluZCAnJHdpbmRvd3NQbGF0Zm9ybVNES1JlZ2lzdHJ5RW50cnknLlxu IjsK 56535 2010-05-19 16:54:32 -0700 2010-05-19 18:12:04 -0700 Patch bug-39296-20100519165431.patch text/plain 2367 tonyg ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxv ZwppbmRleCA0ZjA2NjcwZTRiY2ZhODgyNGI2ZTkwMzQ2NDJlNTc4YmE2OWNlYjBhLi5lZGU3YjY4 YTM0NTE1M2Y1ZjNmNGYxMGExZjJiMGE5OWYwNzJlMzc0IDEwMDY0NAotLS0gYS9XZWJLaXRUb29s cy9DaGFuZ2VMb2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTcgQEAK KzIwMTAtMDUtMTggIFRvbnkgR2VudGlsY29yZSAgPHRvbnlnQGNocm9taXVtLm9yZz4KKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBMb29rIGluIC9wcm9j L3JlZ2lzdHJ5NjQgZm9yIHRoZSBQbGF0Zm9ybSBTREsgb24gNjQtYml0IFdpbmRvd3MuCisKKyAg ICAgICAgVGhlIGJ1aWxkLXdlYmtpdCBzY3JpcHQgZmFpbGVkIGZvciBtZSBvbiBWaXN0YSA2NC4g QSB3ZWIgc2VhcmNoIHR1cm5lZAorICAgICAgICB1cCB0aGlzIGJsb2cgcG9zdCB3aXRoIGEgcGF0 Y2ggdGhhdCB3b3JrZWQgZm9yIG1lOgorICAgICAgICBodHRwOi8vd3d3Lm5pY2hvbGFzd2lsc29u Lm1lLnVrLzIwMTAvMDQvaGFja2luZy13ZWJraXQtZmFpbC8KKworICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MzkyOTYKKworICAgICAgICAqIFNjcmlwdHMv d2Via2l0ZGlycy5wbToKKwogMjAxMC0wNS0wOCAgUm9iZXJ0IEhvZ2FuICA8cm9iZXJ0QHJvYmVy dGhvZ2FuLm5ldD4KIAogICAgICAgICBSZXZpZXdlZCBieSBTaW1vbiBIYXVzbWFubi4KZGlmZiAt LWdpdCBhL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0ZGlycy5wbSBiL1dlYktpdFRvb2xzL1Nj cmlwdHMvd2Via2l0ZGlycy5wbQppbmRleCBjNTEyMDA5ZWNkZWNkMmY5YjZjOGZjOWU4MjY2NWEy MTQ0YjA2MTRlLi40ZjA4ZjIwOGUyOTg5ZWIwMTAyYTg5YjI2ZGUxMTMyYjlkNzkwMTNkIDEwMDY0 NAotLS0gYS9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdGRpcnMucG0KKysrIGIvV2ViS2l0VG9v bHMvU2NyaXB0cy93ZWJraXRkaXJzLnBtCkBAIC0xMDUxLDEyICsxMDUxLDE3IEBAIHN1YiBzZXR1 cEN5Z3dpbkVudigpCiAKIHN1YiBkaWVJZldpbmRvd3NQbGF0Zm9ybVNES05vdEluc3RhbGxlZAog ewotICAgIG15ICR3aW5kb3dzUGxhdGZvcm1TREtSZWdpc3RyeUVudHJ5ID0gIi9wcm9jL3JlZ2lz dHJ5L0hLRVlfTE9DQUxfTUFDSElORS9TT0ZUV0FSRS9NaWNyb3NvZnQvTWljcm9zb2Z0U0RLL0lu c3RhbGxlZFNES3MvRDJGRjlGODktOEFBMi00MzczLThBMzEtQzgzOEJGNERCQkUxIjsKKyAgICBt eSAkcmVnaXN0cnkzMlBhdGggPSAiL3Byb2MvcmVnaXN0cnkvIjsKKyAgICBteSAkcmVnaXN0cnk2 NFBhdGggPSAiL3Byb2MvcmVnaXN0cnk2NC8iOworICAgIG15ICR3aW5kb3dzUGxhdGZvcm1TREtS ZWdpc3RyeUVudHJ5ID0gIkhLRVlfTE9DQUxfTUFDSElORS9TT0ZUV0FSRS9NaWNyb3NvZnQvTWlj cm9zb2Z0U0RLL0luc3RhbGxlZFNES3MvRDJGRjlGODktOEFBMi00MzczLThBMzEtQzgzOEJGNERC QkUxIjsKIAotICAgIHJldHVybiBpZiAtZSAkd2luZG93c1BsYXRmb3JtU0RLUmVnaXN0cnlFbnRy eTsKKyAgICAjIEZJWE1FIEl0IHdvdWxkIGJlIGJldHRlciB0byBkZXRlY3QgaWYgdGhpcyBpcyBh IDY0LWJpdCBXaW5kb3dzIGJ1aWxkCisgICAgIyBhbmQgb25seSBjaGVjayB0aGUgYXBwcm9wcmlh dGUgZW50cnkuIEJ1dCBmb3Igbm93IHdlIGp1c3QgYmxpbmRseSBjaGVjaworICAgICMgYm90aC4K KyAgICByZXR1cm4gaWYgKC1lICRyZWdpc3RyeTMyUGF0aCAuICR3aW5kb3dzUGxhdGZvcm1TREtS ZWdpc3RyeUVudHJ5KSB8fCAoLWUgJHJlZ2lzdHJ5NjRQYXRoIC4gJHdpbmRvd3NQbGF0Zm9ybVNE S1JlZ2lzdHJ5RW50cnkpOwogCiAgICAgcHJpbnQgIioqKioqKioqKioqKioqKioqKioqKioqKioq KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKipcbiI7Ci0gICAgcHJpbnQgIkNhbm5v dCBmaW5kICckd2luZG93c1BsYXRmb3JtU0RLUmVnaXN0cnlFbnRyeScuXG4iOworICAgIHByaW50 ICJDYW5ub3QgZmluZCByZWdpc3RyeSBlbnRyeSAnJHdpbmRvd3NQbGF0Zm9ybVNES1JlZ2lzdHJ5 RW50cnknLlxuIjsKICAgICBwcmludCAiUGxlYXNlIGRvd25sb2FkIGFuZCBpbnN0YWxsIHRoZSBN aWNyb3NvZnQgV2luZG93cyBTZXJ2ZXIgMjAwMyBSMlxuIjsKICAgICBwcmludCAiUGxhdGZvcm0g U0RLIGZyb20gPGh0dHA6Ly93d3cubWljcm9zb2Z0LmNvbS9kb3dubG9hZHMvZGV0YWlscy5hc3B4 P1xuIjsKICAgICBwcmludCAiZmFtaWx5aWQ9MGJhZjJiMzUtYzY1Ni00OTY5LWFjZTgtZTRjMGMw NzE2YWRiJmRpc3BsYXlsYW5nPWVuPi5cblxuIjsK 56543 2010-05-19 18:12:08 -0700 2010-05-20 20:43:07 -0700 Patch bug-39296-20100519181207.patch text/plain 2360 tonyg ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxv ZwppbmRleCBiZWU1MWU5M2Y2NGMzYWFiZDIwZmUyYWU2YzlhMzUyZGY3MDAzOGUwLi5kMzEwODQ0 ZDdlNTNkYTZiMDUyZGYzYTk0OGY4NTYzYTBhYzdhYzRmIDEwMDY0NAotLS0gYS9XZWJLaXRUb29s cy9DaGFuZ2VMb2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTYgQEAK KzIwMTAtMDUtMTggIFRvbnkgR2VudGlsY29yZSAgPHRvbnlnQGNocm9taXVtLm9yZz4KKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBMb29rIGluIC9wcm9j L3JlZ2lzdHJ5NjQgZm9yIHRoZSBQbGF0Zm9ybSBTREsgb24gNjQtYml0IFdpbmRvd3MuCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0zOTI5NgorCisgICAg ICAgIFRoZSBidWlsZC13ZWJraXQgc2NyaXB0IGZhaWxlZCBmb3IgbWUgb24gVmlzdGEgNjQuIEEg d2ViIHNlYXJjaCB0dXJuZWQKKyAgICAgICAgdXAgdGhpcyBibG9nIHBvc3Qgd2l0aCBhIHBhdGNo IHRoYXQgd29ya2VkIGZvciBtZToKKyAgICAgICAgaHR0cDovL3d3dy5uaWNob2xhc3dpbHNvbi5t ZS51ay8yMDEwLzA0L2hhY2tpbmctd2Via2l0LWZhaWwvCisKKyAgICAgICAgKiBTY3JpcHRzL3dl YmtpdGRpcnMucG06CisKIDIwMTAtMDUtMTkgIERpcmsgUHJhbmtlICA8ZHByYW5rZUBjaHJvbWl1 bS5vcmc+CiAKICAgICAgICAgVW5yZXZpZXdlZCwgYnVpbGQgZml4LgpkaWZmIC0tZ2l0IGEvV2Vi S2l0VG9vbHMvU2NyaXB0cy93ZWJraXRkaXJzLnBtIGIvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJr aXRkaXJzLnBtCmluZGV4IGM1MTIwMDllY2RlY2QyZjliNmM4ZmM5ZTgyNjY1YTIxNDRiMDYxNGUu LmNhMTc3NTdmN2RiZmU5NmU2Mzk0MTYyOGFkMTlhNGRhNTM5MTAzNDMgMTAwNjQ0Ci0tLSBhL1dl YktpdFRvb2xzL1NjcmlwdHMvd2Via2l0ZGlycy5wbQorKysgYi9XZWJLaXRUb29scy9TY3JpcHRz L3dlYmtpdGRpcnMucG0KQEAgLTEwNTEsMTIgKzEwNTEsMTYgQEAgc3ViIHNldHVwQ3lnd2luRW52 KCkKIAogc3ViIGRpZUlmV2luZG93c1BsYXRmb3JtU0RLTm90SW5zdGFsbGVkCiB7Ci0gICAgbXkg JHdpbmRvd3NQbGF0Zm9ybVNES1JlZ2lzdHJ5RW50cnkgPSAiL3Byb2MvcmVnaXN0cnkvSEtFWV9M T0NBTF9NQUNISU5FL1NPRlRXQVJFL01pY3Jvc29mdC9NaWNyb3NvZnRTREsvSW5zdGFsbGVkU0RL cy9EMkZGOUY4OS04QUEyLTQzNzMtOEEzMS1DODM4QkY0REJCRTEiOworICAgIG15ICRyZWdpc3Ry eTMyUGF0aCA9ICIvcHJvYy9yZWdpc3RyeS8iOworICAgIG15ICRyZWdpc3RyeTY0UGF0aCA9ICIv cHJvYy9yZWdpc3RyeTY0LyI7CisgICAgbXkgJHdpbmRvd3NQbGF0Zm9ybVNES1JlZ2lzdHJ5RW50 cnkgPSAiSEtFWV9MT0NBTF9NQUNISU5FL1NPRlRXQVJFL01pY3Jvc29mdC9NaWNyb3NvZnRTREsv SW5zdGFsbGVkU0RLcy9EMkZGOUY4OS04QUEyLTQzNzMtOEEzMS1DODM4QkY0REJCRTEiOwogCi0g ICAgcmV0dXJuIGlmIC1lICR3aW5kb3dzUGxhdGZvcm1TREtSZWdpc3RyeUVudHJ5OworICAgICMg RklYTUU6IEl0IHdvdWxkIGJlIGJldHRlciB0byBkZXRlY3Qgd2hldGhlciB3ZSBhcmUgdXNpbmcg MzItIG9yIDY0LWJpdCBXaW5kb3dzCisgICAgIyBhbmQgb25seSBjaGVjayB0aGUgYXBwcm9wcmlh dGUgZW50cnkuIEJ1dCBmb3Igbm93IHdlIGp1c3QgYmxpbmRseSBjaGVjayBib3RoLgorICAgIHJl dHVybiBpZiAoLWUgJHJlZ2lzdHJ5MzJQYXRoIC4gJHdpbmRvd3NQbGF0Zm9ybVNES1JlZ2lzdHJ5 RW50cnkpIHx8ICgtZSAkcmVnaXN0cnk2NFBhdGggLiAkd2luZG93c1BsYXRmb3JtU0RLUmVnaXN0 cnlFbnRyeSk7CiAKICAgICBwcmludCAiKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq KioqKioqKioqKioqKioqKioqKioqKioqKioqKlxuIjsKLSAgICBwcmludCAiQ2Fubm90IGZpbmQg JyR3aW5kb3dzUGxhdGZvcm1TREtSZWdpc3RyeUVudHJ5Jy5cbiI7CisgICAgcHJpbnQgIkNhbm5v dCBmaW5kIHJlZ2lzdHJ5IGVudHJ5ICckd2luZG93c1BsYXRmb3JtU0RLUmVnaXN0cnlFbnRyeScu XG4iOwogICAgIHByaW50ICJQbGVhc2UgZG93bmxvYWQgYW5kIGluc3RhbGwgdGhlIE1pY3Jvc29m dCBXaW5kb3dzIFNlcnZlciAyMDAzIFIyXG4iOwogICAgIHByaW50ICJQbGF0Zm9ybSBTREsgZnJv bSA8aHR0cDovL3d3dy5taWNyb3NvZnQuY29tL2Rvd25sb2Fkcy9kZXRhaWxzLmFzcHg/XG4iOwog ICAgIHByaW50ICJmYW1pbHlpZD0wYmFmMmIzNS1jNjU2LTQ5NjktYWNlOC1lNGMwYzA3MTZhZGIm ZGlzcGxheWxhbmc9ZW4+LlxuXG4iOwo=