106913 2013-01-15 09:11:10 -0800 Upstream iOS changes for ANGLE project 2013-01-15 13:51:43 -0800 1 1 1 Unclassified WebKit ANGLE 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 ddkilzer ddkilzer dino kbr mrowe mvujovic sam oldest_to_newest 807363 0 182786 ddkilzer 2013-01-15 09:11:10 -0800 Created attachment 182786 Patch <http://webkit.org/b/000000> Reviewed by NOBODY (OOPS!). * ANGLE.xcodeproj/project.pbxproj: - Use $(INSTALL_PATH_PREFIX) with CopyFiles build phase paths. - Add iOS.xcconfig to project. * Configurations/ANGLE.xcconfig: - Use INSTALL_PATH_ACTUAL instead of INSTALL_PATH. (See below.) - Use $(INSTALL_PATH_PREFIX) with PUBLIC_HEADERS_FOLDER_PATH. * Configurations/Base.xcconfig: - Include iOS.xcconfig. - Add per-platform values for GCC_ENABLE_OBJC_GC and GCC_MODEL_TUNING. - Define INSTALL_PATH when building for macosx SDK. * Configurations/iOS.xcconfig: Add. Note that missing include files are sipmly ignored without an error by Xcode. --- 5 files changed, 39 insertions(+), 6 deletions(-) 807372 1 ddkilzer 2013-01-15 09:18:43 -0800 Some additional notes: - There were no other code changes to ANGLE in iOS--only these build file changes. - The INSTALL_PATH_ACTUAL and INSTALL_PATH_PREFIX changes are required for iOS Simulator builds at Apple to make sure they end up in /Applications/Xcode.app/Contents/$(SDKROOT). The definition of INSTALL_PATH in Base.xcconfig is required to make these changes work with Mac OS X builds. - Missing #include files in *.xcconfig files (like iOS.xcconfig) are not build errors. 807462 2 182786 joepeck 2013-01-15 10:57:55 -0800 Comment on attachment 182786 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=182786&action=review r=me > Source/ThirdParty/ANGLE/ChangeLog:4 > + <http://webkit.org/b/000000> Nit: Update the bug link before landing > Source/ThirdParty/ANGLE/ChangeLog:20 > + files are sipmly ignored without an error by Xcode. Typo: sipmly > Source/ThirdParty/ANGLE/Configurations/Base.xcconfig:14 > +GCC_ENABLE_OBJC_GC_iphonesimulator = NO; Nit: Normally the _iphonesimulator version just uses the _iphoneos version, so: GCC_ENABLE_OBJC_GC_iphonesimulator = $(GCC_ENABLE_OBJC_GC_iphoneos) Up to you on making this change. That just seems to be the existing convention but it doesn't seem necessary. 807491 3 ddkilzer 2013-01-15 11:18:48 -0800 Committed r139761: <http://trac.webkit.org/changeset/139761> 807664 4 ddkilzer 2013-01-15 13:51:43 -0800 (In reply to comment #3) > Committed r139761: <http://trac.webkit.org/changeset/139761> Related build fix in r139784: <http://trac.webkit.org/changeset/139784 > 182786 2013-01-15 09:11:10 -0800 2013-01-15 10:57:55 -0800 Patch 20130115090810.patch text/plain 6567 ddkilzer U3VidmVyc2lvbiBSZXZpc2lvbjogMTM5NzQ0CmRpZmYgLS1naXQgYS9Tb3VyY2UvVGhpcmRQYXJ0 eS9BTkdMRS9DaGFuZ2VMb2cgYi9Tb3VyY2UvVGhpcmRQYXJ0eS9BTkdMRS9DaGFuZ2VMb2cKaW5k ZXggYjU4NTVlMzliOTcwMDEwYzkyZmUxYWM5YzU5N2EzOTI3ODU5NTAyNi4uNWUxYmMzMDM2YzVk MWY2YTMyZTNhYTQ5ZGQ0MDMzNmM1NTg2MzVmMiAxMDA2NDQKLS0tIGEvU291cmNlL1RoaXJkUGFy dHkvQU5HTEUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9UaGlyZFBhcnR5L0FOR0xFL0NoYW5nZUxv ZwpAQCAtMSwzICsxLDI0IEBACisyMDEzLTAxLTE1ICBEYXZpZCBLaWx6ZXIgIDxkZGtpbHplckBh cHBsZS5jb20+CisKKyAgICAgICAgVXBzdHJlYW0gaU9TIGNoYW5nZXMgZm9yIEFOR0xFIHByb2pl Y3QKKyAgICAgICAgPGh0dHA6Ly93ZWJraXQub3JnL2IvMDAwMDAwPgorCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogQU5HTEUueGNvZGVwcm9qL3Byb2pl Y3QucGJ4cHJvajoKKyAgICAgICAgLSBVc2UgJChJTlNUQUxMX1BBVEhfUFJFRklYKSB3aXRoIENv cHlGaWxlcyBidWlsZCBwaGFzZSBwYXRocy4KKyAgICAgICAgLSBBZGQgaU9TLnhjY29uZmlnIHRv IHByb2plY3QuCisgICAgICAgICogQ29uZmlndXJhdGlvbnMvQU5HTEUueGNjb25maWc6CisgICAg ICAgIC0gVXNlIElOU1RBTExfUEFUSF9BQ1RVQUwgaW5zdGVhZCBvZiBJTlNUQUxMX1BBVEguICAo U2VlIGJlbG93LikKKyAgICAgICAgLSBVc2UgJChJTlNUQUxMX1BBVEhfUFJFRklYKSB3aXRoIFBV QkxJQ19IRUFERVJTX0ZPTERFUl9QQVRILgorICAgICAgICAqIENvbmZpZ3VyYXRpb25zL0Jhc2Uu eGNjb25maWc6CisgICAgICAgIC0gSW5jbHVkZSBpT1MueGNjb25maWcuCisgICAgICAgIC0gQWRk IHBlci1wbGF0Zm9ybSB2YWx1ZXMgZm9yIEdDQ19FTkFCTEVfT0JKQ19HQyBhbmQKKyAgICAgICAg ICBHQ0NfTU9ERUxfVFVOSU5HLgorICAgICAgICAtIERlZmluZSBJTlNUQUxMX1BBVEggd2hlbiBi dWlsZGluZyBmb3IgbWFjb3N4IFNESy4KKyAgICAgICAgKiBDb25maWd1cmF0aW9ucy9pT1MueGNj b25maWc6IEFkZC4gIE5vdGUgdGhhdCBtaXNzaW5nIGluY2x1ZGUKKyAgICAgICAgZmlsZXMgYXJl IHNpcG1seSBpZ25vcmVkIHdpdGhvdXQgYW4gZXJyb3IgYnkgWGNvZGUuCisKIDIwMTMtMDEtMTQg IERhdmlkIEtpbHplciAgPGRka2lsemVyQGFwcGxlLmNvbT4KIAogICAgICAgICBSZW1vdmUgbm9u ZXhpc3RlbnQgZmlsZSBpbiBBTkdMRSBYY29kZSBwcm9qZWN0CmRpZmYgLS1naXQgYS9Tb3VyY2Uv VGhpcmRQYXJ0eS9BTkdMRS9BTkdMRS54Y29kZXByb2ovcHJvamVjdC5wYnhwcm9qIGIvU291cmNl L1RoaXJkUGFydHkvQU5HTEUvQU5HTEUueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvagppbmRleCA2 YzE1ZGU5OTE3MDAyNGRjOTczOGJiNzAyNzBkYzcwYTk1MmU0NTIwLi5kNDk5YTY1NDUyMzE1NDE1 MjZmZDNlYjNlMzc0Mzc1ZDhlODFjM2VhIDEwMDY0NAotLS0gYS9Tb3VyY2UvVGhpcmRQYXJ0eS9B TkdMRS9BTkdMRS54Y29kZXByb2ovcHJvamVjdC5wYnhwcm9qCisrKyBiL1NvdXJjZS9UaGlyZFBh cnR5L0FOR0xFL0FOR0xFLnhjb2RlcHJvai9wcm9qZWN0LnBieHByb2oKQEAgLTExNCw3ICsxMTQs NyBAQAogCQkzMTJCREIwQjE1RkVDQUIwMDA5N0VCQzcgLyogQ29weUZpbGVzICovID0gewogCQkJ aXNhID0gUEJYQ29weUZpbGVzQnVpbGRQaGFzZTsKIAkJCWJ1aWxkQWN0aW9uTWFzayA9IDg7Ci0J CQlkc3RQYXRoID0gL3Vzci9sb2NhbC9PcGVuU291cmNlVmVyc2lvbnM7CisJCQlkc3RQYXRoID0g IiQoSU5TVEFMTF9QQVRIX1BSRUZJWCkvdXNyL2xvY2FsL09wZW5Tb3VyY2VWZXJzaW9ucyI7CiAJ CQlkc3RTdWJmb2xkZXJTcGVjID0gMDsKIAkJCWZpbGVzID0gKAogCQkJCTMxMkJEQjBDMTVGRUNB QzkwMDk3RUJDNyAvKiBBTkdMRS5wbGlzdCBpbiBDb3B5RmlsZXMgKi8sCkBAIC0xMjQsNyArMTI0 LDcgQEAKIAkJMzEyQkRCMEQxNUZFQ0FDRTAwOTdFQkM3IC8qIENvcHlGaWxlcyAqLyA9IHsKIAkJ CWlzYSA9IFBCWENvcHlGaWxlc0J1aWxkUGhhc2U7CiAJCQlidWlsZEFjdGlvbk1hc2sgPSA4Owot CQkJZHN0UGF0aCA9IC91c3IvbG9jYWwvT3BlblNvdXJjZUxpY2Vuc2VzOworCQkJZHN0UGF0aCA9 ICIkKElOU1RBTExfUEFUSF9QUkVGSVgpL3Vzci9sb2NhbC9PcGVuU291cmNlTGljZW5zZXMiOwog CQkJZHN0U3ViZm9sZGVyU3BlYyA9IDA7CiAJCQlmaWxlcyA9ICgKIAkJCQkzMTJCREIwRTE1RkVD QUU1MDA5N0VCQzcgLyogQU5HTEUudHh0IGluIENvcHlGaWxlcyAqLywKQEAgLTEzOCw2ICsxMzgs NyBAQAogCQkzMTJCREIwQTE1RkVDQTNBMDA5N0VCQzcgLyogQU5HTEUudHh0ICovID0ge2lzYSA9 IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0g dGV4dDsgcGF0aCA9IEFOR0xFLnR4dDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKIAkJMzE1 OEVBMEMxNjMwOTY4RDAwNkJFNUVFIC8qIEFycmF5Qm91bmRzQ2xhbXBlci5jcHAgKi8gPSB7aXNh ID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUg PSBzb3VyY2Vjb2RlLmNwcC5jcHA7IHBhdGggPSBBcnJheUJvdW5kc0NsYW1wZXIuY3BwOyBzb3Vy Y2VUcmVlID0gIjxncm91cD4iOyB9OwogCQkzMTU4RUEwRDE2MzA5NjhEMDA2QkU1RUUgLyogQXJy YXlCb3VuZHNDbGFtcGVyLmggKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29k aW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmMuaDsgcGF0aCA9IEFycmF5 Qm91bmRzQ2xhbXBlci5oOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9OworCQk0NDNBM0UxNTEy RUNGNkNDMDAwNEY5RDcgLyogaU9TLnhjY29uZmlnICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVu Y2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gdGV4dC54Y2NvbmZpZzsg cGF0aCA9IGlPUy54Y2NvbmZpZzsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKIAkJNDk5NTFD MDIxNEI3QUFCMzAwNjBFOTZFIC8qIGxlbmd0aF9saW1pdHMuaCAqLyA9IHtpc2EgPSBQQlhGaWxl UmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNv ZGUuYy5oOyBwYXRoID0gbGVuZ3RoX2xpbWl0cy5oOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9 OwogCQk0OTk1MUMwNTE0QjdBQUQ3MDA2MEU5NkUgLyogQnVpbHRJbkZ1bmN0aW9uRW11bGF0b3Iu Y3BwICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxhc3RL bm93bkZpbGVUeXBlID0gc291cmNlY29kZS5jcHAuY3BwOyBwYXRoID0gQnVpbHRJbkZ1bmN0aW9u RW11bGF0b3IuY3BwOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9OwogCQk0OTk1MUMwNjE0QjdB QUQ4MDA2MEU5NkUgLyogQnVpbHRJbkZ1bmN0aW9uRW11bGF0b3IuaCAqLyA9IHtpc2EgPSBQQlhG aWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJj ZWNvZGUuYy5oOyBwYXRoID0gQnVpbHRJbkZ1bmN0aW9uRW11bGF0b3IuaDsgc291cmNlVHJlZSA9 ICI8Z3JvdXA+IjsgfTsKQEAgLTI5MCw2ICsyOTEsNyBAQAogCQkJCTVEN0M1OUM1MTIwOEM2OEIw MDFDODczRSAvKiBBTkdMRS54Y2NvbmZpZyAqLywKIAkJCQk1RDdDNTlDNjEyMDhDNjhCMDAxQzg3 M0UgLyogQmFzZS54Y2NvbmZpZyAqLywKIAkJCQk1RDdDNTlDNzEyMDhDNjhCMDAxQzg3M0UgLyog RGVidWdSZWxlYXNlLnhjY29uZmlnICovLAorCQkJCTQ0M0EzRTE1MTJFQ0Y2Q0MwMDA0RjlENyAv KiBpT1MueGNjb25maWcgKi8sCiAJCQkpOwogCQkJcGF0aCA9IENvbmZpZ3VyYXRpb25zOwogCQkJ c291cmNlVHJlZSA9ICI8Z3JvdXA+IjsKZGlmZiAtLWdpdCBhL1NvdXJjZS9UaGlyZFBhcnR5L0FO R0xFL0NvbmZpZ3VyYXRpb25zL0FOR0xFLnhjY29uZmlnIGIvU291cmNlL1RoaXJkUGFydHkvQU5H TEUvQ29uZmlndXJhdGlvbnMvQU5HTEUueGNjb25maWcKaW5kZXggNjQ0YjcxZGRhMWE2NTQ1MmZh ZTlhMGE2MDc1NmI0NGNhNGUyYjM1My4uNmQ0ZDBjNmY1ODFlNWNjNDQyOWY3OTkxNWMyYTY1MjYw Y2E2NWY1YiAxMDA2NDQKLS0tIGEvU291cmNlL1RoaXJkUGFydHkvQU5HTEUvQ29uZmlndXJhdGlv bnMvQU5HTEUueGNjb25maWcKKysrIGIvU291cmNlL1RoaXJkUGFydHkvQU5HTEUvQ29uZmlndXJh dGlvbnMvQU5HTEUueGNjb25maWcKQEAgLTEsNSArMSw1IEBACiBQUk9EVUNUX05BTUUgPSBBTkdM RTsKIAogSEVBREVSX1NFQVJDSF9QQVRIUyA9IGluY2x1ZGUgc3JjOwotSU5TVEFMTF9QQVRIID0g L3Vzci9sb2NhbC9saWI7Ci1QVUJMSUNfSEVBREVSU19GT0xERVJfUEFUSCA9IC91c3IvbG9jYWwv aW5jbHVkZS9BTkdMRTsKK0lOU1RBTExfUEFUSF9BQ1RVQUwgPSAvdXNyL2xvY2FsL2xpYjsKK1BV QkxJQ19IRUFERVJTX0ZPTERFUl9QQVRIID0gJChJTlNUQUxMX1BBVEhfUFJFRklYKS91c3IvbG9j YWwvaW5jbHVkZS9BTkdMRTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9UaGlyZFBhcnR5L0FOR0xFL0Nv bmZpZ3VyYXRpb25zL0Jhc2UueGNjb25maWcgYi9Tb3VyY2UvVGhpcmRQYXJ0eS9BTkdMRS9Db25m aWd1cmF0aW9ucy9CYXNlLnhjY29uZmlnCmluZGV4IDc0MmM4ZmM0YWZmNDRkMmZhODllNDhmMGI1 ZmMyNDIwY2U5ZGEzNjcuLmVjMWI4MmU3YjUyNDc5OTJlNTM5ZDIzMjViMTQwZjg4YzI3OGNlZTcg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9UaGlyZFBhcnR5L0FOR0xFL0NvbmZpZ3VyYXRpb25zL0Jhc2Uu eGNjb25maWcKKysrIGIvU291cmNlL1RoaXJkUGFydHkvQU5HTEUvQ29uZmlndXJhdGlvbnMvQmFz ZS54Y2NvbmZpZwpAQCAtMSwzICsxLDUgQEAKKyNpbmNsdWRlICJpT1MueGNjb25maWciCisKIENM QU5HX0NYWF9MQU5HVUFHRV9TVEFOREFSRCA9IGdudSsrMHg7CiBDTEFOR19DWFhfTElCUkFSWSA9 IGxpYmMrKzsKIERFQURfQ09ERV9TVFJJUFBJTkcgPSBZRVM7CkBAIC03LDEwICs5LDE0IEBAIEdD Q19ERUJVR0dJTkdfU1lNQk9MUyA9IGRlZmF1bHQ7CiBHQ0NfRU5BQkxFX0NQUF9FWENFUFRJT05T ID0gTk87CiBHQ0NfRU5BQkxFX0NQUF9SVFRJID0gTk87CiBHQ0NfRU5BQkxFX09CSkNfRVhDRVBU SU9OUyA9IFlFUzsKLUdDQ19FTkFCTEVfT0JKQ19HQyA9IHN1cHBvcnRlZDsKK0dDQ19FTkFCTEVf T0JKQ19HQyA9ICQoR0NDX0VOQUJMRV9PQkpDX0dDXyQoUExBVEZPUk1fTkFNRSkpOworR0NDX0VO QUJMRV9PQkpDX0dDX2lwaG9uZW9zID0gTk87CitHQ0NfRU5BQkxFX09CSkNfR0NfaXBob25lc2lt dWxhdG9yID0gTk87CitHQ0NfRU5BQkxFX09CSkNfR0NfbWFjb3N4ID0gc3VwcG9ydGVkOwogR0ND X0VOQUJMRV9TWU1CT0xfU0VQQVJBVElPTiA9IE5POwogR0NDX0ZBU1RfT0JKQ19ESVNQQVRDSCA9 IFlFUzsKLUdDQ19NT0RFTF9UVU5JTkcgPSBHNTsKK0dDQ19NT0RFTF9UVU5JTkcgPSAkKEdDQ19N T0RFTF9UVU5JTkdfJChQTEFURk9STV9OQU1FKSk7CitHQ0NfTU9ERUxfVFVOSU5HX21hY29zeCA9 IEc1OwogR0NDX09CSkNfQ0FMTF9DWFhfQ0RUT1JTID0gWUVTOwogR0NDX09QVElNSVpBVElPTl9M RVZFTCA9IHM7CiBHQ0NfUFJFQ09NUElMRV9QUkVGSVhfSEVBREVSID0gTk87CkBAIC0zMiw2ICsz OCw5IEBAIFRBUkdFVElOR19TQU1FX09TX1hfVkVSU0lPTl8xMDcwXzEwNzAgPSBZRVM7CiBUQVJH RVRJTkdfU0FNRV9PU19YX1ZFUlNJT05fMTA4MF8xMDgwID0gWUVTOwogVEFSR0VUSU5HX1NBTUVf T1NfWF9WRVJTSU9OXzEwOTBfMTA5MCA9IFlFUzsKIAorLy8gTWFrZSBtYWNvc3ggU0RLIGJ1aWxk cyB3b3JrIHdpdGhvdXQgQXNwZW5GYW1pbHkueGNjb25maWcuCitJTlNUQUxMX1BBVEggPSAkKElO U1RBTExfUEFUSF9QUkVGSVgpJChJTlNUQUxMX1BBVEhfQUNUVUFMKTsKKwogLy8gRG9uJ3QgYnVp bGQgYWdhaW5zdCBhbiBTREsgdW5sZXNzIHdlJ3JlIHRhcmdldGluZyBhbiBvbGRlciBPUyB2ZXJz aW9uLgogU0RLUk9PVCA9ICQoU0RLUk9PVF9UQVJHRVRJTkdfU0FNRV9PU19YX1ZFUlNJT05fJChU QVJHRVRJTkdfU0FNRV9PU19YX1ZFUlNJT04pKTsKIFNES1JPT1RfVEFSR0VUSU5HX1NBTUVfT1Nf WF9WRVJTSU9OXyA9IG1hY29zeDsKZGlmZiAtLWdpdCBhL1NvdXJjZS9UaGlyZFBhcnR5L0FOR0xF L0NvbmZpZ3VyYXRpb25zL2lPUy54Y2NvbmZpZyBiL1NvdXJjZS9UaGlyZFBhcnR5L0FOR0xFL0Nv bmZpZ3VyYXRpb25zL2lPUy54Y2NvbmZpZwpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi4xNzdiMzE5ODljNWUxZmFkYTZk NTA2M2FjNzQ2NmI0NWYwNmMwYTIzCi0tLSAvZGV2L251bGwKKysrIGIvU291cmNlL1RoaXJkUGFy dHkvQU5HTEUvQ29uZmlndXJhdGlvbnMvaU9TLnhjY29uZmlnCkBAIC0wLDAgKzEgQEAKKyNpbmNs dWRlICI8REVWRUxPUEVSX0RJUj4vQXBwbGVJbnRlcm5hbC9YY29kZUNvbmZpZy9Bc3BlbkZhbWls eS54Y2NvbmZpZyIK