144394 2015-04-29 09:58:35 -0700 [CMake] Automatically expose WTF_USE_FOO to the build when USE_FOO is exposed 2015-04-30 09:18:26 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 mrobinson mrobinson cgarcia gyuyoung.kim mcatanzaro ossy oldest_to_newest 1090042 0 mrobinson 2015-04-29 09:58:35 -0700 When options are presented to the user they are presented in the form USE_FOO, but the WTF USE(...) macro expects WTF_USE_FOO. We can automatically expose WTF_USE_FOO to make some things simpler. 1090055 1 251964 mrobinson 2015-04-29 10:22:22 -0700 Created attachment 251964 Patch 1090057 2 mcatanzaro 2015-04-29 10:28:24 -0700 Nits: You should mention in the changelog that this fixes USE_REDIRECTED_XCOMPOSITE_WINDOW after yesterday's commit, since that's a significant consequence of the change. Also, the comment "when we forget" implies that exposing WTF_USE_WHATEVER is best practice, but after this change I don't see any reason to do that anymore. 1090060 3 251966 mrobinson 2015-04-29 10:35:29 -0700 Created attachment 251966 Patch 1090221 4 mrobinson 2015-04-29 16:34:58 -0700 (In reply to comment #2) > Nits: > > You should mention in the changelog that this fixes > USE_REDIRECTED_XCOMPOSITE_WINDOW after yesterday's commit, since that's a > significant consequence of the change. > > Also, the comment "when we forget" implies that exposing WTF_USE_WHATEVER is > best practice, but after this change I don't see any reason to do that > anymore. Thanks for the comments. I have updated the patch with your suggestions. 1090383 5 251966 cgarcia 2015-04-30 00:44:04 -0700 Comment on attachment 251966 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=251966&action=review > Source/cmake/OptionsGTK.cmake:378 > set(DERIVED_SOURCES_GOBJECT_DOM_BINDINGS_DIR ${DERIVED_SOURCES_DIR}/webkitdom) I guess you can remove SET_AND_EXPOSE_TO_BUILD(WTF_USE_LIBHYPHEN 1) > Source/cmake/WebKitFeatures.cmake:314 > + _ADD_CONFIGURATION_LINE_TO_HEADER_STRING(_file_contents ${_variable_name} ${_variable_name}) > + > + # WebKit looks for WTF_USE_FOO when calling the USE(FOO) macro. Automatically exposing > + # this definition when USE_FOO is exposed, prevents us from having to expose both (or > + # forgetting to do so). > + string(FIND ${_variable_name} "USE_" _use_string_location) > + if (${_use_string_location} EQUAL 0) > + _ADD_CONFIGURATION_LINE_TO_HEADER_STRING(_file_contents ${_variable_name} "WTF_${_variable_name}") This duplicates the USE macros in the cmakeconfig.h, with and without the WTF prefix, but I guess only the prefixed one is useful. I guess we could move the previous _ADD_CONFIGURATION_LINE_TO_HEADER_STRING to and else() here. 1090444 6 mrobinson 2015-04-30 08:47:04 -0700 (In reply to comment #5) > Comment on attachment 251966 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=251966&action=review > > > Source/cmake/OptionsGTK.cmake:378 > > set(DERIVED_SOURCES_GOBJECT_DOM_BINDINGS_DIR ${DERIVED_SOURCES_DIR}/webkitdom) > > I guess you can remove SET_AND_EXPOSE_TO_BUILD(WTF_USE_LIBHYPHEN 1) > Yes, this patch was written before libhyphen integration was complete. :) > > Source/cmake/WebKitFeatures.cmake:314 > > + _ADD_CONFIGURATION_LINE_TO_HEADER_STRING(_file_contents ${_variable_name} ${_variable_name}) > > + > > + # WebKit looks for WTF_USE_FOO when calling the USE(FOO) macro. Automatically exposing > > + # this definition when USE_FOO is exposed, prevents us from having to expose both (or > > + # forgetting to do so). > > + string(FIND ${_variable_name} "USE_" _use_string_location) > > + if (${_use_string_location} EQUAL 0) > > + _ADD_CONFIGURATION_LINE_TO_HEADER_STRING(_file_contents ${_variable_name} "WTF_${_variable_name}") > > This duplicates the USE macros in the cmakeconfig.h, with and without the > WTF prefix, but I guess only the prefixed one is useful. I guess we could > move the previous _ADD_CONFIGURATION_LINE_TO_HEADER_STRING to and else() > here. I waffled a bit on this, so your approach is probably fine too. 1090446 7 mrobinson 2015-04-30 08:53:21 -0700 (In reply to comment #6) > > This duplicates the USE macros in the cmakeconfig.h, with and without the > > WTF prefix, but I guess only the prefixed one is useful. I guess we could > > move the previous _ADD_CONFIGURATION_LINE_TO_HEADER_STRING to and else() > > here. > > I waffled a bit on this, so your approach is probably fine too. Actually, this isn't possible because there is at least one exception. USE_SYSTEM_MALLOC shouldn't have the prefix. I think it's safer to expose both for now. 1090447 8 252060 mrobinson 2015-04-30 08:53:43 -0700 Created attachment 252060 Patch 1090448 9 252060 cgarcia 2015-04-30 09:01:31 -0700 Comment on attachment 252060 Patch Hopefully USE won't require the WTF prefix eventually. 1090451 10 252060 mrobinson 2015-04-30 09:18:22 -0700 Comment on attachment 252060 Patch Clearing flags on attachment: 252060 Committed r183626: <http://trac.webkit.org/changeset/183626> 1090452 11 mrobinson 2015-04-30 09:18:26 -0700 All reviewed patches have been landed. Closing bug. 251964 2015-04-29 10:22:22 -0700 2015-04-29 10:35:25 -0700 Patch bug-144394-20150429102112.patch text/plain 3826 mrobinson U3VidmVyc2lvbiBSZXZpc2lvbjogMTgzNTUwCmRpZmYgLS1naXQgYS9Tb3VyY2UvY21ha2UvT3B0 aW9uc0dUSy5jbWFrZSBiL1NvdXJjZS9jbWFrZS9PcHRpb25zR1RLLmNtYWtlCmluZGV4IDZiZjgy YTIyZjYyZjM3MmU4NDcxNDE3ZjQyZGQwNzUwODAyNDIyYjIuLjAzODM2MzE2YzU1OWIxMGVkMmFm ZmZhYzE2ZmE5NGZlNTk1YzM3MTAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9jbWFrZS9PcHRpb25zR1RL LmNtYWtlCisrKyBiL1NvdXJjZS9jbWFrZS9PcHRpb25zR1RLLmNtYWtlCkBAIC0zNTEsMTQgKzM1 MSwxMiBAQCBpZiAoRU5BQkxFX1ZJREVPIE9SIEVOQUJMRV9XRUJfQVVESU8pCiAgICAgICAgIGlm IChOT1QgUENfR1NUUkVBTUVSX01QRUdUU19GT1VORCkKICAgICAgICAgICAgIG1lc3NhZ2UoRkFU QUxfRVJST1IgIkdTdHJlYW1lciBNUEVHLVRTIGlzIG5lZWRlZCBmb3IgVVNFX0dTVFJFQU1FUl9N UEVHVFMuIikKICAgICAgICAgZW5kaWYgKCkKLSAgICAgICAgU0VUX0FORF9FWFBPU0VfVE9fQlVJ TEQoV1RGX1VTRV9HU1RSRUFNRVJfTVBFR1RTIFRSVUUpCiAgICAgZW5kaWYgKCkKIAogICAgIGlm IChVU0VfR1NUUkVBTUVSX0dMKQogICAgICAgICBpZiAoTk9UIFBDX0dTVFJFQU1FUl9HTF9GT1VO RCkKICAgICAgICAgICAgIG1lc3NhZ2UoRkFUQUxfRVJST1IgIkdTdHJlYW1lckdMIGlzIG5lZWRl ZCBmb3IgVVNFX0dTVFJFQU1FUl9HTC4iKQogICAgICAgICBlbmRpZiAoKQotICAgICAgICBTRVRf QU5EX0VYUE9TRV9UT19CVUlMRChXVEZfVVNFX0dTVFJFQU1FUl9HTCBUUlVFKQogICAgIGVuZGlm ICgpCiBlbmRpZiAoKQogCkBAIC0zNzUsNyArMzczLDYgQEAgaWYgKFVTRV9MSUJOT1RJRlkpCiAg ICAgaWYgKE5PVCBMSUJOT1RJRllfRk9VTkQpCiAgICAgICAgbWVzc2FnZShGQVRBTF9FUlJPUiAi bGlibm90aWZ5IGlzIG5lZWRlZCBmb3IgVVNFX0xJQk5PVElGWS4iKQogICAgIGVuZGlmICgpCi0g ICAgU0VUX0FORF9FWFBPU0VfVE9fQlVJTEQoV1RGX1VTRV9MSUJOT1RJRlkgVFJVRSkKIGVuZGlm ICgpCiAKIHNldChERVJJVkVEX1NPVVJDRVNfR09CSkVDVF9ET01fQklORElOR1NfRElSICR7REVS SVZFRF9TT1VSQ0VTX0RJUn0vd2Via2l0ZG9tKQpkaWZmIC0tZ2l0IGEvU291cmNlL2NtYWtlL1dl YktpdEZlYXR1cmVzLmNtYWtlIGIvU291cmNlL2NtYWtlL1dlYktpdEZlYXR1cmVzLmNtYWtlCmlu ZGV4IDc2YmRiNTcxYTVkNTIxMjk5YTVkMTc4NDczMWU0NTRlMDk0ZDNlNTUuLjMwZTBlNGJhMWFi ZmNkNTY2MDIyNzIxNTUxNTYzOTZkOGZiOGRlZWYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9jbWFrZS9X ZWJLaXRGZWF0dXJlcy5jbWFrZQorKysgYi9Tb3VyY2UvY21ha2UvV2ViS2l0RmVhdHVyZXMuY21h a2UKQEAgLTI5MCwxNSArMjkwLDI4IEBAIG1hY3JvKFNFVF9BTkRfRVhQT1NFX1RPX0JVSUxEIF92 YXJpYWJsZV9uYW1lKQogICAgIEVYUE9TRV9WQVJJQUJMRV9UT19CVUlMRCgke192YXJpYWJsZV9u YW1lfSkKIGVuZG1hY3JvKCkKIAorbWFjcm8oX0FERF9DT05GSUdVUkFUSU9OX0xJTkVfVE9fSEVB REVSX1NUUklORyBfc3RyaW5nIF92YXJpYWJsZV9uYW1lIF9vdXRwdXRfdmFyaWFibGVfbmFtZSkK KyAgICBpZiAoJHske192YXJpYWJsZV9uYW1lfX0pCisgICAgICAgIHNldCgke19zdHJpbmd9ICIk e19maWxlX2NvbnRlbnRzfSNkZWZpbmUgJHtfb3V0cHV0X3ZhcmlhYmxlX25hbWV9IDFcbiIpCisg ICAgZWxzZSAoKQorICAgICAgICBzZXQoJHtfc3RyaW5nfSAiJHtfZmlsZV9jb250ZW50c30jZGVm aW5lICR7X291dHB1dF92YXJpYWJsZV9uYW1lfSAwXG4iKQorICAgIGVuZGlmICgpCitlbmRtYWNy bygpCisKIG1hY3JvKENSRUFURV9DT05GSUdVUkFUSU9OX0hFQURFUikKICAgICBsaXN0KFNPUlQg X1dFQktJVF9DT05GSUdfRklMRV9WQVJJQUJMRVMpCiAgICAgc2V0KF9maWxlX2NvbnRlbnRzICIj aWZuZGVmIENNQUtFQ09ORklHX0hcbiIpCiAgICAgc2V0KF9maWxlX2NvbnRlbnRzICIke19maWxl X2NvbnRlbnRzfSNkZWZpbmUgQ01BS0VDT05GSUdfSFxuXG4iKQorCiAgICAgZm9yZWFjaCAoX3Zh cmlhYmxlX25hbWUgJHtfV0VCS0lUX0NPTkZJR19GSUxFX1ZBUklBQkxFU30pCi0gICAgICAgIGlm ICgkeyR7X3ZhcmlhYmxlX25hbWV9fSkKLSAgICAgICAgICAgIHNldChfZmlsZV9jb250ZW50cyAi JHtfZmlsZV9jb250ZW50c30jZGVmaW5lICR7X3ZhcmlhYmxlX25hbWV9IDFcbiIpCi0gICAgICAg IGVsc2UgKCkKLSAgICAgICAgICAgIHNldChfZmlsZV9jb250ZW50cyAiJHtfZmlsZV9jb250ZW50 c30jZGVmaW5lICR7X3ZhcmlhYmxlX25hbWV9IDBcbiIpCisgICAgICAgIF9BRERfQ09ORklHVVJB VElPTl9MSU5FX1RPX0hFQURFUl9TVFJJTkcoX2ZpbGVfY29udGVudHMgJHtfdmFyaWFibGVfbmFt ZX0gJHtfdmFyaWFibGVfbmFtZX0pCisKKyAgICAgICAgIyBXZWJLaXQgbG9va3MgZm9yIFdURl9V U0VfRk9PIHdoZW4gY2FsbGluZyB0aGUgVVNFKEZPTykgbWFjcm8uIEF1dG9tYXRpY2FsbHkgZXhw b3NpbmcKKyAgICAgICAgIyB0aGlzIGRlZmluaXRpb24gd2hlbiBVU0VfRk9PIGlzIGV4cG9zZWQg Y2FuIGhlbHAgcHJldmVudCBlcnJvcnMgd2hlcmUgd2UgZm9yZ2V0IHRvCisgICAgICAgICMgZG8g dGhpcyBtYW51YWxseS4KKyAgICAgICAgc3RyaW5nKEZJTkQgJHtfdmFyaWFibGVfbmFtZX0gIlVT RV8iIF91c2Vfc3RyaW5nX2xvY2F0aW9uKQorICAgICAgICBpZiAoJHtfdXNlX3N0cmluZ19sb2Nh dGlvbn0gRVFVQUwgMCkKKyAgICAgICAgICAgIF9BRERfQ09ORklHVVJBVElPTl9MSU5FX1RPX0hF QURFUl9TVFJJTkcoX2ZpbGVfY29udGVudHMgJHtfdmFyaWFibGVfbmFtZX0gIldURl8ke192YXJp YWJsZV9uYW1lfSIpCiAgICAgICAgIGVuZGlmICgpCiAgICAgZW5kZm9yZWFjaCAoKQogICAgIHNl dChfZmlsZV9jb250ZW50cyAiJHtfZmlsZV9jb250ZW50c31cbiNlbmRpZiAvKiBDTUFLRUNPTkZJ R19IICovXG4iKQpkaWZmIC0tZ2l0IGEvQ2hhbmdlTG9nIGIvQ2hhbmdlTG9nCmluZGV4IDkyN2Fm M2ZhMThmOTViMDA4MjA5NjJiYTIyNDdhMTQ5YTg2YWU3ZDUuLjMyN2MwOTFjOGZiYjBhNTMxNDlm ODJiODQ2MmQ0ZTJlMGYxZWFlYmEgMTAwNjQ0Ci0tLSBhL0NoYW5nZUxvZworKysgYi9DaGFuZ2VM b2cKQEAgLTEsNSArMSwxNyBAQAogMjAxNS0wNC0yOSAgTWFydGluIFJvYmluc29uICA8bXJvYmlu c29uQGlnYWxpYS5jb20+CiAKKyAgICAgICAgW0NNYWtlXSBBdXRvbWF0aWNhbGx5IGV4cG9zZSBX VEZfVVNFX0ZPTyB0byB0aGUgYnVpbGQgd2hlbiBVU0VfRk9PIGlzIGV4cG9zZWQKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE0NDM5NAorCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogU291cmNlL2NtYWtlL09w dGlvbnNHVEsuY21ha2U6IFdlIG5vIGxvbmdlciBuZWVkIHRvIGV4cG9zZSB0aGUgV1RGXyBwcmVm aXhlZAorICAgICAgICB2ZXJzaW9uIG9mIFVTRSB2YXJpYWJsZXMuCisgICAgICAgICogU291cmNl L2NtYWtlL1dlYktpdEZlYXR1cmVzLmNtYWtlOiBBdXRvbWF0aWNhbGx5IGV4cG9zZSBXVEZfVVNF X0ZPTyB3aGVuIFVTRV9GT08KKyAgICAgICAgaXMgZXhwb3NlZCB0byB0aGUgYnVpbGQuCisKKzIw MTUtMDQtMjkgIE1hcnRpbiBSb2JpbnNvbiAgPG1yb2JpbnNvbkBpZ2FsaWEuY29tPgorCiAgICAg ICAgIFtDTWFrZV0gW0dUS10gT3JnYW5pemUgYW5kIGNsZWFuIHVwIHVudXNlZCBDTWFrZSB2YXJp YWJsZXMKICAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE0 NDM2NAogCg== 251966 2015-04-29 10:35:29 -0700 2015-04-30 08:53:40 -0700 Patch bug-144394-20150429103419.patch text/plain 4089 mrobinson U3VidmVyc2lvbiBSZXZpc2lvbjogMTgzNTUwCmRpZmYgLS1naXQgYS9Tb3VyY2UvY21ha2UvT3B0 aW9uc0dUSy5jbWFrZSBiL1NvdXJjZS9jbWFrZS9PcHRpb25zR1RLLmNtYWtlCmluZGV4IDZiZjgy YTIyZjYyZjM3MmU4NDcxNDE3ZjQyZGQwNzUwODAyNDIyYjIuLjAzODM2MzE2YzU1OWIxMGVkMmFm ZmZhYzE2ZmE5NGZlNTk1YzM3MTAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9jbWFrZS9PcHRpb25zR1RL LmNtYWtlCisrKyBiL1NvdXJjZS9jbWFrZS9PcHRpb25zR1RLLmNtYWtlCkBAIC0zNTEsMTQgKzM1 MSwxMiBAQCBpZiAoRU5BQkxFX1ZJREVPIE9SIEVOQUJMRV9XRUJfQVVESU8pCiAgICAgICAgIGlm IChOT1QgUENfR1NUUkVBTUVSX01QRUdUU19GT1VORCkKICAgICAgICAgICAgIG1lc3NhZ2UoRkFU QUxfRVJST1IgIkdTdHJlYW1lciBNUEVHLVRTIGlzIG5lZWRlZCBmb3IgVVNFX0dTVFJFQU1FUl9N UEVHVFMuIikKICAgICAgICAgZW5kaWYgKCkKLSAgICAgICAgU0VUX0FORF9FWFBPU0VfVE9fQlVJ TEQoV1RGX1VTRV9HU1RSRUFNRVJfTVBFR1RTIFRSVUUpCiAgICAgZW5kaWYgKCkKIAogICAgIGlm IChVU0VfR1NUUkVBTUVSX0dMKQogICAgICAgICBpZiAoTk9UIFBDX0dTVFJFQU1FUl9HTF9GT1VO RCkKICAgICAgICAgICAgIG1lc3NhZ2UoRkFUQUxfRVJST1IgIkdTdHJlYW1lckdMIGlzIG5lZWRl ZCBmb3IgVVNFX0dTVFJFQU1FUl9HTC4iKQogICAgICAgICBlbmRpZiAoKQotICAgICAgICBTRVRf QU5EX0VYUE9TRV9UT19CVUlMRChXVEZfVVNFX0dTVFJFQU1FUl9HTCBUUlVFKQogICAgIGVuZGlm ICgpCiBlbmRpZiAoKQogCkBAIC0zNzUsNyArMzczLDYgQEAgaWYgKFVTRV9MSUJOT1RJRlkpCiAg ICAgaWYgKE5PVCBMSUJOT1RJRllfRk9VTkQpCiAgICAgICAgbWVzc2FnZShGQVRBTF9FUlJPUiAi bGlibm90aWZ5IGlzIG5lZWRlZCBmb3IgVVNFX0xJQk5PVElGWS4iKQogICAgIGVuZGlmICgpCi0g ICAgU0VUX0FORF9FWFBPU0VfVE9fQlVJTEQoV1RGX1VTRV9MSUJOT1RJRlkgVFJVRSkKIGVuZGlm ICgpCiAKIHNldChERVJJVkVEX1NPVVJDRVNfR09CSkVDVF9ET01fQklORElOR1NfRElSICR7REVS SVZFRF9TT1VSQ0VTX0RJUn0vd2Via2l0ZG9tKQpkaWZmIC0tZ2l0IGEvU291cmNlL2NtYWtlL1dl YktpdEZlYXR1cmVzLmNtYWtlIGIvU291cmNlL2NtYWtlL1dlYktpdEZlYXR1cmVzLmNtYWtlCmlu ZGV4IDc2YmRiNTcxYTVkNTIxMjk5YTVkMTc4NDczMWU0NTRlMDk0ZDNlNTUuLmU5NTlmYmY2MWVm ODlkYzYzM2E4NTFjMmE4ZTZmZjU4M2ZjNzQzOTIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9jbWFrZS9X ZWJLaXRGZWF0dXJlcy5jbWFrZQorKysgYi9Tb3VyY2UvY21ha2UvV2ViS2l0RmVhdHVyZXMuY21h a2UKQEAgLTI5MCwxNSArMjkwLDI4IEBAIG1hY3JvKFNFVF9BTkRfRVhQT1NFX1RPX0JVSUxEIF92 YXJpYWJsZV9uYW1lKQogICAgIEVYUE9TRV9WQVJJQUJMRV9UT19CVUlMRCgke192YXJpYWJsZV9u YW1lfSkKIGVuZG1hY3JvKCkKIAorbWFjcm8oX0FERF9DT05GSUdVUkFUSU9OX0xJTkVfVE9fSEVB REVSX1NUUklORyBfc3RyaW5nIF92YXJpYWJsZV9uYW1lIF9vdXRwdXRfdmFyaWFibGVfbmFtZSkK KyAgICBpZiAoJHske192YXJpYWJsZV9uYW1lfX0pCisgICAgICAgIHNldCgke19zdHJpbmd9ICIk e19maWxlX2NvbnRlbnRzfSNkZWZpbmUgJHtfb3V0cHV0X3ZhcmlhYmxlX25hbWV9IDFcbiIpCisg ICAgZWxzZSAoKQorICAgICAgICBzZXQoJHtfc3RyaW5nfSAiJHtfZmlsZV9jb250ZW50c30jZGVm aW5lICR7X291dHB1dF92YXJpYWJsZV9uYW1lfSAwXG4iKQorICAgIGVuZGlmICgpCitlbmRtYWNy bygpCisKIG1hY3JvKENSRUFURV9DT05GSUdVUkFUSU9OX0hFQURFUikKICAgICBsaXN0KFNPUlQg X1dFQktJVF9DT05GSUdfRklMRV9WQVJJQUJMRVMpCiAgICAgc2V0KF9maWxlX2NvbnRlbnRzICIj aWZuZGVmIENNQUtFQ09ORklHX0hcbiIpCiAgICAgc2V0KF9maWxlX2NvbnRlbnRzICIke19maWxl X2NvbnRlbnRzfSNkZWZpbmUgQ01BS0VDT05GSUdfSFxuXG4iKQorCiAgICAgZm9yZWFjaCAoX3Zh cmlhYmxlX25hbWUgJHtfV0VCS0lUX0NPTkZJR19GSUxFX1ZBUklBQkxFU30pCi0gICAgICAgIGlm ICgkeyR7X3ZhcmlhYmxlX25hbWV9fSkKLSAgICAgICAgICAgIHNldChfZmlsZV9jb250ZW50cyAi JHtfZmlsZV9jb250ZW50c30jZGVmaW5lICR7X3ZhcmlhYmxlX25hbWV9IDFcbiIpCi0gICAgICAg IGVsc2UgKCkKLSAgICAgICAgICAgIHNldChfZmlsZV9jb250ZW50cyAiJHtfZmlsZV9jb250ZW50 c30jZGVmaW5lICR7X3ZhcmlhYmxlX25hbWV9IDBcbiIpCisgICAgICAgIF9BRERfQ09ORklHVVJB VElPTl9MSU5FX1RPX0hFQURFUl9TVFJJTkcoX2ZpbGVfY29udGVudHMgJHtfdmFyaWFibGVfbmFt ZX0gJHtfdmFyaWFibGVfbmFtZX0pCisKKyAgICAgICAgIyBXZWJLaXQgbG9va3MgZm9yIFdURl9V U0VfRk9PIHdoZW4gY2FsbGluZyB0aGUgVVNFKEZPTykgbWFjcm8uIEF1dG9tYXRpY2FsbHkgZXhw b3NpbmcKKyAgICAgICAgIyB0aGlzIGRlZmluaXRpb24gd2hlbiBVU0VfRk9PIGlzIGV4cG9zZWQs IHByZXZlbnRzIHVzIGZyb20gaGF2aW5nIHRvIGV4cG9zZSBib3RoIChvcgorICAgICAgICAjIGZv cmdldHRpbmcgdG8gZG8gc28pLgorICAgICAgICBzdHJpbmcoRklORCAke192YXJpYWJsZV9uYW1l fSAiVVNFXyIgX3VzZV9zdHJpbmdfbG9jYXRpb24pCisgICAgICAgIGlmICgke191c2Vfc3RyaW5n X2xvY2F0aW9ufSBFUVVBTCAwKQorICAgICAgICAgICAgX0FERF9DT05GSUdVUkFUSU9OX0xJTkVf VE9fSEVBREVSX1NUUklORyhfZmlsZV9jb250ZW50cyAke192YXJpYWJsZV9uYW1lfSAiV1RGXyR7 X3ZhcmlhYmxlX25hbWV9IikKICAgICAgICAgZW5kaWYgKCkKICAgICBlbmRmb3JlYWNoICgpCiAg ICAgc2V0KF9maWxlX2NvbnRlbnRzICIke19maWxlX2NvbnRlbnRzfVxuI2VuZGlmIC8qIENNQUtF Q09ORklHX0ggKi9cbiIpCmRpZmYgLS1naXQgYS9DaGFuZ2VMb2cgYi9DaGFuZ2VMb2cKaW5kZXgg OTI3YWYzZmExOGY5NWIwMDgyMDk2MmJhMjI0N2ExNDlhODZhZTdkNS4uOWI1YjhkN2I0ZDFiYjk0 OWIyZmVjYmU1MTVhMzEwNWQyMGNmZTdkMyAxMDA2NDQKLS0tIGEvQ2hhbmdlTG9nCisrKyBiL0No YW5nZUxvZwpAQCAtMSw1ICsxLDIxIEBACiAyMDE1LTA0LTI5ICBNYXJ0aW4gUm9iaW5zb24gIDxt cm9iaW5zb25AaWdhbGlhLmNvbT4KIAorICAgICAgICBbQ01ha2VdIEF1dG9tYXRpY2FsbHkgZXhw b3NlIFdURl9VU0VfRk9PIHRvIHRoZSBidWlsZCB3aGVuIFVTRV9GT08gaXMgZXhwb3NlZAorICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTQ0Mzk0CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQXV0b21hdGljYWxs eSBleHBvc2UgV1RGX1VTRV9GT08gd2hlbiBVU0VfRk9PIGlzIGV4cG9zZWQuIEEgc2lkZS1lZmZl Y3Qgb2YgdGhpcyBjaGFuZ2UKKyAgICAgICAgaXMgdGhhdCBpdCBmaXhlcyB0aGUgcmVkaXJlY3Rl ZCBYQ29tcG9zaXRlIHdpbmRvdyBmb3IgR1RLKywgd2hpY2ggd2FzIGFjY2lkZW50YWxseQorICAg ICAgICBkaXNhYmxlZCBpbiBwcmV2aW91cyByZXdvcmtpbmcgb2YgdGhlIENNYWtlIGNvbmZpZ3Vy YXRpb24uCisKKyAgICAgICAgKiBTb3VyY2UvY21ha2UvT3B0aW9uc0dUSy5jbWFrZTogV2Ugbm8g bG9uZ2VyIG5lZWQgdG8gZXhwb3NlIHRoZSBXVEZfIHByZWZpeGVkCisgICAgICAgIHZlcnNpb24g b2YgVVNFIHZhcmlhYmxlcy4KKyAgICAgICAgKiBTb3VyY2UvY21ha2UvV2ViS2l0RmVhdHVyZXMu Y21ha2U6IEF1dG9tYXRpY2FsbHkgZXhwb3NlIFdURl9VU0VfRk9PIHdoZW4gVVNFX0ZPTworICAg ICAgICBpcyBleHBvc2VkIHRvIHRoZSBidWlsZC4KKworMjAxNS0wNC0yOSAgTWFydGluIFJvYmlu c29uICA8bXJvYmluc29uQGlnYWxpYS5jb20+CisKICAgICAgICAgW0NNYWtlXSBbR1RLXSBPcmdh bml6ZSBhbmQgY2xlYW4gdXAgdW51c2VkIENNYWtlIHZhcmlhYmxlcwogICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTQ0MzY0CiAK 252060 2015-04-30 08:53:43 -0700 2015-04-30 09:18:22 -0700 Patch bug-144394-20150430085232.patch text/plain 4246 mrobinson U3VidmVyc2lvbiBSZXZpc2lvbjogMTgzNjI1CmRpZmYgLS1naXQgYS9Tb3VyY2UvY21ha2UvT3B0 aW9uc0dUSy5jbWFrZSBiL1NvdXJjZS9jbWFrZS9PcHRpb25zR1RLLmNtYWtlCmluZGV4IDAwNTQ2 YWUwOWNhM2EyZGUwMTJjMmY2OGNiZjg4YzJhODk0ZDhkNmEuLmMxOWI5NjFjMmE5OTY2ZWMxMWNi YjY1MWYyMmZkMzIyZGM3NWY0M2QgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9jbWFrZS9PcHRpb25zR1RL LmNtYWtlCisrKyBiL1NvdXJjZS9jbWFrZS9PcHRpb25zR1RLLmNtYWtlCkBAIC0zNTIsMTQgKzM1 MiwxMiBAQCBpZiAoRU5BQkxFX1ZJREVPIE9SIEVOQUJMRV9XRUJfQVVESU8pCiAgICAgICAgIGlm IChOT1QgUENfR1NUUkVBTUVSX01QRUdUU19GT1VORCkKICAgICAgICAgICAgIG1lc3NhZ2UoRkFU QUxfRVJST1IgIkdTdHJlYW1lciBNUEVHLVRTIGlzIG5lZWRlZCBmb3IgVVNFX0dTVFJFQU1FUl9N UEVHVFMuIikKICAgICAgICAgZW5kaWYgKCkKLSAgICAgICAgU0VUX0FORF9FWFBPU0VfVE9fQlVJ TEQoV1RGX1VTRV9HU1RSRUFNRVJfTVBFR1RTIFRSVUUpCiAgICAgZW5kaWYgKCkKIAogICAgIGlm IChVU0VfR1NUUkVBTUVSX0dMKQogICAgICAgICBpZiAoTk9UIFBDX0dTVFJFQU1FUl9HTF9GT1VO RCkKICAgICAgICAgICAgIG1lc3NhZ2UoRkFUQUxfRVJST1IgIkdTdHJlYW1lckdMIGlzIG5lZWRl ZCBmb3IgVVNFX0dTVFJFQU1FUl9HTC4iKQogICAgICAgICBlbmRpZiAoKQotICAgICAgICBTRVRf QU5EX0VYUE9TRV9UT19CVUlMRChXVEZfVVNFX0dTVFJFQU1FUl9HTCBUUlVFKQogICAgIGVuZGlm ICgpCiBlbmRpZiAoKQogCkBAIC0zNzYsNyArMzc0LDYgQEAgaWYgKFVTRV9MSUJOT1RJRlkpCiAg ICAgaWYgKE5PVCBMSUJOT1RJRllfRk9VTkQpCiAgICAgICAgbWVzc2FnZShGQVRBTF9FUlJPUiAi bGlibm90aWZ5IGlzIG5lZWRlZCBmb3IgVVNFX0xJQk5PVElGWS4iKQogICAgIGVuZGlmICgpCi0g ICAgU0VUX0FORF9FWFBPU0VfVE9fQlVJTEQoV1RGX1VTRV9MSUJOT1RJRlkgVFJVRSkKIGVuZGlm ICgpCiAKIGlmIChVU0VfTElCSFlQSEVOKQpAQCAtMzg0LDcgKzM4MSw2IEBAIGlmIChVU0VfTElC SFlQSEVOKQogICAgIGlmIChOT1QgSFlQSEVOX0ZPVU5EKQogICAgICAgIG1lc3NhZ2UoRkFUQUxf RVJST1IgImxpYmh5cGhlbiBpcyBuZWVkZWQgZm9yIFVTRV9MSUJIWVBIRU4uIikKICAgICBlbmRp ZiAoKQotICAgIFNFVF9BTkRfRVhQT1NFX1RPX0JVSUxEKFdURl9VU0VfTElCSFlQSEVOIDEpCiBl bmRpZiAoKQogCiBzZXQoREVSSVZFRF9TT1VSQ0VTX0dPQkpFQ1RfRE9NX0JJTkRJTkdTX0RJUiAk e0RFUklWRURfU09VUkNFU19ESVJ9L3dlYmtpdGRvbSkKZGlmZiAtLWdpdCBhL1NvdXJjZS9jbWFr ZS9XZWJLaXRGZWF0dXJlcy5jbWFrZSBiL1NvdXJjZS9jbWFrZS9XZWJLaXRGZWF0dXJlcy5jbWFr ZQppbmRleCA3NmJkYjU3MWE1ZDUyMTI5OWE1ZDE3ODQ3MzFlNDU0ZTA5NGQzZTU1Li5lOTU5ZmJm NjFlZjg5ZGM2MzNhODUxYzJhOGU2ZmY1ODNmYzc0MzkyIDEwMDY0NAotLS0gYS9Tb3VyY2UvY21h a2UvV2ViS2l0RmVhdHVyZXMuY21ha2UKKysrIGIvU291cmNlL2NtYWtlL1dlYktpdEZlYXR1cmVz LmNtYWtlCkBAIC0yOTAsMTUgKzI5MCwyOCBAQCBtYWNybyhTRVRfQU5EX0VYUE9TRV9UT19CVUlM RCBfdmFyaWFibGVfbmFtZSkKICAgICBFWFBPU0VfVkFSSUFCTEVfVE9fQlVJTEQoJHtfdmFyaWFi bGVfbmFtZX0pCiBlbmRtYWNybygpCiAKK21hY3JvKF9BRERfQ09ORklHVVJBVElPTl9MSU5FX1RP X0hFQURFUl9TVFJJTkcgX3N0cmluZyBfdmFyaWFibGVfbmFtZSBfb3V0cHV0X3ZhcmlhYmxlX25h bWUpCisgICAgaWYgKCR7JHtfdmFyaWFibGVfbmFtZX19KQorICAgICAgICBzZXQoJHtfc3RyaW5n fSAiJHtfZmlsZV9jb250ZW50c30jZGVmaW5lICR7X291dHB1dF92YXJpYWJsZV9uYW1lfSAxXG4i KQorICAgIGVsc2UgKCkKKyAgICAgICAgc2V0KCR7X3N0cmluZ30gIiR7X2ZpbGVfY29udGVudHN9 I2RlZmluZSAke19vdXRwdXRfdmFyaWFibGVfbmFtZX0gMFxuIikKKyAgICBlbmRpZiAoKQorZW5k bWFjcm8oKQorCiBtYWNybyhDUkVBVEVfQ09ORklHVVJBVElPTl9IRUFERVIpCiAgICAgbGlzdChT T1JUIF9XRUJLSVRfQ09ORklHX0ZJTEVfVkFSSUFCTEVTKQogICAgIHNldChfZmlsZV9jb250ZW50 cyAiI2lmbmRlZiBDTUFLRUNPTkZJR19IXG4iKQogICAgIHNldChfZmlsZV9jb250ZW50cyAiJHtf ZmlsZV9jb250ZW50c30jZGVmaW5lIENNQUtFQ09ORklHX0hcblxuIikKKwogICAgIGZvcmVhY2gg KF92YXJpYWJsZV9uYW1lICR7X1dFQktJVF9DT05GSUdfRklMRV9WQVJJQUJMRVN9KQotICAgICAg ICBpZiAoJHske192YXJpYWJsZV9uYW1lfX0pCi0gICAgICAgICAgICBzZXQoX2ZpbGVfY29udGVu dHMgIiR7X2ZpbGVfY29udGVudHN9I2RlZmluZSAke192YXJpYWJsZV9uYW1lfSAxXG4iKQotICAg ICAgICBlbHNlICgpCi0gICAgICAgICAgICBzZXQoX2ZpbGVfY29udGVudHMgIiR7X2ZpbGVfY29u dGVudHN9I2RlZmluZSAke192YXJpYWJsZV9uYW1lfSAwXG4iKQorICAgICAgICBfQUREX0NPTkZJ R1VSQVRJT05fTElORV9UT19IRUFERVJfU1RSSU5HKF9maWxlX2NvbnRlbnRzICR7X3ZhcmlhYmxl X25hbWV9ICR7X3ZhcmlhYmxlX25hbWV9KQorCisgICAgICAgICMgV2ViS2l0IGxvb2tzIGZvciBX VEZfVVNFX0ZPTyB3aGVuIGNhbGxpbmcgdGhlIFVTRShGT08pIG1hY3JvLiBBdXRvbWF0aWNhbGx5 IGV4cG9zaW5nCisgICAgICAgICMgdGhpcyBkZWZpbml0aW9uIHdoZW4gVVNFX0ZPTyBpcyBleHBv c2VkLCBwcmV2ZW50cyB1cyBmcm9tIGhhdmluZyB0byBleHBvc2UgYm90aCAob3IKKyAgICAgICAg IyBmb3JnZXR0aW5nIHRvIGRvIHNvKS4KKyAgICAgICAgc3RyaW5nKEZJTkQgJHtfdmFyaWFibGVf bmFtZX0gIlVTRV8iIF91c2Vfc3RyaW5nX2xvY2F0aW9uKQorICAgICAgICBpZiAoJHtfdXNlX3N0 cmluZ19sb2NhdGlvbn0gRVFVQUwgMCkKKyAgICAgICAgICAgIF9BRERfQ09ORklHVVJBVElPTl9M SU5FX1RPX0hFQURFUl9TVFJJTkcoX2ZpbGVfY29udGVudHMgJHtfdmFyaWFibGVfbmFtZX0gIldU Rl8ke192YXJpYWJsZV9uYW1lfSIpCiAgICAgICAgIGVuZGlmICgpCiAgICAgZW5kZm9yZWFjaCAo KQogICAgIHNldChfZmlsZV9jb250ZW50cyAiJHtfZmlsZV9jb250ZW50c31cbiNlbmRpZiAvKiBD TUFLRUNPTkZJR19IICovXG4iKQpkaWZmIC0tZ2l0IGEvQ2hhbmdlTG9nIGIvQ2hhbmdlTG9nCmlu ZGV4IDkwNTIyNDI1YzNiOGE1YzVlNThmMDRkOGMzOTZhMDU1NDY3YWYwMzkuLjFjMTlhYTQyMDZi ZWRlNDBiNWY3YTM1NDU5NmJkN2JjY2QzMTc2YTQgMTAwNjQ0Ci0tLSBhL0NoYW5nZUxvZworKysg Yi9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxOSBAQAorMjAxNS0wNC0yOSAgTWFydGluIFJvYmluc29u ICA8bXJvYmluc29uQGlnYWxpYS5jb20+CisKKyAgICAgICAgW0NNYWtlXSBBdXRvbWF0aWNhbGx5 IGV4cG9zZSBXVEZfVVNFX0ZPTyB0byB0aGUgYnVpbGQgd2hlbiBVU0VfRk9PIGlzIGV4cG9zZWQK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE0NDM5NAor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEF1dG9tYXRp Y2FsbHkgZXhwb3NlIFdURl9VU0VfRk9PIHdoZW4gVVNFX0ZPTyBpcyBleHBvc2VkLiBBIHNpZGUt ZWZmZWN0IG9mIHRoaXMgY2hhbmdlCisgICAgICAgIGlzIHRoYXQgaXQgZml4ZXMgdGhlIHJlZGly ZWN0ZWQgWENvbXBvc2l0ZSB3aW5kb3cgZm9yIEdUSyssIHdoaWNoIHdhcyBhY2NpZGVudGFsbHkK KyAgICAgICAgZGlzYWJsZWQgaW4gcHJldmlvdXMgcmV3b3JraW5nIG9mIHRoZSBDTWFrZSBjb25m aWd1cmF0aW9uLgorCisgICAgICAgICogU291cmNlL2NtYWtlL09wdGlvbnNHVEsuY21ha2U6IFdl IG5vIGxvbmdlciBuZWVkIHRvIGV4cG9zZSB0aGUgV1RGXyBwcmVmaXhlZAorICAgICAgICB2ZXJz aW9uIG9mIFVTRSB2YXJpYWJsZXMuCisgICAgICAgICogU291cmNlL2NtYWtlL1dlYktpdEZlYXR1 cmVzLmNtYWtlOiBBdXRvbWF0aWNhbGx5IGV4cG9zZSBXVEZfVVNFX0ZPTyB3aGVuIFVTRV9GT08K KyAgICAgICAgaXMgZXhwb3NlZCB0byB0aGUgYnVpbGQuCisKIDIwMTUtMDQtMzAgIENhcmxvcyBH YXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29tPgogCiAgICAgICAgIFVucmV2aWV3ZWQu IEJ1bXAgR1RLKyB2ZXJzaW9uIG51bWJlcnMuCg==