WebKit:

        Reviewed by Mark Rowe.

        <rdar://problem/5069711> OpenSource version of libWebKitSystemInterface.a is Tiger only, causes issues if used on Leopard

        Use the WebKitSystemInterface that matches the system version.

        * Configurations/DebugRelease.xcconfig:
        * WebKit.xcodeproj/project.pbxproj:

WebKitLibraries:

        Reviewed by Mark Rowe.

        <rdar://problem/5069711> OpenSource version of libWebKitSystemInterface.a is Tiger only, causes issues if used on Leopard

        Add system specific versions of WebKitSystemInterface.

        * libWebKitSystemInterface.a: Removed.
        * libWebKitSystemInterfaceLeopard.a: Added.
        * libWebKitSystemInterfaceTiger.a: Added.

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

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index a99275292fe1392dfa13aadfccb95d91ea78be75..245099835c3f033e0ad510036f13e26c93749e9a 100644 (file)
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,14 @@
+2007-10-24  Timothy Hatcher  <timothy@apple.com>
+
+        Reviewed by Mark Rowe.
+
+        <rdar://problem/5069711> OpenSource version of libWebKitSystemInterface.a is Tiger only, causes issues if used on Leopard
+
+        Use the WebKitSystemInterface that matches the system version.
+
+        * Configurations/DebugRelease.xcconfig:
+        * WebKit.xcodeproj/project.pbxproj:
+
 2007-10-24  Brady Eidson  <beidson@apple.com>
 
         Reviewed by Anders

diff --git a/WebKit/Configurations/DebugRelease.xcconfig b/WebKit/Configurations/DebugRelease.xcconfig
index f93e177a059b9f5ddacee1ac2d471abafc15770c..96ba3a2a152df04063933e4bd30dd354fcb3fa0f 100644 (file)
--- a/WebKit/Configurations/DebugRelease.xcconfig
+++ b/WebKit/Configurations/DebugRelease.xcconfig
@@ -3,3 +3,7 @@ MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(MAC_OS_X_VERSION_MAJOR))
 MACOSX_DEPLOYMENT_TARGET_ = 10.4;
 MACOSX_DEPLOYMENT_TARGET_1040 = 10.4;
 MACOSX_DEPLOYMENT_TARGET_1050 = 10.5;
+WEBKIT_SYSTEM_INTERFACE_LIBRARY = $(WEBKIT_SYSTEM_INTERFACE_LIBRARY_$(MAC_OS_X_VERSION_MAJOR));
+WEBKIT_SYSTEM_INTERFACE_LIBRARY_ = WebKitSystemInterfaceTiger;
+WEBKIT_SYSTEM_INTERFACE_LIBRARY_1040 = WebKitSystemInterfaceTiger;
+WEBKIT_SYSTEM_INTERFACE_LIBRARY_1050 = WebKitSystemInterfaceLeopard;

diff --git a/WebKit/WebKit.xcodeproj/project.pbxproj b/WebKit/WebKit.xcodeproj/project.pbxproj
index dbed95f43800d48df7b46687ef715122b73da4f1..6989d4c261a759fcb99b3b2cd254fd966e5abd2c 100644 (file)
--- a/WebKit/WebKit.xcodeproj/project.pbxproj
+++ b/WebKit/WebKit.xcodeproj/project.pbxproj
@@ -58,7 +58,6 @@
                6550B7C8099EFAE90090D781 /* WebArchiver.mm in Sources */ = {isa = PBXBuildFile; fileRef = 6550B7C6099EFAE90090D781 /* WebArchiver.mm */; };
                656D333E0AF21AE900212169 /* WebResourceLoadDelegatePrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = 656D333D0AF21AE900212169 /* WebResourceLoadDelegatePrivate.h */; settings = {ATTRIBUTES = (Private, ); }; };
                658A40960A14853B005E6987 /* WebDataSourceInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 658A40950A14853B005E6987 /* WebDataSourceInternal.h */; };
-               65A0006908527D1A005620FA /* libWebKitSystemInterface.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 65A0006808527D1A005620FA /* libWebKitSystemInterface.a */; };
                65E0F88408500917007E5CB9 /* WebNSURLRequestExtras.h in Headers */ = {isa = PBXBuildFile; fileRef = 65E0F88208500917007E5CB9 /* WebNSURLRequestExtras.h */; };
                65E0F88508500917007E5CB9 /* WebNSURLRequestExtras.m in Sources */ = {isa = PBXBuildFile; fileRef = 65E0F88308500917007E5CB9 /* WebNSURLRequestExtras.m */; };
                65E0F9E608500F23007E5CB9 /* WebNSUserDefaultsExtras.h in Headers */ = {isa = PBXBuildFile; fileRef = 65E0F9E408500F23007E5CB9 /* WebNSUserDefaultsExtras.h */; settings = {ATTRIBUTES = (Private, ); }; };
@@ -414,7 +413,6 @@
                6578F5DF045F817400000128 /* WebDownload.m */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.objc; path = WebDownload.m; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
                65836F5E07EE425900682F95 /* WebPluginContainerPrivate.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = WebPluginContainerPrivate.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
                658A40950A14853B005E6987 /* WebDataSourceInternal.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = WebDataSourceInternal.h; sourceTree = "<group>"; };
-               65A0006808527D1A005620FA /* libWebKitSystemInterface.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libWebKitSystemInterface.a; sourceTree = BUILT_PRODUCTS_DIR; };
                65A7D44A0568AB2600E70EF6 /* WebUIDelegatePrivate.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = WebUIDelegatePrivate.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
                65DA2608052CC18700A97B31 /* WebHistory.mm */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebHistory.mm; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
                65E0F88208500917007E5CB9 /* WebNSURLRequestExtras.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = WebNSURLRequestExtras.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
@@ -608,7 +606,6 @@
                                9398112C0824BF01008DF038 /* WebCore.framework in Frameworks */,
                                9398112E0824BF01008DF038 /* libicucore.dylib in Frameworks */,
                                9398112F0824BF01008DF038 /* Security.framework in Frameworks */,
-                               65A0006908527D1A005620FA /* libWebKitSystemInterface.a in Frameworks */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
@@ -658,7 +655,6 @@
                                830E81E005853AC000AD0891 /* Security.framework */,
                                93D623DD051E791F002F47DD /* libicucore.dylib */,
                                F738C9E903FAD3DF0321FBE0 /* JavaScriptCore.framework */,
-                               65A0006808527D1A005620FA /* libWebKitSystemInterface.a */,
                                F738C9EA03FAD3DF0321FBE0 /* WebCore.framework */,
                        );
                        name = "Frameworks and Libraries";
@@ -1626,6 +1622,7 @@
                                        "-lobjc",
                                        "-sub_library",
                                        libobjc,
+                                       "-l$(WEBKIT_SYSTEM_INTERFACE_LIBRARY)",
                                );
                                UMBRELLA_FRAMEWORKS_DIR = "$(BUILT_PRODUCTS_DIR)";
                        };
@@ -1642,6 +1639,7 @@
                                        "-lobjc",
                                        "-sub_library",
                                        libobjc,
+                                       "-l$(WEBKIT_SYSTEM_INTERFACE_LIBRARY)",
                                );
                                UMBRELLA_FRAMEWORKS_DIR = "$(BUILT_PRODUCTS_DIR)";
                        };
@@ -1655,6 +1653,7 @@
                                OTHER_LDFLAGS = (
                                        "-sub_umbrella",
                                        WebCore,
+                                       "-lWebKitSystemInterface",
                                );
                                SECTORDER_FLAGS = (
                                        "-sectorder",

diff --git a/WebKitLibraries/ChangeLog b/WebKitLibraries/ChangeLog
index 7c3f4993e5fa65414851cbeb647fd918db7e704e..cf25e9076e03276e83cd6aad2bb3465f63698a21 100644 (file)
--- a/WebKitLibraries/ChangeLog
+++ b/WebKitLibraries/ChangeLog
@@ -1,3 +1,15 @@
+2007-10-24  Timothy Hatcher  <timothy@apple.com>
+
+        Reviewed by Mark Rowe.
+
+        <rdar://problem/5069711> OpenSource version of libWebKitSystemInterface.a is Tiger only, causes issues if used on Leopard
+
+        Add system specific versions of WebKitSystemInterface.
+
+        * libWebKitSystemInterface.a: Removed.
+        * libWebKitSystemInterfaceLeopard.a: Added.
+        * libWebKitSystemInterfaceTiger.a: Added.
+
 2007-10-11  Ada Chan  <adachan@apple.com>
 
         <rdar://problem/5534421>

diff --git a/WebKitLibraries/libWebKitSystemInterface.a b/WebKitLibraries/libWebKitSystemInterface.a
deleted file mode 100644 (file)
index a7fa409..0000000
Binary files a/WebKitLibraries/libWebKitSystemInterface.a and /dev/null differ

diff --git a/WebKitLibraries/libWebKitSystemInterfaceLeopard.a b/WebKitLibraries/libWebKitSystemInterfaceLeopard.a
new file mode 100644 (file)
index 0000000..72caf71
Binary files /dev/null and b/WebKitLibraries/libWebKitSystemInterfaceLeopard.a differ

diff --git a/WebKitLibraries/libWebKitSystemInterfaceTiger.a b/WebKitLibraries/libWebKitSystemInterfaceTiger.a
new file mode 100644 (file)
index 0000000..3810727
Binary files /dev/null and b/WebKitLibraries/libWebKitSystemInterfaceTiger.a differ