Reviewed/landed by Adam.

        Bug 13198: Move build settings from project file to xcconfig file for apollo
        port JSCore
        http://bugs.webkit.org/show_bug.cgi?id=13198

        - Moving build settings from xcode project file to xcconfig files.

        * JavaScriptCore.apolloproj/mac/JavaScriptCore/JavaScriptCore.Debug.xcconfig:
        * JavaScriptCore.apolloproj/mac/JavaScriptCore/JavaScriptCore.Release.xcconfig:
        * JavaScriptCore.apolloproj/mac/JavaScriptCore/JavaScriptCore.xcconfig:
        * JavaScriptCore.apolloproj/mac/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj:

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

diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index e6cf6d6229786ab4bca9dc87ed2708849b997b25..3b04e582de523fb5369b37d8b616b8db3a4f3619 100644 (file)
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,3 +1,18 @@
+2007-03-26  Christopher Brichford  <chrisb@adobe.com>
+
+        Reviewed/landed by Adam.
+
+        Bug 13198: Move build settings from project file to xcconfig file for apollo
+        port JSCore
+        http://bugs.webkit.org/show_bug.cgi?id=13198
+
+        - Moving build settings from xcode project file to xcconfig files.
+
+        * JavaScriptCore.apolloproj/mac/JavaScriptCore/JavaScriptCore.Debug.xcconfig:
+        * JavaScriptCore.apolloproj/mac/JavaScriptCore/JavaScriptCore.Release.xcconfig:
+        * JavaScriptCore.apolloproj/mac/JavaScriptCore/JavaScriptCore.xcconfig:
+        * JavaScriptCore.apolloproj/mac/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj:
+
 2007-03-26  Brady Eidson  <beidson@apple.com>
 
         Rubberstamped by Anders and Maciej aand Geoff (oh my!)

diff --git a/JavaScriptCore/JavaScriptCore.apolloproj/mac/JavaScriptCore/JavaScriptCore.Debug.xcconfig b/JavaScriptCore/JavaScriptCore.apolloproj/mac/JavaScriptCore/JavaScriptCore.Debug.xcconfig
index a243269d2c8182f22fe211356c4f05ac8d1fcf39..237b98f1afef7a5e7c9c634094b3be535488a6f0 100644 (file)
--- a/JavaScriptCore/JavaScriptCore.apolloproj/mac/JavaScriptCore/JavaScriptCore.Debug.xcconfig
+++ b/JavaScriptCore/JavaScriptCore.apolloproj/mac/JavaScriptCore/JavaScriptCore.Debug.xcconfig
@@ -1 +1,2 @@
 #include "JavaScriptCore.xcconfig"
+GCC_OPTIMIZATION_LEVEL = 0

diff --git a/JavaScriptCore/JavaScriptCore.apolloproj/mac/JavaScriptCore/JavaScriptCore.Release.xcconfig b/JavaScriptCore/JavaScriptCore.apolloproj/mac/JavaScriptCore/JavaScriptCore.Release.xcconfig
index fc182d7c6babdade11a3b72ab0d0ef9335c9f738..ce94453ff8e975830bc2263803c05676bdd577a5 100644 (file)
--- a/JavaScriptCore/JavaScriptCore.apolloproj/mac/JavaScriptCore/JavaScriptCore.Release.xcconfig
+++ b/JavaScriptCore/JavaScriptCore.apolloproj/mac/JavaScriptCore/JavaScriptCore.Release.xcconfig
@@ -1,2 +1,3 @@
 #include "JavaScriptCore.xcconfig"
 ARCHS = i386 ppc;
+GCC_OPTIMIZATION_LEVEL = s

diff --git a/JavaScriptCore/JavaScriptCore.apolloproj/mac/JavaScriptCore/JavaScriptCore.xcconfig b/JavaScriptCore/JavaScriptCore.apolloproj/mac/JavaScriptCore/JavaScriptCore.xcconfig
index 52b81ce792acd8e850023c66e3654aedb3474250..3c5337f243fd251e617490c00c9a177d78d6336f 100644 (file)
--- a/JavaScriptCore/JavaScriptCore.apolloproj/mac/JavaScriptCore/JavaScriptCore.xcconfig
+++ b/JavaScriptCore/JavaScriptCore.apolloproj/mac/JavaScriptCore/JavaScriptCore.xcconfig
@@ -3,6 +3,7 @@ VALID_ARCHS = i386 ppc;
 OBJROOT=${WEBKIT_BUILD_DIR}/${CONFIGURATION}-int;
 SYMROOT=${WEBKIT_BUILD_DIR}/${CONFIGURATION}-int;
 SHARED_PRECOMPS_DIR=${WEBKIT_BUILD_DIR}/${CONFIGURATION}-int/PrecompiledHeaders
+SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk
 
 GCC_PREFIX_HEADER = ../../../JavaScriptCorePrefix.h;
 GCC_PREPROCESSOR_DEFINITIONS = $(DEBUG_DEFINES) $(GCC_PREPROCESSOR_DEFINITIONS);
@@ -10,3 +11,10 @@ HEADER_SEARCH_PATHS = "${JAVASCRIPTCORE_SRC_ROOT}/." "${JAVASCRIPTCORE_SRC_ROOT}
 CONFIGURATION_BUILD_DIR = $(BUILD_DIR);
 CONFIGURATION_TEMP_DIR = $(PROJECT_TEMP_DIR);
 GCC_PFE_FILE_C_DIALECTS = c c++ objective-c++;
+PRODUCT_NAME = JavaScriptCore
+INSTALL_PATH = /usr/local/lib
+GCC_GENERATE_DEBUGGING_SYMBOLS = YES
+GCC_MODEL_TUNING = G5
+COPY_PHASE_STRIP = NO
+GCC_WARN_ABOUT_RETURN_TYPE = YES
+GCC_WARN_UNUSED_VARIABLE = YES

diff --git a/JavaScriptCore/JavaScriptCore.apolloproj/mac/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj b/JavaScriptCore/JavaScriptCore.apolloproj/mac/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj
index 03ffc16509b12920afdd55e39675ae9e20b05685..492a7bc289a5ccaa74fc47415c8a5d52e1a01ea7 100644 (file)
--- a/JavaScriptCore/JavaScriptCore.apolloproj/mac/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj
+++ b/JavaScriptCore/JavaScriptCore.apolloproj/mac/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj
@@ -801,14 +801,6 @@
                        isa = XCBuildConfiguration;
                        baseConfigurationReference = 8160D7510BB3270400D65181 /* JavaScriptCore.Debug.xcconfig */;
                        buildSettings = {
-                               COPY_PHASE_STRIP = NO;
-                               GCC_DYNAMIC_NO_PIC = NO;
-                               GCC_ENABLE_FIX_AND_CONTINUE = YES;
-                               GCC_MODEL_TUNING = G5;
-                               GCC_OPTIMIZATION_LEVEL = 0;
-                               INSTALL_PATH = /usr/local/lib;
-                               PRODUCT_NAME = JavaScriptCore;
-                               ZERO_LINK = YES;
                        };
                        name = Debug;
                };
@@ -816,14 +808,6 @@
                        isa = XCBuildConfiguration;
                        baseConfigurationReference = 8160D7540BB3273D00D65181 /* JavaScriptCore.Release.xcconfig */;
                        buildSettings = {
-                               ARCHS = (
-                                       ppc,
-                                       i386,
-                               );
-                               GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
-                               GCC_MODEL_TUNING = G5;
-                               INSTALL_PATH = /usr/local/lib;
-                               PRODUCT_NAME = JavaScriptCore;
                        };
                        name = Release;
                };
@@ -831,11 +815,7 @@
                        isa = XCBuildConfiguration;
                        baseConfigurationReference = 8160D74E0BB3262800D65181 /* JavaScriptCore.xcconfig */;
                        buildSettings = {
-                               GCC_WARN_ABOUT_RETURN_TYPE = YES;
-                               GCC_WARN_UNUSED_VARIABLE = YES;
                                JAVASCRIPTCORE_SRC_ROOT = "${PROJECT_DIR}/../../..";
-                               PREBINDING = NO;
-                               SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
                                WEBKIT_BUILD_DIR = "${JAVASCRIPTCORE_SRC_ROOT}/../WebKitBuild";
                        };
                        name = Debug;
@@ -844,11 +824,7 @@
                        isa = XCBuildConfiguration;
                        baseConfigurationReference = 8160D74E0BB3262800D65181 /* JavaScriptCore.xcconfig */;
                        buildSettings = {
-                               GCC_WARN_ABOUT_RETURN_TYPE = YES;
-                               GCC_WARN_UNUSED_VARIABLE = YES;
                                JAVASCRIPTCORE_SRC_ROOT = "${PROJECT_DIR}/../../..";
-                               PREBINDING = NO;
-                               SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
                                WEBKIT_BUILD_DIR = "${JAVASCRIPTCORE_SRC_ROOT}/../WebKitBuild";
                        };
                        name = Release;
@@ -880,15 +856,7 @@
                        baseConfigurationReference = 8160D7510BB3270400D65181 /* JavaScriptCore.Debug.xcconfig */;
                        buildSettings = {
                                CONFIGURATION_BUILD_DIR = "$(CONFIGURATION_TEMP_DIR)";
-                               COPY_PHASE_STRIP = NO;
-                               GCC_DYNAMIC_NO_PIC = NO;
-                               GCC_ENABLE_FIX_AND_CONTINUE = NO;
-                               GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
-                               GCC_MODEL_TUNING = G5;
-                               GCC_OPTIMIZATION_LEVEL = 0;
-                               PREBINDING = NO;
                                PRODUCT_NAME = dftables;
-                               ZERO_LINK = NO;
                        };
                        name = Debug;
                };
@@ -896,16 +864,8 @@
                        isa = XCBuildConfiguration;
                        baseConfigurationReference = 8160D7540BB3273D00D65181 /* JavaScriptCore.Release.xcconfig */;
                        buildSettings = {
-                               CONFIGURATION_BUILD_DIR = "$(BUILD_DIR)/JavaScriptCore.build";
-                               COPY_PHASE_STRIP = YES;
-                               GCC_DYNAMIC_NO_PIC = NO;
-                               GCC_ENABLE_FIX_AND_CONTINUE = NO;
-                               GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
-                               GCC_MODEL_TUNING = G5;
-                               GCC_OPTIMIZATION_LEVEL = s;
-                               PREBINDING = NO;
+                               CONFIGURATION_BUILD_DIR = "$(CONFIGURATION_TEMP_DIR)";
                                PRODUCT_NAME = dftables;
-                               ZERO_LINK = NO;
                        };
                        name = Release;
                };