27619 2009-07-23 12:51:12 -0700 Switch wx to using waf for builds 2009-09-02 08:55:31 -0700 1 1 1 Unclassified WebKit WebKit wx 528+ (Nightly build) All All RESOLVED FIXED Wx P2 Normal --- 1 kevino webkit-unassigned abarth christian jmalonzo mrowe oldest_to_newest 134207 0 kevino 2009-07-23 12:51:12 -0700 The Bakefile system is currently broken in trunk and after a series of problems I've decided to switch over waf, a Python-based build system. 134260 1 33374 kevino 2009-07-23 14:27:06 -0700 Created attachment 33374 Changes to build-webkit needed for wx to use the waf build process 134261 2 33375 kevino 2009-07-23 14:31:36 -0700 Created attachment 33375 Fix for when running DerivedSources.make from a subdir of JSCore 134342 3 33399 kevino 2009-07-23 18:28:21 -0700 Created attachment 33399 Helper scripts for the waf build. 134343 4 33400 kevino 2009-07-23 18:32:47 -0700 Created attachment 33400 JSCore waf build script 134345 5 33401 kevino 2009-07-23 18:52:37 -0700 Created attachment 33401 WebKit waf build script for wx 134346 6 33402 kevino 2009-07-23 18:57:06 -0700 Created attachment 33402 wxBrowser waf build script 136390 7 33374 jmalonzo 2009-07-31 21:44:03 -0700 Comment on attachment 33374 Changes to build-webkit needed for wx to use the waf build process > + # get / update waf if needed > + my $waf = 'WebKitTools/wx/waf'; > + my $wafURL = 'http://wxwebkit.wxcommunity.com/downloads/deps/waf'; > + if (!-f $waf) { > + my $result = system "curl -o $waf $wafURL"; > + chmod 0755, $waf; > + } Is downloading waf easier for wx instead of just making it a dependency? > @@ -323,6 +340,16 @@ > if ($dir eq "WebKit") { > $result = buildVisualStudioProject("win/WebKit.vcproj/WebKit.sln", $clean); > } > + } elsif (isWx()) { > + @options = (); > + if (defined($makeArgs)) { > + @options = split(/ /, $makeArgs); > + } > + if ($dir eq "WebKit" && isWx()) { > + chdir 'wx' or die; Is there a reason why you're checking for isWx() twice? > + } > + > + $result = buildWafProject($dir, $clean, @options); > } > > if (exitStatus($result)) { > @@ -335,7 +362,7 @@ > } > exit exitStatus($result); > } > - chdir ".." or die; > + chdirWebKit(); Any reason for this change? > } > > # Don't report the "WebKit is now built" message after a clean operation. > @@ -349,7 +376,11 @@ > print "\n"; > print "===========================================================\n"; > print " WebKit is now built. To run $launcherName with this newly-built\n"; > -print " code, use the \"$launcherPath\" script.\n"; > +if (isWx()) { > + print " code, run \"$launcherPath\".\n"; > +} else { > + print " code, use the \"$launcherPath\" script.\n"; > +} I think you should just add --wx support to run-launcher so we can avoid conditionalizing this. > + } elsif (isWx()) { > + return productDir() . '/wxBrowser'; See my comment above to add --wx support to run-launcher. 136399 8 33399 jmalonzo 2009-07-31 22:08:18 -0700 Comment on attachment 33399 Helper scripts for the waf build. This patch uses mixed style in variables e.g., wx_foo and wxFoo. Patch looks sane enough otherwise. rs=me. 136400 9 33401 jmalonzo 2009-07-31 22:15:18 -0700 Comment on attachment 33401 WebKit waf build script for wx r=me. 136406 10 33375 jmalonzo 2009-07-31 22:26:30 -0700 Comment on attachment 33375 Fix for when running DerivedSources.make from a subdir of JSCore > docs/bytecode.html: make-bytecode-docs.pl Interpreter.cpp > - perl $^ $@ > + perl $^ $(JavaScriptCore)/$@ VPATH is already set to the appropriate directories so I don't see why you need this, and why it needs to apply to Interpreter.cpp only. Can you please attach the build log or the error you're getting here as well? r- for now because of this. 136408 11 33400 jmalonzo 2009-07-31 22:37:22 -0700 Comment on attachment 33400 JSCore waf build script r=me. 136494 12 kevino 2009-08-01 17:55:05 -0700 Hi Jan, First off, thanks for all your help on reviewing these patches! :-) (In reply to comment #7) > (From update of attachment 33374 [details]) > > + # get / update waf if needed > > + my $waf = 'WebKitTools/wx/waf'; > > + my $wafURL = 'http://wxwebkit.wxcommunity.com/downloads/deps/waf'; > > + if (!-f $waf) { > > + my $result = system "curl -o $waf $wafURL"; > > + chmod 0755, $waf; > > + } > > Is downloading waf easier for wx instead of just making it a dependency? Yes, I've found that the less steps that require user intervention, the less chance the user will run into issues. I've seen issues where people get the wrong version of Bakefile, get it from the wrong place, etc. Also issues where a system Bakefile isn't quite what the user needs, and so you end up with messy hacks to pick the right version. You never know how a user's system is configured, and sometimes they've got a lot of stuff they didn't even put there. So a script downloading the right version into the right place in the tree and using that is IMHO best. > > @@ -323,6 +340,16 @@ > > if ($dir eq "WebKit") { > > $result = buildVisualStudioProject("win/WebKit.vcproj/WebKit.sln", $clean); > > } > > + } elsif (isWx()) { > > + @options = (); > > + if (defined($makeArgs)) { > > + @options = split(/ /, $makeArgs); > > + } > > + if ($dir eq "WebKit" && isWx()) { > > + chdir 'wx' or die; > > Is there a reason why you're checking for isWx() twice? No, sorry, good catch. That code used to be outside the ifWx() block, and I forgot to remove the check when I moved the code. > > + } > > + > > + $result = buildWafProject($dir, $clean, @options); > > } > > > > if (exitStatus($result)) { > > @@ -335,7 +362,7 @@ > > } > > exit exitStatus($result); > > } > > - chdir ".." or die; > > + chdirWebKit(); > > Any reason for this change? Yes, it relates to the fact that some wx port projects can be in places like WebKit/wx, or even WebKit/wx/bindings/python. The code `chdir ".." or die` really intends to bring you back to the root of the WebKit tree, and it works for the current implementation only because the other ports the project dirs are all only one level below the root dir AFAICT. (e.g. <wk_root>/WebKit, rather than <wk_root>/WebKit/wx) > > } > > > > # Don't report the "WebKit is now built" message after a clean operation. > > @@ -349,7 +376,11 @@ > > print "\n"; > > print "===========================================================\n"; > > print " WebKit is now built. To run $launcherName with this newly-built\n"; > > -print " code, use the \"$launcherPath\" script.\n"; > > +if (isWx()) { > > + print " code, run \"$launcherPath\".\n"; > > +} else { > > + print " code, use the \"$launcherPath\" script.\n"; > > +} > > I think you should just add --wx support to run-launcher so we can avoid > conditionalizing this. Okay, I'll do it that way instead. Thanks. :-) > > + } elsif (isWx()) { > > + return productDir() . '/wxBrowser'; > > See my comment above to add --wx support to run-launcher. 136529 13 33399 abarth 2009-08-02 01:54:19 -0700 Comment on attachment 33399 Helper scripts for the waf build. Clearing review flag on attachment: 33399 Committing to http://svn.webkit.org/repository/webkit/trunk ... M WebKitTools/ChangeLog A WebKitTools/wx/build/build_utils.py A WebKitTools/wx/build/settings.py A WebKitTools/wx/build/waf_extensions.py A WebKitTools/wx/build/wxpresets.py Committed r46693 M WebKitTools/ChangeLog A WebKitTools/wx/build/waf_extensions.py A WebKitTools/wx/build/build_utils.py A WebKitTools/wx/build/settings.py A WebKitTools/wx/build/wxpresets.py r46693 = 5d1f2c818eb8e58baca38ad0ed89d7598b3f1038 (trunk) No changes between current HEAD and refs/remotes/trunk Resetting to the latest refs/remotes/trunk http://trac.webkit.org/changeset/46693 136530 14 33400 abarth 2009-08-02 01:54:34 -0700 Comment on attachment 33400 JSCore waf build script Clearing review flag on attachment: 33400 Committing to http://svn.webkit.org/repository/webkit/trunk ... M JavaScriptCore/ChangeLog A JavaScriptCore/wscript Committed r46694 M JavaScriptCore/ChangeLog A JavaScriptCore/wscript r46694 = 4d2041e813d90c6b9f590a36f2ee97ece82f6581 (trunk) No changes between current HEAD and refs/remotes/trunk Resetting to the latest refs/remotes/trunk http://trac.webkit.org/changeset/46694 136531 15 33401 abarth 2009-08-02 01:54:49 -0700 Comment on attachment 33401 WebKit waf build script for wx Clearing review flag on attachment: 33401 Committing to http://svn.webkit.org/repository/webkit/trunk ... M WebKit/wx/ChangeLog A WebKit/wx/wscript Committed r46695 M WebKit/wx/ChangeLog A WebKit/wx/wscript r46695 = f8f905ac392a85c8ceb60a7cc89a85019535edcf (trunk) No changes between current HEAD and refs/remotes/trunk Resetting to the latest refs/remotes/trunk http://trac.webkit.org/changeset/46695 136532 16 33402 abarth 2009-08-02 01:55:04 -0700 Comment on attachment 33402 wxBrowser waf build script Clearing review flag on attachment: 33402 Committing to http://svn.webkit.org/repository/webkit/trunk ... M WebKitTools/ChangeLog A WebKitTools/wx/browser/wscript Committed r46696 M WebKitTools/ChangeLog A WebKitTools/wx/browser/wscript r46696 = dc657c1ea8a2c643a040da386e95db966c6ba6a0 (trunk) No changes between current HEAD and refs/remotes/trunk Resetting to the latest refs/remotes/trunk http://trac.webkit.org/changeset/46696 136533 17 abarth 2009-08-02 01:55:08 -0700 All reviewed patches have been landed. Closing bug. 136534 18 abarth 2009-08-02 01:55:42 -0700 Silly bugzilla-tool. There's more work to do here. 136739 19 kevino 2009-08-03 12:24:48 -0700 (In reply to comment #10) > (From update of attachment 33375 [details]) > > docs/bytecode.html: make-bytecode-docs.pl Interpreter.cpp > > - perl $^ $@ > > + perl $^ $(JavaScriptCore)/$@ > > VPATH is already set to the appropriate directories so I don't see why you need > this, and why it needs to apply to Interpreter.cpp only. Can you please attach > the build log or the error you're getting here as well? > > r- for now because of this. I, along with other wx port users, are getting output like this: perl /Users/kevino/oss/webkit-commit/WebKit/JavaScriptCore/docs/make-bytecode-docs.pl /Users/kevino/oss/webkit-commit/WebKit/JavaScriptCore/interpreter/Interpreter.cpp docs/bytecode.html print() on closed filehandle OUTPUT at /Users/kevino/oss/webkit-commit/WebKit/JavaScriptCore/docs/make-bytecode-docs.pl line 10. print() on closed filehandle OUTPUT at /Users/kevino/oss/webkit-commit/WebKit/JavaScriptCore/docs/make-bytecode-docs.pl line 31, <MACHINE> line 1209. print() on closed filehandle OUTPUT at /Users/kevino/oss/webkit-commit/WebKit/JavaScriptCore/docs/make-bytecode-docs.pl line 31, <MACHINE> line 1223. ... about 50-60 more lines like this... Note that while Interpreter.cpp and make-bytecode-docs.pl are using absolute paths, docs/bytecode.html is not, and for some reason that causes the OUTPUT filehandle not to be properly opened. For some reason, converting it to an absolute path fixes the issue, though I'll admit I don't quite understand why. :-/ 137173 20 34096 kevino 2009-08-04 16:06:07 -0700 Created attachment 34096 Changes to build-webkit needed for wx to use the waf build process - second patch 137328 21 34141 kevino 2009-08-05 10:11:26 -0700 Created attachment 34141 WebCore build script for waf Somehow I missed uploading this. 137329 22 34142 kevino 2009-08-05 10:17:39 -0700 Created attachment 34142 Python bindings build support for waf build system The last piece. 137728 23 34096 eric 2009-08-06 18:48:45 -0700 Comment on attachment 34096 Changes to build-webkit needed for wx to use the waf build process - second patch I think the huge wx() if block shoudl be moved elsewhere. No need to make build-webkit even bigger! Maybe a function in webkitdirs.pm? Maybe some sort of ensureWafInstalled() or similar. 137729 24 34141 eric 2009-08-06 18:52:28 -0700 Comment on attachment 34141 WebCore build script for waf I don't see why wx would want to switch build systems again away from the masses. But I'm not gonna stand in your way. Nor do I have time to review these line by line. Rubber Stamp. 137730 25 34142 eric 2009-08-06 18:52:45 -0700 Comment on attachment 34142 Python bindings build support for waf build system Rubber Stamp. 138129 26 34326 kevino 2009-08-07 13:54:02 -0700 Created attachment 34326 Changes to build-webkit, revised version with parts moved to webkitdirs.pm 138458 27 jmalonzo 2009-08-08 17:32:03 -0700 Index: WebKitTools/Scripts/build-webkit =================================================================== --- WebKitTools/Scripts/build-webkit (revision 46910) +++ WebKitTools/Scripts/build-webkit (working copy) @@ -339,7 +346,7 @@ } exit exitStatus($result); } - chdir ".." or die; + chdirWebKit(); } Mark, is the above change going to affect any of the Mac builds? I see that chdirWebKit() also checks for Internal or OpenSource if it doesn't find WebKit, JavaScriptCore or WebCore. Thanks. 138459 28 mrowe 2009-08-08 17:40:33 -0700 > Mark, is the above change going to affect any of the Mac builds? I see that > chdirWebKit() also checks for Internal or OpenSource if it doesn't find WebKit, > JavaScriptCore or WebCore. The directory structure that Apple folks use is to have the WebKit directory checked out in a folder named OpenSource alongside a folder named Internal. The extra checks in chdirWebKit for OpenSource and Internal directories allow the WebKit scripts to locate the top level of the WebKit tree even when invoked from within the Internal directory. The result of this is that chdirWebKit will always put the current directory back to the top of the open source tree, which is equivalent to what the 'cd "..";' has been doing before this change. 138461 29 34326 mrowe 2009-08-08 17:53:31 -0700 Comment on attachment 34326 Changes to build-webkit, revised version with parts moved to webkitdirs.pm > + # we don't support SVG yet. > + ($svgSupport, $svgAnimationSupport, $svgAsImageSupport, $svgDOMObjCBindingsSupport) = (0, 0, 0, 0); > + ($svgFontsSupport, $svgForeignObjectSupport, $svgUseSupport) = (0, 0, 0); > +} You should take a look at how the Qt project modifies the default values of these build options. Overriding them in this manner will result in their default values in 'build-webkit --help' being inconsistent with the values that are actually used. > # Don't report the "WebKit is now built" message after a clean operation. > Index: WebKitTools/Scripts/run-launcher > =================================================================== > --- WebKitTools/Scripts/run-launcher (revision 46910) > +++ WebKitTools/Scripts/run-launcher (working copy) > @@ -42,7 +42,9 @@ > my @args = @ARGV; > > # Check to see that all the frameworks are built. > -checkFrameworks(); > +if (!isWx()) { > + checkFrameworks(); > +} We should fix the implementation of checkFrameworks rather than if'ing the call site. > + # get / update waf if needed > + my $waf = "$sourceDir/WebKitTools/wx/waf"; > + my $wafURL = 'http://wxwebkit.wxcommunity.com/downloads/deps/waf'; > + if (!-f $waf) { > + my $result = system "curl -o $waf $wafURL"; > + chmod 0755, $waf; > + } Is it really necessary to attempt to check if this tool needs updated every time a project is built? This seems like something we'd typically have update-webkit do. Either way it should have some more error handling and fewer redundant variables. > + print "Building $project\n"; > + > + my $wafCommand = $waf; > + if (isCygwin()) { > + $wafCommand = `cygpath --windows "$wafCommand"`; > + chomp($wafCommand); > + } > + if ($shouldClean) { > + return system $wafCommand, "clean"; > + } > + > + my $result = system $wafCommand, 'configure', 'build', 'install', @options; > + > + return $result; The temporary $result variable here isn't needed. There are no major issues, but it does need revision. Marking as r-. 138577 30 kevino 2009-08-09 17:10:49 -0700 (In reply to comment #29) > (From update of attachment 34326 [details]) > > + # we don't support SVG yet. > > + ($svgSupport, $svgAnimationSupport, $svgAsImageSupport, $svgDOMObjCBindingsSupport) = (0, 0, 0, 0); > > + ($svgFontsSupport, $svgForeignObjectSupport, $svgUseSupport) = (0, 0, 0); > > +} > > You should take a look at how the Qt project modifies the default values of > these build options. Overriding them in this manner will result in their > default values in 'build-webkit --help' being inconsistent with the values that > are actually used. Okay, I'll give that approach a shot for my next revision. > > # Don't report the "WebKit is now built" message after a clean operation. > > Index: WebKitTools/Scripts/run-launcher > > =================================================================== > > --- WebKitTools/Scripts/run-launcher (revision 46910) > > +++ WebKitTools/Scripts/run-launcher (working copy) > > @@ -42,7 +42,9 @@ > > my @args = @ARGV; > > > > # Check to see that all the frameworks are built. > > -checkFrameworks(); > > +if (!isWx()) { > > + checkFrameworks(); > > +} > > We should fix the implementation of checkFrameworks rather than if'ing the call > site. Okay, will do. > > + # get / update waf if needed > > + my $waf = "$sourceDir/WebKitTools/wx/waf"; > > + my $wafURL = 'http://wxwebkit.wxcommunity.com/downloads/deps/waf'; > > + if (!-f $waf) { > > + my $result = system "curl -o $waf $wafURL"; > > + chmod 0755, $waf; > > + } > > Is it really necessary to attempt to check if this tool needs updated every > time a project is built? This seems like something we'd typically have > update-webkit do. Either way it should have some more error handling and fewer > redundant variables. I can put it somewhere else, but I don't want it in update-webkit because the user won't have waf on initial checkout, and I don't think it would occur to them to run update-webkit after a clean checkout. I could put it in somewhere like update-webkit-auxiliary-libs, but IMHO, if the user needs the latest version of something each time they build, it's better to just run the check to make sure they've got the latest version of the deps before building rather than requiring the user to repeatedly run an extra manual step. I suppose it adds a second or so to the build, but OTOH the build won't end up failing due to outdated deps because the user forgot to run a step. I'm certainly open to alternate ideas of how to handle this, but I would like the behavior to be automatic. I could just make a downloadOrUpdateWaf() function and call it from build-webkit directly as an alternative to running it each time a project is built. > > + print "Building $project\n"; > > + > > + my $wafCommand = $waf; > > + if (isCygwin()) { > > + $wafCommand = `cygpath --windows "$wafCommand"`; > > + chomp($wafCommand); > > + } > > + if ($shouldClean) { > > + return system $wafCommand, "clean"; > > + } > > + > > + my $result = system $wafCommand, 'configure', 'build', 'install', @options; > > + > > + return $result; > > The temporary $result variable here isn't needed. Oops, thanks, in previous revisions I was checking the result for debugging and forgot to remove that code. > There are no major issues, but it does need revision. Marking as r-. 138879 31 34533 kevino 2009-08-10 19:03:35 -0700 Created attachment 34533 Changes to build-webkit, with Mark's comments addressed Should have all the pointed out issues addressed now. Note that I removed the svg option defaults code entirely in this revision because I only added it to silence the SVG feature print outs at the end of the build, which themselves were removed in r46641, meaning I no longer need to worry about the values they are set term in the short term. I'll revisit the options code when I make the options more configurable for wx. 144164 32 34533 eric 2009-09-02 02:44:09 -0700 Comment on attachment 34533 Changes to build-webkit, with Mark's comments addressed This looks sane enough to me. cq- because yo're a committer. You can set cq+ yourself if you'd prefer the bot to commit this for you. 144223 33 kevino 2009-09-02 08:55:31 -0700 Landed in r47972, thanks! 33374 2009-07-23 14:27:06 -0700 2009-08-04 16:06:07 -0700 Changes to build-webkit needed for wx to use the waf build process waf-build-webkit.patch text/plain 4997 kevino SW5kZXg6IFdlYktpdFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXRUb29scy9D aGFuZ2VMb2cJKHJldmlzaW9uIDQ2Mjg2KQorKysgV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCSh3b3Jr aW5nIGNvcHkpCkBAIC0xLDMgKzEsMTQgQEAKKzIwMDktMDctMjMgIEtldmluIE9sbGl2aWVyICA8 a2V2aW5vQHRoZW9sbGl2aWVycy5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgQ2hhbmdlcyBuZWVkZWQgZm9yIGJ1aWxkLXdlYmtpdCB0byBzdXBw b3J0IHRoZSB3YWYgYnVpbGQgc3lzdGVtIGZvciB0aGUgd3ggcG9ydC4KKyAgICAgICAgCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yNzYxOQorCisgICAg ICAgICogU2NyaXB0cy9idWlsZC13ZWJraXQ6CisgICAgICAgICogU2NyaXB0cy93ZWJraXRkaXJz LnBtOgorCiAyMDA5LTA3LTIzICBFbGkgRmlkbGVyICA8ZWxpLmZpZGxlckB0b3JjaG1vYmlsZS5j b20+CiAKICAgICAgICAgIFJldmlld2VkIGJ5IEFkYW0gVHJlYXQuCkluZGV4OiBXZWJLaXRUb29s cy9TY3JpcHRzL2J1aWxkLXdlYmtpdAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXRUb29scy9TY3JpcHRz L2J1aWxkLXdlYmtpdAkocmV2aXNpb24gNDYyODUpCisrKyBXZWJLaXRUb29scy9TY3JpcHRzL2J1 aWxkLXdlYmtpdAkod29ya2luZyBjb3B5KQpAQCAtMTg3LDE4ICsxODcsNiBAQAogY2hlY2tSZXF1 aXJlZFN5c3RlbUNvbmZpZygpOwogc2V0Q29uZmlndXJhdGlvbigpOwogCi1pZiAoaXNXeCgpKSB7 Ci0gICAgJEVOVnsiV0VCS0lUT1VUUFVURElSIn0gPSBwcm9kdWN0RGlyKCk7Ci0KLSAgICBteSBA b3B0cyA9IGdldFd4QXJncygpOwotCi0gICAgaWYgKCRjbGVhbikgewotICAgICAgICBwdXNoKEBv cHRzLCAiY2xlYW4iKTsKLSAgICB9Ci0gICAgc3lzdGVtICJXZWJLaXRUb29scy93eC9idWlsZC13 eHdlYmtpdCBAb3B0cyI7Ci0gICAgZXhpdCBleGl0U3RhdHVzKCQ/KTsKLX0KLQogbXkgJHByb2R1 Y3REaXIgPSBwcm9kdWN0RGlyKCk7CiAKICMgQ2hlY2sgdGhhdCBhbGwgdGhlIHByb2plY3QgZGly ZWN0b3JpZXMgYXJlIHRoZXJlLgpAQCAtMzAyLDYgKzI5MCwzNSBAQAogIyBGb3JjZSByZS1saW5r IG9mIGV4aXN0aW5nIGxpYnJhcmllcyBpZiBkaWZmZXJlbnQgdGhhbiBleHBlY3RlZAogcmVtb3Zl TGlicmFyeURlcGVuZGluZ09uU1ZHKCJXZWJDb3JlIiwgJHN2Z1N1cHBvcnQpOwogCitpZiAoaXNX eCgpKSB7CisgICAgIyBzZXQgdGhlIFBZVEhPTlBBVEggZm9yIHdhZgorICAgIG15ICRweXRob25Q YXRoID0gJEVOVnsnUFlUSE9OUEFUSCd9OworICAgIGlmICghZGVmaW5lZCgkcHl0aG9uUGF0aCkp IHsKKyAgICAgICAgJHB5dGhvblBhdGggPSAnJzsKKyAgICB9CisgICAgbXkgJHNvdXJjZURpciA9 IHNvdXJjZURpcigpOworICAgIG15ICRuZXdQeXRob25QYXRoID0gIiRzb3VyY2VEaXIvV2ViS2l0 L3d4OiRweXRob25QYXRoIjsKKyAgICBpZiAoaXNDeWd3aW4oKSkgeworICAgICAgICAkbmV3UHl0 aG9uUGF0aCA9IGBjeWdwYXRoIC0tbWl4ZWQgLS1wYXRoICRuZXdQeXRob25QYXRoYDsKKyAgICB9 CisgICAgJEVOVnsnUFlUSE9OUEFUSCd9ID0gJG5ld1B5dGhvblBhdGg7CisgICAgCisgICAgIyBn ZXQgLyB1cGRhdGUgd2FmIGlmIG5lZWRlZAorICAgIG15ICR3YWYgPSAnV2ViS2l0VG9vbHMvd3gv d2FmJzsKKyAgICBteSAkd2FmVVJMID0gJ2h0dHA6Ly93eHdlYmtpdC53eGNvbW11bml0eS5jb20v ZG93bmxvYWRzL2RlcHMvd2FmJzsKKyAgICBpZiAoIS1mICR3YWYpIHsKKyAgICAgICAgbXkgJHJl c3VsdCA9IHN5c3RlbSAiY3VybCAtbyAkd2FmICR3YWZVUkwiOworICAgICAgICBjaG1vZCAwNzU1 LCAkd2FmOworICAgIH0KKyAgICAKKyAgICBwdXNoIEBwcm9qZWN0cywgJ1dlYktpdFRvb2xzL3d4 L2Jyb3dzZXInOworICAgIHB1c2ggQHByb2plY3RzLCAnV2ViS2l0L3d4L2JpbmRpbmdzL3B5dGhv bic7CisgICAgCisgICAgIyB3ZSBkb24ndCBzdXBwb3J0IFNWRyB5ZXQuCisgICAgKCRzdmdTdXBw b3J0LCAkc3ZnQW5pbWF0aW9uU3VwcG9ydCwgJHN2Z0FzSW1hZ2VTdXBwb3J0LCAkc3ZnRE9NT2Jq Q0JpbmRpbmdzU3VwcG9ydCkgPSAoMCwgMCwgMCwgMCk7CisgICAgKCRzdmdGb250c1N1cHBvcnQs ICRzdmdGb3JlaWduT2JqZWN0U3VwcG9ydCwgJHN2Z1VzZVN1cHBvcnQpID0gKDAsIDAsIDApOwor fQorCiAjIEJ1aWxkLCBhbmQgYWJvcnQgaWYgdGhlIGJ1aWxkIGZhaWxzLgogZm9yIG15ICRkaXIg KEBwcm9qZWN0cykgewogICAgIGNoZGlyICRkaXIgb3IgZGllOwpAQCAtMzIzLDYgKzM0MCwxNiBA QAogICAgICAgICBpZiAoJGRpciBlcSAiV2ViS2l0IikgewogICAgICAgICAgICAgJHJlc3VsdCA9 IGJ1aWxkVmlzdWFsU3R1ZGlvUHJvamVjdCgid2luL1dlYktpdC52Y3Byb2ovV2ViS2l0LnNsbiIs ICRjbGVhbik7CiAgICAgICAgIH0KKyAgICB9IGVsc2lmIChpc1d4KCkpIHsKKyAgICAgICAgQG9w dGlvbnMgPSAoKTsKKyAgICAgICAgaWYgKGRlZmluZWQoJG1ha2VBcmdzKSkgeworICAgICAgICAg ICAgQG9wdGlvbnMgPSBzcGxpdCgvIC8sICRtYWtlQXJncyk7CisgICAgICAgIH0KKyAgICAgICAg aWYgKCRkaXIgZXEgIldlYktpdCIgJiYgaXNXeCgpKSB7CisgICAgICAgICAgICBjaGRpciAnd3gn IG9yIGRpZTsKKyAgICAgICAgfQorICAgICAgICAgICAgCisgICAgICAgICRyZXN1bHQgPSBidWls ZFdhZlByb2plY3QoJGRpciwgJGNsZWFuLCBAb3B0aW9ucyk7CiAgICAgfQogCiAgICAgaWYgKGV4 aXRTdGF0dXMoJHJlc3VsdCkpIHsKQEAgLTMzNSw3ICszNjIsNyBAQAogICAgICAgICB9CiAgICAg ICAgIGV4aXQgZXhpdFN0YXR1cygkcmVzdWx0KTsKICAgICB9Ci0gICAgY2hkaXIgIi4uIiBvciBk aWU7CisgICAgY2hkaXJXZWJLaXQoKTsKIH0KIAogIyBEb24ndCByZXBvcnQgdGhlICJXZWJLaXQg aXMgbm93IGJ1aWx0IiBtZXNzYWdlIGFmdGVyIGEgY2xlYW4gb3BlcmF0aW9uLgpAQCAtMzQ5LDcg KzM3NiwxMSBAQAogcHJpbnQgIlxuIjsKIHByaW50ICI9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PVxuIjsKIHByaW50ICIgV2ViS2l0IGlz IG5vdyBidWlsdC4gVG8gcnVuICRsYXVuY2hlck5hbWUgd2l0aCB0aGlzIG5ld2x5LWJ1aWx0XG4i OwotcHJpbnQgIiBjb2RlLCB1c2UgdGhlIFwiJGxhdW5jaGVyUGF0aFwiIHNjcmlwdC5cbiI7Citp ZiAoaXNXeCgpKSB7CisgICAgcHJpbnQgIiBjb2RlLCBydW4gXCIkbGF1bmNoZXJQYXRoXCIuXG4i OworfSBlbHNlIHsKKyAgICBwcmludCAiIGNvZGUsIHVzZSB0aGUgXCIkbGF1bmNoZXJQYXRoXCIg c2NyaXB0LlxuIjsKK30KIGlmICgkc3ZnU3VwcG9ydCkgewogICAgIHByaW50ICJcbiBOT1RFOiBX ZWJLaXQgaGFzIGJlZW4gYnVpbHQgd2l0aCBTVkcgc3VwcG9ydCBlbmFibGVkLlxuIjsKICAgICBw cmludCAiICRsYXVuY2hlck5hbWUgd2lsbCBoYXZlIFNWRyB2aWV3aW5nIGNhcGFiaWxpdGllcy5c biI7CkluZGV4OiBXZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdGRpcnMucG0KPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRkaXJzLnBtCShyZXZpc2lvbiA0NjI4NSkKKysr IFdlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0ZGlycy5wbQkod29ya2luZyBjb3B5KQpAQCAtODk3 LDYgKzg5Nyw4IEBACiAgICAgbXkgJHJlbGF0aXZlU2NyaXB0c1BhdGggPSByZWxhdGl2ZVNjcmlw dHNEaXIoKTsKICAgICBpZiAoaXNHdGsoKSB8fCBpc1F0KCkpIHsKICAgICAgICAgcmV0dXJuICIk cmVsYXRpdmVTY3JpcHRzUGF0aC9ydW4tbGF1bmNoZXIiOworICAgIH0gZWxzaWYgKGlzV3goKSkg eworICAgICAgICByZXR1cm4gcHJvZHVjdERpcigpIC4gJy93eEJyb3dzZXInOwogICAgIH0gZWxz aWYgKGlzQXBwbGVXZWJLaXQoKSkgewogICAgICAgICByZXR1cm4gIiRyZWxhdGl2ZVNjcmlwdHNQ YXRoL3J1bi1zYWZhcmkiOwogICAgIH0KQEAgLTkwOCw2ICs5MTAsOCBAQAogICAgICAgICByZXR1 cm4gIkd0a0xhdW5jaGVyIjsKICAgICB9IGVsc2lmIChpc1F0KCkpIHsKICAgICAgICAgcmV0dXJu ICJRdExhdW5jaGVyIjsKKyAgICB9IGVsc2lmIChpc1d4KCkpIHsKKyAgICAgICAgcmV0dXJuICJ3 eEJyb3dzZXIiOwogICAgIH0gZWxzaWYgKGlzQXBwbGVXZWJLaXQoKSkgewogICAgICAgICByZXR1 cm4gIlNhZmFyaSI7CiAgICAgfQpAQCAtMTAzMyw2ICsxMDM3LDI1IEBACiAgICAgcmV0dXJuIHN5 c3RlbSBAY29tbWFuZDsKIH0KIAorc3ViIGJ1aWxkV2FmUHJvamVjdAoreworICAgIG15ICgkcHJv amVjdCwgJHNob3VsZENsZWFuLCBAb3B0aW9ucykgPSBAXzsKKyAgICBwcmludCAiQnVpbGRpbmcg JHByb2plY3RcbiI7CisKKyAgICBteSAkd2FmQ29tbWFuZCA9ICIkc291cmNlRGlyL1dlYktpdFRv b2xzL3d4L3dhZiI7CisgICAgaWYgKGlzQ3lnd2luKCkpIHsKKyAgICAgICAgJHdhZkNvbW1hbmQg PSBgY3lncGF0aCAtLXdpbmRvd3MgIiR3YWZDb21tYW5kImA7CisgICAgICAgIGNob21wKCR3YWZD b21tYW5kKTsKKyAgICB9CisgICAgaWYgKCRzaG91bGRDbGVhbikgeworICAgICAgICByZXR1cm4g c3lzdGVtICR3YWZDb21tYW5kLCAiY2xlYW4iOworICAgIH0KKyAgICAKKyAgICBteSAkcmVzdWx0 ID0gc3lzdGVtICR3YWZDb21tYW5kLCAnY29uZmlndXJlJywgJ2J1aWxkJywgJ2luc3RhbGwnLCBA b3B0aW9uczsKKyAgICAKKyAgICByZXR1cm4gJHJlc3VsdDsKK30KKwogc3ViIHJldHJpZXZlUU1h a2VzcGVjVmFyCiB7CiAgICAgbXkgJG1rc3BlYyA9ICRfWzBdOwo= 33375 2009-07-23 14:31:36 -0700 2009-07-31 22:26:29 -0700 Fix for when running DerivedSources.make from a subdir of JSCore derived_sources.patch text/plain 950 kevino SW5kZXg6IEphdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBKYXZhU2NyaXB0 Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDQ2Mjg2KQorKysgSmF2YVNjcmlwdENvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDUgKzEsMTQgQEAKIDIwMDktMDctMjMgIEtldmluIE9s bGl2aWVyICA8a2V2aW5vQHRoZW9sbGl2aWVycy5jb20+CiAKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgRml4IGZvciB3aGVuIHJ1bm5pbmcgRGVyaXZlZFNv dXJjZXMubWFrZSBmcm9tIGEgc3ViZGlyIG9mIEpTQ29yZS4KKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTI3NjE5CisKKyAgICAgICAgKiBEZXJpdmVkU291 cmNlcy5tYWtlOgorCisyMDA5LTA3LTIzICBLZXZpbiBPbGxpdmllciAgPGtldmlub0B0aGVvbGxp dmllcnMuY29tPgorCiAgICAgICAgIHd4IGJ1aWxkIGZpeCwgYWRkaW5nIG1pc3NpbmcgaGVhZGVy LgogCiAgICAgICAgICogaml0L0pJVC5jcHA6CkluZGV4OiBKYXZhU2NyaXB0Q29yZS9EZXJpdmVk U291cmNlcy5tYWtlCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIEphdmFTY3JpcHRDb3JlL0Rlcml2ZWRTb3VyY2Vz Lm1ha2UJKHJldmlzaW9uIDQ2Mjg1KQorKysgSmF2YVNjcmlwdENvcmUvRGVyaXZlZFNvdXJjZXMu bWFrZQkod29ya2luZyBjb3B5KQpAQCAtNzMsNCArNzMsNCBAQAogCSReICRACiAKIGRvY3MvYnl0 ZWNvZGUuaHRtbDogbWFrZS1ieXRlY29kZS1kb2NzLnBsIEludGVycHJldGVyLmNwcCAKLQlwZXJs ICReICRACisJcGVybCAkXiAkKEphdmFTY3JpcHRDb3JlKS8kQAo= 33399 2009-07-23 18:28:21 -0700 2009-08-02 01:54:19 -0700 Helper scripts for the waf build. waf_scripts.patch text/plain 22300 kevino SW5kZXg6IFdlYktpdFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXRUb29scy9D aGFuZ2VMb2cJKHJldmlzaW9uIDQ2MzAyKQorKysgV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCSh3b3Jr aW5nIGNvcHkpCkBAIC0xLDMgKzEsMTYgQEAKKzIwMDktMDctMjMgIEtldmluIE9sbGl2aWVyICA8 a2V2aW5vQHRoZW9sbGl2aWVycy5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgU2NyaXB0cyBuZWVkZWQgZm9yIHRoZSB3YWYgYnVpbGQuCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yNzYxOQorCisgICAg ICAgICogd3gvYnVpbGQ6IEFkZGVkLgorICAgICAgICAqIHd4L2J1aWxkL2J1aWxkX3V0aWxzLnB5 OiBBZGRlZC4KKyAgICAgICAgKiB3eC9idWlsZC9zZXR0aW5ncy5weTogQWRkZWQuCisgICAgICAg ICogd3gvYnVpbGQvd2FmX2V4dGVuc2lvbnMucHk6IEFkZGVkLgorICAgICAgICAqIHd4L2J1aWxk L3d4cHJlc2V0cy5weTogQWRkZWQuCisKIDIwMDktMDctMjMgIE1hcmsgUm93ZSAgPG1yb3dlQGFw cGxlLmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSBPbGl2ZXIgSHVudC4KSW5kZXg6IFdlYktp dFRvb2xzL3d4L2J1aWxkL3dhZl9leHRlbnNpb25zLnB5Cj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdFRv b2xzL3d4L2J1aWxkL3dhZl9leHRlbnNpb25zLnB5CShyZXZpc2lvbiAwKQorKysgV2ViS2l0VG9v bHMvd3gvYnVpbGQvd2FmX2V4dGVuc2lvbnMucHkJKHJldmlzaW9uIDApCkBAIC0wLDAgKzEsNzkg QEAKKyMgQ29weXJpZ2h0IChDKSAyMDA5IEtldmluIE9sbGl2aWVyICBBbGwgcmlnaHRzIHJlc2Vy dmVkLgorIworIyBSZWRpc3RyaWJ1dGlvbiBhbmQgdXNlIGluIHNvdXJjZSBhbmQgYmluYXJ5IGZv cm1zLCB3aXRoIG9yIHdpdGhvdXQKKyMgbW9kaWZpY2F0aW9uLCBhcmUgcGVybWl0dGVkIHByb3Zp ZGVkIHRoYXQgdGhlIGZvbGxvd2luZyBjb25kaXRpb25zCisjIGFyZSBtZXQ6CisjIDEuIFJlZGlz dHJpYnV0aW9ucyBvZiBzb3VyY2UgY29kZSBtdXN0IHJldGFpbiB0aGUgYWJvdmUgY29weXJpZ2h0 CisjICAgIG5vdGljZSwgdGhpcyBsaXN0IG9mIGNvbmRpdGlvbnMgYW5kIHRoZSBmb2xsb3dpbmcg ZGlzY2xhaW1lci4KKyMgMi4gUmVkaXN0cmlidXRpb25zIGluIGJpbmFyeSBmb3JtIG11c3QgcmVw cm9kdWNlIHRoZSBhYm92ZSBjb3B5cmlnaHQKKyMgICAgbm90aWNlLCB0aGlzIGxpc3Qgb2YgY29u ZGl0aW9ucyBhbmQgdGhlIGZvbGxvd2luZyBkaXNjbGFpbWVyIGluIHRoZQorIyAgICBkb2N1bWVu dGF0aW9uIGFuZC9vciBvdGhlciBtYXRlcmlhbHMgcHJvdmlkZWQgd2l0aCB0aGUgZGlzdHJpYnV0 aW9uLgorIworIyBUSElTIFNPRlRXQVJFIElTIFBST1ZJREVEIEJZIEFQUExFIENPTVBVVEVSLCBJ TkMuIGBgQVMgSVMnJyBBTkQgQU5ZCisjIEVYUFJFU1MgT1IgSU1QTElFRCBXQVJSQU5USUVTLCBJ TkNMVURJTkcsIEJVVCBOT1QgTElNSVRFRCBUTywgVEhFCisjIElNUExJRUQgV0FSUkFOVElFUyBP RiBNRVJDSEFOVEFCSUxJVFkgQU5EIEZJVE5FU1MgRk9SIEEgUEFSVElDVUxBUgorIyBQVVJQT1NF IEFSRSBESVNDTEFJTUVELiAgSU4gTk8gRVZFTlQgU0hBTEwgQVBQTEUgQ09NUFVURVIsIElOQy4g T1IKKyMgQ09OVFJJQlVUT1JTIEJFIExJQUJMRSBGT1IgQU5ZIERJUkVDVCwgSU5ESVJFQ1QsIElO Q0lERU5UQUwsIFNQRUNJQUwsCisjIEVYRU1QTEFSWSwgT1IgQ09OU0VRVUVOVElBTCBEQU1BR0VT IChJTkNMVURJTkcsIEJVVCBOT1QgTElNSVRFRCBUTywKKyMgUFJPQ1VSRU1FTlQgT0YgU1VCU1RJ VFVURSBHT09EUyBPUiBTRVJWSUNFUzsgTE9TUyBPRiBVU0UsIERBVEEsIE9SCisjIFBST0ZJVFM7 IE9SIEJVU0lORVNTIElOVEVSUlVQVElPTikgSE9XRVZFUiBDQVVTRUQgQU5EIE9OIEFOWSBUSEVP UlkKKyMgT0YgTElBQklMSVRZLCBXSEVUSEVSIElOIENPTlRSQUNULCBTVFJJQ1QgTElBQklMSVRZ LCBPUiBUT1JUCisjIChJTkNMVURJTkcgTkVHTElHRU5DRSBPUiBPVEhFUldJU0UpIEFSSVNJTkcg SU4gQU5ZIFdBWSBPVVQgT0YgVEhFIFVTRQorIyBPRiBUSElTIFNPRlRXQVJFLCBFVkVOIElGIEFE VklTRUQgT0YgVEhFIFBPU1NJQklMSVRZIE9GIFNVQ0ggREFNQUdFLiAKKyMKKyMgVGhpcyBtb2R1 bGUgaXMgZm9yIGNvZGUgd2hlcmUgd2Ugb3ZlcnJpZGUgd2FmJ3MgZGVmYXVsdCBiZWhhdmlvciBv ciBleHRlbmQgd2FmCisKK2ltcG9ydCBvcworaW1wb3J0IHN1YnByb2Nlc3MKK2ltcG9ydCBzeXMK KworaW1wb3J0IFV0aWxzCisKKyMgdmVyc2lvbiBvZiBleGVjX2NvbW1hbmQgdGhhdCBoYW5kbGVz IFdpbmRvd3MgY29tbWFuZCBsaW5lcyBsb25nZXIgdGhhbiAzMjAwMCBjaGFycworZGVmIGV4ZWNf Y29tbWFuZChzLCAqKmt3KToKKyAgICBmaWxlbmFtZSA9ICcnCisgICAgaWYgc3lzLnBsYXRmb3Jt LnN0YXJ0c3dpdGgoJ3dpbicpIGFuZCBsZW4oJyAnLmpvaW4ocykpID4gMzIwMDA6CisgICAgICAg IGltcG9ydCB0ZW1wZmlsZQorICAgICAgICBmaWxlID0gdGVtcGZpbGUuTmFtZWRUZW1wb3JhcnlG aWxlKGRlbGV0ZT1GYWxzZSkKKyAgICAgICAgZmlsZW5hbWUgPSBmaWxlLm5hbWUKKyAgICAgICAg ZmlsZS53cml0ZSgnICcuam9pbihzWzE6XSkpCisgICAgICAgIGZpbGUuY2xvc2UoKQorICAgICAg ICAKKyAgICAgICAgcyA9IFtzWzBdLCAnQCcgKyBmaWxlbmFtZV0KKyAgICAgICAgCisgICAgaWYg J2xvZycgaW4ga3c6CisgICAgICAgIGt3WydzdGRvdXQnXSA9IGt3WydzdGRlcnInXSA9IGt3Wyds b2cnXQorICAgICAgICBkZWwoa3dbJ2xvZyddKQorICAgIGt3WydzaGVsbCddID0gaXNpbnN0YW5j ZShzLCBzdHIpCisKKyAgICBkZWYgY2xlYW51cCgpOgorICAgICAgICB0cnk6CisgICAgICAgICAg ICBpZiBvcy5wYXRoLmV4aXN0cyhmaWxlbmFtZSk6CisgICAgICAgICAgICAgICAgb3MucmVtb3Zl KGZpbGVuYW1lKQorICAgICAgICBleGNlcHQ6CisgICAgICAgICAgICBwYXNzCisKKyAgICB0cnk6 CisgICAgICAgIHByb2MgPSBzdWJwcm9jZXNzLlBvcGVuKHMsICoqa3cpCisgICAgICAgIHJlc3Vs dCA9IHByb2Mud2FpdCgpCisgICAgICAgIGNsZWFudXAoKQorICAgICAgICByZXR1cm4gcmVzdWx0 CisgICAgICAgIAorICAgIGV4Y2VwdCBPU0Vycm9yOgorICAgICAgICBjbGVhbnVwKCkKKyAgICAg ICAgcmFpc2UKKyAgICAgICAgCitVdGlscy5leGVjX2NvbW1hbmQgPSBleGVjX2NvbW1hbmQKKwor IyBCZXR0ZXIgcGVyZm9ybWluZyBoX2ZpbGUgdG8ga2VlcCBoYXNoaW5nIGZyb20gY29uc3VtaW5n IGxvdHMgb2YgdGltZQoraW1wb3J0IHN0YXQKK2RlZiBoX2ZpbGUoZmlsZW5hbWUpOgorICAgIHN0 ID0gb3Muc3RhdChmaWxlbmFtZSkKKyAgICBpZiBzdGF0LlNfSVNESVIoc3Rbc3RhdC5TVF9NT0RF XSk6IHJhaXNlIElPRXJyb3IoJ25vdCBhIGZpbGUnKQorICAgIG0gPSBVdGlscy5tZDUoKQorICAg IG0udXBkYXRlKHN0cihzdC5zdF9tdGltZSkpCisgICAgbS51cGRhdGUoc3RyKHN0LnN0X3NpemUp KQorICAgIG0udXBkYXRlKGZpbGVuYW1lKQorICAgIHJldHVybiBtLmRpZ2VzdCgpCisKK1V0aWxz LmhfZmlsZSA9IGhfZmlsZQpJbmRleDogV2ViS2l0VG9vbHMvd3gvYnVpbGQvYnVpbGRfdXRpbHMu cHkKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gV2ViS2l0VG9vbHMvd3gvYnVpbGQvYnVpbGRfdXRpbHMucHkJKHJl dmlzaW9uIDApCisrKyBXZWJLaXRUb29scy93eC9idWlsZC9idWlsZF91dGlscy5weQkocmV2aXNp b24gMCkKQEAgLTAsMCArMSwxNDMgQEAKKyMgQ29weXJpZ2h0IChDKSAyMDA5IEtldmluIE9sbGl2 aWVyICBBbGwgcmlnaHRzIHJlc2VydmVkLgorIworIyBSZWRpc3RyaWJ1dGlvbiBhbmQgdXNlIGlu IHNvdXJjZSBhbmQgYmluYXJ5IGZvcm1zLCB3aXRoIG9yIHdpdGhvdXQKKyMgbW9kaWZpY2F0aW9u LCBhcmUgcGVybWl0dGVkIHByb3ZpZGVkIHRoYXQgdGhlIGZvbGxvd2luZyBjb25kaXRpb25zCisj IGFyZSBtZXQ6CisjIDEuIFJlZGlzdHJpYnV0aW9ucyBvZiBzb3VyY2UgY29kZSBtdXN0IHJldGFp biB0aGUgYWJvdmUgY29weXJpZ2h0CisjICAgIG5vdGljZSwgdGhpcyBsaXN0IG9mIGNvbmRpdGlv bnMgYW5kIHRoZSBmb2xsb3dpbmcgZGlzY2xhaW1lci4KKyMgMi4gUmVkaXN0cmlidXRpb25zIGlu IGJpbmFyeSBmb3JtIG11c3QgcmVwcm9kdWNlIHRoZSBhYm92ZSBjb3B5cmlnaHQKKyMgICAgbm90 aWNlLCB0aGlzIGxpc3Qgb2YgY29uZGl0aW9ucyBhbmQgdGhlIGZvbGxvd2luZyBkaXNjbGFpbWVy IGluIHRoZQorIyAgICBkb2N1bWVudGF0aW9uIGFuZC9vciBvdGhlciBtYXRlcmlhbHMgcHJvdmlk ZWQgd2l0aCB0aGUgZGlzdHJpYnV0aW9uLgorIworIyBUSElTIFNPRlRXQVJFIElTIFBST1ZJREVE IEJZIEFQUExFIENPTVBVVEVSLCBJTkMuIGBgQVMgSVMnJyBBTkQgQU5ZCisjIEVYUFJFU1MgT1Ig SU1QTElFRCBXQVJSQU5USUVTLCBJTkNMVURJTkcsIEJVVCBOT1QgTElNSVRFRCBUTywgVEhFCisj IElNUExJRUQgV0FSUkFOVElFUyBPRiBNRVJDSEFOVEFCSUxJVFkgQU5EIEZJVE5FU1MgRk9SIEEg UEFSVElDVUxBUgorIyBQVVJQT1NFIEFSRSBESVNDTEFJTUVELiAgSU4gTk8gRVZFTlQgU0hBTEwg QVBQTEUgQ09NUFVURVIsIElOQy4gT1IKKyMgQ09OVFJJQlVUT1JTIEJFIExJQUJMRSBGT1IgQU5Z IERJUkVDVCwgSU5ESVJFQ1QsIElOQ0lERU5UQUwsIFNQRUNJQUwsCisjIEVYRU1QTEFSWSwgT1Ig Q09OU0VRVUVOVElBTCBEQU1BR0VTIChJTkNMVURJTkcsIEJVVCBOT1QgTElNSVRFRCBUTywKKyMg UFJPQ1VSRU1FTlQgT0YgU1VCU1RJVFVURSBHT09EUyBPUiBTRVJWSUNFUzsgTE9TUyBPRiBVU0Us IERBVEEsIE9SCisjIFBST0ZJVFM7IE9SIEJVU0lORVNTIElOVEVSUlVQVElPTikgSE9XRVZFUiBD QVVTRUQgQU5EIE9OIEFOWSBUSEVPUlkKKyMgT0YgTElBQklMSVRZLCBXSEVUSEVSIElOIENPTlRS QUNULCBTVFJJQ1QgTElBQklMSVRZLCBPUiBUT1JUCisjIChJTkNMVURJTkcgTkVHTElHRU5DRSBP UiBPVEhFUldJU0UpIEFSSVNJTkcgSU4gQU5ZIFdBWSBPVVQgT0YgVEhFIFVTRQorIyBPRiBUSElT IFNPRlRXQVJFLCBFVkVOIElGIEFEVklTRUQgT0YgVEhFIFBPU1NJQklMSVRZIE9GIFNVQ0ggREFN QUdFLiAKKyMKKyMgSGVscGVyIGZ1bmN0aW9ucyBmb3IgdGhlIFdlYktpdCBidWlsZC4KKworaW1w b3J0IGdsb2IKK2ltcG9ydCBvcworaW1wb3J0IHN5cworaW1wb3J0IHVybGxpYgoraW1wb3J0IHVy bHBhcnNlCisKK2ltcG9ydCBMb2dzCisKK2RlZiBnZXRfb3V0cHV0KGNvbW1hbmQpOgorICAgICIi IgorICAgIFdpbmRvd3MtY29tcGF0aWJsZSBmdW5jdGlvbiBmb3IgZ2V0dGluZyBvdXRwdXQgZnJv bSBhIGNvbW1hbmQuCisgICAgIiIiCisgICAgZiA9IG9zLnBvcGVuKGNvbW1hbmQpCisgICAgcmV0 dXJuIGYucmVhZCgpLnN0cmlwKCkKKyAgICAKK2RlZiBnZXRfZXhjbHVkZXMocm9vdCwgcGF0dGVy bnMpOgorICAgICIiIgorICAgIEdldCBhIGxpc3Qgb2YgZXhjbHVkZSBwYXR0ZXJucyBnb2luZyBk b3duIHNldmVyYWwgZGlycy4gCisgICAgVE9ETzogTWFrZSB0aGlzIGZ1bGx5IHJlY3Vyc2l2ZS4K KyAgICAiIiIKKyAgICBleGNsdWRlcyA9IFtdCisgICAgCisgICAgZm9yIHBhdHRlcm4gaW4gcGF0 dGVybnM6CisgICAgICAgIHN1YmRpcl9wYXR0ZXJuID0gb3Muc2VwICsgJyonCisgICAgICAgIGZv ciBzdWJkaXIgaW4gW3N1YmRpcl9wYXR0ZXJuLCBzdWJkaXJfcGF0dGVybioyLCBzdWJkaXJfcGF0 dGVybiozXToKKyAgICAgICAgICAgIGFkaXIgPSByb290ICsgc3ViZGlyICsgb3Muc2VwICsgcGF0 dGVybgorICAgICAgICAgICAgZmlsZXMgPSBnbG9iLmdsb2IoYWRpcikKKyAgICAgICAgICAgIGZv ciBhZmlsZSBpbiBmaWxlczoKKyAgICAgICAgICAgICAgICBleGNsdWRlcy5hcHBlbmQob3MucGF0 aC5iYXNlbmFtZShhZmlsZSkpCisKKyAgICByZXR1cm4gZXhjbHVkZXMKKyAgICAKK2RlZiBnZXRf ZGlyc19mb3JfZmVhdHVyZXMocm9vdCwgZmVhdHVyZXMsIGRpcnMpOgorICAgICIiIgorICAgIEZp bmQgd2hpY2ggZGlyZWN0b3JpZXMgdG8gaW5jbHVkZSBpbiB0aGUgbGlzdCBvZiBidWlsZCBkaXJz IGJhc2VkIHVwb24gdGhlIAorICAgIGVuYWJsZWQgcG9ydChzKSBhbmQgZmVhdHVyZXMuCisgICAg IiIiCisgICAgb3V0ZGlycyA9IGRpcnMKKyAgICBmb3IgYWRpciBpbiBkaXJzOgorICAgICAgICBm b3IgZmVhdHVyZSBpbiBmZWF0dXJlczoKKyAgICAgICAgICAgIHJlbHBhdGggPSBvcy5wYXRoLmpv aW4oYWRpciwgZmVhdHVyZSkKKyAgICAgICAgICAgIGZlYXR1cmVkaXIgPSBvcy5wYXRoLmpvaW4o cm9vdCwgcmVscGF0aCkKKyAgICAgICAgICAgIGlmIG9zLnBhdGguZXhpc3RzKGZlYXR1cmVkaXIp IGFuZCBub3QgcmVscGF0aCBpbiBvdXRkaXJzOgorICAgICAgICAgICAgICAgIG91dGRpcnMuYXBw ZW5kKHJlbHBhdGgpCisgICAgICAgICAgICAKKyAgICByZXR1cm4gb3V0ZGlycworCitkZWYgZG93 bmxvYWRfaWZfbmV3ZXIodXJsLCBkZXN0ZGlyKToKKyAgICAiIiIKKyAgICBDaGVja3MgaWYgdGhl IGZpbGUgb24gdGhlIHNlcnZlciBpcyBuZXdlciB0aGFuIHRoZSBvbmUgaW4gdGhlIHVzZXIncyB0 cmVlLAorICAgIGFuZCBpZiBzbywgZG93bmxvYWRzIGl0LiAKKyAgICAKKyAgICBSZXR1cm5zIHRo ZSBmaWxlbmFtZSBvZiB0aGUgZG93bmxvYWRlZCBmaWxlIGlmIGRvd25sb2FkZWQsIG9yIE5vbmUg aWYgCisgICAgdGhlIGV4aXN0aW5nIGZpbGUgbWF0Y2hlcyB0aGUgb25lIG9uIHRoZSBzZXJ2ZXIu CisgICAgIiIiCisgICAgb2JqID0gdXJscGFyc2UudXJscGFyc2UodXJsKQorICAgIGZpbGVuYW1l ID0gb3MucGF0aC5iYXNlbmFtZShvYmoucGF0aCkKKyAgICBkZXN0ZmlsZSA9IG9zLnBhdGguam9p bihkZXN0ZGlyLCBmaWxlbmFtZSkKKyAgICAKKyAgICB1cmxvYmogPSB1cmxsaWIudXJsb3Blbih1 cmwpCisgICAgc2l6ZSA9IGxvbmcodXJsb2JqLmluZm8oKS5nZXRoZWFkZXIoJ0NvbnRlbnQtTGVu Z3RoJykpCisKKyAgICBkZWYgZG93bmxvYWRfY2FsbGJhY2soZG93bmxvYWRlZCwgYmxvY2tfc2l6 ZSwgdG90YWxfc2l6ZSk6IAorICAgICAgICBkb3dubG9hZGVkID0gYmxvY2tfc2l6ZSAqIGRvd25s b2FkZWQKKyAgICAgICAgaWYgZG93bmxvYWRlZCA+IHRvdGFsX3NpemU6CisgICAgICAgICAgICBk b3dubG9hZGVkID0gdG90YWxfc2l6ZQorICAgICAgICBzeXMuc3Rkb3V0LndyaXRlKCclcyAlZCBv ZiAlZCBieXRlcyBkb3dubG9hZGVkXHInICUgKGZpbGVuYW1lLCBkb3dubG9hZGVkLCB0b3RhbF9z aXplKSkKKyAgICAKKyAgICAjIE5COiBXZSBkb24ndCBjaGVjayBtb2RpZmllZCB0aW1lIGFzIFB5 dGhvbiBkb2Vzbid0IHlldCBoYW5kbGUgdGltZXpvbmUgY29udmVyc2lvbgorICAgICMgcHJvcGVy bHkgd2hlbiBjb252ZXJ0aW5nIHN0cmluZ3MgdG8gdGltZSBvYmplY3RzLgorICAgIGlmIG5vdCBv cy5wYXRoLmV4aXN0cyhkZXN0ZmlsZSkgb3Igb3MucGF0aC5nZXRzaXplKGRlc3RmaWxlKSAhPSBz aXplOgorICAgICAgICB1cmxsaWIudXJscmV0cmlldmUodXJsLCBkZXN0ZmlsZSwgZG93bmxvYWRf Y2FsbGJhY2spCisgICAgICAgIHByaW50ICcnCisgICAgICAgIHJldHVybiBkZXN0ZmlsZQorICAg IAorICAgIHJldHVybiBOb25lCisgICAgCitkZWYgdXBkYXRlX3d4X2RlcHMod2tfcm9vdCwgbXN2 Y192ZXJzaW9uPSdtc3ZjMjAwOCcpOgorICAgICIiIgorICAgIERvd25sb2FkIGFuZCB1cGRhdGUg dG9vbHMgbmVlZGVkIHRvIGJ1aWxkIHRoZSB3eCBwb3J0LgorICAgICIiIgorICAgIExvZ3MuaW5m bygnRW5zdXJpbmcgd3hXZWJLaXQgZGVwZW5kZW5jaWVzIGFyZSB1cC10by1kYXRlLicpCisgICAg CisgICAgd2tsaWJzX2RpciA9IG9zLnBhdGguam9pbih3a19yb290LCAnV2ViS2l0TGlicmFyaWVz JykKKyAgICB3YWYgPSBkb3dubG9hZF9pZl9uZXdlcignaHR0cDovL3d4d2Via2l0Lnd4Y29tbXVu aXR5LmNvbS9kb3dubG9hZHMvZGVwcy93YWYnLCBvcy5wYXRoLmpvaW4od2tfcm9vdCwgJ1dlYktp dFRvb2xzJywgJ3d4JykpCisgICAgaWYgd2FmOgorICAgICAgICAjIFRPRE86IE1ha2UgdGhlIGJ1 aWxkIHJlc3RhcnQgaXRzZWxmIGFmdGVyIGFuIHVwZGF0ZS4KKyAgICAgICAgTG9ncy53YXJuKCdC dWlsZCBzeXN0ZW0gdXBkYXRlZCwgcGxlYXNlIHJlc3RhcnQgYnVpbGQuJykKKyAgICAgICAgc3lz LmV4aXQoMSkKKworICAgICMgc2luY2UgdGhpcyBtb2R1bGUgaXMgc3RpbGwgZXhwZXJpbWVudGFs CisgICAgI3N3aWdfbW9kdWxlID0gZG93bmxvYWRfaWZfbmV3ZXIoJ2h0dHA6Ly93eHdlYmtpdC53 eGNvbW11bml0eS5jb20vZG93bmxvYWRzL2RlcHMvc3dpZy5weScsIG9zLnBhdGguam9pbih3a19y b290LCAnV2ViS2l0JywgJ3d4JywgJ2JpbmRpbmdzJywgJ3B5dGhvbicpKQorCisgICAgaWYgc3lz LnBsYXRmb3JtLnN0YXJ0c3dpdGgoJ3dpbicpOgorICAgICAgICBMb2dzLmluZm8oJ2Rvd25sb2Fk aW5nIGRlcHMgcGFja2FnZScpCisgICAgICAgIGFyY2hpdmUgPSBkb3dubG9hZF9pZl9uZXdlcign aHR0cDovL3d4d2Via2l0Lnd4Y29tbXVuaXR5LmNvbS9kb3dubG9hZHMvZGVwcy93eFdlYktpdERl cHMtJXMuemlwJyAlIG1zdmNfdmVyc2lvbiwgd2tsaWJzX2RpcikKKyAgICAgICAgaWYgYXJjaGl2 ZSBhbmQgb3MucGF0aC5leGlzdHMoYXJjaGl2ZSk6CisgICAgICAgICAgICBvcy5zeXN0ZW0oJ3Vu emlwIC1vICVzIC1kICVzJyAlIChhcmNoaXZlLCBvcy5wYXRoLmpvaW4od2tsaWJzX2RpciwgbXN2 Y192ZXJzaW9uKSkpCisgICAgCisgICAgZWxpZiBzeXMucGxhdGZvcm0uc3RhcnRzd2l0aCgnZGFy d2luJyk6CisgICAgICAgIG9zLnN5c3RlbSgnJXMvV2ViS2l0VG9vbHMvd3gvaW5zdGFsbC11bml4 LWV4dHJhcycgJSB3a19yb290KQorICAgICAgICAKK2RlZiBpbmNsdWRlRGlyc0ZvclNvdXJjZXMo c291cmNlcyk6CisgICAgaW5jbHVkZV9kaXJzID0gW10KKyAgICBmb3IgZ3JvdXAgaW4gc291cmNl czoKKyAgICAgICAgZm9yIHNvdXJjZSBpbiBncm91cDoKKyAgICAgICAgICAgIGRpcm5hbWUgPSBv cy5wYXRoLmRpcm5hbWUoc291cmNlKQorICAgICAgICAgICAgaWYgbm90IGRpcm5hbWUgaW4gaW5j bHVkZV9kaXJzOgorICAgICAgICAgICAgICAgIGluY2x1ZGVfZGlycy5hcHBlbmQoZGlybmFtZSkK KyAgICAgICAgICAgIAorICAgIHJldHVybiBpbmNsdWRlX2RpcnMKKworZGVmIGZsYXR0ZW5Tb3Vy Y2VzKHNvdXJjZXMpOgorICAgIGZsYXRfc291cmNlcyA9IFtdCisgICAgZm9yIGdyb3VwIGluIHNv dXJjZXM6CisgICAgICAgIGZsYXRfc291cmNlcy5leHRlbmQoZ3JvdXApCisgICAgICAgIAorICAg IHJldHVybiBmbGF0X3NvdXJjZXMKSW5kZXg6IFdlYktpdFRvb2xzL3d4L2J1aWxkL3NldHRpbmdz LnB5Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT0KLS0tIFdlYktpdFRvb2xzL3d4L2J1aWxkL3NldHRpbmdzLnB5CShyZXZp c2lvbiAwKQorKysgV2ViS2l0VG9vbHMvd3gvYnVpbGQvc2V0dGluZ3MucHkJKHJldmlzaW9uIDAp CkBAIC0wLDAgKzEsMjY1IEBACisjIENvcHlyaWdodCAoQykgMjAwOSBLZXZpbiBPbGxpdmllciAg QWxsIHJpZ2h0cyByZXNlcnZlZC4KKyMKKyMgUmVkaXN0cmlidXRpb24gYW5kIHVzZSBpbiBzb3Vy Y2UgYW5kIGJpbmFyeSBmb3Jtcywgd2l0aCBvciB3aXRob3V0CisjIG1vZGlmaWNhdGlvbiwgYXJl IHBlcm1pdHRlZCBwcm92aWRlZCB0aGF0IHRoZSBmb2xsb3dpbmcgY29uZGl0aW9ucworIyBhcmUg bWV0OgorIyAxLiBSZWRpc3RyaWJ1dGlvbnMgb2Ygc291cmNlIGNvZGUgbXVzdCByZXRhaW4gdGhl IGFib3ZlIGNvcHlyaWdodAorIyAgICBub3RpY2UsIHRoaXMgbGlzdCBvZiBjb25kaXRpb25zIGFu ZCB0aGUgZm9sbG93aW5nIGRpc2NsYWltZXIuCisjIDIuIFJlZGlzdHJpYnV0aW9ucyBpbiBiaW5h cnkgZm9ybSBtdXN0IHJlcHJvZHVjZSB0aGUgYWJvdmUgY29weXJpZ2h0CisjICAgIG5vdGljZSwg dGhpcyBsaXN0IG9mIGNvbmRpdGlvbnMgYW5kIHRoZSBmb2xsb3dpbmcgZGlzY2xhaW1lciBpbiB0 aGUKKyMgICAgZG9jdW1lbnRhdGlvbiBhbmQvb3Igb3RoZXIgbWF0ZXJpYWxzIHByb3ZpZGVkIHdp dGggdGhlIGRpc3RyaWJ1dGlvbi4KKyMKKyMgVEhJUyBTT0ZUV0FSRSBJUyBQUk9WSURFRCBCWSBB UFBMRSBDT01QVVRFUiwgSU5DLiBgYEFTIElTJycgQU5EIEFOWQorIyBFWFBSRVNTIE9SIElNUExJ RUQgV0FSUkFOVElFUywgSU5DTFVESU5HLCBCVVQgTk9UIExJTUlURUQgVE8sIFRIRQorIyBJTVBM SUVEIFdBUlJBTlRJRVMgT0YgTUVSQ0hBTlRBQklMSVRZIEFORCBGSVRORVNTIEZPUiBBIFBBUlRJ Q1VMQVIKKyMgUFVSUE9TRSBBUkUgRElTQ0xBSU1FRC4gIElOIE5PIEVWRU5UIFNIQUxMIEFQUExF IENPTVBVVEVSLCBJTkMuIE9SCisjIENPTlRSSUJVVE9SUyBCRSBMSUFCTEUgRk9SIEFOWSBESVJF Q1QsIElORElSRUNULCBJTkNJREVOVEFMLCBTUEVDSUFMLAorIyBFWEVNUExBUlksIE9SIENPTlNF UVVFTlRJQUwgREFNQUdFUyAoSU5DTFVESU5HLCBCVVQgTk9UIExJTUlURUQgVE8sCisjIFBST0NV UkVNRU5UIE9GIFNVQlNUSVRVVEUgR09PRFMgT1IgU0VSVklDRVM7IExPU1MgT0YgVVNFLCBEQVRB LCBPUgorIyBQUk9GSVRTOyBPUiBCVVNJTkVTUyBJTlRFUlJVUFRJT04pIEhPV0VWRVIgQ0FVU0VE IEFORCBPTiBBTlkgVEhFT1JZCisjIE9GIExJQUJJTElUWSwgV0hFVEhFUiBJTiBDT05UUkFDVCwg U1RSSUNUIExJQUJJTElUWSwgT1IgVE9SVAorIyAoSU5DTFVESU5HIE5FR0xJR0VOQ0UgT1IgT1RI RVJXSVNFKSBBUklTSU5HIElOIEFOWSBXQVkgT1VUIE9GIFRIRSBVU0UKKyMgT0YgVEhJUyBTT0ZU V0FSRSwgRVZFTiBJRiBBRFZJU0VEIE9GIFRIRSBQT1NTSUJJTElUWSBPRiBTVUNIIERBTUFHRS4g CisjCisjIENvbW1vbiBlbGVtZW50cyBvZiB0aGUgd2FmIGJ1aWxkIHN5c3RlbSBzaGFyZWQgYnkg YWxsIHByb2plY3RzLgorCitpbXBvcnQgY29tbWFuZHMKK2ltcG9ydCBvcworaW1wb3J0IHBsYXRm b3JtCitpbXBvcnQgc3lzCisKK2Zyb20gYnVpbGRfdXRpbHMgaW1wb3J0ICoKK2Zyb20gd2FmX2V4 dGVuc2lvbnMgaW1wb3J0ICoKKworIyB0byBiZSBtb3ZlZCB0byB3eCB3aGVuIGl0IHN1cHBvcnRz IG1vcmUgY29uZmlncworZnJvbSB3eHByZXNldHMgaW1wb3J0ICoKKword2tfcm9vdCA9IG9zLnBh dGguYWJzcGF0aChvcy5wYXRoLmpvaW4ob3MucGF0aC5kaXJuYW1lKF9fZmlsZV9fKSwgJy4uLy4u Ly4uJykpCisKK2lmIHN5cy5wbGF0Zm9ybS5zdGFydHN3aXRoKCd3aW4nKToKKyAgICBpZiBub3Qg J1dYV0lOJyBpbiBvcy5lbnZpcm9uOgorICAgICAgICBwcmludCAiUGxlYXNlIHNldCBXWFdJTiB0 byB0aGUgZGlyZWN0b3J5IGNvbnRhaW5pbmcgd3hXaWRnZXRzLiIKKyAgICAgICAgc3lzLmV4aXQo MSkKKworICAgIHd4X3Jvb3QgPSBvcy5lbnZpcm9uWydXWFdJTiddCitlbHNlOgorICAgIHd4X3Jv b3QgPSBjb21tYW5kcy5nZXRvdXRwdXQoJ3d4LWNvbmZpZyAtLXByZWZpeCcpCisKK2pzY29yZV9k aXIgPSBvcy5wYXRoLmpvaW4od2tfcm9vdCwgJ0phdmFTY3JpcHRDb3JlJykKK3dlYmNvcmVfZGly ID0gb3MucGF0aC5qb2luKHdrX3Jvb3QsICdXZWJDb3JlJykKK3drbGlic19kaXIgPSBvcy5wYXRo LmpvaW4od2tfcm9vdCwgJ1dlYktpdExpYnJhcmllcycpCisKK2NvbW1vbl9kZWZpbmVzID0gW10K K2NvbW1vbl9jeHhmbGFncyA9IFtdCitjb21tb25faW5jbHVkZXMgPSBbXQorY29tbW9uX2xpYnMg PSBbXQorY29tbW9uX2xpYnBhdGhzID0gW10KK2NvbW1vbl9mcmFtZXdvcmtzID0gW10KKworanNj b3JlX2RpcnMgPSBbCisgICAgJ0FQSScsCisgICAgJ2J5dGVjb2RlJywKKyAgICAnYnl0ZWNvbXBp bGVyJywKKyAgICAnZGVidWdnZXInLAorICAgICdEZXJpdmVkU291cmNlcycsCisgICAgJ2ludGVy cHJldGVyJywKKyAgICAnaml0JywKKyAgICAncGFyc2VyJywKKyAgICAncGNyZScsCisgICAgJ3By b2ZpbGVyJywKKyAgICAncnVudGltZScsCisgICAgJ3d0ZicsCisgICAgJ3d0Zi91bmljb2RlJywK KyAgICAnd3RmL3VuaWNvZGUvaWN1JywKK10KKword2ViY29yZV9kaXJzID0gWworICAgICdhY2Nl c3NpYmlsaXR5JywgCisgICAgJ2JpbmRpbmdzL2pzJywgCisgICAgJ2JyaWRnZScsIAorICAgICdi cmlkZ2UvYycsIAorICAgICdjc3MnLAorICAgICdEZXJpdmVkU291cmNlcycsCisgICAgJ2RvbScs CisgICAgJ2RvbS9kZWZhdWx0JywKKyAgICAnZWRpdGluZycsIAorICAgICdoaXN0b3J5JywgCisg ICAgJ2h0bWwnLCAKKyAgICAnaW5zcGVjdG9yJywgCisgICAgJ2xvYWRlcicsIAorICAgICdsb2Fk ZXIvYXBwY2FjaGUnLCAKKyAgICAnbG9hZGVyL2FyY2hpdmUnLCAKKyAgICAnbG9hZGVyL2ljb24n LCAKKyAgICAncGFnZScsIAorICAgICdwYWdlL2FuaW1hdGlvbicsIAorICAgICdwbGF0Zm9ybScs IAorICAgICdwbGF0Zm9ybS9hbmltYXRpb24nLCAKKyAgICAncGxhdGZvcm0vZ3JhcGhpY3MnLCAK KyAgICAncGxhdGZvcm0vZ3JhcGhpY3MvdHJhbnNmb3JtcycsCisgICAgJ3BsYXRmb3JtL2ltYWdl LWRlY29kZXJzJywKKyAgICAncGxhdGZvcm0vaW1hZ2UtZGVjb2RlcnMvYm1wJywgCisgICAgJ3Bs YXRmb3JtL2ltYWdlLWRlY29kZXJzL2dpZicsIAorICAgICdwbGF0Zm9ybS9pbWFnZS1kZWNvZGVy cy9pY28nLCAKKyAgICAncGxhdGZvcm0vaW1hZ2UtZGVjb2RlcnMvanBlZycsIAorICAgICdwbGF0 Zm9ybS9pbWFnZS1kZWNvZGVycy9wbmcnLCAKKyAgICAncGxhdGZvcm0vaW1hZ2UtZGVjb2RlcnMv eGJtJywgCisgICAgJ3BsYXRmb3JtL2ltYWdlLWRlY29kZXJzL3psaWInLCAKKyAgICAncGxhdGZv cm0vbmV0d29yaycsIAorICAgICdwbGF0Zm9ybS9zcWwnLCAKKyAgICAncGxhdGZvcm0vdGV4dCcs IAorICAgICdwbHVnaW5zJywgCisgICAgJ3JlbmRlcmluZycsIAorICAgICdyZW5kZXJpbmcvc3R5 bGUnLCAKKyAgICAnc3RvcmFnZScsIAorICAgICd4bWwnCitdCisKK2NvbmZpZ19maWxlID0gb3Mu cGF0aC5qb2luKHdrX3Jvb3QsICdXZWJLaXRCdWlsZCcsICdDb25maWd1cmF0aW9uJykKK2NvbmZp ZyA9ICdEZWJ1ZycKKworaWYgb3MucGF0aC5leGlzdHMoY29uZmlnX2ZpbGUpOgorICAgIGNvbmZp ZyA9IG9wZW4oY29uZmlnX2ZpbGUpLnJlYWQoKQorCitvdXRwdXRfZGlyID0gb3MucGF0aC5qb2lu KHdrX3Jvb3QsICdXZWJLaXRCdWlsZCcsIGNvbmZpZykKKword2FmX2NvbmZpZ25hbWUgPSBjb25m aWcudXBwZXIoKQorCitidWlsZF9wb3J0ID0gInd4IgorYnVpbGRpbmdfb25fd2luMzIgPSBzeXMu cGxhdGZvcm0uc3RhcnRzd2l0aCgnd2luJykKKworaWYgYnVpbGRpbmdfb25fd2luMzI6CisgICAg aWYgY29uZmlnID09ICdSZWxlYXNlJzoKKyAgICAgICAgd2FmX2NvbmZpZ25hbWUgPSB3YWZfY29u ZmlnbmFtZSArICcgQ1JUX01VTFRJVEhSRUFERURfRExMJworICAgIGVsc2U6CisgICAgICAgIHdh Zl9jb25maWduYW1lID0gd2FmX2NvbmZpZ25hbWUgKyAnIENSVF9NVUxUSVRIUkVBREVEX0RMTF9E QkcnCisKK2NyZWF0ZV9oYXNoX3RhYmxlID0gd2tfcm9vdCArICIvSmF2YVNjcmlwdENvcmUvY3Jl YXRlX2hhc2hfdGFibGUiCitpZiBidWlsZGluZ19vbl93aW4zMjoKKyAgICBjcmVhdGVfaGFzaF90 YWJsZSA9IGdldF9vdXRwdXQoJ2N5Z3BhdGggLS11bml4ICIlcyInICUgY3JlYXRlX2hhc2hfdGFi bGUpCitvcy5lbnZpcm9uWydDUkVBVEVfSEFTSF9UQUJMRSddID0gY3JlYXRlX2hhc2hfdGFibGUK KworZmVhdHVyZV9kZWZpbmVzID0gWydFTkFCTEVfREFUQUJBU0UnLCAnRU5BQkxFX1hTTFQnLCAn RU5BQkxFX0pBVkFTQ1JJUFRfREVCVUdHRVInXQorCitkZWYgY29tbW9uX3NldF9vcHRpb25zKG9w dCk6CisgICAgIiIiCisgICAgSW5pdGlhbGl6ZSBjb21tb24gb3B0aW9ucyBwcm92aWRlZCB0byB0 aGUgdXNlci4KKyAgICAiIiIKKyAgICBvcHQudG9vbF9vcHRpb25zKCdjb21waWxlcl9jeHgnKQor ICAgIG9wdC50b29sX29wdGlvbnMoJ2NvbXBpbGVyX2NjJykKKyAgICBvcHQudG9vbF9vcHRpb25z KCdweXRob24nKQorICAgIAorICAgIG9wdC5hZGRfb3B0aW9uKCctLXd4cHl0aG9uJywgYWN0aW9u PSdzdG9yZV90cnVlJywgZGVmYXVsdD1GYWxzZSwgaGVscD0nQ3JlYXRlIHRoZSB3eFB5dGhvbiBi aW5kaW5ncy4nKQorCitkZWYgY29tbW9uX2NvbmZpZ3VyZShjb25mKToKKyAgICAiIiIKKyAgICBD b25maWd1cmF0aW9uIHVzZWQgYnkgYWxsIHRhcmdldHMsIGNhbGxlZCBmcm9tIHRoZSB0YXJnZXQn cyBjb25maWd1cmUoKSBzdGVwLgorICAgICIiIgorICAgIGNvbmYuY2hlY2tfdG9vbCgnY29tcGls ZXJfY3h4JykKKyAgICBjb25mLmNoZWNrX3Rvb2woJ2NvbXBpbGVyX2NjJykKKyAgICBjb25mLmNo ZWNrX3Rvb2woJ3B5dGhvbicpCisgICAgY29uZi5jaGVja19weXRob25faGVhZGVycygpCisgICAg CisgICAgaWYgc3lzLnBsYXRmb3JtLnN0YXJ0c3dpdGgoJ2RhcndpbicpOgorICAgICAgICBjb25m LmNoZWNrX3Rvb2woJ29zeCcpCisgICAgCisgICAgbXN2Y192ZXJzaW9uID0gJ21zdmMyMDA4Jwor ICAgIGlmIGJ1aWxkaW5nX29uX3dpbjMyOgorICAgICAgICBmb3VuZF92ZXJzaW9ucyA9IGNvbmYu Z2V0X21zdmNfdmVyc2lvbnMoKQorICAgICAgICBpZiBmb3VuZF92ZXJzaW9uc1swXVswXSA9PSAn bXN2YyA5LjAnOgorICAgICAgICAgICAgbXN2Y192ZXJzaW9uID0gJ21zdmMyMDA4JworICAgICAg ICBlbGlmIGZvdW5kX3ZlcnNpb25zWzBdWzBdID09ICdtc3ZjIDguMCc6CisgICAgICAgICAgICBt c3ZjX3ZlcnNpb24gPSAnbXN2YzIwMDUnCisgICAgICAgCisgICAgbXN2Y2xpYnNfZGlyID0gJycK KyAgICBpZiBidWlsZF9wb3J0ID09ICJ3eCI6CisgICAgICAgIHVwZGF0ZV93eF9kZXBzKHdrX3Jv b3QsIG1zdmNfdmVyc2lvbikKKyAgICAgICAgbXN2Y2xpYnNfZGlyID0gb3MucGF0aC5qb2luKHdr bGlic19kaXIsIG1zdmNfdmVyc2lvbiwgJ3dpbicpCisgICAgCisgICAgICAgIGNvbmYuZW52LmFw cGVuZF92YWx1ZSgnQ1hYREVGSU5FUycsIFsnQlVJTERJTkdfV1hfXz0xJywgJ1dURl9VU0VfV1hH Qz0xJ10pCisKKyAgICAgICAgaWYgYnVpbGRpbmdfb25fd2luMzI6CisgICAgICAgICAgICBjb25m LmVudi5hcHBlbmRfdmFsdWUoJ0xJQlBBVEgnLCBvcy5wYXRoLmpvaW4obXN2Y2xpYnNfZGlyLCAn bGliJykpCisgICAgICAgICAgICAjIHd4IHNldHRpbmdzCisgICAgICAgICAgICB3eGRlZmluZXMs IHd4aW5jbHVkZXMsIHd4bGlicywgd3hsaWJwYXRocyA9IGdldF93eG1zd19zZXR0aW5ncyh3eF9y b290LCBzaGFyZWQ9VHJ1ZSwgdW5pY29kZT1UcnVlLCB3eFB5dGhvbj1UcnVlKQorICAgICAgICAg ICAgY29uZi5lbnZbJ0NYWERFRklORVNfV1gnXSA9IHd4ZGVmaW5lcworICAgICAgICAgICAgY29u Zi5lbnZbJ0NQUFBBVEhfV1gnXSA9IHd4aW5jbHVkZXMKKyAgICAgICAgICAgIGNvbmYuZW52WydM SUJfV1gnXSA9IHd4bGlicworICAgICAgICAgICAgY29uZi5lbnZbJ0xJQlBBVEhfV1gnXSA9IHd4 bGlicGF0aHMKKyAgICAKKyAgICBpZiBzeXMucGxhdGZvcm0uc3RhcnRzd2l0aCgnZGFyd2luJyk6 CisgICAgICAgIGNvbmYuZW52WydMSUJfSUNVJ10gPSBbJ2ljdWNvcmUnXQorICAgICAgICAjIEFw cGxlIGRvZXMgbm90IHNoaXAgdGhlIElDVSBoZWFkZXJzIHdpdGggTWFjIE9TIFgsIHNvIFdlYktp dCBpbmNsdWRlcyBhIGNvcHkgb2YgMy4yIGhlYWRlcnMKKyAgICAgICAgY29uZi5lbnZbJ0NQUFBB VEhfSUNVJ10gPSBbb3MucGF0aC5qb2luKGpzY29yZV9kaXIsICdpY3UnKSwgb3MucGF0aC5qb2lu KHdlYmNvcmVfZGlyLCAnaWN1JyldCisgICAgCisgICAgICAgIGNvbmYuZW52LmFwcGVuZF92YWx1 ZSgnQ1BQUEFUSCcsIHdrbGlic19kaXIpCisgICAgICAgIGNvbmYuZW52LmFwcGVuZF92YWx1ZSgn TElCUEFUSCcsIHdrbGlic19kaXIpCisgICAgCisgICAgI2NvbmYuZW52WydQUkVGSVgnXSA9IG91 dHB1dF9kaXIKKyAgICAKKyAgICBsaWJwcmVmaXggPSAnJworICAgIGlmIGJ1aWxkaW5nX29uX3dp bjMyOgorICAgICAgICBsaWJwcmVmaXggPSAnbGliJworICAgIAorICAgIGNvbmYuZW52WydMSUJf SlNDT1JFJ10gPSBbbGlicHJlZml4ICsgJ2pzY29yZSddCisgICAgY29uZi5lbnZbJ0xJQl9XRUJD T1JFJ10gPSBbbGlicHJlZml4ICsgJ3dlYmNvcmUnXQorICAgIGNvbmYuZW52WydMSUJfV1hXRUJL SVQnXSA9IFsnd3h3ZWJraXQnXQorICAgIGNvbmYuZW52WydDWFhERUZJTkVTX1dYV0VCS0lUJ10g PSBbJ1dYVVNJTkdETExfV0VCS0lUJ10KKyAgICAKKyAgICBjb25mLmVudi5hcHBlbmRfdmFsdWUo J0NYWERFRklORVMnLCBmZWF0dXJlX2RlZmluZXMpCisgICAgaWYgY29uZmlnID09ICdSZWxlYXNl JzoKKyAgICAgICAgY29uZi5lbnYuYXBwZW5kX3ZhbHVlKCdDUFBERUZJTkVTJywgJ05ERUJVRycp CisgICAgICAgIAorICAgIGlmIGJ1aWxkaW5nX29uX3dpbjMyOgorICAgICAgICBjb25mLmVudi5h cHBlbmRfdmFsdWUoJ0NQUFBBVEgnLCBbCisgICAgICAgICAgICBvcy5wYXRoLmpvaW4oanNjb3Jl X2RpciwgJ29zLXdpbjMyJyksCisgICAgICAgICAgICBvcy5wYXRoLmpvaW4obXN2Y2xpYnNfZGly LCAnaW5jbHVkZScpLAorICAgICAgICAgICAgb3MucGF0aC5qb2luKG1zdmNsaWJzX2RpciwgJ2lu Y2x1ZGUnLCAncHRocmVhZHMnKSwKKyAgICAgICAgICAgIG9zLnBhdGguam9pbihtc3ZjbGlic19k aXIsICdsaWInKSwKKyAgICAgICAgICAgIF0pCisgICAgICAgICAgICAKKyAgICAgICAgY29uZi5l bnYuYXBwZW5kX3ZhbHVlKCdMSUInLCBbJ2xpYnBuZycsICdsaWJqcGVnJywgJ3B0aHJlYWRWQzIn XSkKKyAgICAgICAgIyBjb21tb24gd2luIGxpYnMKKyAgICAgICAgY29uZi5lbnYuYXBwZW5kX3Zh bHVlKCdMSUInLCBbCisgICAgICAgICAgICAna2VybmVsMzInLCAndXNlcjMyJywnZ2RpMzInLCdj b21kbGczMicsJ3dpbnNwb29sJywnd2lubW0nLAorICAgICAgICAgICAgJ3NoZWxsMzInLCAnY29t Y3RsMzInLCAnb2xlMzInLCAnb2xlYXV0MzInLCAndXVpZCcsICdhZHZhcGkzMicsIAorICAgICAg ICAgICAgJ3dzb2NrMzInLCAnZ2RpcGx1cyddKQorCisgICAgICAgIGNvbmYuZW52WydMSUJfSUNV J10gPSBbJ2ljdWR0JywgJ2ljdWxlJywgJ2ljdWx4JywgJ2ljdXVjJywgJ2ljdWluJywgJ2ljdWlv JywgJ2ljdXR1J10KKyAgICAgICAgCisgICAgICAgICNjdXJsCisgICAgICAgIGNvbmYuZW52WydM SUJfQ1VSTCddID0gWydsaWJjdXJsJ10KKyAgICAgICAgCisgICAgICAgICNzcWxpdGUzCisgICAg ICAgIGNvbmYuZW52WydDUFBQQVRIX1NRTElURTMnXSA9IFtvcy5wYXRoLmpvaW4obXN2Y2xpYnNf ZGlyLCAnaW5jbHVkZScsICdTUUxpdGUnKV0KKyAgICAgICAgY29uZi5lbnZbJ0xJQl9TUUxJVEUz J10gPSBbJ3NxbGl0ZTMnXQorICAgICAgICAKKyAgICAgICAgI2xpYnhtbDIKKyAgICAgICAgY29u Zi5lbnZbJ0xJQl9YTUwnXSA9IFsnbGlieG1sMiddCisgICAgICAgIAorICAgICAgICAjbGlieHNs dAorICAgICAgICBjb25mLmVudlsnTElCX1hTTFQnXSA9IFsnbGlieHNsdCddCisgICAgZWxzZTog ICAgCisgICAgICAgIGlmIGJ1aWxkX3BvcnQgPT0gJ3d4JzoKKyAgICAgICAgICAgIGNvbmYuZW52 LmFwcGVuZF92YWx1ZSgnTElCJywgWydwbmcnLCAncHRocmVhZCddKQorICAgICAgICAgICAgY29u Zi5lbnYuYXBwZW5kX3ZhbHVlKCdMSUJQQVRIJywgb3MucGF0aC5qb2luKHdrbGlic19kaXIsICd1 bml4JywgJ2xpYicpKQorICAgICAgICAgICAgY29uZi5lbnYuYXBwZW5kX3ZhbHVlKCdDUFBQQVRI Jywgb3MucGF0aC5qb2luKHdrbGlic19kaXIsICd1bml4JywgJ2luY2x1ZGUnKSkKKyAgICAgICAg ICAgIGNvbmYuZW52LmFwcGVuZF92YWx1ZSgnQ1hYRkxBR1MnLCBbJy1mUElDJywgJy1EUElDJ10p CisgICAgICAgICAgICAKKyAgICAgICAgICAgIGNvbmYuY2hlY2tfY2ZnKHBhdGg9J3d4LWNvbmZp ZycsIGFyZ3M9Jy0tY3h4ZmxhZ3MgLS1saWJzJywgcGFja2FnZT0nJywgdXNlbGliX3N0b3JlPSdX WCcpCisgICAgICAgICAgICAKKyAgICAgICAgY29uZi5jaGVja19jZmcocGF0aD0neHNsdC1jb25m aWcnLCBhcmdzPSctLWNmbGFncyAtLWxpYnMnLCBwYWNrYWdlPScnLCB1c2VsaWJfc3RvcmU9J1hT TFQnKQorICAgICAgICBjb25mLmNoZWNrX2NmZyhwYXRoPSd4bWwyLWNvbmZpZycsIGFyZ3M9Jy0t Y2ZsYWdzIC0tbGlicycsIHBhY2thZ2U9JycsIHVzZWxpYl9zdG9yZT0nWE1MJykKKyAgICAgICAg Y29uZi5jaGVja19jZmcocGF0aD0nY3VybC1jb25maWcnLCBhcmdzPSctLWNmbGFncyAtLWxpYnMn LCBwYWNrYWdlPScnLCB1c2VsaWJfc3RvcmU9J0NVUkwnKQorICAgICAgICBpZiBzeXMucGxhdGZv cm0uc3RhcnRzd2l0aCgnZGFyd2luJyk6CisgICAgICAgICAgICBjb25mLmVudi5hcHBlbmRfdmFs dWUoJ0xJQicsIFsnV2ViQ29yZVNRTGl0ZTMnXSkKKyAgICAgICAgCisgICAgICAgIGlmIG5vdCBz eXMucGxhdGZvcm0uc3RhcnRzd2l0aCgnZGFyd2luJyk6CisgICAgICAgICAgICBjb25mLmNoZWNr X2NmZyhwYWNrYWdlPSdjYWlybycsIGFyZ3M9Jy0tY2ZsYWdzIC0tbGlicycsIHVzZWxpYl9zdG9y ZT0nV1gnKQorICAgICAgICAgICAgY29uZi5jaGVja19jZmcocGFja2FnZT0ncGFuZ28nLCBhcmdz PSctLWNmbGFncyAtLWxpYnMnLCB1c2VsaWJfc3RvcmU9J1dYJykKKyAgICAgICAgICAgIGNvbmYu Y2hlY2tfY2ZnKHBhY2thZ2U9J2d0aystMi4wJywgYXJncz0nLS1jZmxhZ3MgLS1saWJzJywgdXNl bGliX3N0b3JlPSdXWCcpCisgICAgICAgICAgICBjb25mLmNoZWNrX2NmZyhwYWNrYWdlPSdzcWxp dGUzJywgYXJncz0nLS1jZmxhZ3MgLS1saWJzJywgdXNlbGliX3N0b3JlPSdTUUxJVEUzJykKKyAg ICAgICAgICAgIGNvbmYuY2hlY2tfY2ZnKHBhdGg9J2ljdS1jb25maWcnLCBhcmdzPSctLWNmbGFn cyAtLWxkZmxhZ3MnLCBwYWNrYWdlPScnLCB1c2VsaWJfc3RvcmU9J0lDVScpCisKKworCisKSW5k ZXg6IFdlYktpdFRvb2xzL3d4L2J1aWxkL3d4cHJlc2V0cy5weQo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJL aXRUb29scy93eC9idWlsZC93eHByZXNldHMucHkJKHJldmlzaW9uIDApCisrKyBXZWJLaXRUb29s cy93eC9idWlsZC93eHByZXNldHMucHkJKHJldmlzaW9uIDApCkBAIC0wLDAgKzEsNzggQEAKKyMg Q29weXJpZ2h0IChDKSAyMDA5IEtldmluIE9sbGl2aWVyICBBbGwgcmlnaHRzIHJlc2VydmVkLgor IworIyBSZWRpc3RyaWJ1dGlvbiBhbmQgdXNlIGluIHNvdXJjZSBhbmQgYmluYXJ5IGZvcm1zLCB3 aXRoIG9yIHdpdGhvdXQKKyMgbW9kaWZpY2F0aW9uLCBhcmUgcGVybWl0dGVkIHByb3ZpZGVkIHRo YXQgdGhlIGZvbGxvd2luZyBjb25kaXRpb25zCisjIGFyZSBtZXQ6CisjIDEuIFJlZGlzdHJpYnV0 aW9ucyBvZiBzb3VyY2UgY29kZSBtdXN0IHJldGFpbiB0aGUgYWJvdmUgY29weXJpZ2h0CisjICAg IG5vdGljZSwgdGhpcyBsaXN0IG9mIGNvbmRpdGlvbnMgYW5kIHRoZSBmb2xsb3dpbmcgZGlzY2xh aW1lci4KKyMgMi4gUmVkaXN0cmlidXRpb25zIGluIGJpbmFyeSBmb3JtIG11c3QgcmVwcm9kdWNl IHRoZSBhYm92ZSBjb3B5cmlnaHQKKyMgICAgbm90aWNlLCB0aGlzIGxpc3Qgb2YgY29uZGl0aW9u cyBhbmQgdGhlIGZvbGxvd2luZyBkaXNjbGFpbWVyIGluIHRoZQorIyAgICBkb2N1bWVudGF0aW9u IGFuZC9vciBvdGhlciBtYXRlcmlhbHMgcHJvdmlkZWQgd2l0aCB0aGUgZGlzdHJpYnV0aW9uLgor IworIyBUSElTIFNPRlRXQVJFIElTIFBST1ZJREVEIEJZIEFQUExFIENPTVBVVEVSLCBJTkMuIGBg QVMgSVMnJyBBTkQgQU5ZCisjIEVYUFJFU1MgT1IgSU1QTElFRCBXQVJSQU5USUVTLCBJTkNMVURJ TkcsIEJVVCBOT1QgTElNSVRFRCBUTywgVEhFCisjIElNUExJRUQgV0FSUkFOVElFUyBPRiBNRVJD SEFOVEFCSUxJVFkgQU5EIEZJVE5FU1MgRk9SIEEgUEFSVElDVUxBUgorIyBQVVJQT1NFIEFSRSBE SVNDTEFJTUVELiAgSU4gTk8gRVZFTlQgU0hBTEwgQVBQTEUgQ09NUFVURVIsIElOQy4gT1IKKyMg Q09OVFJJQlVUT1JTIEJFIExJQUJMRSBGT1IgQU5ZIERJUkVDVCwgSU5ESVJFQ1QsIElOQ0lERU5U QUwsIFNQRUNJQUwsCisjIEVYRU1QTEFSWSwgT1IgQ09OU0VRVUVOVElBTCBEQU1BR0VTIChJTkNM VURJTkcsIEJVVCBOT1QgTElNSVRFRCBUTywKKyMgUFJPQ1VSRU1FTlQgT0YgU1VCU1RJVFVURSBH T09EUyBPUiBTRVJWSUNFUzsgTE9TUyBPRiBVU0UsIERBVEEsIE9SCisjIFBST0ZJVFM7IE9SIEJV U0lORVNTIElOVEVSUlVQVElPTikgSE9XRVZFUiBDQVVTRUQgQU5EIE9OIEFOWSBUSEVPUlkKKyMg T0YgTElBQklMSVRZLCBXSEVUSEVSIElOIENPTlRSQUNULCBTVFJJQ1QgTElBQklMSVRZLCBPUiBU T1JUCisjIChJTkNMVURJTkcgTkVHTElHRU5DRSBPUiBPVEhFUldJU0UpIEFSSVNJTkcgSU4gQU5Z IFdBWSBPVVQgT0YgVEhFIFVTRQorIyBPRiBUSElTIFNPRlRXQVJFLCBFVkVOIElGIEFEVklTRUQg T0YgVEhFIFBPU1NJQklMSVRZIE9GIFNVQ0ggREFNQUdFLiAKKyMKKyMgTGlicmFyeSBmb3IgZnVu Y3Rpb25zIHRvIGRldGVybWluZSB3eCBzZXR0aW5ncyBiYXNlZCBvbiBjb25maWd1cmF0aW9uCisK K2ltcG9ydCBvcworCitkZWYgZ2V0X3d4bXN3X3NldHRpbmdzKHd4X3Jvb3QsIHNoYXJlZCA9IEZh bHNlLCB1bmljb2RlID0gRmFsc2UsIGRlYnVnID0gRmFsc2UsIHd4UHl0aG9uPUZhbHNlKToKKyAg ICBpZiBub3Qgb3MucGF0aC5leGlzdHMod3hfcm9vdCk6CisgICAgICAgIHByaW50ICJEaXJlY3Rv cnkgJXMgZG9lcyBub3QgZXhpc3QuIiAlIHd4X3Jvb3QKKyAgICAgICAgc3lzLmV4aXQoMSkKKwor ICAgIGRlZmluZXMgPSBbJ19fV1hNU1dfXyddCisgICAgaW5jbHVkZXMgPSBbb3MucGF0aC5qb2lu KHd4X3Jvb3QsICdpbmNsdWRlJyldCisgICAgY3h4ZmxhZ3MgPSBbXQorICAgIGxpYnMgPSBbXQor ICAgIGxpYnBhdGhzID0gW10KKyAgICAKKyAgICBsaWJkaXIgPSBvcy5wYXRoLmpvaW4od3hfcm9v dCwgJ2xpYicpCisgICAgZXh0ID0gJycKKyAgICBwb3N0Zml4ID0gJ3ZjJworICAgIAorICAgIGlm IHNoYXJlZDoKKyAgICAgICAgZGVmaW5lcy5hcHBlbmQoJ1dYVVNJTkdETEwnKQorICAgICAgICBs aWJkaXIgPSBvcy5wYXRoLmpvaW4obGliZGlyLCAndmNfZGxsJykKKyAgICBlbHNlOgorICAgICAg ICBsaWJkaXIgPSBvcy5wYXRoLmpvaW4obGliZGlyLCAndmNfbGliJykKKyAgICAgICAgCisgICAg aWYgdW5pY29kZToKKyAgICAgICAgZGVmaW5lcy5hcHBlbmQoJ19VTklDT0RFJykKKyAgICAgICAg ZXh0ICs9ICd1JworICAgIAorICAgIGRlcGV4dCA9ICcnCisgICAgaWYgd3hQeXRob246CisgICAg ICAgIGV4dCArPSAnaCcKKyAgICAgICAgZGVwZXh0ICs9ICdoJworICAgIGVsaWYgZGVidWc6Cisg ICAgICAgIGV4dCArPSAnZCcKKyAgICAgICAgZGVwZXh0ICs9ICdkJworCisgICAgY29uZmlnZGly ID0gb3MucGF0aC5qb2luKGxpYmRpciwgJ21zdycgKyBleHQpCisgICAgbGlicGF0aHMuYXBwZW5k KGxpYmRpcikKKyAgICBpbmNsdWRlcy5hcHBlbmQoY29uZmlnZGlyKQorICAgIAorICAgIGRlZiBn ZXRfd3hsaWJfbmFtZShuYW1lKToKKyAgICAgICAgcHJlZml4ID0gJ3d4bXN3JworICAgICAgICBp ZiBuYW1lID09ICdiYXNlJzoKKyAgICAgICAgICAgIHJldHVybiAnd3hiYXNlMjglcycgJSAoZXh0 KQorICAgICAgICAKKyAgICAgICAgcmV0dXJuICJ3eG1zdzI4JXNfJXMiICUgKGV4dCwgbmFtZSkK KyAgICAKKyAgICBsaWJzLmV4dGVuZChbJ3d4emxpYicgKyBkZXBleHQsICd3eGpwZWcnICsgZGVw ZXh0LCAnd3hwbmcnICsgZGVwZXh0LCAnd3hleHBhdCcgKyBkZXBleHRdKQorICAgIGxpYnMuZXh0 ZW5kKFtnZXRfd3hsaWJfbmFtZSgnYmFzZScpLCBnZXRfd3hsaWJfbmFtZSgnY29yZScpXSkKKyAg ICAKKyAgICBpZiB3eFB5dGhvbiBvciBkZWJ1ZzoKKyAgICAgICAgZGVmaW5lcy5hcHBlbmQoJ19f V1hERUJVR19fJykKKyAgICAgICAgCisgICAgcmV0dXJuIChkZWZpbmVzLCBpbmNsdWRlcywgbGli cywgbGlicGF0aHMpCg== 33400 2009-07-23 18:32:47 -0700 2009-08-02 01:54:34 -0700 JSCore waf build script jscore_waf.patch text/plain 4776 kevino SW5kZXg6IEphdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBKYXZhU2NyaXB0 Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDQ2MzAyKQorKysgSmF2YVNjcmlwdENvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDUgKzEsMTQgQEAKIDIwMDktMDctMjMgIEtldmluIE9s bGl2aWVyICA8a2V2aW5vQHRoZW9sbGl2aWVycy5jb20+CiAKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgU2NyaXB0IGZvciBidWlsZGluZyB0aGUgSmF2YVNj cmlwdENvcmUgbGlicmFyeSBmb3Igd3guCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD0yNzYxOQorCisgICAgICAgICogd3NjcmlwdDogQWRkZWQuCisKKzIw MDktMDctMjMgIEtldmluIE9sbGl2aWVyICA8a2V2aW5vQHRoZW9sbGl2aWVycy5jb20+CisKICAg ICAgICAgd3ggYnVpbGQgZml4LCBhZGRpbmcgbWlzc2luZyBoZWFkZXIuCiAKICAgICAgICAgKiBq aXQvSklULmNwcDoKSW5kZXg6IEphdmFTY3JpcHRDb3JlL3dzY3JpcHQKPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g SmF2YVNjcmlwdENvcmUvd3NjcmlwdAkocmV2aXNpb24gMCkKKysrIEphdmFTY3JpcHRDb3JlL3dz Y3JpcHQJKHJldmlzaW9uIDApCkBAIC0wLDAgKzEsMTA2IEBACisjISAvdXNyL2Jpbi9lbnYgcHl0 aG9uCisKKyMgQ29weXJpZ2h0IChDKSAyMDA5IEtldmluIE9sbGl2aWVyICBBbGwgcmlnaHRzIHJl c2VydmVkLgorIworIyBSZWRpc3RyaWJ1dGlvbiBhbmQgdXNlIGluIHNvdXJjZSBhbmQgYmluYXJ5 IGZvcm1zLCB3aXRoIG9yIHdpdGhvdXQKKyMgbW9kaWZpY2F0aW9uLCBhcmUgcGVybWl0dGVkIHBy b3ZpZGVkIHRoYXQgdGhlIGZvbGxvd2luZyBjb25kaXRpb25zCisjIGFyZSBtZXQ6CisjIDEuIFJl ZGlzdHJpYnV0aW9ucyBvZiBzb3VyY2UgY29kZSBtdXN0IHJldGFpbiB0aGUgYWJvdmUgY29weXJp Z2h0CisjICAgIG5vdGljZSwgdGhpcyBsaXN0IG9mIGNvbmRpdGlvbnMgYW5kIHRoZSBmb2xsb3dp bmcgZGlzY2xhaW1lci4KKyMgMi4gUmVkaXN0cmlidXRpb25zIGluIGJpbmFyeSBmb3JtIG11c3Qg cmVwcm9kdWNlIHRoZSBhYm92ZSBjb3B5cmlnaHQKKyMgICAgbm90aWNlLCB0aGlzIGxpc3Qgb2Yg Y29uZGl0aW9ucyBhbmQgdGhlIGZvbGxvd2luZyBkaXNjbGFpbWVyIGluIHRoZQorIyAgICBkb2N1 bWVudGF0aW9uIGFuZC9vciBvdGhlciBtYXRlcmlhbHMgcHJvdmlkZWQgd2l0aCB0aGUgZGlzdHJp YnV0aW9uLgorIworIyBUSElTIFNPRlRXQVJFIElTIFBST1ZJREVEIEJZIEFQUExFIENPTVBVVEVS LCBJTkMuIGBgQVMgSVMnJyBBTkQgQU5ZCisjIEVYUFJFU1MgT1IgSU1QTElFRCBXQVJSQU5USUVT LCBJTkNMVURJTkcsIEJVVCBOT1QgTElNSVRFRCBUTywgVEhFCisjIElNUExJRUQgV0FSUkFOVElF UyBPRiBNRVJDSEFOVEFCSUxJVFkgQU5EIEZJVE5FU1MgRk9SIEEgUEFSVElDVUxBUgorIyBQVVJQ T1NFIEFSRSBESVNDTEFJTUVELiAgSU4gTk8gRVZFTlQgU0hBTEwgQVBQTEUgQ09NUFVURVIsIElO Qy4gT1IKKyMgQ09OVFJJQlVUT1JTIEJFIExJQUJMRSBGT1IgQU5ZIERJUkVDVCwgSU5ESVJFQ1Qs IElOQ0lERU5UQUwsIFNQRUNJQUwsCisjIEVYRU1QTEFSWSwgT1IgQ09OU0VRVUVOVElBTCBEQU1B R0VTIChJTkNMVURJTkcsIEJVVCBOT1QgTElNSVRFRCBUTywKKyMgUFJPQ1VSRU1FTlQgT0YgU1VC U1RJVFVURSBHT09EUyBPUiBTRVJWSUNFUzsgTE9TUyBPRiBVU0UsIERBVEEsIE9SCisjIFBST0ZJ VFM7IE9SIEJVU0lORVNTIElOVEVSUlVQVElPTikgSE9XRVZFUiBDQVVTRUQgQU5EIE9OIEFOWSBU SEVPUlkKKyMgT0YgTElBQklMSVRZLCBXSEVUSEVSIElOIENPTlRSQUNULCBTVFJJQ1QgTElBQklM SVRZLCBPUiBUT1JUCisjIChJTkNMVURJTkcgTkVHTElHRU5DRSBPUiBPVEhFUldJU0UpIEFSSVNJ TkcgSU4gQU5ZIFdBWSBPVVQgT0YgVEhFIFVTRQorIyBPRiBUSElTIFNPRlRXQVJFLCBFVkVOIElG IEFEVklTRUQgT0YgVEhFIFBPU1NJQklMSVRZIE9GIFNVQ0ggREFNQUdFLiAKKyMKKyMgSmF2YVNj cmlwdENvcmUgYnVpbGQgc2NyaXB0IGZvciB0aGUgd2FmIGJ1aWxkIHN5c3RlbQorCitpbXBvcnQg Y29tbWFuZHMKKworZnJvbSBzZXR0aW5ncyBpbXBvcnQgKgorCitqc2NvcmVfZXhjbHVkZXMgPSBb J2pzYy5jcHAnLCAndWNwdGFibGUuY3BwJywgJ0dPd25QdHIuY3BwJ10KK2pzY29yZV9leGNsdWRl cy5leHRlbmQoZ2V0X2V4Y2x1ZGVzKGpzY29yZV9kaXIsIFsnKkNGLmNwcCddKSkKKworc291cmNl cyA9IFtdCisKK2pzY29yZV9leGNsdWRlcy5leHRlbmQoZ2V0X2V4Y2x1ZGVzKGpzY29yZV9kaXIs IFsnKldpbi5jcHAnLCAnKk5vbmUuY3BwJ10pKQorCitpZiBidWlsZGluZ19vbl93aW4zMjoKKyAg ICBqc2NvcmVfZXhjbHVkZXMuYXBwZW5kKCdFeGVjdXRhYmxlQWxsb2NhdG9yUG9zaXguY3BwJykK KyAgICBzb3VyY2VzLmFwcGVuZCgnaml0L0V4ZWN1dGFibGVBbGxvY2F0b3JXaW4uY3BwJykKK2Vs c2U6CisgICAganNjb3JlX2V4Y2x1ZGVzLmFwcGVuZCgnSlNTdHJpbmdSZWZCU1RSLmNwcCcpCisK K2RlZiBnZW5lcmF0ZV9qc2NvcmVfZGVyaXZlZF9zb3VyY2VzKCk6CisgICAgIyBidWlsZCB0aGUg ZGVyaXZlZCBzb3VyY2VzCisgICAganNfZGlyID0ganNjb3JlX2RpcgorICAgIGlmIGJ1aWxkaW5n X29uX3dpbjMyOgorICAgICAgICBqc19kaXIgPSBnZXRfb3V0cHV0KCdjeWdwYXRoIC0tdW5peCAi JXMiJyAlIGpzX2RpcikKKyAgICBkZXJpdmVkX3NvdXJjZXNfZGlyID0gb3MucGF0aC5qb2luKGpz Y29yZV9kaXIsICdEZXJpdmVkU291cmNlcycpCisgICAgaWYgbm90IG9zLnBhdGguZXhpc3RzKGRl cml2ZWRfc291cmNlc19kaXIpOgorICAgICAgICBvcy5ta2RpcihkZXJpdmVkX3NvdXJjZXNfZGly KQorCisgICAgb2xkZGlyID0gb3MuZ2V0Y3dkKCkKKyAgICBvcy5jaGRpcihkZXJpdmVkX3NvdXJj ZXNfZGlyKQorCisgICAgY29tbWFuZCA9ICdtYWtlIC1mICVzL0Rlcml2ZWRTb3VyY2VzLm1ha2Ug SmF2YVNjcmlwdENvcmU9JXMgQlVJTFRfUFJPRFVDVFNfRElSPSVzIGFsbCBGRUFUVVJFX0RFRklO RVM9IiVzIicgJSAoanNfZGlyLCBqc19kaXIsIGpzX2RpciwgJyAnLmpvaW4oZmVhdHVyZV9kZWZp bmVzKSkKKyAgICBvcy5zeXN0ZW0oY29tbWFuZCkKKyAgICBvcy5jaGRpcihvbGRkaXIpCisKK2Rl ZiBzZXRfb3B0aW9ucyhvcHQpOgorICAgIGNvbW1vbl9zZXRfb3B0aW9ucyhvcHQpCisKK2RlZiBj b25maWd1cmUoY29uZik6CisgICAgY29tbW9uX2NvbmZpZ3VyZShjb25mKSAgICAKKyAgICAKK2Rl ZiBidWlsZChibGQpOgorICAgIGltcG9ydCBPcHRpb25zCisKKyAgICBnZW5lcmF0ZV9qc2NvcmVf ZGVyaXZlZF9zb3VyY2VzKCkKKworICAgIGZ1bGxfZGlycyA9IGdldF9kaXJzX2Zvcl9mZWF0dXJl cyhqc2NvcmVfZGlyLCBmZWF0dXJlcz1bYnVpbGRfcG9ydF0sIGRpcnM9anNjb3JlX2RpcnMpCisK KyAgICBwcmludCAnZnVsbF9kaXJzID0gJXInICUgZnVsbF9kaXJzCisKKyAgICBpbmNsdWRlcyA9 IGNvbW1vbl9pbmNsdWRlcyArIGZ1bGxfZGlycworCisgICAgIyAxLiBBIHNpbXBsZSBwcm9ncmFt CisgICAganNjb3JlID0gYmxkLm5ld190YXNrX2dlbigKKyAgICAgICAgZmVhdHVyZXMgPSAnY3h4 IGNzdGF0aWNsaWInLAorICAgICAgICBpbmNsdWRlcyA9ICcuIC4uIGFzc2VtYmxlciB3cmVjIERl cml2ZWRTb3VyY2VzIEZvcndhcmRpbmdIZWFkZXJzICcgKyAnICcuam9pbihpbmNsdWRlcyksCisg ICAgICAgIHNvdXJjZSA9IHNvdXJjZXMsCisgICAgICAgIHRhcmdldCA9ICdqc2NvcmUnLAorICAg ICAgICB1c2VsaWIgPSAnV1ggSUNVICcgKyB3YWZfY29uZmlnbmFtZSwKKyAgICAgICAgdXNlbGli X2xvY2FsID0gJycsCisgICAgICAgIGluc3RhbGxfcGF0aCA9IG91dHB1dF9kaXIpCisKKyAgICBq c2NvcmUuZmluZF9zb3VyY2VzX2luX2RpcnMoZnVsbF9kaXJzLCBleGNsdWRlcyA9IGpzY29yZV9l eGNsdWRlcykgIAorICAgICAgICAKKyAgICBvYmogPSBibGQubmV3X3Rhc2tfZ2VuKAorICAgICAg ICBmZWF0dXJlcyA9ICdjeHggY3Byb2dyYW0nLAorICAgICAgICBpbmNsdWRlcyA9ICcuIC4uIGFz c2VtYmxlciB3cmVjIERlcml2ZWRTb3VyY2VzIEZvcndhcmRpbmdIZWFkZXJzICcgKyAnICcuam9p bihpbmNsdWRlcyksCisgICAgICAgIHNvdXJjZSA9ICdqc2MuY3BwJywKKyAgICAgICAgdGFyZ2V0 ID0gJ2pzYycsCisgICAgICAgIHVzZWxpYiA9ICdXWCBJQ1UgJyArIHdhZl9jb25maWduYW1lLAor ICAgICAgICB1c2VsaWJfbG9jYWwgPSAnanNjb3JlJywKKyAgICAgICAgaW5zdGFsbF9wYXRoID0g b3V0cHV0X2RpciwKKyAgICAgICAgKQorICAgICAgICAKKyAgICAjIHdlJ2xsIGdldCBhbiBlcnJv ciBpZiBleGNlcHRpb25zIGFyZSBvbiBiZWNhdXNlIG9mIGFuIHVud2luZCBlcnJvciB3aGVuIHVz aW5nIF9fdHJ5CisgICAgaWYgYnVpbGRpbmdfb25fd2luMzI6CisgICAgICAgIGZsYWdzID0gb2Jq LmVudi5DUFBGTEFHUworICAgICAgICBmbGFncy5yZW1vdmUoJy9FSHNjJykKKyAgICAgICAgb2Jq LmVudi5DUFBGTEFHUyA9IGZsYWdzCisKKyAgICBibGQuaW5zdGFsbF9maWxlcyhvcy5wYXRoLmpv aW4ob3V0cHV0X2RpciwgJ0phdmFTY3JpcHRDb3JlJyksICdBUEkvKi5oJykK 33401 2009-07-23 18:52:37 -0700 2009-08-02 01:54:49 -0700 WebKit waf build script for wx wxwebkit_waf.patch text/plain 3710 kevino SW5kZXg6IFdlYktpdC93eC9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0L3d4L0NoYW5n ZUxvZwkocmV2aXNpb24gNDYzMDMpCisrKyBXZWJLaXQvd3gvQ2hhbmdlTG9nCSh3b3JraW5nIGNv cHkpCkBAIC0xLDMgKzEsMTIgQEAKKzIwMDktMDctMjMgIEtldmluIE9sbGl2aWVyICA8a2V2aW5v QHRoZW9sbGl2aWVycy5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgU2NyaXB0IGZvciBidWlsZGluZyB0aGUgV2ViS2l0IGxpYnJhcnkgZm9yIHd4 LgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9Mjc2MTkK KworICAgICAgICAqIHdzY3JpcHQ6IEFkZGVkLgorCiAyMDA5LTA3LTIxICBLZXZpbiBPbGxpdmll ciAgPGtldmlub0B0aGVvbGxpdmllcnMuY29tPgogCiAgICAgICAgIHd4IGJ1aWxkIGZpeC4gTWlz c2luZyBoZWFkZXIgYWRkZWQuCkluZGV4OiBXZWJLaXQvd3gvd3NjcmlwdAo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSBXZWJLaXQvd3gvd3NjcmlwdAkocmV2aXNpb24gMCkKKysrIFdlYktpdC93eC93c2NyaXB0CShy ZXZpc2lvbiAwKQpAQCAtMCwwICsxLDY4IEBACisjISAvdXNyL2Jpbi9lbnYgcHl0aG9uCisKKyMg Q29weXJpZ2h0IChDKSAyMDA5IEtldmluIE9sbGl2aWVyICBBbGwgcmlnaHRzIHJlc2VydmVkLgor IworIyBSZWRpc3RyaWJ1dGlvbiBhbmQgdXNlIGluIHNvdXJjZSBhbmQgYmluYXJ5IGZvcm1zLCB3 aXRoIG9yIHdpdGhvdXQKKyMgbW9kaWZpY2F0aW9uLCBhcmUgcGVybWl0dGVkIHByb3ZpZGVkIHRo YXQgdGhlIGZvbGxvd2luZyBjb25kaXRpb25zCisjIGFyZSBtZXQ6CisjIDEuIFJlZGlzdHJpYnV0 aW9ucyBvZiBzb3VyY2UgY29kZSBtdXN0IHJldGFpbiB0aGUgYWJvdmUgY29weXJpZ2h0CisjICAg IG5vdGljZSwgdGhpcyBsaXN0IG9mIGNvbmRpdGlvbnMgYW5kIHRoZSBmb2xsb3dpbmcgZGlzY2xh aW1lci4KKyMgMi4gUmVkaXN0cmlidXRpb25zIGluIGJpbmFyeSBmb3JtIG11c3QgcmVwcm9kdWNl IHRoZSBhYm92ZSBjb3B5cmlnaHQKKyMgICAgbm90aWNlLCB0aGlzIGxpc3Qgb2YgY29uZGl0aW9u cyBhbmQgdGhlIGZvbGxvd2luZyBkaXNjbGFpbWVyIGluIHRoZQorIyAgICBkb2N1bWVudGF0aW9u IGFuZC9vciBvdGhlciBtYXRlcmlhbHMgcHJvdmlkZWQgd2l0aCB0aGUgZGlzdHJpYnV0aW9uLgor IworIyBUSElTIFNPRlRXQVJFIElTIFBST1ZJREVEIEJZIEFQUExFIENPTVBVVEVSLCBJTkMuIGBg QVMgSVMnJyBBTkQgQU5ZCisjIEVYUFJFU1MgT1IgSU1QTElFRCBXQVJSQU5USUVTLCBJTkNMVURJ TkcsIEJVVCBOT1QgTElNSVRFRCBUTywgVEhFCisjIElNUExJRUQgV0FSUkFOVElFUyBPRiBNRVJD SEFOVEFCSUxJVFkgQU5EIEZJVE5FU1MgRk9SIEEgUEFSVElDVUxBUgorIyBQVVJQT1NFIEFSRSBE SVNDTEFJTUVELiAgSU4gTk8gRVZFTlQgU0hBTEwgQVBQTEUgQ09NUFVURVIsIElOQy4gT1IKKyMg Q09OVFJJQlVUT1JTIEJFIExJQUJMRSBGT1IgQU5ZIERJUkVDVCwgSU5ESVJFQ1QsIElOQ0lERU5U QUwsIFNQRUNJQUwsCisjIEVYRU1QTEFSWSwgT1IgQ09OU0VRVUVOVElBTCBEQU1BR0VTIChJTkNM VURJTkcsIEJVVCBOT1QgTElNSVRFRCBUTywKKyMgUFJPQ1VSRU1FTlQgT0YgU1VCU1RJVFVURSBH T09EUyBPUiBTRVJWSUNFUzsgTE9TUyBPRiBVU0UsIERBVEEsIE9SCisjIFBST0ZJVFM7IE9SIEJV U0lORVNTIElOVEVSUlVQVElPTikgSE9XRVZFUiBDQVVTRUQgQU5EIE9OIEFOWSBUSEVPUlkKKyMg T0YgTElBQklMSVRZLCBXSEVUSEVSIElOIENPTlRSQUNULCBTVFJJQ1QgTElBQklMSVRZLCBPUiBU T1JUCisjIChJTkNMVURJTkcgTkVHTElHRU5DRSBPUiBPVEhFUldJU0UpIEFSSVNJTkcgSU4gQU5Z IFdBWSBPVVQgT0YgVEhFIFVTRQorIyBPRiBUSElTIFNPRlRXQVJFLCBFVkVOIElGIEFEVklTRUQg T0YgVEhFIFBPU1NJQklMSVRZIE9GIFNVQ0ggREFNQUdFLiAKKyMKKyMgd3hXZWJLaXQgYnVpbGQg c2NyaXB0IGZvciB0aGUgd2FmIGJ1aWxkIHN5c3RlbQorCitmcm9tIHNldHRpbmdzIGltcG9ydCAq CisKK3dlYmtpdF9kaXJzID0gWycuJywgJ1dlYktpdFN1cHBvcnQnXQoraW5jbHVkZV9wYXRocyA9 IHdlYmtpdF9kaXJzICsgY29tbW9uX2luY2x1ZGVzICsgWycuJywgJy4uJywKKyAgICAgICAgICAg ICAgICB3a19yb290LAorICAgICAgICAgICAgICAgIG9zLnBhdGguam9pbih3a19yb290LCAnSmF2 YVNjcmlwdENvcmUnKSwKKyAgICAgICAgICAgICAgICBvcy5wYXRoLmpvaW4od2tfcm9vdCwgJ1dl YkNvcmUnKSwKKyAgICAgICAgICAgICAgICBvcy5wYXRoLmpvaW4ob3V0cHV0X2RpciksCisgICAg ICAgICAgICAgICAgb3MucGF0aC5qb2luKHdrX3Jvb3QsICdXZWJDb3JlJywgJ3BhZ2UnLCAnd3gn KSwKKyAgICAgICAgICAgICAgICBvcy5wYXRoLmpvaW4od2tfcm9vdCwgJ1dlYkNvcmUnLCAncGxh dGZvcm0nLCAnbmV0d29yaycsICdjdXJsJyksCisgICAgICAgICAgICAgICAgb3MucGF0aC5qb2lu KHdrX3Jvb3QsICdXZWJDb3JlJywgJ3BsYXRmb3JtJywgJ3d4JyksCisgICAgICAgICAgICAgICAg b3MucGF0aC5qb2luKHdrX3Jvb3QsICdXZWJDb3JlJywgJ3BsYXRmb3JtJywgJ2JyaWRnZScsICd3 eCcpLAorICAgICAgICAgICAgICAgIG9zLnBhdGguam9pbih3a19yb290LCAnV2ViQ29yZScsICdw bGF0Zm9ybScsICdncmFwaGljcycsICd3eCcpLAorXQorCit3ZWJjb3JlX2luY2x1ZGVfZGlycyA9 IFtdCitmb3IgZGlyIGluIHdlYmNvcmVfZGlycyArIFsnRGVyaXZlZFNvdXJjZXMnXToKKyAgICBp bmNsdWRlX3BhdGhzLmFwcGVuZChvcy5wYXRoLmpvaW4od2tfcm9vdCwgJ1dlYkNvcmUnLCBkaXIp KSAKKworanNfaW5jbHVkZV9kaXJzID0gW29zLnBhdGguam9pbih3a19yb290LCAnSmF2YVNjcmlw dENvcmUnLCAnYXNzZW1ibGVyJyldCitmb3IgZGlyIGluIGpzY29yZV9kaXJzOgorICAgIGpzX2lu Y2x1ZGVfZGlycy5hcHBlbmQob3MucGF0aC5qb2luKHdrX3Jvb3QsICdKYXZhU2NyaXB0Q29yZScs IGRpcikpCisKK2RlZiBzZXRfb3B0aW9ucyhvcHQpOgorICAgIGNvbW1vbl9zZXRfb3B0aW9ucyhv cHQpCisKK2RlZiBjb25maWd1cmUoY29uZik6CisgICAgY29tbW9uX2NvbmZpZ3VyZShjb25mKQor ICAgIAorZGVmIGJ1aWxkKGJsZCk6CisgICAgb2JqID0gYmxkLm5ld190YXNrX2dlbigKKyAgICAg ICAgZmVhdHVyZXMgPSAnY3h4IGNzaGxpYiBpbXBsaWInLAorICAgICAgICBpbmNsdWRlcyA9ICcg Jy5qb2luKGluY2x1ZGVfcGF0aHMgKyBqc19pbmNsdWRlX2RpcnMpLAorICAgICAgICB0YXJnZXQg PSAnd3h3ZWJraXQnLAorICAgICAgICBkZWZpbmVzID0gWydXWE1BS0lOR0RMTF9XRUJLSVQnXSwK KyAgICAgICAgdXNlbGliID0gJ1dYIENVUkwgSUNVIFhTTFQgWE1MIFNRTElURTMgV0VCQ09SRSBK U0NPUkUgJyArIHdhZl9jb25maWduYW1lLAorICAgICAgICBsaWJwYXRoID0gW291dHB1dF9kaXJd LAorICAgICAgICB1c2VsaWJfbG9jYWwgPSAnJywKKyAgICAgICAgaW5zdGFsbF9wYXRoID0gb3V0 cHV0X2RpcikKKyAgICAgICAgCisgICAgb2JqLmZpbmRfc291cmNlc19pbl9kaXJzKHdlYmtpdF9k aXJzKQo= 33402 2009-07-23 18:57:06 -0700 2009-08-02 01:55:04 -0700 wxBrowser waf build script wxbrowser_waf.patch text/plain 2862 kevino SW5kZXg6IFdlYktpdFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXRUb29scy9D aGFuZ2VMb2cJKHJldmlzaW9uIDQ2MzAzKQorKysgV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCSh3b3Jr aW5nIGNvcHkpCkBAIC0xLDMgKzEsMTIgQEAKKzIwMDktMDctMjMgIEtldmluIE9sbGl2aWVyICA8 a2V2aW5vQHRoZW9sbGl2aWVycy5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgU2NyaXB0IGZvciBidWlsZGluZyB0aGUgd3hCcm93c2VyIHNhbXBs ZSBhcHAgZm9yIHd4LgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9Mjc2MTkKKworICAgICAgICAqIHd4L2Jyb3dzZXIvd3NjcmlwdDogQWRkZWQuCisKIDIw MDktMDctMjMgIE1hcmsgUm93ZSAgPG1yb3dlQGFwcGxlLmNvbT4KIAogICAgICAgICBSZXZpZXdl ZCBieSBPbGl2ZXIgSHVudC4KSW5kZXg6IFdlYktpdFRvb2xzL3d4L2Jyb3dzZXIvd3NjcmlwdAo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBXZWJLaXRUb29scy93eC9icm93c2VyL3dzY3JpcHQJKHJldmlzaW9uIDAp CisrKyBXZWJLaXRUb29scy93eC9icm93c2VyL3dzY3JpcHQJKHJldmlzaW9uIDApCkBAIC0wLDAg KzEsNTQgQEAKKyMhIC91c3IvYmluL2VudiBweXRob24KKworIyBDb3B5cmlnaHQgKEMpIDIwMDkg S2V2aW4gT2xsaXZpZXIgIEFsbCByaWdodHMgcmVzZXJ2ZWQuCisjCisjIFJlZGlzdHJpYnV0aW9u IGFuZCB1c2UgaW4gc291cmNlIGFuZCBiaW5hcnkgZm9ybXMsIHdpdGggb3Igd2l0aG91dAorIyBt b2RpZmljYXRpb24sIGFyZSBwZXJtaXR0ZWQgcHJvdmlkZWQgdGhhdCB0aGUgZm9sbG93aW5nIGNv bmRpdGlvbnMKKyMgYXJlIG1ldDoKKyMgMS4gUmVkaXN0cmlidXRpb25zIG9mIHNvdXJjZSBjb2Rl IG11c3QgcmV0YWluIHRoZSBhYm92ZSBjb3B5cmlnaHQKKyMgICAgbm90aWNlLCB0aGlzIGxpc3Qg b2YgY29uZGl0aW9ucyBhbmQgdGhlIGZvbGxvd2luZyBkaXNjbGFpbWVyLgorIyAyLiBSZWRpc3Ry aWJ1dGlvbnMgaW4gYmluYXJ5IGZvcm0gbXVzdCByZXByb2R1Y2UgdGhlIGFib3ZlIGNvcHlyaWdo dAorIyAgICBub3RpY2UsIHRoaXMgbGlzdCBvZiBjb25kaXRpb25zIGFuZCB0aGUgZm9sbG93aW5n IGRpc2NsYWltZXIgaW4gdGhlCisjICAgIGRvY3VtZW50YXRpb24gYW5kL29yIG90aGVyIG1hdGVy aWFscyBwcm92aWRlZCB3aXRoIHRoZSBkaXN0cmlidXRpb24uCisjCisjIFRISVMgU09GVFdBUkUg SVMgUFJPVklERUQgQlkgQVBQTEUgQ09NUFVURVIsIElOQy4gYGBBUyBJUycnIEFORCBBTlkKKyMg RVhQUkVTUyBPUiBJTVBMSUVEIFdBUlJBTlRJRVMsIElOQ0xVRElORywgQlVUIE5PVCBMSU1JVEVE IFRPLCBUSEUKKyMgSU1QTElFRCBXQVJSQU5USUVTIE9GIE1FUkNIQU5UQUJJTElUWSBBTkQgRklU TkVTUyBGT1IgQSBQQVJUSUNVTEFSCisjIFBVUlBPU0UgQVJFIERJU0NMQUlNRUQuICBJTiBOTyBF VkVOVCBTSEFMTCBBUFBMRSBDT01QVVRFUiwgSU5DLiBPUgorIyBDT05UUklCVVRPUlMgQkUgTElB QkxFIEZPUiBBTlkgRElSRUNULCBJTkRJUkVDVCwgSU5DSURFTlRBTCwgU1BFQ0lBTCwKKyMgRVhF TVBMQVJZLCBPUiBDT05TRVFVRU5USUFMIERBTUFHRVMgKElOQ0xVRElORywgQlVUIE5PVCBMSU1J VEVEIFRPLAorIyBQUk9DVVJFTUVOVCBPRiBTVUJTVElUVVRFIEdPT0RTIE9SIFNFUlZJQ0VTOyBM T1NTIE9GIFVTRSwgREFUQSwgT1IKKyMgUFJPRklUUzsgT1IgQlVTSU5FU1MgSU5URVJSVVBUSU9O KSBIT1dFVkVSIENBVVNFRCBBTkQgT04gQU5ZIFRIRU9SWQorIyBPRiBMSUFCSUxJVFksIFdIRVRI RVIgSU4gQ09OVFJBQ1QsIFNUUklDVCBMSUFCSUxJVFksIE9SIFRPUlQKKyMgKElOQ0xVRElORyBO RUdMSUdFTkNFIE9SIE9USEVSV0lTRSkgQVJJU0lORyBJTiBBTlkgV0FZIE9VVCBPRiBUSEUgVVNF CisjIE9GIFRISVMgU09GVFdBUkUsIEVWRU4gSUYgQURWSVNFRCBPRiBUSEUgUE9TU0lCSUxJVFkg T0YgU1VDSCBEQU1BR0UuIAorIworIyB3eEJyb3dzZXIgc2FtcGxlIGFwcCBidWlsZCBzY3JpcHQg Zm9yIHRoZSB3YWYgYnVpbGQgc3lzdGVtCisKK2ltcG9ydCBzeXMKKworZnJvbSBzZXR0aW5ncyBp bXBvcnQgKgorCitpbmNsdWRlX3BhdGhzID0gW29zLnBhdGguam9pbih3a19yb290LCAnV2ViS2l0 JywgJ3d4JyldCisKK2RlZiBzZXRfb3B0aW9ucyhvcHQpOgorICAgIGNvbW1vbl9zZXRfb3B0aW9u cyhvcHQpCisKK2RlZiBjb25maWd1cmUoY29uZik6CisgICAgY29tbW9uX2NvbmZpZ3VyZShjb25m KQorICAgIAorZGVmIGJ1aWxkKGJsZCk6CisgICAgaW1wb3J0IE9wdGlvbnMKKworICAgIG9iaiA9 IGJsZC5uZXdfdGFza19nZW4oCisgICAgICAgIGZlYXR1cmVzID0gJ2N4eCBjcHJvZ3JhbScsCisg ICAgICAgIGluY2x1ZGVzID0gJyAnLmpvaW4oaW5jbHVkZV9wYXRocyksCisgICAgICAgIHNvdXJj ZSA9ICdicm93c2VyLmNwcCcsCisgICAgICAgIHRhcmdldCA9ICd3eEJyb3dzZXInLAorICAgICAg ICB1c2VsaWIgPSAnV1ggQ1VSTCBJQ1UgWFNMVCBYTUwgV1hXRUJLSVQgJyArIHdhZl9jb25maWdu YW1lLAorICAgICAgICBsaWJwYXRoID0gW291dHB1dF9kaXJdLAorICAgICAgICB1c2VsaWJfbG9j YWwgPSAnJywKKyAgICAgICAgaW5zdGFsbF9wYXRoID0gb3V0cHV0X2RpcikKKyAgICAgICAgCisg ICAgaWYgc3lzLnBsYXRmb3JtLnN0YXJ0c3dpdGgoJ2RhcndpbicpOgorICAgICAgICBvYmoubWFj X2FwcCA9IFRydWUK 34096 2009-08-04 16:06:07 -0700 2009-08-07 13:54:02 -0700 Changes to build-webkit needed for wx to use the waf build process - second patch waf-webkit-build2.patch text/plain 5477 kevino SW5kZXg6IFdlYktpdFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXRUb29scy9D aGFuZ2VMb2cJKHJldmlzaW9uIDQ2NzgwKQorKysgV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCSh3b3Jr aW5nIGNvcHkpCkBAIC0xLDMgKzEsMTUgQEAKKzIwMDktMDgtMDQgIEtldmluIE9sbGl2aWVyICA8 a2V2aW5vQHRoZW9sbGl2aWVycy5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgQ2hhbmdlcyBuZWVkZWQgZm9yIGJ1aWxkLXdlYmtpdCB0byBzdXBw b3J0IHRoZSB3YWYgYnVpbGQgc3lzdGVtIGZvciB0aGUgd3ggcG9ydC4KKyAgICAgICAgCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yNzYxOQorCisgICAg ICAgICogU2NyaXB0cy9idWlsZC13ZWJraXQ6CisgICAgICAgICogU2NyaXB0cy9ydW4tbGF1bmNo ZXI6CisgICAgICAgICogU2NyaXB0cy93ZWJraXRkaXJzLnBtOgorCiAyMDA5LTA4LTA0ICBNYXJr IFJvd2UgIDxtcm93ZUBhcHBsZS5jb20+CiAKICAgICAgICAgUnViYmVyLXN0YW1wZWQgYnkgR2F2 aW4gIkdhdnZ5IiBCYXJyYWNsb3VnaC4KSW5kZXg6IFdlYktpdFRvb2xzL1NjcmlwdHMvYnVpbGQt d2Via2l0Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdFRvb2xzL1NjcmlwdHMvYnVpbGQtd2Via2l0CShy ZXZpc2lvbiA0Njc4MCkKKysrIFdlYktpdFRvb2xzL1NjcmlwdHMvYnVpbGQtd2Via2l0CSh3b3Jr aW5nIGNvcHkpCkBAIC0yMDIsMTggKzIwMiw2IEBACiBjaGVja1JlcXVpcmVkU3lzdGVtQ29uZmln KCk7CiBzZXRDb25maWd1cmF0aW9uKCk7CiAKLWlmIChpc1d4KCkpIHsKLSAgICAkRU5WeyJXRUJL SVRPVVRQVVRESVIifSA9IHByb2R1Y3REaXIoKTsKLQotICAgIG15IEBvcHRzID0gZ2V0V3hBcmdz KCk7Ci0KLSAgICBpZiAoJGNsZWFuKSB7Ci0gICAgICAgIHB1c2goQG9wdHMsICJjbGVhbiIpOwot ICAgIH0KLSAgICBzeXN0ZW0gIldlYktpdFRvb2xzL3d4L2J1aWxkLXd4d2Via2l0IEBvcHRzIjsK LSAgICBleGl0IGV4aXRTdGF0dXMoJD8pOwotfQotCiBteSAkcHJvZHVjdERpciA9IHByb2R1Y3RE aXIoKTsKIAogIyBDaGVjayB0aGF0IGFsbCB0aGUgcHJvamVjdCBkaXJlY3RvcmllcyBhcmUgdGhl cmUuCkBAIC0zMDMsNiArMjkxLDM1IEBACiAjIEZvcmNlIHJlLWxpbmsgb2YgZXhpc3RpbmcgbGli cmFyaWVzIGlmIGRpZmZlcmVudCB0aGFuIGV4cGVjdGVkCiByZW1vdmVMaWJyYXJ5RGVwZW5kaW5n T25TVkcoIldlYkNvcmUiLCAkc3ZnU3VwcG9ydCk7CiAKK2lmIChpc1d4KCkpIHsKKyAgICAjIHNl dCB0aGUgUFlUSE9OUEFUSCBmb3Igd2FmCisgICAgbXkgJHB5dGhvblBhdGggPSAkRU5WeydQWVRI T05QQVRIJ307CisgICAgaWYgKCFkZWZpbmVkKCRweXRob25QYXRoKSkgeworICAgICAgICAkcHl0 aG9uUGF0aCA9ICcnOworICAgIH0KKyAgICBteSAkc291cmNlRGlyID0gc291cmNlRGlyKCk7Cisg ICAgbXkgJG5ld1B5dGhvblBhdGggPSAiJHNvdXJjZURpci9XZWJLaXRUb29scy93eC9idWlsZDok cHl0aG9uUGF0aCI7CisgICAgaWYgKGlzQ3lnd2luKCkpIHsKKyAgICAgICAgJG5ld1B5dGhvblBh dGggPSBgY3lncGF0aCAtLW1peGVkIC0tcGF0aCAkbmV3UHl0aG9uUGF0aGA7CisgICAgfQorICAg ICRFTlZ7J1BZVEhPTlBBVEgnfSA9ICRuZXdQeXRob25QYXRoOworICAgIAorICAgICMgZ2V0IC8g dXBkYXRlIHdhZiBpZiBuZWVkZWQKKyAgICBteSAkd2FmID0gJ1dlYktpdFRvb2xzL3d4L3dhZic7 CisgICAgbXkgJHdhZlVSTCA9ICdodHRwOi8vd3h3ZWJraXQud3hjb21tdW5pdHkuY29tL2Rvd25s b2Fkcy9kZXBzL3dhZic7CisgICAgaWYgKCEtZiAkd2FmKSB7CisgICAgICAgIG15ICRyZXN1bHQg PSBzeXN0ZW0gImN1cmwgLW8gJHdhZiAkd2FmVVJMIjsKKyAgICAgICAgY2htb2QgMDc1NSwgJHdh ZjsKKyAgICB9CisgICAgCisgICAgcHVzaCBAcHJvamVjdHMsICdXZWJLaXRUb29scy93eC9icm93 c2VyJzsKKyAgICBwdXNoIEBwcm9qZWN0cywgJ1dlYktpdC93eC9iaW5kaW5ncy9weXRob24nOwor ICAgIAorICAgICMgd2UgZG9uJ3Qgc3VwcG9ydCBTVkcgeWV0LgorICAgICgkc3ZnU3VwcG9ydCwg JHN2Z0FuaW1hdGlvblN1cHBvcnQsICRzdmdBc0ltYWdlU3VwcG9ydCwgJHN2Z0RPTU9iakNCaW5k aW5nc1N1cHBvcnQpID0gKDAsIDAsIDAsIDApOworICAgICgkc3ZnRm9udHNTdXBwb3J0LCAkc3Zn Rm9yZWlnbk9iamVjdFN1cHBvcnQsICRzdmdVc2VTdXBwb3J0KSA9ICgwLCAwLCAwKTsKK30KKwog IyBCdWlsZCwgYW5kIGFib3J0IGlmIHRoZSBidWlsZCBmYWlscy4KIGZvciBteSAkZGlyIChAcHJv amVjdHMpIHsKICAgICBjaGRpciAkZGlyIG9yIGRpZTsKQEAgLTMyNCw2ICszNDEsMTYgQEAKICAg ICAgICAgaWYgKCRkaXIgZXEgIldlYktpdCIpIHsKICAgICAgICAgICAgICRyZXN1bHQgPSBidWls ZFZpc3VhbFN0dWRpb1Byb2plY3QoIndpbi9XZWJLaXQudmNwcm9qL1dlYktpdC5zbG4iLCAkY2xl YW4pOwogICAgICAgICB9CisgICAgfSBlbHNpZiAoaXNXeCgpKSB7CisgICAgICAgIEBvcHRpb25z ID0gKCk7CisgICAgICAgIGlmIChkZWZpbmVkKCRtYWtlQXJncykpIHsKKyAgICAgICAgICAgIEBv cHRpb25zID0gc3BsaXQoLyAvLCAkbWFrZUFyZ3MpOworICAgICAgICB9CisgICAgICAgIGlmICgk ZGlyIGVxICJXZWJLaXQiICYmIGlzV3goKSkgeworICAgICAgICAgICAgY2hkaXIgJ3d4JyBvciBk aWU7CisgICAgICAgIH0KKyAgICAgICAgICAgIAorICAgICAgICAkcmVzdWx0ID0gYnVpbGRXYWZQ cm9qZWN0KCRkaXIsICRjbGVhbiwgQG9wdGlvbnMpOwogICAgIH0KIAogICAgIGlmIChleGl0U3Rh dHVzKCRyZXN1bHQpKSB7CkBAIC0zMzYsNyArMzYzLDcgQEAKICAgICAgICAgfQogICAgICAgICBl eGl0IGV4aXRTdGF0dXMoJHJlc3VsdCk7CiAgICAgfQotICAgIGNoZGlyICIuLiIgb3IgZGllOwor ICAgIGNoZGlyV2ViS2l0KCk7CiB9CiAKICMgRG9uJ3QgcmVwb3J0IHRoZSAiV2ViS2l0IGlzIG5v dyBidWlsdCIgbWVzc2FnZSBhZnRlciBhIGNsZWFuIG9wZXJhdGlvbi4KSW5kZXg6IFdlYktpdFRv b2xzL1NjcmlwdHMvcnVuLWxhdW5jaGVyCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdFRvb2xzL1Njcmlw dHMvcnVuLWxhdW5jaGVyCShyZXZpc2lvbiA0Njc4MCkKKysrIFdlYktpdFRvb2xzL1NjcmlwdHMv cnVuLWxhdW5jaGVyCSh3b3JraW5nIGNvcHkpCkBAIC00Miw3ICs0Miw5IEBACiBteSBAYXJncyA9 IEBBUkdWOwogCiAjIENoZWNrIHRvIHNlZSB0aGF0IGFsbCB0aGUgZnJhbWV3b3JrcyBhcmUgYnVp bHQuCi1jaGVja0ZyYW1ld29ya3MoKTsKK2lmICghaXNXeCgpKSB7CisgICAgY2hlY2tGcmFtZXdv cmtzKCk7Cit9CiAKICMgU2V0IHBhdGhzIGFjY29yZGluZyB0byB0aGUgYnVpbGQgc3lzdGVtIHVz ZWQKIGlmIChpc1F0KCkpIHsKQEAgLTYxLDYgKzYzLDE1IEBACiAgICAgaWYgKGlzR3RrKCkpIHsK ICAgICAgICAgJGxhdW5jaGVyUGF0aCA9IGNhdGRpcigkbGF1bmNoZXJQYXRoLCAiUHJvZ3JhbXMi LCAiR3RrTGF1bmNoZXIiKTsKICAgICB9CisgICAgCisgICAgaWYgKGlzV3goKSkgeworICAgICAg ICBpZiAoaXNEYXJ3aW4oKSkgeworICAgICAgICAgICAgJGxhdW5jaGVyUGF0aCA9IGNhdGRpcigk bGF1bmNoZXJQYXRoLCAnd3hCcm93c2VyLmFwcCcsICdDb250ZW50cycsICdNYWNPUycsICd3eEJy b3dzZXInKTsKKyAgICAgICAgfSBlbHNlIHsKKyAgICAgICAgICAgICRFTlZ7TERfTElCUkFSWV9Q QVRIfSA9ICRFTlZ7TERfTElCUkFSWV9QQVRIfSA/ICIkcHJvZHVjdERpcjokRU5We0xEX0xJQlJB UllfUEFUSH0iIDogJHByb2R1Y3REaXI7CisgICAgICAgICAgICAkbGF1bmNoZXJQYXRoID0gY2F0 ZGlyKCRsYXVuY2hlclBhdGgsICd3eEJyb3dzZXInKTsKKyAgICAgICAgfQorICAgIH0KIAogICAg IHByaW50ICJTdGFydGluZyB3ZWJraXQgbGF1bmNoZXIuXG4iOwogfQpJbmRleDogV2ViS2l0VG9v bHMvU2NyaXB0cy93ZWJraXRkaXJzLnBtCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdFRvb2xzL1Njcmlw dHMvd2Via2l0ZGlycy5wbQkocmV2aXNpb24gNDY3ODApCisrKyBXZWJLaXRUb29scy9TY3JpcHRz L3dlYmtpdGRpcnMucG0JKHdvcmtpbmcgY29weSkKQEAgLTg5NCw3ICs4OTQsNyBAQAogc3ViIGxh dW5jaGVyUGF0aCgpCiB7CiAgICAgbXkgJHJlbGF0aXZlU2NyaXB0c1BhdGggPSByZWxhdGl2ZVNj cmlwdHNEaXIoKTsKLSAgICBpZiAoaXNHdGsoKSB8fCBpc1F0KCkpIHsKKyAgICBpZiAoaXNHdGso KSB8fCBpc1F0KCkgfHwgaXNXeCgpKSB7CiAgICAgICAgIHJldHVybiAiJHJlbGF0aXZlU2NyaXB0 c1BhdGgvcnVuLWxhdW5jaGVyIjsKICAgICB9IGVsc2lmIChpc0FwcGxlV2ViS2l0KCkpIHsKICAg ICAgICAgcmV0dXJuICIkcmVsYXRpdmVTY3JpcHRzUGF0aC9ydW4tc2FmYXJpIjsKQEAgLTkwNyw2 ICs5MDcsOCBAQAogICAgICAgICByZXR1cm4gIkd0a0xhdW5jaGVyIjsKICAgICB9IGVsc2lmIChp c1F0KCkpIHsKICAgICAgICAgcmV0dXJuICJRdExhdW5jaGVyIjsKKyAgICB9IGVsc2lmIChpc1d4 KCkpIHsKKyAgICAgICAgcmV0dXJuICJ3eEJyb3dzZXIiOwogICAgIH0gZWxzaWYgKGlzQXBwbGVX ZWJLaXQoKSkgewogICAgICAgICByZXR1cm4gIlNhZmFyaSI7CiAgICAgfQpAQCAtMTAzMiw2ICsx MDM0LDI1IEBACiAgICAgcmV0dXJuIHN5c3RlbSBAY29tbWFuZDsKIH0KIAorc3ViIGJ1aWxkV2Fm UHJvamVjdAoreworICAgIG15ICgkcHJvamVjdCwgJHNob3VsZENsZWFuLCBAb3B0aW9ucykgPSBA XzsKKyAgICBwcmludCAiQnVpbGRpbmcgJHByb2plY3RcbiI7CisKKyAgICBteSAkd2FmQ29tbWFu ZCA9ICIkc291cmNlRGlyL1dlYktpdFRvb2xzL3d4L3dhZiI7CisgICAgaWYgKGlzQ3lnd2luKCkp IHsKKyAgICAgICAgJHdhZkNvbW1hbmQgPSBgY3lncGF0aCAtLXdpbmRvd3MgIiR3YWZDb21tYW5k ImA7CisgICAgICAgIGNob21wKCR3YWZDb21tYW5kKTsKKyAgICB9CisgICAgaWYgKCRzaG91bGRD bGVhbikgeworICAgICAgICByZXR1cm4gc3lzdGVtICR3YWZDb21tYW5kLCAiY2xlYW4iOworICAg IH0KKyAgICAKKyAgICBteSAkcmVzdWx0ID0gc3lzdGVtICR3YWZDb21tYW5kLCAnY29uZmlndXJl JywgJ2J1aWxkJywgJ2luc3RhbGwnLCBAb3B0aW9uczsKKyAgICAKKyAgICByZXR1cm4gJHJlc3Vs dDsKK30KKwogc3ViIHJldHJpZXZlUU1ha2VzcGVjVmFyCiB7CiAgICAgbXkgJG1rc3BlYyA9ICRf WzBdOwo= 34141 2009-08-05 10:11:26 -0700 2009-08-06 21:25:34 -0700 WebCore build script for waf webcore_waf.patch text/plain 6480 kevino SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA0NjgwNCkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTMgQEAKKzIwMDktMDgtMDUgIEtldmluIE9sbGl2aWVyICA8a2V2aW5vQHRoZW9s bGl2aWVycy5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgQWRkaW5nIFdlYkNvcmUgc3VwcG9ydCBmb3IgdGhlIHdhZiBidWlsZCBzeXN0ZW0gZm9y IHd4LgorICAgICAgICAKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTI3NjE5CisKKyAgICAgICAgKiB3c2NyaXB0OiBBZGRlZC4KKwogMjAwOS0wOC0wNSAg QW5kcmFzIEJlY3NpICA8YmVjc2kuYW5kcmFzQHN0dWQudS1zemVnZWQuaHU+CiAKICAgICAgICAg UmV2aWV3ZWQgYnkgU2ltb24gSGF1c21hbm4uCkluZGV4OiBXZWJDb3JlL3dzY3JpcHQKPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gV2ViQ29yZS93c2NyaXB0CShyZXZpc2lvbiAwKQorKysgV2ViQ29yZS93c2NyaXB0 CShyZXZpc2lvbiAwKQpAQCAtMCwwICsxLDE0NCBAQAorIyEgL3Vzci9iaW4vZW52IHB5dGhvbgor CisjIENvcHlyaWdodCAoQykgMjAwOSBLZXZpbiBPbGxpdmllciAgQWxsIHJpZ2h0cyByZXNlcnZl ZC4KKyMKKyMgUmVkaXN0cmlidXRpb24gYW5kIHVzZSBpbiBzb3VyY2UgYW5kIGJpbmFyeSBmb3Jt cywgd2l0aCBvciB3aXRob3V0CisjIG1vZGlmaWNhdGlvbiwgYXJlIHBlcm1pdHRlZCBwcm92aWRl ZCB0aGF0IHRoZSBmb2xsb3dpbmcgY29uZGl0aW9ucworIyBhcmUgbWV0OgorIyAxLiBSZWRpc3Ry aWJ1dGlvbnMgb2Ygc291cmNlIGNvZGUgbXVzdCByZXRhaW4gdGhlIGFib3ZlIGNvcHlyaWdodAor IyAgICBub3RpY2UsIHRoaXMgbGlzdCBvZiBjb25kaXRpb25zIGFuZCB0aGUgZm9sbG93aW5nIGRp c2NsYWltZXIuCisjIDIuIFJlZGlzdHJpYnV0aW9ucyBpbiBiaW5hcnkgZm9ybSBtdXN0IHJlcHJv ZHVjZSB0aGUgYWJvdmUgY29weXJpZ2h0CisjICAgIG5vdGljZSwgdGhpcyBsaXN0IG9mIGNvbmRp dGlvbnMgYW5kIHRoZSBmb2xsb3dpbmcgZGlzY2xhaW1lciBpbiB0aGUKKyMgICAgZG9jdW1lbnRh dGlvbiBhbmQvb3Igb3RoZXIgbWF0ZXJpYWxzIHByb3ZpZGVkIHdpdGggdGhlIGRpc3RyaWJ1dGlv bi4KKyMKKyMgVEhJUyBTT0ZUV0FSRSBJUyBQUk9WSURFRCBCWSBBUFBMRSBDT01QVVRFUiwgSU5D LiBgYEFTIElTJycgQU5EIEFOWQorIyBFWFBSRVNTIE9SIElNUExJRUQgV0FSUkFOVElFUywgSU5D TFVESU5HLCBCVVQgTk9UIExJTUlURUQgVE8sIFRIRQorIyBJTVBMSUVEIFdBUlJBTlRJRVMgT0Yg TUVSQ0hBTlRBQklMSVRZIEFORCBGSVRORVNTIEZPUiBBIFBBUlRJQ1VMQVIKKyMgUFVSUE9TRSBB UkUgRElTQ0xBSU1FRC4gIElOIE5PIEVWRU5UIFNIQUxMIEFQUExFIENPTVBVVEVSLCBJTkMuIE9S CisjIENPTlRSSUJVVE9SUyBCRSBMSUFCTEUgRk9SIEFOWSBESVJFQ1QsIElORElSRUNULCBJTkNJ REVOVEFMLCBTUEVDSUFMLAorIyBFWEVNUExBUlksIE9SIENPTlNFUVVFTlRJQUwgREFNQUdFUyAo SU5DTFVESU5HLCBCVVQgTk9UIExJTUlURUQgVE8sCisjIFBST0NVUkVNRU5UIE9GIFNVQlNUSVRV VEUgR09PRFMgT1IgU0VSVklDRVM7IExPU1MgT0YgVVNFLCBEQVRBLCBPUgorIyBQUk9GSVRTOyBP UiBCVVNJTkVTUyBJTlRFUlJVUFRJT04pIEhPV0VWRVIgQ0FVU0VEIEFORCBPTiBBTlkgVEhFT1JZ CisjIE9GIExJQUJJTElUWSwgV0hFVEhFUiBJTiBDT05UUkFDVCwgU1RSSUNUIExJQUJJTElUWSwg T1IgVE9SVAorIyAoSU5DTFVESU5HIE5FR0xJR0VOQ0UgT1IgT1RIRVJXSVNFKSBBUklTSU5HIElO IEFOWSBXQVkgT1VUIE9GIFRIRSBVU0UKKyMgT0YgVEhJUyBTT0ZUV0FSRSwgRVZFTiBJRiBBRFZJ U0VEIE9GIFRIRSBQT1NTSUJJTElUWSBPRiBTVUNIIERBTUFHRS4gCisjCisjIFdlYkNvcmUgYnVp bGQgc2NyaXB0IGZvciB0aGUgd2FmIGJ1aWxkIHN5c3RlbQorCitmcm9tIHNldHRpbmdzIGltcG9y dCAqCisKK3dlYmNvcmVfc291cmNlcyA9IHt9CisKK2lmIGJ1aWxkX3BvcnQgPT0gInd4IjoKKyAg ICB3ZWJjb3JlX3NvdXJjZXNbJ3BsdWdpbnMnXSA9IFsgICdwbHVnaW5zL1BsdWdpbkRhdGFOb25l LmNwcCcsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAncGx1Z2lucy9QbHVn aW5QYWNrYWdlTm9uZS5jcHAnLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg J3BsdWdpbnMvUGx1Z2luVmlld05vbmUuY3BwJworICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgIF0KKyAgICAKKyAgICBpZiBidWlsZGluZ19vbl93aW4zMjoKKyAgICAgICAgd2ViY29y ZV9kaXJzLmFwcGVuZCgncGxhdGZvcm0vd3gvd3hjb2RlL3dpbicpCisgICAgICAgIHdlYmNvcmVf c291cmNlc1snd3gtd2luJ10gPSBbCisgICAgICAgICAgICAgICAjIHd4VGltZXIgb24gV2luZG93 cyBoYXMgYSBidWcgdGhhdCBjYXVzZXMgaXQgdG8gZWF0IGNyYXNoZXMgaW4gY2FsbGJhY2tzCisg ICAgICAgICAgICAgICAjIHNvIHdlIG5lZWQgdG8gdXNlIHRoZSBXaW4gcG9ydCdzIGltcGxlbWVu dGF0aW9uIHVudGlsIHRoZSB3eCBidWcgZml4IGlzCisgICAgICAgICAgICAgICAjIHdpZGVseSBh dmFpbGFibGUgKGl0IHdhcyBmaXhlZCBpbiAyLjguMTApLgorICAgICAgICAgICAgICAgJ3BsYXRm b3JtL3dpbi9TaGFyZWRUaW1lcldpbi5jcHAnLAorICAgICAgICAgICAgICAgJ3BhZ2Uvd2luL1Bh Z2VXaW4uY3BwJywKKyAgICAgICAgCisgICAgICAgIF0KKyAgICBlbGlmIHN5cy5wbGF0Zm9ybS5z dGFydHN3aXRoKCdkYXJ3aW4nKToKKyAgICAgICAgd2ViY29yZV9kaXJzLmFwcGVuZCgncGxhdGZv cm0vd3gvd3hjb2RlL21hYy9jYXJib24nKQorICAgICAgICB3ZWJjb3JlX3NvdXJjZXNbJ3d4LW1h YyddID0gWworICAgICAgICAgICAgICAgJ3BsYXRmb3JtL21hYy9QdXJnZWFibGVCdWZmZXJNYWMu Y3BwJywKKyAgICAgICAgXQorICAgIGVsc2U6CisgICAgICAgIHdlYmNvcmVfZGlycy5hcHBlbmQo J3BsYXRmb3JtL3d4L3d4Y29kZS9ndGsnKQorICAgICAgICAKK2Zyb20gVGFza0dlbiBpbXBvcnQg dGFza2dlbiwgZmVhdHVyZSwgYWZ0ZXIKK2ltcG9ydCBUYXNrLCBjY3Jvb3QKKworZGVmIGdlbmVy YXRlX3dlYmNvcmVfZGVyaXZlZF9zb3VyY2VzKCk6CisgICAgIyBidWlsZCB0aGUgZGVyaXZlZCBz b3VyY2VzCisgICAgZGVyaXZlZF9zb3VyY2VzX2RpciA9IG9zLnBhdGguam9pbih3ZWJjb3JlX2Rp ciwgJ0Rlcml2ZWRTb3VyY2VzJykKKyAgICB3Y19kaXIgPSB3ZWJjb3JlX2RpcgorICAgIGlmIGJ1 aWxkaW5nX29uX3dpbjMyOgorICAgICAgICB3Y19kaXIgPSBnZXRfb3V0cHV0KCdjeWdwYXRoIC0t dW5peCAiJXMiJyAlIHdjX2RpcikKKyAgICBpZiBub3Qgb3MucGF0aC5leGlzdHMoZGVyaXZlZF9z b3VyY2VzX2Rpcik6CisgICAgICAgIG9zLm1rZGlyKGRlcml2ZWRfc291cmNlc19kaXIpCisKKyAg ICBvbGRkaXIgPSBvcy5nZXRjd2QoKQorICAgIG9zLmNoZGlyKGRlcml2ZWRfc291cmNlc19kaXIp CisKKyAgICBvcy5zeXN0ZW0oJ21ha2UgLWYgJXMvRGVyaXZlZFNvdXJjZXMubWFrZSBXZWJDb3Jl PSVzIFNPVVJDRV9ST09UPSVzIGFsbCBGRUFUVVJFX0RFRklORVM9IiVzIicgJSAod2NfZGlyLCB3 Y19kaXIsIHdjX2RpciwgJyAnLmpvaW4oZmVhdHVyZV9kZWZpbmVzKSkpCisgICAgb3MuY2hkaXIo b2xkZGlyKQorCitkZWYgc2V0X29wdGlvbnMob3B0KToKKyAgICBjb21tb25fc2V0X29wdGlvbnMo b3B0KQorCitkZWYgY29uZmlndXJlKGNvbmYpOgorICAgIGNvbW1vbl9jb25maWd1cmUoY29uZikK KworZGVmIGJ1aWxkKGJsZCk6CisgICAgaW1wb3J0IE9wdGlvbnMKKworICAgIGdlbmVyYXRlX3dl YmNvcmVfZGVyaXZlZF9zb3VyY2VzKCkKKworICAgIHdrX2luY2x1ZGVzID0gWycuJywgJy4uJywg J0Rlcml2ZWRTb3VyY2VzJywKKyAgICAgICAgICAgICAgICB3a19yb290LCAKKyAgICAgICAgICAg ICAgICBvcy5wYXRoLmpvaW4od2tfcm9vdCwgJ0phdmFTY3JpcHRDb3JlJyksCisgICAgICAgICAg ICAgICAgb3MucGF0aC5qb2luKHdrX3Jvb3QsICdXZWJDb3JlJyksCisgICAgICAgICAgICAgICAg J3BsYXRmb3JtL2ltYWdlLWRlY29kZXJzJywKKyAgICAgICAgICAgICAgICAncGxhdGZvcm0vd3gv d3hjb2RlJywKKyAgICAgICAgICAgICAgICAnd29ya2VycycsCisgICAgICAgIF0KKworICAgIGZl YXR1cmVzID0gW2J1aWxkX3BvcnRdCisgICAgaWYgYnVpbGRfcG9ydCA9PSAnd3gnOgorICAgICAg ICBmZWF0dXJlcy5hcHBlbmQoJ2N1cmwnKQorCisgICAgZnVsbF9kaXJzID0gZ2V0X2RpcnNfZm9y X2ZlYXR1cmVzKHdlYmNvcmVfZGlyLCBmZWF0dXJlcz1mZWF0dXJlcywgZGlycz13ZWJjb3JlX2Rp cnMpCisKKyAgICBqc2NvcmVfZGlyID0gb3MucGF0aC5qb2luKHdrX3Jvb3QsICdKYXZhU2NyaXB0 Q29yZScpCisgICAgZm9yIGl0ZW0gaW4gb3MubGlzdGRpcihqc2NvcmVfZGlyKToKKyAgICAgICAg ZnVsbHBhdGggPSBvcy5wYXRoLmpvaW4oanNjb3JlX2RpciwgaXRlbSkKKyAgICAgICAgaWYgb3Mu cGF0aC5pc2RpcihmdWxscGF0aCkgYW5kIG5vdCBpdGVtID09ICJvcy13aW4zMiIgYW5kIG5vdCBp dGVtID09ICdpY3UnOgorICAgICAgICAgICAgd2tfaW5jbHVkZXMuYXBwZW5kKGZ1bGxwYXRoKQor CisgICAgd2tfaW5jbHVkZXMgKz0gY29tbW9uX2luY2x1ZGVzICsgZnVsbF9kaXJzCisKKyAgICBj eHhmbGFncyA9IFtdCisgICAgaWYgYnVpbGRpbmdfb25fd2luMzI6CisgICAgICAgIGN4eGZsYWdz LmFwcGVuZCgnL0ZJV2ViQ29yZVByZWZpeC5oJykKKyAgICBlbHNlOgorICAgICAgICBjeHhmbGFn cy5leHRlbmQoWyctaW5jbHVkZScsICdXZWJDb3JlUHJlZml4LmgnXSkKKworICAgIHdlYmNvcmUg PSBibGQubmV3X3Rhc2tfZ2VuKAorICAgICAgICBmZWF0dXJlcyA9ICdjYyBjeHggY3N0YXRpY2xp YicsCisgICAgICAgIGluY2x1ZGVzID0gJyAnLmpvaW4od2tfaW5jbHVkZXMpLAorICAgICAgICBz b3VyY2UgPSAnICcuam9pbihmbGF0dGVuU291cmNlcyh3ZWJjb3JlX3NvdXJjZXMudmFsdWVzKCkp KSwKKyAgICAgICAgY3h4ZmxhZ3MgPSBjeHhmbGFncywKKyAgICAgICAgdGFyZ2V0ID0gJ3dlYmNv cmUnLAorICAgICAgICB1c2VsaWIgPSAnV1ggSUNVIFhNTCBYU0xUIENVUkwgJyArIHdhZl9jb25m aWduYW1lLAorICAgICAgICB1c2VsaWJfbG9jYWwgPSAnJywKKyAgICAgICAgaW5zdGFsbF9wYXRo ID0gb3V0cHV0X2RpciwKKyAgICAgICAgKQorICAgICAgICAKKyAgICBleGNsdWRlcyA9IFtdCisg ICAgaWYgYnVpbGRfcG9ydCA9PSAnd3gnOgorICAgICAgICBleGNsdWRlcyA9IGdldF9leGNsdWRl cyh3ZWJjb3JlX2RpciwgWycqTm9uZS5jcHAnLCAnKkNGLmNwcCcsICcqUXQuY3BwJywgJypXaW4u Y3BwJywgJypXaW5jZS5jcHAnLCAnKkd0ay5jcHAnLCAnKk1hYy5jcHAnLCAnKlNhZmFyaS5jcHAn LCAnKkNocm9taXVtKi5jcHAnLCcqU1ZHKi5jcHAnLCAnKkFsbEluT25lLmNwcCcsICd0ZXN0KmJp bmRpbmdzLionXSkKKyAgICAgICAgZXhjbHVkZXMuZXh0ZW5kKFsnVXNlclN0eWxlU2hlZXRMb2Fk ZXIuY3BwJywgJ1JlbmRlck1lZGlhQ29udHJvbHMuY3BwJ10pCisKKyAgICAgICAgIyBpbnRlcm1l ZGlhdGUgc291cmNlcworICAgICAgICBleGNsdWRlcy5hcHBlbmQoJ0NTU1ZhbHVlS2V5d29yZHMu YycpCisgICAgICAgIGV4Y2x1ZGVzLmFwcGVuZCgnQ1NTUHJvcGVydHlOYW1lcy5jcHAnKQorICAg ICAgICBleGNsdWRlcy5hcHBlbmQoJ3Rva2VuaXplci5jcHAnKQorCisgICAgICAgICMgRklYTUU6 IHRoZXNlIHRocmVlIHJlcXVpcmUgaGVhZGVycyB0aGF0IEkgY2FuJ3Qgc2VlbSB0byBmaW5kIGlu IHRydW5rLgorICAgICAgICAjIEludmVzdGlnYXRlIGhvdyB0byByZXNvbHZlIHRoZXNlIGlzc3Vl cy4KKyAgICAgICAgZXhjbHVkZXMuYXBwZW5kKCdKU0Fic3RyYWN0Vmlldy5jcHAnKQorICAgICAg ICBleGNsdWRlcy5hcHBlbmQoJ0pTUG9zaXRpb25DYWxsYmFjay5jcHAnKQorICAgICAgICBleGNs dWRlcy5hcHBlbmQoJ0pTRE9NU3RyaW5nTGlzdC5jcHAnKQorICAgICAgICBleGNsdWRlcy5hcHBl bmQoJ0pTSW5zcGVjdG9yQ29udHJvbGxlci5jcHAnKQorICAgICAgICBpZiBidWlsZGluZ19vbl93 aW4zMjoKKyAgICAgICAgICAgIGV4Y2x1ZGVzLmFwcGVuZCgnU2hhcmVkVGltZXJXeC5jcHAnKQor ICAgICAgICAKKyAgICB3ZWJjb3JlLmZpbmRfc291cmNlc19pbl9kaXJzKGZ1bGxfZGlycywgZXhj bHVkZXMgPSBleGNsdWRlcywgZXh0cz1bJy5jJywgJy5jcHAnXSkK 34142 2009-08-05 10:17:39 -0700 2009-08-06 21:45:37 -0700 Python bindings build support for waf build system waf_python_bindings.patch text/plain 4248 kevino SW5kZXg6IFdlYktpdC93eC9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0L3d4L0NoYW5n ZUxvZwkocmV2aXNpb24gNDY4MDQpCisrKyBXZWJLaXQvd3gvQ2hhbmdlTG9nCSh3b3JraW5nIGNv cHkpCkBAIC0xLDMgKzEsMTMgQEAKKzIwMDktMDgtMDUgIEtldmluIE9sbGl2aWVyICA8a2V2aW5v QHRoZW9sbGl2aWVycy5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgQWRkaW5nIHN1cHBvcnQgZm9yIGJ1aWxkaW5nIHd4IFB5dGhvbiBiaW5kaW5n cyB1c2luZyB0aGUgd2FmIGJ1aWxkIHN5c3RlbS4KKyAgICAgICAgCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yNzYxOQorCisgICAgICAgICogYmluZGlu Z3MvcHl0aG9uL3dzY3JpcHQ6IEFkZGVkLgorCiAyMDA5LTA4LTA0ICBLZXZpbiBPbGxpdmllciAg PGtldmlub0B0aGVvbGxpdmllcnMuY29tPgogCiAgICAgICAgIHd4IGJ1aWxkIGZpeCBhZnRlciBJ bnNwZWN0b3JDbGllbnQgQVBJIGNoYW5nZS4KSW5kZXg6IFdlYktpdC93eC9iaW5kaW5ncy9weXRo b24vd3NjcmlwdAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXQvd3gvYmluZGluZ3MvcHl0aG9uL3dzY3Jp cHQJKHJldmlzaW9uIDApCisrKyBXZWJLaXQvd3gvYmluZGluZ3MvcHl0aG9uL3dzY3JpcHQJKHJl dmlzaW9uIDApCkBAIC0wLDAgKzEsODkgQEAKKyMhIC91c3IvYmluL2VudiBweXRob24KKworIyBD b3B5cmlnaHQgKEMpIDIwMDkgS2V2aW4gT2xsaXZpZXIgIEFsbCByaWdodHMgcmVzZXJ2ZWQuCisj CisjIFJlZGlzdHJpYnV0aW9uIGFuZCB1c2UgaW4gc291cmNlIGFuZCBiaW5hcnkgZm9ybXMsIHdp dGggb3Igd2l0aG91dAorIyBtb2RpZmljYXRpb24sIGFyZSBwZXJtaXR0ZWQgcHJvdmlkZWQgdGhh dCB0aGUgZm9sbG93aW5nIGNvbmRpdGlvbnMKKyMgYXJlIG1ldDoKKyMgMS4gUmVkaXN0cmlidXRp b25zIG9mIHNvdXJjZSBjb2RlIG11c3QgcmV0YWluIHRoZSBhYm92ZSBjb3B5cmlnaHQKKyMgICAg bm90aWNlLCB0aGlzIGxpc3Qgb2YgY29uZGl0aW9ucyBhbmQgdGhlIGZvbGxvd2luZyBkaXNjbGFp bWVyLgorIyAyLiBSZWRpc3RyaWJ1dGlvbnMgaW4gYmluYXJ5IGZvcm0gbXVzdCByZXByb2R1Y2Ug dGhlIGFib3ZlIGNvcHlyaWdodAorIyAgICBub3RpY2UsIHRoaXMgbGlzdCBvZiBjb25kaXRpb25z IGFuZCB0aGUgZm9sbG93aW5nIGRpc2NsYWltZXIgaW4gdGhlCisjICAgIGRvY3VtZW50YXRpb24g YW5kL29yIG90aGVyIG1hdGVyaWFscyBwcm92aWRlZCB3aXRoIHRoZSBkaXN0cmlidXRpb24uCisj CisjIFRISVMgU09GVFdBUkUgSVMgUFJPVklERUQgQlkgQVBQTEUgQ09NUFVURVIsIElOQy4gYGBB UyBJUycnIEFORCBBTlkKKyMgRVhQUkVTUyBPUiBJTVBMSUVEIFdBUlJBTlRJRVMsIElOQ0xVRElO RywgQlVUIE5PVCBMSU1JVEVEIFRPLCBUSEUKKyMgSU1QTElFRCBXQVJSQU5USUVTIE9GIE1FUkNI QU5UQUJJTElUWSBBTkQgRklUTkVTUyBGT1IgQSBQQVJUSUNVTEFSCisjIFBVUlBPU0UgQVJFIERJ U0NMQUlNRUQuICBJTiBOTyBFVkVOVCBTSEFMTCBBUFBMRSBDT01QVVRFUiwgSU5DLiBPUgorIyBD T05UUklCVVRPUlMgQkUgTElBQkxFIEZPUiBBTlkgRElSRUNULCBJTkRJUkVDVCwgSU5DSURFTlRB TCwgU1BFQ0lBTCwKKyMgRVhFTVBMQVJZLCBPUiBDT05TRVFVRU5USUFMIERBTUFHRVMgKElOQ0xV RElORywgQlVUIE5PVCBMSU1JVEVEIFRPLAorIyBQUk9DVVJFTUVOVCBPRiBTVUJTVElUVVRFIEdP T0RTIE9SIFNFUlZJQ0VTOyBMT1NTIE9GIFVTRSwgREFUQSwgT1IKKyMgUFJPRklUUzsgT1IgQlVT SU5FU1MgSU5URVJSVVBUSU9OKSBIT1dFVkVSIENBVVNFRCBBTkQgT04gQU5ZIFRIRU9SWQorIyBP RiBMSUFCSUxJVFksIFdIRVRIRVIgSU4gQ09OVFJBQ1QsIFNUUklDVCBMSUFCSUxJVFksIE9SIFRP UlQKKyMgKElOQ0xVRElORyBORUdMSUdFTkNFIE9SIE9USEVSV0lTRSkgQVJJU0lORyBJTiBBTlkg V0FZIE9VVCBPRiBUSEUgVVNFCisjIE9GIFRISVMgU09GVFdBUkUsIEVWRU4gSUYgQURWSVNFRCBP RiBUSEUgUE9TU0lCSUxJVFkgT0YgU1VDSCBEQU1BR0UuIAorIworIyB3eFdlYktpdCBQeXRob24g YmluZGluZ3MgYnVpbGQgc2NyaXB0IGZvciB0aGUgd2FmIGJ1aWxkIHN5c3RlbQorCitmcm9tIHNl dHRpbmdzIGltcG9ydCAqCitpbXBvcnQgTG9ncworaW1wb3J0IE9wdGlvbnMKKworaW5jbHVkZV9w YXRocyA9IFsKKyAgICAgICAgICAgIG9zLnBhdGguam9pbih3a19yb290LCAnV2ViS2l0JywgJ3d4 JyksCisgICAgICAgICAgICBvcy5wYXRoLmpvaW4od3hfcm9vdCwgJ3d4UHl0aG9uJywgJ2luY2x1 ZGUnKSwKKyAgICAgICAgICAgIG9zLnBhdGguam9pbih3eF9yb290LCAnLi4nLCAnd3hQeXRob24n LCAnaW5jbHVkZScpLAorICAgICAgICAgICAgXQorCitkZWYgd3hweV9zd2lnX2luY2x1ZGUoKToK KyAgICBkaXJzID0gWworICAgICAgICAgICAgICAgICdpbmNsdWRlL3d4LTIuOS93eC93eFB5dGhv bi9pX2ZpbGVzJywKKyAgICAgICAgICAgICAgICAnaW5jbHVkZS93eC0yLjgvd3gvd3hQeXRob24v aV9maWxlcycsCisgICAgICAgICAgICAgICAgJ2luY2x1ZGUvd3gvd3hQeXRob24vaV9maWxlcycs CisgICAgICAgICAgICAgICAgJ3d4UHl0aG9uL3NyYycsCisgICAgICAgICAgICAgICAgJy4uL3d4 UHl0aG9uL3NyYycsCisgICAgICAgICAgIF0KKworICAgIGZvciBhZGlyIGluIGRpcnM6CisgICAg ICAgIGZ1bGxwYXRoID0gb3MucGF0aC5qb2luKHd4X3Jvb3QsIGFkaXIpCisgICAgICAgIGlmIG9z LnBhdGguZXhpc3RzKGZ1bGxwYXRoKToKKyAgICAgICAgICAgIHJldHVybiBmdWxscGF0aAorICAg ICAgICAgICAgCisgICAgcmV0dXJuICcnCisKK2RlZiBzZXRfb3B0aW9ucyhvcHQpOgorICAgIGNv bW1vbl9zZXRfb3B0aW9ucyhvcHQpCisKK2RlZiBjb25maWd1cmUoY29uZik6CisgICAgY29tbW9u X2NvbmZpZ3VyZShjb25mKQorICAgIGNvbmYuY2hlY2tfdG9vbCgnc3dpZycsIHRvb2xkaXI9Jy4n KQorICAgIGNvbmYuY2hlY2tfc3dpZ192ZXJzaW9uKCcxLjMuMjknKQorICAgIAorZGVmIGJ1aWxk KGJsZCk6CisgICAgaWYgT3B0aW9ucy5vcHRpb25zLnd4cHl0aG9uOgorICAgICAgICB3eF9zd2ln X2FyZ3MgPSBbXQorICAgICAgICB0cnk6CisgICAgICAgICAgICBpbXBvcnQgd3guYnVpbGQuY29u ZmlnCisgICAgICAgICAgICB3eF9zd2lnX2FyZ3MgPSB3eC5idWlsZC5jb25maWcuc3dpZ19hcmdz CisgICAgICAgIGV4Y2VwdDoKKyAgICAgICAgICAgIExvZ3Mud2FybigiQ2Fubm90IGZpbmQgd3hQ eXRob24sIHd4UHl0aG9uIGV4dGVuc2lvbiB3aWxsIG5vdCBiZSBidWlsdC4iKQorICAgICAgICAg ICAgcmV0dXJuCisgICAgCisgICAgICAgIHd4cHlfaW5jbHVkZSA9IHd4cHlfc3dpZ19pbmNsdWRl KCkKKyAgICAgICAgaWYgb3MucGF0aC5leGlzdHMod3hweV9pbmNsdWRlKToKKyAgICAgICAgICAg IGluY2x1ZGVfcGF0aHMuYXBwZW5kKHd4cHlfaW5jbHVkZSkKKyAgICAgICAgZWxzZToKKyAgICAg ICAgICAgIExvZ3Mud2FybigiQ2Fubm90IGZpbmQgbG9jYXRpb24gb2Ygd3hQeXRob24gLmkgZmls ZXMsIHd4UHl0aG9uIGV4dGVuc2lvbiB3aWxsIG5vdCBiZSBidWlsdC4iKQorICAgICAgICAgICAg cmV0dXJuCisgICAgCisgICAgICAgIG9iaiA9IGJsZC5uZXdfdGFza19nZW4oCisgICAgICAgICAg ICBmZWF0dXJlcyA9ICdjeHggY3NobGliIHB5ZXh0JywKKyAgICAgICAgICAgIGluY2x1ZGVzID0g JyAnLmpvaW4oaW5jbHVkZV9wYXRocyksCisgICAgICAgICAgICBzb3VyY2UgPSAnd2Vidmlldy5p JywKKyAgICAgICAgICAgIHN3aWdfZmxhZ3MgPSAnLWMrKyAtcHl0aG9uIC1XYWxsICcgKyAnICcu am9pbih3eF9zd2lnX2FyZ3MpLAorICAgICAgICAgICAgdGFyZ2V0ID0gJ193ZWJ2aWV3JywKKyAg ICAgICAgICAgIHVzZWxpYiA9ICdXWCBDVVJMIElDVSBYU0xUIFhNTCBTUUxJVEUzIFdYV0VCS0lU ICcgKyB3YWZfY29uZmlnbmFtZSwKKyAgICAgICAgICAgIAorICAgICAgICAgICAgbGlicGF0aCA9 IFtvdXRwdXRfZGlyXSwKKyAgICAgICAgICAgIHVzZWxpYl9sb2NhbCA9ICcnLAorICAgICAgICAg ICAgaW5zdGFsbF9wYXRoID0gb3V0cHV0X2RpcikK 34326 2009-08-07 13:54:02 -0700 2009-08-10 19:03:35 -0700 Changes to build-webkit, revised version with parts moved to webkitdirs.pm waf-build-webkit3.patch text/plain 5466 kevino SW5kZXg6IFdlYktpdFRvb2xzL1NjcmlwdHMvYnVpbGQtd2Via2l0Cj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdl YktpdFRvb2xzL1NjcmlwdHMvYnVpbGQtd2Via2l0CShyZXZpc2lvbiA0NjkxMCkKKysrIFdlYktp dFRvb2xzL1NjcmlwdHMvYnVpbGQtd2Via2l0CSh3b3JraW5nIGNvcHkpCkBAIC0yMDUsMTggKzIw NSw2IEBACiBjaGVja1JlcXVpcmVkU3lzdGVtQ29uZmlnKCk7CiBzZXRDb25maWd1cmF0aW9uKCk7 CiAKLWlmIChpc1d4KCkpIHsKLSAgICAkRU5WeyJXRUJLSVRPVVRQVVRESVIifSA9IHByb2R1Y3RE aXIoKTsKLQotICAgIG15IEBvcHRzID0gZ2V0V3hBcmdzKCk7Ci0KLSAgICBpZiAoJGNsZWFuKSB7 Ci0gICAgICAgIHB1c2goQG9wdHMsICJjbGVhbiIpOwotICAgIH0KLSAgICBzeXN0ZW0gIldlYktp dFRvb2xzL3d4L2J1aWxkLXd4d2Via2l0IEBvcHRzIjsKLSAgICBleGl0IGV4aXRTdGF0dXMoJD8p OwotfQotCiBteSAkcHJvZHVjdERpciA9IHByb2R1Y3REaXIoKTsKIAogIyBDaGVjayB0aGF0IGFs bCB0aGUgcHJvamVjdCBkaXJlY3RvcmllcyBhcmUgdGhlcmUuCkBAIC0zMDYsNiArMjk0LDE1IEBA CiAjIEZvcmNlIHJlLWxpbmsgb2YgZXhpc3RpbmcgbGlicmFyaWVzIGlmIGRpZmZlcmVudCB0aGFu IGV4cGVjdGVkCiByZW1vdmVMaWJyYXJ5RGVwZW5kaW5nT25TVkcoIldlYkNvcmUiLCAkc3ZnU3Vw cG9ydCk7CiAKK2lmIChpc1d4KCkpIHsgICAKKyAgICBwdXNoIEBwcm9qZWN0cywgJ1dlYktpdFRv b2xzL3d4L2Jyb3dzZXInOworICAgIHB1c2ggQHByb2plY3RzLCAnV2ViS2l0L3d4L2JpbmRpbmdz L3B5dGhvbic7CisgICAgCisgICAgIyB3ZSBkb24ndCBzdXBwb3J0IFNWRyB5ZXQuCisgICAgKCRz dmdTdXBwb3J0LCAkc3ZnQW5pbWF0aW9uU3VwcG9ydCwgJHN2Z0FzSW1hZ2VTdXBwb3J0LCAkc3Zn RE9NT2JqQ0JpbmRpbmdzU3VwcG9ydCkgPSAoMCwgMCwgMCwgMCk7CisgICAgKCRzdmdGb250c1N1 cHBvcnQsICRzdmdGb3JlaWduT2JqZWN0U3VwcG9ydCwgJHN2Z1VzZVN1cHBvcnQpID0gKDAsIDAs IDApOworfQorCiAjIEJ1aWxkLCBhbmQgYWJvcnQgaWYgdGhlIGJ1aWxkIGZhaWxzLgogZm9yIG15 ICRkaXIgKEBwcm9qZWN0cykgewogICAgIGNoZGlyICRkaXIgb3IgZGllOwpAQCAtMzI3LDYgKzMy NCwxNiBAQAogICAgICAgICBpZiAoJGRpciBlcSAiV2ViS2l0IikgewogICAgICAgICAgICAgJHJl c3VsdCA9IGJ1aWxkVmlzdWFsU3R1ZGlvUHJvamVjdCgid2luL1dlYktpdC52Y3Byb2ovV2ViS2l0 LnNsbiIsICRjbGVhbik7CiAgICAgICAgIH0KKyAgICB9IGVsc2lmIChpc1d4KCkpIHsKKyAgICAg ICAgQG9wdGlvbnMgPSAoKTsKKyAgICAgICAgaWYgKGRlZmluZWQoJG1ha2VBcmdzKSkgeworICAg ICAgICAgICAgQG9wdGlvbnMgPSBzcGxpdCgvIC8sICRtYWtlQXJncyk7CisgICAgICAgIH0KKyAg ICAgICAgaWYgKCRkaXIgZXEgIldlYktpdCIgJiYgaXNXeCgpKSB7CisgICAgICAgICAgICBjaGRp ciAnd3gnIG9yIGRpZTsKKyAgICAgICAgfQorICAgICAgICAgICAgCisgICAgICAgICRyZXN1bHQg PSBidWlsZFdhZlByb2plY3QoJGRpciwgJGNsZWFuLCBAb3B0aW9ucyk7CiAgICAgfQogCiAgICAg aWYgKGV4aXRTdGF0dXMoJHJlc3VsdCkpIHsKQEAgLTMzOSw3ICszNDYsNyBAQAogICAgICAgICB9 CiAgICAgICAgIGV4aXQgZXhpdFN0YXR1cygkcmVzdWx0KTsKICAgICB9Ci0gICAgY2hkaXIgIi4u IiBvciBkaWU7CisgICAgY2hkaXJXZWJLaXQoKTsKIH0KIAogIyBEb24ndCByZXBvcnQgdGhlICJX ZWJLaXQgaXMgbm93IGJ1aWx0IiBtZXNzYWdlIGFmdGVyIGEgY2xlYW4gb3BlcmF0aW9uLgpJbmRl eDogV2ViS2l0VG9vbHMvU2NyaXB0cy9ydW4tbGF1bmNoZXIKPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0 VG9vbHMvU2NyaXB0cy9ydW4tbGF1bmNoZXIJKHJldmlzaW9uIDQ2OTEwKQorKysgV2ViS2l0VG9v bHMvU2NyaXB0cy9ydW4tbGF1bmNoZXIJKHdvcmtpbmcgY29weSkKQEAgLTQyLDcgKzQyLDkgQEAK IG15IEBhcmdzID0gQEFSR1Y7CiAKICMgQ2hlY2sgdG8gc2VlIHRoYXQgYWxsIHRoZSBmcmFtZXdv cmtzIGFyZSBidWlsdC4KLWNoZWNrRnJhbWV3b3JrcygpOworaWYgKCFpc1d4KCkpIHsKKyAgICBj aGVja0ZyYW1ld29ya3MoKTsKK30KIAogIyBTZXQgcGF0aHMgYWNjb3JkaW5nIHRvIHRoZSBidWls ZCBzeXN0ZW0gdXNlZAogaWYgKGlzUXQoKSkgewpAQCAtNjEsNiArNjMsMTUgQEAKICAgICBpZiAo aXNHdGsoKSkgewogICAgICAgICAkbGF1bmNoZXJQYXRoID0gY2F0ZGlyKCRsYXVuY2hlclBhdGgs ICJQcm9ncmFtcyIsICJHdGtMYXVuY2hlciIpOwogICAgIH0KKyAgICAKKyAgICBpZiAoaXNXeCgp KSB7CisgICAgICAgIGlmIChpc0RhcndpbigpKSB7CisgICAgICAgICAgICAkbGF1bmNoZXJQYXRo ID0gY2F0ZGlyKCRsYXVuY2hlclBhdGgsICd3eEJyb3dzZXIuYXBwJywgJ0NvbnRlbnRzJywgJ01h Y09TJywgJ3d4QnJvd3NlcicpOworICAgICAgICB9IGVsc2UgeworICAgICAgICAgICAgJEVOVntM RF9MSUJSQVJZX1BBVEh9ID0gJEVOVntMRF9MSUJSQVJZX1BBVEh9ID8gIiRwcm9kdWN0RGlyOiRF TlZ7TERfTElCUkFSWV9QQVRIfSIgOiAkcHJvZHVjdERpcjsKKyAgICAgICAgICAgICRsYXVuY2hl clBhdGggPSBjYXRkaXIoJGxhdW5jaGVyUGF0aCwgJ3d4QnJvd3NlcicpOworICAgICAgICB9Cisg ICAgfQogCiAgICAgcHJpbnQgIlN0YXJ0aW5nIHdlYmtpdCBsYXVuY2hlci5cbiI7CiB9CkluZGV4 OiBXZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdGRpcnMucG0KPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0 VG9vbHMvU2NyaXB0cy93ZWJraXRkaXJzLnBtCShyZXZpc2lvbiA0NjkxMCkKKysrIFdlYktpdFRv b2xzL1NjcmlwdHMvd2Via2l0ZGlycy5wbQkod29ya2luZyBjb3B5KQpAQCAtODk0LDcgKzg5NCw3 IEBACiBzdWIgbGF1bmNoZXJQYXRoKCkKIHsKICAgICBteSAkcmVsYXRpdmVTY3JpcHRzUGF0aCA9 IHJlbGF0aXZlU2NyaXB0c0RpcigpOwotICAgIGlmIChpc0d0aygpIHx8IGlzUXQoKSkgeworICAg IGlmIChpc0d0aygpIHx8IGlzUXQoKSB8fCBpc1d4KCkpIHsKICAgICAgICAgcmV0dXJuICIkcmVs YXRpdmVTY3JpcHRzUGF0aC9ydW4tbGF1bmNoZXIiOwogICAgIH0gZWxzaWYgKGlzQXBwbGVXZWJL aXQoKSkgewogICAgICAgICByZXR1cm4gIiRyZWxhdGl2ZVNjcmlwdHNQYXRoL3J1bi1zYWZhcmki OwpAQCAtOTA3LDYgKzkwNyw4IEBACiAgICAgICAgIHJldHVybiAiR3RrTGF1bmNoZXIiOwogICAg IH0gZWxzaWYgKGlzUXQoKSkgewogICAgICAgICByZXR1cm4gIlF0TGF1bmNoZXIiOworICAgIH0g ZWxzaWYgKGlzV3goKSkgeworICAgICAgICByZXR1cm4gInd4QnJvd3NlciI7CiAgICAgfSBlbHNp ZiAoaXNBcHBsZVdlYktpdCgpKSB7CiAgICAgICAgIHJldHVybiAiU2FmYXJpIjsKICAgICB9CkBA IC0xMDMyLDYgKzEwMzQsNDYgQEAKICAgICByZXR1cm4gc3lzdGVtIEBjb21tYW5kOwogfQogCitz dWIgYnVpbGRXYWZQcm9qZWN0Cit7CisgICAgbXkgKCRwcm9qZWN0LCAkc2hvdWxkQ2xlYW4sIEBv cHRpb25zKSA9IEBfOworICAgIAorICAgICMgc2V0IHRoZSBQWVRIT05QQVRIIGZvciB3YWYKKyAg ICBteSAkcHl0aG9uUGF0aCA9ICRFTlZ7J1BZVEhPTlBBVEgnfTsKKyAgICBpZiAoIWRlZmluZWQo JHB5dGhvblBhdGgpKSB7CisgICAgICAgICRweXRob25QYXRoID0gJyc7CisgICAgfQorICAgIG15 ICRzb3VyY2VEaXIgPSBzb3VyY2VEaXIoKTsKKyAgICBteSAkbmV3UHl0aG9uUGF0aCA9ICIkc291 cmNlRGlyL1dlYktpdFRvb2xzL3d4L2J1aWxkOiRweXRob25QYXRoIjsKKyAgICBpZiAoaXNDeWd3 aW4oKSkgeworICAgICAgICAkbmV3UHl0aG9uUGF0aCA9IGBjeWdwYXRoIC0tbWl4ZWQgLS1wYXRo ICRuZXdQeXRob25QYXRoYDsKKyAgICB9CisgICAgJEVOVnsnUFlUSE9OUEFUSCd9ID0gJG5ld1B5 dGhvblBhdGg7CisgICAgCisgICAgIyBnZXQgLyB1cGRhdGUgd2FmIGlmIG5lZWRlZAorICAgIG15 ICR3YWYgPSAiJHNvdXJjZURpci9XZWJLaXRUb29scy93eC93YWYiOworICAgIG15ICR3YWZVUkwg PSAnaHR0cDovL3d4d2Via2l0Lnd4Y29tbXVuaXR5LmNvbS9kb3dubG9hZHMvZGVwcy93YWYnOwor ICAgIGlmICghLWYgJHdhZikgeworICAgICAgICBteSAkcmVzdWx0ID0gc3lzdGVtICJjdXJsIC1v ICR3YWYgJHdhZlVSTCI7CisgICAgICAgIGNobW9kIDA3NTUsICR3YWY7CisgICAgfQorICAgIAor ICAgIHByaW50ICJCdWlsZGluZyAkcHJvamVjdFxuIjsKKworICAgIG15ICR3YWZDb21tYW5kID0g JHdhZjsKKyAgICBpZiAoaXNDeWd3aW4oKSkgeworICAgICAgICAkd2FmQ29tbWFuZCA9IGBjeWdw YXRoIC0td2luZG93cyAiJHdhZkNvbW1hbmQiYDsKKyAgICAgICAgY2hvbXAoJHdhZkNvbW1hbmQp OworICAgIH0KKyAgICBpZiAoJHNob3VsZENsZWFuKSB7CisgICAgICAgIHJldHVybiBzeXN0ZW0g JHdhZkNvbW1hbmQsICJjbGVhbiI7CisgICAgfQorICAgIAorICAgIG15ICRyZXN1bHQgPSBzeXN0 ZW0gJHdhZkNvbW1hbmQsICdjb25maWd1cmUnLCAnYnVpbGQnLCAnaW5zdGFsbCcsIEBvcHRpb25z OworICAgIAorICAgIHJldHVybiAkcmVzdWx0OworfQorCiBzdWIgcmV0cmlldmVRTWFrZXNwZWNW YXIKIHsKICAgICBteSAkbWtzcGVjID0gJF9bMF07CkluZGV4OiBXZWJLaXRUb29scy9DaGFuZ2VM b2cKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCShyZXZpc2lvbiA0NjkxMCkK KysrIFdlYktpdFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE1IEBA CisyMDA5LTA4LTA3ICBLZXZpbiBPbGxpdmllciAgPGtldmlub0B0aGVvbGxpdmllcnMuY29tPgor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIENoYW5nZXMg bmVlZGVkIGZvciBidWlsZC13ZWJraXQgdG8gc3VwcG9ydCB0aGUgd2FmIGJ1aWxkIHN5c3RlbSBm b3IgdGhlIHd4IHBvcnQuCisgICAgICAgIAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9Mjc2MTkKKworICAgICAgICAqIFNjcmlwdHMvYnVpbGQtd2Via2l0 OgorICAgICAgICAqIFNjcmlwdHMvcnVuLWxhdW5jaGVyOgorICAgICAgICAqIFNjcmlwdHMvd2Vi a2l0ZGlycy5wbToKKwogMjAwOS0wOC0wNyAgR2VvcmdlIFdyaWdodCAgPGdlb3JnZS53cmlnaHRA dG9yY2htb2JpbGUuY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IEFkYW0gVHJlYXQK 34533 2009-08-10 19:03:35 -0700 2009-09-02 02:44:09 -0700 Changes to build-webkit, with Mark's comments addressed waf-build-webkit4.patch text/plain 5073 kevino SW5kZXg6IFdlYktpdFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXRUb29scy9D aGFuZ2VMb2cJKHJldmlzaW9uIDQ3MDE0KQorKysgV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCSh3b3Jr aW5nIGNvcHkpCkBAIC0xLDMgKzEsMTUgQEAKKzIwMDktMDgtMTAgIEtldmluIE9sbGl2aWVyICA8 a2V2aW5vQHRoZW9sbGl2aWVycy5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgQ2hhbmdlcyBuZWVkZWQgZm9yIGJ1aWxkLXdlYmtpdCB0byBzdXBw b3J0IHRoZSB3YWYgYnVpbGQgc3lzdGVtIGZvciB0aGUgd3ggcG9ydC4KKyAgICAgICAgCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yNzYxOQorCisgICAg ICAgICogU2NyaXB0cy9idWlsZC13ZWJraXQ6CisgICAgICAgICogU2NyaXB0cy9ydW4tbGF1bmNo ZXI6CisgICAgICAgICogU2NyaXB0cy93ZWJraXRkaXJzLnBtOgorCiAyMDA5LTA4LTEwICBTdGV2 ZSBGYWxrZW5idXJnICA8c2ZhbGtlbkBhcHBsZS5jb20+CiAKICAgICAgICAgV2luZG93cyBuaWdo dGx5IGZpeC4KSW5kZXg6IFdlYktpdFRvb2xzL1NjcmlwdHMvYnVpbGQtd2Via2l0Cj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIFdlYktpdFRvb2xzL1NjcmlwdHMvYnVpbGQtd2Via2l0CShyZXZpc2lvbiA0NzAxNCkK KysrIFdlYktpdFRvb2xzL1NjcmlwdHMvYnVpbGQtd2Via2l0CSh3b3JraW5nIGNvcHkpCkBAIC0y MDUsMTggKzIwNSw2IEBACiBjaGVja1JlcXVpcmVkU3lzdGVtQ29uZmlnKCk7CiBzZXRDb25maWd1 cmF0aW9uKCk7CiAKLWlmIChpc1d4KCkpIHsKLSAgICAkRU5WeyJXRUJLSVRPVVRQVVRESVIifSA9 IHByb2R1Y3REaXIoKTsKLQotICAgIG15IEBvcHRzID0gZ2V0V3hBcmdzKCk7Ci0KLSAgICBpZiAo JGNsZWFuKSB7Ci0gICAgICAgIHB1c2goQG9wdHMsICJjbGVhbiIpOwotICAgIH0KLSAgICBzeXN0 ZW0gIldlYktpdFRvb2xzL3d4L2J1aWxkLXd4d2Via2l0IEBvcHRzIjsKLSAgICBleGl0IGV4aXRT dGF0dXMoJD8pOwotfQotCiBteSAkcHJvZHVjdERpciA9IHByb2R1Y3REaXIoKTsKIAogIyBDaGVj ayB0aGF0IGFsbCB0aGUgcHJvamVjdCBkaXJlY3RvcmllcyBhcmUgdGhlcmUuCkBAIC0zMDYsNiAr Mjk0LDEyIEBACiAjIEZvcmNlIHJlLWxpbmsgb2YgZXhpc3RpbmcgbGlicmFyaWVzIGlmIGRpZmZl cmVudCB0aGFuIGV4cGVjdGVkCiByZW1vdmVMaWJyYXJ5RGVwZW5kaW5nT25TVkcoIldlYkNvcmUi LCAkc3ZnU3VwcG9ydCk7CiAKK2lmIChpc1d4KCkpIHsKKyAgICBkb3dubG9hZFdhZklmTmVlZGVk KCk7CisgICAgcHVzaCBAcHJvamVjdHMsICdXZWJLaXRUb29scy93eC9icm93c2VyJzsKKyAgICBw dXNoIEBwcm9qZWN0cywgJ1dlYktpdC93eC9iaW5kaW5ncy9weXRob24nOworfQorCiAjIEJ1aWxk LCBhbmQgYWJvcnQgaWYgdGhlIGJ1aWxkIGZhaWxzLgogZm9yIG15ICRkaXIgKEBwcm9qZWN0cykg ewogICAgIGNoZGlyICRkaXIgb3IgZGllOwpAQCAtMzI3LDYgKzMyMSwxNiBAQAogICAgICAgICBp ZiAoJGRpciBlcSAiV2ViS2l0IikgewogICAgICAgICAgICAgJHJlc3VsdCA9IGJ1aWxkVmlzdWFs U3R1ZGlvUHJvamVjdCgid2luL1dlYktpdC52Y3Byb2ovV2ViS2l0LnNsbiIsICRjbGVhbik7CiAg ICAgICAgIH0KKyAgICB9IGVsc2lmIChpc1d4KCkpIHsKKyAgICAgICAgQG9wdGlvbnMgPSAoKTsK KyAgICAgICAgaWYgKGRlZmluZWQoJG1ha2VBcmdzKSkgeworICAgICAgICAgICAgQG9wdGlvbnMg PSBzcGxpdCgvIC8sICRtYWtlQXJncyk7CisgICAgICAgIH0KKyAgICAgICAgaWYgKCRkaXIgZXEg IldlYktpdCIgJiYgaXNXeCgpKSB7CisgICAgICAgICAgICBjaGRpciAnd3gnIG9yIGRpZTsKKyAg ICAgICAgfQorICAgICAgICAgICAgCisgICAgICAgICRyZXN1bHQgPSBidWlsZFdhZlByb2plY3Qo JGRpciwgJGNsZWFuLCBAb3B0aW9ucyk7CiAgICAgfQogCiAgICAgaWYgKGV4aXRTdGF0dXMoJHJl c3VsdCkpIHsKQEAgLTMzOSw3ICszNDMsNyBAQAogICAgICAgICB9CiAgICAgICAgIGV4aXQgZXhp dFN0YXR1cygkcmVzdWx0KTsKICAgICB9Ci0gICAgY2hkaXIgIi4uIiBvciBkaWU7CisgICAgY2hk aXJXZWJLaXQoKTsKIH0KIAogIyBEb24ndCByZXBvcnQgdGhlICJXZWJLaXQgaXMgbm93IGJ1aWx0 IiBtZXNzYWdlIGFmdGVyIGEgY2xlYW4gb3BlcmF0aW9uLgpJbmRleDogV2ViS2l0VG9vbHMvU2Ny aXB0cy9ydW4tbGF1bmNoZXIKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0VG9vbHMvU2NyaXB0cy9ydW4t bGF1bmNoZXIJKHJldmlzaW9uIDQ3MDE0KQorKysgV2ViS2l0VG9vbHMvU2NyaXB0cy9ydW4tbGF1 bmNoZXIJKHdvcmtpbmcgY29weSkKQEAgLTYxLDYgKzYxLDE1IEBACiAgICAgaWYgKGlzR3RrKCkp IHsKICAgICAgICAgJGxhdW5jaGVyUGF0aCA9IGNhdGRpcigkbGF1bmNoZXJQYXRoLCAiUHJvZ3Jh bXMiLCAiR3RrTGF1bmNoZXIiKTsKICAgICB9CisgICAgCisgICAgaWYgKGlzV3goKSkgeworICAg ICAgICBpZiAoaXNEYXJ3aW4oKSkgeworICAgICAgICAgICAgJGxhdW5jaGVyUGF0aCA9IGNhdGRp cigkbGF1bmNoZXJQYXRoLCAnd3hCcm93c2VyLmFwcCcsICdDb250ZW50cycsICdNYWNPUycsICd3 eEJyb3dzZXInKTsKKyAgICAgICAgfSBlbHNlIHsKKyAgICAgICAgICAgICRFTlZ7TERfTElCUkFS WV9QQVRIfSA9ICRFTlZ7TERfTElCUkFSWV9QQVRIfSA/ICIkcHJvZHVjdERpcjokRU5We0xEX0xJ QlJBUllfUEFUSH0iIDogJHByb2R1Y3REaXI7CisgICAgICAgICAgICAkbGF1bmNoZXJQYXRoID0g Y2F0ZGlyKCRsYXVuY2hlclBhdGgsICd3eEJyb3dzZXInKTsKKyAgICAgICAgfQorICAgIH0KIAog ICAgIHByaW50ICJTdGFydGluZyB3ZWJraXQgbGF1bmNoZXIuXG4iOwogfQpJbmRleDogV2ViS2l0 VG9vbHMvU2NyaXB0cy93ZWJraXRkaXJzLnBtCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdFRvb2xzL1Nj cmlwdHMvd2Via2l0ZGlycy5wbQkocmV2aXNpb24gNDcwMTQpCisrKyBXZWJLaXRUb29scy9TY3Jp cHRzL3dlYmtpdGRpcnMucG0JKHdvcmtpbmcgY29weSkKQEAgLTg5NCw3ICs4OTQsNyBAQAogc3Vi IGxhdW5jaGVyUGF0aCgpCiB7CiAgICAgbXkgJHJlbGF0aXZlU2NyaXB0c1BhdGggPSByZWxhdGl2 ZVNjcmlwdHNEaXIoKTsKLSAgICBpZiAoaXNHdGsoKSB8fCBpc1F0KCkpIHsKKyAgICBpZiAoaXNH dGsoKSB8fCBpc1F0KCkgfHwgaXNXeCgpKSB7CiAgICAgICAgIHJldHVybiAiJHJlbGF0aXZlU2Ny aXB0c1BhdGgvcnVuLWxhdW5jaGVyIjsKICAgICB9IGVsc2lmIChpc0FwcGxlV2ViS2l0KCkpIHsK ICAgICAgICAgcmV0dXJuICIkcmVsYXRpdmVTY3JpcHRzUGF0aC9ydW4tc2FmYXJpIjsKQEAgLTkw Nyw2ICs5MDcsOCBAQAogICAgICAgICByZXR1cm4gIkd0a0xhdW5jaGVyIjsKICAgICB9IGVsc2lm IChpc1F0KCkpIHsKICAgICAgICAgcmV0dXJuICJRdExhdW5jaGVyIjsKKyAgICB9IGVsc2lmIChp c1d4KCkpIHsKKyAgICAgICAgcmV0dXJuICJ3eEJyb3dzZXIiOwogICAgIH0gZWxzaWYgKGlzQXBw bGVXZWJLaXQoKSkgewogICAgICAgICByZXR1cm4gIlNhZmFyaSI7CiAgICAgfQpAQCAtMTAzMiw2 ICsxMDM0LDQ3IEBACiAgICAgcmV0dXJuIHN5c3RlbSBAY29tbWFuZDsKIH0KIAorc3ViIGRvd25s b2FkV2FmSWZOZWVkZWQKK3sKKyAgICAjIGdldCAvIHVwZGF0ZSB3YWYgaWYgbmVlZGVkCisgICAg bXkgJHdhZiA9ICIkc291cmNlRGlyL1dlYktpdFRvb2xzL3d4L3dhZiI7CisgICAgbXkgJHdhZlVS TCA9ICdodHRwOi8vd3h3ZWJraXQud3hjb21tdW5pdHkuY29tL2Rvd25sb2Fkcy9kZXBzL3dhZic7 CisgICAgaWYgKCEtZiAkd2FmKSB7CisgICAgICAgIG15ICRyZXN1bHQgPSBzeXN0ZW0gImN1cmwg LW8gJHdhZiAkd2FmVVJMIjsKKyAgICAgICAgY2htb2QgMDc1NSwgJHdhZjsKKyAgICB9Cit9CisK K3N1YiBidWlsZFdhZlByb2plY3QKK3sKKyAgICBteSAoJHByb2plY3QsICRzaG91bGRDbGVhbiwg QG9wdGlvbnMpID0gQF87CisgICAgCisgICAgIyBzZXQgdGhlIFBZVEhPTlBBVEggZm9yIHdhZgor ICAgIG15ICRweXRob25QYXRoID0gJEVOVnsnUFlUSE9OUEFUSCd9OworICAgIGlmICghZGVmaW5l ZCgkcHl0aG9uUGF0aCkpIHsKKyAgICAgICAgJHB5dGhvblBhdGggPSAnJzsKKyAgICB9CisgICAg bXkgJHNvdXJjZURpciA9IHNvdXJjZURpcigpOworICAgIG15ICRuZXdQeXRob25QYXRoID0gIiRz b3VyY2VEaXIvV2ViS2l0VG9vbHMvd3gvYnVpbGQ6JHB5dGhvblBhdGgiOworICAgIGlmIChpc0N5 Z3dpbigpKSB7CisgICAgICAgICRuZXdQeXRob25QYXRoID0gYGN5Z3BhdGggLS1taXhlZCAtLXBh dGggJG5ld1B5dGhvblBhdGhgOworICAgIH0KKyAgICAkRU5WeydQWVRIT05QQVRIJ30gPSAkbmV3 UHl0aG9uUGF0aDsKKyAgICAKKyAgICBwcmludCAiQnVpbGRpbmcgJHByb2plY3RcbiI7CisKKyAg ICBteSAkd2FmQ29tbWFuZCA9ICIkc291cmNlRGlyL1dlYktpdFRvb2xzL3d4L3dhZiI7CisgICAg aWYgKGlzQ3lnd2luKCkpIHsKKyAgICAgICAgJHdhZkNvbW1hbmQgPSBgY3lncGF0aCAtLXdpbmRv d3MgIiR3YWZDb21tYW5kImA7CisgICAgICAgIGNob21wKCR3YWZDb21tYW5kKTsKKyAgICB9Cisg ICAgaWYgKCRzaG91bGRDbGVhbikgeworICAgICAgICByZXR1cm4gc3lzdGVtICR3YWZDb21tYW5k LCAiY2xlYW4iLCAiZGlzdGNsZWFuIjsKKyAgICB9CisgICAgCisgICAgcmV0dXJuIHN5c3RlbSAk d2FmQ29tbWFuZCwgJ2NvbmZpZ3VyZScsICdidWlsZCcsICdpbnN0YWxsJywgQG9wdGlvbnM7Cit9 CisKIHN1YiByZXRyaWV2ZVFNYWtlc3BlY1ZhcgogewogICAgIG15ICRta3NwZWMgPSAkX1swXTsK