[webkit-changes] cvs commit: WebKit/WebKit.xcodeproj project.pbxproj

Timothy thatcher at opensource.apple.com
Thu Nov 3 17:38:26 PST 2005


thatcher    05/11/03 17:38:25

  Modified:    .        ChangeLog
               JavaScriptCore.xcodeproj project.pbxproj
               .        ChangeLog
               WebCore.xcodeproj project.pbxproj
               .        ChangeLog
               WebKit.xcodeproj project.pbxproj
  Log:
  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.
  
  Revision  Changes    Path
  1.873     +8 -0      JavaScriptCore/ChangeLog
  
  Index: ChangeLog
  ===================================================================
  RCS file: /cvs/root/JavaScriptCore/ChangeLog,v
  retrieving revision 1.872
  retrieving revision 1.873
  diff -u -r1.872 -r1.873
  --- ChangeLog	3 Nov 2005 19:31:46 -0000	1.872
  +++ ChangeLog	4 Nov 2005 01:38:16 -0000	1.873
  @@ -1,3 +1,11 @@
  +2005-11-03  Timothy Hatcher  <timothy at 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 at apple.com>
   
           - Updated JavaScriptCore test results to reflect recent fixes.
  
  
  
  1.23      +1 -1      JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj
  
  Index: project.pbxproj
  ===================================================================
  RCS file: /cvs/root/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj,v
  retrieving revision 1.22
  retrieving revision 1.23
  diff -u -r1.22 -r1.23
  --- project.pbxproj	16 Oct 2005 00:46:21 -0000	1.22
  +++ project.pbxproj	4 Nov 2005 01:38:17 -0000	1.23
  @@ -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)",
  
  
  
  1.334     +8 -0      WebCore/ChangeLog
  
  Index: ChangeLog
  ===================================================================
  RCS file: /cvs/root/WebCore/ChangeLog,v
  retrieving revision 1.333
  retrieving revision 1.334
  diff -u -r1.333 -r1.334
  --- ChangeLog	3 Nov 2005 23:53:56 -0000	1.333
  +++ ChangeLog	4 Nov 2005 01:38:18 -0000	1.334
  @@ -1,3 +1,11 @@
  +2005-11-03  Timothy Hatcher  <timothy at 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 at apple.com>
   
   	Cleanup of bidi.cpp.  This is bug 5532.  I merged it nearly as is, although I
  
  
  
  1.41      +5 -5      WebCore/WebCore.xcodeproj/project.pbxproj
  
  Index: project.pbxproj
  ===================================================================
  RCS file: /cvs/root/WebCore/WebCore.xcodeproj/project.pbxproj,v
  retrieving revision 1.40
  retrieving revision 1.41
  diff -u -r1.40 -r1.41
  --- project.pbxproj	28 Oct 2005 00:49:50 -0000	1.40
  +++ project.pbxproj	4 Nov 2005 01:38:20 -0000	1.41
  @@ -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)",
  
  
  
  1.3367    +8 -0      WebKit/ChangeLog
  
  Index: ChangeLog
  ===================================================================
  RCS file: /cvs/root/WebKit/ChangeLog,v
  retrieving revision 1.3366
  retrieving revision 1.3367
  diff -u -r1.3366 -r1.3367
  --- ChangeLog	2 Nov 2005 01:59:07 -0000	1.3366
  +++ ChangeLog	4 Nov 2005 01:38:21 -0000	1.3367
  @@ -1,3 +1,11 @@
  +2005-11-03  Timothy Hatcher  <timothy at 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 at apple.com>
   
           Reviewed by John Sullivan.
  
  
  
  1.14      +21 -21    WebKit/WebKit.xcodeproj/project.pbxproj
  
  Index: project.pbxproj
  ===================================================================
  RCS file: /cvs/root/WebKit/WebKit.xcodeproj/project.pbxproj,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- project.pbxproj	2 Nov 2005 01:59:16 -0000	1.13
  +++ project.pbxproj	4 Nov 2005 01:38:25 -0000	1.14
  @@ -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",
  
  
  



More information about the webkit-changes mailing list