Mac build and header search path sanity fix.

Reviewed by Sam Weinig and Tim Hatcher.

Move base setting for HEADER_SEARCH_PATHS into Base.xcconfig, and extend
it in JavaScriptCore.xcconfig.  This removes the need to override it on a
per-target basis inside the .xcodeproj file.

* Configurations/Base.xcconfig:
* Configurations/JavaScriptCore.xcconfig:
* JavaScriptCore.xcodeproj/project.pbxproj:

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

diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index 2857274b05236bbae6c1f16a56dbcbf29b972b18..7d6bdd9d38551af3b7e7d40948e00c591297cb9e 100644 (file)
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,3 +1,17 @@
+2007-11-15  Mark Rowe  <mrowe@apple.com>
+
+        Mac build and header search path sanity fix.
+
+        Reviewed by Sam Weinig and Tim Hatcher.
+
+        Move base setting for HEADER_SEARCH_PATHS into Base.xcconfig, and extend
+        it in JavaScriptCore.xcconfig.  This removes the need to override it on a
+        per-target basis inside the .xcodeproj file.
+
+        * Configurations/Base.xcconfig:
+        * Configurations/JavaScriptCore.xcconfig:
+        * JavaScriptCore.xcodeproj/project.pbxproj:
+
 2007-11-15  Mark Rowe  <mrowe@apple.com>
 
         Qt build fix.

diff --git a/JavaScriptCore/Configurations/Base.xcconfig b/JavaScriptCore/Configurations/Base.xcconfig
index af863b55211b8e018beb45aedbacf03a0a469326..0e53f10b57825f7b1c587706c57e90fc8299315d 100644 (file)
--- a/JavaScriptCore/Configurations/Base.xcconfig
+++ b/JavaScriptCore/Configurations/Base.xcconfig
@@ -30,6 +30,7 @@ WARNING_CFLAGS_ppc = $(WARNING_CFLAGS_BASE) -Wshorten-64-to-32;
 // FIXME: JavaScriptCore 64-bit builds should build with -Wshorten-64-to-32
 WARNING_CFLAGS_ppc64 = $(WARNING_CFLAGS_BASE);
 WARNING_CFLAGS_x86_64 = $(WARNING_CFLAGS_BASE);
+HEADER_SEARCH_PATHS = . icu $(HEADER_SEARCH_PATHS);
 
 
 // <rdar://problem/5488678>: Production builds on 10.4 PowerPC need to have debugging symbols disabled to prevent a huge STABS section being generated.

diff --git a/JavaScriptCore/Configurations/JavaScriptCore.xcconfig b/JavaScriptCore/Configurations/JavaScriptCore.xcconfig
index eed73cce5964701beb6c31680aded52b0a17b7be..23278637af787ad69de4f8052096996058dae90a 100644 (file)
--- a/JavaScriptCore/Configurations/JavaScriptCore.xcconfig
+++ b/JavaScriptCore/Configurations/JavaScriptCore.xcconfig
@@ -9,7 +9,7 @@ FEATURE_DEFINES = ENABLE_DATABASE ENABLE_ICONDATABASE ENABLE_SVG ENABLE_SVG_EXPE
 OTHER_LDFLAGS = -lobjc -sub_library libobjc -Wl,-Y,3;
 GCC_PREFIX_HEADER = JavaScriptCorePrefix.h;
 GCC_PREPROCESSOR_DEFINITIONS = $(DEBUG_DEFINES) $(GCC_PREPROCESSOR_DEFINITIONS);
-HEADER_SEARCH_PATHS = . icu "${BUILT_PRODUCTS_DIR}/DerivedSources/JavaScriptCore" $(HEADER_SEARCH_PATHS);
+HEADER_SEARCH_PATHS = "${BUILT_PRODUCTS_DIR}/DerivedSources/JavaScriptCore" $(HEADER_SEARCH_PATHS);
 INFOPLIST_FILE = Info.plist;
 INSTALL_PATH = $(SYSTEM_LIBRARY_DIR)/Frameworks;
 PRODUCT_NAME = JavaScriptCore;

diff --git a/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj b/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj
index 67b340a99d21afc4d3c5a0b3c8bfebe2bcd4a55f..99a0e2f68b7f75b742b801ea1e664ca9f8706b85 100644 (file)
--- a/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj
+++ b/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj
@@ -1626,7 +1626,6 @@
                1412113A0A48798400480255 /* Debug */ = {
                        isa = XCBuildConfiguration;
                        buildSettings = {
-                               HEADER_SEARCH_PATHS = .;
                                PRODUCT_NAME = minidom;
                        };
                        name = Debug;
@@ -1634,7 +1633,6 @@
                1412113B0A48798400480255 /* Release */ = {
                        isa = XCBuildConfiguration;
                        buildSettings = {
-                               HEADER_SEARCH_PATHS = .;
                                PRODUCT_NAME = minidom;
                        };
                        name = Release;
@@ -1642,7 +1640,6 @@
                1412113C0A48798400480255 /* Production */ = {
                        isa = XCBuildConfiguration;
                        buildSettings = {
-                               HEADER_SEARCH_PATHS = .;
                                PRODUCT_NAME = minidom;
                        };
                        name = Production;
@@ -1703,7 +1700,6 @@
                149C276808902AFE008A9EFC /* Debug */ = {
                        isa = XCBuildConfiguration;
                        buildSettings = {
-                               HEADER_SEARCH_PATHS = .;
                                PRODUCT_NAME = testkjs;
                        };
                        name = Debug;
@@ -1711,7 +1707,6 @@
                149C276908902AFE008A9EFC /* Release */ = {
                        isa = XCBuildConfiguration;
                        buildSettings = {
-                               HEADER_SEARCH_PATHS = .;
                                PRODUCT_NAME = testkjs;
                        };
                        name = Release;
@@ -1719,7 +1714,6 @@
                149C276B08902AFE008A9EFC /* Production */ = {
                        isa = XCBuildConfiguration;
                        buildSettings = {
-                               HEADER_SEARCH_PATHS = .;
                                PRODUCT_NAME = testkjs;
                        };
                        name = Production;
@@ -1750,10 +1744,6 @@
                        baseConfigurationReference = 1C9051440BA9E8A70081E9D0 /* DebugRelease.xcconfig */;
                        buildSettings = {
                                GCC_OPTIMIZATION_LEVEL = 0;
-                               HEADER_SEARCH_PATHS = (
-                                       icu,
-                                       .,
-                               );
                                STRIP_INSTALLED_PRODUCT = NO;
                        };
                        name = Debug;
@@ -1762,10 +1752,6 @@
                        isa = XCBuildConfiguration;
                        baseConfigurationReference = 1C9051440BA9E8A70081E9D0 /* DebugRelease.xcconfig */;
                        buildSettings = {
-                               HEADER_SEARCH_PATHS = (
-                                       icu,
-                                       .,
-                               );
                                STRIP_INSTALLED_PRODUCT = NO;
                        };
                        name = Release;
@@ -1774,17 +1760,12 @@
                        isa = XCBuildConfiguration;
                        baseConfigurationReference = 1C9051450BA9E8A70081E9D0 /* Base.xcconfig */;
                        buildSettings = {
-                               HEADER_SEARCH_PATHS = (
-                                       icu,
-                                       .,
-                               );
                        };
                        name = Production;
                };
                14BD59D70A3E8FC900BAF59C /* Debug */ = {
                        isa = XCBuildConfiguration;
                        buildSettings = {
-                               HEADER_SEARCH_PATHS = .;
                                PRODUCT_NAME = testapi;
                        };
                        name = Debug;
@@ -1792,7 +1773,6 @@
                14BD59D80A3E8FC900BAF59C /* Release */ = {
                        isa = XCBuildConfiguration;
                        buildSettings = {
-                               HEADER_SEARCH_PATHS = .;
                                PRODUCT_NAME = testapi;
                        };
                        name = Release;
@@ -1800,7 +1780,6 @@
                14BD59D90A3E8FC900BAF59C /* Production */ = {
                        isa = XCBuildConfiguration;
                        buildSettings = {
-                               HEADER_SEARCH_PATHS = .;
                                PRODUCT_NAME = testapi;
                        };
                        name = Production;