Changeset 27582 in webkit

Timestamp:

Nov 7, 2007 3:09:12 PM (16 years ago)

Author:

mrowe@apple.com

Message:

2007-11-07 Mark Rowe <​mrowe@apple.com>

Reviewed by Kevin Decker.

Fix 64-bit Mac build.

• WebKit.xcodeproj/project.pbxproj: Change paths specified relative to SRCROOT to be relative to PROJECT_DIR. PROJECT_DIR takes into account the projectDirPath setting of the project, which in this instance includes the necessary "mac" subdirectory.

Location:

trunk/WebKit

Files:

• ChangeLog (added)
• WebKit.xcodeproj/project.pbxproj (modified) (5 diffs)

trunk/WebKit/WebKit.xcodeproj/project.pbxproj

@@ -1366 +1366 @@
                         );
                         inputPaths = (
-                                "$(SRCROOT)/WebKit.exp",
+                                "$(PROJECT_DIR)/WebKit.exp",
                         );
                         outputPaths = (
@@ -1373 +1373 @@
                         runOnlyForDeploymentPostprocessing = 0;
                         shellPath = /bin/sh;
-                        shellScript = "mkdir -p \"${BUILT_PRODUCTS_DIR}/DerivedSources/WebKit\"\n\n# exclude Carbon functions on 64-bit\nsed -e s/^_HIWebViewCreate$// -e s/^_HIWebViewGetWebView$// -e s/^_WebConvertNSImageToCGImageRef$// -e s/^_WebInitForCarbon$// \"${SRCROOT}/WebKit.exp\" > \"${BUILT_PRODUCTS_DIR}/DerivedSources/WebKit/WebKit.LP64.exp\"\n";
+                        shellScript = "mkdir -p \"${BUILT_PRODUCTS_DIR}/DerivedSources/WebKit\"\n\n# exclude Carbon functions on 64-bit\nsed -e s/^_HIWebViewCreate$// -e s/^_HIWebViewGetWebView$// -e s/^_WebConvertNSImageToCGImageRef$// -e s/^_WebInitForCarbon$// \"${PROJECT_DIR}/WebKit.exp\" > \"${BUILT_PRODUCTS_DIR}/DerivedSources/WebKit/WebKit.LP64.exp\"\n";
                 };
                 1C5BFFFE0BAF8AEA004FF4F5 /* Check Bundle Version */ = {
@@ -1381 +1381 @@
                         );
                         inputPaths = (
-                                "$(SRCROOT)/Configurations/Version.xcconfig",
+                                "$(PROJECT_DIR)/Configurations/Version.xcconfig",
                         );
                         name = "Check Bundle Version";
@@ -1396 +1396 @@
                         );
                         inputPaths = (
-                                "$(SRCROOT)/MigrateWebCoreHeaders.make",
+                                "$(PROJECT_DIR)/MigrateWebCoreHeaders.make",
                         );
                         name = "Migrate Headers";
@@ -1411 +1411 @@
                         );
                         inputPaths = (
-                                "$(SRCROOT)/Configurations/Version.xcconfig",
+                                "$(PROJECT_DIR)/Configurations/Version.xcconfig",
                         );
                         name = "Update Info.plist with version information";
                         outputPaths = (
-                                "$(SRCROOT)/Info.plist",
+                                "$(PROJECT_DIR)/Info.plist",
                         );
                         runOnlyForDeploymentPostprocessing = 0;
                         shellPath = /bin/sh;
-                        shellScript = "# Touch Info.plist to let Xcode know it needs to copy it into the built product\ntouch \"$SRCROOT/Info.plist\"\n";
+                        shellScript = "# Touch Info.plist to let Xcode know it needs to copy it into the built product\ntouch \"$PROJECT_DIR/Info.plist\"\n";
                 };
                 939811300824BF01008DF038 /* Make Frameworks Symbolic Link */ = {