51509 2010-12-22 17:02:47 -0800 [Qt] [Symbian] Fix build-webkit script for Symbian 2010-12-30 15:30:52 -0800 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) PC S60 3rd edition RESOLVED FIXED Qt, QtTriaged P3 Normal --- 1 laszlo.gombos webkit-unassigned commit-queue dbates gyuyoung.kim mrobinson oldest_to_newest 325800 0 laszlo.gombos 2010-12-22 17:02:47 -0800 Symbian port of QtWebKit does not support out of source builds - as it has been also established by r53266. On Symbian OUTPUT_DIR should be set to the source directory as Release and Debug configuration can not be built side-by-side. In addition OUTPUT_DIR is really only used for generated files for Symbian builds, which are the same for both Release and Debug builds, so there is no reason to use the actual configuration in the OUTPUT_DIR. 325803 1 77281 laszlo.gombos 2010-12-22 17:08:14 -0800 Created attachment 77281 proposed patch 325966 2 77281 eric 2010-12-23 01:03:51 -0800 Comment on attachment 77281 proposed patch View in context: https://bugs.webkit.org/attachment.cgi?id=77281&action=review Review tool can't seem to apply the patch, so I doubt this will land w/o an update. > Tools/Scripts/webkitdirs.pm:303 > + # Symbian builds do not have Release/Debug configurations either. > + if (($ENV{"WEBKITOUTPUTDIR"} && (isGtk() || isEfl())) || isSymbian()) { We need to make this into a function. usesPerConfigurationBuildDirectory() or similar. > Tools/Scripts/webkitdirs.pm:1526 > - my $dir = File::Spec->canonpath(baseProductDir()); > - $dir = File::Spec->catfile($dir, $config) unless isSymbian(); > + my $dir = File::Spec->canonpath(productDir()); Is this a symbian specific code path? Otherwise why is this OK for other ports? > Tools/Scripts/webkitdirs.pm:1532 > - push @buildArgs, "OUTPUT_DIR=" . baseProductDir() . "/$config"; > + push @buildArgs, "OUTPUT_DIR=" . $dir; Why is this OK for other ports? Or is this just reverting previously added symbian-specific code? 326090 3 laszlo.gombos 2010-12-23 08:28:50 -0800 Thanks for the review Eric! . (In reply to comment #2) > (From update of attachment 77281 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=77281&action=review > > Review tool can't seem to apply the patch, so I doubt this will land w/o an update. EWS seems to be green. > > > Tools/Scripts/webkitdirs.pm:303 > > + # Symbian builds do not have Release/Debug configurations either. > > + if (($ENV{"WEBKITOUTPUTDIR"} && (isGtk() || isEfl())) || isSymbian()) { > > We need to make this into a function. usesPerConfigurationBuildDirectory() or similar. Will do. > > > Tools/Scripts/webkitdirs.pm:1526 > > - my $dir = File::Spec->canonpath(baseProductDir()); > > - $dir = File::Spec->catfile($dir, $config) unless isSymbian(); > > + my $dir = File::Spec->canonpath(productDir()); > > Is this a symbian specific code path? Otherwise why is this OK for other ports? This is a Qt specific code path (Symbian being one of the QtWebKit ports). For QtWebKit productDir() returns $baseProductDir/$configuration for all Qt ports except for Symbian (see earlier part of the patch). > > > Tools/Scripts/webkitdirs.pm:1532 > > - push @buildArgs, "OUTPUT_DIR=" . baseProductDir() . "/$config"; > > + push @buildArgs, "OUTPUT_DIR=" . $dir; > > Why is this OK for other ports? Or is this just reverting previously added symbian-specific code? Same as above. 326091 4 77336 laszlo.gombos 2010-12-23 08:30:31 -0800 Created attachment 77336 created a separate function 328037 5 77336 ddkilzer 2010-12-30 14:11:09 -0800 Comment on attachment 77336 created a separate function r=me 328047 6 77336 commit-queue 2010-12-30 15:30:45 -0800 Comment on attachment 77336 created a separate function Clearing flags on attachment: 77336 Committed r74811: <http://trac.webkit.org/changeset/74811> 328048 7 commit-queue 2010-12-30 15:30:52 -0800 All reviewed patches have been landed. Closing bug. 77281 2010-12-22 17:08:14 -0800 2010-12-23 08:30:31 -0800 proposed patch 51509.patch text/plain 2141 laszlo.gombos ZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCBjZjMw NDUxLi45YTc4MWY4IDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMTUgQEAKKzIwMTAtMTItMjIgIExhc3psbyBHb21ib3MgIDxsYXN6 bG8uMS5nb21ib3NAbm9raWEuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgIFtRdF0gW1N5bWJpYW5dIEZpeCBidWlsZC13ZWJraXQgc2NyaXB0IGZv ciBTeW1iaWFuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD01MTUwOQorCisgICAgICAgIFNldCB0aGUgT1VUUFVUX0RJUiBmb3IgU3ltYmlhbiB0byBiZSB0 aGUgc2FtZSBhcyB0aGUgc291cmNlCisgICAgICAgIGRpcmVjdG9yeS4KKworICAgICAgICAqIFNj cmlwdHMvd2Via2l0ZGlycy5wbToKKwogMjAxMC0xMi0yMiAgRGF2aWQgTGV2aW4gIDxsZXZpbkBj aHJvbWl1bS5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgU2hpbmljaGlybyBIYW1hamkuCmRp ZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdGRpcnMucG0gYi9Ub29scy9TY3JpcHRzL3dl YmtpdGRpcnMucG0KaW5kZXggYWM0MGVjNi4uZWQ1OTZmOCAxMDA2NDQKLS0tIGEvVG9vbHMvU2Ny aXB0cy93ZWJraXRkaXJzLnBtCisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0ZGlycy5wbQpAQCAt Mjk4LDcgKzI5OCw5IEBAIHN1YiBkZXRlcm1pbmVDb25maWd1cmF0aW9uUHJvZHVjdERpcgogICAg ICAgICAjIGF1dG90b29sIGJ1aWxkcyAobm9uIGJ1aWxkLXdlYmtpdCkuIEluIHRoaXMgY2FzZSBh bmQgaWYKICAgICAgICAgIyBXRUJLSVRPVVRQVVRESVIgZXhpc3QsIHVzZSB0aGF0IGFzIG91ciBj b25maWd1cmF0aW9uIGRpci4gVGhpcyB3aWxsCiAgICAgICAgICMgYWxsb3dzIHVzIHRvIHJ1biBy dW4td2Via2l0LXRlc3RzIHdpdGhvdXQgdXNpbmcgYnVpbGQtd2Via2l0LgotICAgICAgICBpZiAo JEVOVnsiV0VCS0lUT1VUUFVURElSIn0gJiYgKGlzR3RrKCkgfHwgaXNFZmwoKSkpIHsKKyAgICAg ICAgIworICAgICAgICAjIFN5bWJpYW4gYnVpbGRzIGRvIG5vdCBoYXZlIFJlbGVhc2UvRGVidWcg Y29uZmlndXJhdGlvbnMgZWl0aGVyLgorICAgICAgICBpZiAoKCRFTlZ7IldFQktJVE9VVFBVVERJ UiJ9ICYmIChpc0d0aygpIHx8IGlzRWZsKCkpKSB8fCBpc1N5bWJpYW4oKSkgewogICAgICAgICAg ICAgJGNvbmZpZ3VyYXRpb25Qcm9kdWN0RGlyID0gIiRiYXNlUHJvZHVjdERpciI7CiAgICAgICAg IH0gZWxzZSB7CiAgICAgICAgICAgICAkY29uZmlndXJhdGlvblByb2R1Y3REaXIgPSAiJGJhc2VQ cm9kdWN0RGlyLyRjb25maWd1cmF0aW9uIjsKQEAgLTE1MjEsMTQgKzE1MjMsMTMgQEAgc3ViIGJ1 aWxkUU1ha2VQcm9qZWN0KCRAKQogICAgIG15ICRjb25maWcgPSBjb25maWd1cmF0aW9uKCk7CiAg ICAgcHVzaCBAYnVpbGRBcmdzLCAiSU5TVEFMTF9IRUFERVJTPSIgLiAkaW5zdGFsbEhlYWRlcnMg aWYgZGVmaW5lZCgkaW5zdGFsbEhlYWRlcnMpOwogICAgIHB1c2ggQGJ1aWxkQXJncywgIklOU1RB TExfTElCUz0iIC4gJGluc3RhbGxMaWJzIGlmIGRlZmluZWQoJGluc3RhbGxMaWJzKTsKLSAgICBt eSAkZGlyID0gRmlsZTo6U3BlYy0+Y2Fub25wYXRoKGJhc2VQcm9kdWN0RGlyKCkpOwotICAgICRk aXIgPSBGaWxlOjpTcGVjLT5jYXRmaWxlKCRkaXIsICRjb25maWcpIHVubGVzcyBpc1N5bWJpYW4o KTsKKyAgICBteSAkZGlyID0gRmlsZTo6U3BlYy0+Y2Fub25wYXRoKHByb2R1Y3REaXIoKSk7CiAg ICAgRmlsZTo6UGF0aDo6bWtwYXRoKCRkaXIpOwogICAgIGNoZGlyICRkaXIgb3IgZGllICJGYWls ZWQgdG8gY2QgaW50byAiIC4gJGRpciAuICJcbiI7CiAKICAgICBwcmludCAiR2VuZXJhdGluZyBk ZXJpdmVkIHNvdXJjZXNcblxuIjsKIAotICAgIHB1c2ggQGJ1aWxkQXJncywgIk9VVFBVVF9ESVI9 IiAuIGJhc2VQcm9kdWN0RGlyKCkgLiAiLyRjb25maWciOworICAgIHB1c2ggQGJ1aWxkQXJncywg Ik9VVFBVVF9ESVI9IiAuICRkaXI7CiAKICAgICBteSBAZHNRbWFrZUFyZ3MgPSBAYnVpbGRBcmdz OwogICAgIHB1c2ggQGRzUW1ha2VBcmdzLCAiLXIiOwo= 77336 2010-12-23 08:30:31 -0800 2010-12-30 15:30:45 -0800 created a separate function 51509-2.patch text/plain 2936 laszlo.gombos ZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCBjZjMw NDUxLi5hNDU1MjBkIDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMTUgQEAKKzIwMTAtMTItMjMgIExhc3psbyBHb21ib3MgIDxsYXN6 bG8uMS5nb21ib3NAbm9raWEuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgIFtRdF0gW1N5bWJpYW5dIEZpeCBidWlsZC13ZWJraXQgc2NyaXB0IGZv ciBTeW1iaWFuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD01MTUwOQorCisgICAgICAgIFNldCB0aGUgT1VUUFVUX0RJUiBmb3IgU3ltYmlhbiB0byBiZSB0 aGUgc2FtZSBhcyB0aGUgc291cmNlCisgICAgICAgIGRpcmVjdG9yeS4KKworICAgICAgICAqIFNj cmlwdHMvd2Via2l0ZGlycy5wbToKKwogMjAxMC0xMi0yMiAgRGF2aWQgTGV2aW4gIDxsZXZpbkBj aHJvbWl1bS5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgU2hpbmljaGlybyBIYW1hamkuCmRp ZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdGRpcnMucG0gYi9Ub29scy9TY3JpcHRzL3dl YmtpdGRpcnMucG0KaW5kZXggYWM0MGVjNi4uYzRkYzMyMCAxMDA2NDQKLS0tIGEvVG9vbHMvU2Ny aXB0cy93ZWJraXRkaXJzLnBtCisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0ZGlycy5wbQpAQCAt Mjg2LDYgKzI4NiwxNyBAQCBzdWIgZGV0ZXJtaW5lQ29uZmlndXJhdGlvbkZvclZpc3VhbFN0dWRp bwogICAgICRjb25maWd1cmF0aW9uRm9yVmlzdWFsU3R1ZGlvID0gJGNvbmZpZ3VyYXRpb247CiB9 CiAKK3N1YiB1c2VzUGVyQ29uZmlndXJhdGlvbkJ1aWxkRGlyZWN0b3J5Cit7CisgICAgIyBbR3Rr XVtFZmxdIFdlIGRvbid0IGhhdmUgUmVsZWFzZS9EZWJ1ZyBjb25maWd1cmF0aW9ucyBpbiBzdHJh aWdodAorICAgICMgYXV0b3Rvb2wgYnVpbGRzIChub24gYnVpbGQtd2Via2l0KS4gSW4gdGhpcyBj YXNlIGFuZCBpZgorICAgICMgV0VCS0lUT1VUUFVURElSIGV4aXN0LCB1c2UgdGhhdCBhcyBvdXIg Y29uZmlndXJhdGlvbiBkaXIuIFRoaXMgd2lsbAorICAgICMgYWxsb3dzIHVzIHRvIHJ1biBydW4t d2Via2l0LXRlc3RzIHdpdGhvdXQgdXNpbmcgYnVpbGQtd2Via2l0LgorICAgICMKKyAgICAjIFN5 bWJpYW4gYnVpbGRzIGRvIG5vdCBoYXZlIFJlbGVhc2UvRGVidWcgY29uZmlndXJhdGlvbnMgZWl0 aGVyLgorICAgIHJldHVybiAoJEVOVnsiV0VCS0lUT1VUUFVURElSIn0gJiYgKGlzR3RrKCkgfHwg aXNFZmwoKSkpIHx8IGlzU3ltYmlhbigpOworfQorCiBzdWIgZGV0ZXJtaW5lQ29uZmlndXJhdGlv blByb2R1Y3REaXIKIHsKICAgICByZXR1cm4gaWYgZGVmaW5lZCAkY29uZmlndXJhdGlvblByb2R1 Y3REaXI7CkBAIC0yOTQsMTEgKzMwNSw3IEBAIHN1YiBkZXRlcm1pbmVDb25maWd1cmF0aW9uUHJv ZHVjdERpcgogICAgIGlmIChpc0FwcGxlV2luV2ViS2l0KCkgJiYgIWlzV3goKSkgewogICAgICAg ICAkY29uZmlndXJhdGlvblByb2R1Y3REaXIgPSBGaWxlOjpTcGVjLT5jYXRkaXIoJGJhc2VQcm9k dWN0RGlyLCAiYmluIik7CiAgICAgfSBlbHNlIHsKLSAgICAgICAgIyBbR3RrXVtFZmxdIFdlIGRv bid0IGhhdmUgUmVsZWFzZS9EZWJ1ZyBjb25maWd1cmF0aW9ucyBpbiBzdHJhaWdodAotICAgICAg ICAjIGF1dG90b29sIGJ1aWxkcyAobm9uIGJ1aWxkLXdlYmtpdCkuIEluIHRoaXMgY2FzZSBhbmQg aWYKLSAgICAgICAgIyBXRUJLSVRPVVRQVVRESVIgZXhpc3QsIHVzZSB0aGF0IGFzIG91ciBjb25m aWd1cmF0aW9uIGRpci4gVGhpcyB3aWxsCi0gICAgICAgICMgYWxsb3dzIHVzIHRvIHJ1biBydW4t d2Via2l0LXRlc3RzIHdpdGhvdXQgdXNpbmcgYnVpbGQtd2Via2l0LgotICAgICAgICBpZiAoJEVO VnsiV0VCS0lUT1VUUFVURElSIn0gJiYgKGlzR3RrKCkgfHwgaXNFZmwoKSkpIHsKKyAgICAgICAg aWYgKHVzZXNQZXJDb25maWd1cmF0aW9uQnVpbGREaXJlY3RvcnkoKSkgewogICAgICAgICAgICAg JGNvbmZpZ3VyYXRpb25Qcm9kdWN0RGlyID0gIiRiYXNlUHJvZHVjdERpciI7CiAgICAgICAgIH0g ZWxzZSB7CiAgICAgICAgICAgICAkY29uZmlndXJhdGlvblByb2R1Y3REaXIgPSAiJGJhc2VQcm9k dWN0RGlyLyRjb25maWd1cmF0aW9uIjsKQEAgLTE1MjEsMTQgKzE1MjgsMTMgQEAgc3ViIGJ1aWxk UU1ha2VQcm9qZWN0KCRAKQogICAgIG15ICRjb25maWcgPSBjb25maWd1cmF0aW9uKCk7CiAgICAg cHVzaCBAYnVpbGRBcmdzLCAiSU5TVEFMTF9IRUFERVJTPSIgLiAkaW5zdGFsbEhlYWRlcnMgaWYg ZGVmaW5lZCgkaW5zdGFsbEhlYWRlcnMpOwogICAgIHB1c2ggQGJ1aWxkQXJncywgIklOU1RBTExf TElCUz0iIC4gJGluc3RhbGxMaWJzIGlmIGRlZmluZWQoJGluc3RhbGxMaWJzKTsKLSAgICBteSAk ZGlyID0gRmlsZTo6U3BlYy0+Y2Fub25wYXRoKGJhc2VQcm9kdWN0RGlyKCkpOwotICAgICRkaXIg PSBGaWxlOjpTcGVjLT5jYXRmaWxlKCRkaXIsICRjb25maWcpIHVubGVzcyBpc1N5bWJpYW4oKTsK KyAgICBteSAkZGlyID0gRmlsZTo6U3BlYy0+Y2Fub25wYXRoKHByb2R1Y3REaXIoKSk7CiAgICAg RmlsZTo6UGF0aDo6bWtwYXRoKCRkaXIpOwogICAgIGNoZGlyICRkaXIgb3IgZGllICJGYWlsZWQg dG8gY2QgaW50byAiIC4gJGRpciAuICJcbiI7CiAKICAgICBwcmludCAiR2VuZXJhdGluZyBkZXJp dmVkIHNvdXJjZXNcblxuIjsKIAotICAgIHB1c2ggQGJ1aWxkQXJncywgIk9VVFBVVF9ESVI9IiAu IGJhc2VQcm9kdWN0RGlyKCkgLiAiLyRjb25maWciOworICAgIHB1c2ggQGJ1aWxkQXJncywgIk9V VFBVVF9ESVI9IiAuICRkaXI7CiAKICAgICBteSBAZHNRbWFrZUFyZ3MgPSBAYnVpbGRBcmdzOwog ICAgIHB1c2ggQGRzUW1ha2VBcmdzLCAiLXIiOwo=