Future-proof Xcode configuration settings.

Source/JavaScriptCore:

* Configurations/Base.xcconfig:
* Configurations/DebugRelease.xcconfig:
* Configurations/JavaScriptCore.xcconfig:
* Configurations/Version.xcconfig:

Source/JavaScriptGlue:

* Configurations/Base.xcconfig:
* Configurations/CompilerVersion.xcconfig:
* Configurations/DebugRelease.xcconfig:
* Configurations/Version.xcconfig:

Source/ThirdParty:

* gtest/xcode/Config/General.xcconfig:

Source/ThirdParty/ANGLE:

* Configurations/Base.xcconfig:
* Configurations/CompilerVersion.xcconfig:
* Configurations/DebugRelease.xcconfig:

Source/WebCore:

* Configurations/Base.xcconfig:
* Configurations/DebugRelease.xcconfig:
* Configurations/Version.xcconfig:
* Configurations/WebCore.xcconfig:

Source/WebKit/mac:

* Configurations/Base.xcconfig:
* Configurations/DebugRelease.xcconfig:
* Configurations/Version.xcconfig:
* Configurations/WebKit.xcconfig:

Source/WebKit2:

* Configurations/Base.xcconfig:
* Configurations/CompilerVersion.xcconfig:
* Configurations/DebugRelease.xcconfig:
* Configurations/Version.xcconfig:
* Configurations/WebKit2.xcconfig:

Tools:

* DumpRenderTree/mac/Configurations/Base.xcconfig:
* DumpRenderTree/mac/Configurations/CompilerVersion.xcconfig:
* DumpRenderTree/mac/Configurations/DebugRelease.xcconfig:
* MiniBrowser/Configurations/Base.xcconfig:
* MiniBrowser/Configurations/CompilerVersion.xcconfig:
* MiniBrowser/Configurations/DebugRelease.xcconfig:
* TestWebKitAPI/Configurations/Base.xcconfig:
* TestWebKitAPI/Configurations/CompilerVersion.xcconfig:
* TestWebKitAPI/Configurations/DebugRelease.xcconfig:
* WebKitTestRunner/Configurations/Base.xcconfig:
* WebKitTestRunner/Configurations/CompilerVersion.xcconfig:
* WebKitTestRunner/Configurations/DebugRelease.xcconfig:

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

diff --git a/Source/JavaScriptCore/ChangeLog b/Source/JavaScriptCore/ChangeLog
index 048956c37411f2a4f3f61136ccecd9da9ba66fb1..98372476e10c16c905c483abb5edc9cb4bfacb25 100644 (file)
--- a/Source/JavaScriptCore/ChangeLog
+++ b/Source/JavaScriptCore/ChangeLog
@@ -1,3 +1,12 @@
+2011-08-04  Mark Rowe  <mrowe@apple.com>
+
+        Future-proof Xcode configuration settings.
+
+        * Configurations/Base.xcconfig:
+        * Configurations/DebugRelease.xcconfig:
+        * Configurations/JavaScriptCore.xcconfig:
+        * Configurations/Version.xcconfig:
+
 2011-08-04  Mark Hahnenberg  <mhahnenberg@apple.com>
 
         Interpreter can potentially GC in the middle of initializing a structure chain

diff --git a/Source/JavaScriptCore/Configurations/Base.xcconfig b/Source/JavaScriptCore/Configurations/Base.xcconfig
index 51f1553b2e2510c4521cc36adaa472629826a699..f0ab528431af723f5bf8df29e970844ecd10def7 100644 (file)
--- a/Source/JavaScriptCore/Configurations/Base.xcconfig
+++ b/Source/JavaScriptCore/Configurations/Base.xcconfig
@@ -115,7 +115,14 @@ GCC_ENABLE_CPP_EXCEPTIONS_LLVM_COMPILER = YES;
 SDKROOT = $(SDKROOT_$(MAC_OS_X_VERSION_MAJOR)_$(TARGET_MAC_OS_X_VERSION_MAJOR));
 SDKROOT_1060_1050 = macosx10.5;
 SDKROOT_1070_1050 = macosx10.5;
+SDKROOT_1080_1050 = macosx10.5;
+SDKROOT_1090_1050 = macosx10.5;
 SDKROOT_1070_1060 = macosx10.6;
+SDKROOT_1080_1060 = macosx10.6;
+SDKROOT_1090_1060 = macosx10.6;
+SDKROOT_1080_1070 = macosx10.7;
+SDKROOT_1090_1070 = macosx10.7;
+SDKROOT_1090_1080 = macosx10.8;
 
 
 // HAVE_DTRACE is disabled on Leopard due to <rdar://problem/5628149>
@@ -126,3 +133,5 @@ HAVE_DTRACE_macosx = $(HAVE_DTRACE_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR));
 HAVE_DTRACE_macosx_1050 = 0;
 HAVE_DTRACE_macosx_1060 = 1;
 HAVE_DTRACE_macosx_1070 = 1;
+HAVE_DTRACE_macosx_1080 = 1;
+HAVE_DTRACE_macosx_1090 = 1;

diff --git a/Source/JavaScriptCore/Configurations/DebugRelease.xcconfig b/Source/JavaScriptCore/Configurations/DebugRelease.xcconfig
index 7f1fbf8c55f2b987803aeb1052feb82836e0b9da..2b2cff7e51288599606a17b50657408ddb758014 100644 (file)
--- a/Source/JavaScriptCore/Configurations/DebugRelease.xcconfig
+++ b/Source/JavaScriptCore/Configurations/DebugRelease.xcconfig
@@ -30,6 +30,8 @@ ARCHS_macosx = $(ARCHS_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR));
 ARCHS_macosx_1050 = $(NATIVE_ARCH);
 ARCHS_macosx_1060 = $(ARCHS_STANDARD_32_64_BIT);
 ARCHS_macosx_1070 = $(ARCHS_STANDARD_32_64_BIT);
+ARCHS_macosx_1080 = $(ARCHS_STANDARD_32_64_BIT);
+ARCHS_macosx_1090 = $(ARCHS_STANDARD_32_64_BIT);
 
 ONLY_ACTIVE_ARCH = YES;
 
@@ -40,6 +42,8 @@ MACOSX_DEPLOYMENT_TARGET_macosx = $(MACOSX_DEPLOYMENT_TARGET_macosx_$(TARGET_MAC
 MACOSX_DEPLOYMENT_TARGET_macosx_1050 = 10.5;
 MACOSX_DEPLOYMENT_TARGET_macosx_1060 = 10.6;
 MACOSX_DEPLOYMENT_TARGET_macosx_1070 = 10.7;
+MACOSX_DEPLOYMENT_TARGET_macosx_1080 = 10.8;
+MACOSX_DEPLOYMENT_TARGET_macosx_1090 = 10.9;
 
 GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = YES;
 

diff --git a/Source/JavaScriptCore/Configurations/JavaScriptCore.xcconfig b/Source/JavaScriptCore/Configurations/JavaScriptCore.xcconfig
index dd2a2e9069151c80ad4bcb3fb8b661779eb40f34..65f5ca5d7e8a2d9f3efb733b582ad91e8ba7e60f 100644 (file)
--- a/Source/JavaScriptCore/Configurations/JavaScriptCore.xcconfig
+++ b/Source/JavaScriptCore/Configurations/JavaScriptCore.xcconfig
@@ -40,6 +40,8 @@ OTHER_LDFLAGS_iphoneos = $(OTHER_LDFLAGS_BASE);
 OTHER_LDFLAGS_iphonesimulator = $(OTHER_LDFLAGS_iphoneos);
 OTHER_LDFLAGS_macosx = $(OTHER_LDFLAGS_BASE) -sub_library libobjc -framework CoreServices $(OTHER_LDFLAGS_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR));
 OTHER_LDFLAGS_macosx_1070 = -Xlinker -objc_gc_compaction;
+OTHER_LDFLAGS_macosx_1080 = $(OTHER_LDFLAGS_macosx_1070);
+OTHER_LDFLAGS_macosx_1090 = $(OTHER_LDFLAGS_macosx_1070);
 GCC_PREFIX_HEADER = JavaScriptCorePrefix.h;
 HEADER_SEARCH_PATHS = "${BUILT_PRODUCTS_DIR}/DerivedSources/JavaScriptCore" $(HEADER_SEARCH_PATHS);
 INFOPLIST_FILE = Info.plist;

diff --git a/Source/JavaScriptCore/Configurations/Version.xcconfig b/Source/JavaScriptCore/Configurations/Version.xcconfig
index 1a7933a7b13b261792c11f7b0c54fde975bf2305..8d751bdca383f66619f332368ef69a33c50d0246 100644 (file)
--- a/Source/JavaScriptCore/Configurations/Version.xcconfig
+++ b/Source/JavaScriptCore/Configurations/Version.xcconfig
@@ -35,6 +35,8 @@ SYSTEM_VERSION_PREFIX = $(SYSTEM_VERSION_PREFIX_$(TARGET_MAC_OS_X_VERSION_MAJOR)
 SYSTEM_VERSION_PREFIX_1050 = 5;
 SYSTEM_VERSION_PREFIX_1060 = 6;
 SYSTEM_VERSION_PREFIX_1070 = 7;
+SYSTEM_VERSION_PREFIX_1080 = 8;
+SYSTEM_VERSION_PREFIX_1090 = 9;
 
 // The production build always uses the full version with a system version prefix.
 BUNDLE_VERSION_Production = $(SYSTEM_VERSION_PREFIX)$(FULL_VERSION);

diff --git a/Source/JavaScriptGlue/ChangeLog b/Source/JavaScriptGlue/ChangeLog
index d3433388a5df1400c5d0ae2587b3a75da964e9ae..1a40b73554e0a23e5ea341f2992bd2ee707e707e 100644 (file)
--- a/Source/JavaScriptGlue/ChangeLog
+++ b/Source/JavaScriptGlue/ChangeLog
@@ -1,3 +1,12 @@
+2011-08-04  Mark Rowe  <mrowe@apple.com>
+
+        Future-proof Xcode configuration settings.
+
+        * Configurations/Base.xcconfig:
+        * Configurations/CompilerVersion.xcconfig:
+        * Configurations/DebugRelease.xcconfig:
+        * Configurations/Version.xcconfig:
+
 2011-08-01  David Levin  <levin@chromium.org>
 
         Add asserts to RefCounted to make sure ref/deref happens on the right thread.

diff --git a/Source/JavaScriptGlue/Configurations/Base.xcconfig b/Source/JavaScriptGlue/Configurations/Base.xcconfig
index c490839cd99bd8012d38307b84d5a701c6c354d6..822d563ba8740f64df326f4ce3184b1b4dd96e04 100644 (file)
--- a/Source/JavaScriptGlue/Configurations/Base.xcconfig
+++ b/Source/JavaScriptGlue/Configurations/Base.xcconfig
@@ -85,4 +85,11 @@ GCC_ENABLE_CPP_EXCEPTIONS_LLVM_COMPILER = YES;
 SDKROOT = $(SDKROOT_$(MAC_OS_X_VERSION_MAJOR)_$(TARGET_MAC_OS_X_VERSION_MAJOR));
 SDKROOT_1060_1050 = macosx10.5;
 SDKROOT_1070_1050 = macosx10.5;
+SDKROOT_1080_1050 = macosx10.5;
+SDKROOT_1090_1050 = macosx10.5;
 SDKROOT_1070_1060 = macosx10.6;
+SDKROOT_1080_1060 = macosx10.6;
+SDKROOT_1090_1060 = macosx10.6;
+SDKROOT_1080_1070 = macosx10.7;
+SDKROOT_1090_1070 = macosx10.7;
+SDKROOT_1090_1080 = macosx10.8;

diff --git a/Source/JavaScriptGlue/Configurations/CompilerVersion.xcconfig b/Source/JavaScriptGlue/Configurations/CompilerVersion.xcconfig
index cb7e89d0115bd4508b0ff8eb2a91a84bb90f81fa..8beb5b1da80a2180216c2d9919182b28c14c419e 100644 (file)
--- a/Source/JavaScriptGlue/Configurations/CompilerVersion.xcconfig
+++ b/Source/JavaScriptGlue/Configurations/CompilerVersion.xcconfig
@@ -44,10 +44,12 @@ TARGET_GCC_VERSION_1060_Debug_0400_1 = GCC_42;
 TARGET_GCC_VERSION_1060_Release = GCC_42;
 TARGET_GCC_VERSION_1060_Production = GCC_42;
 
-TARGET_GCC_VERSION_1070 = $(TARGET_GCC_VERSION_1070_$(CONFIGURATION));
-TARGET_GCC_VERSION_1070_Debug = LLVM_COMPILER;
-TARGET_GCC_VERSION_1070_Release = LLVM_GCC_42;
-TARGET_GCC_VERSION_1070_Production = LLVM_GCC_42;
+TARGET_GCC_VERSION_1070 = $(TARGET_GCC_VERSION_1070_AND_LATER_$(CONFIGURATION));
+TARGET_GCC_VERSION_1080 = $(TARGET_GCC_VERSION_1070_AND_LATER_$(CONFIGURATION));
+TARGET_GCC_VERSION_1090 = $(TARGET_GCC_VERSION_1070_AND_LATER_$(CONFIGURATION));
+TARGET_GCC_VERSION_1070_AND_LATER_Debug = LLVM_COMPILER;
+TARGET_GCC_VERSION_1070_AND_LATER_Release = LLVM_GCC_42;
+TARGET_GCC_VERSION_1070_AND_LATER_Production = LLVM_GCC_42;
 
 GCC_VERSION = $(GCC_VERSION_$(TARGET_GCC_VERSION));
 GCC_VERSION_GCC_40 = 4.0;

diff --git a/Source/JavaScriptGlue/Configurations/DebugRelease.xcconfig b/Source/JavaScriptGlue/Configurations/DebugRelease.xcconfig
index c050b9bcd10736a736b457dc5237cba2134cf7aa..486d2986fa63f4393e5948a6791e2380a4f07d3a 100644 (file)
--- a/Source/JavaScriptGlue/Configurations/DebugRelease.xcconfig
+++ b/Source/JavaScriptGlue/Configurations/DebugRelease.xcconfig
@@ -27,6 +27,8 @@ ARCHS = $(ARCHS_$(TARGET_MAC_OS_X_VERSION_MAJOR));
 ARCHS_1050 = $(NATIVE_ARCH);
 ARCHS_1060 = $(ARCHS_STANDARD_32_64_BIT);
 ARCHS_1070 = $(ARCHS_STANDARD_32_64_BIT);
+ARCHS_1080 = $(ARCHS_STANDARD_32_64_BIT);
+ARCHS_1090 = $(ARCHS_STANDARD_32_64_BIT);
 
 ONLY_ACTIVE_ARCH = YES;
 
@@ -34,5 +36,7 @@ MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(TARGET_MAC_OS_X_VERSION_
 MACOSX_DEPLOYMENT_TARGET_1050 = 10.5;
 MACOSX_DEPLOYMENT_TARGET_1060 = 10.6;
 MACOSX_DEPLOYMENT_TARGET_1070 = 10.7;
+MACOSX_DEPLOYMENT_TARGET_1080 = 10.8;
+MACOSX_DEPLOYMENT_TARGET_1090 = 10.9;
 
 GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = YES;

diff --git a/Source/JavaScriptGlue/Configurations/Version.xcconfig b/Source/JavaScriptGlue/Configurations/Version.xcconfig
index 1a7933a7b13b261792c11f7b0c54fde975bf2305..8d751bdca383f66619f332368ef69a33c50d0246 100644 (file)
--- a/Source/JavaScriptGlue/Configurations/Version.xcconfig
+++ b/Source/JavaScriptGlue/Configurations/Version.xcconfig
@@ -35,6 +35,8 @@ SYSTEM_VERSION_PREFIX = $(SYSTEM_VERSION_PREFIX_$(TARGET_MAC_OS_X_VERSION_MAJOR)
 SYSTEM_VERSION_PREFIX_1050 = 5;
 SYSTEM_VERSION_PREFIX_1060 = 6;
 SYSTEM_VERSION_PREFIX_1070 = 7;
+SYSTEM_VERSION_PREFIX_1080 = 8;
+SYSTEM_VERSION_PREFIX_1090 = 9;
 
 // The production build always uses the full version with a system version prefix.
 BUNDLE_VERSION_Production = $(SYSTEM_VERSION_PREFIX)$(FULL_VERSION);

diff --git a/Source/ThirdParty/ANGLE/ChangeLog b/Source/ThirdParty/ANGLE/ChangeLog
index 8d5677e4994492f14e77aee2c78839c668cab6e4..df3e4d4654a909a44b550f11631a84b2db112d6f 100644 (file)
--- a/Source/ThirdParty/ANGLE/ChangeLog
+++ b/Source/ThirdParty/ANGLE/ChangeLog
@@ -1,3 +1,11 @@
+2011-08-04  Mark Rowe  <mrowe@apple.com>
+
+        Future-proof Xcode configuration settings.
+
+        * Configurations/Base.xcconfig:
+        * Configurations/CompilerVersion.xcconfig:
+        * Configurations/DebugRelease.xcconfig:
+
 2011-06-30  Mark Rowe  <mrowe@apple.com>
 
         Rubber-stamped by Dan Bernstein.

diff --git a/Source/ThirdParty/ANGLE/Configurations/Base.xcconfig b/Source/ThirdParty/ANGLE/Configurations/Base.xcconfig
index 27a5101dba5c4b1006040c39a89ea745edda62c2..445edaa6d5a9454d74a4e353f6cd01cec5efc54e 100644 (file)
--- a/Source/ThirdParty/ANGLE/Configurations/Base.xcconfig
+++ b/Source/ThirdParty/ANGLE/Configurations/Base.xcconfig
@@ -38,4 +38,11 @@ GCC_ENABLE_CPP_EXCEPTIONS_LLVM_COMPILER = YES;
 SDKROOT = $(SDKROOT_$(MAC_OS_X_VERSION_MAJOR)_$(TARGET_MAC_OS_X_VERSION_MAJOR));
 SDKROOT_1060_1050 = macosx10.5;
 SDKROOT_1070_1050 = macosx10.5;
+SDKROOT_1080_1050 = macosx10.5;
+SDKROOT_1090_1050 = macosx10.5;
 SDKROOT_1070_1060 = macosx10.6;
+SDKROOT_1080_1060 = macosx10.6;
+SDKROOT_1090_1060 = macosx10.6;
+SDKROOT_1080_1070 = macosx10.7;
+SDKROOT_1090_1070 = macosx10.7;
+SDKROOT_1090_1080 = macosx10.8;

diff --git a/Source/ThirdParty/ANGLE/Configurations/CompilerVersion.xcconfig b/Source/ThirdParty/ANGLE/Configurations/CompilerVersion.xcconfig
index cb7e89d0115bd4508b0ff8eb2a91a84bb90f81fa..8beb5b1da80a2180216c2d9919182b28c14c419e 100644 (file)
--- a/Source/ThirdParty/ANGLE/Configurations/CompilerVersion.xcconfig
+++ b/Source/ThirdParty/ANGLE/Configurations/CompilerVersion.xcconfig
@@ -44,10 +44,12 @@ TARGET_GCC_VERSION_1060_Debug_0400_1 = GCC_42;
 TARGET_GCC_VERSION_1060_Release = GCC_42;
 TARGET_GCC_VERSION_1060_Production = GCC_42;
 
-TARGET_GCC_VERSION_1070 = $(TARGET_GCC_VERSION_1070_$(CONFIGURATION));
-TARGET_GCC_VERSION_1070_Debug = LLVM_COMPILER;
-TARGET_GCC_VERSION_1070_Release = LLVM_GCC_42;
-TARGET_GCC_VERSION_1070_Production = LLVM_GCC_42;
+TARGET_GCC_VERSION_1070 = $(TARGET_GCC_VERSION_1070_AND_LATER_$(CONFIGURATION));
+TARGET_GCC_VERSION_1080 = $(TARGET_GCC_VERSION_1070_AND_LATER_$(CONFIGURATION));
+TARGET_GCC_VERSION_1090 = $(TARGET_GCC_VERSION_1070_AND_LATER_$(CONFIGURATION));
+TARGET_GCC_VERSION_1070_AND_LATER_Debug = LLVM_COMPILER;
+TARGET_GCC_VERSION_1070_AND_LATER_Release = LLVM_GCC_42;
+TARGET_GCC_VERSION_1070_AND_LATER_Production = LLVM_GCC_42;
 
 GCC_VERSION = $(GCC_VERSION_$(TARGET_GCC_VERSION));
 GCC_VERSION_GCC_40 = 4.0;

diff --git a/Source/ThirdParty/ANGLE/Configurations/DebugRelease.xcconfig b/Source/ThirdParty/ANGLE/Configurations/DebugRelease.xcconfig
index e34aa0d4ffd8af8aa3faa07a7f34f6194051329e..0236d351768b673925081103f6870a178641bab4 100644 (file)
--- a/Source/ThirdParty/ANGLE/Configurations/DebugRelease.xcconfig
+++ b/Source/ThirdParty/ANGLE/Configurations/DebugRelease.xcconfig
@@ -4,6 +4,8 @@ ARCHS = $(ARCHS_$(TARGET_MAC_OS_X_VERSION_MAJOR));
 ARCHS_1050 = $(NATIVE_ARCH);
 ARCHS_1060 = $(ARCHS_STANDARD_32_64_BIT);
 ARCHS_1070 = $(ARCHS_STANDARD_32_64_BIT);
+ARCHS_1080 = $(ARCHS_STANDARD_32_64_BIT);
+ARCHS_1090 = $(ARCHS_STANDARD_32_64_BIT);
 
 ONLY_ACTIVE_ARCH = YES;
 
@@ -11,5 +13,7 @@ MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(TARGET_MAC_OS_X_VERSION_
 MACOSX_DEPLOYMENT_TARGET_1050 = 10.5;
 MACOSX_DEPLOYMENT_TARGET_1060 = 10.6;
 MACOSX_DEPLOYMENT_TARGET_1070 = 10.7;
+MACOSX_DEPLOYMENT_TARGET_1080 = 10.8;
+MACOSX_DEPLOYMENT_TARGET_1090 = 10.9;
 
 GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = YES;

diff --git a/Source/ThirdParty/ChangeLog b/Source/ThirdParty/ChangeLog
index 169129b48eda76e89fb50ef11f8e12de67f09565..82003a172ea7f14c9b621965b74276b860e00e2d 100644 (file)
--- a/Source/ThirdParty/ChangeLog
+++ b/Source/ThirdParty/ChangeLog
@@ -1,3 +1,9 @@
+2011-08-04  Mark Rowe  <mrowe@apple.com>
+
+        Future-proof Xcode configuration settings.
+
+        * gtest/xcode/Config/General.xcconfig:
+
 2011-08-03  Dmitry Lomov  <dslomov@google.com>
 
         https://bugs.webkit.org/show_bug.cgi?id=61812

diff --git a/Source/ThirdParty/gtest/xcode/Config/General.xcconfig b/Source/ThirdParty/gtest/xcode/Config/General.xcconfig
index 18976d2f670c06a1c46d094e2edbae4a731aa86d..49df7a9c22d4fd2a505bbfc151787dfb6b3a0caf 100644 (file)
--- a/Source/ThirdParty/gtest/xcode/Config/General.xcconfig
+++ b/Source/ThirdParty/gtest/xcode/Config/General.xcconfig
@@ -67,8 +67,17 @@ SDKROOT_1050_1040 = macosx10.4;
 SDKROOT_1060_1040 = macosx10.4;
 SDKROOT_1060_1050 = macosx10.5;
 SDKROOT_1070_1040 = macosx10.4;
+SDKROOT_1080_1040 = macosx10.4;
+SDKROOT_1090_1040 = macosx10.4;
 SDKROOT_1070_1050 = macosx10.5;
+SDKROOT_1080_1050 = macosx10.5;
+SDKROOT_1090_1050 = macosx10.5;
 SDKROOT_1070_1060 = macosx10.6;
+SDKROOT_1080_1060 = macosx10.6;
+SDKROOT_1090_1060 = macosx10.6;
+SDKROOT_1080_1070 = macosx10.7;
+SDKROOT_1090_1070 = macosx10.7;
+SDKROOT_1090_1080 = macosx10.8;
 
 
 // VERSIONING BUILD SETTINGS (used in Info.plist)

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index b6350b421190bad665278012445af435f790a928..265a3a87822ba6e230c0a2603c44497cfeaa8b5a 100644 (file)
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,12 @@
+2011-08-04  Mark Rowe  <mrowe@apple.com>
+
+        Future-proof Xcode configuration settings.
+
+        * Configurations/Base.xcconfig:
+        * Configurations/DebugRelease.xcconfig:
+        * Configurations/Version.xcconfig:
+        * Configurations/WebCore.xcconfig:
+
 2011-08-04  Van Lam  <vanlam@google.com>
 
         A few purely stylistic modifications to visible_units.cpp

diff --git a/Source/WebCore/Configurations/Base.xcconfig b/Source/WebCore/Configurations/Base.xcconfig
index fbd142c6123402059cb33228bfca59ea117d71ca..bbbf7e47134b4a7807a48efc3c9e3b309e7d0af8 100644 (file)
--- a/Source/WebCore/Configurations/Base.xcconfig
+++ b/Source/WebCore/Configurations/Base.xcconfig
@@ -98,8 +98,6 @@ WEBCORE_SQLITE3_HEADER_SEARCH_PATHS = $(NEXT_ROOT)/usr/local/include/WebCoreSQLi
 SQLITE3_HEADER_SEARCH_PATHS = $(SQLITE3_HEADER_SEARCH_PATHS_$(REAL_PLATFORM_NAME));
 SQLITE3_HEADER_SEARCH_PATHS_macosx = $(SQLITE3_HEADER_SEARCH_PATHS_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR));
 SQLITE3_HEADER_SEARCH_PATHS_macosx_1050 = $(WEBCORE_SQLITE3_HEADER_SEARCH_PATHS);
-SQLITE3_HEADER_SEARCH_PATHS_macosx_1060 = ;
-SQLITE3_HEADER_SEARCH_PATHS_macosx_1070 = ;
 
 
 // FIXME: Disable C++ exceptions in the LLVM Compiler once it supports enabling Obj-C exceptions without C++ exceptions.
@@ -121,9 +119,18 @@ GCC_GENERATE_DEBUGGING_SYMBOLS_macosx_1050_Release = YES;
 GCC_GENERATE_DEBUGGING_SYMBOLS_macosx_1050_Production = YES;
 GCC_GENERATE_DEBUGGING_SYMBOLS_macosx_1060 = YES;
 GCC_GENERATE_DEBUGGING_SYMBOLS_macosx_1070 = YES;
+GCC_GENERATE_DEBUGGING_SYMBOLS_macosx_1080 = YES;
+GCC_GENERATE_DEBUGGING_SYMBOLS_macosx_1090 = YES;
 
 // If the target Mac OS X version does not match the current Mac OS X version then we'll want to build using the target version's SDK.
 SDKROOT = $(SDKROOT_$(MAC_OS_X_VERSION_MAJOR)_$(TARGET_MAC_OS_X_VERSION_MAJOR));
 SDKROOT_1060_1050 = macosx10.5;
 SDKROOT_1070_1050 = macosx10.5;
+SDKROOT_1080_1050 = macosx10.5;
+SDKROOT_1090_1050 = macosx10.5;
 SDKROOT_1070_1060 = macosx10.6;
+SDKROOT_1080_1060 = macosx10.6;
+SDKROOT_1090_1060 = macosx10.6;
+SDKROOT_1080_1070 = macosx10.7;
+SDKROOT_1090_1070 = macosx10.7;
+SDKROOT_1090_1080 = macosx10.8;

diff --git a/Source/WebCore/Configurations/DebugRelease.xcconfig b/Source/WebCore/Configurations/DebugRelease.xcconfig
index c12463ede4bf01513e5eef2e2f96c1589b183e06..fd2ff1498b9bc1d537451741b807f6c91864b43e 100644 (file)
--- a/Source/WebCore/Configurations/DebugRelease.xcconfig
+++ b/Source/WebCore/Configurations/DebugRelease.xcconfig
@@ -30,6 +30,8 @@ ARCHS_macosx = $(ARCHS_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR));
 ARCHS_macosx_1050 = $(NATIVE_ARCH);
 ARCHS_macosx_1060 = $(ARCHS_STANDARD_32_64_BIT);
 ARCHS_macosx_1070 = $(ARCHS_STANDARD_32_64_BIT);
+ARCHS_macosx_1080 = $(ARCHS_STANDARD_32_64_BIT);
+ARCHS_macosx_1090 = $(ARCHS_STANDARD_32_64_BIT);
 
 ONLY_ACTIVE_ARCH = YES;
 
@@ -40,6 +42,8 @@ MACOSX_DEPLOYMENT_TARGET_macosx = $(MACOSX_DEPLOYMENT_TARGET_macosx_$(TARGET_MAC
 MACOSX_DEPLOYMENT_TARGET_macosx_1050 = 10.5;
 MACOSX_DEPLOYMENT_TARGET_macosx_1060 = 10.6;
 MACOSX_DEPLOYMENT_TARGET_macosx_1070 = 10.7;
+MACOSX_DEPLOYMENT_TARGET_macosx_1080 = 10.8;
+MACOSX_DEPLOYMENT_TARGET_macosx_1090 = 10.9;
 
 GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = YES;
 

diff --git a/Source/WebCore/Configurations/Version.xcconfig b/Source/WebCore/Configurations/Version.xcconfig
index e3c84f26ca0f49972cae1d76baef5fc3a1893c4f..2120281eea154848cac42b3b750544483734825c 100644 (file)
--- a/Source/WebCore/Configurations/Version.xcconfig
+++ b/Source/WebCore/Configurations/Version.xcconfig
@@ -38,6 +38,8 @@ SYSTEM_VERSION_PREFIX_macosx = $(SYSTEM_VERSION_PREFIX_macosx_$(TARGET_MAC_OS_X_
 SYSTEM_VERSION_PREFIX_macosx_1050 = 5;
 SYSTEM_VERSION_PREFIX_macosx_1060 = 6;
 SYSTEM_VERSION_PREFIX_macosx_1070 = 7;
+SYSTEM_VERSION_PREFIX_macosx_1080 = 8;
+SYSTEM_VERSION_PREFIX_macosx_1090 = 9;
 
 // The production build always uses the full version with a system version prefix.
 BUNDLE_VERSION_Production = $(SYSTEM_VERSION_PREFIX)$(FULL_VERSION);

diff --git a/Source/WebCore/Configurations/WebCore.xcconfig b/Source/WebCore/Configurations/WebCore.xcconfig
index 8839adecaec9b7c24934f41789df4da0b16da859..ec4f6d8816527c9700910690407a432f27bac835 100644 (file)
--- a/Source/WebCore/Configurations/WebCore.xcconfig
+++ b/Source/WebCore/Configurations/WebCore.xcconfig
@@ -56,6 +56,8 @@ OTHER_LDFLAGS_iphoneos = $(OTHER_LDFLAGS_BASE) -framework CFNetwork -framework C
 OTHER_LDFLAGS_iphonesimulator = $(OTHER_LDFLAGS_iphoneos);
 OTHER_LDFLAGS_macosx = $(OTHER_LDFLAGS_BASE) -sub_library libobjc -umbrella WebKit $(WEBKIT2_LDFLAGS) $(OTHER_LDFLAGS_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR));
 OTHER_LDFLAGS_macosx_1070 = -Xlinker -objc_gc_compaction -framework IOSurface;
+OTHER_LDFLAGS_macosx_1080 = $(OTHER_LDFLAGS_macosx_1070);
+OTHER_LDFLAGS_macosx_1090 = $(OTHER_LDFLAGS_macosx_1070);
 
 PRODUCTION_FRAMEWORKS_DIR = $(PRODUCTION_FRAMEWORKS_DIR_$(REAL_PLATFORM_NAME));
 PRODUCTION_FRAMEWORKS_DIR_iphoneos = $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks;
@@ -65,6 +67,8 @@ PRODUCTION_FRAMEWORKS_DIR_macosx = $(NEXT_ROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks;
 WEBKIT2_LDFLAGS = $(WEBKIT2_LDFLAGS_$(TARGET_MAC_OS_X_VERSION_MAJOR));
 WEBKIT2_LDFLAGS_1060 = -allowable_client WebKit2
 WEBKIT2_LDFLAGS_1070 = $(WEBKIT2_LDFLAGS_1060);
+WEBKIT2_LDFLAGS_1080 = $(WEBKIT2_LDFLAGS_1060);
+WEBKIT2_LDFLAGS_1090 = $(WEBKIT2_LDFLAGS_1060);
 
 JAVASCRIPTCORE_PRIVATE_HEADERS_DIR = $(JAVASCRIPTCORE_PRIVATE_HEADERS_DIR_$(CONFIGURATION));
 JAVASCRIPTCORE_PRIVATE_HEADERS_DIR_Release = $(JAVASCRIPTCORE_PRIVATE_HEADERS_engineering);
@@ -87,3 +91,5 @@ SQLITE3_LIBRARY_macosx = $(SQLITE3_LIBRARY_macosx_$(TARGET_MAC_OS_X_VERSION_MAJO
 SQLITE3_LIBRARY_macosx_1050 = WebCoreSQLite3;
 SQLITE3_LIBRARY_macosx_1060 = sqlite3;
 SQLITE3_LIBRARY_macosx_1070 = sqlite3;
+SQLITE3_LIBRARY_macosx_1080 = sqlite3;
+SQLITE3_LIBRARY_macosx_1090 = sqlite3;

diff --git a/Source/WebKit/mac/ChangeLog b/Source/WebKit/mac/ChangeLog
index a80d9186f75679b3c23692c7cd9ad6d6e3d0e56d..a32b890fddc0698458217c2aa53cb6d3782e49cb 100644 (file)
--- a/Source/WebKit/mac/ChangeLog
+++ b/Source/WebKit/mac/ChangeLog
@@ -1,3 +1,12 @@
+2011-08-04  Mark Rowe  <mrowe@apple.com>
+
+        Future-proof Xcode configuration settings.
+
+        * Configurations/Base.xcconfig:
+        * Configurations/DebugRelease.xcconfig:
+        * Configurations/Version.xcconfig:
+        * Configurations/WebKit.xcconfig:
+
 2011-08-03  Kent Tamura  <tkent@chromium.org>
 
         Fix incorrect checks for HTMLMediaElement

diff --git a/Source/WebKit/mac/Configurations/Base.xcconfig b/Source/WebKit/mac/Configurations/Base.xcconfig
index c09de6e36c9363755a24d5a643b29ede0409cc62..47adf3768a42d51bf51ecb1245b0072bdbabdda8 100644 (file)
--- a/Source/WebKit/mac/Configurations/Base.xcconfig
+++ b/Source/WebKit/mac/Configurations/Base.xcconfig
@@ -101,4 +101,11 @@ GCC_ENABLE_CPP_EXCEPTIONS_LLVM_COMPILER = YES;
 SDKROOT = $(SDKROOT_$(MAC_OS_X_VERSION_MAJOR)_$(TARGET_MAC_OS_X_VERSION_MAJOR));
 SDKROOT_1060_1050 = macosx10.5;
 SDKROOT_1070_1050 = macosx10.5;
+SDKROOT_1080_1050 = macosx10.5;
+SDKROOT_1090_1050 = macosx10.5;
 SDKROOT_1070_1060 = macosx10.6;
+SDKROOT_1080_1060 = macosx10.6;
+SDKROOT_1090_1060 = macosx10.6;
+SDKROOT_1080_1070 = macosx10.7;
+SDKROOT_1090_1070 = macosx10.7;
+SDKROOT_1090_1080 = macosx10.8;

diff --git a/Source/WebKit/mac/Configurations/DebugRelease.xcconfig b/Source/WebKit/mac/Configurations/DebugRelease.xcconfig
index 945a47e61aeae02576ed05715062267ec0c70806..f2e048581a1a82bf4d719e6428d1a95c4613acdf 100644 (file)
--- a/Source/WebKit/mac/Configurations/DebugRelease.xcconfig
+++ b/Source/WebKit/mac/Configurations/DebugRelease.xcconfig
@@ -30,6 +30,8 @@ ARCHS_macosx = $(ARCHS_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR));
 ARCHS_macosx_1050 = $(NATIVE_ARCH);
 ARCHS_macosx_1060 = $(ARCHS_STANDARD_32_64_BIT);
 ARCHS_macosx_1070 = $(ARCHS_STANDARD_32_64_BIT);
+ARCHS_macosx_1080 = $(ARCHS_STANDARD_32_64_BIT);
+ARCHS_macosx_1090 = $(ARCHS_STANDARD_32_64_BIT);
 
 ONLY_ACTIVE_ARCH = YES;
 
@@ -40,6 +42,8 @@ MACOSX_DEPLOYMENT_TARGET_macosx = $(MACOSX_DEPLOYMENT_TARGET_macosx_$(TARGET_MAC
 MACOSX_DEPLOYMENT_TARGET_macosx_1050 = 10.5;
 MACOSX_DEPLOYMENT_TARGET_macosx_1060 = 10.6;
 MACOSX_DEPLOYMENT_TARGET_macosx_1070 = 10.7;
+MACOSX_DEPLOYMENT_TARGET_macosx_1080 = 10.8;
+MACOSX_DEPLOYMENT_TARGET_macosx_1090 = 10.9;
 
 GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = YES;
 
@@ -52,3 +56,5 @@ WEBKIT_SYSTEM_INTERFACE_LIBRARY_macosx = $(WEBKIT_SYSTEM_INTERFACE_LIBRARY_macos
 WEBKIT_SYSTEM_INTERFACE_LIBRARY_macosx_1050 = WebKitSystemInterfaceLeopard;
 WEBKIT_SYSTEM_INTERFACE_LIBRARY_macosx_1060 = WebKitSystemInterfaceSnowLeopard;
 WEBKIT_SYSTEM_INTERFACE_LIBRARY_macosx_1070 = WebKitSystemInterfaceLion;
+WEBKIT_SYSTEM_INTERFACE_LIBRARY_macosx_1080 = WebKitSystemInterfaceLion;
+WEBKIT_SYSTEM_INTERFACE_LIBRARY_macosx_1090 = WebKitSystemInterfaceLion;

diff --git a/Source/WebKit/mac/Configurations/Version.xcconfig b/Source/WebKit/mac/Configurations/Version.xcconfig
index 42928cb7a81eb656cc4ac8a6dbddf3817e07dffc..75b45d949c2bce4e08a7cc8bfab6610ebf9d519e 100644 (file)
--- a/Source/WebKit/mac/Configurations/Version.xcconfig
+++ b/Source/WebKit/mac/Configurations/Version.xcconfig
@@ -38,6 +38,8 @@ SYSTEM_VERSION_PREFIX_macosx = $(SYSTEM_VERSION_PREFIX_macosx_$(TARGET_MAC_OS_X_
 SYSTEM_VERSION_PREFIX_macosx_1050 = 5;
 SYSTEM_VERSION_PREFIX_macosx_1060 = 6;
 SYSTEM_VERSION_PREFIX_macosx_1070 = 7;
+SYSTEM_VERSION_PREFIX_macosx_1080 = 8;
+SYSTEM_VERSION_PREFIX_macosx_1090 = 9;
 
 // The production build always uses the full version with a system version prefix.
 BUNDLE_VERSION_Production = $(SYSTEM_VERSION_PREFIX)$(FULL_VERSION);

diff --git a/Source/WebKit/mac/Configurations/WebKit.xcconfig b/Source/WebKit/mac/Configurations/WebKit.xcconfig
index 594b3a703d4af354ee878e396a762df5f96a472f..364aed9a916814a1db369bf9b5c4883fea8057b0 100644 (file)
--- a/Source/WebKit/mac/Configurations/WebKit.xcconfig
+++ b/Source/WebKit/mac/Configurations/WebKit.xcconfig
@@ -62,6 +62,8 @@ OTHER_LDFLAGS_iphoneos = -lobjc -framework CFNetwork -framework CoreFoundation -
 OTHER_LDFLAGS_iphonesimulator = $(OTHER_LDFLAGS_iphoneos);
 OTHER_LDFLAGS_macosx = -sub_umbrella WebCore $(OTHER_LDFLAGS) $(OTHER_LDFLAGS_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR));
 OTHER_LDFLAGS_macosx_1070 = -Xlinker -objc_gc_compaction;
+OTHER_LDFLAGS_macosx_1080 = $(OTHER_LDFLAGS_macosx_1070);
+OTHER_LDFLAGS_macosx_1090 = $(OTHER_LDFLAGS_macosx_1070);
 
 PRODUCTION_FRAMEWORKS_DIR = $(PRODUCTION_FRAMEWORKS_DIR_$(REAL_PLATFORM_NAME));
 PRODUCTION_FRAMEWORKS_DIR_iphoneos = $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks;

diff --git a/Source/WebKit2/ChangeLog b/Source/WebKit2/ChangeLog
index d0aae0c173db0d5d37adfb0d472736d5e285a7ec..b833ab49f88446adb1974b6112ac15e6dc75a894 100644 (file)
--- a/Source/WebKit2/ChangeLog
+++ b/Source/WebKit2/ChangeLog
@@ -1,3 +1,13 @@
+2011-08-04  Mark Rowe  <mrowe@apple.com>
+
+        Future-proof Xcode configuration settings.
+
+        * Configurations/Base.xcconfig:
+        * Configurations/CompilerVersion.xcconfig:
+        * Configurations/DebugRelease.xcconfig:
+        * Configurations/Version.xcconfig:
+        * Configurations/WebKit2.xcconfig:
+
 2011-08-01  Brian Weinstein  <bweinstein@apple.com>
 
         WebKit2: Web Inspector always starts in undocked mode

diff --git a/Source/WebKit2/Configurations/Base.xcconfig b/Source/WebKit2/Configurations/Base.xcconfig
index a8fafa78d8cbf4b7fcfbfccbf999c0e17785cdff..0fa1bed9734ff922b176752b75607dfa75958f72 100644 (file)
--- a/Source/WebKit2/Configurations/Base.xcconfig
+++ b/Source/WebKit2/Configurations/Base.xcconfig
@@ -94,4 +94,11 @@ GCC_ENABLE_CPP_EXCEPTIONS_LLVM_COMPILER = YES;
 SDKROOT = $(SDKROOT_$(MAC_OS_X_VERSION_MAJOR)_$(TARGET_MAC_OS_X_VERSION_MAJOR));
 SDKROOT_1060_1050 = macosx10.5;
 SDKROOT_1070_1050 = macosx10.5;
+SDKROOT_1080_1050 = macosx10.5;
+SDKROOT_1090_1050 = macosx10.5;
 SDKROOT_1070_1060 = macosx10.6;
+SDKROOT_1080_1060 = macosx10.6;
+SDKROOT_1090_1060 = macosx10.6;
+SDKROOT_1080_1070 = macosx10.7;
+SDKROOT_1090_1070 = macosx10.7;
+SDKROOT_1090_1080 = macosx10.8;

diff --git a/Source/WebKit2/Configurations/CompilerVersion.xcconfig b/Source/WebKit2/Configurations/CompilerVersion.xcconfig
index cb7e89d0115bd4508b0ff8eb2a91a84bb90f81fa..8beb5b1da80a2180216c2d9919182b28c14c419e 100644 (file)
--- a/Source/WebKit2/Configurations/CompilerVersion.xcconfig
+++ b/Source/WebKit2/Configurations/CompilerVersion.xcconfig
@@ -44,10 +44,12 @@ TARGET_GCC_VERSION_1060_Debug_0400_1 = GCC_42;
 TARGET_GCC_VERSION_1060_Release = GCC_42;
 TARGET_GCC_VERSION_1060_Production = GCC_42;
 
-TARGET_GCC_VERSION_1070 = $(TARGET_GCC_VERSION_1070_$(CONFIGURATION));
-TARGET_GCC_VERSION_1070_Debug = LLVM_COMPILER;
-TARGET_GCC_VERSION_1070_Release = LLVM_GCC_42;
-TARGET_GCC_VERSION_1070_Production = LLVM_GCC_42;
+TARGET_GCC_VERSION_1070 = $(TARGET_GCC_VERSION_1070_AND_LATER_$(CONFIGURATION));
+TARGET_GCC_VERSION_1080 = $(TARGET_GCC_VERSION_1070_AND_LATER_$(CONFIGURATION));
+TARGET_GCC_VERSION_1090 = $(TARGET_GCC_VERSION_1070_AND_LATER_$(CONFIGURATION));
+TARGET_GCC_VERSION_1070_AND_LATER_Debug = LLVM_COMPILER;
+TARGET_GCC_VERSION_1070_AND_LATER_Release = LLVM_GCC_42;
+TARGET_GCC_VERSION_1070_AND_LATER_Production = LLVM_GCC_42;
 
 GCC_VERSION = $(GCC_VERSION_$(TARGET_GCC_VERSION));
 GCC_VERSION_GCC_40 = 4.0;

diff --git a/Source/WebKit2/Configurations/DebugRelease.xcconfig b/Source/WebKit2/Configurations/DebugRelease.xcconfig
index 0bcf9b97712aa68086f1ee4f10a530fbbf86f369..0c403cf8686532415f5dfe6313a5783f8ed662be 100644 (file)
--- a/Source/WebKit2/Configurations/DebugRelease.xcconfig
+++ b/Source/WebKit2/Configurations/DebugRelease.xcconfig
@@ -23,10 +23,7 @@
 
 #include "Base.xcconfig"
 
-ARCHS = $(ARCHS_$(TARGET_MAC_OS_X_VERSION_MAJOR));
-ARCHS_1050 = $(NATIVE_ARCH);
-ARCHS_1060 = $(ARCHS_STANDARD_32_64_BIT);
-ARCHS_1070 = $(ARCHS_STANDARD_32_64_BIT);
+ARCHS = $(ARCHS_STANDARD_32_64_BIT);
 
 ONLY_ACTIVE_ARCH = YES;
 
@@ -34,6 +31,8 @@ MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(TARGET_MAC_OS_X_VERSION_
 MACOSX_DEPLOYMENT_TARGET_1050 = 10.5;
 MACOSX_DEPLOYMENT_TARGET_1060 = 10.6;
 MACOSX_DEPLOYMENT_TARGET_1070 = 10.7;
+MACOSX_DEPLOYMENT_TARGET_1080 = 10.8;
+MACOSX_DEPLOYMENT_TARGET_1090 = 10.9;
 
 GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = YES;
 
@@ -43,3 +42,5 @@ WEBKIT_SYSTEM_INTERFACE_LIBRARY = $(WEBKIT_SYSTEM_INTERFACE_LIBRARY_$(TARGET_MAC
 WEBKIT_SYSTEM_INTERFACE_LIBRARY_1050 = WebKitSystemInterfaceLeopard;
 WEBKIT_SYSTEM_INTERFACE_LIBRARY_1060 = WebKitSystemInterfaceSnowLeopard;
 WEBKIT_SYSTEM_INTERFACE_LIBRARY_1070 = WebKitSystemInterfaceLion;
+WEBKIT_SYSTEM_INTERFACE_LIBRARY_1080 = WebKitSystemInterfaceLion;
+WEBKIT_SYSTEM_INTERFACE_LIBRARY_1090 = WebKitSystemInterfaceLion;

diff --git a/Source/WebKit2/Configurations/Version.xcconfig b/Source/WebKit2/Configurations/Version.xcconfig
index 8201f20007fe8cf82a3bd74b198f418a63b24aab..d4a9e37b91aa322ebd5ccfd3679c15cc0510ccaa 100644 (file)
--- a/Source/WebKit2/Configurations/Version.xcconfig
+++ b/Source/WebKit2/Configurations/Version.xcconfig
@@ -35,6 +35,8 @@ SYSTEM_VERSION_PREFIX = $(SYSTEM_VERSION_PREFIX_$(TARGET_MAC_OS_X_VERSION_MAJOR)
 SYSTEM_VERSION_PREFIX_1050 = 5;
 SYSTEM_VERSION_PREFIX_1060 = 6;
 SYSTEM_VERSION_PREFIX_1070 = 7;
+SYSTEM_VERSION_PREFIX_1080 = 8;
+SYSTEM_VERSION_PREFIX_1090 = 9;
 
 // The production build always uses the full version with a system version prefix.
 BUNDLE_VERSION_Production = $(SYSTEM_VERSION_PREFIX)$(FULL_VERSION);

diff --git a/Source/WebKit2/Configurations/WebKit2.xcconfig b/Source/WebKit2/Configurations/WebKit2.xcconfig
index aa80bbcab6a92f97239c6c9bd946791944e09db9..57794e1ef40456242fc6ffa6724d37954daca6fb 100644 (file)
--- a/Source/WebKit2/Configurations/WebKit2.xcconfig
+++ b/Source/WebKit2/Configurations/WebKit2.xcconfig
@@ -32,3 +32,5 @@ INSTALL_PATH = $(SYSTEM_LIBRARY_DIR)/PrivateFrameworks;
 OTHER_LDFLAGS = $(OTHER_LDFLAGS_$(REAL_PLATFORM_NAME)) $(OTHER_LDFLAGS);
 OTHER_LDFLAGS_macosx = $(OTHER_LDFLAGS_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR));
 OTHER_LDFLAGS_macosx_1070 = -Xlinker -objc_gc_compaction;
+OTHER_LDFLAGS_macosx_1080 = $(OTHER_LDFLAGS_macosx_1070);
+OTHER_LDFLAGS_macosx_1090 = $(OTHER_LDFLAGS_macosx_1070);

diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index 373feb035a063782ad66b4212260a5cabe048a6f..78629c3869f68c18eb384c9d24300c50ab335bea 100644 (file)
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,3 +1,20 @@
+2011-08-04  Mark Rowe  <mrowe@apple.com>
+
+        Future-proof Xcode configuration settings.
+
+        * DumpRenderTree/mac/Configurations/Base.xcconfig:
+        * DumpRenderTree/mac/Configurations/CompilerVersion.xcconfig:
+        * DumpRenderTree/mac/Configurations/DebugRelease.xcconfig:
+        * MiniBrowser/Configurations/Base.xcconfig:
+        * MiniBrowser/Configurations/CompilerVersion.xcconfig:
+        * MiniBrowser/Configurations/DebugRelease.xcconfig:
+        * TestWebKitAPI/Configurations/Base.xcconfig:
+        * TestWebKitAPI/Configurations/CompilerVersion.xcconfig:
+        * TestWebKitAPI/Configurations/DebugRelease.xcconfig:
+        * WebKitTestRunner/Configurations/Base.xcconfig:
+        * WebKitTestRunner/Configurations/CompilerVersion.xcconfig:
+        * WebKitTestRunner/Configurations/DebugRelease.xcconfig:
+
 2011-08-04  Adam Barth  <abarth@webkit.org>
 
         Fancier debug logging.

diff --git a/Tools/DumpRenderTree/mac/Configurations/Base.xcconfig b/Tools/DumpRenderTree/mac/Configurations/Base.xcconfig
index 8d20987c8dfd6251eb80c6f43f3b065d3df8e9dc..c1189ba0495a03c5e5664c15f7b16f243553ca82 100644 (file)
--- a/Tools/DumpRenderTree/mac/Configurations/Base.xcconfig
+++ b/Tools/DumpRenderTree/mac/Configurations/Base.xcconfig
@@ -46,4 +46,11 @@ TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR);
 SDKROOT = $(SDKROOT_$(MAC_OS_X_VERSION_MAJOR)_$(TARGET_MAC_OS_X_VERSION_MAJOR));
 SDKROOT_1060_1050 = macosx10.5;
 SDKROOT_1070_1050 = macosx10.5;
+SDKROOT_1080_1050 = macosx10.5;
+SDKROOT_1090_1050 = macosx10.5;
 SDKROOT_1070_1060 = macosx10.6;
+SDKROOT_1080_1060 = macosx10.6;
+SDKROOT_1090_1060 = macosx10.6;
+SDKROOT_1080_1070 = macosx10.7;
+SDKROOT_1090_1070 = macosx10.7;
+SDKROOT_1090_1080 = macosx10.8;

diff --git a/Tools/DumpRenderTree/mac/Configurations/CompilerVersion.xcconfig b/Tools/DumpRenderTree/mac/Configurations/CompilerVersion.xcconfig
index 209bc548f7e85f8839a457277085298772c86b74..5146bb6cf13dcb208f7d452740b7273b64866640 100644 (file)
--- a/Tools/DumpRenderTree/mac/Configurations/CompilerVersion.xcconfig
+++ b/Tools/DumpRenderTree/mac/Configurations/CompilerVersion.xcconfig
@@ -45,10 +45,12 @@ TARGET_GCC_VERSION_1060_Debug_0400_1 = GCC_42;
 TARGET_GCC_VERSION_1060_Release = GCC_42;
 TARGET_GCC_VERSION_1060_Production = GCC_42;
 
-TARGET_GCC_VERSION_1070 = $(TARGET_GCC_VERSION_1070_$(CONFIGURATION));
-TARGET_GCC_VERSION_1070_Debug = LLVM_COMPILER;
-TARGET_GCC_VERSION_1070_Release = LLVM_GCC_42;
-TARGET_GCC_VERSION_1070_Production = LLVM_GCC_42;
+TARGET_GCC_VERSION_1070 = $(TARGET_GCC_VERSION_1070_AND_LATER_$(CONFIGURATION));
+TARGET_GCC_VERSION_1080 = $(TARGET_GCC_VERSION_1070_AND_LATER_$(CONFIGURATION));
+TARGET_GCC_VERSION_1090 = $(TARGET_GCC_VERSION_1070_AND_LATER_$(CONFIGURATION));
+TARGET_GCC_VERSION_1070_AND_LATER_Debug = LLVM_COMPILER;
+TARGET_GCC_VERSION_1070_AND_LATER_Release = LLVM_GCC_42;
+TARGET_GCC_VERSION_1070_AND_LATER_Production = LLVM_GCC_42;
 
 GCC_VERSION = $(GCC_VERSION_$(TARGET_GCC_VERSION));
 GCC_VERSION_GCC_40 = 4.0;

diff --git a/Tools/DumpRenderTree/mac/Configurations/DebugRelease.xcconfig b/Tools/DumpRenderTree/mac/Configurations/DebugRelease.xcconfig
index d331d2363375ea9fc9ffaf2aa72b3505b392ef27..b61d484852845e803bdaabefd99e1828bef45bc7 100644 (file)
--- a/Tools/DumpRenderTree/mac/Configurations/DebugRelease.xcconfig
+++ b/Tools/DumpRenderTree/mac/Configurations/DebugRelease.xcconfig
@@ -27,6 +27,8 @@ ARCHS = $(ARCHS_$(TARGET_MAC_OS_X_VERSION_MAJOR));
 ARCHS_1050 = $(NATIVE_ARCH);
 ARCHS_1060 = $(ARCHS_STANDARD_32_64_BIT);
 ARCHS_1070 = $(ARCHS_STANDARD_32_64_BIT);
+ARCHS_1080 = $(ARCHS_STANDARD_32_64_BIT);
+ARCHS_1090 = $(ARCHS_STANDARD_32_64_BIT);
 
 ONLY_ACTIVE_ARCH = YES;
 
@@ -34,3 +36,5 @@ MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(TARGET_MAC_OS_X_VERSION_
 MACOSX_DEPLOYMENT_TARGET_1050 = 10.5;
 MACOSX_DEPLOYMENT_TARGET_1060 = 10.6;
 MACOSX_DEPLOYMENT_TARGET_1070 = 10.7;
+MACOSX_DEPLOYMENT_TARGET_1080 = 10.8;
+MACOSX_DEPLOYMENT_TARGET_1090 = 10.9;

diff --git a/Tools/MiniBrowser/Configurations/Base.xcconfig b/Tools/MiniBrowser/Configurations/Base.xcconfig
index 99ee7dd79a31bd97710750358ebd70dfeb5dbe52..f66d642ff59bc14685514e3c2b91d4a152b98a01 100644 (file)
--- a/Tools/MiniBrowser/Configurations/Base.xcconfig
+++ b/Tools/MiniBrowser/Configurations/Base.xcconfig
@@ -50,4 +50,11 @@ GCC_ENABLE_CPP_EXCEPTIONS_LLVM_COMPILER = YES;
 SDKROOT = $(SDKROOT_$(MAC_OS_X_VERSION_MAJOR)_$(TARGET_MAC_OS_X_VERSION_MAJOR));
 SDKROOT_1060_1050 = macosx10.5;
 SDKROOT_1070_1050 = macosx10.5;
+SDKROOT_1080_1050 = macosx10.5;
+SDKROOT_1090_1050 = macosx10.5;
 SDKROOT_1070_1060 = macosx10.6;
+SDKROOT_1080_1060 = macosx10.6;
+SDKROOT_1090_1060 = macosx10.6;
+SDKROOT_1080_1070 = macosx10.7;
+SDKROOT_1090_1070 = macosx10.7;
+SDKROOT_1090_1080 = macosx10.8;

diff --git a/Tools/MiniBrowser/Configurations/CompilerVersion.xcconfig b/Tools/MiniBrowser/Configurations/CompilerVersion.xcconfig
index cb7e89d0115bd4508b0ff8eb2a91a84bb90f81fa..8beb5b1da80a2180216c2d9919182b28c14c419e 100644 (file)
--- a/Tools/MiniBrowser/Configurations/CompilerVersion.xcconfig
+++ b/Tools/MiniBrowser/Configurations/CompilerVersion.xcconfig
@@ -44,10 +44,12 @@ TARGET_GCC_VERSION_1060_Debug_0400_1 = GCC_42;
 TARGET_GCC_VERSION_1060_Release = GCC_42;
 TARGET_GCC_VERSION_1060_Production = GCC_42;
 
-TARGET_GCC_VERSION_1070 = $(TARGET_GCC_VERSION_1070_$(CONFIGURATION));
-TARGET_GCC_VERSION_1070_Debug = LLVM_COMPILER;
-TARGET_GCC_VERSION_1070_Release = LLVM_GCC_42;
-TARGET_GCC_VERSION_1070_Production = LLVM_GCC_42;
+TARGET_GCC_VERSION_1070 = $(TARGET_GCC_VERSION_1070_AND_LATER_$(CONFIGURATION));
+TARGET_GCC_VERSION_1080 = $(TARGET_GCC_VERSION_1070_AND_LATER_$(CONFIGURATION));
+TARGET_GCC_VERSION_1090 = $(TARGET_GCC_VERSION_1070_AND_LATER_$(CONFIGURATION));
+TARGET_GCC_VERSION_1070_AND_LATER_Debug = LLVM_COMPILER;
+TARGET_GCC_VERSION_1070_AND_LATER_Release = LLVM_GCC_42;
+TARGET_GCC_VERSION_1070_AND_LATER_Production = LLVM_GCC_42;
 
 GCC_VERSION = $(GCC_VERSION_$(TARGET_GCC_VERSION));
 GCC_VERSION_GCC_40 = 4.0;

diff --git a/Tools/MiniBrowser/Configurations/DebugRelease.xcconfig b/Tools/MiniBrowser/Configurations/DebugRelease.xcconfig
index 5c3f4b0c380524978fbfa039d1cd0cf695c7af0a..0d6374f3b82569ff146a91d94c7d2918644eace5 100644 (file)
--- a/Tools/MiniBrowser/Configurations/DebugRelease.xcconfig
+++ b/Tools/MiniBrowser/Configurations/DebugRelease.xcconfig
@@ -27,6 +27,8 @@ ARCHS = $(ARCHS_$(TARGET_MAC_OS_X_VERSION_MAJOR));
 ARCHS_1050 = $(NATIVE_ARCH);
 ARCHS_1060 = $(ARCHS_STANDARD_32_64_BIT);
 ARCHS_1070 = $(ARCHS_STANDARD_32_64_BIT);
+ARCHS_1080 = $(ARCHS_STANDARD_32_64_BIT);
+ARCHS_1090 = $(ARCHS_STANDARD_32_64_BIT);
 
 ONLY_ACTIVE_ARCH = YES;
 
@@ -34,3 +36,5 @@ MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(TARGET_MAC_OS_X_VERSION_
 MACOSX_DEPLOYMENT_TARGET_1050 = 10.5;
 MACOSX_DEPLOYMENT_TARGET_1060 = 10.6;
 MACOSX_DEPLOYMENT_TARGET_1070 = 10.7;
+MACOSX_DEPLOYMENT_TARGET_1080 = 10.8;
+MACOSX_DEPLOYMENT_TARGET_1090 = 10.9;

diff --git a/Tools/TestWebKitAPI/Configurations/Base.xcconfig b/Tools/TestWebKitAPI/Configurations/Base.xcconfig
index 46772bdc77861d5d50845f842cd3944af6437dd0..cfcfca6893df7cd4758ab055a896e0257a2eaee1 100644 (file)
--- a/Tools/TestWebKitAPI/Configurations/Base.xcconfig
+++ b/Tools/TestWebKitAPI/Configurations/Base.xcconfig
@@ -53,7 +53,14 @@ GCC_ENABLE_CPP_EXCEPTIONS_LLVM_COMPILER = YES;
 SDKROOT = $(SDKROOT_$(MAC_OS_X_VERSION_MAJOR)_$(TARGET_MAC_OS_X_VERSION_MAJOR));
 SDKROOT_1060_1050 = macosx10.5;
 SDKROOT_1070_1050 = macosx10.5;
+SDKROOT_1080_1050 = macosx10.5;
+SDKROOT_1090_1050 = macosx10.5;
 SDKROOT_1070_1060 = macosx10.6;
+SDKROOT_1080_1060 = macosx10.6;
+SDKROOT_1090_1060 = macosx10.6;
+SDKROOT_1080_1070 = macosx10.7;
+SDKROOT_1090_1070 = macosx10.7;
+SDKROOT_1090_1080 = macosx10.8;
 
 WEBKIT_UMBRELLA_FRAMEWORKS_DIR = $(NEXT_ROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks/WebKit.framework/Versions/A/Frameworks;
 WEBCORE_PRIVATE_HEADERS_DIR = $(WEBKIT_UMBRELLA_FRAMEWORKS_DIR)/WebCore.framework/PrivateHeaders;

diff --git a/Tools/TestWebKitAPI/Configurations/CompilerVersion.xcconfig b/Tools/TestWebKitAPI/Configurations/CompilerVersion.xcconfig
index 209bc548f7e85f8839a457277085298772c86b74..5146bb6cf13dcb208f7d452740b7273b64866640 100644 (file)
--- a/Tools/TestWebKitAPI/Configurations/CompilerVersion.xcconfig
+++ b/Tools/TestWebKitAPI/Configurations/CompilerVersion.xcconfig
@@ -45,10 +45,12 @@ TARGET_GCC_VERSION_1060_Debug_0400_1 = GCC_42;
 TARGET_GCC_VERSION_1060_Release = GCC_42;
 TARGET_GCC_VERSION_1060_Production = GCC_42;
 
-TARGET_GCC_VERSION_1070 = $(TARGET_GCC_VERSION_1070_$(CONFIGURATION));
-TARGET_GCC_VERSION_1070_Debug = LLVM_COMPILER;
-TARGET_GCC_VERSION_1070_Release = LLVM_GCC_42;
-TARGET_GCC_VERSION_1070_Production = LLVM_GCC_42;
+TARGET_GCC_VERSION_1070 = $(TARGET_GCC_VERSION_1070_AND_LATER_$(CONFIGURATION));
+TARGET_GCC_VERSION_1080 = $(TARGET_GCC_VERSION_1070_AND_LATER_$(CONFIGURATION));
+TARGET_GCC_VERSION_1090 = $(TARGET_GCC_VERSION_1070_AND_LATER_$(CONFIGURATION));
+TARGET_GCC_VERSION_1070_AND_LATER_Debug = LLVM_COMPILER;
+TARGET_GCC_VERSION_1070_AND_LATER_Release = LLVM_GCC_42;
+TARGET_GCC_VERSION_1070_AND_LATER_Production = LLVM_GCC_42;
 
 GCC_VERSION = $(GCC_VERSION_$(TARGET_GCC_VERSION));
 GCC_VERSION_GCC_40 = 4.0;

diff --git a/Tools/TestWebKitAPI/Configurations/DebugRelease.xcconfig b/Tools/TestWebKitAPI/Configurations/DebugRelease.xcconfig
index a10fe34f4b8851cb1e551cbda8f696177856dca5..54ad20d822e5cd933202cbec733fe1c46f5e65cf 100644 (file)
--- a/Tools/TestWebKitAPI/Configurations/DebugRelease.xcconfig
+++ b/Tools/TestWebKitAPI/Configurations/DebugRelease.xcconfig
@@ -27,6 +27,8 @@ ARCHS = $(ARCHS_$(TARGET_MAC_OS_X_VERSION_MAJOR));
 ARCHS_1050 = $(NATIVE_ARCH);
 ARCHS_1060 = $(ARCHS_STANDARD_32_64_BIT);
 ARCHS_1070 = $(ARCHS_STANDARD_32_64_BIT);
+ARCHS_1080 = $(ARCHS_STANDARD_32_64_BIT);
+ARCHS_1090 = $(ARCHS_STANDARD_32_64_BIT);
 
 ONLY_ACTIVE_ARCH = YES;
 
@@ -34,5 +36,7 @@ MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(TARGET_MAC_OS_X_VERSION_
 MACOSX_DEPLOYMENT_TARGET_1050 = 10.5;
 MACOSX_DEPLOYMENT_TARGET_1060 = 10.6;
 MACOSX_DEPLOYMENT_TARGET_1070 = 10.7;
+MACOSX_DEPLOYMENT_TARGET_1080 = 10.8;
+MACOSX_DEPLOYMENT_TARGET_1090 = 10.9;
 
 WEBKIT_UMBRELLA_FRAMEWORKS_DIR = $(BUILT_PRODUCTS_DIR);

diff --git a/Tools/WebKitTestRunner/Configurations/Base.xcconfig b/Tools/WebKitTestRunner/Configurations/Base.xcconfig
index f728701ee3564cf8433123f047fc1659a76cfc03..221c628e4ca4b8eb62dde1ba79cf02d33ffbfd86 100644 (file)
--- a/Tools/WebKitTestRunner/Configurations/Base.xcconfig
+++ b/Tools/WebKitTestRunner/Configurations/Base.xcconfig
@@ -53,7 +53,14 @@ GCC_ENABLE_CPP_EXCEPTIONS_LLVM_COMPILER = YES;
 SDKROOT = $(SDKROOT_$(MAC_OS_X_VERSION_MAJOR)_$(TARGET_MAC_OS_X_VERSION_MAJOR));
 SDKROOT_1060_1050 = macosx10.5;
 SDKROOT_1070_1050 = macosx10.5;
+SDKROOT_1080_1050 = macosx10.5;
+SDKROOT_1090_1050 = macosx10.5;
 SDKROOT_1070_1060 = macosx10.6;
+SDKROOT_1080_1060 = macosx10.6;
+SDKROOT_1090_1060 = macosx10.6;
+SDKROOT_1080_1070 = macosx10.7;
+SDKROOT_1090_1070 = macosx10.7;
+SDKROOT_1090_1080 = macosx10.8;
 
 WEBKIT_UMBRELLA_FRAMEWORKS_DIR = $(NEXT_ROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks/WebKit.framework/Versions/A/Frameworks;
 WEBCORE_PRIVATE_HEADERS_DIR = $(WEBKIT_UMBRELLA_FRAMEWORKS_DIR)/WebCore.framework/PrivateHeaders;

diff --git a/Tools/WebKitTestRunner/Configurations/CompilerVersion.xcconfig b/Tools/WebKitTestRunner/Configurations/CompilerVersion.xcconfig
index cb7e89d0115bd4508b0ff8eb2a91a84bb90f81fa..8beb5b1da80a2180216c2d9919182b28c14c419e 100644 (file)
--- a/Tools/WebKitTestRunner/Configurations/CompilerVersion.xcconfig
+++ b/Tools/WebKitTestRunner/Configurations/CompilerVersion.xcconfig
@@ -44,10 +44,12 @@ TARGET_GCC_VERSION_1060_Debug_0400_1 = GCC_42;
 TARGET_GCC_VERSION_1060_Release = GCC_42;
 TARGET_GCC_VERSION_1060_Production = GCC_42;
 
-TARGET_GCC_VERSION_1070 = $(TARGET_GCC_VERSION_1070_$(CONFIGURATION));
-TARGET_GCC_VERSION_1070_Debug = LLVM_COMPILER;
-TARGET_GCC_VERSION_1070_Release = LLVM_GCC_42;
-TARGET_GCC_VERSION_1070_Production = LLVM_GCC_42;
+TARGET_GCC_VERSION_1070 = $(TARGET_GCC_VERSION_1070_AND_LATER_$(CONFIGURATION));
+TARGET_GCC_VERSION_1080 = $(TARGET_GCC_VERSION_1070_AND_LATER_$(CONFIGURATION));
+TARGET_GCC_VERSION_1090 = $(TARGET_GCC_VERSION_1070_AND_LATER_$(CONFIGURATION));
+TARGET_GCC_VERSION_1070_AND_LATER_Debug = LLVM_COMPILER;
+TARGET_GCC_VERSION_1070_AND_LATER_Release = LLVM_GCC_42;
+TARGET_GCC_VERSION_1070_AND_LATER_Production = LLVM_GCC_42;
 
 GCC_VERSION = $(GCC_VERSION_$(TARGET_GCC_VERSION));
 GCC_VERSION_GCC_40 = 4.0;

diff --git a/Tools/WebKitTestRunner/Configurations/DebugRelease.xcconfig b/Tools/WebKitTestRunner/Configurations/DebugRelease.xcconfig
index a10fe34f4b8851cb1e551cbda8f696177856dca5..54ad20d822e5cd933202cbec733fe1c46f5e65cf 100644 (file)
--- a/Tools/WebKitTestRunner/Configurations/DebugRelease.xcconfig
+++ b/Tools/WebKitTestRunner/Configurations/DebugRelease.xcconfig
@@ -27,6 +27,8 @@ ARCHS = $(ARCHS_$(TARGET_MAC_OS_X_VERSION_MAJOR));
 ARCHS_1050 = $(NATIVE_ARCH);
 ARCHS_1060 = $(ARCHS_STANDARD_32_64_BIT);
 ARCHS_1070 = $(ARCHS_STANDARD_32_64_BIT);
+ARCHS_1080 = $(ARCHS_STANDARD_32_64_BIT);
+ARCHS_1090 = $(ARCHS_STANDARD_32_64_BIT);
 
 ONLY_ACTIVE_ARCH = YES;
 
@@ -34,5 +36,7 @@ MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(TARGET_MAC_OS_X_VERSION_
 MACOSX_DEPLOYMENT_TARGET_1050 = 10.5;
 MACOSX_DEPLOYMENT_TARGET_1060 = 10.6;
 MACOSX_DEPLOYMENT_TARGET_1070 = 10.7;
+MACOSX_DEPLOYMENT_TARGET_1080 = 10.8;
+MACOSX_DEPLOYMENT_TARGET_1090 = 10.9;
 
 WEBKIT_UMBRELLA_FRAMEWORKS_DIR = $(BUILT_PRODUCTS_DIR);