git://git.webkit.org / WebKit-https.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 6190848)
JavaScriptCore:
authorthatcher <thatcher@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 4 Nov 2005 01:38:25 +0000 (01:38 +0000)
committerthatcher <thatcher@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 4 Nov 2005 01:38:25 +0000 (01:38 +0000)
        Reviewed by Darin and Vicki.

        * JavaScriptCore.xcodeproj/project.pbxproj:
          Change to use $(SYSTEM_LIBRARY_DIR) consistently and place
          $(NEXT_ROOT) in a few spots to make build-root work.

WebCore:

        Reviewed by Darin and Vicki.

        * WebCore.xcodeproj/project.pbxproj:
          Change to use $(SYSTEM_LIBRARY_DIR) consistently and place
          $(NEXT_ROOT) in a few spots to make build-root work.

WebKit:

        Reviewed by Darin and Vicki.

        * WebKit.xcodeproj/project.pbxproj:
          Change to use $(SYSTEM_LIBRARY_DIR) consistently and place
          $(NEXT_ROOT) in a few spots to make build-root work.

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

JavaScriptCore/ChangeLog patch | blob | history
JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj patch | blob | history
WebCore/ChangeLog-2005-12-19 patch | blob | history
WebCore/WebCore.xcodeproj/project.pbxproj patch | blob | history
WebKit/ChangeLog patch | blob | history
WebKit/WebKit.xcodeproj/project.pbxproj patch | blob | history

diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index f10286beab48c9bce54ca726e3d0d6e9e1cee696..e72d0ef38f0d014d39d2794bd054d2f641a07913 100644 (file)
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,3 +1,11 @@
+2005-11-03  Timothy Hatcher  <timothy@apple.com>
+
+        Reviewed by Darin and Vicki.
+
+        * JavaScriptCore.xcodeproj/project.pbxproj:
+          Change to use $(SYSTEM_LIBRARY_DIR) consistently and place
+          $(NEXT_ROOT) in a few spots to make build-root work.
+
 2005-11-03  Geoffrey Garen  <ggaren@apple.com>
 
         - Updated JavaScriptCore test results to reflect recent fixes.
diff --git a/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj b/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj
index 938f3b7ce2a43f14a715db765dc4c819d3d46344..8183152f98ec38dfd1dd8882fb5252c021f93ebb 100644 (file)
--- a/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj
+++ b/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj
@@ -2091,7 +2091,7 @@
                                        .,
                                );
                                INFOPLIST_FILE = Info.plist;
-                               INSTALL_PATH = /System/Library/Frameworks/WebKit.framework/Versions/A/Frameworks;
+                               INSTALL_PATH = "$(SYSTEM_LIBRARY_DIR)/Frameworks/WebKit.framework/Versions/A/Frameworks";
                                OTHER_CFLAGS = "";
                                OTHER_LDFLAGS = (
                                        "$(STYLE_LDFLAGS)",
diff --git a/WebCore/ChangeLog-2005-12-19 b/WebCore/ChangeLog-2005-12-19
index 2d49ade8cfcb86d5ff0b9e6d00489c5478809f17..d9dd3836ca08f2bd6d860e3a6ac5eb3fcfbaeb27 100644 (file)
--- a/WebCore/ChangeLog-2005-12-19
+++ b/WebCore/ChangeLog-2005-12-19
@@ -1,3 +1,11 @@
+2005-11-03  Timothy Hatcher  <timothy@apple.com>
+
+        Reviewed by Darin and Vicki.
+
+        * WebCore.xcodeproj/project.pbxproj:
+          Change to use $(SYSTEM_LIBRARY_DIR) consistently and place
+          $(NEXT_ROOT) in a few spots to make build-root work.
+
 2005-11-03  David Hyatt  <hyatt@apple.com>
 
        Cleanup of bidi.cpp.  This is bug 5532.  I merged it nearly as is, although I
diff --git a/WebCore/WebCore.xcodeproj/project.pbxproj b/WebCore/WebCore.xcodeproj/project.pbxproj
index 93c98c9b4a6ee38abe47ee19602f6ee3fcdccc3b..95ae659298bd2c0039b8adb415e0bdaf6acea52a 100644 (file)
--- a/WebCore/WebCore.xcodeproj/project.pbxproj
+++ b/WebCore/WebCore.xcodeproj/project.pbxproj
@@ -10408,7 +10408,7 @@
                                        /usr/include/libxml2,
                                );
                                INFOPLIST_FILE = Info.plist;
-                               INSTALL_PATH = /System/Library/Frameworks/WebKit.framework/Versions/A/Frameworks;
+                               INSTALL_PATH = "$(SYSTEM_LIBRARY_DIR)/Frameworks/WebKit.framework/Versions/A/Frameworks";
                                LIBRARY_SEARCH_PATHS = "'$(DERIVED_FILE_DIR)'";
                                MACOSX_DEPLOYMENT_TARGET = 10.3;
                                OTHER_LDFLAGS = (
@@ -10466,7 +10466,7 @@
                                        /usr/include/libxml2,
                                );
                                INFOPLIST_FILE = Info.plist;
-                               INSTALL_PATH = /System/Library/Frameworks/WebKit.framework/Versions/A/Frameworks;
+                               INSTALL_PATH = "$(SYSTEM_LIBRARY_DIR)/Frameworks/WebKit.framework/Versions/A/Frameworks";
                                LIBRARY_SEARCH_PATHS = "'$(DERIVED_FILE_DIR)'";
                                MACOSX_DEPLOYMENT_TARGET = 10.3;
                                OTHER_LDFLAGS = (
@@ -10524,7 +10524,7 @@
                                        /usr/include/libxml2,
                                );
                                INFOPLIST_FILE = Info.plist;
-                               INSTALL_PATH = /System/Library/Frameworks/WebKit.framework/Versions/A/Frameworks;
+                               INSTALL_PATH = "$(SYSTEM_LIBRARY_DIR)/Frameworks/WebKit.framework/Versions/A/Frameworks";
                                LIBRARY_SEARCH_PATHS = "'$(DERIVED_FILE_DIR)'";
                                MACOSX_DEPLOYMENT_TARGET = 10.3;
                                OTHER_LDFLAGS = (
@@ -10554,7 +10554,7 @@
                149C283D08902B11008A9EFC /* Default */ = {
                        isa = XCBuildConfiguration;
                        buildSettings = {
-                               CREATE_HASH_TABLE = /System/Library/Frameworks/WebKit.framework/Versions/A/Frameworks/JavaScriptCore.framework/PrivateHeaders/create_hash_table;
+                               CREATE_HASH_TABLE = "$(NEXT_ROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks/WebKit.framework/Versions/A/Frameworks/JavaScriptCore.framework/PrivateHeaders/create_hash_table";
                                DEBUG_DEFINES = NDEBUG;
                                DYLIB_COMPATIBILITY_VERSION = 1;
                                DYLIB_CURRENT_VERSION = 1;
@@ -10582,7 +10582,7 @@
                                        /usr/include/libxml2,
                                );
                                INFOPLIST_FILE = Info.plist;
-                               INSTALL_PATH = /System/Library/Frameworks/WebKit.framework/Versions/A/Frameworks;
+                               INSTALL_PATH = "$(SYSTEM_LIBRARY_DIR)/Frameworks/WebKit.framework/Versions/A/Frameworks";
                                LIBRARY_SEARCH_PATHS = "'$(DERIVED_FILE_DIR)'";
                                OTHER_LDFLAGS = (
                                        "$(STYLE_LDFLAGS)",
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index f2e7e1ec3793a5e5a11efe81a3c920458236b5b5..8fdae9f6836c959f40469ce933f0d8e81d6a84d2 100644 (file)
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,11 @@
+2005-11-03  Timothy Hatcher  <timothy@apple.com>
+
+        Reviewed by Darin and Vicki.
+
+        * WebKit.xcodeproj/project.pbxproj:
+          Change to use $(SYSTEM_LIBRARY_DIR) consistently and place
+          $(NEXT_ROOT) in a few spots to make build-root work.
+
 2005-11-01  Tim Omernick  <timo@apple.com>
 
         Reviewed by John Sullivan.
diff --git a/WebKit/WebKit.xcodeproj/project.pbxproj b/WebKit/WebKit.xcodeproj/project.pbxproj
index 720218edbc33fd33be0d672eef21ff31862687c3..37ce78dc597c9f3937e30dd26a6500bb0d64f558 100644 (file)
--- a/WebKit/WebKit.xcodeproj/project.pbxproj
+++ b/WebKit/WebKit.xcodeproj/project.pbxproj
@@ -1864,11 +1864,11 @@
                                DYLIB_CURRENT_VERSION = 1;
                                EXPORTED_SYMBOLS_FILE = WebKit.exp;
                                FRAMEWORK_SEARCH_PATHS = (
-                                       /System/Library/Frameworks/WebKit.framework/Frameworks,
-                                       /System/Library/Frameworks/ApplicationServices.framework/Frameworks,
+                                       "$(SYSTEM_LIBRARY_DIR)/Frameworks/WebKit.framework/Frameworks",
+                                       "$(SYSTEM_LIBRARY_DIR)/Frameworks/ApplicationServices.framework/Frameworks",
                                        "$(SYSTEM_LIBRARY_DIR)/Frameworks/Carbon.framework/Frameworks",
-                                       /System/Library/Frameworks/Quartz.framework/Frameworks,
-                                       /System/Library/PrivateFrameworks,
+                                       "$(SYSTEM_LIBRARY_DIR)/Frameworks/Quartz.framework/Frameworks",
+                                       "$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks",
                                );
                                GCC_ENABLE_OBJC_GC = YES;
                                GCC_FAST_OBJC_DISPATCH = YES;
@@ -1889,7 +1889,7 @@
                                        icu,
                                );
                                INFOPLIST_FILE = Info.plist;
-                               INSTALL_PATH = /System/Library/Frameworks;
+                               INSTALL_PATH = "$(SYSTEM_LIBRARY_DIR)/Frameworks";
                                JAVASCRIPTCORE_PRIVATE_HEADERS_DIR = "$(UMBRELLA_FRAMEWORKS_DIR)/JavaScriptCore.framework/PrivateHeaders";
                                MACOSX_DEPLOYMENT_TARGET = 10.3;
                                OTHER_CFLAGS = (
@@ -1928,11 +1928,11 @@
                                DYLIB_CURRENT_VERSION = 1;
                                EXPORTED_SYMBOLS_FILE = WebKit.exp;
                                FRAMEWORK_SEARCH_PATHS = (
-                                       /System/Library/Frameworks/WebKit.framework/Frameworks,
-                                       /System/Library/Frameworks/ApplicationServices.framework/Frameworks,
+                                       "$(SYSTEM_LIBRARY_DIR)/Frameworks/WebKit.framework/Frameworks",
+                                       "$(SYSTEM_LIBRARY_DIR)/Frameworks/ApplicationServices.framework/Frameworks",
                                        "$(SYSTEM_LIBRARY_DIR)/Frameworks/Carbon.framework/Frameworks",
-                                       /System/Library/Frameworks/Quartz.framework/Frameworks,
-                                       /System/Library/PrivateFrameworks,
+                                       "$(SYSTEM_LIBRARY_DIR)/Frameworks/Quartz.framework/Frameworks",
+                                       "$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks",
                                );
                                GCC_ENABLE_OBJC_GC = YES;
                                GCC_FAST_OBJC_DISPATCH = YES;
@@ -1952,7 +1952,7 @@
                                        icu,
                                );
                                INFOPLIST_FILE = Info.plist;
-                               INSTALL_PATH = /System/Library/Frameworks;
+                               INSTALL_PATH = "$(SYSTEM_LIBRARY_DIR)/Frameworks";
                                JAVASCRIPTCORE_PRIVATE_HEADERS_DIR = "$(UMBRELLA_FRAMEWORKS_DIR)/JavaScriptCore.framework/PrivateHeaders";
                                MACOSX_DEPLOYMENT_TARGET = 10.3;
                                OTHER_CFLAGS = (
@@ -1991,11 +1991,11 @@
                                DYLIB_CURRENT_VERSION = 1;
                                EXPORTED_SYMBOLS_FILE = WebKit.exp;
                                FRAMEWORK_SEARCH_PATHS = (
-                                       /System/Library/Frameworks/WebKit.framework/Frameworks,
-                                       /System/Library/Frameworks/ApplicationServices.framework/Frameworks,
+                                       "$(SYSTEM_LIBRARY_DIR)/Frameworks/WebKit.framework/Frameworks",
+                                       "$(SYSTEM_LIBRARY_DIR)/Frameworks/ApplicationServices.framework/Frameworks",
                                        "$(SYSTEM_LIBRARY_DIR)/Frameworks/Carbon.framework/Frameworks",
-                                       /System/Library/Frameworks/Quartz.framework/Frameworks,
-                                       /System/Library/PrivateFrameworks,
+                                       "$(SYSTEM_LIBRARY_DIR)/Frameworks/Quartz.framework/Frameworks",
+                                       "$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks",
                                );
                                GCC_ENABLE_OBJC_GC = YES;
                                GCC_FAST_OBJC_DISPATCH = YES;
@@ -2016,7 +2016,7 @@
                                        icu,
                                );
                                INFOPLIST_FILE = Info.plist;
-                               INSTALL_PATH = /System/Library/Frameworks;
+                               INSTALL_PATH = "$(SYSTEM_LIBRARY_DIR)/Frameworks";
                                JAVASCRIPTCORE_PRIVATE_HEADERS_DIR = "$(UMBRELLA_FRAMEWORKS_DIR)/JavaScriptCore.framework/PrivateHeaders";
                                MACOSX_DEPLOYMENT_TARGET = 10.3;
                                OTHER_CFLAGS = (
@@ -2055,11 +2055,11 @@
                                DYLIB_CURRENT_VERSION = 1;
                                EXPORTED_SYMBOLS_FILE = WebKit.exp;
                                FRAMEWORK_SEARCH_PATHS = (
-                                       /System/Library/Frameworks/WebKit.framework/Frameworks,
-                                       /System/Library/Frameworks/ApplicationServices.framework/Frameworks,
+                                       "$(SYSTEM_LIBRARY_DIR)/Frameworks/WebKit.framework/Frameworks",
+                                       "$(SYSTEM_LIBRARY_DIR)/Frameworks/ApplicationServices.framework/Frameworks",
                                        "$(SYSTEM_LIBRARY_DIR)/Frameworks/Carbon.framework/Frameworks",
-                                       /System/Library/Frameworks/Quartz.framework/Frameworks,
-                                       /System/Library/PrivateFrameworks,
+                                       "$(SYSTEM_LIBRARY_DIR)/Frameworks/Quartz.framework/Frameworks",
+                                       "$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks",
                                );
                                GCC_ENABLE_OBJC_GC = YES;
                                GCC_FAST_OBJC_DISPATCH = YES;
@@ -2079,7 +2079,7 @@
                                        icu,
                                );
                                INFOPLIST_FILE = Info.plist;
-                               INSTALL_PATH = /System/Library/Frameworks;
+                               INSTALL_PATH = "$(SYSTEM_LIBRARY_DIR)/Frameworks";
                                JAVASCRIPTCORE_PRIVATE_HEADERS_DIR = "$(UMBRELLA_FRAMEWORKS_DIR)/JavaScriptCore.framework/PrivateHeaders";
                                OTHER_CFLAGS = (
                                        "-Wbad-function-cast",
@@ -2096,7 +2096,7 @@
                                        /AppleInternal/OrderFiles/WebKit.order,
                                );
                                STYLE_LDFLAGS = "-sub_umbrella WebCore -sub_umbrella JavaScriptCore";
-                               UMBRELLA_FRAMEWORKS_DIR = /System/Library/Frameworks/WebKit.framework/Frameworks;
+                               UMBRELLA_FRAMEWORKS_DIR = "$(NEXT_ROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks/WebKit.framework/Versions/A/Frameworks";
                                WARNING_CFLAGS = (
                                        "-Wall",
                                        "-W",
Mirror of the WebKit open source project from svn.webkit.org.