29656 2009-09-22 15:35:38 -0700 Make WebKitTools/Scripits/run-sunspider script work on Windows platform 2009-09-30 10:15:44 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) PC Windows XP RESOLVED FIXED P2 Normal --- 29802 1 ossy webkit-unassigned ddkilzer eric mjs vestbo oldest_to_newest 149232 0 ossy 2009-09-22 15:35:38 -0700 If you build QtWebKit on Windows platform, you have to use cmd.exe as shell. It doesn't interpret the first line of scripts, eg #!/usr/bin/perl, but you have to run perl scripts directly with "perl ./foo.pl" command instead of "./foo.pl" It is the correct thing if you invoke external script from a perl script with exec or system command. 149235 1 39954 ossy 2009-09-22 15:40:02 -0700 Created attachment 39954 proposed patch 149255 2 39954 eric 2009-09-22 16:22:56 -0700 Comment on attachment 39954 proposed patch It seems wrong that only this script would need special casing. Either we already handle MSWIN Perl in all the other perl scripts, or we dont' support it at all and we shouldn't here. 149362 3 mrowe 2009-09-23 05:06:57 -0700 run-webkit-tests invokes build-dumprendertree in the same manner that run-sunspider currently invokes build-jsc. We used to have a Qt Windows buildbot that ran regression tests, which suggests that what run-webkit-tests is doing does work. Of course, we don't have that build bot at the moment so I can't say that conclusively. 149383 4 39954 vestbo 2009-09-23 06:53:23 -0700 Comment on attachment 39954 proposed patch run-webkit-tests uses open3 instead of system, can you try that and see if it helps? 149385 5 ossy 2009-09-23 06:56:37 -0700 (In reply to comment #4) I tried it with open3, but it didn't help. The problem is same, because system, exec and open3 don't interpret the first line of scripts, and don't know which script interpreter should be called. 149389 6 vestbo 2009-09-23 07:06:16 -0700 It seems run-javascriptcore-tests uses perl directly, maybe that's why the old regression tests used to work bdash? 150929 7 40304 ossy 2009-09-29 08:29:30 -0700 Created attachment 40304 proposed patch I refactored my patch, and modified sunspider-compare-results script too. I added a bug to depends list because of modifying isWindows() function. 150939 8 40304 ddkilzer 2009-09-29 09:24:14 -0700 Comment on attachment 40304 proposed patch Since both of these scripts are Perl scripts, they had to be invoked with a Perl interpreter originally. We should use the same Perl interpreter when running subsequent scripts. I would add a method like this to webkitdirs.pm (see "man perlvar" for details): use Config; [...] sub currentPerlPath() { my $thisPerl = $^X; if ($^O ne 'VMS') { $thisPerl .= $Config{_exe} unless $thisPerl =~ m/$Config{_exe}$/i; } return $thisPerl; } Then the following changes can be made: > diff --git a/WebKitTools/Scripts/run-sunspider b/WebKitTools/Scripts/run-sunspider > +my @perl; > +push @perl, "perl" if isWindows(); These are no longer needed. > - my $buildResult = system "WebKitTools/Scripts/build-jsc", @ARGV; > + my $buildResult = system @perl, "WebKitTools/Scripts/build-jsc", @ARGV; Replace @perl with currentPerlPath() here. > -exec "./sunspider", @args; > +exec @perl, "./sunspider", @args; Ditto. > diff --git a/WebKitTools/Scripts/sunspider-compare-results b/WebKitTools/Scripts/sunspider-compare-results > +my @perl; > +push @perl, "perl" if isWindows(); These are no longer needed. > - my $buildResult = system "WebKitTools/Scripts/build-jsc", "--" . $configuration; > + my $buildResult = system @perl, "WebKitTools/Scripts/build-jsc", "--" . $configuration; Replace @perl with currentPerlPath(). > -exec "./sunspider-compare-results", @args, @ARGV; > +exec @perl, "./sunspider-compare-results", @args, @ARGV; Ditto. r- to make the above changes. 151230 9 ossy 2009-09-30 05:49:15 -0700 (In reply to comment #8) You are right, that we should use same Perl interpreter when invoke another Perl scripts. It is nicer solution than using just "perl". I don't know perlvar before, I read it, and find it is very helpful, thx. ;) > sub currentPerlPath() > { > my $thisPerl = $^X; > if ($^O ne 'VMS') { > $thisPerl .= $Config{_exe} unless $thisPerl =~ m/$Config{_exe}$/i; > } > return $thisPerl; > } I don't see why we should use this method to determine the actual Perl interpreter. Why don't use simple $^X? I think all windows platform don't need .exe suffixes. And my ActiveState Perl 5.10.0 said that its interpreter is c:\perl\bin\perl.exe. It works with ...perl and ...perl.exe too. Do you know a perl used by WebKit developers which needs this very complex method? I think we can use simple "return $^X". 151231 10 40365 ossy 2009-09-30 05:50:42 -0700 Created attachment 40365 updated patch 151251 11 ddkilzer 2009-09-30 08:22:31 -0700 (In reply to comment #9) > > sub currentPerlPath() > > { > > my $thisPerl = $^X; > > if ($^O ne 'VMS') { > > $thisPerl .= $Config{_exe} unless $thisPerl =~ m/$Config{_exe}$/i; > > } > > return $thisPerl; > > } > > I don't see why we should use this method to determine the actual Perl > interpreter. Why don't use simple $^X? I think all windows platform don't need > .exe suffixes. And my ActiveState Perl 5.10.0 said that its interpreter is > c:\perl\bin\perl.exe. It works with ...perl and ...perl.exe too. > > Do you know a perl used by WebKit developers which needs this very complex > method? I think we can use simple "return $^X". The problem is that the manpage doesn't say which platforms need the workaround (and I have no more knowledge that the manpage on this one). You say you don't need it with ActiveState Perl, but have you tested all combinations of ActiveState Perl, Cygwin's Perl, "native" (DOS/Windows-only) Perl and invoking the script from both a DOS shell and a Cygwin shell? I think it's best to follow the manpage on this one. It certainly won't hurt to use the code, and it's guaranteed to work. (It would probably make sense to add a comment to the subroutine that mentions the perlvar manpage, though.) 151253 12 40365 ddkilzer 2009-09-30 08:24:58 -0700 Comment on attachment 40365 updated patch > diff --git a/WebKitTools/Scripts/webkitdirs.pm b/WebKitTools/Scripts/webkitdirs.pm > # used for scripts which are stored in a non-standard location > +sub currentPerlPath() > +{ > + return $^X; > +} I really think you should use the method from Comment #8 due to the reasons I outlined in Comment #11: it's guaranteed to work, and we don't know exactly which platforms it's needed on. r- 151256 13 ddkilzer 2009-09-30 08:26:20 -0700 (In reply to comment #12) > (From update of attachment 40365 [details]) > > diff --git a/WebKitTools/Scripts/webkitdirs.pm b/WebKitTools/Scripts/webkitdirs.pm > > # used for scripts which are stored in a non-standard location > > +sub currentPerlPath() > > +{ > > + return $^X; > > +} > > I really think you should use the method from Comment #8 due to the reasons I > outlined in Comment #11: it's guaranteed to work, and we don't know exactly > which platforms it's needed on. If you change the method back, I will r+ the patch. Everything else looks good! 151265 14 40375 ossy 2009-09-30 08:39:43 -0700 Created attachment 40375 updated patch OK, I changed back the method. 151282 15 40375 ddkilzer 2009-09-30 10:12:03 -0700 Comment on attachment 40375 updated patch r=me. I'll land this. 151287 16 ddkilzer 2009-09-30 10:15:44 -0700 Committed r48931: <http://trac.webkit.org/changeset/48931> 39954 2009-09-22 15:40:02 -0700 2009-09-29 08:29:30 -0700 proposed patch win.patch text/plain 1684 ossy ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxv ZwppbmRleCBkOTcwNTgzLi45NmVjMThiIDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9DaGFuZ2VM b2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTIgQEAKKzIwMDktMDkt MjIgIENzYWJhIE9zenRyb2dvbmFjICA8b3N6aUBpbmYudS1zemVnZWQuaHU+CisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgW1F0XSBNYWtlIHJ1bi1zdW5z cGlkZXIgc2NyaXB0IHdvcmsgb24gV2luZG93cyBwbGF0Zm9ybS4KKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTI5NjU2CisKKyAgICAgICAgKiBTY3JpcHRz L3J1bi1zdW5zcGlkZXI6IFVzaW5nIHBsYXRmb3JtIGRlcGVuZGVudCBzeXN0ZW0gY2FsbHMuCisK IDIwMDktMDktMjIgIEVyaWMgU2VpZGVsICA8ZXJpY0B3ZWJraXQub3JnPgogCiAgICAgICAgIFJl dmlld2VkIGJ5IERhcmluIEFkbGVyLgpkaWZmIC0tZ2l0IGEvV2ViS2l0VG9vbHMvU2NyaXB0cy9y dW4tc3Vuc3BpZGVyIGIvV2ViS2l0VG9vbHMvU2NyaXB0cy9ydW4tc3Vuc3BpZGVyCmluZGV4IGY2 YmM3NzkuLjY3ODI3MGQgMTAwNzU1Ci0tLSBhL1dlYktpdFRvb2xzL1NjcmlwdHMvcnVuLXN1bnNw aWRlcgorKysgYi9XZWJLaXRUb29scy9TY3JpcHRzL3J1bi1zdW5zcGlkZXIKQEAgLTgxLDEzICs4 MSwyMCBAQCBpZiAoJHNob3dIZWxwKSB7CiAgICBleGl0IDE7CiB9CiAKK215ICRpc01TV2luZG93 c1BlcmwgPSAoJF5PIGVxICJNU1dpbjMyIik7CisKIHN1YiBidWlsZEpTQwogewogICAgIGlmICgh ZGVmaW5lZCgkcm9vdCkpewogICAgICAgICBwdXNoKEBBUkdWLCAgIi0tIiAuICRjb25maWd1cmF0 aW9uKTsKICAgICAgICAgCiAgICAgICAgIGNoZGlyV2ViS2l0KCk7Ci0gICAgICAgIG15ICRidWls ZFJlc3VsdCA9IHN5c3RlbSAiV2ViS2l0VG9vbHMvU2NyaXB0cy9idWlsZC1qc2MiLCBAQVJHVjsK KyAgICAgICAgbXkgJGJ1aWxkUmVzdWx0OworICAgICAgICBpZiAoJGlzTVNXaW5kb3dzUGVybCkg eworICAgICAgICAgICAgJGJ1aWxkUmVzdWx0ID0gc3lzdGVtICJwZXJsIiwgIldlYktpdFRvb2xz L1NjcmlwdHMvYnVpbGQtanNjIiwgQEFSR1Y7CisgICAgICAgIH0gZWxzZSB7CisgICAgICAgICAg ICAkYnVpbGRSZXN1bHQgPSBzeXN0ZW0gIldlYktpdFRvb2xzL1NjcmlwdHMvYnVpbGQtanNjIiwg QEFSR1Y7CisgICAgICAgIH0KICAgICAgICAgaWYgKCRidWlsZFJlc3VsdCkgewogICAgICAgICAg ICAgcHJpbnQgU1RERVJSICJDb21waWxpbmcganNjIGZhaWxlZCFcbiI7CiAgICAgICAgICAgICBl eGl0IGV4aXRTdGF0dXMoJGJ1aWxkUmVzdWx0KTsKQEAgLTEzMyw0ICsxNDAsOCBAQCBwdXNoIEBh cmdzLCAiLS12OCIgaWYgJHY4OwogcHVzaCBAYXJncywgIi0tcGFyc2Utb25seSIgaWYgJHBhcnNl b25seTsKIHB1c2ggQGFyZ3MsICItLXRlc3RzIiwgJHRlc3RzUGF0dGVybiBpZiAkdGVzdHNQYXR0 ZXJuOwogCi1leGVjICIuL3N1bnNwaWRlciIsIEBhcmdzOworaWYgKCRpc01TV2luZG93c1Blcmwp IHsKKyAgICBleGVjICJwZXJsIiwgIi4vc3Vuc3BpZGVyIiwgQGFyZ3M7Cit9IGVsc2UgeworICAg IGV4ZWMgIi4vc3Vuc3BpZGVyIiwgQGFyZ3M7Cit9Cg== 40304 2009-09-29 08:29:30 -0700 2009-09-30 05:50:42 -0700 proposed patch perl.patch text/plain 2657 ossy ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxv ZwppbmRleCA1NGNjYzVkLi4xZGE1YTgzIDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9DaGFuZ2VM b2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTQgQEAKKzIwMDktMDkt MjkgIENzYWJhIE9zenRyb2dvbmFjICA8b3N6aUBpbmYudS1zemVnZWQuaHU+CisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgW1F0XSBNYWtlIHN1bnNwaWRl ciBzY3JpcHRzIHdvcmsgb24gV2luZG93cyBwbGF0Zm9ybS4KKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTI5NjU2CisKKyAgICAgICAgKiBTY3JpcHRzL3J1 bi1zdW5zcGlkZXI6CisgICAgICAgICogU2NyaXB0cy9zdW5zcGlkZXItY29tcGFyZS1yZXN1bHRz OgorICAgICAgICBVc2luZyBwZXJsIHByZWZpeCBmb3IgaW52b2tpbmcgcGVybCBzY3JpcHQgb24g V2luZG93cy4KKwogMjAwOS0wOS0yOSAgSmFrdWIgV2llY3pvcmVrICA8ZmF3MjE3QGdtYWlsLmNv bT4KIAogICAgICAgICBSZXZpZXdlZCBieSBTaW1vbiBIYXVzbWFubi4KZGlmZiAtLWdpdCBhL1dl YktpdFRvb2xzL1NjcmlwdHMvcnVuLXN1bnNwaWRlciBiL1dlYktpdFRvb2xzL1NjcmlwdHMvcnVu LXN1bnNwaWRlcgppbmRleCBmNmJjNzc5Li4xMDQyOTVhIDEwMDc1NQotLS0gYS9XZWJLaXRUb29s cy9TY3JpcHRzL3J1bi1zdW5zcGlkZXIKKysrIGIvV2ViS2l0VG9vbHMvU2NyaXB0cy9ydW4tc3Vu c3BpZGVyCkBAIC00Nyw2ICs0Nyw4IEBAIG15ICRwYXJzZW9ubHkgPSAwOwogbXkgJHNldEJhc2Vs aW5lID0gMDsKIG15ICRzaG93SGVscCA9IDA7CiBteSAkdGVzdHNQYXR0ZXJuOworbXkgQHBlcmw7 CitwdXNoIEBwZXJsLCAicGVybCIgaWYgaXNXaW5kb3dzKCk7CiAKIG15ICRwcm9ncmFtTmFtZSA9 IGJhc2VuYW1lKCQwKTsKIG15ICR1c2FnZSA9IDw8RU9GOwpAQCAtODcsNyArODksNyBAQCBzdWIg YnVpbGRKU0MKICAgICAgICAgcHVzaChAQVJHViwgICItLSIgLiAkY29uZmlndXJhdGlvbik7CiAg ICAgICAgIAogICAgICAgICBjaGRpcldlYktpdCgpOwotICAgICAgICBteSAkYnVpbGRSZXN1bHQg PSBzeXN0ZW0gIldlYktpdFRvb2xzL1NjcmlwdHMvYnVpbGQtanNjIiwgQEFSR1Y7CisgICAgICAg IG15ICRidWlsZFJlc3VsdCA9IHN5c3RlbSBAcGVybCwgIldlYktpdFRvb2xzL1NjcmlwdHMvYnVp bGQtanNjIiwgQEFSR1Y7CiAgICAgICAgIGlmICgkYnVpbGRSZXN1bHQpIHsKICAgICAgICAgICAg IHByaW50IFNUREVSUiAiQ29tcGlsaW5nIGpzYyBmYWlsZWQhXG4iOwogICAgICAgICAgICAgZXhp dCBleGl0U3RhdHVzKCRidWlsZFJlc3VsdCk7CkBAIC0xMzMsNCArMTM1LDQgQEAgcHVzaCBAYXJn cywgIi0tdjgiIGlmICR2ODsKIHB1c2ggQGFyZ3MsICItLXBhcnNlLW9ubHkiIGlmICRwYXJzZW9u bHk7CiBwdXNoIEBhcmdzLCAiLS10ZXN0cyIsICR0ZXN0c1BhdHRlcm4gaWYgJHRlc3RzUGF0dGVy bjsKIAotZXhlYyAiLi9zdW5zcGlkZXIiLCBAYXJnczsKK2V4ZWMgQHBlcmwsICIuL3N1bnNwaWRl ciIsIEBhcmdzOwpkaWZmIC0tZ2l0IGEvV2ViS2l0VG9vbHMvU2NyaXB0cy9zdW5zcGlkZXItY29t cGFyZS1yZXN1bHRzIGIvV2ViS2l0VG9vbHMvU2NyaXB0cy9zdW5zcGlkZXItY29tcGFyZS1yZXN1 bHRzCmluZGV4IGQyMTk4OTYuLjE4NmZkNGEgMTAwNzU1Ci0tLSBhL1dlYktpdFRvb2xzL1Njcmlw dHMvc3Vuc3BpZGVyLWNvbXBhcmUtcmVzdWx0cworKysgYi9XZWJLaXRUb29scy9TY3JpcHRzL3N1 bnNwaWRlci1jb21wYXJlLXJlc3VsdHMKQEAgLTQxLDYgKzQxLDkgQEAgbXkgJHJvb3Q7CiBteSAk c2hvd0hlbHAgPSAwOwogbXkgJHViZW5jaCA9IDA7CiBteSAkdjggPSAwOworbXkgQHBlcmw7Citw dXNoIEBwZXJsLCAicGVybCIgaWYgaXNXaW5kb3dzKCk7CisKIAogbXkgJHByb2dyYW1OYW1lID0g YmFzZW5hbWUoJDApOwogbXkgJHVzYWdlID0gPDxFT0Y7CkBAIC02Nyw3ICs3MCw3IEBAIHN1YiBi dWlsZEpTQwogewogICAgIGlmICghZGVmaW5lZCgkcm9vdCkpewogICAgICAgICBjaGRpcldlYktp dCgpOwotICAgICAgICBteSAkYnVpbGRSZXN1bHQgPSBzeXN0ZW0gIldlYktpdFRvb2xzL1Njcmlw dHMvYnVpbGQtanNjIiwgIi0tIiAuICRjb25maWd1cmF0aW9uOworICAgICAgICBteSAkYnVpbGRS ZXN1bHQgPSBzeXN0ZW0gQHBlcmwsICJXZWJLaXRUb29scy9TY3JpcHRzL2J1aWxkLWpzYyIsICIt LSIgLiAkY29uZmlndXJhdGlvbjsKICAgICAgICAgaWYgKCRidWlsZFJlc3VsdCkgewogICAgICAg ICAgICAgcHJpbnQgU1RERVJSICJDb21waWxpbmcganNjIGZhaWxlZCFcbiI7CiAgICAgICAgICAg ICBleGl0IFdFWElUU1RBVFVTKCRidWlsZFJlc3VsdCk7CkBAIC0xMjQsNCArMTI3LDQgQEAgbXkg QGFyZ3MgPSAoIi0tc2hlbGwiLCAkanNjUGF0aCk7CiBwdXNoIEBhcmdzLCAiLS11YmVuY2giIGlm ICR1YmVuY2g7CiBwdXNoIEBhcmdzLCAiLS12OCIgaWYgJHY4OwogCi1leGVjICIuL3N1bnNwaWRl ci1jb21wYXJlLXJlc3VsdHMiLCBAYXJncywgQEFSR1Y7CitleGVjIEBwZXJsLCAiLi9zdW5zcGlk ZXItY29tcGFyZS1yZXN1bHRzIiwgQGFyZ3MsIEBBUkdWOwo= 40365 2009-09-30 05:50:42 -0700 2009-09-30 08:39:43 -0700 updated patch perl2.patch text/plain 2815 ossy ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxv ZwppbmRleCBmOTkyOGQ3Li5hMjhiNzFmIDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9DaGFuZ2VM b2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTQgQEAKKzIwMDktMDkt MzAgIENzYWJhIE9zenRyb2dvbmFjICA8b3N6aUBpbmYudS1zemVnZWQuaHU+CisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgTWFrZSBzdW5zcGlkZXIgc2Ny aXB0cyB3b3JrIG9uIFdpbmRvd3MgcGxhdGZvcm0uCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yOTY1NgorCisgICAgICAgICogU2NyaXB0cy9ydW4tc3Vu c3BpZGVyOiBQZXJsIHNjcmlwdHMgaW52b2tlZCB3aXRoIHNhbWUgUGVybCBpbnRlcnByZXRlci4K KyAgICAgICAgKiBTY3JpcHRzL3N1bnNwaWRlci1jb21wYXJlLXJlc3VsdHM6IFBlcmwgc2NyaXB0 cyBpbnZva2VkIHdpdGggc2FtZSBQZXJsIGludGVycHJldGVyLgorICAgICAgICAqIFNjcmlwdHMv d2Via2l0ZGlycy5wbTogY3VycmVudFBlcmxQYXRoKCkgYWRkZWQuCisKIDIwMDktMDktMjkgIEJy YWR5IEVpZHNvbiAgPGJlaWRzb25AYXBwbGUuY29tPgogCiAgICAgICAgIFJ1YmJlcnN0YW1wZWQg YnkgRGFuIEJlcm5zdGVpbi4KZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL1NjcmlwdHMvcnVuLXN1 bnNwaWRlciBiL1dlYktpdFRvb2xzL1NjcmlwdHMvcnVuLXN1bnNwaWRlcgppbmRleCBmNmJjNzc5 Li4zNjdmZDA2IDEwMDc1NQotLS0gYS9XZWJLaXRUb29scy9TY3JpcHRzL3J1bi1zdW5zcGlkZXIK KysrIGIvV2ViS2l0VG9vbHMvU2NyaXB0cy9ydW4tc3Vuc3BpZGVyCkBAIC04Nyw3ICs4Nyw3IEBA IHN1YiBidWlsZEpTQwogICAgICAgICBwdXNoKEBBUkdWLCAgIi0tIiAuICRjb25maWd1cmF0aW9u KTsKICAgICAgICAgCiAgICAgICAgIGNoZGlyV2ViS2l0KCk7Ci0gICAgICAgIG15ICRidWlsZFJl c3VsdCA9IHN5c3RlbSAiV2ViS2l0VG9vbHMvU2NyaXB0cy9idWlsZC1qc2MiLCBAQVJHVjsKKyAg ICAgICAgbXkgJGJ1aWxkUmVzdWx0ID0gc3lzdGVtIGN1cnJlbnRQZXJsUGF0aCgpLCAiV2ViS2l0 VG9vbHMvU2NyaXB0cy9idWlsZC1qc2MiLCBAQVJHVjsKICAgICAgICAgaWYgKCRidWlsZFJlc3Vs dCkgewogICAgICAgICAgICAgcHJpbnQgU1RERVJSICJDb21waWxpbmcganNjIGZhaWxlZCFcbiI7 CiAgICAgICAgICAgICBleGl0IGV4aXRTdGF0dXMoJGJ1aWxkUmVzdWx0KTsKQEAgLTEzMyw0ICsx MzMsNCBAQCBwdXNoIEBhcmdzLCAiLS12OCIgaWYgJHY4OwogcHVzaCBAYXJncywgIi0tcGFyc2Ut b25seSIgaWYgJHBhcnNlb25seTsKIHB1c2ggQGFyZ3MsICItLXRlc3RzIiwgJHRlc3RzUGF0dGVy biBpZiAkdGVzdHNQYXR0ZXJuOwogCi1leGVjICIuL3N1bnNwaWRlciIsIEBhcmdzOworZXhlYyBj dXJyZW50UGVybFBhdGgoKSwgIi4vc3Vuc3BpZGVyIiwgQGFyZ3M7CmRpZmYgLS1naXQgYS9XZWJL aXRUb29scy9TY3JpcHRzL3N1bnNwaWRlci1jb21wYXJlLXJlc3VsdHMgYi9XZWJLaXRUb29scy9T Y3JpcHRzL3N1bnNwaWRlci1jb21wYXJlLXJlc3VsdHMKaW5kZXggZDIxOTg5Ni4uY2U4N2EyMyAx MDA3NTUKLS0tIGEvV2ViS2l0VG9vbHMvU2NyaXB0cy9zdW5zcGlkZXItY29tcGFyZS1yZXN1bHRz CisrKyBiL1dlYktpdFRvb2xzL1NjcmlwdHMvc3Vuc3BpZGVyLWNvbXBhcmUtcmVzdWx0cwpAQCAt NjcsNyArNjcsNyBAQCBzdWIgYnVpbGRKU0MKIHsKICAgICBpZiAoIWRlZmluZWQoJHJvb3QpKXsK ICAgICAgICAgY2hkaXJXZWJLaXQoKTsKLSAgICAgICAgbXkgJGJ1aWxkUmVzdWx0ID0gc3lzdGVt ICJXZWJLaXRUb29scy9TY3JpcHRzL2J1aWxkLWpzYyIsICItLSIgLiAkY29uZmlndXJhdGlvbjsK KyAgICAgICAgbXkgJGJ1aWxkUmVzdWx0ID0gc3lzdGVtIGN1cnJlbnRQZXJsUGF0aCgpLCAiV2Vi S2l0VG9vbHMvU2NyaXB0cy9idWlsZC1qc2MiLCAiLS0iIC4gJGNvbmZpZ3VyYXRpb247CiAgICAg ICAgIGlmICgkYnVpbGRSZXN1bHQpIHsKICAgICAgICAgICAgIHByaW50IFNUREVSUiAiQ29tcGls aW5nIGpzYyBmYWlsZWQhXG4iOwogICAgICAgICAgICAgZXhpdCBXRVhJVFNUQVRVUygkYnVpbGRS ZXN1bHQpOwpAQCAtMTI0LDQgKzEyNCw0IEBAIG15IEBhcmdzID0gKCItLXNoZWxsIiwgJGpzY1Bh dGgpOwogcHVzaCBAYXJncywgIi0tdWJlbmNoIiBpZiAkdWJlbmNoOwogcHVzaCBAYXJncywgIi0t djgiIGlmICR2ODsKIAotZXhlYyAiLi9zdW5zcGlkZXItY29tcGFyZS1yZXN1bHRzIiwgQGFyZ3Ms IEBBUkdWOworZXhlYyBjdXJyZW50UGVybFBhdGgoKSwgIi4vc3Vuc3BpZGVyLWNvbXBhcmUtcmVz dWx0cyIsIEBhcmdzLCBAQVJHVjsKZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Vi a2l0ZGlycy5wbSBiL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0ZGlycy5wbQppbmRleCAzYzdi NTM3Li44YmY2MDAzIDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdGRpcnMu cG0KKysrIGIvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRkaXJzLnBtCkBAIC04Niw2ICs4Niwx MSBAQCBzdWIgZGV0ZXJtaW5lU291cmNlRGlyCiB9CiAKICMgdXNlZCBmb3Igc2NyaXB0cyB3aGlj aCBhcmUgc3RvcmVkIGluIGEgbm9uLXN0YW5kYXJkIGxvY2F0aW9uCitzdWIgY3VycmVudFBlcmxQ YXRoKCkKK3sKKyAgICByZXR1cm4gJF5YOworfQorCiBzdWIgc2V0U291cmNlRGlyKCQpCiB7CiAg ICAgKCRzb3VyY2VEaXIpID0gQF87Cg== 40375 2009-09-30 08:39:43 -0700 2009-09-30 10:12:03 -0700 updated patch perl1.patch text/plain 3067 ossy ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxv ZwppbmRleCBmOTkyOGQ3Li5hMjhiNzFmIDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9DaGFuZ2VM b2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTQgQEAKKzIwMDktMDkt MzAgIENzYWJhIE9zenRyb2dvbmFjICA8b3N6aUBpbmYudS1zemVnZWQuaHU+CisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgTWFrZSBzdW5zcGlkZXIgc2Ny aXB0cyB3b3JrIG9uIFdpbmRvd3MgcGxhdGZvcm0uCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yOTY1NgorCisgICAgICAgICogU2NyaXB0cy9ydW4tc3Vu c3BpZGVyOiBQZXJsIHNjcmlwdHMgaW52b2tlZCB3aXRoIHNhbWUgUGVybCBpbnRlcnByZXRlci4K KyAgICAgICAgKiBTY3JpcHRzL3N1bnNwaWRlci1jb21wYXJlLXJlc3VsdHM6IFBlcmwgc2NyaXB0 cyBpbnZva2VkIHdpdGggc2FtZSBQZXJsIGludGVycHJldGVyLgorICAgICAgICAqIFNjcmlwdHMv d2Via2l0ZGlycy5wbTogY3VycmVudFBlcmxQYXRoKCkgYWRkZWQuCisKIDIwMDktMDktMjkgIEJy YWR5IEVpZHNvbiAgPGJlaWRzb25AYXBwbGUuY29tPgogCiAgICAgICAgIFJ1YmJlcnN0YW1wZWQg YnkgRGFuIEJlcm5zdGVpbi4KZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL1NjcmlwdHMvcnVuLXN1 bnNwaWRlciBiL1dlYktpdFRvb2xzL1NjcmlwdHMvcnVuLXN1bnNwaWRlcgppbmRleCBmNmJjNzc5 Li4zNjdmZDA2IDEwMDc1NQotLS0gYS9XZWJLaXRUb29scy9TY3JpcHRzL3J1bi1zdW5zcGlkZXIK KysrIGIvV2ViS2l0VG9vbHMvU2NyaXB0cy9ydW4tc3Vuc3BpZGVyCkBAIC04Nyw3ICs4Nyw3IEBA IHN1YiBidWlsZEpTQwogICAgICAgICBwdXNoKEBBUkdWLCAgIi0tIiAuICRjb25maWd1cmF0aW9u KTsKICAgICAgICAgCiAgICAgICAgIGNoZGlyV2ViS2l0KCk7Ci0gICAgICAgIG15ICRidWlsZFJl c3VsdCA9IHN5c3RlbSAiV2ViS2l0VG9vbHMvU2NyaXB0cy9idWlsZC1qc2MiLCBAQVJHVjsKKyAg ICAgICAgbXkgJGJ1aWxkUmVzdWx0ID0gc3lzdGVtIGN1cnJlbnRQZXJsUGF0aCgpLCAiV2ViS2l0 VG9vbHMvU2NyaXB0cy9idWlsZC1qc2MiLCBAQVJHVjsKICAgICAgICAgaWYgKCRidWlsZFJlc3Vs dCkgewogICAgICAgICAgICAgcHJpbnQgU1RERVJSICJDb21waWxpbmcganNjIGZhaWxlZCFcbiI7 CiAgICAgICAgICAgICBleGl0IGV4aXRTdGF0dXMoJGJ1aWxkUmVzdWx0KTsKQEAgLTEzMyw0ICsx MzMsNCBAQCBwdXNoIEBhcmdzLCAiLS12OCIgaWYgJHY4OwogcHVzaCBAYXJncywgIi0tcGFyc2Ut b25seSIgaWYgJHBhcnNlb25seTsKIHB1c2ggQGFyZ3MsICItLXRlc3RzIiwgJHRlc3RzUGF0dGVy biBpZiAkdGVzdHNQYXR0ZXJuOwogCi1leGVjICIuL3N1bnNwaWRlciIsIEBhcmdzOworZXhlYyBj dXJyZW50UGVybFBhdGgoKSwgIi4vc3Vuc3BpZGVyIiwgQGFyZ3M7CmRpZmYgLS1naXQgYS9XZWJL aXRUb29scy9TY3JpcHRzL3N1bnNwaWRlci1jb21wYXJlLXJlc3VsdHMgYi9XZWJLaXRUb29scy9T Y3JpcHRzL3N1bnNwaWRlci1jb21wYXJlLXJlc3VsdHMKaW5kZXggZDIxOTg5Ni4uY2U4N2EyMyAx MDA3NTUKLS0tIGEvV2ViS2l0VG9vbHMvU2NyaXB0cy9zdW5zcGlkZXItY29tcGFyZS1yZXN1bHRz CisrKyBiL1dlYktpdFRvb2xzL1NjcmlwdHMvc3Vuc3BpZGVyLWNvbXBhcmUtcmVzdWx0cwpAQCAt NjcsNyArNjcsNyBAQCBzdWIgYnVpbGRKU0MKIHsKICAgICBpZiAoIWRlZmluZWQoJHJvb3QpKXsK ICAgICAgICAgY2hkaXJXZWJLaXQoKTsKLSAgICAgICAgbXkgJGJ1aWxkUmVzdWx0ID0gc3lzdGVt ICJXZWJLaXRUb29scy9TY3JpcHRzL2J1aWxkLWpzYyIsICItLSIgLiAkY29uZmlndXJhdGlvbjsK KyAgICAgICAgbXkgJGJ1aWxkUmVzdWx0ID0gc3lzdGVtIGN1cnJlbnRQZXJsUGF0aCgpLCAiV2Vi S2l0VG9vbHMvU2NyaXB0cy9idWlsZC1qc2MiLCAiLS0iIC4gJGNvbmZpZ3VyYXRpb247CiAgICAg ICAgIGlmICgkYnVpbGRSZXN1bHQpIHsKICAgICAgICAgICAgIHByaW50IFNUREVSUiAiQ29tcGls aW5nIGpzYyBmYWlsZWQhXG4iOwogICAgICAgICAgICAgZXhpdCBXRVhJVFNUQVRVUygkYnVpbGRS ZXN1bHQpOwpAQCAtMTI0LDQgKzEyNCw0IEBAIG15IEBhcmdzID0gKCItLXNoZWxsIiwgJGpzY1Bh dGgpOwogcHVzaCBAYXJncywgIi0tdWJlbmNoIiBpZiAkdWJlbmNoOwogcHVzaCBAYXJncywgIi0t djgiIGlmICR2ODsKIAotZXhlYyAiLi9zdW5zcGlkZXItY29tcGFyZS1yZXN1bHRzIiwgQGFyZ3Ms IEBBUkdWOworZXhlYyBjdXJyZW50UGVybFBhdGgoKSwgIi4vc3Vuc3BpZGVyLWNvbXBhcmUtcmVz dWx0cyIsIEBhcmdzLCBAQVJHVjsKZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Vi a2l0ZGlycy5wbSBiL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0ZGlycy5wbQppbmRleCAzYzdi NTM3Li41Y2E0NWMyIDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdGRpcnMu cG0KKysrIGIvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRkaXJzLnBtCkBAIC0yOSw2ICsyOSw3 IEBACiAKIHVzZSBzdHJpY3Q7CiB1c2Ugd2FybmluZ3M7Cit1c2UgQ29uZmlnOwogdXNlIEZpbmRC aW47CiB1c2UgRmlsZTo6QmFzZW5hbWU7CiB1c2UgRmlsZTo6U3BlYzsKQEAgLTg2LDYgKzg3LDE1 IEBAIHN1YiBkZXRlcm1pbmVTb3VyY2VEaXIKIH0KIAogIyB1c2VkIGZvciBzY3JpcHRzIHdoaWNo IGFyZSBzdG9yZWQgaW4gYSBub24tc3RhbmRhcmQgbG9jYXRpb24KK3N1YiBjdXJyZW50UGVybFBh dGgoKQoreworICAgIG15ICR0aGlzUGVybCA9ICReWDsKKyAgICBpZiAoJF5PIG5lICdWTVMnKSB7 CisgICAgICAgICR0aGlzUGVybCAuPSAkQ29uZmlne19leGV9IHVubGVzcyAkdGhpc1BlcmwgPX4g bS8kQ29uZmlne19leGV9JC9pOworICAgIH0KKyAgICByZXR1cm4gJHRoaXNQZXJsOworfQorCiBz dWIgc2V0U291cmNlRGlyKCQpCiB7CiAgICAgKCRzb3VyY2VEaXIpID0gQF87Cg==