git://git.webkit.org / WebKit-https.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 6f67978)
Reviewed by Darin.
authorap <ap@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sat, 24 Jun 2006 11:50:43 +0000 (11:50 +0000)
committerap <ap@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sat, 24 Jun 2006 11:50:43 +0000 (11:50 +0000)
        - http://bugzilla.opendarwin.org/show_bug.cgi?id=9418
        WebKit will not build when Space exists in path

        Enclose search paths in quotes; create symlinks to avoid passing paths with spaces to make.

        * JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj:
        * WebCore/WebCore.xcodeproj/project.pbxproj:
        * WebKit/WebKit.xcodeproj/project.pbxproj:

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

JavaScriptCore/ChangeLog patch | blob | history
JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj patch | blob | history
WebCore/ChangeLog 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 4a5625060f086453e73f886c4bf03c63b4a4e056..dfce9b611a15e60b38561a19f900d5b91f8435b6 100644 (file)
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,3 +1,13 @@
+2006-06-24  Alexey Proskuryakov  <ap@nypop.com>
+
+        Reviewed by Darin.
+
+        - http://bugzilla.opendarwin.org/show_bug.cgi?id=9418
+        WebKit will not build when Space exists in path
+
+        * JavaScriptCore.xcodeproj/project.pbxproj: Enclose search paths in quotes; create symlinks to 
+        avoid passing paths with spaces to make.
+
 2006-06-23  Timothy Hatcher  <timothy@apple.com>
 
         Reviewed by Darin.
diff --git a/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj b/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj
index f3b6ee606cf0fb303b67d34733141289cb7659e2..19c939ae477c292b9385de88210ef88e486c8d35 100644 (file)
--- a/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj
+++ b/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj
@@ -1194,7 +1194,7 @@
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                        shellPath = /bin/sh;
-                       shellScript = "cp ${SRCROOT}/API/testapi.js ${BUILT_PRODUCTS_DIR}";
+                       shellScript = "cp \"${SRCROOT}/API/testapi.js\" \"${BUILT_PRODUCTS_DIR}\"";
                };
                65FB3F6509D11E9100F49DEB /* Generate Derived Sources */ = {
                        isa = PBXShellScriptBuildPhase;
@@ -1208,7 +1208,7 @@
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                        shellPath = /bin/sh;
-                       shellScript = "mkdir -p \"${BUILT_PRODUCTS_DIR}/DerivedSources/JavaScriptCore\"\ncd \"${BUILT_PRODUCTS_DIR}/DerivedSources/JavaScriptCore\"\n\nexport JavaScriptCore=\"${SRCROOT}\"\n\nmake -f \"$JavaScriptCore/DerivedSources.make\"\n";
+                       shellScript = "mkdir -p \"${BUILT_PRODUCTS_DIR}/DerivedSources/JavaScriptCore\"\ncd \"${BUILT_PRODUCTS_DIR}/DerivedSources/JavaScriptCore\"\n\nln -sf \"${SRCROOT}\" JavaScriptCore\nexport JavaScriptCore=\"JavaScriptCore\"\nexport BUILT_PRODUCTS_DIR=\"../..\"\n\nmake -f \"JavaScriptCore/DerivedSources.make\"\n";
                };
                9319586B09D9F91A00A56FD4 /* Check For Global Initializers */ = {
                        isa = PBXShellScriptBuildPhase;
@@ -1411,8 +1411,9 @@
                                HEADER_SEARCH_PATHS = (
                                        .,
                                        icu,
-                                       "$(BUILT_PRODUCTS_DIR)/DerivedSources/JavaScriptCore",
+                                       "$(HEADER_SEARCH_PATHS_QUOTED_1)",
                                );
+                               HEADER_SEARCH_PATHS_QUOTED_1 = "\"$(BUILT_PRODUCTS_DIR)/DerivedSources/JavaScriptCore\"";
                                INSTALL_PATH = "$(HOME)/bin";
                                PREBINDING = NO;
                                PRODUCT_NAME = minidom;
@@ -1430,8 +1431,9 @@
                                HEADER_SEARCH_PATHS = (
                                        .,
                                        icu,
-                                       "$(BUILT_PRODUCTS_DIR)/DerivedSources/JavaScriptCore",
+                                       "$(HEADER_SEARCH_PATHS_QUOTED_1)",
                                );
+                               HEADER_SEARCH_PATHS_QUOTED_1 = "\"$(BUILT_PRODUCTS_DIR)/DerivedSources/JavaScriptCore\"";
                                INSTALL_PATH = "$(HOME)/bin";
                                PREBINDING = NO;
                                PRODUCT_NAME = minidom;
@@ -1447,8 +1449,9 @@
                                HEADER_SEARCH_PATHS = (
                                        .,
                                        icu,
-                                       "$(BUILT_PRODUCTS_DIR)/DerivedSources/JavaScriptCore",
+                                       "$(HEADER_SEARCH_PATHS_QUOTED_1)",
                                );
+                               HEADER_SEARCH_PATHS_QUOTED_1 = "\"$(BUILT_PRODUCTS_DIR)/DerivedSources/JavaScriptCore\"";
                                INSTALL_PATH = "$(HOME)/bin";
                                PREBINDING = NO;
                                PRODUCT_NAME = minidom;
@@ -1489,8 +1492,9 @@
                                HEADER_SEARCH_PATHS = (
                                        .,
                                        icu,
-                                       "$(BUILT_PRODUCTS_DIR)/DerivedSources/JavaScriptCore",
+                                       "$(HEADER_SEARCH_PATHS_QUOTED_1)",
                                );
+                               HEADER_SEARCH_PATHS_QUOTED_1 = "\"$(BUILT_PRODUCTS_DIR)/DerivedSources/JavaScriptCore\"";
                                INFOPLIST_FILE = Info.plist;
                                INSTALL_PATH = "$(BUILT_PRODUCTS_DIR)";
                                OTHER_LDFLAGS = (
@@ -1528,8 +1532,9 @@
                                HEADER_SEARCH_PATHS = (
                                        .,
                                        icu,
-                                       "$(BUILT_PRODUCTS_DIR)/DerivedSources/JavaScriptCore",
+                                       "$(HEADER_SEARCH_PATHS_QUOTED_1)",
                                );
+                               HEADER_SEARCH_PATHS_QUOTED_1 = "\"$(BUILT_PRODUCTS_DIR)/DerivedSources/JavaScriptCore\"";
                                INFOPLIST_FILE = Info.plist;
                                INSTALL_PATH = "$(BUILT_PRODUCTS_DIR)";
                                OTHER_LDFLAGS = (
@@ -1567,8 +1572,9 @@
                                HEADER_SEARCH_PATHS = (
                                        .,
                                        icu,
-                                       "$(BUILT_PRODUCTS_DIR)/DerivedSources/JavaScriptCore",
+                                       "$(HEADER_SEARCH_PATHS_QUOTED_1)",
                                );
+                               HEADER_SEARCH_PATHS_QUOTED_1 = "\"$(BUILT_PRODUCTS_DIR)/DerivedSources/JavaScriptCore\"";
                                INFOPLIST_FILE = Info.plist;
                                INSTALL_PATH = "$(SYSTEM_LIBRARY_DIR)/Frameworks/WebKit.framework/Versions/A/Frameworks";
                                OTHER_LDFLAGS = (
@@ -1780,8 +1786,9 @@
                                HEADER_SEARCH_PATHS = (
                                        .,
                                        icu,
-                                       "$(BUILT_PRODUCTS_DIR)/DerivedSources/JavaScriptCore",
+                                       "$(HEADER_SEARCH_PATHS_QUOTED_1)",
                                );
+                               HEADER_SEARCH_PATHS_QUOTED_1 = "\"$(BUILT_PRODUCTS_DIR)/DerivedSources/JavaScriptCore\"";
                                INSTALL_PATH = "$(HOME)/bin";
                                PREBINDING = NO;
                                PRODUCT_NAME = testapi;
@@ -1800,8 +1807,9 @@
                                HEADER_SEARCH_PATHS = (
                                        .,
                                        icu,
-                                       "$(BUILT_PRODUCTS_DIR)/DerivedSources/JavaScriptCore",
+                                       "$(HEADER_SEARCH_PATHS_QUOTED_1)",
                                );
+                               HEADER_SEARCH_PATHS_QUOTED_1 = "\"$(BUILT_PRODUCTS_DIR)/DerivedSources/JavaScriptCore\"";
                                INSTALL_PATH = "$(HOME)/bin";
                                PREBINDING = NO;
                                PRODUCT_NAME = testapi;
@@ -1818,8 +1826,9 @@
                                HEADER_SEARCH_PATHS = (
                                        .,
                                        icu,
-                                       "$(BUILT_PRODUCTS_DIR)/DerivedSources/JavaScriptCore",
+                                       "$(HEADER_SEARCH_PATHS_QUOTED_1)",
                                );
+                               HEADER_SEARCH_PATHS_QUOTED_1 = "\"$(BUILT_PRODUCTS_DIR)/DerivedSources/JavaScriptCore\"";
                                INSTALL_PATH = "$(HOME)/bin";
                                PREBINDING = NO;
                                PRODUCT_NAME = testapi;
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 2d65007466d2c71a43988a42f65f0a9e748b41ef..64d61d4ab9a89c75831807f81aedadc5782c8072 100644 (file)
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,13 @@
+2006-06-24  Alexey Proskuryakov  <ap@nypop.com>
+
+        Reviewed by Darin.
+
+        - http://bugzilla.opendarwin.org/show_bug.cgi?id=9418
+        WebKit will not build when Space exists in path
+
+        * WebCore.xcodeproj/project.pbxproj: Enclose search paths in quotes; create symlinks to 
+        avoid passing paths with spaces to make.
+
 2006-06-23  Tim Omernick  <timo@apple.com>
 
         Reviewed by Tim Hatcher.
diff --git a/WebCore/WebCore.xcodeproj/project.pbxproj b/WebCore/WebCore.xcodeproj/project.pbxproj
index 464f829d0968d0007d1cbeb9063de26cc7a83c75..acd42e5290ac71bcee829d49e130fa51c31fdc28 100644 (file)
--- a/WebCore/WebCore.xcodeproj/project.pbxproj
+++ b/WebCore/WebCore.xcodeproj/project.pbxproj
@@ -6432,7 +6432,7 @@
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                        shellPath = /bin/sh;
-                       shellScript = "if [ \"${BUILD_STYLE}\" = \"Release\" -o \"${BUILD_STYLE}\" = \"Debug\" ] ; then\n    export CREATE_HASH_TABLE=\"${BUILT_PRODUCTS_DIR}/JavaScriptCore.framework/PrivateHeaders/create_hash_table\"\nelse\n    export CREATE_HASH_TABLE=\"${NEXT_ROOT}${SYSTEM_LIBRARY_DIR}/Frameworks/WebKit.framework/Versions/A/Frameworks/JavaScriptCore.framework/PrivateHeaders/create_hash_table\"\nfi\n\nmkdir -p \"${BUILT_PRODUCTS_DIR}/DerivedSources/WebCore\"\ncd \"${BUILT_PRODUCTS_DIR}/DerivedSources/WebCore\"\n\nexport WebCore=\"${SRCROOT}\"\n\nexport ENCODINGS_FILE=\"${WebCore}/platform/mac/mac-encodings.txt\"\nexport ENCODINGS_PREFIX=\"kCFStringEncoding\"\n\nif [ \"${ACTION}\" = \"build\" -o \"${ACTION}\" = \"install\" ]; then\n\tmake -f \"${WebCore}/DerivedSources.make\"\nfi\n";
+                       shellScript = "mkdir -p \"${BUILT_PRODUCTS_DIR}/DerivedSources/WebCore\"\ncd \"${BUILT_PRODUCTS_DIR}/DerivedSources/WebCore\"\n\nif [ \"${BUILD_STYLE}\" = \"Release\" -o \"${BUILD_STYLE}\" = \"Debug\" ] ; then\n    export CREATE_HASH_TABLE=\"../../JavaScriptCore.framework/PrivateHeaders/create_hash_table\"\nelse\n    export CREATE_HASH_TABLE=\"${NEXT_ROOT}${SYSTEM_LIBRARY_DIR}/Frameworks/WebKit.framework/Versions/A/Frameworks/JavaScriptCore.framework/PrivateHeaders/create_hash_table\"\nfi\n\nln -sf \"${SRCROOT}\" WebCore\nexport WebCore=\"WebCore\"\n\nexport ENCODINGS_FILE=\"WebCore/platform/mac/mac-encodings.txt\"\nexport ENCODINGS_PREFIX=\"kCFStringEncoding\"\n\nif [ \"${ACTION}\" = \"build\" -o \"${ACTION}\" = \"install\" ]; then\n    make -f \"WebCore/DerivedSources.make\"\nfi\n";
                };
 /* End PBXShellScriptBuildPhase section */
 
@@ -7193,8 +7193,9 @@
                                        icu,
                                        /usr/include/libxslt,
                                        /usr/include/libxml2,
-                                       "${BUILT_PRODUCTS_DIR}/DerivedSources/WebCore",
+                                       "$(HEADER_SEARCH_PATHS_QUOTED_1)",
                                );
+                               HEADER_SEARCH_PATHS_QUOTED_1 = "\"${BUILT_PRODUCTS_DIR}/DerivedSources/WebCore\"";
                                INFOPLIST_FILE = Info.plist;
                                INSTALL_PATH = "$(BUILT_PRODUCTS_DIR)";
                                OTHER_LDFLAGS = (
@@ -7226,8 +7227,9 @@
                                        icu,
                                        /usr/include/libxslt,
                                        /usr/include/libxml2,
-                                       "${BUILT_PRODUCTS_DIR}/DerivedSources/WebCore",
+                                       "$(HEADER_SEARCH_PATHS_QUOTED_1)",
                                );
+                               HEADER_SEARCH_PATHS_QUOTED_1 = "\"${BUILT_PRODUCTS_DIR}/DerivedSources/WebCore\"";
                                INFOPLIST_FILE = Info.plist;
                                INSTALL_PATH = "$(BUILT_PRODUCTS_DIR)";
                                OTHER_LDFLAGS = (
@@ -7260,8 +7262,9 @@
                                        icu,
                                        /usr/include/libxslt,
                                        /usr/include/libxml2,
-                                       "${BUILT_PRODUCTS_DIR}/DerivedSources/WebCore",
+                                       "$(HEADER_SEARCH_PATHS_QUOTED_1)",
                                );
+                               HEADER_SEARCH_PATHS_QUOTED_1 = "\"${BUILT_PRODUCTS_DIR}/DerivedSources/WebCore\"";
                                INFOPLIST_FILE = Info.plist;
                                INSTALL_PATH = "$(SYSTEM_LIBRARY_DIR)/Frameworks/WebKit.framework/Versions/A/Frameworks";
                                OTHER_LDFLAGS = (
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 4cabcc8e7f6e5c43d65038a936ca81e47a5a1c16..7bc9965cc379b39f127e96c1685372f25722722c 100644 (file)
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,12 @@
+2006-06-24  Alexey Proskuryakov  <ap@nypop.com>
+
+        Reviewed by Darin.
+
+        - http://bugzilla.opendarwin.org/show_bug.cgi?id=9418
+        WebKit will not build when Space exists in path
+
+        * WebKit.xcodeproj/project.pbxproj: Enclose search paths in quotes.
+
 2006-06-23  Tim Omernick  <timo@apple.com>
 
         Reviewed by John Sullivan.
diff --git a/WebKit/WebKit.xcodeproj/project.pbxproj b/WebKit/WebKit.xcodeproj/project.pbxproj
index eccf3ad0f9564da3095f6b5f031bc0017f409418..0a3115e21d0f52a41f5712f9df5a370eb2eb79a0 100644 (file)
--- a/WebKit/WebKit.xcodeproj/project.pbxproj
+++ b/WebKit/WebKit.xcodeproj/project.pbxproj
@@ -1716,9 +1716,10 @@
                                        "$(PER_CONFIGURATION_PREPROCESSOR_DEFINES)",
                                );
                                HEADER_SEARCH_PATHS = (
-                                       "$(BUILT_PRODUCTS_DIR)/usr/local/include",
+                                       "$(HEADER_SEARCH_PATHS_QUOTED_1)",
                                        icu,
                                );
+                               HEADER_SEARCH_PATHS_QUOTED_1 = "\"$(BUILT_PRODUCTS_DIR)/usr/local/include\"";
                                INFOPLIST_FILE = Info.plist;
                                INSTALL_PATH = "$(BUILT_PRODUCTS_DIR)";
                                JAVASCRIPTCORE_PRIVATE_HEADERS_DIR = "$(UMBRELLA_FRAMEWORKS_DIR)/JavaScriptCore.framework/PrivateHeaders";
@@ -1751,9 +1752,10 @@
                                        "$(PER_CONFIGURATION_PREPROCESSOR_DEFINES)",
                                );
                                HEADER_SEARCH_PATHS = (
-                                       "$(BUILT_PRODUCTS_DIR)/usr/local/include",
+                                       "$(HEADER_SEARCH_PATHS_QUOTED_1)",
                                        icu,
                                );
+                               HEADER_SEARCH_PATHS_QUOTED_1 = "\"$(BUILT_PRODUCTS_DIR)/usr/local/include\"";
                                INFOPLIST_FILE = Info.plist;
                                INSTALL_PATH = "$(BUILT_PRODUCTS_DIR)";
                                JAVASCRIPTCORE_PRIVATE_HEADERS_DIR = "$(UMBRELLA_FRAMEWORKS_DIR)/JavaScriptCore.framework/PrivateHeaders";
@@ -1788,9 +1790,10 @@
                                        "$(PER_CONFIGURATION_PREPROCESSOR_DEFINES)",
                                );
                                HEADER_SEARCH_PATHS = (
-                                       "$(BUILT_PRODUCTS_DIR)/usr/local/include",
+                                       "$(HEADER_SEARCH_PATHS_QUOTED_1)",
                                        icu,
                                );
+                               HEADER_SEARCH_PATHS_QUOTED_1 = "\"$(BUILT_PRODUCTS_DIR)/usr/local/include\"";
                                INFOPLIST_FILE = Info.plist;
                                INSTALL_PATH = "$(SYSTEM_LIBRARY_DIR)/Frameworks";
                                JAVASCRIPTCORE_PRIVATE_HEADERS_DIR = "$(UMBRELLA_FRAMEWORKS_DIR)/JavaScriptCore.framework/PrivateHeaders";
Mirror of the WebKit open source project from svn.webkit.org.