136955 2014-09-19 10:24:05 -0700 Web Inspector: Remove UserInterface/Images/gtk from Apple builds 2014-09-23 14:08:50 -0700 1 1 1 Unclassified WebKit Web Inspector 528+ (Nightly build) All All RESOLVED FIXED InRadar P2 Normal --- 1 timothy timothy commit-queue graouts joepeck timothy webkit-bug-importer oldest_to_newest 1036149 0 timothy 2014-09-19 10:24:05 -0700 We should remove the newly added UserInterface/Images/gtk folder from Apple's Mac and Windows builds. 1036150 1 webkit-bug-importer 2014-09-19 10:24:23 -0700 <rdar://problem/18395443> 1036810 2 238564 timothy 2014-09-23 13:14:22 -0700 Created attachment 238564 Patch 1036817 3 238564 joepeck 2014-09-23 13:30:48 -0700 Comment on attachment 238564 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=238564&action=review r=me > Source/WebInspectorUI/Scripts/copy-user-interface-resources.pl:185 > + remove_tree(File::Spec->catdir($targetResourcePath, 'Images', 'gtk')) if defined $ENV{'MAC_OS_X_VERSION_MAJOR'} or defined $ENV{'OFFICIAL_BUILD'}; I feel like it would be cleaner if we checked some ENV variable like: export OS=MACOS export PLATFORM_NAME=macosx But, I'm not sure what other OSes have set for their ENV variables when running this build phase so this is probably fine. 1036830 4 238564 commit-queue 2014-09-23 14:08:48 -0700 Comment on attachment 238564 Patch Clearing flags on attachment: 238564 Committed r173889: <http://trac.webkit.org/changeset/173889> 1036831 5 commit-queue 2014-09-23 14:08:50 -0700 All reviewed patches have been landed. Closing bug. 238564 2014-09-23 13:14:22 -0700 2014-09-23 14:08:47 -0700 Patch bug-136955-20140923131421.patch text/plain 2253 timothy U3VidmVyc2lvbiBSZXZpc2lvbjogMTczODQ3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZwppbmRleCBm OWQ3NTliMmRiOGFjMjIyMTViNzU0NDRjNDZhOTZlMjRkOGM2MzE3Li4wODU4MjZlNzYyOTI0Yzc3 OGYyODJkMzM4NmEyMmVjNTcwNDkyNjY0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwxNCBAQAorMjAxNC0wOS0yMyAgVGltb3RoeSBIYXRjaGVyICA8dGltb3RoeUBhcHBsZS5j b20+CisKKyAgICAgICAgV2ViIEluc3BlY3RvcjogUmVtb3ZlIFVzZXJJbnRlcmZhY2UvSW1hZ2Vz L2d0ayBmcm9tIEFwcGxlIGJ1aWxkcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MTM2OTU1CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgKiBTY3JpcHRzL2NvcHktdXNlci1pbnRlcmZhY2UtcmVzb3VyY2VzLnBs OgorICAgICAgICBSZW1vdmUgSW1hZ2VzL0xlZ2FjeSBhbmQgSW1hZ2VzL2d0ayBvbiBNYWMgYW5k IFdpbmRvd3MgYnVpbGRzIGJ5IGxvb2tpbmcKKyAgICAgICAgYXQgdGhlIE1BQ19PU19YX1ZFUlNJ T05fTUFKT1IgYW5kIE9GRklDSUFMX0JVSUxEIGVudmlyb25tZW50IHZhcnMuCisKIDIwMTQtMDkt MjEgIFRpbW90aHkgSGF0Y2hlciAgPHRpbW90aHlAYXBwbGUuY29tPgogCiAgICAgICAgIE1ha2Ug dGhlIFdlYiBJbnNwZWN0b3IgdXNlIGEgc2VwYXJhdGUgd2ViIHByb2Nlc3MuCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvU2NyaXB0cy9jb3B5LXVzZXItaW50ZXJmYWNlLXJlc291 cmNlcy5wbCBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9TY3JpcHRzL2NvcHktdXNlci1pbnRlcmZh Y2UtcmVzb3VyY2VzLnBsCmluZGV4IGExNzRhMDI4Y2JjODRmYWQzOWJmZmE0NWFmMTBiNzU3ZDMx MTg2YmYuLjRmYWRmYzdhYWEwMjg1YTJlMjdkOGJmYjljMTkxMGFkOTIzNTJjNzcgMTAwNzU1Ci0t LSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9TY3JpcHRzL2NvcHktdXNlci1pbnRlcmZhY2UtcmVz b3VyY2VzLnBsCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9TY3JpcHRzL2NvcHktdXNlci1p bnRlcmZhY2UtcmVzb3VyY2VzLnBsCkBAIC0yLDcgKzIsNyBAQAogCiB1c2UgRW5nbGlzaDsKIHVz ZSBGaWxlOjpDb3B5IHF3KGNvcHkpOwotdXNlIEZpbGU6OlBhdGggcXcobWFrZV9wYXRoKTsKK3Vz ZSBGaWxlOjpQYXRoIHF3KG1ha2VfcGF0aCByZW1vdmVfdHJlZSk7CiB1c2UgRmlsZTo6U3BlYzsK IAogbXkgJHVzZURpckNvcHkgPSAwOwpAQCAtMTc4LDYgKzE3OCwxMiBAQCBpZiAoZGVmaW5lZCAk RU5WeydDT01CSU5FX0lOU1BFQ1RPUl9SRVNPVVJDRVMnfSAmJiAoJEVOVnsnQ09NQklORV9JTlNQ RUNUT1JfUkVTTwogCiAgICAgZGl0dG8oRmlsZTo6U3BlYy0+Y2F0ZGlyKCR1aVJvb3QsICdJbWFn ZXMnKSwgRmlsZTo6U3BlYy0+Y2F0ZGlyKCR0YXJnZXRSZXNvdXJjZVBhdGgsICdJbWFnZXMnKSk7 CiAKKyAgICAjIFJlbW92ZSBJbWFnZXMvTGVnYWN5IG9uIG1vZGVybiBzeXN0ZW1zIChPUyBYIDEw LjEwIFlvc2VtaXRlIGFuZCBncmVhdGVyIG9yIFdpbmRvd3MpLgorICAgIHJlbW92ZV90cmVlKEZp bGU6OlNwZWMtPmNhdGRpcigkdGFyZ2V0UmVzb3VyY2VQYXRoLCAnSW1hZ2VzJywgJ0xlZ2FjeScp KSBpZiAoZGVmaW5lZCAkRU5WeydNQUNfT1NfWF9WRVJTSU9OX01BSk9SJ30gJiYgJEVOVnsnTUFD X09TX1hfVkVSU0lPTl9NQUpPUid9IGdlIDEwMTAwMCkgb3IgZGVmaW5lZCAkRU5WeydPRkZJQ0lB TF9CVUlMRCd9OworCisgICAgIyBSZW1vdmUgSW1hZ2VzL2d0ayBvbiBNYWMgYW5kIFdpbmRvd3Mg YnVpbGRzLgorICAgIHJlbW92ZV90cmVlKEZpbGU6OlNwZWMtPmNhdGRpcigkdGFyZ2V0UmVzb3Vy Y2VQYXRoLCAnSW1hZ2VzJywgJ2d0aycpKSBpZiBkZWZpbmVkICRFTlZ7J01BQ19PU19YX1ZFUlNJ T05fTUFKT1InfSBvciBkZWZpbmVkICRFTlZ7J09GRklDSUFMX0JVSUxEJ307CisKICAgICAjIENv cHkgdGhlIExlZ2FjeSBkaXJlY3RvcnkuCiAgICAgZGl0dG8oRmlsZTo6U3BlYy0+Y2F0ZmlsZSgk dWlSb290LCAnUHJvdG9jb2wnLCAnTGVnYWN5JyksIEZpbGU6OlNwZWMtPmNhdGZpbGUoJHByb3Rv Y29sRGlyLCAnTGVnYWN5JykpOwogfSBlbHNlIHsK