JavaScriptCore:

        Reviewed by Maciej.

        Moved JavaScriptCore to be a public framework.

        * JavaScriptCore.xcodeproj/project.pbxproj:

WebKit:

        Reviewed by Maciej.

        Moved JavaScriptCore to be a public framework.

        * WebKit.xcodeproj/project.pbxproj:

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

diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index ce8a87d5ed2fad1608c79d610baf887d0f130324..e3392be80c598adbac16d91dc8cb92af58b6c119 100644 (file)
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,3 +1,11 @@
+2006-07-13  Timothy Hatcher  <timothy@apple.com>
+
+        Reviewed by Maciej.
+
+        Moved JavaScriptCore to be a public framework.
+
+        * JavaScriptCore.xcodeproj/project.pbxproj:
+
 2006-07-13  Mark Rowe  <opendarwin.org@bdash.net.nz>
 
         Reviewed by Geoffrey.

diff --git a/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj b/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj
index 698980cb2c69b5c8334c436c81fa57394578d81b..2fd59f02895900016b31d9cff87d0e2da5fe987a 100644 (file)
--- a/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj
+++ b/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj
@@ -1582,13 +1582,12 @@
                                INFOPLIST_FILE = Info.plist;
                                INSTALL_PATH = "$(BUILT_PRODUCTS_DIR)";
                                OTHER_LDFLAGS = (
-                                       "$(STYLE_LDFLAGS)",
                                        "-sub_library",
                                        libobjc,
                                        "-Wl,-Y,3",
                                );
                                PRODUCT_NAME = JavaScriptCore;
-                               STYLE_LDFLAGS = "";
+                               VALID_ARCHS = "i386 ppc ppc7400 ppc970 ppc64 x86_64";
                                WARNING_CFLAGS = (
                                        "-Wall",
                                        "-W",
@@ -1623,13 +1622,12 @@
                                INFOPLIST_FILE = Info.plist;
                                INSTALL_PATH = "$(BUILT_PRODUCTS_DIR)";
                                OTHER_LDFLAGS = (
-                                       "$(STYLE_LDFLAGS)",
                                        "-sub_library",
                                        libobjc,
                                        "-Wl,-Y,3",
                                );
                                PRODUCT_NAME = JavaScriptCore;
-                               STYLE_LDFLAGS = "";
+                               VALID_ARCHS = "i386 ppc ppc7400 ppc970 ppc64 x86_64";
                                WARNING_CFLAGS = (
                                        "-Wall",
                                        "-W",
@@ -1662,9 +1660,8 @@
                                );
                                HEADER_SEARCH_PATHS_QUOTED_1 = "\"$(BUILT_PRODUCTS_DIR)/DerivedSources/JavaScriptCore\"";
                                INFOPLIST_FILE = Info.plist;
-                               INSTALL_PATH = "$(SYSTEM_LIBRARY_DIR)/Frameworks/WebKit.framework/Versions/A/Frameworks";
+                               INSTALL_PATH = "$(SYSTEM_LIBRARY_DIR)/Frameworks";
                                OTHER_LDFLAGS = (
-                                       "$(STYLE_LDFLAGS)",
                                        "-sub_library",
                                        libobjc,
                                        "-Wl,-Y,3",
@@ -1676,7 +1673,7 @@
                                        __text,
                                        "$(APPLE_INTERNAL_DIR)/OrderFiles/JavaScriptCore.order",
                                );
-                               STYLE_LDFLAGS = "-umbrella WebKit -allowable_client JavaScriptGlue";
+                               VALID_ARCHS = "i386 ppc ppc7400 ppc970 ppc64 x86_64";
                                WARNING_CFLAGS = (
                                        "-Wall",
                                        "-W",

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 292aaefdf778a3313b59265d12e43aa5b2a86cb2..6bf5f555e17090ecd005b59196ecad1a8f5a25d4 100644 (file)
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,11 @@
+2006-07-14  Timothy Hatcher  <timothy@apple.com>
+
+        Reviewed by Maciej.
+
+        Moved JavaScriptCore to be a public framework.
+
+        * WebKit.xcodeproj/project.pbxproj:
+
 2006-07-13  Mitz Pettel  <opendarwin.org@mitzpettel.com>
 
         Reviewed by Darin.

diff --git a/WebKit/WebKit.xcodeproj/project.pbxproj b/WebKit/WebKit.xcodeproj/project.pbxproj
index 6f6e12480f347f35ed6bd4a9e51206af95a45b4c..729bc80eb84be4a44a2d4baf7d596e39619ebc2a 100644 (file)
--- a/WebKit/WebKit.xcodeproj/project.pbxproj
+++ b/WebKit/WebKit.xcodeproj/project.pbxproj
@@ -1840,7 +1840,7 @@
                                HEADER_SEARCH_PATHS_QUOTED_1 = "\"$(BUILT_PRODUCTS_DIR)/usr/local/include\"";
                                INFOPLIST_FILE = Info.plist;
                                INSTALL_PATH = "$(SYSTEM_LIBRARY_DIR)/Frameworks";
-                               JAVASCRIPTCORE_PRIVATE_HEADERS_DIR = "$(UMBRELLA_FRAMEWORKS_DIR)/JavaScriptCore.framework/PrivateHeaders";
+                               JAVASCRIPTCORE_PRIVATE_HEADERS_DIR = "$(NEXT_ROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks/JavaScriptCore.framework/PrivateHeaders";
                                OTHER_LDFLAGS = "$(STYLE_LDFLAGS)";
                                PRODUCT_NAME = WebKit;
                                SECTORDER_FLAGS = (
@@ -1849,7 +1849,7 @@
                                        __text,
                                        /AppleInternal/OrderFiles/WebKit.order,
                                );
-                               STYLE_LDFLAGS = "-sub_umbrella WebCore -sub_umbrella JavaScriptCore";
+                               STYLE_LDFLAGS = "-sub_umbrella WebCore";
                                UMBRELLA_FRAMEWORKS_DIR = "$(NEXT_ROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks/WebKit.framework/Versions/A/Frameworks";
                                VALID_ARCHS = "i386 ppc ppc7400 ppc970 ppc64 x86_64";
                                WEBCORE_PRIVATE_HEADERS_DIR = "$(UMBRELLA_FRAMEWORKS_DIR)/WebCore.framework/PrivateHeaders";