Title: [140458] trunk/Tools
- Revision
- 140458
- Author
- [email protected]
- Date
- 2013-01-22 13:23:41 -0800 (Tue, 22 Jan 2013)
Log Message
Prettify the output of the override-feature-defines script
https://bugs.webkit.org/show_bug.cgi?id=106542
Patch by Zan Dobersek <[email protected]> on 2013-01-22
Reviewed by Martin Robinson.
The output now clearly lists the feature defines being overridden
along with the default and overriding values for each feature define.
* gtk/override-feature-defines:
(adjust_feature_defines_makefile):
(adjust_feature_defines_makefile.override_feature_define):
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (140457 => 140458)
--- trunk/Tools/ChangeLog 2013-01-22 21:21:34 UTC (rev 140457)
+++ trunk/Tools/ChangeLog 2013-01-22 21:23:41 UTC (rev 140458)
@@ -1,3 +1,17 @@
+2013-01-22 Zan Dobersek <[email protected]>
+
+ Prettify the output of the override-feature-defines script
+ https://bugs.webkit.org/show_bug.cgi?id=106542
+
+ Reviewed by Martin Robinson.
+
+ The output now clearly lists the feature defines being overridden
+ along with the default and overriding values for each feature define.
+
+ * gtk/override-feature-defines:
+ (adjust_feature_defines_makefile):
+ (adjust_feature_defines_makefile.override_feature_define):
+
2013-01-22 Zan Dobersek <[email protected]>
Remove uses of deprecated unittest.TestCase aliases
Modified: trunk/Tools/gtk/override-feature-defines (140457 => 140458)
--- trunk/Tools/gtk/override-feature-defines 2013-01-22 21:21:34 UTC (rev 140457)
+++ trunk/Tools/gtk/override-feature-defines 2013-01-22 21:23:41 UTC (rev 140458)
@@ -15,22 +15,26 @@
with open(feature_defines_makefile_file) as f:
feature_defines_makefile = f.read()
- overriden_feature_defines = []
+ overridden_feature_defines = {}
def override_feature_define(match):
- matched_feature_define = match.group('feature')
- if matched_feature_define not in feature_defines_overriding:
+ feature_define = match.group('feature')
+ if feature_define not in feature_defines_overriding:
return match.string[match.start():match.end()]
- if int(match.group('default_value')) is not feature_defines_overriding[matched_feature_define]:
- overriden_feature_defines.append(matched_feature_define)
- return "%s=%d" % (matched_feature_define, feature_defines_overriding[matched_feature_define])
+ default_value = int(match.group('default_value'))
+ overriding_value = feature_defines_overriding[feature_define]
+ if default_value is not overriding_value:
+ overridden_feature_defines[feature_define] = default_value, overriding_value
+ return "%s=%d" % (feature_define, overriding_value)
feature_defines_makefile = re.sub(r"(?P<feature>(?:ENABLE_)\w+)=(?P<default_value>0|1)", override_feature_define, feature_defines_makefile)
with open(feature_defines_makefile_file, 'w') as f:
f.write(feature_defines_makefile)
- if overriden_feature_defines:
- print("The following feature defines were overriden:\n{0}".format(', '.join(overriden_feature_defines)))
+ if overridden_feature_defines:
+ print("The following feature defines were overriden:")
+ for feature, values in iter(overridden_feature_defines.items()):
+ print("\t{0}: {1} => {2}".format(feature, *values))
def override_feature_defines(build_dir):
copy_feature_defines_makefile()
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
