99770 2012-10-18 15:51:57 -0700 Mac WTF build checks dependencies before copying header files 2012-10-18 18:04:39 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) Mac All RESOLVED FIXED P2 Normal --- 99739 1 msaboff msaboff oldest_to_newest 745669 0 msaboff 2012-10-18 15:51:57 -0700 XCode checks dependencies as the first phase of building. The second step for building WTF is to move the WTF header files to the derived location. This move can impact the dependency outcome causing the build to fail. 745694 1 msaboff 2012-10-18 16:06:56 -0700 Committed r131819: <http://trac.webkit.org/changeset/131819> 745762 2 msaboff 2012-10-18 17:14:35 -0700 Mark says this isn't quite right. 745763 3 169509 msaboff 2012-10-18 17:17:27 -0700 Created attachment 169509 Fixed a couple of problems from original checkin 745772 4 169509 mrowe 2012-10-18 17:25:07 -0700 Comment on attachment 169509 Fixed a couple of problems from original checkin Beyond this, you should create a new CopyWTFHeaders.xcconfig file for this target and move the bits that this target needs that the WTF no longer needs (PRIVATE_HEADERS_FOLDER_PATH / INSTALLHDRS_SCRIPT_PHASE, I think) out of WTF.xcconfig. If you do that as well then I think that'll address all of my complaints. 745794 5 169518 msaboff 2012-10-18 17:46:34 -0700 Created attachment 169518 Updated patch 745799 6 169518 mrowe 2012-10-18 17:48:05 -0700 Comment on attachment 169518 Updated patch Only minor nit is that it should be CopyWTFHeaders.xcconfig, with the trailing s. If it's a pain to change it, don't worry about it! 745821 7 msaboff 2012-10-18 18:04:39 -0700 Committed r131833: <http://trac.webkit.org/changeset/131833> 169509 2012-10-18 17:17:27 -0700 2012-10-18 17:46:34 -0700 Fixed a couple of problems from original checkin 99770-2.patch text/plain 3677 msaboff SW5kZXg6IFNvdXJjZS9XVEYvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XVEYvQ2hh bmdlTG9nCShyZXZpc2lvbiAxMzE4MjYpCisrKyBTb3VyY2UvV1RGL0NoYW5nZUxvZwkod29ya2lu ZyBjb3B5KQpAQCAtMSwzICsxLDE0IEBACisyMDEyLTEwLTE4ICBNaWNoYWVsIFNhYm9mZiAgPG1z YWJvZmZAYXBwbGUuY29tPgorCisgICAgICAgIE1hYyBXVEYgYnVpbGQgY2hlY2tzIGRlcGVuZGVu Y2llcyBiZWZvcmUgY29weWluZyBoZWFkZXIgZmlsZXMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTk5NzcwCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgRml4ZWQgdXAgYnVpbGQgcnVsZXMgcGVyIE1hcmsgUm93 ZS4gTWFkZSBuZXcgdGFyZ2V0IGFuIEFnZ3JlZ2F0ZSBhbmQgcmVtb3ZlZCAiV1RGIGNvcHkiLgor CisgICAgICAgICogV1RGLnhjb2RlcHJvai9wcm9qZWN0LnBieHByb2o6CisKIDIwMTItMTAtMTgg IE1pY2hhZWwgU2Fib2ZmICA8bXNhYm9mZkBhcHBsZS5jb20+CiAKICAgICAgICAgTWFjIFdURiBi dWlsZCBjaGVja3MgZGVwZW5kZW5jaWVzIGJlZm9yZSBjb3B5aW5nIGhlYWRlciBmaWxlcwpJbmRl eDogU291cmNlL1dURi9XVEYueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvago9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSBTb3VyY2UvV1RGL1dURi54Y29kZXByb2ovcHJvamVjdC5wYnhwcm9qCShyZXZpc2lvbiAxMzE4 MjEpCisrKyBTb3VyY2UvV1RGL1dURi54Y29kZXByb2ovcHJvamVjdC5wYnhwcm9qCSh3b3JraW5n IGNvcHkpCkBAIC02LDYgKzYsMjAgQEAKIAlvYmplY3RWZXJzaW9uID0gNDY7CiAJb2JqZWN0cyA9 IHsKIAorLyogQmVnaW4gUEJYQWdncmVnYXRlVGFyZ2V0IHNlY3Rpb24gKi8KKwkJNjVBRkExNkYx NjMwQjk3NzAwM0Q3MjNDIC8qIENvcHkgV1RGIEhlYWRlcnMgKi8gPSB7CisJCQlpc2EgPSBQQlhB Z2dyZWdhdGVUYXJnZXQ7CisJCQlidWlsZENvbmZpZ3VyYXRpb25MaXN0ID0gNjVBRkEyODgxNjMw Qjk3NzAwM0Q3MjNDIC8qIEJ1aWxkIGNvbmZpZ3VyYXRpb24gbGlzdCBmb3IgUEJYQWdncmVnYXRl VGFyZ2V0ICJDb3B5IFdURiBIZWFkZXJzIiAqLzsKKwkJCWJ1aWxkUGhhc2VzID0gKAorCQkJCTY1 QUZBMTcwMTYzMEI5NzcwMDNENzIzQyAvKiBDb3B5IFdURiBIZWFkZXJzICovLAorCQkJKTsKKwkJ CWRlcGVuZGVuY2llcyA9ICgKKwkJCSk7CisJCQluYW1lID0gIkNvcHkgV1RGIEhlYWRlcnMiOwor CQkJcHJvZHVjdE5hbWUgPSAiQ29weSBXVEYgSGVhZGVycyI7CisJCX07CisvKiBFbmQgUEJYQWdn cmVnYXRlVGFyZ2V0IHNlY3Rpb24gKi8KKwogLyogQmVnaW4gUEJYQnVpbGRGaWxlIHNlY3Rpb24g Ki8KIAkJMEZEODFBQzUxNTRGQjIyRTAwOTgzRTcyIC8qIEZhc3RCaXRWZWN0b3IuaCBpbiBIZWFk ZXJzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IDBGRDgxQUM0MTU0RkIyMkUw MDk4M0U3MiAvKiBGYXN0Qml0VmVjdG9yLmggKi87IHNldHRpbmdzID0ge0FUVFJJQlVURVMgPSAo KTsgfTsgfTsKIAkJMTQzRjYxMUYxNTY1RjBGOTAwREI1MTRBIC8qIFJBTVNpemUuY3BwIGluIFNv dXJjZXMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gMTQzRjYxMUQxNTY1RjBG OTAwREI1MTRBIC8qIFJBTVNpemUuY3BwICovOyB9OwpAQCAtMTIxNiwyMCArMTIzMCw2IEBACiAJ CQlwcm9kdWN0UmVmZXJlbmNlID0gNUQyNDdCNjIxNDY4OUI4NjAwRTc4Qjc2IC8qIGxpYldURi5h ICovOwogCQkJcHJvZHVjdFR5cGUgPSAiY29tLmFwcGxlLnByb2R1Y3QtdHlwZS5saWJyYXJ5LnN0 YXRpYyI7CiAJCX07Ci0JCTY1QUZBMTZGMTYzMEI5NzcwMDNENzIzQyAvKiBDb3B5IFdURiBIZWFk ZXJzICovID0gewotCQkJaXNhID0gUEJYTmF0aXZlVGFyZ2V0OwotCQkJYnVpbGRDb25maWd1cmF0 aW9uTGlzdCA9IDY1QUZBMjg4MTYzMEI5NzcwMDNENzIzQyAvKiBCdWlsZCBjb25maWd1cmF0aW9u IGxpc3QgZm9yIFBCWE5hdGl2ZVRhcmdldCAiQ29weSBXVEYgSGVhZGVycyIgKi87Ci0JCQlidWls ZFBoYXNlcyA9ICgKLQkJCQk2NUFGQTE3MDE2MzBCOTc3MDAzRDcyM0MgLyogQ29weSBXVEYgSGVh ZGVycyAqLywKLQkJCSk7Ci0JCQlidWlsZFJ1bGVzID0gKAotCQkJKTsKLQkJCWRlcGVuZGVuY2ll cyA9ICgKLQkJCSk7Ci0JCQluYW1lID0gIkNvcHkgV1RGIEhlYWRlcnMiOwotCQkJcHJvZHVjdE5h bWUgPSAiQ29weSBXVEYgSGVhZGVycyI7Ci0JCQlwcm9kdWN0VHlwZSA9ICJjb20uYXBwbGUucHJv ZHVjdC10eXBlLnRvb2wiOwotCQl9OwogLyogRW5kIFBCWE5hdGl2ZVRhcmdldCBzZWN0aW9uICov CiAKIC8qIEJlZ2luIFBCWFByb2plY3Qgc2VjdGlvbiAqLwpAQCAtMTQzNSw3ICsxNDM1LDcgQEAK IAkJCWlzYSA9IFhDQnVpbGRDb25maWd1cmF0aW9uOwogCQkJYmFzZUNvbmZpZ3VyYXRpb25SZWZl cmVuY2UgPSA1RDI0N0I3MzE0Njg5QzQ3MDBFNzhCNzYgLyogV1RGLnhjY29uZmlnICovOwogCQkJ YnVpbGRTZXR0aW5ncyA9IHsKLQkJCQlQUk9EVUNUX05BTUUgPSAiV1RGIGNvcHkiOworCQkJCVBS T0RVQ1RfTkFNRSA9ICIkKFRBUkdFVF9OQU1FKSI7CiAJCQl9OwogCQkJbmFtZSA9IERlYnVnOwog CQl9OwpAQCAtMTQ0Myw3ICsxNDQzLDcgQEAKIAkJCWlzYSA9IFhDQnVpbGRDb25maWd1cmF0aW9u OwogCQkJYmFzZUNvbmZpZ3VyYXRpb25SZWZlcmVuY2UgPSA1RDI0N0I3MzE0Njg5QzQ3MDBFNzhC NzYgLyogV1RGLnhjY29uZmlnICovOwogCQkJYnVpbGRTZXR0aW5ncyA9IHsKLQkJCQlQUk9EVUNU X05BTUUgPSAiV1RGIGNvcHkiOworCQkJCVBST0RVQ1RfTkFNRSA9ICIkKFRBUkdFVF9OQU1FKSI7 CiAJCQl9OwogCQkJbmFtZSA9IFJlbGVhc2U7CiAJCX07CkBAIC0xNDUxLDcgKzE0NTEsNyBAQAog CQkJaXNhID0gWENCdWlsZENvbmZpZ3VyYXRpb247CiAJCQliYXNlQ29uZmlndXJhdGlvblJlZmVy ZW5jZSA9IDVEMjQ3QjczMTQ2ODlDNDcwMEU3OEI3NiAvKiBXVEYueGNjb25maWcgKi87CiAJCQli dWlsZFNldHRpbmdzID0gewotCQkJCVBST0RVQ1RfTkFNRSA9ICJXVEYgY29weSI7CisJCQkJUFJP RFVDVF9OQU1FID0gIiQoVEFSR0VUX05BTUUpIjsKIAkJCX07CiAJCQluYW1lID0gUHJvZHVjdGlv bjsKIAkJfTsKQEAgLTE0NzgsNyArMTQ3OCw3IEBACiAJCQlkZWZhdWx0Q29uZmlndXJhdGlvbklz VmlzaWJsZSA9IDA7CiAJCQlkZWZhdWx0Q29uZmlndXJhdGlvbk5hbWUgPSBQcm9kdWN0aW9uOwog CQl9OwotCQk2NUFGQTI4ODE2MzBCOTc3MDAzRDcyM0MgLyogQnVpbGQgY29uZmlndXJhdGlvbiBs aXN0IGZvciBQQlhOYXRpdmVUYXJnZXQgIkNvcHkgV1RGIEhlYWRlcnMiICovID0geworCQk2NUFG QTI4ODE2MzBCOTc3MDAzRDcyM0MgLyogQnVpbGQgY29uZmlndXJhdGlvbiBsaXN0IGZvciBQQlhB Z2dyZWdhdGVUYXJnZXQgIkNvcHkgV1RGIEhlYWRlcnMiICovID0gewogCQkJaXNhID0gWENDb25m aWd1cmF0aW9uTGlzdDsKIAkJCWJ1aWxkQ29uZmlndXJhdGlvbnMgPSAoCiAJCQkJNjVBRkEyODkx NjMwQjk3NzAwM0Q3MjNDIC8qIERlYnVnICovLAo= 169518 2012-10-18 17:46:34 -0700 2012-10-18 17:48:05 -0700 Updated patch 99770-3.patch text/plain 7842 msaboff SW5kZXg6IFNvdXJjZS9XVEYvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XVEYvQ2hh bmdlTG9nCShyZXZpc2lvbiAxMzE4MjYpCisrKyBTb3VyY2UvV1RGL0NoYW5nZUxvZwkod29ya2lu ZyBjb3B5KQpAQCAtMSwzICsxLDE0IEBACisyMDEyLTEwLTE4ICBNaWNoYWVsIFNhYm9mZiAgPG1z YWJvZmZAYXBwbGUuY29tPgorCisgICAgICAgIE1hYyBXVEYgYnVpbGQgY2hlY2tzIGRlcGVuZGVu Y2llcyBiZWZvcmUgY29weWluZyBoZWFkZXIgZmlsZXMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTk5NzcwCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgRml4ZWQgdXAgYnVpbGQgcnVsZXMgcGVyIE1hcmsgUm93 ZS4gTWFkZSBuZXcgdGFyZ2V0IGFuIEFnZ3JlZ2F0ZSBhbmQgcmVtb3ZlZCAiV1RGIGNvcHkiLgor CisgICAgICAgICogV1RGLnhjb2RlcHJvai9wcm9qZWN0LnBieHByb2o6CisKIDIwMTItMTAtMTgg IE1pY2hhZWwgU2Fib2ZmICA8bXNhYm9mZkBhcHBsZS5jb20+CiAKICAgICAgICAgTWFjIFdURiBi dWlsZCBjaGVja3MgZGVwZW5kZW5jaWVzIGJlZm9yZSBjb3B5aW5nIGhlYWRlciBmaWxlcwpJbmRl eDogU291cmNlL1dURi9Db25maWd1cmF0aW9ucy9Db3B5V1RGSGVhZGVyLnhjY29uZmlnCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIFNvdXJjZS9XVEYvQ29uZmlndXJhdGlvbnMvQ29weVdURkhlYWRlci54Y2NvbmZp ZwkocmV2aXNpb24gMCkKKysrIFNvdXJjZS9XVEYvQ29uZmlndXJhdGlvbnMvQ29weVdURkhlYWRl ci54Y2NvbmZpZwkocmV2aXNpb24gMCkKQEAgLTAsMCArMSwyNiBAQAorLy8gQ29weXJpZ2h0IChD KSAyMDExIEFwcGxlIEluYy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KKy8vCisvLyBSZWRpc3RyaWJ1 dGlvbiBhbmQgdXNlIGluIHNvdXJjZSBhbmQgYmluYXJ5IGZvcm1zLCB3aXRoIG9yIHdpdGhvdXQK Ky8vIG1vZGlmaWNhdGlvbiwgYXJlIHBlcm1pdHRlZCBwcm92aWRlZCB0aGF0IHRoZSBmb2xsb3dp bmcgY29uZGl0aW9ucworLy8gYXJlIG1ldDoKKy8vIDEuIFJlZGlzdHJpYnV0aW9ucyBvZiBzb3Vy Y2UgY29kZSBtdXN0IHJldGFpbiB0aGUgYWJvdmUgY29weXJpZ2h0CisvLyAgICBub3RpY2UsIHRo aXMgbGlzdCBvZiBjb25kaXRpb25zIGFuZCB0aGUgZm9sbG93aW5nIGRpc2NsYWltZXIuCisvLyAy LiBSZWRpc3RyaWJ1dGlvbnMgaW4gYmluYXJ5IGZvcm0gbXVzdCByZXByb2R1Y2UgdGhlIGFib3Zl IGNvcHlyaWdodAorLy8gICAgbm90aWNlLCB0aGlzIGxpc3Qgb2YgY29uZGl0aW9ucyBhbmQgdGhl IGZvbGxvd2luZyBkaXNjbGFpbWVyIGluIHRoZQorLy8gICAgZG9jdW1lbnRhdGlvbiBhbmQvb3Ig b3RoZXIgbWF0ZXJpYWxzIHByb3ZpZGVkIHdpdGggdGhlIGRpc3RyaWJ1dGlvbi4KKy8vCisvLyBU SElTIFNPRlRXQVJFIElTIFBST1ZJREVEIEJZIEFQUExFIElOQy4gYGBBUyBJUycnIEFORCBBTlkK Ky8vIEVYUFJFU1MgT1IgSU1QTElFRCBXQVJSQU5USUVTLCBJTkNMVURJTkcsIEJVVCBOT1QgTElN SVRFRCBUTywgVEhFCisvLyBJTVBMSUVEIFdBUlJBTlRJRVMgT0YgTUVSQ0hBTlRBQklMSVRZIEFO RCBGSVRORVNTIEZPUiBBIFBBUlRJQ1VMQVIKKy8vIFBVUlBPU0UgQVJFIERJU0NMQUlNRUQuICBJ TiBOTyBFVkVOVCBTSEFMTCBBUFBMRSBJTkMuIE9SCisvLyBDT05UUklCVVRPUlMgQkUgTElBQkxF IEZPUiBBTlkgRElSRUNULCBJTkRJUkVDVCwgSU5DSURFTlRBTCwgU1BFQ0lBTCwKKy8vIEVYRU1Q TEFSWSwgT1IgQ09OU0VRVUVOVElBTCBEQU1BR0VTIChJTkNMVURJTkcsIEJVVCBOT1QgTElNSVRF RCBUTywKKy8vIFBST0NVUkVNRU5UIE9GIFNVQlNUSVRVVEUgR09PRFMgT1IgU0VSVklDRVM7IExP U1MgT0YgVVNFLCBEQVRBLCBPUgorLy8gUFJPRklUUzsgT1IgQlVTSU5FU1MgSU5URVJSVVBUSU9O KSBIT1dFVkVSIENBVVNFRCBBTkQgT04gQU5ZIFRIRU9SWQorLy8gT0YgTElBQklMSVRZLCBXSEVU SEVSIElOIENPTlRSQUNULCBTVFJJQ1QgTElBQklMSVRZLCBPUiBUT1JUCisvLyAoSU5DTFVESU5H IE5FR0xJR0VOQ0UgT1IgT1RIRVJXSVNFKSBBUklTSU5HIElOIEFOWSBXQVkgT1VUIE9GIFRIRSBV U0UKKy8vIE9GIFRISVMgU09GVFdBUkUsIEVWRU4gSUYgQURWSVNFRCBPRiBUSEUgUE9TU0lCSUxJ VFkgT0YgU1VDSCBEQU1BR0UuIAorCisKK1BSSVZBVEVfSEVBREVSU19GT0xERVJfUEFUSCA9IC91 c3IvbG9jYWwvaW5jbHVkZS93dGY7CitJTlNUQUxMSERSU19TQ1JJUFRfUEhBU0UgPSBZRVM7Cklu ZGV4OiBTb3VyY2UvV1RGL0NvbmZpZ3VyYXRpb25zL1dURi54Y2NvbmZpZwo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSBTb3VyY2UvV1RGL0NvbmZpZ3VyYXRpb25zL1dURi54Y2NvbmZpZwkocmV2aXNpb24gMTMxODIx KQorKysgU291cmNlL1dURi9Db25maWd1cmF0aW9ucy9XVEYueGNjb25maWcJKHdvcmtpbmcgY29w eSkKQEAgLTI0LDYgKzI0LDQgQEAKIEVYRUNVVEFCTEVfUFJFRklYID0gbGliOwogUFJPRFVDVF9O QU1FID0gV1RGOwogCi1QUklWQVRFX0hFQURFUlNfRk9MREVSX1BBVEggPSAvdXNyL2xvY2FsL2lu Y2x1ZGUvd3RmOwotSU5TVEFMTEhEUlNfU0NSSVBUX1BIQVNFID0gWUVTOwogR0NDX1NZTUJPTFNf UFJJVkFURV9FWFRFUk4gPSBZRVM7CkluZGV4OiBTb3VyY2UvV1RGL1dURi54Y29kZXByb2ovcHJv amVjdC5wYnhwcm9qCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XVEYvV1RGLnhjb2RlcHJvai9wcm9q ZWN0LnBieHByb2oJKHJldmlzaW9uIDEzMTgyMSkKKysrIFNvdXJjZS9XVEYvV1RGLnhjb2RlcHJv ai9wcm9qZWN0LnBieHByb2oJKHdvcmtpbmcgY29weSkKQEAgLTYsNiArNiwyMCBAQAogCW9iamVj dFZlcnNpb24gPSA0NjsKIAlvYmplY3RzID0gewogCisvKiBCZWdpbiBQQlhBZ2dyZWdhdGVUYXJn ZXQgc2VjdGlvbiAqLworCQk2NUFGQTE2RjE2MzBCOTc3MDAzRDcyM0MgLyogQ29weSBXVEYgSGVh ZGVycyAqLyA9IHsKKwkJCWlzYSA9IFBCWEFnZ3JlZ2F0ZVRhcmdldDsKKwkJCWJ1aWxkQ29uZmln dXJhdGlvbkxpc3QgPSA2NUFGQTI4ODE2MzBCOTc3MDAzRDcyM0MgLyogQnVpbGQgY29uZmlndXJh dGlvbiBsaXN0IGZvciBQQlhBZ2dyZWdhdGVUYXJnZXQgIkNvcHkgV1RGIEhlYWRlcnMiICovOwor CQkJYnVpbGRQaGFzZXMgPSAoCisJCQkJNjVBRkExNzAxNjMwQjk3NzAwM0Q3MjNDIC8qIENvcHkg V1RGIEhlYWRlcnMgKi8sCisJCQkpOworCQkJZGVwZW5kZW5jaWVzID0gKAorCQkJKTsKKwkJCW5h bWUgPSAiQ29weSBXVEYgSGVhZGVycyI7CisJCQlwcm9kdWN0TmFtZSA9ICJDb3B5IFdURiBIZWFk ZXJzIjsKKwkJfTsKKy8qIEVuZCBQQlhBZ2dyZWdhdGVUYXJnZXQgc2VjdGlvbiAqLworCiAvKiBC ZWdpbiBQQlhCdWlsZEZpbGUgc2VjdGlvbiAqLwogCQkwRkQ4MUFDNTE1NEZCMjJFMDA5ODNFNzIg LyogRmFzdEJpdFZlY3Rvci5oIGluIEhlYWRlcnMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBm aWxlUmVmID0gMEZEODFBQzQxNTRGQjIyRTAwOTgzRTcyIC8qIEZhc3RCaXRWZWN0b3IuaCAqLzsg c2V0dGluZ3MgPSB7QVRUUklCVVRFUyA9ICgpOyB9OyB9OwogCQkxNDNGNjExRjE1NjVGMEY5MDBE QjUxNEEgLyogUkFNU2l6ZS5jcHAgaW4gU291cmNlcyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7 IGZpbGVSZWYgPSAxNDNGNjExRDE1NjVGMEY5MDBEQjUxNEEgLyogUkFNU2l6ZS5jcHAgKi87IH07 CkBAIC0zNDEsNiArMzU1LDcgQEAKIAkJNUQyNDdCNzAxNDY4OUM0NzAwRTc4Qjc2IC8qIERlYnVn UmVsZWFzZS54Y2NvbmZpZyAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBsYXN0S25vd25G aWxlVHlwZSA9IHRleHQueGNjb25maWc7IHBhdGggPSBEZWJ1Z1JlbGVhc2UueGNjb25maWc7IHNv dXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CiAJCTVEMjQ3QjczMTQ2ODlDNDcwMEU3OEI3NiAvKiBX VEYueGNjb25maWcgKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgbGFzdEtub3duRmlsZVR5 cGUgPSB0ZXh0LnhjY29uZmlnOyBwYXRoID0gV1RGLnhjY29uZmlnOyBzb3VyY2VUcmVlID0gIjxn cm91cD4iOyB9OwogCQk1RDI0N0VCMTE0NjhCMDE1MDBFNzhCNzYgLyogSGVhZGVyRGV0ZWN0aW9u LmggKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtu b3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmMuaDsgbmFtZSA9IEhlYWRlckRldGVjdGlvbi5oOyBw YXRoID0gRGVyaXZlZFNvdXJjZXMvV1RGL0hlYWRlckRldGVjdGlvbi5oOyBzb3VyY2VUcmVlID0g QlVJTFRfUFJPRFVDVFNfRElSOyB9OworCQk2NTQxQ0FGMzE2MzBEOEZBMDA2RDBERUMgLyogQ29w eVdURkhlYWRlci54Y2NvbmZpZyAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5j b2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHRleHQueGNjb25maWc7IHBhdGggPSBDb3B5 V1RGSGVhZGVyLnhjY29uZmlnOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9OwogCQk3RTI5QzMz RDE1RkZENzlCMDA1MTZENjEgLyogT2JqY1J1bnRpbWVFeHRyYXMuaCAqLyA9IHtpc2EgPSBQQlhG aWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJj ZWNvZGUuYy5oOyBwYXRoID0gT2JqY1J1bnRpbWVFeHRyYXMuaDsgc291cmNlVHJlZSA9ICI8Z3Jv dXA+IjsgfTsKIAkJODEzNDAxMzYxNUIwOTJGRDAwMUZGMEI4IC8qIEJhc2U2NC5jcHAgKi8gPSB7 aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5 cGUgPSBzb3VyY2Vjb2RlLmNwcC5jcHA7IHBhdGggPSBCYXNlNjQuY3BwOyBzb3VyY2VUcmVlID0g Ijxncm91cD4iOyB9OwogCQk4MTM0MDEzNzE1QjA5MkZEMDAxRkYwQjggLyogQmFzZTY0LmggKi8g PSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmls ZVR5cGUgPSBzb3VyY2Vjb2RlLmMuaDsgcGF0aCA9IEJhc2U2NC5oOyBzb3VyY2VUcmVlID0gIjxn cm91cD4iOyB9OwpAQCAtNjEyLDYgKzYyNyw3IEBACiAJCTVEMjQ3QjZEMTQ2ODlDNDcwMEU3OEI3 NiAvKiBDb25maWd1cmF0aW9ucyAqLyA9IHsKIAkJCWlzYSA9IFBCWEdyb3VwOwogCQkJY2hpbGRy ZW4gPSAoCisJCQkJNjU0MUNBRjMxNjMwRDhGQTAwNkQwREVDIC8qIENvcHlXVEZIZWFkZXIueGNj b25maWcgKi8sCiAJCQkJNUQyNDdCNkUxNDY4OUM0NzAwRTc4Qjc2IC8qIEJhc2UueGNjb25maWcg Ki8sCiAJCQkJNUQyNDdCNkYxNDY4OUM0NzAwRTc4Qjc2IC8qIENvbXBpbGVyVmVyc2lvbi54Y2Nv bmZpZyAqLywKIAkJCQk1RDI0N0I3MDE0Njg5QzQ3MDBFNzhCNzYgLyogRGVidWdSZWxlYXNlLnhj Y29uZmlnICovLApAQCAtMTIxNiwyMCArMTIzMiw2IEBACiAJCQlwcm9kdWN0UmVmZXJlbmNlID0g NUQyNDdCNjIxNDY4OUI4NjAwRTc4Qjc2IC8qIGxpYldURi5hICovOwogCQkJcHJvZHVjdFR5cGUg PSAiY29tLmFwcGxlLnByb2R1Y3QtdHlwZS5saWJyYXJ5LnN0YXRpYyI7CiAJCX07Ci0JCTY1QUZB MTZGMTYzMEI5NzcwMDNENzIzQyAvKiBDb3B5IFdURiBIZWFkZXJzICovID0gewotCQkJaXNhID0g UEJYTmF0aXZlVGFyZ2V0OwotCQkJYnVpbGRDb25maWd1cmF0aW9uTGlzdCA9IDY1QUZBMjg4MTYz MEI5NzcwMDNENzIzQyAvKiBCdWlsZCBjb25maWd1cmF0aW9uIGxpc3QgZm9yIFBCWE5hdGl2ZVRh cmdldCAiQ29weSBXVEYgSGVhZGVycyIgKi87Ci0JCQlidWlsZFBoYXNlcyA9ICgKLQkJCQk2NUFG QTE3MDE2MzBCOTc3MDAzRDcyM0MgLyogQ29weSBXVEYgSGVhZGVycyAqLywKLQkJCSk7Ci0JCQli dWlsZFJ1bGVzID0gKAotCQkJKTsKLQkJCWRlcGVuZGVuY2llcyA9ICgKLQkJCSk7Ci0JCQluYW1l ID0gIkNvcHkgV1RGIEhlYWRlcnMiOwotCQkJcHJvZHVjdE5hbWUgPSAiQ29weSBXVEYgSGVhZGVy cyI7Ci0JCQlwcm9kdWN0VHlwZSA9ICJjb20uYXBwbGUucHJvZHVjdC10eXBlLnRvb2wiOwotCQl9 OwogLyogRW5kIFBCWE5hdGl2ZVRhcmdldCBzZWN0aW9uICovCiAKIC8qIEJlZ2luIFBCWFByb2pl Y3Qgc2VjdGlvbiAqLwpAQCAtMTQzMywyNSArMTQzNSwyNSBAQAogCQl9OwogCQk2NUFGQTI4OTE2 MzBCOTc3MDAzRDcyM0MgLyogRGVidWcgKi8gPSB7CiAJCQlpc2EgPSBYQ0J1aWxkQ29uZmlndXJh dGlvbjsKLQkJCWJhc2VDb25maWd1cmF0aW9uUmVmZXJlbmNlID0gNUQyNDdCNzMxNDY4OUM0NzAw RTc4Qjc2IC8qIFdURi54Y2NvbmZpZyAqLzsKKwkJCWJhc2VDb25maWd1cmF0aW9uUmVmZXJlbmNl ID0gNjU0MUNBRjMxNjMwRDhGQTAwNkQwREVDIC8qIENvcHlXVEZIZWFkZXIueGNjb25maWcgKi87 CiAJCQlidWlsZFNldHRpbmdzID0gewotCQkJCVBST0RVQ1RfTkFNRSA9ICJXVEYgY29weSI7CisJ CQkJUFJPRFVDVF9OQU1FID0gIiQoVEFSR0VUX05BTUUpIjsKIAkJCX07CiAJCQluYW1lID0gRGVi dWc7CiAJCX07CiAJCTY1QUZBMjhBMTYzMEI5NzcwMDNENzIzQyAvKiBSZWxlYXNlICovID0gewog CQkJaXNhID0gWENCdWlsZENvbmZpZ3VyYXRpb247Ci0JCQliYXNlQ29uZmlndXJhdGlvblJlZmVy ZW5jZSA9IDVEMjQ3QjczMTQ2ODlDNDcwMEU3OEI3NiAvKiBXVEYueGNjb25maWcgKi87CisJCQli YXNlQ29uZmlndXJhdGlvblJlZmVyZW5jZSA9IDY1NDFDQUYzMTYzMEQ4RkEwMDZEMERFQyAvKiBD b3B5V1RGSGVhZGVyLnhjY29uZmlnICovOwogCQkJYnVpbGRTZXR0aW5ncyA9IHsKLQkJCQlQUk9E VUNUX05BTUUgPSAiV1RGIGNvcHkiOworCQkJCVBST0RVQ1RfTkFNRSA9ICIkKFRBUkdFVF9OQU1F KSI7CiAJCQl9OwogCQkJbmFtZSA9IFJlbGVhc2U7CiAJCX07CiAJCTY1QUZBMjhCMTYzMEI5Nzcw MDNENzIzQyAvKiBQcm9kdWN0aW9uICovID0gewogCQkJaXNhID0gWENCdWlsZENvbmZpZ3VyYXRp b247Ci0JCQliYXNlQ29uZmlndXJhdGlvblJlZmVyZW5jZSA9IDVEMjQ3QjczMTQ2ODlDNDcwMEU3 OEI3NiAvKiBXVEYueGNjb25maWcgKi87CisJCQliYXNlQ29uZmlndXJhdGlvblJlZmVyZW5jZSA9 IDY1NDFDQUYzMTYzMEQ4RkEwMDZEMERFQyAvKiBDb3B5V1RGSGVhZGVyLnhjY29uZmlnICovOwog CQkJYnVpbGRTZXR0aW5ncyA9IHsKLQkJCQlQUk9EVUNUX05BTUUgPSAiV1RGIGNvcHkiOworCQkJ CVBST0RVQ1RfTkFNRSA9ICIkKFRBUkdFVF9OQU1FKSI7CiAJCQl9OwogCQkJbmFtZSA9IFByb2R1 Y3Rpb247CiAJCX07CkBAIC0xNDc4LDcgKzE0ODAsNyBAQAogCQkJZGVmYXVsdENvbmZpZ3VyYXRp b25Jc1Zpc2libGUgPSAwOwogCQkJZGVmYXVsdENvbmZpZ3VyYXRpb25OYW1lID0gUHJvZHVjdGlv bjsKIAkJfTsKLQkJNjVBRkEyODgxNjMwQjk3NzAwM0Q3MjNDIC8qIEJ1aWxkIGNvbmZpZ3VyYXRp b24gbGlzdCBmb3IgUEJYTmF0aXZlVGFyZ2V0ICJDb3B5IFdURiBIZWFkZXJzIiAqLyA9IHsKKwkJ NjVBRkEyODgxNjMwQjk3NzAwM0Q3MjNDIC8qIEJ1aWxkIGNvbmZpZ3VyYXRpb24gbGlzdCBmb3Ig UEJYQWdncmVnYXRlVGFyZ2V0ICJDb3B5IFdURiBIZWFkZXJzIiAqLyA9IHsKIAkJCWlzYSA9IFhD Q29uZmlndXJhdGlvbkxpc3Q7CiAJCQlidWlsZENvbmZpZ3VyYXRpb25zID0gKAogCQkJCTY1QUZB Mjg5MTYzMEI5NzcwMDNENzIzQyAvKiBEZWJ1ZyAqLywK