40285 2010-06-07 23:57:41 -0700 [chromium] compile linux chromium in WebKit/out instead of WebKit/WebKit/chromium/out 2010-07-14 13:10:50 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 40349 1 tony tony abarth eric evan webkit.review.bot oldest_to_newest 235156 0 tony 2010-06-07 23:57:41 -0700 [chromium] compile linux chromium in WebKit/out instead of WebKit/WebKit/chromium/out 235157 1 58117 tony 2010-06-07 23:58:07 -0700 Created attachment 58117 Patch 235164 2 tony 2010-06-08 00:03:47 -0700 Chromium Linux is currently built in WebKit/WebKit/chromium/out from a Makefile that is generated into WebKit/WebKit/chromium/Makefile. This causes problems, because the Makefile that is generated builds relative paths to .cpp files. This results in some files being compiled outside of the target directory. For example, when building libwebcore.a, it places the file in WebKit/WebKit/chromium/out/WebCore/libwebcore.a instead of, say, WebKit/WebKit/chromium/out/Debug/obj.target/WebCore/libwebcore.a. This causes problems because it tries to put the debug and release .a file in the same place and switching from debug to release can cause weird link errors. Anyway, this patch is to move from generating WebKit/WebKit/chromium/Makefile to generating WebKit/Makefile.chromium and building at the root of the source tree. Since this changes the output path, there's a small change to new-run-webkit-tests. 235635 3 tony 2010-06-08 21:05:25 -0700 Committed r60878: <http://trac.webkit.org/changeset/60878> 235639 4 webkit.review.bot 2010-06-08 21:19:45 -0700 http://trac.webkit.org/changeset/60878 might have broken Chromium Linux Release 235648 5 tony 2010-06-08 21:32:45 -0700 Reverted because this broke the linux build. 235685 6 tony 2010-06-09 00:23:02 -0700 Committed r60884: <http://trac.webkit.org/changeset/60884> 235690 7 tony 2010-06-09 00:40:49 -0700 (In reply to comment #6) > Committed r60884: <http://trac.webkit.org/changeset/60884> Yay, this actually worked. 251385 8 tony 2010-07-14 13:10:50 -0700 *** Bug 37969 has been marked as a duplicate of this bug. *** 58117 2010-06-07 23:58:07 -0700 2010-06-08 14:15:14 -0700 Patch bug-40285-20100607235806.patch text/plain 4471 tony ZGlmZiAtLWdpdCBhL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cgYi9XZWJLaXQvY2hyb21pdW0v Q2hhbmdlTG9nCmluZGV4IDQxYjM2MTgxNWZjODg3MzM4ODEzY2JjY2Q3YjNjNjkxOGEwMTdmY2Uu LmRhYTU1ZjIyZWZlOWY5ZTk5ZGEyYjBkZGNmNWZjMmUzYTQyYzk2NTMgMTAwNjQ0Ci0tLSBhL1dl YktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKKysrIGIvV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZwpA QCAtMSw1ICsxLDE0IEBACiAyMDEwLTA2LTA3ICBUb255IENoYW5nICA8dG9ueUBjaHJvbWl1bS5v cmc+CiAKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgW2No cm9taXVtXSBjb21waWxlIGxpbnV4IGNocm9taXVtIGluIFdlYktpdC9vdXQgaW5zdGVhZCBvZiBX ZWJLaXQvV2ViS2l0L2Nocm9taXVtL291dAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9NDAyODUKKworICAgICAgICAqIGd5cF93ZWJraXQ6CisKKzIwMTAt MDYtMDcgIFRvbnkgQ2hhbmcgIDx0b255QGNocm9taXVtLm9yZz4KKwogICAgICAgICBSZXZpZXdl ZCBieSBLZW50IFRhbXVyYS4KIAogICAgICAgICBbY2hyb21pdW1dIHJvbGwgY2hyb21pdW0gREVQ UwpkaWZmIC0tZ2l0IGEvV2ViS2l0L2Nocm9taXVtL2d5cF93ZWJraXQgYi9XZWJLaXQvY2hyb21p dW0vZ3lwX3dlYmtpdAppbmRleCAxY2E2MTMzNjMwMzlkYzc1NTAyNzY2YzJkYmVkNWE3NDc5OTU4 NjRlLi5iN2QyMzA4Y2I5ZWY4NzZiOTViMmQxMTcyMGJjZGUwMmIyNzZkMmExIDEwMDc1NQotLS0g YS9XZWJLaXQvY2hyb21pdW0vZ3lwX3dlYmtpdAorKysgYi9XZWJLaXQvY2hyb21pdW0vZ3lwX3dl YmtpdApAQCAtNzgsNyArNzgsMTEgQEAgaWYgX19uYW1lX18gPT0gJ19fbWFpbl9fJzoKIAogICAj IE9uIGxpbnV4LCB3ZSB3YW50IGd5cCB0byBvdXRwdXQgYSBtYWtlZmlsZSAoZGVmYXVsdCBpcyBz Y29ucykuCiAgIGlmIHN5cy5wbGF0Zm9ybSA9PSAnbGludXgyJzoKLSAgICBhcmdzLmV4dGVuZChb Jy1mbWFrZSddKQorICAgIGFyZ3MuZXh0ZW5kKFsnLWZtYWtlJywKKyAgICAgICAgICAgICAgICAg Jy0tc3VmZml4PS5jaHJvbWl1bScsCisgICAgICAgICAgICAgICAgICctLXRvcGxldmVsLWRpcj0u Li8uLicsCisgICAgICAgICAgICAgICAgICMgYXV0b19yZWdlbmVyYXRpb24gZG9lc24ndCB3b3Jr IHdpdGggdG9wbGV2ZWwtZGlyCisgICAgICAgICAgICAgICAgICctR2F1dG9fcmVnZW5lcmF0aW9u PTAnXSkKIAogICAjIE90aGVyIGNvbW1hbmQgYXJnczoKICAgYXJncy5leHRlbmQoWwpAQCAtOTAs NyArOTQsNyBAQCBpZiBfX25hbWVfXyA9PSAnX19tYWluX18nOgogICAgICAgICAgICAgICAgIyBn eXAgaGFjazogb3RoZXJ3aXNlIGd5cCBhc3N1bWVzIGl0cyBpbiBjaHJvbWl1bSdzIHNyYy8gZGly LgogICAgICAgICAgICAgICAgJy0tZGVwdGg9Li8nLAogCi0gICAgICAgICAgICAgICAjIGd5cCBm aWxlcyB0byBleGVjdXRlLgorICAgICAgICAgICAgICAgIyBneXAgZmlsZSB0byBleGVjdXRlLgog ICAgICAgICAgICAgICAgJ1dlYktpdC5neXAnXSkKIAogICBwcmludCAnVXBkYXRpbmcgd2Via2l0 IHByb2plY3RzIGZyb20gZ3lwIGZpbGVzLi4uJwpkaWZmIC0tZ2l0IGEvV2ViS2l0VG9vbHMvQ2hh bmdlTG9nIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCmluZGV4IDBiNmQ3N2FmYmJlMmNlZDg5MDk4 NzJhOWNjYTA0YzdjZmVjMTgyYTkuLjA1N2E2ZmU4YWUzMTcxNzI1OTE5YTRhMDQ2NGQ3YzExNGFk OWNiMGEgMTAwNjQ0Ci0tLSBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZworKysgYi9XZWJLaXRUb29s cy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxMyBAQAorMjAxMC0wNi0wNyAgVG9ueSBDaGFuZyAgPHRv bnlAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgIFtjaHJvbWl1bV0gY29tcGlsZSBsaW51eCBjaHJvbWl1bSBpbiBXZWJLaXQvb3V0 IGluc3RlYWQgb2YgV2ViS2l0L1dlYktpdC9jaHJvbWl1bS9vdXQKKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTQwMjg1CisKKyAgICAgICAgKiBTY3JpcHRz L3dlYmtpdGRpcnMucG06CisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMv cG9ydC9jaHJvbWl1bV9saW51eC5weToKKwogMjAxMC0wNi0wNyAgTWFydGluIFJvYmluc29uICA8 bXJvYmluc29uQGlnYWxpYS5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgT2xpdmVyIEh1bnQu CmRpZmYgLS1naXQgYS9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdGRpcnMucG0gYi9XZWJLaXRU b29scy9TY3JpcHRzL3dlYmtpdGRpcnMucG0KaW5kZXggY2ExNzc1N2Y3ZGJmZTk2ZTYzOTQxNjI4 YWQxOWE0ZGE1MzkxMDM0My4uZjNmODYzMzY2NWFjNzhiNGM4YmEwYzUzNjk5YjAyZWRlMDUwNTQy ZiAxMDA2NDQKLS0tIGEvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRkaXJzLnBtCisrKyBiL1dl YktpdFRvb2xzL1NjcmlwdHMvd2Via2l0ZGlycy5wbQpAQCAtMTQzNCwxNiArMTQzNCwxNSBAQCBz dWIgYnVpbGRHdGtQcm9qZWN0KCQkQCkKICAgICByZXR1cm4gYnVpbGRBdXRvdG9vbHNQcm9qZWN0 KCRjbGVhbiwgQGJ1aWxkQXJncyk7CiB9CiAKLXN1YiBidWlsZENocm9taXVtTWFrZWZpbGUoJCQk KQorc3ViIGJ1aWxkQ2hyb21pdW1NYWtlZmlsZSgkJCkKIHsKLSAgICBteSAoJGRpciwgJHRhcmdl dCwgJGNsZWFuKSA9IEBfOwotICAgIGNoZGlyICRkaXI7CisgICAgbXkgKCR0YXJnZXQsICRjbGVh bikgPSBAXzsKICAgICBpZiAoJGNsZWFuKSB7CiAgICAgICAgIHJldHVybiBzeXN0ZW0gcXcocm0g LXJmIG91dCk7CiAgICAgfQogICAgIG15ICRjb25maWcgPSBjb25maWd1cmF0aW9uKCk7CiAgICAg bXkgJG51bUNwdXMgPSAoZ3JlcCAvcHJvY2Vzc29yLywgYGNhdCAvcHJvYy9jcHVpbmZvYCkgfHwg MTsKLSAgICBteSBAY29tbWFuZCA9ICgibWFrZSIsICItaiRudW1DcHVzIiwgIkJVSUxEVFlQRT0k Y29uZmlnIiwgJHRhcmdldCk7CisgICAgbXkgQGNvbW1hbmQgPSAoIm1ha2UiLCAiLWZNYWtlZmls ZS5jaHJvbWl1bSIsICItaiRudW1DcHVzIiwgIkJVSUxEVFlQRT0kY29uZmlnIiwgJHRhcmdldCk7 CiAgICAgcHJpbnQgam9pbigiICIsIEBjb21tYW5kKSAuICJcbiI7CiAgICAgcmV0dXJuIHN5c3Rl bSBAY29tbWFuZDsKIH0KQEAgLTE1MDEsNyArMTUwMCw3IEBAIHN1YiBidWlsZENocm9taXVtKCRA KQogICAgICAgICAkcmVzdWx0ID0gYnVpbGRDaHJvbWl1bVZpc3VhbFN0dWRpb1Byb2plY3QoIldl YktpdC9jaHJvbWl1bS9XZWJLaXQuc2xuIiwgJGNsZWFuKTsKICAgICB9IGVsc2lmIChpc0xpbnV4 KCkpIHsKICAgICAgICAgIyBMaW51eCBidWlsZCAtIGJ1aWxkIHVzaW5nIG1ha2UuCi0gICAgICAg ICQgcmVzdWx0ID0gYnVpbGRDaHJvbWl1bU1ha2VmaWxlKCJXZWJLaXQvY2hyb21pdW0vIiwgImFs bCIsICRjbGVhbik7CisgICAgICAgICQgcmVzdWx0ID0gYnVpbGRDaHJvbWl1bU1ha2VmaWxlKCJh bGwiLCAkY2xlYW4pOwogICAgIH0gZWxzZSB7CiAgICAgICAgIHByaW50IFNUREVSUiAiVGhpcyBw bGF0Zm9ybSBpcyBub3Qgc3VwcG9ydGVkIGJ5IGNocm9taXVtLlxuIjsKICAgICB9CmRpZmYgLS1n aXQgYS9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2Nocm9t aXVtX2xpbnV4LnB5IGIvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMv cG9ydC9jaHJvbWl1bV9saW51eC5weQppbmRleCAwODE4ZDUxMjZkOTQxZTFkMTBhMTM5YmRkZjVk Y2U2ODY5NGM5Yzc2Li5mOGU2MWI5NzljMWUxNzZkNjJmNjQwYjdiZWQ4MjcxOTA3OWYyMzRjIDEw MDY0NAotLS0gYS9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0 L2Nocm9taXVtX2xpbnV4LnB5CisrKyBiL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5 b3V0X3Rlc3RzL3BvcnQvY2hyb21pdW1fbGludXgucHkKQEAgLTgyLDggKzgyLDcgQEAgY2xhc3Mg Q2hyb21pdW1MaW51eFBvcnQoY2hyb21pdW0uQ2hyb21pdW1Qb3J0KToKIAogICAgIGRlZiBfYnVp bGRfcGF0aChzZWxmLCAqY29tcHMpOgogICAgICAgICBpZiBzZWxmLl9vcHRpb25zLnVzZV9kcnQ6 Ci0gICAgICAgICAgICBiYXNlID0gb3MucGF0aC5qb2luKHNlbGYucGF0aF9mcm9tX3dlYmtpdF9i YXNlKCksICdXZWJLaXQnLAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAnY2hyb21p dW0nKQorICAgICAgICAgICAgYmFzZSA9IG9zLnBhdGguam9pbihzZWxmLnBhdGhfZnJvbV93ZWJr aXRfYmFzZSgpKQogICAgICAgICBlbHNlOgogICAgICAgICAgICAgYmFzZSA9IHNlbGYucGF0aF9m cm9tX2Nocm9taXVtX2Jhc2UoKQogICAgICAgICBpZiBvcy5wYXRoLmV4aXN0cyhvcy5wYXRoLmpv aW4oYmFzZSwgJ3Njb25zYnVpbGQnKSk6Cg==