143839 2015-04-16 12:27:40 -0700 [CMake] Should be possible for an option to depend on multiple options 2015-04-23 12:57:22 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) PC Linux RESOLVED FIXED P2 Enhancement --- 143831 143956 1 mcatanzaro mcatanzaro cgarcia mcatanzaro mrobinson ossy oldest_to_newest 1086016 0 mcatanzaro 2015-04-16 12:27:40 -0700 Currently it's not possible for an option to depend on more than one other option. This makes it awkward to manually check whether the combination of available options is valid. For example, my patch in bug #143558 uses the following code: WEBKIT_OPTION_DEPEND(USE_GSTREAMER_GL ENABLE_VIDEO) WEBKIT_OPTION_DEPEND(USE_GSTREAMER_GL USE_OPENGL) WEBKIT_OPTION_DEPEND(USE_REDIRECTED_XCOMPOSITE_WINDOW ENABLE_X11_TARGET) WEBKIT_OPTION_DEPEND(USE_REDIRECTED_XCOMPOSITE_WINDOW USE_OPENGL) It would be nice if that worked as expected. The current behavior is that the most recent call to WEBKIT_OPTION_DEPEND overrides the previous call. 1086022 1 250939 mcatanzaro 2015-04-16 12:39:22 -0700 Created attachment 250939 Patch 1086857 2 251177 mcatanzaro 2015-04-20 11:50:02 -0700 Created attachment 251177 [CMake] Should be possible for an option to depend on multiple options 1087384 3 251318 mcatanzaro 2015-04-22 08:30:07 -0700 Created attachment 251318 Patch 1087482 4 251318 mrobinson 2015-04-22 11:42:02 -0700 Comment on attachment 251318 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=251318&action=review Looks good to me. Small suggestion for a cleanup: > Source/cmake/WebKitFeatures.cmake:185 > +macro(_WEBKIT_OPTION_ENFORCE_DEPENDS) > + set(_OPTION_CHANGED TRUE) > + while (${_OPTION_CHANGED}) > + set(_OPTION_CHANGED FALSE) > + foreach (_name ${_WEBKIT_AVAILABLE_OPTIONS}) > + if (${_name}) > + foreach (_dependency ${_WEBKIT_AVAILABLE_OPTIONS_${_name}_DEPENDENCIES}) > + if (NOT ${_dependency}) > + message(STATUS "Disabling ${_name} since ${_dependency} is disabled.") > + set(${_name} OFF) > + set(_OPTION_CHANGED TRUE) > + break () > + endif () > + endforeach () > + endif () > + endforeach () > + endwhile () > +endmacro() You could eliminate the outer loop by running this macro for every option and passing the option name as an argument. I think that would simplify things quite a bit. > Source/cmake/WebKitFeatures.cmake:190 > list(SORT _WEBKIT_AVAILABLE_OPTIONS) > + > set(_MAX_FEATURE_LENGTH 0) This newline looks unrelated. 1087836 5 251440 mcatanzaro 2015-04-23 08:57:52 -0700 Created attachment 251440 [CMake] Should be possible for an option to conflict with other options 1087838 6 251442 mcatanzaro 2015-04-23 09:00:11 -0700 Created attachment 251442 [CMake] Should be possible for an option to depend on multiple options 1087940 7 251442 mcatanzaro 2015-04-23 12:43:43 -0700 Comment on attachment 251442 [CMake] Should be possible for an option to depend on multiple options Clearing flags on attachment: 251442 Committed r183202: <http://trac.webkit.org/changeset/183202> 1087941 8 mcatanzaro 2015-04-23 12:43:48 -0700 All reviewed patches have been landed. Closing bug. 250939 2015-04-16 12:39:22 -0700 2015-04-20 11:49:59 -0700 Patch bug-143839-20150416143823.patch text/plain 2650 mcatanzaro U3VidmVyc2lvbiBSZXZpc2lvbjogMTgyODkxCmRpZmYgLS1naXQgYS9Tb3VyY2UvY21ha2UvV2Vi S2l0RmVhdHVyZXMuY21ha2UgYi9Tb3VyY2UvY21ha2UvV2ViS2l0RmVhdHVyZXMuY21ha2UKaW5k ZXggYTdlMDMzOTA5NzUwMGY4MWZlMjQ5YjI1ZTlhM2NhZWI5MTA5YTIxMC4uMjA0MTQ1NzM3NDBk NjY1ZmRhNGJiZjFlNjdkY2EzNDNhOTNlYmRiYiAxMDA2NDQKLS0tIGEvU291cmNlL2NtYWtlL1dl YktpdEZlYXR1cmVzLmNtYWtlCisrKyBiL1NvdXJjZS9jbWFrZS9XZWJLaXRGZWF0dXJlcy5jbWFr ZQpAQCAtNyw2ICs3LDcgQEAgbWFjcm8oV0VCS0lUX09QVElPTl9ERUZJTkUgX25hbWUgX2Rlc2Ny aXB0aW9uIF9wdWJsaWMgX2luaXRpYWxfdmFsdWUpCiAgICAgc2V0KF9XRUJLSVRfQVZBSUxBQkxF X09QVElPTlNfREVTQ1JJUFRJT05fJHtfbmFtZX0gJHtfZGVzY3JpcHRpb259KQogICAgIHNldChf V0VCS0lUX0FWQUlMQUJMRV9PUFRJT05TX0lTX1BVQkxJQ18ke19uYW1lfSAke19wdWJsaWN9KQog ICAgIHNldChfV0VCS0lUX0FWQUlMQUJMRV9PUFRJT05TX0lOSVRJQUxfVkFMVUVfJHtfbmFtZX0g JHtfaW5pdGlhbF92YWx1ZX0pCisgICAgc2V0KF9XRUJLSVRfQVZBSUxBQkxFX09QVElPTlNfJHtf bmFtZX1fREVQRU5ERU5DSUVTICIiKQogICAgIGxpc3QoQVBQRU5EIF9XRUJLSVRfQVZBSUxBQkxF X09QVElPTlMgJHtfbmFtZX0pCiBlbmRtYWNybygpCiAKQEAgLTE2LDcgKzE3LDcgQEAgbWFjcm8o V0VCS0lUX09QVElPTl9ERUZBVUxUX1BPUlRfVkFMVUUgX25hbWUgX3B1YmxpYyBfdmFsdWUpCiBl bmRtYWNybygpCiAKIG1hY3JvKFdFQktJVF9PUFRJT05fREVQRU5EIF9uYW1lIF9kZXBlbmQpCi0g ICAgc2V0KF9XRUJLSVRfQVZBSUxBQkxFX09QVElPTlNfREVQRU5ERU5DWV9PRl8ke19uYW1lfSAk e19kZXBlbmR9KQorICAgIGxpc3QoQVBQRU5EIF9XRUJLSVRfQVZBSUxBQkxFX09QVElPTlNfJHtf bmFtZX1fREVQRU5ERU5DSUVTICR7X2RlcGVuZH0pCiBlbmRtYWNybygpCiAKIG1hY3JvKFdFQktJ VF9PUFRJT05fQkVHSU4pCkBAIC0xNzcsMTEgKzE3OCwxNCBAQCBtYWNybyhXRUJLSVRfT1BUSU9O X0VORCkKICAgICAgICAgICAgIG1hcmtfYXNfYWR2YW5jZWQoRk9SQ0UgJHtfbmFtZX0pCiAgICAg ICAgIGVuZGlmICgpCiAKLSAgICAgICAgaWYgKCR7X25hbWV9IEFORCBERUZJTkVEIF9XRUJLSVRf QVZBSUxBQkxFX09QVElPTlNfREVQRU5ERU5DWV9PRl8ke19uYW1lfSkKLSAgICAgICAgICAgIGlm IChOT1QgJHske19XRUJLSVRfQVZBSUxBQkxFX09QVElPTlNfREVQRU5ERU5DWV9PRl8ke19uYW1l fX19KQotICAgICAgICAgICAgICAgIG1lc3NhZ2UoU1RBVFVTICJEaXNhYmxpbmcgJHtfbmFtZX0g c2luY2UgJHtfV0VCS0lUX0FWQUlMQUJMRV9PUFRJT05TX0RFUEVOREVOQ1lfT0ZfJHtfbmFtZX19 IHN1cHBvcnQgaXMgZGlzYWJsZWQuIikKLSAgICAgICAgICAgICAgICBzZXQoJHtfbmFtZX0gT0ZG KQotICAgICAgICAgICAgZW5kaWYgKCkKKyAgICAgICAgaWYgKCR7X25hbWV9KQorICAgICAgICAg ICAgZm9yZWFjaCAoX2RlcGVuZGVuY3kgJHtfV0VCS0lUX0FWQUlMQUJMRV9PUFRJT05TXyR7X25h bWV9X0RFUEVOREVOQ0lFU30pCisgICAgICAgICAgICAgICAgaWYgKE5PVCAke19kZXBlbmRlbmN5 fSkKKyAgICAgICAgICAgICAgICAgICAgbWVzc2FnZShTVEFUVVMgIkRpc2FibGluZyAke19uYW1l fSBzaW5jZSAke19kZXBlbmRlbmN5fSBpcyBkaXNhYmxlZC4iKQorICAgICAgICAgICAgICAgICAg ICBzZXQoJHtfbmFtZX0gT0ZGKQorICAgICAgICAgICAgICAgICAgICBicmVhayAoKQorICAgICAg ICAgICAgICAgIGVuZGlmICgpCisgICAgICAgICAgICBlbmRmb3JlYWNoICgpCiAgICAgICAgIGVu ZGlmICgpCiAKICAgICAgICAgaWYgKCR7X25hbWV9KQpkaWZmIC0tZ2l0IGEvQ2hhbmdlTG9nIGIv Q2hhbmdlTG9nCmluZGV4IGU5N2E4MzkwZmZhZDhiZjhkMjQ3NDhmZTBhMTcwOWIwY2M0NjhiNzAu LjcwZTRhZDY4ZjZiZTNlMWY1ZGMzNzljZWE1ZGVkZGU1OWFlYjc3YjMgMTAwNjQ0Ci0tLSBhL0No YW5nZUxvZworKysgYi9DaGFuZ2VMb2cKQEAgLTEsNSArMSwxNiBAQAogMjAxNS0wNC0xNiAgTWlj aGFlbCBDYXRhbnphcm8gIDxtY2F0YW56YXJvQGlnYWxpYS5jb20+CiAKKyAgICAgICAgW0NNYWtl XSBTaG91bGQgYmUgcG9zc2libGUgZm9yIGFuIG9wdGlvbiB0byBkZXBlbmQgb24gbXVsdGlwbGUg b3B0aW9ucworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MTQzODM5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg VXNlIGEgbGlzdCBpbnN0ZWFkIG9mIGEgc2luZ2xlIHZhcmlhYmxlIHRvIHRyYWNrIHRoZSBkZXBl bmRlbmNpZXMgb2YgZWFjaCBvcHRpb24uCisKKyAgICAgICAgKiBTb3VyY2UvY21ha2UvV2ViS2l0 RmVhdHVyZXMuY21ha2U6CisKKzIwMTUtMDQtMTYgIE1pY2hhZWwgQ2F0YW56YXJvICA8bWNhdGFu emFyb0BpZ2FsaWEuY29tPgorCiAgICAgICAgIFtDTWFrZV0gRmVhdHVyZXMgbGlzdCBzaG91bGQg cHJpbnQgZG90cyBldmVyeSBvdGhlciByb3cKICAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTE0MzgzMgogCg== 251177 2015-04-20 11:50:02 -0700 2015-04-22 08:30:04 -0700 [CMake] Should be possible for an option to depend on multiple options bug-143839-20150420134900.patch text/plain 3013 mcatanzaro U3VidmVyc2lvbiBSZXZpc2lvbjogMTgyODkxCmRpZmYgLS1naXQgYS9Tb3VyY2UvY21ha2UvV2Vi S2l0RmVhdHVyZXMuY21ha2UgYi9Tb3VyY2UvY21ha2UvV2ViS2l0RmVhdHVyZXMuY21ha2UKaW5k ZXggYTdlMDMzOTA5NzUwMGY4MWZlMjQ5YjI1ZTlhM2NhZWI5MTA5YTIxMC4uNjcwNGY0YTQ0MmQ5 NjRmMDc4OGU0ZGI4NzhkZDBkM2U5OTVmNWJlYiAxMDA2NDQKLS0tIGEvU291cmNlL2NtYWtlL1dl YktpdEZlYXR1cmVzLmNtYWtlCisrKyBiL1NvdXJjZS9jbWFrZS9XZWJLaXRGZWF0dXJlcy5jbWFr ZQpAQCAtNyw2ICs3LDcgQEAgbWFjcm8oV0VCS0lUX09QVElPTl9ERUZJTkUgX25hbWUgX2Rlc2Ny aXB0aW9uIF9wdWJsaWMgX2luaXRpYWxfdmFsdWUpCiAgICAgc2V0KF9XRUJLSVRfQVZBSUxBQkxF X09QVElPTlNfREVTQ1JJUFRJT05fJHtfbmFtZX0gJHtfZGVzY3JpcHRpb259KQogICAgIHNldChf V0VCS0lUX0FWQUlMQUJMRV9PUFRJT05TX0lTX1BVQkxJQ18ke19uYW1lfSAke19wdWJsaWN9KQog ICAgIHNldChfV0VCS0lUX0FWQUlMQUJMRV9PUFRJT05TX0lOSVRJQUxfVkFMVUVfJHtfbmFtZX0g JHtfaW5pdGlhbF92YWx1ZX0pCisgICAgc2V0KF9XRUJLSVRfQVZBSUxBQkxFX09QVElPTlNfJHtf bmFtZX1fREVQRU5ERU5DSUVTICIiKQogICAgIGxpc3QoQVBQRU5EIF9XRUJLSVRfQVZBSUxBQkxF X09QVElPTlMgJHtfbmFtZX0pCiBlbmRtYWNybygpCiAKQEAgLTE2LDcgKzE3LDcgQEAgbWFjcm8o V0VCS0lUX09QVElPTl9ERUZBVUxUX1BPUlRfVkFMVUUgX25hbWUgX3B1YmxpYyBfdmFsdWUpCiBl bmRtYWNybygpCiAKIG1hY3JvKFdFQktJVF9PUFRJT05fREVQRU5EIF9uYW1lIF9kZXBlbmQpCi0g ICAgc2V0KF9XRUJLSVRfQVZBSUxBQkxFX09QVElPTlNfREVQRU5ERU5DWV9PRl8ke19uYW1lfSAk e19kZXBlbmR9KQorICAgIGxpc3QoQVBQRU5EIF9XRUJLSVRfQVZBSUxBQkxFX09QVElPTlNfJHtf bmFtZX1fREVQRU5ERU5DSUVTICR7X2RlcGVuZH0pCiBlbmRtYWNybygpCiAKIG1hY3JvKFdFQktJ VF9PUFRJT05fQkVHSU4pCkBAIC0xNjUsNiArMTY2LDcgQEAgZW5kbWFjcm8oKQogCiBtYWNybyhX RUJLSVRfT1BUSU9OX0VORCkKICAgICBsaXN0KFNPUlQgX1dFQktJVF9BVkFJTEFCTEVfT1BUSU9O UykKKwogICAgIHNldChfTUFYX0ZFQVRVUkVfTEVOR1RIIDApCiAgICAgZm9yZWFjaCAoX25hbWUg JHtfV0VCS0lUX0FWQUlMQUJMRV9PUFRJT05TfSkKICAgICAgICAgc3RyaW5nKExFTkdUSCAke19u YW1lfSBfTkFNRV9MRU5HVEgpCkBAIC0xNzYsMTIgKzE3OCwxNyBAQCBtYWNybyhXRUJLSVRfT1BU SU9OX0VORCkKICAgICAgICAgaWYgKE5PVCBfV0VCS0lUX0FWQUlMQUJMRV9PUFRJT05TX0lTX1BV QkxJQ18ke19uYW1lfSkKICAgICAgICAgICAgIG1hcmtfYXNfYWR2YW5jZWQoRk9SQ0UgJHtfbmFt ZX0pCiAgICAgICAgIGVuZGlmICgpCisgICAgZW5kZm9yZWFjaCAoKQogCi0gICAgICAgIGlmICgk e19uYW1lfSBBTkQgREVGSU5FRCBfV0VCS0lUX0FWQUlMQUJMRV9PUFRJT05TX0RFUEVOREVOQ1lf T0ZfJHtfbmFtZX0pCi0gICAgICAgICAgICBpZiAoTk9UICR7JHtfV0VCS0lUX0FWQUlMQUJMRV9P UFRJT05TX0RFUEVOREVOQ1lfT0ZfJHtfbmFtZX19fSkKLSAgICAgICAgICAgICAgICBtZXNzYWdl KFNUQVRVUyAiRGlzYWJsaW5nICR7X25hbWV9IHNpbmNlICR7X1dFQktJVF9BVkFJTEFCTEVfT1BU SU9OU19ERVBFTkRFTkNZX09GXyR7X25hbWV9fSBzdXBwb3J0IGlzIGRpc2FibGVkLiIpCi0gICAg ICAgICAgICAgICAgc2V0KCR7X25hbWV9IE9GRikKLSAgICAgICAgICAgIGVuZGlmICgpCisgICAg Zm9yZWFjaCAoX25hbWUgJHtfV0VCS0lUX0FWQUlMQUJMRV9PUFRJT05TfSkKKyAgICAgICAgaWYg KCR7X25hbWV9KQorICAgICAgICAgICAgZm9yZWFjaCAoX2RlcGVuZGVuY3kgJHtfV0VCS0lUX0FW QUlMQUJMRV9PUFRJT05TXyR7X25hbWV9X0RFUEVOREVOQ0lFU30pCisgICAgICAgICAgICAgICAg aWYgKE5PVCAke19kZXBlbmRlbmN5fSkKKyAgICAgICAgICAgICAgICAgICAgbWVzc2FnZShTVEFU VVMgIkRpc2FibGluZyAke19uYW1lfSBzaW5jZSAke19kZXBlbmRlbmN5fSBpcyBkaXNhYmxlZC4i KQorICAgICAgICAgICAgICAgICAgICBzZXQoJHtfbmFtZX0gT0ZGKQorICAgICAgICAgICAgICAg ICAgICBicmVhayAoKQorICAgICAgICAgICAgICAgIGVuZGlmICgpCisgICAgICAgICAgICBlbmRm b3JlYWNoICgpCiAgICAgICAgIGVuZGlmICgpCiAKICAgICAgICAgaWYgKCR7X25hbWV9KQpkaWZm IC0tZ2l0IGEvQ2hhbmdlTG9nIGIvQ2hhbmdlTG9nCmluZGV4IGU5N2E4MzkwZmZhZDhiZjhkMjQ3 NDhmZTBhMTcwOWIwY2M0NjhiNzAuLjcwZTRhZDY4ZjZiZTNlMWY1ZGMzNzljZWE1ZGVkZGU1OWFl Yjc3YjMgMTAwNjQ0Ci0tLSBhL0NoYW5nZUxvZworKysgYi9DaGFuZ2VMb2cKQEAgLTEsNSArMSwx NiBAQAogMjAxNS0wNC0xNiAgTWljaGFlbCBDYXRhbnphcm8gIDxtY2F0YW56YXJvQGlnYWxpYS5j b20+CiAKKyAgICAgICAgW0NNYWtlXSBTaG91bGQgYmUgcG9zc2libGUgZm9yIGFuIG9wdGlvbiB0 byBkZXBlbmQgb24gbXVsdGlwbGUgb3B0aW9ucworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTQzODM5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgVXNlIGEgbGlzdCBpbnN0ZWFkIG9mIGEgc2luZ2xlIHZhcmlh YmxlIHRvIHRyYWNrIHRoZSBkZXBlbmRlbmNpZXMgb2YgZWFjaCBvcHRpb24uCisKKyAgICAgICAg KiBTb3VyY2UvY21ha2UvV2ViS2l0RmVhdHVyZXMuY21ha2U6CisKKzIwMTUtMDQtMTYgIE1pY2hh ZWwgQ2F0YW56YXJvICA8bWNhdGFuemFyb0BpZ2FsaWEuY29tPgorCiAgICAgICAgIFtDTWFrZV0g RmVhdHVyZXMgbGlzdCBzaG91bGQgcHJpbnQgZG90cyBldmVyeSBvdGhlciByb3cKICAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE0MzgzMgogCg== 251318 2015-04-22 08:30:07 -0700 2015-04-23 08:57:49 -0700 Patch bug-143839-20150422102903.patch text/plain 3759 mcatanzaro U3VidmVyc2lvbiBSZXZpc2lvbjogMTgzMTAyCmRpZmYgLS1naXQgYS9Tb3VyY2UvY21ha2UvV2Vi S2l0RmVhdHVyZXMuY21ha2UgYi9Tb3VyY2UvY21ha2UvV2ViS2l0RmVhdHVyZXMuY21ha2UKaW5k ZXggNjUxMWJjZTQxMjA3ZDM5OWYzNDQzNWUzYjgwZDBkYzc2YmEzZTljNi4uNzU4YWFlOThiYzk5 YTEzOTY1YTM4OGNmNTZkZGQ2Y2RkZTFmZTNhYyAxMDA2NDQKLS0tIGEvU291cmNlL2NtYWtlL1dl YktpdEZlYXR1cmVzLmNtYWtlCisrKyBiL1NvdXJjZS9jbWFrZS9XZWJLaXRGZWF0dXJlcy5jbWFr ZQpAQCAtNyw2ICs3LDcgQEAgbWFjcm8oV0VCS0lUX09QVElPTl9ERUZJTkUgX25hbWUgX2Rlc2Ny aXB0aW9uIF9wdWJsaWMgX2luaXRpYWxfdmFsdWUpCiAgICAgc2V0KF9XRUJLSVRfQVZBSUxBQkxF X09QVElPTlNfREVTQ1JJUFRJT05fJHtfbmFtZX0gJHtfZGVzY3JpcHRpb259KQogICAgIHNldChf V0VCS0lUX0FWQUlMQUJMRV9PUFRJT05TX0lTX1BVQkxJQ18ke19uYW1lfSAke19wdWJsaWN9KQog ICAgIHNldChfV0VCS0lUX0FWQUlMQUJMRV9PUFRJT05TX0lOSVRJQUxfVkFMVUVfJHtfbmFtZX0g JHtfaW5pdGlhbF92YWx1ZX0pCisgICAgc2V0KF9XRUJLSVRfQVZBSUxBQkxFX09QVElPTlNfJHtf bmFtZX1fREVQRU5ERU5DSUVTICIiKQogICAgIGxpc3QoQVBQRU5EIF9XRUJLSVRfQVZBSUxBQkxF X09QVElPTlMgJHtfbmFtZX0pCiBlbmRtYWNybygpCiAKQEAgLTE2LDcgKzE3LDcgQEAgbWFjcm8o V0VCS0lUX09QVElPTl9ERUZBVUxUX1BPUlRfVkFMVUUgX25hbWUgX3B1YmxpYyBfdmFsdWUpCiBl bmRtYWNybygpCiAKIG1hY3JvKFdFQktJVF9PUFRJT05fREVQRU5EIF9uYW1lIF9kZXBlbmQpCi0g ICAgc2V0KF9XRUJLSVRfQVZBSUxBQkxFX09QVElPTlNfREVQRU5ERU5DWV9PRl8ke19uYW1lfSAk e19kZXBlbmR9KQorICAgIGxpc3QoQVBQRU5EIF9XRUJLSVRfQVZBSUxBQkxFX09QVElPTlNfJHtf bmFtZX1fREVQRU5ERU5DSUVTICR7X2RlcGVuZH0pCiBlbmRtYWNybygpCiAKIG1hY3JvKFdFQktJ VF9PUFRJT05fQkVHSU4pCkBAIC0xNjQsOCArMTY1LDI4IEBAIG1hY3JvKFdFQktJVF9PUFRJT05f QkVHSU4pCiAgICAgV0VCS0lUX09QVElPTl9ERVBFTkQoRU5BQkxFX1RPVUNIX1NMSURFUiBFTkFC TEVfVE9VQ0hfRVZFTlRTKQogZW5kbWFjcm8oKQogCittYWNybyhfV0VCS0lUX09QVElPTl9FTkZP UkNFX0RFUEVORFMpCisgICAgc2V0KF9PUFRJT05fQ0hBTkdFRCBUUlVFKQorICAgIHdoaWxlICgk e19PUFRJT05fQ0hBTkdFRH0pCisgICAgICAgIHNldChfT1BUSU9OX0NIQU5HRUQgRkFMU0UpCisg ICAgICAgIGZvcmVhY2ggKF9uYW1lICR7X1dFQktJVF9BVkFJTEFCTEVfT1BUSU9OU30pCisgICAg ICAgICAgICBpZiAoJHtfbmFtZX0pCisgICAgICAgICAgICAgICAgZm9yZWFjaCAoX2RlcGVuZGVu Y3kgJHtfV0VCS0lUX0FWQUlMQUJMRV9PUFRJT05TXyR7X25hbWV9X0RFUEVOREVOQ0lFU30pCisg ICAgICAgICAgICAgICAgICAgIGlmIChOT1QgJHtfZGVwZW5kZW5jeX0pCisgICAgICAgICAgICAg ICAgICAgICAgICBtZXNzYWdlKFNUQVRVUyAiRGlzYWJsaW5nICR7X25hbWV9IHNpbmNlICR7X2Rl cGVuZGVuY3l9IGlzIGRpc2FibGVkLiIpCisgICAgICAgICAgICAgICAgICAgICAgICBzZXQoJHtf bmFtZX0gT0ZGKQorICAgICAgICAgICAgICAgICAgICAgICAgc2V0KF9PUFRJT05fQ0hBTkdFRCBU UlVFKQorICAgICAgICAgICAgICAgICAgICAgICAgYnJlYWsgKCkKKyAgICAgICAgICAgICAgICAg ICAgZW5kaWYgKCkKKyAgICAgICAgICAgICAgICBlbmRmb3JlYWNoICgpCisgICAgICAgICAgICBl bmRpZiAoKQorICAgICAgICBlbmRmb3JlYWNoICgpCisgICAgZW5kd2hpbGUgKCkKK2VuZG1hY3Jv KCkKKwogbWFjcm8oV0VCS0lUX09QVElPTl9FTkQpCiAgICAgbGlzdChTT1JUIF9XRUJLSVRfQVZB SUxBQkxFX09QVElPTlMpCisKICAgICBzZXQoX01BWF9GRUFUVVJFX0xFTkdUSCAwKQogICAgIGZv cmVhY2ggKF9uYW1lICR7X1dFQktJVF9BVkFJTEFCTEVfT1BUSU9OU30pCiAgICAgICAgIHN0cmlu ZyhMRU5HVEggJHtfbmFtZX0gX05BTUVfTEVOR1RIKQpAQCAtMTc3LDE0ICsxOTgsMTEgQEAgbWFj cm8oV0VCS0lUX09QVElPTl9FTkQpCiAgICAgICAgIGlmIChOT1QgX1dFQktJVF9BVkFJTEFCTEVf T1BUSU9OU19JU19QVUJMSUNfJHtfbmFtZX0pCiAgICAgICAgICAgICBtYXJrX2FzX2FkdmFuY2Vk KEZPUkNFICR7X25hbWV9KQogICAgICAgICBlbmRpZiAoKQorICAgIGVuZGZvcmVhY2ggKCkKIAot ICAgICAgICBpZiAoJHtfbmFtZX0gQU5EIERFRklORUQgX1dFQktJVF9BVkFJTEFCTEVfT1BUSU9O U19ERVBFTkRFTkNZX09GXyR7X25hbWV9KQotICAgICAgICAgICAgaWYgKE5PVCAkeyR7X1dFQktJ VF9BVkFJTEFCTEVfT1BUSU9OU19ERVBFTkRFTkNZX09GXyR7X25hbWV9fX0pCi0gICAgICAgICAg ICAgICAgbWVzc2FnZShTVEFUVVMgIkRpc2FibGluZyAke19uYW1lfSBzaW5jZSAke19XRUJLSVRf QVZBSUxBQkxFX09QVElPTlNfREVQRU5ERU5DWV9PRl8ke19uYW1lfX0gc3VwcG9ydCBpcyBkaXNh YmxlZC4iKQotICAgICAgICAgICAgICAgIHNldCgke19uYW1lfSBPRkYpCi0gICAgICAgICAgICBl bmRpZiAoKQotICAgICAgICBlbmRpZiAoKQorICAgIF9XRUJLSVRfT1BUSU9OX0VORk9SQ0VfREVQ RU5EUyAoKQogCisgICAgZm9yZWFjaCAoX25hbWUgJHtfV0VCS0lUX0FWQUlMQUJMRV9PUFRJT05T fSkKICAgICAgICAgaWYgKCR7X25hbWV9KQogICAgICAgICAgICAgbGlzdChBUFBFTkQgRkVBVFVS RV9ERUZJTkVTICR7X25hbWV9KQogICAgICAgICAgICAgc2V0KEZFQVRVUkVfREVGSU5FU19XSVRI X1NQQUNFX1NFUEFSQVRPUiAiJHtGRUFUVVJFX0RFRklORVNfV0lUSF9TUEFDRV9TRVBBUkFUT1J9 ICR7X25hbWV9IikKZGlmZiAtLWdpdCBhL0NoYW5nZUxvZyBiL0NoYW5nZUxvZwppbmRleCBkMmZk MzM2MmFiM2UyNTc1YzViYjNhZmMyM2E0NDBiZWRlNjUwNmM3Li4zYjdiYmVjNjJjOWVjZWFlZmY1 ZWRlMmZjYTU3ZDc0ZDVhMTRlMmJlIDEwMDY0NAotLS0gYS9DaGFuZ2VMb2cKKysrIGIvQ2hhbmdl TG9nCkBAIC0xLDUgKzEsMTcgQEAKIDIwMTUtMDQtMjIgIE1pY2hhZWwgQ2F0YW56YXJvICA8bWNh dGFuemFyb0BpZ2FsaWEuY29tPgogCisgICAgICAgIFtDTWFrZV0gU2hvdWxkIGJlIHBvc3NpYmxl IGZvciBhbiBvcHRpb24gdG8gZGVwZW5kIG9uIG11bHRpcGxlIG9wdGlvbnMKKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE0MzgzOQorCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFVzZSBhIGxpc3QgaW5zdGVhZCBv ZiBhIHNpbmdsZSB2YXJpYWJsZSB0byB0cmFjayB0aGUgZGVwZW5kZW5jaWVzIG9mIGVhY2ggb3B0 aW9uLiBJdGVyYXRlCisgICAgICAgIG92ZXIgdGhlIGxpc3QgYXMgbWFueSB0aW1lcyBhcyBuZWNl c3NhcnkgdG8gZW5zdXJlIGFsbCBvcHRpb25zIGFyZSBwcm9wZXJseSBkaXNhYmxlZC4KKworICAg ICAgICAqIFNvdXJjZS9jbWFrZS9XZWJLaXRGZWF0dXJlcy5jbWFrZToKKworMjAxNS0wNC0xNiAg TWljaGFlbCBDYXRhbnphcm8gIDxtY2F0YW56YXJvQGlnYWxpYS5jb20+CisKICAgICAgICAgW0NN YWtlXSBGZWF0dXJlcyBsaXN0IHNob3VsZCBwcmludCBkb3RzIGV2ZXJ5IG90aGVyIHJvdwogICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTQzODMyCiAK 251440 2015-04-23 08:57:52 -0700 2015-04-23 08:58:18 -0700 [CMake] Should be possible for an option to conflict with other options bug-143839-20150423105647.patch text/plain 4513 mcatanzaro U3VidmVyc2lvbiBSZXZpc2lvbjogMTgzMTg0CmRpZmYgLS1naXQgYS9Tb3VyY2UvY21ha2UvV2Vi S2l0RmVhdHVyZXMuY21ha2UgYi9Tb3VyY2UvY21ha2UvV2ViS2l0RmVhdHVyZXMuY21ha2UKaW5k ZXggZGY1ZWJmY2Y4MjYwN2VmYzc0ODE1YTNkYjc2OWJiYTVlYjgxMmVhNi4uODQ4Njg0MjdmYWEw Y2Q5MzY1OTRjM2E3ZTcxMGEyZGUzY2U0MmY2MyAxMDA2NDQKLS0tIGEvU291cmNlL2NtYWtlL1dl YktpdEZlYXR1cmVzLmNtYWtlCisrKyBiL1NvdXJjZS9jbWFrZS9XZWJLaXRGZWF0dXJlcy5jbWFr ZQpAQCAtNyw2ICs3LDcgQEAgbWFjcm8oV0VCS0lUX09QVElPTl9ERUZJTkUgX25hbWUgX2Rlc2Ny aXB0aW9uIF9wdWJsaWMgX2luaXRpYWxfdmFsdWUpCiAgICAgc2V0KF9XRUJLSVRfQVZBSUxBQkxF X09QVElPTlNfREVTQ1JJUFRJT05fJHtfbmFtZX0gJHtfZGVzY3JpcHRpb259KQogICAgIHNldChf V0VCS0lUX0FWQUlMQUJMRV9PUFRJT05TX0lTX1BVQkxJQ18ke19uYW1lfSAke19wdWJsaWN9KQog ICAgIHNldChfV0VCS0lUX0FWQUlMQUJMRV9PUFRJT05TX0lOSVRJQUxfVkFMVUVfJHtfbmFtZX0g JHtfaW5pdGlhbF92YWx1ZX0pCisgICAgc2V0KF9XRUJLSVRfQVZBSUxBQkxFX09QVElPTlNfJHtf bmFtZX1fQ09ORkxJQ1RTICIiKQogICAgIHNldChfV0VCS0lUX0FWQUlMQUJMRV9PUFRJT05TXyR7 X25hbWV9X0RFUEVOREVOQ0lFUyAiIikKICAgICBsaXN0KEFQUEVORCBfV0VCS0lUX0FWQUlMQUJM RV9PUFRJT05TICR7X25hbWV9KQogZW5kbWFjcm8oKQpAQCAtMTYsNiArMTcsMTAgQEAgbWFjcm8o V0VCS0lUX09QVElPTl9ERUZBVUxUX1BPUlRfVkFMVUUgX25hbWUgX3B1YmxpYyBfdmFsdWUpCiAg ICAgc2V0KF9XRUJLSVRfQVZBSUxBQkxFX09QVElPTlNfSU5JVElBTF9WQUxVRV8ke19uYW1lfSAk e192YWx1ZX0pCiBlbmRtYWNybygpCiAKK21hY3JvKFdFQktJVF9PUFRJT05fQ09ORkxJQ1QgX25h bWUgX2NvbmZsaWN0KQorICAgIGxpc3QoQVBQRU5EIF9XRUJLSVRfQVZBSUxBQkxFX09QVElPTlNf JHtfbmFtZX1fQ09ORkxJQ1RTICR7X2NvbmZsaWN0fSkKK2VuZG1hY3JvKCkKKwogbWFjcm8oV0VC S0lUX09QVElPTl9ERVBFTkQgX25hbWUgX2RlcGVuZCkKICAgICBsaXN0KEFQUEVORCBfV0VCS0lU X0FWQUlMQUJMRV9PUFRJT05TXyR7X25hbWV9X0RFUEVOREVOQ0lFUyAke19kZXBlbmR9KQogZW5k bWFjcm8oKQpAQCAtMTc0LDEyICsxNzksNDcgQEAgbWFjcm8oX1dFQktJVF9PUFRJT05fRU5GT1JD RV9ERVBFTkRTIF9uYW1lKQogICAgICAgICBpZiAoTk9UICR7X2RlcGVuZGVuY3l9KQogICAgICAg ICAgICAgbWVzc2FnZShTVEFUVVMgIkRpc2FibGluZyAke19uYW1lfSBzaW5jZSAke19kZXBlbmRl bmN5fSBpcyBkaXNhYmxlZC4iKQogICAgICAgICAgICAgc2V0KCR7X25hbWV9IE9GRikKLSAgICAg ICAgICAgIHNldChfUkVTVEFSVF9ERVBFTkRFTkNZX1BST0NFU1NJTkcgVFJVRSkKKyAgICAgICAg ICAgIHNldChfT1BUSU9OX0NIQU5HRUQgVFJVRSkKKyAgICAgICAgICAgIGJyZWFrICgpCisgICAg ICAgIGVuZGlmICgpCisgICAgZW5kZm9yZWFjaCAoKQorZW5kbWFjcm8oKQorCittYWNybyhfV0VC S0lUX09QVElPTl9FTkZPUkNFX0NPTkZMSUNUUyBfbmFtZSkKKyAgICBmb3JlYWNoIChfY29uZmxp Y3QgJHtfV0VCS0lUX0FWQUlMQUJMRV9PUFRJT05TXyR7X25hbWV9X0NPTkZMSUNUU30pCisgICAg ICAgIGlmICgke19jb25mbGljdH0pCisgICAgICAgICAgICBtZXNzYWdlKFNUQVRVUyAiRGlzYWJs aW5nICR7X25hbWV9IHNpbmNlICR7X2NvbmZsaWN0fSBpcyBlbmFibGVkLiIpCisgICAgICAgICAg ICBzZXQoJHtfbmFtZX0gT0ZGKQorICAgICAgICAgICAgc2V0KF9PUFRJT05fQ0hBTkdFRCBUUlVF KQogICAgICAgICAgICAgYnJlYWsgKCkKICAgICAgICAgZW5kaWYgKCkKICAgICBlbmRmb3JlYWNo ICgpCiBlbmRtYWNybygpCiAKK21hY3JvKF9XRUJLSVRfT1BUSU9OX0VORk9SQ0VfQUxMX0RFUEVO RFMpCisgICAgc2V0KF9PUFRJT05fQ0hBTkdFRCBUUlVFKQorICAgIHdoaWxlICgke19PUFRJT05f Q0hBTkdFRH0pCisgICAgICAgIHNldChfT1BUSU9OX0NIQU5HRUQgRkFMU0UpCisgICAgICAgIGZv cmVhY2ggKF9uYW1lICR7X1dFQktJVF9BVkFJTEFCTEVfT1BUSU9OU30pCisgICAgICAgICAgICBp ZiAoJHtfbmFtZX0pCisgICAgICAgICAgICAgICAgX1dFQktJVF9PUFRJT05fRU5GT1JDRV9ERVBF TkRTKCR7X25hbWV9KQorICAgICAgICAgICAgZW5kaWYgKCkKKyAgICAgICAgZW5kZm9yZWFjaCAo KQorICAgIGVuZHdoaWxlICgpCitlbmRtYWNybygpCisKK21hY3JvKF9XRUJLSVRfT1BUSU9OX0VO Rk9SQ0VfQUxMX0NPTkZMSUNUUykKKyAgICBzZXQoX09QVElPTl9DSEFOR0VEIFRSVUUpCisgICAg d2hpbGUgKCR7X09QVElPTl9DSEFOR0VEfSkKKyAgICAgICAgc2V0KF9PUFRJT05fQ0hBTkdFRCBG QUxTRSkKKyAgICAgICAgZm9yZWFjaCAoX25hbWUgJHtfV0VCS0lUX0FWQUlMQUJMRV9PUFRJT05T fSkKKyAgICAgICAgICAgIGlmICgke19uYW1lfSkKKyAgICAgICAgICAgICAgICBfV0VCS0lUX09Q VElPTl9FTkZPUkNFX0NPTkZMSUNUUygke19uYW1lfSkKKyAgICAgICAgICAgIGVuZGlmICgpCisg ICAgICAgIGVuZGZvcmVhY2ggKCkKKyAgICBlbmR3aGlsZSAoKQorZW5kbWFjcm8oKQorCiBtYWNy byhXRUJLSVRfT1BUSU9OX0VORCkKICAgICBsaXN0KFNPUlQgX1dFQktJVF9BVkFJTEFCTEVfT1BU SU9OUykKICAgICBzZXQoX01BWF9GRUFUVVJFX0xFTkdUSCAwKQpAQCAtMTk1LDE1ICsyMzUsMTQg QEAgbWFjcm8oV0VCS0lUX09QVElPTl9FTkQpCiAgICAgICAgIGVuZGlmICgpCiAgICAgZW5kZm9y ZWFjaCAoKQogCi0gICAgc2V0KF9SRVNUQVJUX0RFUEVOREVOQ1lfUFJPQ0VTU0lORyBUUlVFKQot ICAgIHdoaWxlICgke19SRVNUQVJUX0RFUEVOREVOQ1lfUFJPQ0VTU0lOR30pCi0gICAgICAgIHNl dChfUkVTVEFSVF9ERVBFTkRFTkNZX1BST0NFU1NJTkcgRkFMU0UpCi0gICAgICAgIGZvcmVhY2gg KF9uYW1lICR7X1dFQktJVF9BVkFJTEFCTEVfT1BUSU9OU30pCi0gICAgICAgICAgICBpZiAoJHtf bmFtZX0pCi0gICAgICAgICAgICAgICAgX1dFQktJVF9PUFRJT05fRU5GT1JDRV9ERVBFTkRTKCR7 X25hbWV9KQotICAgICAgICAgICAgZW5kaWYgKCkKLSAgICAgICAgZW5kZm9yZWFjaCAoKQotICAg IGVuZHdoaWxlICgpCisgICAgIyBSdW4gdGhyb3VnaCBldmVyeSBwb3NzaWJsZSBkZXBlbmRzIHRv IG1ha2Ugc3VyZSB3ZSBoYXZlIGRpc2FibGVkIGFueXRoaW5nCisgICAgIyB0aGF0IGNvdWxkIGNh dXNlIGFuIHVubmVjZXNzYXJ5IGNvbmZsaWN0IGJlZm9yZSBwcm9jZXNzaW5nIGFueSBjb25mbGlj dHMsCisgICAgIyBzbyB0aGF0IG9wdGlvbnMgZG9uJ3QgZ2V0IGluYXBwcm9wcmlhdGVseSBkaXNh YmxlZC4gQWZ0ZXIgcHJvY2Vzc2luZworICAgICMgY29uZmxpY3RzLCBwcm9jZXNzIGRlcGVuZGVu Y2llcyBhZ2FpbiBpbiBjYXNlIGNvbmZsaWN0cyBkaXNhYmxlZCBhbiBvcHRpb24KKyAgICAjIHJl cXVpcmVkIGJ5IGFub3RoZXIuCisgICAgX1dFQktJVF9PUFRJT05fRU5GT1JDRV9BTExfREVQRU5E UygpCisgICAgX1dFQktJVF9PUFRJT05fRU5GT1JDRV9BTExfQ09ORkxJQ1RTKCkKKyAgICBfV0VC S0lUX09QVElPTl9FTkZPUkNFX0FMTF9ERVBFTkRTKCkKIAogICAgIGZvcmVhY2ggKF9uYW1lICR7 X1dFQktJVF9BVkFJTEFCTEVfT1BUSU9OU30pCiAgICAgICAgIGlmICgke19uYW1lfSkKZGlmZiAt LWdpdCBhL0NoYW5nZUxvZyBiL0NoYW5nZUxvZwppbmRleCAxNDkyMWQ2NDk0ZmNmNmYyMjExZWFl MjdlY2VhOWVkNWQyNmFiOTJiLi5jMjY4NTFhZTI1MmMyZGVhNjM4NGIwMmM3Nzk1ODBiMGRlYjc5 MDkyIDEwMDY0NAotLS0gYS9DaGFuZ2VMb2cKKysrIGIvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMTYg QEAKIDIwMTUtMDQtMjIgIE1pY2hhZWwgQ2F0YW56YXJvICA8bWNhdGFuemFyb0BpZ2FsaWEuY29t PgogCisgICAgICAgIFtDTWFrZV0gU2hvdWxkIGJlIHBvc3NpYmxlIGZvciBhbiBvcHRpb24gdG8g Y29uZmxpY3Qgd2l0aCBvdGhlciBvcHRpb25zCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0xNDM5NTYKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBBZGQgV0VCS0lUX09QVElPTl9DT05GTElDVCBtYWNybywgd2hp Y2ggdHVybnMgb2ZmIGFuIG9wdGlvbiBpZiBhbm90aGVyIG9wdGlvbiBpcyBvZmYuCisKKyAgICAg ICAgKiBTb3VyY2UvY21ha2UvV2ViS2l0RmVhdHVyZXMuY21ha2U6CisKKzIwMTUtMDQtMjIgIE1p Y2hhZWwgQ2F0YW56YXJvICA8bWNhdGFuemFyb0BpZ2FsaWEuY29tPgorCiAgICAgICAgIFtDTWFr ZV0gU2hvdWxkIGJlIHBvc3NpYmxlIGZvciBhbiBvcHRpb24gdG8gZGVwZW5kIG9uIG11bHRpcGxl IG9wdGlvbnMKICAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTE0MzgzOQogCg== 251442 2015-04-23 09:00:11 -0700 2015-04-23 12:43:43 -0700 [CMake] Should be possible for an option to depend on multiple options bug-143839-20150423105907.patch text/plain 3605 mcatanzaro U3VidmVyc2lvbiBSZXZpc2lvbjogMTgzMTg0CmRpZmYgLS1naXQgYS9Tb3VyY2UvY21ha2UvV2Vi S2l0RmVhdHVyZXMuY21ha2UgYi9Tb3VyY2UvY21ha2UvV2ViS2l0RmVhdHVyZXMuY21ha2UKaW5k ZXggMjFhZGU0M2U0YjBhNjE5ODUxNzExYzljYjE3YjBlZGI3ZDJiYTViOC4uZGY1ZWJmY2Y4MjYw N2VmYzc0ODE1YTNkYjc2OWJiYTVlYjgxMmVhNiAxMDA2NDQKLS0tIGEvU291cmNlL2NtYWtlL1dl YktpdEZlYXR1cmVzLmNtYWtlCisrKyBiL1NvdXJjZS9jbWFrZS9XZWJLaXRGZWF0dXJlcy5jbWFr ZQpAQCAtNyw2ICs3LDcgQEAgbWFjcm8oV0VCS0lUX09QVElPTl9ERUZJTkUgX25hbWUgX2Rlc2Ny aXB0aW9uIF9wdWJsaWMgX2luaXRpYWxfdmFsdWUpCiAgICAgc2V0KF9XRUJLSVRfQVZBSUxBQkxF X09QVElPTlNfREVTQ1JJUFRJT05fJHtfbmFtZX0gJHtfZGVzY3JpcHRpb259KQogICAgIHNldChf V0VCS0lUX0FWQUlMQUJMRV9PUFRJT05TX0lTX1BVQkxJQ18ke19uYW1lfSAke19wdWJsaWN9KQog ICAgIHNldChfV0VCS0lUX0FWQUlMQUJMRV9PUFRJT05TX0lOSVRJQUxfVkFMVUVfJHtfbmFtZX0g JHtfaW5pdGlhbF92YWx1ZX0pCisgICAgc2V0KF9XRUJLSVRfQVZBSUxBQkxFX09QVElPTlNfJHtf bmFtZX1fREVQRU5ERU5DSUVTICIiKQogICAgIGxpc3QoQVBQRU5EIF9XRUJLSVRfQVZBSUxBQkxF X09QVElPTlMgJHtfbmFtZX0pCiBlbmRtYWNybygpCiAKQEAgLTE2LDcgKzE3LDcgQEAgbWFjcm8o V0VCS0lUX09QVElPTl9ERUZBVUxUX1BPUlRfVkFMVUUgX25hbWUgX3B1YmxpYyBfdmFsdWUpCiBl bmRtYWNybygpCiAKIG1hY3JvKFdFQktJVF9PUFRJT05fREVQRU5EIF9uYW1lIF9kZXBlbmQpCi0g ICAgc2V0KF9XRUJLSVRfQVZBSUxBQkxFX09QVElPTlNfREVQRU5ERU5DWV9PRl8ke19uYW1lfSAk e19kZXBlbmR9KQorICAgIGxpc3QoQVBQRU5EIF9XRUJLSVRfQVZBSUxBQkxFX09QVElPTlNfJHtf bmFtZX1fREVQRU5ERU5DSUVTICR7X2RlcGVuZH0pCiBlbmRtYWNybygpCiAKIG1hY3JvKFdFQktJ VF9PUFRJT05fQkVHSU4pCkBAIC0xNjgsNiArMTY5LDE3IEBAIG1hY3JvKFdFQktJVF9PUFRJT05f QkVHSU4pCiAgICAgV0VCS0lUX09QVElPTl9ERVBFTkQoRU5BQkxFX1RPVUNIX1NMSURFUiBFTkFC TEVfVE9VQ0hfRVZFTlRTKQogZW5kbWFjcm8oKQogCittYWNybyhfV0VCS0lUX09QVElPTl9FTkZP UkNFX0RFUEVORFMgX25hbWUpCisgICAgZm9yZWFjaCAoX2RlcGVuZGVuY3kgJHtfV0VCS0lUX0FW QUlMQUJMRV9PUFRJT05TXyR7X25hbWV9X0RFUEVOREVOQ0lFU30pCisgICAgICAgIGlmIChOT1Qg JHtfZGVwZW5kZW5jeX0pCisgICAgICAgICAgICBtZXNzYWdlKFNUQVRVUyAiRGlzYWJsaW5nICR7 X25hbWV9IHNpbmNlICR7X2RlcGVuZGVuY3l9IGlzIGRpc2FibGVkLiIpCisgICAgICAgICAgICBz ZXQoJHtfbmFtZX0gT0ZGKQorICAgICAgICAgICAgc2V0KF9SRVNUQVJUX0RFUEVOREVOQ1lfUFJP Q0VTU0lORyBUUlVFKQorICAgICAgICAgICAgYnJlYWsgKCkKKyAgICAgICAgZW5kaWYgKCkKKyAg ICBlbmRmb3JlYWNoICgpCitlbmRtYWNybygpCisKIG1hY3JvKFdFQktJVF9PUFRJT05fRU5EKQog ICAgIGxpc3QoU09SVCBfV0VCS0lUX0FWQUlMQUJMRV9PUFRJT05TKQogICAgIHNldChfTUFYX0ZF QVRVUkVfTEVOR1RIIDApCkBAIC0xODEsMTQgKzE5MywxOSBAQCBtYWNybyhXRUJLSVRfT1BUSU9O X0VORCkKICAgICAgICAgaWYgKE5PVCBfV0VCS0lUX0FWQUlMQUJMRV9PUFRJT05TX0lTX1BVQkxJ Q18ke19uYW1lfSkKICAgICAgICAgICAgIG1hcmtfYXNfYWR2YW5jZWQoRk9SQ0UgJHtfbmFtZX0p CiAgICAgICAgIGVuZGlmICgpCisgICAgZW5kZm9yZWFjaCAoKQogCi0gICAgICAgIGlmICgke19u YW1lfSBBTkQgREVGSU5FRCBfV0VCS0lUX0FWQUlMQUJMRV9PUFRJT05TX0RFUEVOREVOQ1lfT0Zf JHtfbmFtZX0pCi0gICAgICAgICAgICBpZiAoTk9UICR7JHtfV0VCS0lUX0FWQUlMQUJMRV9PUFRJ T05TX0RFUEVOREVOQ1lfT0ZfJHtfbmFtZX19fSkKLSAgICAgICAgICAgICAgICBtZXNzYWdlKFNU QVRVUyAiRGlzYWJsaW5nICR7X25hbWV9IHNpbmNlICR7X1dFQktJVF9BVkFJTEFCTEVfT1BUSU9O U19ERVBFTkRFTkNZX09GXyR7X25hbWV9fSBzdXBwb3J0IGlzIGRpc2FibGVkLiIpCi0gICAgICAg ICAgICAgICAgc2V0KCR7X25hbWV9IE9GRikKKyAgICBzZXQoX1JFU1RBUlRfREVQRU5ERU5DWV9Q Uk9DRVNTSU5HIFRSVUUpCisgICAgd2hpbGUgKCR7X1JFU1RBUlRfREVQRU5ERU5DWV9QUk9DRVNT SU5HfSkKKyAgICAgICAgc2V0KF9SRVNUQVJUX0RFUEVOREVOQ1lfUFJPQ0VTU0lORyBGQUxTRSkK KyAgICAgICAgZm9yZWFjaCAoX25hbWUgJHtfV0VCS0lUX0FWQUlMQUJMRV9PUFRJT05TfSkKKyAg ICAgICAgICAgIGlmICgke19uYW1lfSkKKyAgICAgICAgICAgICAgICBfV0VCS0lUX09QVElPTl9F TkZPUkNFX0RFUEVORFMoJHtfbmFtZX0pCiAgICAgICAgICAgICBlbmRpZiAoKQotICAgICAgICBl bmRpZiAoKQorICAgICAgICBlbmRmb3JlYWNoICgpCisgICAgZW5kd2hpbGUgKCkKIAorICAgIGZv cmVhY2ggKF9uYW1lICR7X1dFQktJVF9BVkFJTEFCTEVfT1BUSU9OU30pCiAgICAgICAgIGlmICgk e19uYW1lfSkKICAgICAgICAgICAgIGxpc3QoQVBQRU5EIEZFQVRVUkVfREVGSU5FUyAke19uYW1l fSkKICAgICAgICAgICAgIHNldChGRUFUVVJFX0RFRklORVNfV0lUSF9TUEFDRV9TRVBBUkFUT1Ig IiR7RkVBVFVSRV9ERUZJTkVTX1dJVEhfU1BBQ0VfU0VQQVJBVE9SfSAke19uYW1lfSIpCmRpZmYg LS1naXQgYS9DaGFuZ2VMb2cgYi9DaGFuZ2VMb2cKaW5kZXggYmU3MmRmODQwMzZmNjMxYjk1ZWQy ODcyMzEwNGE0MDJkY2E2YWNjMS4uMTQ5MjFkNjQ5NGZjZjZmMjIxMWVhZTI3ZWNlYTllZDVkMjZh YjkyYiAxMDA2NDQKLS0tIGEvQ2hhbmdlTG9nCisrKyBiL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDE3 IEBACiAyMDE1LTA0LTIyICBNaWNoYWVsIENhdGFuemFybyAgPG1jYXRhbnphcm9AaWdhbGlhLmNv bT4KIAorICAgICAgICBbQ01ha2VdIFNob3VsZCBiZSBwb3NzaWJsZSBmb3IgYW4gb3B0aW9uIHRv IGRlcGVuZCBvbiBtdWx0aXBsZSBvcHRpb25zCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0xNDM4MzkKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBVc2UgYSBsaXN0IGluc3RlYWQgb2YgYSBzaW5nbGUgdmFyaWFi bGUgdG8gdHJhY2sgdGhlIGRlcGVuZGVuY2llcyBvZiBlYWNoIG9wdGlvbi4gSXRlcmF0ZQorICAg ICAgICBvdmVyIHRoZSBsaXN0IGFzIG1hbnkgdGltZXMgYXMgbmVjZXNzYXJ5IHRvIGVuc3VyZSBh bGwgb3B0aW9ucyBhcmUgcHJvcGVybHkgZGlzYWJsZWQuCisKKyAgICAgICAgKiBTb3VyY2UvY21h a2UvV2ViS2l0RmVhdHVyZXMuY21ha2U6CisKKzIwMTUtMDQtMjIgIE1pY2hhZWwgQ2F0YW56YXJv ICA8bWNhdGFuemFyb0BpZ2FsaWEuY29tPgorCiAgICAgICAgIFtDTWFrZV0gQ2xlYW4gdXAgSlND IEpJVCBvcHRpb25zCiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0xNDM5OTgKIAo=