From 724eef5e5e36807e02add760ad0d3fca53ac58ec Mon Sep 17 00:00:00 2001 From: thatcher Date: Fri, 4 Nov 2005 01:38:25 +0000 Subject: [PATCH] JavaScriptCore: 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 | 8 ++++ .../JavaScriptCore.xcodeproj/project.pbxproj | 2 +- WebCore/ChangeLog-2005-12-19 | 8 ++++ WebCore/WebCore.xcodeproj/project.pbxproj | 10 ++--- WebKit/ChangeLog | 8 ++++ WebKit/WebKit.xcodeproj/project.pbxproj | 42 +++++++++---------- 6 files changed, 51 insertions(+), 27 deletions(-) diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog index f10286beab48..e72d0ef38f0d 100644 --- a/JavaScriptCore/ChangeLog +++ b/JavaScriptCore/ChangeLog @@ -1,3 +1,11 @@ +2005-11-03 Timothy Hatcher + + 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 - Updated JavaScriptCore test results to reflect recent fixes. diff --git a/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj b/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj index 938f3b7ce2a4..8183152f98ec 100644 --- 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 2d49ade8cfcb..d9dd3836ca08 100644 --- a/WebCore/ChangeLog-2005-12-19 +++ b/WebCore/ChangeLog-2005-12-19 @@ -1,3 +1,11 @@ +2005-11-03 Timothy Hatcher + + 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 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 93c98c9b4a6e..95ae659298bd 100644 --- 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 f2e7e1ec3793..8fdae9f6836c 100644 --- a/WebKit/ChangeLog +++ b/WebKit/ChangeLog @@ -1,3 +1,11 @@ +2005-11-03 Timothy Hatcher + + 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 Reviewed by John Sullivan. diff --git a/WebKit/WebKit.xcodeproj/project.pbxproj b/WebKit/WebKit.xcodeproj/project.pbxproj index 720218edbc33..37ce78dc597c 100644 --- 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", -- 2.36.0