From e182b3abba8d90c030a9ada95beff3d1fcc53359 Mon Sep 17 00:00:00 2001 From: "weinig@apple.com" Date: Tue, 3 Mar 2009 02:24:55 +0000 Subject: [PATCH] JavaScriptCore: 2009-03-02 Sam Weinig Reviewed by Mark Rowe. Enable Geolocation (except on Tiger and Leopard). * Configurations/JavaScriptCore.xcconfig: WebCore: 2009-03-02 Sam Weinig Reviewed by Mark Rowe. Enable Geolocation (except on Tiger and Leopard). * Configurations/WebCore.xcconfig: WebKit/mac: 2009-03-02 Sam Weinig Reviewed by Mark Rowe. Enable Geolocation (except on Tiger and Leopard). * Configurations/WebKit.xcconfig: WebKitTools: 2009-03-02 Sam Weinig Reviewed by Mark Rowe. Enable Geolocation (except on Tiger and Leopard). * Scripts/build-webkit: git-svn-id: https://svn.webkit.org/repository/webkit/trunk@41378 268f45cc-cd09-0410-ab3c-d52691b4dbfc --- JavaScriptCore/ChangeLog | 8 ++++++++ JavaScriptCore/Configurations/JavaScriptCore.xcconfig | 7 ++++++- WebCore/ChangeLog | 8 ++++++++ WebCore/Configurations/WebCore.xcconfig | 7 ++++++- WebKit/mac/ChangeLog | 8 ++++++++ WebKit/mac/Configurations/WebKit.xcconfig | 7 ++++++- WebKitTools/ChangeLog | 8 ++++++++ WebKitTools/Scripts/build-webkit | 4 ++++ 8 files changed, 54 insertions(+), 3 deletions(-) diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog index 6b01e59df74d..e0baa3c8e388 100644 --- a/JavaScriptCore/ChangeLog +++ b/JavaScriptCore/ChangeLog @@ -1,3 +1,11 @@ +2009-03-02 Sam Weinig + + Reviewed by Mark Rowe. + + Enable Geolocation (except on Tiger and Leopard). + + * Configurations/JavaScriptCore.xcconfig: + 2009-03-01 David Kilzer Move HAVE_DTRACE check to Base.xcconfig diff --git a/JavaScriptCore/Configurations/JavaScriptCore.xcconfig b/JavaScriptCore/Configurations/JavaScriptCore.xcconfig index ef199d2ad252..1dabc521a549 100644 --- a/JavaScriptCore/Configurations/JavaScriptCore.xcconfig +++ b/JavaScriptCore/Configurations/JavaScriptCore.xcconfig @@ -13,7 +13,12 @@ INSTALL_PATH = $(SYSTEM_LIBRARY_DIR)/Frameworks; PRODUCT_NAME = JavaScriptCore; // This needs to be kept sorted, and in sync with FEATURE_DEFINES in WebCore.xcconfig, WebKit.xcconfig and the default settings of build-webkit. -FEATURE_DEFINES = ENABLE_DATABASE ENABLE_DOM_STORAGE ENABLE_ICONDATABASE ENABLE_OFFLINE_WEB_APPLICATIONS ENABLE_SVG ENABLE_SVG_ANIMATION ENABLE_SVG_AS_IMAGE ENABLE_SVG_FONTS ENABLE_SVG_FOREIGN_OBJECT ENABLE_SVG_USE ENABLE_VIDEO ENABLE_WORKERS ENABLE_XPATH ENABLE_XSLT; +FEATURE_DEFINES = $(FEATURE_DEFINES_$(MAC_OS_X_VERSION_MAJOR)); +FEATURE_DEFINES_BASE = ENABLE_DATABASE ENABLE_DOM_STORAGE ENABLE_ICONDATABASE ENABLE_OFFLINE_WEB_APPLICATIONS ENABLE_SVG ENABLE_SVG_ANIMATION ENABLE_SVG_AS_IMAGE ENABLE_SVG_FONTS ENABLE_SVG_FOREIGN_OBJECT ENABLE_SVG_USE ENABLE_VIDEO ENABLE_WORKERS ENABLE_XPATH ENABLE_XSLT; +FEATURE_DEFINES_ = $(FEATURE_DEFINES_1040); +FEATURE_DEFINES_1040 = $(FEATURE_DEFINES_BASE); +FEATURE_DEFINES_1050 = $(FEATURE_DEFINES_BASE); +FEATURE_DEFINES_1060 = $(FEATURE_DEFINES_BASE) ENABLE_GEOLOCATION; OTHER_CFLAGS = $(OTHER_CFLAGS_$(CONFIGURATION)_$(CURRENT_VARIANT)); OTHER_CFLAGS_Release_normal = $(OTHER_CFLAGS_normal_$(XCODE_VERSION_ACTUAL)); diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog index 9c8e1a5dda8f..9c0e3c7572af 100644 --- a/WebCore/ChangeLog +++ b/WebCore/ChangeLog @@ -1,3 +1,11 @@ +2009-03-02 Sam Weinig + + Reviewed by Mark Rowe. + + Enable Geolocation (except on Tiger and Leopard). + + * Configurations/WebCore.xcconfig: + 2009-03-02 Ojan Vafai Reviewed by Adele Peterson. diff --git a/WebCore/Configurations/WebCore.xcconfig b/WebCore/Configurations/WebCore.xcconfig index 3d19f6317adc..e0a26dd30a11 100644 --- a/WebCore/Configurations/WebCore.xcconfig +++ b/WebCore/Configurations/WebCore.xcconfig @@ -15,7 +15,12 @@ PRODUCT_NAME = WebCore; OTHER_LDFLAGS = -l$(SQLITE3_LIBRARY) -lobjc -sub_library libobjc -umbrella WebKit; // This needs to be kept sorted, and in sync with FEATURE_DEFINES in JavaScriptCore.xcconfig, WebKit.xcconfig and the default settings of build-webkit. -FEATURE_DEFINES = ENABLE_DATABASE ENABLE_DOM_STORAGE ENABLE_ICONDATABASE ENABLE_OFFLINE_WEB_APPLICATIONS ENABLE_SVG ENABLE_SVG_ANIMATION ENABLE_SVG_AS_IMAGE ENABLE_SVG_FONTS ENABLE_SVG_FOREIGN_OBJECT ENABLE_SVG_USE ENABLE_VIDEO ENABLE_WORKERS ENABLE_XPATH ENABLE_XSLT; +FEATURE_DEFINES = $(FEATURE_DEFINES_$(MAC_OS_X_VERSION_MAJOR)); +FEATURE_DEFINES_BASE = ENABLE_DATABASE ENABLE_DOM_STORAGE ENABLE_ICONDATABASE ENABLE_OFFLINE_WEB_APPLICATIONS ENABLE_SVG ENABLE_SVG_ANIMATION ENABLE_SVG_AS_IMAGE ENABLE_SVG_FONTS ENABLE_SVG_FOREIGN_OBJECT ENABLE_SVG_USE ENABLE_VIDEO ENABLE_WORKERS ENABLE_XPATH ENABLE_XSLT; +FEATURE_DEFINES_ = $(FEATURE_DEFINES_1040); +FEATURE_DEFINES_1040 = $(FEATURE_DEFINES_BASE); +FEATURE_DEFINES_1050 = $(FEATURE_DEFINES_BASE); +FEATURE_DEFINES_1060 = $(FEATURE_DEFINES_BASE) ENABLE_GEOLOCATION; SQLITE3_LIBRARY = $(SQLITE3_LIBRARY_$(MAC_OS_X_VERSION_MAJOR)); SQLITE3_LIBRARY_ = WebCoreSQLite3; diff --git a/WebKit/mac/ChangeLog b/WebKit/mac/ChangeLog index 559d44756364..bb09fcd337f8 100644 --- a/WebKit/mac/ChangeLog +++ b/WebKit/mac/ChangeLog @@ -1,3 +1,11 @@ +2009-03-02 Sam Weinig + + Reviewed by Mark Rowe. + + Enable Geolocation (except on Tiger and Leopard). + + * Configurations/WebKit.xcconfig: + 2009-03-02 Anders Carlsson Reviewed by Dan Bernstein. diff --git a/WebKit/mac/Configurations/WebKit.xcconfig b/WebKit/mac/Configurations/WebKit.xcconfig index 0937fdb73adb..afc294977829 100644 --- a/WebKit/mac/Configurations/WebKit.xcconfig +++ b/WebKit/mac/Configurations/WebKit.xcconfig @@ -18,4 +18,9 @@ WEBCORE_PRIVATE_HEADERS_DIR = $(UMBRELLA_FRAMEWORKS_DIR)/WebCore.framework/Priva OTHER_LDFLAGS = -sub_umbrella WebCore $(OTHER_LDFLAGS); // This needs to be kept sorted, and in sync with FEATURE_DEFINES in JavaScriptCore.xcconfig, WebCore.xcconfig and the default settings of build-webkit. -FEATURE_DEFINES = ENABLE_DATABASE ENABLE_DOM_STORAGE ENABLE_ICONDATABASE ENABLE_OFFLINE_WEB_APPLICATIONS ENABLE_SVG ENABLE_SVG_ANIMATION ENABLE_SVG_AS_IMAGE ENABLE_SVG_FONTS ENABLE_SVG_FOREIGN_OBJECT ENABLE_SVG_USE ENABLE_VIDEO ENABLE_WORKERS ENABLE_XPATH ENABLE_XSLT; +FEATURE_DEFINES = $(FEATURE_DEFINES_$(MAC_OS_X_VERSION_MAJOR)); +FEATURE_DEFINES_BASE = ENABLE_DATABASE ENABLE_DOM_STORAGE ENABLE_ICONDATABASE ENABLE_OFFLINE_WEB_APPLICATIONS ENABLE_SVG ENABLE_SVG_ANIMATION ENABLE_SVG_AS_IMAGE ENABLE_SVG_FONTS ENABLE_SVG_FOREIGN_OBJECT ENABLE_SVG_USE ENABLE_VIDEO ENABLE_WORKERS ENABLE_XPATH ENABLE_XSLT; +FEATURE_DEFINES_ = $(FEATURE_DEFINES_1040); +FEATURE_DEFINES_1040 = $(FEATURE_DEFINES_BASE); +FEATURE_DEFINES_1050 = $(FEATURE_DEFINES_BASE); +FEATURE_DEFINES_1060 = $(FEATURE_DEFINES_BASE) ENABLE_GEOLOCATION; diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog index a5e7b4c84ae9..a0a26ac74f1f 100644 --- a/WebKitTools/ChangeLog +++ b/WebKitTools/ChangeLog @@ -1,3 +1,11 @@ +2009-03-02 Sam Weinig + + Reviewed by Mark Rowe. + + Enable Geolocation (except on Tiger and Leopard). + + * Scripts/build-webkit: + 2009-03-02 Kevin Ollivier Build fixes for wxWidgets Mac trunk build. diff --git a/WebKitTools/Scripts/build-webkit b/WebKitTools/Scripts/build-webkit index 9d6f933c10cf..62f114d190bc 100755 --- a/WebKitTools/Scripts/build-webkit +++ b/WebKitTools/Scripts/build-webkit @@ -58,6 +58,7 @@ my $wmlSupport = 0; my $coverageSupport = 0; my $videoSupport = isAppleWebKit(); # Enable by default for Apple's builds my $workersSupport = (isAppleWebKit() || isGtk()); # Enable by default for Apple's builds (mac/win) and Gtk+ +my $geolocationSupport = (isAppleMacWebKit() && !isTiger() && !isLeopard()); my $showHelp = 0; my $clean = 0; my $buildUniversal = 0; @@ -93,6 +94,7 @@ Usage: $programName [options] [options to pass to build system] --[no-]wml Toggle WML support (default: $wmlSupport) --[no-]video Toggle Video support (default: $videoSupport) --[no-]workers Toggle Web Workers support (default: $workersSupport) + --[no-]geolocation Toggle Geolocation support (default: $geolocationSupport) --[no-]coverage Toggle code coverage support (default: $coverageSupport) EOF @@ -116,6 +118,7 @@ GetOptions( 'wml!' => \$wmlSupport, 'video!' => \$videoSupport, 'workers!' => \$workersSupport, + 'geolocation!' => \$geolocationSupport, 'coverage!' => \$coverageSupport, 'help' => \$showHelp, 'universal' => \$buildUniversal, @@ -165,6 +168,7 @@ push @overrideFeatureDefinesOption, "ENABLE_WORKERS" if $workersSupport; push @overrideFeatureDefinesOption, "ENABLE_XPATH" if $xpathSupport; push @overrideFeatureDefinesOption, "ENABLE_XSLT" if $xsltSupport; push @overrideFeatureDefinesOption, "ENABLE_WML" if $wmlSupport; +push @overrideFeatureDefinesOption, "ENABLE_GEOLOCATION" if $geolocationSupport; my $overrideFeatureDefinesString = "FEATURE_DEFINES=" . join(" ", @overrideFeatureDefinesOption); my @coverageSupportOption = ($coverageSupport) ? XcodeCoverageSupportOptions() : (); -- 2.36.0