Modified: trunk/ChangeLog (127871 => 127872)
--- trunk/ChangeLog 2012-09-07 16:01:37 UTC (rev 127871)
+++ trunk/ChangeLog 2012-09-07 16:01:56 UTC (rev 127872)
@@ -1,3 +1,15 @@
+2012-09-07 Zan Dobersek <[email protected]>
+
+ [GTK] Multiple feature defines in webcore_cppflags can occur
+ https://bugs.webkit.org/show_bug.cgi?id=95942
+
+ Reviewed by Martin Robinson.
+
+ Add the feature_defines_unstable variable that should control values of feature
+ defines for unstable features when unstable features are not enabled (e.g. release builds).
+
+ * GNUmakefile.am:
+
2012-09-06 Zan Dobersek <[email protected]>
[Gtk] Remove configuration options for features that are not supported by the Gtk port
Modified: trunk/GNUmakefile.am (127871 => 127872)
--- trunk/GNUmakefile.am 2012-09-07 16:01:37 UTC (rev 127871)
+++ trunk/GNUmakefile.am 2012-09-07 16:01:56 UTC (rev 127872)
@@ -61,6 +61,7 @@
ALL_MOFILES :=
feature_defines_defaults :=
feature_defines_overrides :=
+feature_defines_unstable :=
feature_defines :=
dom_binding_idls :=
wtf_sources :=
Modified: trunk/Source/WebCore/ChangeLog (127871 => 127872)
--- trunk/Source/WebCore/ChangeLog 2012-09-07 16:01:37 UTC (rev 127871)
+++ trunk/Source/WebCore/ChangeLog 2012-09-07 16:01:56 UTC (rev 127872)
@@ -1,3 +1,26 @@
+2012-09-07 Zan Dobersek <[email protected]>
+
+ [GTK] Multiple feature defines in webcore_cppflags can occur
+ https://bugs.webkit.org/show_bug.cgi?id=95942
+
+ Reviewed by Martin Robinson.
+
+ Any feature define that guards a feature deemed currently unstable (is intended
+ to be enabled in developer builds but not in release builds) should be added to the
+ newly-added feature_defines_unstable variable.
+
+ This moves away from adding such feature defines to the feature_defines_overrides variable
+ as this can cause duplicates in the later-generated feature_defines and webcore_cppflags
+ variables and further warnings of duplicate macros when generating bindings.
+
+ The feature_defines generation is now done by first checking if the bare feature define
+ is present in feature_defines_unstable, if not then feature_defines_overrides is also
+ checked before using the value from feature_defines_defaults.
+
+ No new tests - no new functionality.
+
+ * GNUmakefile.am:
+
2012-09-07 Ilya Tikhonovsky <[email protected]>
Web Inspector: NMI: move WebCore specific code to separate header
Modified: trunk/Source/WebCore/GNUmakefile.am (127871 => 127872)
--- trunk/Source/WebCore/GNUmakefile.am 2012-09-07 16:01:37 UTC (rev 127871)
+++ trunk/Source/WebCore/GNUmakefile.am 2012-09-07 16:01:56 UTC (rev 127872)
@@ -546,22 +546,26 @@
# ---
if !ENABLE_UNSTABLE_FEATURES
# FIXME: List unstable features here once their configuration options are removed.
-feature_defines_overrides +=
+feature_defines_unstable +=
endif
# Fill the feature_defines variable with all the defines, making it possible
# to override the default define value (as set in feature_defines_defaults)
-# through adding the feature define with the desired value to feature_defines_overrides.
+# through adding the feature define with the desired value to either
+# feature_defines_unstable or feature_defines_overrides.
feature_defines += $(strip $(foreach bare_define, \
$(foreach define,$(feature_defines_defaults), \
$(foreach fvalue,0 1, \
$(if $(findstring =$(fvalue),$(define)),$(patsubst %=$(fvalue),%,$(define))) \
) \
), \
- $(if $(findstring $(bare_define), $(feature_defines_overrides)), \
- $(filter $(bare_define)=%,$(feature_defines_overrides)), \
- $(filter $(bare_define)=%,$(feature_defines_defaults)) \
+ $(if $(findstring $(bare_define), $(feature_defines_unstable)), \
+ $(filter $(bare_define)=%,$(feature_defines_unstable)), \
+ $(if $(findstring $(bare_define), $(feature_defines_overrides)), \
+ $(filter $(bare_define)=%,$(feature_defines_overrides)), \
+ $(filter $(bare_define)=%,$(feature_defines_defaults)) \
+ ) \
) \
))
