Commit 14d79856 authored by thatcher's avatar thatcher

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: http://svn.webkit.org/repository/webkit/trunk@11046 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent a1177b7f
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.
......
......@@ -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)",
......
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
......@@ -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)",
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.
......@@ -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",
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment