Permalink
Browse files

[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:

Source/WebCore: 

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:


git-svn-id: http://svn.webkit.org/repository/webkit/trunk@127872 268f45cc-cd09-0410-ab3c-d52691b4dbfc
  • Loading branch information...
1 parent 8aafa6e commit 20f497091705844a7de9d0f10d7e5810c34356ac zandobersek committed Sep 7, 2012
Showing with 45 additions and 5 deletions.
  1. +12 −0 ChangeLog
  2. +1 −0 GNUmakefile.am
  3. +23 −0 Source/WebCore/ChangeLog
  4. +9 −5 Source/WebCore/GNUmakefile.am
View
@@ -1,3 +1,15 @@
+2012-09-07 Zan Dobersek <zandobersek@gmail.com>
+
+ [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 <zandobersek@gmail.com>
[Gtk] Remove configuration options for features that are not supported by the Gtk port
View
@@ -61,6 +61,7 @@ MOFILES :=
ALL_MOFILES :=
feature_defines_defaults :=
feature_defines_overrides :=
+feature_defines_unstable :=
feature_defines :=
dom_binding_idls :=
wtf_sources :=
View
@@ -1,3 +1,26 @@
+2012-09-07 Zan Dobersek <zandobersek@gmail.com>
+
+ [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 <loislo@chromium.org>
Web Inspector: NMI: move WebCore specific code to separate header
@@ -546,22 +546,26 @@ endif # END ENABLE_SPELLCHECK
# ---
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)) \
+ ) \
) \
))

0 comments on commit 20f4970

Please sign in to comment.