Top:
authorddkilzer@apple.com <ddkilzer@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 30 Apr 2008 00:31:10 +0000 (00:31 +0000)
committerddkilzer@apple.com <ddkilzer@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 30 Apr 2008 00:31:10 +0000 (00:31 +0000)
        BUILD FIX for ENABLE(DASHBOARD_SUPPORT)

        * configure.ac: Added conditional for ENABLE_DASHBOARD_SUPPORT.

JavaScriptCore:

        BUILD FIX for ENABLE(DASHBOARD_SUPPORT)

        * wtf/Platform.h: Defined ENABLE(DASHBOARD_SUPPORT) to 1 only for
        PLATFORM(MAC) and PLATFORM(WIN).  Changed default to 0 for other
        ports.

WebCore:

        BUILD FIX for ENABLE(DASHBOARD_SUPPORT)

        * DerivedSources.make: Removed duplication of targets for
        generating CSSPropertyNames.h and CSSValueKeywords.h.
        * GNUmakefile.am: Ditto.  Added support for ENABLE_DASHBOARD_SUPPORT.
        * WebCore.pro: Added support for ENABLE_DASHBOARD_SUPPORT.
        Made both SVG and non-SVG variables of GENERATOR 6-A use new
        DASHBOARDSUPPORTCSSPROPERTIES variable.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@32712 268f45cc-cd09-0410-ab3c-d52691b4dbfc

ChangeLog
JavaScriptCore/ChangeLog
JavaScriptCore/wtf/Platform.h
WebCore/ChangeLog
WebCore/DerivedSources.make
WebCore/GNUmakefile.am
WebCore/WebCore.pro
configure.ac

index d5172fd..87c5b19 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-04-29  David Kilzer  <ddkilzer@apple.com>
+
+        BUILD FIX for ENABLE(DASHBOARD_SUPPORT)
+
+        * configure.ac: Added conditional for ENABLE_DASHBOARD_SUPPORT.
+
 2008-04-22  Alp Toker  <alp@nuanti.com>
 
         GTK+ debug build fix for changes in r32257.
index 478bc55..8ebcb71 100644 (file)
@@ -1,3 +1,11 @@
+2008-04-29  David Kilzer  <ddkilzer@apple.com>
+
+        BUILD FIX for ENABLE(DASHBOARD_SUPPORT)
+
+        * wtf/Platform.h: Defined ENABLE(DASHBOARD_SUPPORT) to 1 only for
+        PLATFORM(MAC) and PLATFORM(WIN).  Changed default to 0 for other
+        ports.
+
 2008-04-29  Greg Bolsinga  <bolsinga@apple.com>
 
         Reviewed by Darin.
index 36b96de..aeac560 100644 (file)
 #endif
 
 #if PLATFORM(MAC) || PLATFORM(WIN)
+#define ENABLE_DASHBOARD_SUPPORT 1
 #define HAVE_ACCESSIBILITY 1
 #endif
 
 #endif
 
 #if !defined(ENABLE_DASHBOARD_SUPPORT)
-#define ENABLE_DASHBOARD_SUPPORT 1
+#define ENABLE_DASHBOARD_SUPPORT 0
 #endif
 
 #endif /* WTF_Platform_h */
index 9b1db19..e59da3d 100644 (file)
@@ -1,3 +1,14 @@
+2008-04-29  David Kilzer  <ddkilzer@apple.com>
+
+        BUILD FIX for ENABLE(DASHBOARD_SUPPORT)
+
+        * DerivedSources.make: Removed duplication of targets for
+        generating CSSPropertyNames.h and CSSValueKeywords.h.
+        * GNUmakefile.am: Ditto.  Added support for ENABLE_DASHBOARD_SUPPORT.
+        * WebCore.pro: Added support for ENABLE_DASHBOARD_SUPPORT.
+        Made both SVG and non-SVG variables of GENERATOR 6-A use new
+        DASHBOARDSUPPORTCSSPROPERTIES variable.
+
 2008-04-29  Ada Chan  <adachan@apple.com>
 
         Added missing return.        
index fe55d01..1c2ebc8 100644 (file)
@@ -398,41 +398,28 @@ endif
 # CSS property names and value keywords
 
 WEBCORE_CSS_PROPERTY_NAMES := $(WebCore)/css/CSSPropertyNames.in
+WEBCORE_CSS_VALUE_KEYWORDS := $(WebCore)/css/CSSValueKeywords.in
 
 ifeq ($(findstring ENABLE_SVG,$(FEATURE_DEFINES)), ENABLE_SVG)
-       WEBCORE_CSS_PROPERTY_NAMES := $(WEBCORE_CSS_PROPERTY_NAMES) $(WebCore)/css/SVGCSSPropertyNames.in
+    WEBCORE_CSS_PROPERTY_NAMES := $(WEBCORE_CSS_PROPERTY_NAMES) $(WebCore)/css/SVGCSSPropertyNames.in
+    WEBCORE_CSS_VALUE_KEYWORDS := $(WEBCORE_CSS_VALUE_KEYWORDS) $(WebCore)/css/SVGCSSValueKeywords.in
 endif
 
 ifeq ($(ENABLE_DASHBOARD_SUPPORT), 1)
     WEBCORE_CSS_PROPERTY_NAMES := $(WEBCORE_CSS_PROPERTY_NAMES) $(WebCore)/css/DashboardSupportCSSPropertyNames.in
 endif
 
-ifeq ($(findstring ENABLE_SVG,$(FEATURE_DEFINES)), ENABLE_SVG)
-
 CSSPropertyNames.h : $(WEBCORE_CSS_PROPERTY_NAMES) css/makeprop.pl
        if sort $(WEBCORE_CSS_PROPERTY_NAMES) | uniq -d | grep -E '^[^#]'; then echo 'Duplicate value!'; exit 1; fi
        cat $(WEBCORE_CSS_PROPERTY_NAMES) > CSSPropertyNames.in
        perl "$(WebCore)/css/makeprop.pl"
 
-CSSValueKeywords.h : css/CSSValueKeywords.in css/SVGCSSValueKeywords.in css/makevalues.pl
+CSSValueKeywords.h : $(WEBCORE_CSS_VALUE_KEYWORDS) css/makevalues.pl
        # Lower case all the values, as CSS values are case-insensitive
-       perl -ne 'print lc' $(WebCore)/css/SVGCSSValueKeywords.in > SVGCSSValueKeywords.in
-       if sort $< SVGCSSValueKeywords.in | uniq -d | grep -E '^[^#]'; then echo 'Duplicate value!'; exit 1; fi
-       cat $< SVGCSSValueKeywords.in > CSSValueKeywords.in
+       perl -ne 'print lc' $(WEBCORE_CSS_VALUE_KEYWORDS) > CSSValueKeywords.in
+       if sort CSSValueKeywords.in | uniq -d | grep -E '^[^#]'; then echo 'Duplicate value!'; exit 1; fi
        perl "$(WebCore)/css/makevalues.pl"
 
-else
-
-CSSPropertyNames.h : $(WEBCORE_CSS_PROPERTY_NAMES) css/makeprop.pl
-       cat $(WEBCORE_CSS_PROPERTY_NAMES) > CSSPropertyNames.in
-       perl "$(WebCore)/css/makeprop.pl"
-
-CSSValueKeywords.h : css/CSSValueKeywords.in css/makevalues.pl
-       cp $< CSSValueKeywords.in
-       perl "$(WebCore)/css/makevalues.pl"
-
-endif 
-
 # --------
 
 # DOCTYPE strings
index 66d7bfd..67907b8 100644 (file)
@@ -4,6 +4,9 @@ WebCore := $(srcdir)/WebCore
 FEATURE_DEFINES_JAVASCRIPT := LANGUAGE_JAVASCRIPT=1
 SVG_FEATURES :=
 
+WEBCORE_CSS_PROPERTY_NAMES = $(WebCore)/css/CSSPropertyNames.in
+WEBCORE_CSS_VALUE_KEYWORDS = $(WebCore)/css/CSSValueKeywords.in
+
 webcore_cppflags += \
        -I$(srcdir)/WebCore \
        -I$(srcdir)/WebCore/platform \
@@ -1131,6 +1134,23 @@ IDL_BINDINGS += \
 endif # END ENABLE_CROSS_DOCUMENT_MESSAGING
 
 # ----
+# Dashboard Support
+# ----
+if ENABLE_DASHBOARD_SUPPORT
+
+webcore_cppflags += \
+       -DENABLE_DASHBOARD_SUPPORT=1
+
+WEBCORE_CSS_PROPERTY_NAMES += $(WebCore)/css/DashboardSupportCSSPropertyNames.in
+
+else
+
+webcore_cppflags += \
+       -DENABLE_DASHBOARD_SUPPORT=0
+
+endif # END ENABLE_DASHBOARD_SUPPORT
+
+# ----
 # Database Support
 # ----
 if ENABLE_DATABASE
@@ -1373,16 +1393,6 @@ webcore_sources += \
        WebCore/xml/XSLTProcessor.cpp
 endif # END ENABLE_XSLT
 
-webcore_cppflags += -DENABLE_DASHBOARD_SUPPORT=1
-
-WEBCORE_CSS_PROPERTY_NAMES := $(WebCore)/css/CSSPropertyNames.in $(WebCore)/css/DashboardSupportCSSPropertyNames.in
-
-DerivedSources/CSSPropertyNames.h: $(WEBCORE_CSS_PROPERTY_NAMES) $(WebCore)/css/makeprop.pl
-       if sort $(WEBCORE_CSS_PROPERTY_NAMES) | uniq -d | grep -E '^[^#]'; then echo 'Duplicate value!'; exit 1; fi
-       cat $(WEBCORE_CSS_PROPERTY_NAMES) > CSSPropertyNames.in
-       $(PERL) "$(WebCore)/css/makeprop.pl"
-       mv CSSPropertyNames.* $(GENSOURCES)
-
 # ----
 # SVG Support
 #
@@ -1391,6 +1401,9 @@ DerivedSources/CSSPropertyNames.h: $(WEBCORE_CSS_PROPERTY_NAMES) $(WebCore)/css/
 if ENABLE_SVG
 FEATURE_DEFINES_JAVASCRIPT += ENABLE_SVG=1
 
+WEBCORE_CSS_PROPERTY_NAMES += $(WebCore)/css/SVGCSSPropertyNames.in 
+WEBCORE_CSS_VALUE_KEYWORDS += $(WebCore)/css/SVGCSSValueKeywords.in
+
 webkitgtk_cppflags += \
        -I$(srcdir)/WebCore/svg/graphics/cairo
 
@@ -2015,16 +2028,6 @@ webkitgtk_sources += \
        WebCore/svg/graphics/cairo/SVGResourceMaskerCairo.cpp
 
 
-WEBCORE_CSS_PROPERTY_NAMES += $(WebCore)/css/SVGCSSPropertyNames.in
-
-# Lower case all the values, as CSS values are case-insensitive
-DerivedSources/CSSValueKeywords.h : $(WebCore)/css/CSSValueKeywords.in $(WebCore)/css/SVGCSSValueKeywords.in $(WebCore)/css/makevalues.pl
-       $(PERL) -ne 'print lc' $(WebCore)/css/SVGCSSValueKeywords.in > SVGCSSValueKeywords.in
-       if sort $< SVGCSSValueKeywords.in | uniq -d | grep -E '^[^#]'; then echo 'Duplicate value!'; exit 1; fi
-       cat $< SVGCSSValueKeywords.in > CSSValueKeywords.in
-       $(PERL) "$(WebCore)/css/makevalues.pl"
-       mv SVGCSSValueKeywords.in $(GENSOURCES) && mv CSSValueKeywords.* $(GENSOURCES)
-
 # SVG Features
 if ENABLE_SVG_USE
 FEATURE_DEFINES_JAVASCRIPT += ENABLE_SVG_USE=1
@@ -2082,15 +2085,21 @@ DerivedSources/XLinkNames.h: DerivedSources/XLinkNames.cpp;
 DerivedSources/XLinkNames.cpp : $(WebCore)/dom/make_names.pl $(WebCore)/svg/xlinkattrs.in
        $(PERL) $< --attrs $(WebCore)/svg/xlinkattrs.in --namespace XLink --cppNamespace WebCore --namespaceURI "http://www.w3.org/1999/xlink" --output $(GENSOURCES)
 
-else !ENABLE_SVG
+endif # END ENABLE_SVG
 
-DerivedSources/CSSValueKeywords.h: $(WebCore)/css/CSSValueKeywords.in $(WebCore)/css/makevalues.pl
-       cp $< CSSValueKeywords.in
+DerivedSources/CSSPropertyNames.h: $(WEBCORE_CSS_PROPERTY_NAMES) $(WebCore)/css/makeprop.pl
+       if sort $(WEBCORE_CSS_PROPERTY_NAMES) | uniq -d | grep -E '^[^#]'; then echo 'Duplicate value!'; exit 1; fi
+       cat $(WEBCORE_CSS_PROPERTY_NAMES) > CSSPropertyNames.in
+       $(PERL) "$(WebCore)/css/makeprop.pl"
+       mv CSSPropertyNames.* $(GENSOURCES)
+
+# Lower case all the values, as CSS values are case-insensitive
+DerivedSources/CSSValueKeywords.h : $(WEBCORE_CSS_VALUE_KEYWORDS) $(WebCore)/css/makevalues.pl
+       $(PERL) -ne 'print lc' $(WEBCORE_CSS_VALUE_KEYWORDS) > CSSValueKeywords.in
+       if sort CSSValueKeywords.in | uniq -d | grep -E '^[^#]'; then echo 'Duplicate value!'; exit 1; fi
        $(PERL) "$(WebCore)/css/makevalues.pl"
        mv CSSValueKeywords.* $(GENSOURCES)
 
-endif !ENABLE_SVG # END ENABLE_SVG
-
 # DOCTYPE strings
 DerivedSources/DocTypeStrings.cpp : $(WebCore)/html/DocTypeStrings.gperf
        $(GPERF) -CEot -L ANSI-C -k "*" -N findDoctypeEntry -F ,PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards $(WebCore)/html/DocTypeStrings.gperf > $@
index 83a0f8a..cf0f4b5 100644 (file)
@@ -70,6 +70,7 @@ gtk-port: PKGCONFIG += gthread-2.0
 
 # Optional components (look for defs in config.h and included files!)
 !contains(DEFINES, ENABLE_CROSS_DOCUMENT_MESSAGING=.): DEFINES += ENABLE_CROSS_DOCUMENT_MESSAGING=1
+!contains(DEFINES, ENABLE_DASHBOARD_SUPPORT=.): DEFINES += ENABLE_DASHBOARD_SUPPORT=0
 !contains(DEFINES, ENABLE_DATABASE=.): DEFINES += ENABLE_DATABASE=1
 !contains(DEFINES, ENABLE_ICONDATABASE=.): DEFINES += ENABLE_ICONDATABASE=1
 !contains(DEFINES, ENABLE_XPATH=.): DEFINES += ENABLE_XPATH=1
@@ -253,6 +254,8 @@ WALDOCSSPROPS = $$PWD/css/CSSPropertyNames.in
 
 WALDOCSSVALUES = $$PWD/css/CSSValueKeywords.in
 
+DASHBOARDSUPPORTCSSPROPERTIES = $$PWD/css/DashboardSupportCSSPropertyNames.in
+
 SVGCSSPROPERTIES = $$PWD/css/SVGCSSPropertyNames.in
 
 SVGCSSVALUES = $$PWD/css/SVGCSSValueKeywords.in
@@ -1175,6 +1178,10 @@ contains(DEFINES, ENABLE_CROSS_DOCUMENT_MESSAGING=1) {
         dom/MessageEvent.idl
 }
 
+contains(DEFINES, ENABLE_DASHBOARD_SUPPORT=0) {
+    DASHBOARDSUPPORTCSSPROPERTIES -= $$PWD/css/DashboardSupportCSSPropertyNames.in
+}
+
 contains(DEFINES, ENABLE_DATABASE=1) {
     FEATURE_DEFINES_JAVASCRIPT += ENABLE_DATABASE=1
 
@@ -1744,9 +1751,9 @@ gtk-port:SOURCES += \
     # GENERATOR 6-A:
     cssprops.output = $$GENERATED_SOURCES_DIR/${QMAKE_FILE_BASE}.c
     cssprops.input = WALDOCSSPROPS
-    cssprops.commands = perl -ne \"print lc\" ${QMAKE_FILE_NAME} $$SVGCSSPROPERTIES > $$GENERATED_SOURCES_DIR/${QMAKE_FILE_BASE}.in && cd $$GENERATED_SOURCES_DIR && perl $$PWD/css/makeprop.pl && $(DEL_FILE) ${QMAKE_FILE_BASE}.strip ${QMAKE_FILE_BASE}.in ${QMAKE_FILE_BASE}.gperf
+    cssprops.commands = perl -ne \"print lc\" ${QMAKE_FILE_NAME} $$DASHBOARDSUPPORTCSSPROPERTIES $$SVGCSSPROPERTIES > $$GENERATED_SOURCES_DIR/${QMAKE_FILE_BASE}.in && cd $$GENERATED_SOURCES_DIR && perl $$PWD/css/makeprop.pl && $(DEL_FILE) ${QMAKE_FILE_BASE}.strip ${QMAKE_FILE_BASE}.in ${QMAKE_FILE_BASE}.gperf
     cssprops.CONFIG = target_predeps no_link
-    cssprops.depend = ${QMAKE_FILE_NAME} SVGCSSPROPERTIES
+    cssprops.depend = ${QMAKE_FILE_NAME} DASHBOARDSUPPORTCSSPROPERTIES SVGCSSPROPERTIES
     cssprops.clean = ${QMAKE_FILE_OUT} ${QMAKE_VAR_GENERATED_SOURCES_DIR_SLASH}${QMAKE_FILE_BASE}.h
     addExtraCompiler(cssprops)
 
@@ -1762,8 +1769,9 @@ gtk-port:SOURCES += \
     # GENERATOR 6-A:
     cssprops.output = $$GENERATED_SOURCES_DIR/${QMAKE_FILE_BASE}.c
     cssprops.input = WALDOCSSPROPS
-    cssprops.commands = $(COPY_FILE) ${QMAKE_FILE_NAME} $$GENERATED_SOURCES_DIR && cd $$GENERATED_SOURCES_DIR && perl $$PWD/css/makeprop.pl && $(DEL_FILE) ${QMAKE_FILE_BASE}.strip ${QMAKE_FILE_BASE}.in ${QMAKE_FILE_BASE}.gperf
+    cssprops.commands = perl -ne \"print lc\" ${QMAKE_FILE_NAME} $$DASHBOARDSUPPORTCSSPROPERTIES > $$GENERATED_SOURCES_DIR/${QMAKE_FILE_BASE}.in && cd $$GENERATED_SOURCES_DIR && perl $$PWD/css/makeprop.pl && $(DEL_FILE) ${QMAKE_FILE_BASE}.strip ${QMAKE_FILE_BASE}.in ${QMAKE_FILE_BASE}.gperf
     cssprops.CONFIG = target_predeps no_link
+    cssprops.depend = ${QMAKE_FILE_NAME} DASHBOARDSUPPORTCSSPROPERTIES
     cssprops.clean = ${QMAKE_FILE_OUT} ${QMAKE_VAR_GENERATED_SOURCES_DIR_SLASH}${QMAKE_FILE_BASE}.h
     addExtraCompiler(cssprops)
 
index 88dc2dc..a058980 100644 (file)
@@ -508,6 +508,7 @@ AM_CONDITIONAL([USE_PANGO], [test "$with_font_backend" = "pango"])
 
 # WebKit feature conditionals
 AM_CONDITIONAL([ENABLE_DEBUG],[test "$enable_debug" = "yes"])
+AM_CONDITIONAL([ENABLE_DASHBOARD_SUPPORT],[test "$enable_dashboard_support" = "yes"])
 AM_CONDITIONAL([ENABLE_CROSS_DOCUMENT_MESSAGING],[test "$enable_cross_document_messaging" = "yes"])
 AM_CONDITIONAL([ENABLE_DOM_STORAGE],[test "$enable_dom_storage" = "yes"])
 AM_CONDITIONAL([ENABLE_DATABASE],[test "$enable_database" = "yes"])
@@ -545,6 +546,7 @@ Build configuration:
  Font backend                                             : $with_font_backend
  Optimized memory allocator                               : $enable_fast_malloc
 Features:
+ Dashboard support                                        : $enable_dashboard_support
  HTML5 cross-document messaging                           : $enable_cross_document_messaging
  HTML5 client-side session and persistent storage support : $enable_dom_storage
  HTML5 client-side database storage support               : $enable_database