JavaScriptCore:
authorandrew <andrew@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 22 Oct 2007 12:56:02 +0000 (12:56 +0000)
committerandrew <andrew@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 22 Oct 2007 12:56:02 +0000 (12:56 +0000)
        Reviewed by Mark Rowe.

        Fix for local database support after r26879
        Ensure that ENABLE_DATABASE and ENABLE_ICONDATABASE are correctly set

        * Configurations/JavaScriptCore.xcconfig:

WebCore:

        Reviewed by Mark Rowe.

        Fix for local database support after r26879
        Ensure that ENABLE_DATABASE and ENABLE_ICONDATABASE are correctly set

        * Configurations/WebCore.xcconfig:
        * WebCore.pro:
        * WebCore.vcproj/build-generated-files.sh:

WebKit:

        Reviewed by Mark Rowe.

        Fix for local database support after r26879
        Ensure that ENABLE_DATABASE and ENABLE_ICONDATABASE are correctly set

        * Configurations/WebKit.xcconfig:

WebKitTools:

        Reviewed by Mark Rowe.

        Fix for local database support after r26879
        Ensure that ENABLE_DATABASE and ENABLE_ICONDATABASE are correctly set

        * Scripts/build-webkit:

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

JavaScriptCore/ChangeLog
JavaScriptCore/Configurations/JavaScriptCore.xcconfig
WebCore/ChangeLog
WebCore/Configurations/WebCore.xcconfig
WebCore/WebCore.pro
WebCore/WebCore.vcproj/build-generated-files.sh
WebKit/ChangeLog
WebKit/Configurations/WebKit.xcconfig
WebKitTools/ChangeLog
WebKitTools/Scripts/build-webkit

index 4d8ebfd716554e7a9d78010e4eaa02cbaa5734de..8b323b9213e163488dbc51b462016b0509c9916e 100644 (file)
@@ -1,3 +1,12 @@
+2007-10-22  Andrew Wellington  <proton@wiretapped.net>
+
+        Reviewed by Mark Rowe.
+        
+        Fix for local database support after r26879
+        Ensure that ENABLE_DATABASE and ENABLE_ICONDATABASE are correctly set
+
+        * Configurations/JavaScriptCore.xcconfig:
+
 2007-10-22  Simon Hausmann  <hausmann@kde.org>
 
         Reviewed by Alp.
index 45a4eff90a4b7d0d76729eb38a763acfe02eca06..eed73cce5964701beb6c31680aded52b0a17b7be 100644 (file)
@@ -5,7 +5,7 @@ EXPORTED_SYMBOLS_FILE_i386 = JavaScriptCore.exp;
 EXPORTED_SYMBOLS_FILE_ppc = JavaScriptCore.exp;
 EXPORTED_SYMBOLS_FILE_ppc64 = $(BUILT_PRODUCTS_DIR)/DerivedSources/JavaScriptCore/JavaScriptCore.LP64.exp;
 EXPORTED_SYMBOLS_FILE_x86_64 = $(BUILT_PRODUCTS_DIR)/DerivedSources/JavaScriptCore/JavaScriptCore.LP64.exp;
-FEATURE_DEFINES = ENABLE_SVG ENABLE_SVG_EXPERIMENTAL_FEATURES ENABLE_XPATH ENABLE_XSLT;
+FEATURE_DEFINES = ENABLE_DATABASE ENABLE_ICONDATABASE ENABLE_SVG ENABLE_SVG_EXPERIMENTAL_FEATURES ENABLE_XPATH ENABLE_XSLT;
 OTHER_LDFLAGS = -lobjc -sub_library libobjc -Wl,-Y,3;
 GCC_PREFIX_HEADER = JavaScriptCorePrefix.h;
 GCC_PREPROCESSOR_DEFINITIONS = $(DEBUG_DEFINES) $(GCC_PREPROCESSOR_DEFINITIONS);
index c480686ec0107e6788e154e29aef14fc5205a1c7..55a5edacd816f58f4abfd592ee08c528541fcd3c 100644 (file)
@@ -1,3 +1,14 @@
+2007-10-22  Andrew Wellington  <proton@wiretapped.net>
+
+        Reviewed by Mark Rowe.
+
+        Fix for local database support after r26879
+        Ensure that ENABLE_DATABASE and ENABLE_ICONDATABASE are correctly set
+
+        * Configurations/WebCore.xcconfig:
+        * WebCore.pro:
+        * WebCore.vcproj/build-generated-files.sh:
+
 2007-10-22  Simon Hausmann  <hausmann@kde.org>
 
         Reviewed by Lars.
index 7ba5ac0f63602b05b95454ac8339e22a491402dc..60383802fa73a3d23795e90ad550c620ab5f59ca 100644 (file)
@@ -5,7 +5,7 @@ EXPORTED_SYMBOLS_FILE_i386 = $(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/WebCor
 EXPORTED_SYMBOLS_FILE_ppc = $(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/WebCore.exp;
 EXPORTED_SYMBOLS_FILE_ppc64 = $(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/WebCore.LP64.exp;
 EXPORTED_SYMBOLS_FILE_x86_64 = $(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/WebCore.LP64.exp;
-FEATURE_DEFINES = ENABLE_SVG ENABLE_SVG_EXPERIMENTAL_FEATURES ENABLE_XPATH ENABLE_XSLT;
+FEATURE_DEFINES = ENABLE_DATABASE ENABLE_ICONDATABASE ENABLE_SVG ENABLE_SVG_EXPERIMENTAL_FEATURES ENABLE_XPATH ENABLE_XSLT;
 GCC_PREFIX_HEADER = WebCorePrefix.h;
 GCC_PREPROCESSOR_DEFINITIONS = $(DEBUG_DEFINES) $(FEATURE_DEFINES) $(GCC_PREPROCESSOR_DEFINITIONS);
 FRAMEWORK_SEARCH_PATHS = $(SYSTEM_LIBRARY_DIR)/Frameworks/Carbon.framework/Frameworks $(SYSTEM_LIBRARY_DIR)/Frameworks/ApplicationServices.framework/Frameworks $(FRAMEWORK_SEARCH_PATHS);
index ff754fd600de02ebf227a454947ea0dba5d7b95a..f97b97d03316bceed0cf22a18be289726456d3ea 100644 (file)
@@ -959,6 +959,7 @@ gtk-port {
 
 # ENABLE_DATABASE probably cannot be disabled without breaking things
 contains(DEFINES, ENABLE_DATABASE=1) {
+    FEATURE_DEFINES_JAVASCRIPT += ENABLE_DATABASE=1
     qt-port: INCLUDEPATH += $$[QT_INSTALL_PREFIX]/src/3rdparty/sqlite/
     LIBS += -lsqlite3
     SOURCES += \
index e303c23a2f34acff1492bffb18a9906e89d026c8..b1a81a8d37cc456da1244f2bd31370b4b9900558 100644 (file)
@@ -39,5 +39,5 @@ mkdir -p "${BUILT_PRODUCTS_DIR}/DerivedSources"
 cd "${BUILT_PRODUCTS_DIR}/DerivedSources"
 
 export WebCore="${XSRCROOT}"
-export FEATURE_DEFINES="ENABLE_XPATH ENABLE_SVG ENABLE_SVG_EXPERIMENTAL_FEATURES"
+export FEATURE_DEFINES="ENABLE_DATABASE ENABLE_ICONDATABASE ENABLE_XPATH ENABLE_SVG ENABLE_SVG_EXPERIMENTAL_FEATURES"
 make -f "$WebCore/DerivedSources.make" -j ${NUMCPUS} || exit 1
index bf19834d3a29201bc76e5c1b17bdb0f2f0adf188..5ec8fd379d4cceb186e9ea2fa57f3b7816514102 100644 (file)
@@ -1,3 +1,12 @@
+2007-10-22  Andrew Wellington  <proton@wiretapped.net>
+
+        Reviewed by Mark Rowe.
+        
+        Fix for local database support after r26879
+        Ensure that ENABLE_DATABASE and ENABLE_ICONDATABASE are correctly set
+
+        * Configurations/WebKit.xcconfig:
+
 2007-10-19  Brady Eidson <beidson@apple.com>
 
         Reviewed by Tim Hatcher
index 5d13d3e146327c625ab59330836e6f4f65f34d83..fcd0e98a24e0fbbe3bd8dda36927ca9934da6a0a 100644 (file)
@@ -5,7 +5,7 @@ EXPORTED_SYMBOLS_FILE_i386 = WebKit.exp;
 EXPORTED_SYMBOLS_FILE_ppc = WebKit.exp;
 EXPORTED_SYMBOLS_FILE_ppc64 = $(BUILT_PRODUCTS_DIR)/DerivedSources/WebKit/WebKit.LP64.exp;
 EXPORTED_SYMBOLS_FILE_x86_64 = $(BUILT_PRODUCTS_DIR)/DerivedSources/WebKit/WebKit.LP64.exp;
-FEATURE_DEFINES = ENABLE_SVG ENABLE_SVG_EXPERIMENTAL_FEATURES ENABLE_XPATH ENABLE_XSLT;
+FEATURE_DEFINES = ENABLE_DATABASE ENABLE_ICONDATABASE ENABLE_SVG ENABLE_SVG_EXPERIMENTAL_FEATURES ENABLE_XPATH ENABLE_XSLT;
 FRAMEWORK_SEARCH_PATHS = $(UMBRELLA_FRAMEWORKS_DIR) $(SYSTEM_LIBRARY_DIR)/Frameworks/ApplicationServices.framework/Frameworks $(SYSTEM_LIBRARY_DIR)/Frameworks/Carbon.framework/Frameworks $(SYSTEM_LIBRARY_DIR)/Frameworks/Quartz.framework/Frameworks $(SYSTEM_LIBRARY_DIR)/PrivateFrameworks $(FRAMEWORK_SEARCH_PATHS);
 GCC_PREFIX_HEADER = WebKitPrefix.h;
 GCC_PREPROCESSOR_DEFINITIONS = $(DEBUG_DEFINES) $(FEATURE_DEFINES) FRAMEWORK_NAME=WebKit $(GCC_PREPROCESSOR_DEFINITIONS);
index ec630447f0394a10000cf4903988073516d654d1..4e5a6430db61e3fd649cbcaa4dda0c281d255082 100644 (file)
@@ -1,3 +1,12 @@
+2007-10-22  Andrew Wellington  <proton@wiretapped.net>
+
+        Reviewed by Mark Rowe.
+        
+        Fix for local database support after r26879
+        Ensure that ENABLE_DATABASE and ENABLE_ICONDATABASE are correctly set
+
+        * Scripts/build-webkit:
+
 2007-10-22  Holger Freyther  <zecke@selfish.org>
 
         Reviewed by Simon Hausmann <hausmann@kde.org>.
index ddf59c27f663cf655f9d18650a77af8f29e074fe..bc6afcc928cbf71e2e02b1f5c6a8887275671347 100755 (executable)
@@ -82,6 +82,8 @@ my $productDir = productDir();
 my @options = XcodeOptions();
 my @overrideFeatureDefinesOption = ();
 
+push @overrideFeatureDefinesOption, "ENABLE_DATABASE";
+push @overrideFeatureDefinesOption, "ENABLE_ICONDATABASE";
 push @overrideFeatureDefinesOption, "ENABLE_SVG" if $svgSupport;
 push @overrideFeatureDefinesOption, "ENABLE_SVG_EXPERIMENTAL_FEATURES" if $svgExperimentalSupport;
 push @overrideFeatureDefinesOption, "ENABLE_XPATH" if $xpathSupport;