JavaScriptCore:
authorthatcher <thatcher@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 15 Mar 2007 23:50:15 +0000 (23:50 +0000)
committerthatcher <thatcher@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 15 Mar 2007 23:50:15 +0000 (23:50 +0000)
        Reviewed by John.

        * Factored out most of our common build settings into .xcconfig files. Anything that was common in
          each build configuration was factored out into the shared .xcconfig file.
        * Adds a Version.xcconfig file to define the current framework version, to be used in other places.
        * Use the new $(BUNDLE_VERSION) (defined in Version.xcconfig) in the preprocessed Info.plist.
        * Use the versions defined in Version.xcconfig to set $(DYLIB_CURRENT_VERSION).

        * Configurations/Base.xcconfig: Added.
        * Configurations/DebugRelease.xcconfig: Added.
        * Configurations/JavaScriptCore.xcconfig: Added.
        * Configurations/Version.xcconfig: Added.
        * Info.plist:
        * JavaScriptCore.xcodeproj/project.pbxproj:

JavaScriptGlue:

        Reviewed by John.

        * Factored out most of our common build settings into .xcconfig files. Anything that was common in
          each build configuration was factored out into the shared .xcconfig file.
        * Adds a Version.xcconfig file to define the current framework version, to be used in other places.
        * Use the new $(BUNDLE_VERSION) (defined in Version.xcconfig) in the preprocessed Info.plist.
        * Use the versions defined in Version.xcconfig to set $(DYLIB_CURRENT_VERSION).

        * Configurations/Base.xcconfig: Added.
        * Configurations/DebugRelease.xcconfig: Added.
        * Configurations/JavaScriptGlue.xcconfig: Added.
        * Configurations/Version.xcconfig: Added.
        * Info.plist:
        * JavaScriptGlue.xcodeproj/project.pbxproj:

WebCore:

        Reviewed by John.

        * Factored out most of our common build settings into .xcconfig files. Anything that was common in
          each build configuration was factored out into the shared .xcconfig file.
        * Adds a Version.xcconfig file to define the current framework version, to be used in other places.
        * Use the new $(BUNDLE_VERSION) (defined in Version.xcconfig) in the preprocessed Info.plist.
        * Use the versions defined in Version.xcconfig to set $(DYLIB_CURRENT_VERSION).

        * Configurations/Base.xcconfig: Added.
        * Configurations/DebugRelease.xcconfig: Added.
        * Configurations/Version.xcconfig: Added.
        * Configurations/WebCore.xcconfig: Added.
        * Info.plist:
        * WebCore.xcodeproj/project.pbxproj:

WebKit:

        Reviewed by John.

        * Fixes: <rdar://problem/4927747> WebKit's Current Library Version number should match the Info.plist Version
        * Factored out most of our common build settings into .xcconfig files. Anything that was common in
          each build configuration was factored out into the shared .xcconfig file.
        * Adds a Version.xcconfig file to define the current framework version, to be used in other places.
        * Use the new $(BUNDLE_VERSION) (defined in Version.xcconfig) in the preprocessed Info.plist.
        * Use the versions defined in Version.xcconfig to set $(DYLIB_CURRENT_VERSION).
        * Make WebKit use the same warning flags as the other projects. This required two casts to be added to fix new warnings.

        * Configurations/Base.xcconfig: Added.
        * Configurations/DebugRelease.xcconfig: Added.
        * Configurations/Version.xcconfig: Added.
        * Configurations/WebKit.xcconfig: Added.
        * Info.plist:
        * Misc/WebKitVersionChecks.h:
        * Plugins/WebBaseNetscapePluginStream.m:
        (-[WebBaseNetscapePluginStream startStreamResponseURL:expectedContentLength:lastModifiedDate:MIMEType:]):
        * WebKit.xcodeproj/project.pbxproj:

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

30 files changed:
JavaScriptCore/ChangeLog
JavaScriptCore/Configurations/Base.xcconfig [new file with mode: 0644]
JavaScriptCore/Configurations/DebugRelease.xcconfig [new file with mode: 0644]
JavaScriptCore/Configurations/JavaScriptCore.xcconfig [new file with mode: 0644]
JavaScriptCore/Configurations/Version.xcconfig [new file with mode: 0644]
JavaScriptCore/Info.plist
JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj
JavaScriptGlue/ChangeLog
JavaScriptGlue/Configurations/Base.xcconfig [new file with mode: 0644]
JavaScriptGlue/Configurations/DebugRelease.xcconfig [new file with mode: 0644]
JavaScriptGlue/Configurations/JavaScriptGlue.xcconfig [new file with mode: 0644]
JavaScriptGlue/Configurations/Version.xcconfig [new file with mode: 0644]
JavaScriptGlue/Info.plist
JavaScriptGlue/JavaScriptGlue.xcodeproj/project.pbxproj
WebCore/ChangeLog
WebCore/Configurations/Base.xcconfig [new file with mode: 0644]
WebCore/Configurations/DebugRelease.xcconfig [new file with mode: 0644]
WebCore/Configurations/Version.xcconfig [new file with mode: 0644]
WebCore/Configurations/WebCore.xcconfig [new file with mode: 0644]
WebCore/Info.plist
WebCore/WebCore.xcodeproj/project.pbxproj
WebKit/ChangeLog
WebKit/Configurations/Base.xcconfig [new file with mode: 0644]
WebKit/Configurations/DebugRelease.xcconfig [new file with mode: 0644]
WebKit/Configurations/Version.xcconfig [new file with mode: 0644]
WebKit/Configurations/WebKit.xcconfig [new file with mode: 0644]
WebKit/Info.plist
WebKit/Misc/WebKitVersionChecks.h
WebKit/Plugins/WebBaseNetscapePluginStream.m
WebKit/WebKit.xcodeproj/project.pbxproj

index 361a0c8..c5c8e53 100644 (file)
@@ -1,3 +1,20 @@
+2007-03-15  Timothy Hatcher  <timothy@apple.com>
+
+        Reviewed by John.
+
+        * Factored out most of our common build settings into .xcconfig files. Anything that was common in
+          each build configuration was factored out into the shared .xcconfig file.
+        * Adds a Version.xcconfig file to define the current framework version, to be used in other places.
+        * Use the new $(BUNDLE_VERSION) (defined in Version.xcconfig) in the preprocessed Info.plist.
+        * Use the versions defined in Version.xcconfig to set $(DYLIB_CURRENT_VERSION).
+
+        * Configurations/Base.xcconfig: Added.
+        * Configurations/DebugRelease.xcconfig: Added.
+        * Configurations/JavaScriptCore.xcconfig: Added.
+        * Configurations/Version.xcconfig: Added.
+        * Info.plist:
+        * JavaScriptCore.xcodeproj/project.pbxproj:
+
 2007-03-16  Shrikant Gangoda  <shrikant.gangoda@celunite.com>
 
         Gdk build fix.
diff --git a/JavaScriptCore/Configurations/Base.xcconfig b/JavaScriptCore/Configurations/Base.xcconfig
new file mode 100644 (file)
index 0000000..5772eee
--- /dev/null
@@ -0,0 +1,24 @@
+DEAD_CODE_STRIPPING = YES;
+DEBUG_INFORMATION_FORMAT = dwarf;
+GCC_C_LANGUAGE_STANDARD = gnu99;
+GCC_DEBUGGING_SYMBOLS = full;
+GCC_DYNAMIC_NO_PIC = NO;
+GCC_STRICT_ALIASING = YES;
+GCC_INLINES_ARE_PRIVATE_EXTERN = YES;
+GCC_ENABLE_CPP_EXCEPTIONS = NO;
+GCC_ENABLE_CPP_RTTI = NO;
+GCC_ENABLE_OBJC_EXCEPTIONS = YES;
+GCC_ENABLE_OBJC_GC = YES;
+GCC_FAST_OBJC_DISPATCH = YES;
+GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
+GCC_MODEL_TUNING = G5;
+GCC_OPTIMIZATION_LEVEL = 2;
+GCC_PRECOMPILE_PREFIX_HEADER = YES;
+GCC_THREADSAFE_STATICS = NO;
+GCC_TREAT_WARNINGS_AS_ERRORS = YES;
+GCC_WARN_ABOUT_MISSING_NEWLINE = YES;
+GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
+GCC_WARN_NON_VIRTUAL_DESTRUCTOR = YES;
+LINKER_DISPLAYS_MANGLED_NAMES = YES;
+VALID_ARCHS = i386 ppc x86_64 ppc64;
+WARNING_CFLAGS = -Wall -W -Wcast-align -Wchar-subscripts -Wformat-security -Wmissing-format-attribute -Wpointer-arith -Wwrite-strings -Wno-format-y2k -Wno-unused-parameter -Wno-long-double -Wundef -Wshorten-64-to-32;
diff --git a/JavaScriptCore/Configurations/DebugRelease.xcconfig b/JavaScriptCore/Configurations/DebugRelease.xcconfig
new file mode 100644 (file)
index 0000000..f93e177
--- /dev/null
@@ -0,0 +1,5 @@
+#include "Base.xcconfig"
+MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(MAC_OS_X_VERSION_MAJOR));
+MACOSX_DEPLOYMENT_TARGET_ = 10.4;
+MACOSX_DEPLOYMENT_TARGET_1040 = 10.4;
+MACOSX_DEPLOYMENT_TARGET_1050 = 10.5;
diff --git a/JavaScriptCore/Configurations/JavaScriptCore.xcconfig b/JavaScriptCore/Configurations/JavaScriptCore.xcconfig
new file mode 100644 (file)
index 0000000..c0adf76
--- /dev/null
@@ -0,0 +1,12 @@
+#include "Version.xcconfig"
+DYLIB_COMPATIBILITY_VERSION = 1;
+DYLIB_CURRENT_VERSION = $(MAJOR_BUNDLE_VERSION).$(MINOR_BUNDLE_VERSION).$(TINY_BUNDLE_VERSION);
+EXPORTED_SYMBOLS_FILE = JavaScriptCore.exp;
+OTHER_LDFLAGS = -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);
+INFOPLIST_FILE = Info.plist;
+INFOPLIST_PREPROCESS = YES;
+INSTALL_PATH = $(SYSTEM_LIBRARY_DIR)/Frameworks;
+PRODUCT_NAME = JavaScriptCore;
diff --git a/JavaScriptCore/Configurations/Version.xcconfig b/JavaScriptCore/Configurations/Version.xcconfig
new file mode 100644 (file)
index 0000000..8558156
--- /dev/null
@@ -0,0 +1,5 @@
+SYSTEM_BUNDLE_VERSION_PREFIX = ;
+MAJOR_BUNDLE_VERSION = 522;
+MINOR_BUNDLE_VERSION = 0;
+TINY_BUNDLE_VERSION = 0;
+BUNDLE_VERSION = $(MAJOR_BUNDLE_VERSION)+;
index 2007944..1bb58dc 100644 (file)
@@ -5,20 +5,20 @@
        <key>CFBundleDevelopmentRegion</key>
        <string>English</string>
        <key>CFBundleExecutable</key>
-       <string>JavaScriptCore</string>
+       <string>${PRODUCT_NAME}</string>
        <key>CFBundleGetInfoString</key>
-       <string>522+, Copyright 2003-2007 Apple Inc.; Copyright 1999-2001 Harri Porten &lt;porten@kde.org&gt;; Copyright 2001 Peter Kelly &lt;pmk@post.com&gt;; Copyright 1997-2005 University of Cambridge; Copyright 1991, 2000, 2001 by Lucent Technologies.</string>
+       <string>${BUNDLE_VERSION}, Copyright 2003-2007 Apple Inc.; Copyright 1999-2001 Harri Porten &lt;porten@kde.org&gt;; Copyright 2001 Peter Kelly &lt;pmk@post.com&gt;; Copyright 1997-2005 University of Cambridge; Copyright 1991, 2000, 2001 by Lucent Technologies.</string>
        <key>CFBundleIdentifier</key>
-       <string>com.apple.JavaScriptCore</string>
+       <string>com.apple.${PRODUCT_NAME}</string>
        <key>CFBundleInfoDictionaryVersion</key>
        <string>6.0</string>
        <key>CFBundleName</key>
-       <string>JavaScriptCore</string>
+       <string>${PRODUCT_NAME}</string>
        <key>CFBundlePackageType</key>
        <string>FMWK</string>
        <key>CFBundleShortVersionString</key>
-       <string>522+</string>
+       <string>${BUNDLE_VERSION}</string>
        <key>CFBundleVersion</key>
-       <string>522+</string>
+       <string>${BUNDLE_VERSION}</string>
 </dict>
 </plist>
index d9a6f67..266e861 100644 (file)
                14D857740A4696C80032146C /* testapi.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; path = testapi.js; sourceTree = "<group>"; };
                14F137580A3A727E00F26F90 /* Context.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = Context.cpp; sourceTree = "<group>"; };
                14F137820A3A765B00F26F90 /* context.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = context.h; sourceTree = "<group>"; };
+               1C9051420BA9E8A70081E9D0 /* Version.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = Version.xcconfig; sourceTree = "<group>"; };
+               1C9051430BA9E8A70081E9D0 /* JavaScriptCore.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = JavaScriptCore.xcconfig; sourceTree = "<group>"; };
+               1C9051440BA9E8A70081E9D0 /* DebugRelease.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = DebugRelease.xcconfig; sourceTree = "<group>"; };
+               1C9051450BA9E8A70081E9D0 /* Base.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = Base.xcconfig; sourceTree = "<group>"; };
                1CAF34880A6C421700ABE06E /* WebScriptObject.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = WebScriptObject.h; path = bindings/objc/WebScriptObject.h; sourceTree = "<group>"; };
                45E12D8806A49B0F00E9DF84 /* testkjs.cpp */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 2; lastKnownFileType = sourcecode.cpp.cpp; name = testkjs.cpp; path = ../kjs/testkjs.cpp; sourceTree = "<group>"; tabWidth = 8; };
                5114F47B05E4426200D1BBBD /* runtime_root.cpp */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.cpp; name = runtime_root.cpp; path = bindings/runtime_root.cpp; sourceTree = "<group>"; tabWidth = 8; };
                                0867D69AFE84028FC02AAC07 /* Frameworks */,
                                932FC3C10824BB61005B3C75 /* Intermediates */,
                                034768DFFF38A50411DB9C8B /* Products */,
+                               1C90513E0BA9E8830081E9D0 /* Configurations */,
                        );
                        name = JavaScriptCore;
                        sourceTree = "<group>";
                        name = minidom;
                        sourceTree = "<group>";
                };
+               1C90513E0BA9E8830081E9D0 /* Configurations */ = {
+                       isa = PBXGroup;
+                       children = (
+                               1C9051450BA9E8A70081E9D0 /* Base.xcconfig */,
+                               1C9051440BA9E8A70081E9D0 /* DebugRelease.xcconfig */,
+                               1C9051430BA9E8A70081E9D0 /* JavaScriptCore.xcconfig */,
+                               1C9051420BA9E8A70081E9D0 /* Version.xcconfig */,
+                       );
+                       path = Configurations;
+                       sourceTree = "<group>";
+               };
                51856D950562EE9C008B9D83 /* bindings */ = {
                        isa = PBXGroup;
                        children = (
                0867D690FE84028FC02AAC07 /* Project object */ = {
                        isa = PBXProject;
                        buildConfigurationList = 149C277108902AFE008A9EFC /* Build configuration list for PBXProject "JavaScriptCore" */;
+                       compatibilityVersion = "Xcode 2.4";
                        hasScannedForEncodings = 1;
                        mainGroup = 0867D691FE84028FC02AAC07 /* JavaScriptCore */;
                        productRefGroup = 034768DFFF38A50411DB9C8B /* Products */;
                        projectDirPath = "";
                        projectRoot = "";
+                       shouldCheckCompatibility = 1;
                        targets = (
+                               932F5BE30822A1C700736975 /* All */,
                                932F5B3E0822A1C700736975 /* JavaScriptCore */,
-                               935F69F508244FEA003D1A45 /* dftables */,
                                65FB3F6609D11E9100F49DEB /* Derived Sources */,
+                               935F69F508244FEA003D1A45 /* dftables */,
                                1412111F0A48793C00480255 /* minidom */,
                                14BD59BE0A3E8F9000BAF59C /* testapi */,
                                932F5BDA0822A1C700736975 /* testkjs */,
-                               932F5BE30822A1C700736975 /* All */,
                        );
                };
 /* End PBXProject section */
                1412113A0A48798400480255 /* Debug */ = {
                        isa = XCBuildConfiguration;
                        buildSettings = {
-                               COPY_PHASE_STRIP = NO;
-                               GCC_DYNAMIC_NO_PIC = NO;
-                               GCC_ENABLE_FIX_AND_CONTINUE = YES;
-                               GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
-                               GCC_MODEL_TUNING = G5;
-                               GCC_OPTIMIZATION_LEVEL = 0;
-                               HEADER_SEARCH_PATHS = (
-                                       .,
-                                       icu,
-                                       "$(HEADER_SEARCH_PATHS_QUOTED_1)",
-                               );
-                               HEADER_SEARCH_PATHS_QUOTED_1 = "\"$(BUILT_PRODUCTS_DIR)/DerivedSources/JavaScriptCore\"";
-                               INSTALL_PATH = "$(HOME)/bin";
-                               PREBINDING = NO;
+                               HEADER_SEARCH_PATHS = .;
                                PRODUCT_NAME = minidom;
-                               ZERO_LINK = YES;
                        };
                        name = Debug;
                };
                1412113B0A48798400480255 /* Release */ = {
                        isa = XCBuildConfiguration;
                        buildSettings = {
-                               COPY_PHASE_STRIP = YES;
-                               GCC_ENABLE_FIX_AND_CONTINUE = NO;
-                               GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
-                               GCC_MODEL_TUNING = G5;
-                               HEADER_SEARCH_PATHS = (
-                                       .,
-                                       icu,
-                                       "$(HEADER_SEARCH_PATHS_QUOTED_1)",
-                               );
-                               HEADER_SEARCH_PATHS_QUOTED_1 = "\"$(BUILT_PRODUCTS_DIR)/DerivedSources/JavaScriptCore\"";
-                               INSTALL_PATH = "$(HOME)/bin";
-                               PREBINDING = NO;
+                               HEADER_SEARCH_PATHS = .;
                                PRODUCT_NAME = minidom;
-                               ZERO_LINK = NO;
                        };
                        name = Release;
                };
                1412113C0A48798400480255 /* Production */ = {
                        isa = XCBuildConfiguration;
                        buildSettings = {
-                               GCC_ENABLE_FIX_AND_CONTINUE = YES;
-                               GCC_MODEL_TUNING = G5;
-                               HEADER_SEARCH_PATHS = (
-                                       .,
-                                       icu,
-                                       "$(HEADER_SEARCH_PATHS_QUOTED_1)",
-                               );
-                               HEADER_SEARCH_PATHS_QUOTED_1 = "\"$(BUILT_PRODUCTS_DIR)/DerivedSources/JavaScriptCore\"";
-                               INSTALL_PATH = "$(HOME)/bin";
-                               PREBINDING = NO;
+                               HEADER_SEARCH_PATHS = .;
                                PRODUCT_NAME = minidom;
-                               ZERO_LINK = YES;
                        };
                        name = Production;
                };
                };
                149C275E08902AFE008A9EFC /* Debug */ = {
                        isa = XCBuildConfiguration;
+                       baseConfigurationReference = 1C9051430BA9E8A70081E9D0 /* JavaScriptCore.xcconfig */;
                        buildSettings = {
                                DEBUG_DEFINES = "";
-                               DEBUG_INFORMATION_FORMAT = dwarf;
-                               DYLIB_COMPATIBILITY_VERSION = 1;
-                               DYLIB_CURRENT_VERSION = 1;
-                               EXPORTED_SYMBOLS_FILE = JavaScriptCore.exp;
-                               GCC_PREFIX_HEADER = JavaScriptCorePrefix.h;
-                               GCC_PREPROCESSOR_DEFINITIONS = "$(DEBUG_DEFINES)";
-                               HEADER_SEARCH_PATHS = (
-                                       .,
-                                       icu,
-                                       "$(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 = (
-                                       "-sub_library",
-                                       libobjc,
-                                       "-Wl,-Y,3",
-                               );
-                               PRODUCT_NAME = JavaScriptCore;
-                               VALID_ARCHS = "i386 ppc ppc7400 ppc970 ppc64 x86_64";
-                               WARNING_CFLAGS = (
-                                       "-Wall",
-                                       "-W",
-                                       "-Wcast-align",
-                                       "-Wchar-subscripts",
-                                       "-Wformat-security",
-                                       "-Wmissing-format-attribute",
-                                       "-Wpointer-arith",
-                                       "-Wwrite-strings",
-                                       "-Wno-format-y2k",
-                                       "-Wno-long-double",
-                                       "-Wundef",
-                                       "-Wshorten-64-to-32",
-                               );
                        };
                        name = Debug;
                };
                149C275F08902AFE008A9EFC /* Release */ = {
                        isa = XCBuildConfiguration;
+                       baseConfigurationReference = 1C9051430BA9E8A70081E9D0 /* JavaScriptCore.xcconfig */;
                        buildSettings = {
                                DEBUG_DEFINES = NDEBUG;
-                               DEBUG_INFORMATION_FORMAT = dwarf;
-                               DYLIB_COMPATIBILITY_VERSION = 1;
-                               DYLIB_CURRENT_VERSION = 1;
-                               EXPORTED_SYMBOLS_FILE = JavaScriptCore.exp;
-                               GCC_PREFIX_HEADER = JavaScriptCorePrefix.h;
-                               GCC_PREPROCESSOR_DEFINITIONS = "$(DEBUG_DEFINES)";
-                               HEADER_SEARCH_PATHS = (
-                                       .,
-                                       icu,
-                                       "$(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 = (
-                                       "-sub_library",
-                                       libobjc,
-                                       "-Wl,-Y,3",
-                               );
-                               PRODUCT_NAME = JavaScriptCore;
-                               VALID_ARCHS = "i386 ppc ppc7400 ppc970 ppc64 x86_64";
-                               WARNING_CFLAGS = (
-                                       "-Wall",
-                                       "-W",
-                                       "-Wcast-align",
-                                       "-Wchar-subscripts",
-                                       "-Wformat-security",
-                                       "-Wmissing-format-attribute",
-                                       "-Wpointer-arith",
-                                       "-Wwrite-strings",
-                                       "-Wno-format-y2k",
-                                       "-Wno-long-double",
-                                       "-Wundef",
-                                       "-Wshorten-64-to-32",
-                               );
                        };
                        name = Release;
                };
                149C276108902AFE008A9EFC /* Production */ = {
                        isa = XCBuildConfiguration;
+                       baseConfigurationReference = 1C9051430BA9E8A70081E9D0 /* JavaScriptCore.xcconfig */;
                        buildSettings = {
                                DEBUG_DEFINES = NDEBUG;
-                               DEBUG_INFORMATION_FORMAT = dwarf;
-                               DYLIB_COMPATIBILITY_VERSION = 1;
-                               DYLIB_CURRENT_VERSION = 1;
-                               EXPORTED_SYMBOLS_FILE = JavaScriptCore.exp;
-                               GCC_PREFIX_HEADER = JavaScriptCorePrefix.h;
-                               GCC_PREPROCESSOR_DEFINITIONS = "$(DEBUG_DEFINES)";
-                               HEADER_SEARCH_PATHS = (
-                                       .,
-                                       icu,
-                                       "$(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";
-                               OTHER_LDFLAGS = (
-                                       "-sub_library",
-                                       libobjc,
-                                       "-Wl,-Y,3",
-                               );
-                               PRODUCT_NAME = JavaScriptCore;
                                SECTORDER_FLAGS = (
                                        "-sectorder",
                                        __TEXT,
                                        __text,
                                        "$(APPLE_INTERNAL_DIR)/OrderFiles/JavaScriptCore.order",
                                );
-                               VALID_ARCHS = "i386 ppc ppc7400 ppc970 ppc64 x86_64";
-                               WARNING_CFLAGS = (
-                                       "-Wall",
-                                       "-W",
-                                       "-Wcast-align",
-                                       "-Wchar-subscripts",
-                                       "-Wformat-security",
-                                       "-Wmissing-format-attribute",
-                                       "-Wpointer-arith",
-                                       "-Wwrite-strings",
-                                       "-Wno-format-y2k",
-                                       "-Wno-long-double",
-                                       "-Wundef",
-                                       "-Wshorten-64-to-32",
-                               );
                        };
                        name = Production;
                };
                149C276D08902AFE008A9EFC /* Debug */ = {
                        isa = XCBuildConfiguration;
                        buildSettings = {
-                               DEBUG_DEFINES = "";
-                               GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
-                               GCC_OPTIMIZATION_LEVEL = 0;
-                               MACOSX_DEPLOYMENT_TARGET = 10.3;
-                               PREBINDING = NO;
                                PRODUCT_NAME = All;
-                               SECTORDER_FLAGS = "";
-                               STYLE_LDFLAGS = "";
                        };
                        name = Debug;
                };
                149C276E08902AFE008A9EFC /* Release */ = {
                        isa = XCBuildConfiguration;
                        buildSettings = {
-                               MACOSX_DEPLOYMENT_TARGET = 10.3;
-                               PREBINDING = NO;
                                PRODUCT_NAME = All;
-                               SECTORDER_FLAGS = "";
-                               STYLE_LDFLAGS = "";
                        };
                        name = Release;
                };
                };
                149C277208902AFE008A9EFC /* Debug */ = {
                        isa = XCBuildConfiguration;
+                       baseConfigurationReference = 1C9051440BA9E8A70081E9D0 /* DebugRelease.xcconfig */;
                        buildSettings = {
-                               DEBUG_INFORMATION_FORMAT = dwarf;
-                               GCC_ENABLE_CPP_EXCEPTIONS = NO;
-                               GCC_ENABLE_CPP_RTTI = NO;
-                               GCC_ENABLE_OBJC_EXCEPTIONS = YES;
-                               GCC_ENABLE_OBJC_GC = YES;
-                               GCC_FAST_OBJC_DISPATCH = YES;
                                GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
-                               GCC_INLINES_ARE_PRIVATE_EXTERN = YES;
-                               GCC_MODEL_TUNING = G5;
                                GCC_OPTIMIZATION_LEVEL = 0;
-                               GCC_PRECOMPILE_PREFIX_HEADER = YES;
-                               GCC_STRICT_ALIASING = YES;
-                               GCC_THREADSAFE_STATICS = NO;
-                               GCC_TREAT_WARNINGS_AS_ERRORS = YES;
-                               GCC_WARN_ABOUT_MISSING_NEWLINE = YES;
-                               GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
-                               GCC_WARN_NON_VIRTUAL_DESTRUCTOR = YES;
-                               MACOSX_DEPLOYMENT_TARGET = "$(MACOSX_DEPLOYMENT_TARGET_$(MAC_OS_X_VERSION_MAJOR))";
-                               MACOSX_DEPLOYMENT_TARGET_ = 10.4;
-                               MACOSX_DEPLOYMENT_TARGET_1040 = 10.4;
-                               MACOSX_DEPLOYMENT_TARGET_1050 = 10.5;
-                               PREBINDING = NO;
                                STRIP_INSTALLED_PRODUCT = NO;
-                               WARNING_CFLAGS = (
-                                       "-Wall",
-                                       "-W",
-                                       "-Wcast-align",
-                                       "-Wchar-subscripts",
-                                       "-Wformat-security",
-                                       "-Wmissing-format-attribute",
-                                       "-Wpointer-arith",
-                                       "-Wwrite-strings",
-                                       "-Wno-format-y2k",
-                                       "-Wno-unused-parameter",
-                                       "-Wno-long-double",
-                                       "-Wundef",
-                                       "-Wshorten-64-to-32",
-                               );
                        };
                        name = Debug;
                };
                149C277308902AFE008A9EFC /* Release */ = {
                        isa = XCBuildConfiguration;
+                       baseConfigurationReference = 1C9051440BA9E8A70081E9D0 /* DebugRelease.xcconfig */;
                        buildSettings = {
-                               DEAD_CODE_STRIPPING = YES;
-                               DEBUG_INFORMATION_FORMAT = dwarf;
-                               GCC_DEBUGGING_SYMBOLS = full;
-                               GCC_ENABLE_CPP_EXCEPTIONS = NO;
-                               GCC_ENABLE_CPP_RTTI = NO;
-                               GCC_ENABLE_OBJC_EXCEPTIONS = YES;
-                               GCC_ENABLE_OBJC_GC = YES;
-                               GCC_ENABLE_SYMBOL_SEPARATION = NO;
-                               GCC_FAST_OBJC_DISPATCH = YES;
                                GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
-                               GCC_INLINES_ARE_PRIVATE_EXTERN = YES;
-                               GCC_MODEL_TUNING = G5;
-                               GCC_OPTIMIZATION_LEVEL = 2;
-                               GCC_PRECOMPILE_PREFIX_HEADER = YES;
-                               GCC_STRICT_ALIASING = YES;
-                               GCC_THREADSAFE_STATICS = NO;
-                               GCC_TREAT_WARNINGS_AS_ERRORS = YES;
-                               GCC_WARN_ABOUT_MISSING_NEWLINE = YES;
-                               GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
-                               GCC_WARN_NON_VIRTUAL_DESTRUCTOR = YES;
-                               MACOSX_DEPLOYMENT_TARGET = "$(MACOSX_DEPLOYMENT_TARGET_$(MAC_OS_X_VERSION_MAJOR))";
-                               MACOSX_DEPLOYMENT_TARGET_ = 10.4;
-                               MACOSX_DEPLOYMENT_TARGET_1040 = 10.4;
-                               MACOSX_DEPLOYMENT_TARGET_1050 = 10.5;
-                               PREBINDING = NO;
                                STRIP_INSTALLED_PRODUCT = NO;
-                               WARNING_CFLAGS = (
-                                       "-Wall",
-                                       "-W",
-                                       "-Wcast-align",
-                                       "-Wchar-subscripts",
-                                       "-Wformat-security",
-                                       "-Wmissing-format-attribute",
-                                       "-Wpointer-arith",
-                                       "-Wwrite-strings",
-                                       "-Wno-format-y2k",
-                                       "-Wno-unused-parameter",
-                                       "-Wno-long-double",
-                                       "-Wundef",
-                                       "-Wshorten-64-to-32",
-                               );
                        };
                        name = Release;
                };
                149C277508902AFE008A9EFC /* Production */ = {
                        isa = XCBuildConfiguration;
+                       baseConfigurationReference = 1C9051450BA9E8A70081E9D0 /* Base.xcconfig */;
                        buildSettings = {
-                               DEAD_CODE_STRIPPING = YES;
-                               DEBUG_INFORMATION_FORMAT = dwarf;
-                               GCC_DEBUGGING_SYMBOLS = full;
-                               GCC_ENABLE_CPP_EXCEPTIONS = NO;
-                               GCC_ENABLE_CPP_RTTI = NO;
-                               GCC_ENABLE_OBJC_EXCEPTIONS = YES;
-                               GCC_ENABLE_OBJC_GC = YES;
-                               GCC_FAST_OBJC_DISPATCH = YES;
-                               GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
-                               GCC_INLINES_ARE_PRIVATE_EXTERN = YES;
-                               GCC_MODEL_TUNING = G5;
-                               GCC_OPTIMIZATION_LEVEL = 2;
-                               GCC_PRECOMPILE_PREFIX_HEADER = YES;
-                               GCC_STRICT_ALIASING = YES;
-                               GCC_THREADSAFE_STATICS = NO;
-                               GCC_TREAT_WARNINGS_AS_ERRORS = YES;
-                               GCC_WARN_ABOUT_MISSING_NEWLINE = YES;
-                               GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
-                               GCC_WARN_NON_VIRTUAL_DESTRUCTOR = YES;
-                               WARNING_CFLAGS = (
-                                       "-Wall",
-                                       "-W",
-                                       "-Wcast-align",
-                                       "-Wchar-subscripts",
-                                       "-Wformat-security",
-                                       "-Wmissing-format-attribute",
-                                       "-Wpointer-arith",
-                                       "-Wwrite-strings",
-                                       "-Wno-format-y2k",
-                                       "-Wno-unused-parameter",
-                                       "-Wno-long-double",
-                                       "-Wundef",
-                                       "-Wshorten-64-to-32",
-                               );
                        };
                        name = Production;
                };
                14BD59D70A3E8FC900BAF59C /* Debug */ = {
                        isa = XCBuildConfiguration;
                        buildSettings = {
-                               COPY_PHASE_STRIP = NO;
-                               DEBUG_INFORMATION_FORMAT = dwarf;
-                               GCC_DYNAMIC_NO_PIC = NO;
-                               GCC_ENABLE_FIX_AND_CONTINUE = YES;
-                               GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
-                               GCC_MODEL_TUNING = G5;
-                               GCC_OPTIMIZATION_LEVEL = 0;
-                               HEADER_SEARCH_PATHS = (
-                                       .,
-                                       icu,
-                                       "$(HEADER_SEARCH_PATHS_QUOTED_1)",
-                               );
-                               HEADER_SEARCH_PATHS_QUOTED_1 = "\"$(BUILT_PRODUCTS_DIR)/DerivedSources/JavaScriptCore\"";
-                               INSTALL_PATH = "$(HOME)/bin";
-                               PREBINDING = NO;
+                               HEADER_SEARCH_PATHS = .;
                                PRODUCT_NAME = testapi;
-                               ZERO_LINK = YES;
                        };
                        name = Debug;
                };
                14BD59D80A3E8FC900BAF59C /* Release */ = {
                        isa = XCBuildConfiguration;
                        buildSettings = {
-                               COPY_PHASE_STRIP = YES;
-                               DEBUG_INFORMATION_FORMAT = dwarf;
-                               GCC_ENABLE_FIX_AND_CONTINUE = NO;
-                               GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
-                               GCC_MODEL_TUNING = G5;
-                               HEADER_SEARCH_PATHS = (
-                                       .,
-                                       icu,
-                                       "$(HEADER_SEARCH_PATHS_QUOTED_1)",
-                               );
-                               HEADER_SEARCH_PATHS_QUOTED_1 = "\"$(BUILT_PRODUCTS_DIR)/DerivedSources/JavaScriptCore\"";
-                               INSTALL_PATH = "$(HOME)/bin";
-                               PREBINDING = NO;
+                               HEADER_SEARCH_PATHS = .;
                                PRODUCT_NAME = testapi;
-                               ZERO_LINK = NO;
                        };
                        name = Release;
                };
                14BD59D90A3E8FC900BAF59C /* Production */ = {
                        isa = XCBuildConfiguration;
                        buildSettings = {
-                               DEBUG_INFORMATION_FORMAT = dwarf;
-                               GCC_ENABLE_FIX_AND_CONTINUE = YES;
-                               GCC_MODEL_TUNING = G5;
-                               HEADER_SEARCH_PATHS = (
-                                       .,
-                                       icu,
-                                       "$(HEADER_SEARCH_PATHS_QUOTED_1)",
-                               );
-                               HEADER_SEARCH_PATHS_QUOTED_1 = "\"$(BUILT_PRODUCTS_DIR)/DerivedSources/JavaScriptCore\"";
-                               INSTALL_PATH = "$(HOME)/bin";
-                               PREBINDING = NO;
+                               HEADER_SEARCH_PATHS = .;
                                PRODUCT_NAME = testapi;
-                               ZERO_LINK = YES;
                        };
                        name = Production;
                };
index 649ffb6..3758452 100644 (file)
@@ -1,3 +1,20 @@
+2007-03-15  Timothy Hatcher  <timothy@apple.com>
+
+        Reviewed by John.
+
+        * Factored out most of our common build settings into .xcconfig files. Anything that was common in
+          each build configuration was factored out into the shared .xcconfig file.
+        * Adds a Version.xcconfig file to define the current framework version, to be used in other places.
+        * Use the new $(BUNDLE_VERSION) (defined in Version.xcconfig) in the preprocessed Info.plist.
+        * Use the versions defined in Version.xcconfig to set $(DYLIB_CURRENT_VERSION).
+
+        * Configurations/Base.xcconfig: Added.
+        * Configurations/DebugRelease.xcconfig: Added.
+        * Configurations/JavaScriptGlue.xcconfig: Added.
+        * Configurations/Version.xcconfig: Added.
+        * Info.plist:
+        * JavaScriptGlue.xcodeproj/project.pbxproj:
+
 2007-03-12  Geoffrey Garen  <ggaren@apple.com>
 
         Reviewed by Oliver Hunt.
diff --git a/JavaScriptGlue/Configurations/Base.xcconfig b/JavaScriptGlue/Configurations/Base.xcconfig
new file mode 100644 (file)
index 0000000..5772eee
--- /dev/null
@@ -0,0 +1,24 @@
+DEAD_CODE_STRIPPING = YES;
+DEBUG_INFORMATION_FORMAT = dwarf;
+GCC_C_LANGUAGE_STANDARD = gnu99;
+GCC_DEBUGGING_SYMBOLS = full;
+GCC_DYNAMIC_NO_PIC = NO;
+GCC_STRICT_ALIASING = YES;
+GCC_INLINES_ARE_PRIVATE_EXTERN = YES;
+GCC_ENABLE_CPP_EXCEPTIONS = NO;
+GCC_ENABLE_CPP_RTTI = NO;
+GCC_ENABLE_OBJC_EXCEPTIONS = YES;
+GCC_ENABLE_OBJC_GC = YES;
+GCC_FAST_OBJC_DISPATCH = YES;
+GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
+GCC_MODEL_TUNING = G5;
+GCC_OPTIMIZATION_LEVEL = 2;
+GCC_PRECOMPILE_PREFIX_HEADER = YES;
+GCC_THREADSAFE_STATICS = NO;
+GCC_TREAT_WARNINGS_AS_ERRORS = YES;
+GCC_WARN_ABOUT_MISSING_NEWLINE = YES;
+GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
+GCC_WARN_NON_VIRTUAL_DESTRUCTOR = YES;
+LINKER_DISPLAYS_MANGLED_NAMES = YES;
+VALID_ARCHS = i386 ppc x86_64 ppc64;
+WARNING_CFLAGS = -Wall -W -Wcast-align -Wchar-subscripts -Wformat-security -Wmissing-format-attribute -Wpointer-arith -Wwrite-strings -Wno-format-y2k -Wno-unused-parameter -Wno-long-double -Wundef -Wshorten-64-to-32;
diff --git a/JavaScriptGlue/Configurations/DebugRelease.xcconfig b/JavaScriptGlue/Configurations/DebugRelease.xcconfig
new file mode 100644 (file)
index 0000000..f93e177
--- /dev/null
@@ -0,0 +1,5 @@
+#include "Base.xcconfig"
+MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(MAC_OS_X_VERSION_MAJOR));
+MACOSX_DEPLOYMENT_TARGET_ = 10.4;
+MACOSX_DEPLOYMENT_TARGET_1040 = 10.4;
+MACOSX_DEPLOYMENT_TARGET_1050 = 10.5;
diff --git a/JavaScriptGlue/Configurations/JavaScriptGlue.xcconfig b/JavaScriptGlue/Configurations/JavaScriptGlue.xcconfig
new file mode 100644 (file)
index 0000000..616b81f
--- /dev/null
@@ -0,0 +1,12 @@
+#include "Version.xcconfig"
+DYLIB_COMPATIBILITY_VERSION = 1;
+DYLIB_CURRENT_VERSION = $(MAJOR_BUNDLE_VERSION).$(MINOR_BUNDLE_VERSION).$(TINY_BUNDLE_VERSION);
+EXPORTED_SYMBOLS_FILE = JavaScriptGlue.exp;
+GCC_PREPROCESSOR_DEFINITIONS = $(DEBUG_DEFINES) $(GCC_PREPROCESSOR_DEFINITIONS);
+HEADER_SEARCH_PATHS = ForwardingHeaders $(HEADER_SEARCH_PATHS);
+INFOPLIST_FILE = Info.plist;
+INFOPLIST_PREPROCESS = YES;
+INSTALL_PATH = $(SYSTEM_LIBRARY_DIR)/PrivateFrameworks;
+OTHER_CFLAGS = -Wno-deprecated-declarations;
+OTHER_LDFLAGS = -sub_library libobjc -Wl,-Y,3;
+PRODUCT_NAME = JavaScriptGlue;
diff --git a/JavaScriptGlue/Configurations/Version.xcconfig b/JavaScriptGlue/Configurations/Version.xcconfig
new file mode 100644 (file)
index 0000000..8558156
--- /dev/null
@@ -0,0 +1,5 @@
+SYSTEM_BUNDLE_VERSION_PREFIX = ;
+MAJOR_BUNDLE_VERSION = 522;
+MINOR_BUNDLE_VERSION = 0;
+TINY_BUNDLE_VERSION = 0;
+BUNDLE_VERSION = $(MAJOR_BUNDLE_VERSION)+;
index f3531b3..04c5312 100644 (file)
@@ -5,24 +5,20 @@
     <key>CFBundleDevelopmentRegion</key>
     <string>English</string>
     <key>CFBundleExecutable</key>
-    <string>JavaScriptGlue</string>
+    <string>${PRODUCT_NAME}</string>
     <key>CFBundleGetInfoString</key>
-    <string>522+, Copyright 2003-2007 Apple Inc.</string>
-    <key>CFBundleIconFile</key>
-    <string></string>
+    <string>${BUNDLE_VERSION}, Copyright 2003-2007 Apple Inc.</string>
     <key>CFBundleIdentifier</key>
-    <string>com.apple.JavaScriptGlue</string>
+    <string>com.apple.${PRODUCT_NAME}</string>
     <key>CFBundleInfoDictionaryVersion</key>
     <string>6.0</string>
+    <key>CFBundleName</key>
+    <string>${PRODUCT_NAME}</string>
     <key>CFBundlePackageType</key>
     <string>FMWK</string>
     <key>CFBundleShortVersionString</key>
-    <string>522+</string>
-    <key>CFBundleSignature</key>
-    <string>????</string>
+    <string>${BUNDLE_VERSION}</string>
     <key>CFBundleVersion</key>
-    <string>522+</string>
-    <key>NSPrincipalClass</key>
-    <string></string>
+    <string>${BUNDLE_VERSION}</string>
 </dict>
 </plist>
index c70ee83..f51163e 100644 (file)
                089C1667FE841158C02AAC07 /* English */ = {isa = PBXFileReference; fileEncoding = 10; indentWidth = 4; lastKnownFileType = text.plist.strings; name = English; path = English.lproj/InfoPlist.strings; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
                1422E86709DE3BCE00749B87 /* testjsglue.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = testjsglue.cpp; sourceTree = "<group>"; };
                1422E87709DE3BE800749B87 /* testjsglue */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = testjsglue; sourceTree = BUILT_PRODUCTS_DIR; };
+               1C90519F0BA9F3050081E9D0 /* Base.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = Base.xcconfig; sourceTree = "<group>"; };
+               1C9051A00BA9F3050081E9D0 /* DebugRelease.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = DebugRelease.xcconfig; sourceTree = "<group>"; };
+               1C9051A10BA9F3050081E9D0 /* JavaScriptGlue.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = JavaScriptGlue.xcconfig; sourceTree = "<group>"; };
+               1C9051A20BA9F3050081E9D0 /* Version.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = Version.xcconfig; sourceTree = "<group>"; };
                DD66F3D508F73ED700C75FD7 /* Info.plist */ = {isa = PBXFileReference; indentWidth = 4; lastKnownFileType = text.xml; path = Info.plist; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
                DD66F3D608F73ED700C75FD7 /* JavaScriptGlue.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = JavaScriptGlue.framework; sourceTree = BUILT_PRODUCTS_DIR; };
                DD66F3F508F7401B00C75FD7 /* JavaScriptCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = JavaScriptCore.framework; sourceTree = BUILT_PRODUCTS_DIR; };
                                089C1665FE841158C02AAC07 /* Resources */,
                                0867D69AFE84028FC02AAC07 /* External Frameworks and Libraries */,
                                034768DFFF38A50411DB9C8B /* Products */,
+                               1C90519E0BA9F3050081E9D0 /* Configurations */,
                                DD66F3D508F73ED700C75FD7 /* Info.plist */,
                        );
                        name = JavaScriptGlue;
                        name = "Other Frameworks";
                        sourceTree = "<group>";
                };
+               1C90519E0BA9F3050081E9D0 /* Configurations */ = {
+                       isa = PBXGroup;
+                       children = (
+                               1C90519F0BA9F3050081E9D0 /* Base.xcconfig */,
+                               1C9051A00BA9F3050081E9D0 /* DebugRelease.xcconfig */,
+                               1C9051A10BA9F3050081E9D0 /* JavaScriptGlue.xcconfig */,
+                               1C9051A20BA9F3050081E9D0 /* Version.xcconfig */,
+                       );
+                       path = Configurations;
+                       sourceTree = "<group>";
+               };
 /* End PBXGroup section */
 
 /* Begin PBXHeadersBuildPhase section */
                0867D690FE84028FC02AAC07 /* Project object */ = {
                        isa = PBXProject;
                        buildConfigurationList = 14AC662B08CE7791006915A8 /* Build configuration list for PBXProject "JavaScriptGlue" */;
+                       compatibilityVersion = "Xcode 2.4";
                        hasScannedForEncodings = 1;
                        mainGroup = 0867D691FE84028FC02AAC07 /* JavaScriptGlue */;
                        productRefGroup = 034768DFFF38A50411DB9C8B /* Products */;
                        projectDirPath = "";
                        projectRoot = "";
+                       shouldCheckCompatibility = 1;
                        targets = (
+                               1422E8C409DE3EA600749B87 /* All */,
                                DD66F3B908F73ED700C75FD7 /* JavaScriptGlue */,
                                1422E87609DE3BE800749B87 /* testjsglue */,
-                               1422E8C409DE3EA600749B87 /* All */,
                        );
                };
 /* End PBXProject section */
                1422E88709DE3C2200749B87 /* Debug */ = {
                        isa = XCBuildConfiguration;
                        buildSettings = {
-                               COPY_PHASE_STRIP = NO;
-                               GCC_DYNAMIC_NO_PIC = NO;
-                               GCC_ENABLE_FIX_AND_CONTINUE = YES;
-                               GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
-                               GCC_MODEL_TUNING = G5;
-                               GCC_OPTIMIZATION_LEVEL = 0;
-                               INSTALL_PATH = "$(HOME)/bin";
-                               PREBINDING = NO;
+                               OTHER_CFLAGS = "-Wno-deprecated-declarations";
+                               OTHER_LDFLAGS = (
+                                       "-framework",
+                                       CoreFoundation,
+                               );
                                PRODUCT_NAME = testjsglue;
-                               ZERO_LINK = YES;
                        };
                        name = Debug;
                };
                1422E88809DE3C2200749B87 /* Release */ = {
                        isa = XCBuildConfiguration;
                        buildSettings = {
-                               COPY_PHASE_STRIP = YES;
-                               GCC_ENABLE_FIX_AND_CONTINUE = NO;
-                               GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
-                               GCC_MODEL_TUNING = G5;
-                               INSTALL_PATH = "$(HOME)/bin";
-                               PREBINDING = NO;
+                               OTHER_CFLAGS = "-Wno-deprecated-declarations";
+                               OTHER_LDFLAGS = (
+                                       "-framework",
+                                       CoreFoundation,
+                               );
                                PRODUCT_NAME = testjsglue;
-                               ZERO_LINK = NO;
                        };
                        name = Release;
                };
                1422E88909DE3C2200749B87 /* Production */ = {
                        isa = XCBuildConfiguration;
                        buildSettings = {
-                               GCC_ENABLE_FIX_AND_CONTINUE = YES;
-                               GCC_MODEL_TUNING = G5;
-                               INSTALL_PATH = "$(HOME)/bin";
-                               PREBINDING = NO;
+                               OTHER_CFLAGS = "-Wno-deprecated-declarations";
+                               OTHER_LDFLAGS = (
+                                       "-framework",
+                                       CoreFoundation,
+                               );
                                PRODUCT_NAME = testjsglue;
-                               ZERO_LINK = YES;
                        };
                        name = Production;
                };
                };
                14AC662C08CE7791006915A8 /* Debug */ = {
                        isa = XCBuildConfiguration;
+                       baseConfigurationReference = 1C9051A00BA9F3050081E9D0 /* DebugRelease.xcconfig */;
                        buildSettings = {
-                               DEBUG_INFORMATION_FORMAT = dwarf;
-                               GCC_ENABLE_CPP_EXCEPTIONS = NO;
-                               GCC_ENABLE_CPP_RTTI = NO;
-                               GCC_ENABLE_OBJC_EXCEPTIONS = YES;
-                               GCC_ENABLE_OBJC_GC = YES;
-                               GCC_FAST_OBJC_DISPATCH = YES;
                                GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
-                               GCC_MODEL_TUNING = G5;
                                GCC_OPTIMIZATION_LEVEL = 0;
-                               GCC_PRECOMPILE_PREFIX_HEADER = YES;
-                               GCC_THREADSAFE_STATICS = NO;
-                               GCC_TREAT_WARNINGS_AS_ERRORS = YES;
-                               GCC_WARN_ABOUT_MISSING_NEWLINE = YES;
-                               GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
-                               GCC_WARN_NON_VIRTUAL_DESTRUCTOR = YES;
-                               MACOSX_DEPLOYMENT_TARGET = "$(MACOSX_DEPLOYMENT_TARGET_$(MAC_OS_X_VERSION_MAJOR))";
-                               MACOSX_DEPLOYMENT_TARGET_ = 10.4;
-                               MACOSX_DEPLOYMENT_TARGET_1040 = 10.4;
-                               MACOSX_DEPLOYMENT_TARGET_1050 = 10.5;
-                               PREBINDING = NO;
                                STRIP_INSTALLED_PRODUCT = NO;
-                               WARNING_CFLAGS = (
-                                       "-Wall",
-                                       "-W",
-                                       "-Wcast-align",
-                                       "-Wchar-subscripts",
-                                       "-Wformat-security",
-                                       "-Wmissing-format-attribute",
-                                       "-Wpointer-arith",
-                                       "-Wwrite-strings",
-                                       "-Wno-format-y2k",
-                                       "-Wno-unused-parameter",
-                                       "-Wno-long-double",
-                                       "-Wundef",
-                                       "-Wshorten-64-to-32",
-                               );
                        };
                        name = Debug;
                };
                14AC662D08CE7791006915A8 /* Release */ = {
                        isa = XCBuildConfiguration;
+                       baseConfigurationReference = 1C9051A00BA9F3050081E9D0 /* DebugRelease.xcconfig */;
                        buildSettings = {
-                               DEAD_CODE_STRIPPING = YES;
-                               DEBUG_INFORMATION_FORMAT = dwarf;
-                               GCC_DEBUGGING_SYMBOLS = full;
-                               GCC_ENABLE_CPP_EXCEPTIONS = NO;
-                               GCC_ENABLE_CPP_RTTI = NO;
-                               GCC_ENABLE_OBJC_EXCEPTIONS = YES;
-                               GCC_ENABLE_OBJC_GC = YES;
-                               GCC_ENABLE_SYMBOL_SEPARATION = NO;
-                               GCC_FAST_OBJC_DISPATCH = YES;
                                GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
-                               GCC_MODEL_TUNING = G5;
-                               GCC_OPTIMIZATION_LEVEL = 2;
-                               GCC_PRECOMPILE_PREFIX_HEADER = YES;
-                               GCC_PREPROCESSOR_DEFINITIONS = "";
-                               GCC_THREADSAFE_STATICS = NO;
-                               GCC_TREAT_WARNINGS_AS_ERRORS = YES;
-                               GCC_WARN_ABOUT_MISSING_NEWLINE = YES;
-                               GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
-                               GCC_WARN_NON_VIRTUAL_DESTRUCTOR = YES;
-                               MACOSX_DEPLOYMENT_TARGET = "$(MACOSX_DEPLOYMENT_TARGET_$(MAC_OS_X_VERSION_MAJOR))";
-                               MACOSX_DEPLOYMENT_TARGET_ = 10.4;
-                               MACOSX_DEPLOYMENT_TARGET_1040 = 10.4;
-                               MACOSX_DEPLOYMENT_TARGET_1050 = 10.5;
-                               PREBINDING = NO;
                                STRIP_INSTALLED_PRODUCT = NO;
-                               WARNING_CFLAGS = (
-                                       "-Wall",
-                                       "-W",
-                                       "-Wcast-align",
-                                       "-Wchar-subscripts",
-                                       "-Wformat-security",
-                                       "-Wmissing-format-attribute",
-                                       "-Wpointer-arith",
-                                       "-Wwrite-strings",
-                                       "-Wno-format-y2k",
-                                       "-Wno-unused-parameter",
-                                       "-Wno-long-double",
-                                       "-Wundef",
-                                       "-Wshorten-64-to-32",
-                               );
                        };
                        name = Release;
                };
                14AC662E08CE7791006915A8 /* Production */ = {
                        isa = XCBuildConfiguration;
+                       baseConfigurationReference = 1C90519F0BA9F3050081E9D0 /* Base.xcconfig */;
                        buildSettings = {
-                               DEAD_CODE_STRIPPING = YES;
-                               DEBUG_INFORMATION_FORMAT = dwarf;
-                               GCC_DEBUGGING_SYMBOLS = full;
-                               GCC_ENABLE_CPP_EXCEPTIONS = NO;
-                               GCC_ENABLE_CPP_RTTI = NO;
-                               GCC_ENABLE_OBJC_EXCEPTIONS = YES;
-                               GCC_ENABLE_OBJC_GC = YES;
-                               GCC_FAST_OBJC_DISPATCH = YES;
-                               GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
-                               GCC_MODEL_TUNING = G5;
-                               GCC_OPTIMIZATION_LEVEL = 2;
-                               GCC_PRECOMPILE_PREFIX_HEADER = YES;
-                               GCC_THREADSAFE_STATICS = NO;
-                               GCC_TREAT_WARNINGS_AS_ERRORS = YES;
-                               GCC_WARN_ABOUT_MISSING_NEWLINE = YES;
-                               GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
-                               GCC_WARN_NON_VIRTUAL_DESTRUCTOR = YES;
-                               WARNING_CFLAGS = (
-                                       "-Wall",
-                                       "-W",
-                                       "-Wcast-align",
-                                       "-Wchar-subscripts",
-                                       "-Wformat-security",
-                                       "-Wmissing-format-attribute",
-                                       "-Wpointer-arith",
-                                       "-Wwrite-strings",
-                                       "-Wno-format-y2k",
-                                       "-Wno-unused-parameter",
-                                       "-Wno-long-double",
-                                       "-Wundef",
-                                       "-Wshorten-64-to-32",
-                               );
                        };
                        name = Production;
                };
                DD66F3D208F73ED700C75FD7 /* Debug */ = {
                        isa = XCBuildConfiguration;
+                       baseConfigurationReference = 1C9051A10BA9F3050081E9D0 /* JavaScriptGlue.xcconfig */;
                        buildSettings = {
-                               DYLIB_COMPATIBILITY_VERSION = 1;
-                               DYLIB_CURRENT_VERSION = 1;
-                               EXPORTED_SYMBOLS_FILE = JavaScriptGlue.exp;
-                               FRAMEWORK_VERSION = A;
-                               HEADER_SEARCH_PATHS = ForwardingHeaders;
-                               INFOPLIST_FILE = Info.plist;
-                               INSTALL_PATH = "$(BUILT_PRODUCTS_DIR)";
-                               OTHER_CFLAGS = "-Wno-deprecated-declarations";
-                               PRODUCT_NAME = JavaScriptGlue;
-                               WRAPPER_EXTENSION = framework;
+                               DEBUG_DEFINES = "";
                        };
                        name = Debug;
                };
                DD66F3D308F73ED700C75FD7 /* Release */ = {
                        isa = XCBuildConfiguration;
+                       baseConfigurationReference = 1C9051A10BA9F3050081E9D0 /* JavaScriptGlue.xcconfig */;
                        buildSettings = {
-                               DYLIB_COMPATIBILITY_VERSION = 1;
-                               DYLIB_CURRENT_VERSION = 1;
-                               EXPORTED_SYMBOLS_FILE = JavaScriptGlue.exp;
-                               FRAMEWORK_VERSION = A;
-                               GCC_PREPROCESSOR_DEFINITIONS = NDEBUG;
-                               HEADER_SEARCH_PATHS = ForwardingHeaders;
-                               INFOPLIST_FILE = Info.plist;
-                               INSTALL_PATH = "$(BUILT_PRODUCTS_DIR)";
-                               OTHER_CFLAGS = "-Wno-deprecated-declarations";
-                               PRODUCT_NAME = JavaScriptGlue;
-                               WRAPPER_EXTENSION = framework;
+                               DEBUG_DEFINES = NDEBUG;
                        };
                        name = Release;
                };
                DD66F3D408F73ED700C75FD7 /* Production */ = {
                        isa = XCBuildConfiguration;
+                       baseConfigurationReference = 1C9051A10BA9F3050081E9D0 /* JavaScriptGlue.xcconfig */;
                        buildSettings = {
-                               DYLIB_COMPATIBILITY_VERSION = 1;
-                               DYLIB_CURRENT_VERSION = 1;
-                               EXPORTED_SYMBOLS_FILE = JavaScriptGlue.exp;
-                               FRAMEWORK_VERSION = A;
-                               GCC_PREPROCESSOR_DEFINITIONS = NDEBUG;
-                               HEADER_SEARCH_PATHS = ForwardingHeaders;
-                               INFOPLIST_FILE = Info.plist;
-                               INSTALL_PATH = "$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks";
-                               OTHER_CFLAGS = "-Wno-deprecated-declarations";
-                               PRODUCT_NAME = JavaScriptGlue;
+                               DEBUG_DEFINES = NDEBUG;
                                SECTORDER_FLAGS = (
                                        "-sectorder",
                                        __TEXT,
                                        __text,
                                        "$(APPLE_INTERNAL_DIR)/OrderFiles/JavaScriptGlue.order",
                                );
-                               WRAPPER_EXTENSION = framework;
                        };
                        name = Production;
                };
index 03c3ef2..7268fa2 100644 (file)
@@ -1,3 +1,20 @@
+2007-03-15  Timothy Hatcher  <timothy@apple.com>
+
+        Reviewed by John.
+
+        * Factored out most of our common build settings into .xcconfig files. Anything that was common in
+          each build configuration was factored out into the shared .xcconfig file.
+        * Adds a Version.xcconfig file to define the current framework version, to be used in other places.
+        * Use the new $(BUNDLE_VERSION) (defined in Version.xcconfig) in the preprocessed Info.plist.
+        * Use the versions defined in Version.xcconfig to set $(DYLIB_CURRENT_VERSION).
+
+        * Configurations/Base.xcconfig: Added.
+        * Configurations/DebugRelease.xcconfig: Added.
+        * Configurations/Version.xcconfig: Added.
+        * Configurations/WebCore.xcconfig: Added.
+        * Info.plist:
+        * WebCore.xcodeproj/project.pbxproj:
+
 2007-03-15  Krzysztof Kowalczyk  <kkowalczyk@gmail.com>
 
         Not reviewed - gdk build fixes.
diff --git a/WebCore/Configurations/Base.xcconfig b/WebCore/Configurations/Base.xcconfig
new file mode 100644 (file)
index 0000000..a94d1fd
--- /dev/null
@@ -0,0 +1,22 @@
+DEAD_CODE_STRIPPING = YES;
+DEBUG_INFORMATION_FORMAT = dwarf;
+GCC_C_LANGUAGE_STANDARD = gnu99;
+GCC_DEBUGGING_SYMBOLS = full;
+GCC_DYNAMIC_NO_PIC = NO;
+GCC_ENABLE_CPP_EXCEPTIONS = NO;
+GCC_ENABLE_CPP_RTTI = NO;
+GCC_ENABLE_OBJC_EXCEPTIONS = YES;
+GCC_ENABLE_OBJC_GC = YES;
+GCC_FAST_OBJC_DISPATCH = YES;
+GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
+GCC_MODEL_TUNING = G5;
+GCC_OPTIMIZATION_LEVEL = 2;
+GCC_PRECOMPILE_PREFIX_HEADER = YES;
+GCC_THREADSAFE_STATICS = NO;
+GCC_TREAT_WARNINGS_AS_ERRORS = YES;
+GCC_WARN_ABOUT_MISSING_NEWLINE = YES;
+GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
+GCC_WARN_NON_VIRTUAL_DESTRUCTOR = YES;
+LINKER_DISPLAYS_MANGLED_NAMES = YES;
+VALID_ARCHS = i386 ppc x86_64 ppc64;
+WARNING_CFLAGS = -Wall -W -Wcast-align -Wchar-subscripts -Wformat-security -Wmissing-format-attribute -Wpointer-arith -Wwrite-strings -Wno-format-y2k -Wno-unused-parameter -Wno-long-double -Wundef -Wshorten-64-to-32;
diff --git a/WebCore/Configurations/DebugRelease.xcconfig b/WebCore/Configurations/DebugRelease.xcconfig
new file mode 100644 (file)
index 0000000..f93e177
--- /dev/null
@@ -0,0 +1,5 @@
+#include "Base.xcconfig"
+MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(MAC_OS_X_VERSION_MAJOR));
+MACOSX_DEPLOYMENT_TARGET_ = 10.4;
+MACOSX_DEPLOYMENT_TARGET_1040 = 10.4;
+MACOSX_DEPLOYMENT_TARGET_1050 = 10.5;
diff --git a/WebCore/Configurations/Version.xcconfig b/WebCore/Configurations/Version.xcconfig
new file mode 100644 (file)
index 0000000..8558156
--- /dev/null
@@ -0,0 +1,5 @@
+SYSTEM_BUNDLE_VERSION_PREFIX = ;
+MAJOR_BUNDLE_VERSION = 522;
+MINOR_BUNDLE_VERSION = 0;
+TINY_BUNDLE_VERSION = 0;
+BUNDLE_VERSION = $(MAJOR_BUNDLE_VERSION)+;
diff --git a/WebCore/Configurations/WebCore.xcconfig b/WebCore/Configurations/WebCore.xcconfig
new file mode 100644 (file)
index 0000000..adc5a5e
--- /dev/null
@@ -0,0 +1,17 @@
+#include "Version.xcconfig"
+DYLIB_COMPATIBILITY_VERSION = 1;
+DYLIB_CURRENT_VERSION = $(MAJOR_BUNDLE_VERSION).$(MINOR_BUNDLE_VERSION).$(TINY_BUNDLE_VERSION);
+EXPORTED_SYMBOLS_FILE = $(EXPORTED_SYMBOLS_FILE_$(CURRENT_ARCH));
+EXPORTED_SYMBOLS_FILE_ = WebCore.exp;
+EXPORTED_SYMBOLS_FILE_i386 = WebCore.exp;
+EXPORTED_SYMBOLS_FILE_ppc = WebCore.exp;
+EXPORTED_SYMBOLS_FILE_ppc64 = "${BUILT_PRODUCTS_DIR}/DerivedSources/WebCore/WebCore.LP64.exp";
+EXPORTED_SYMBOLS_FILE_x86_64 = "${BUILT_PRODUCTS_DIR}/DerivedSources/WebCore/WebCore.LP64.exp";
+FEATURE_DEFINES = ENABLE_SVG ENABLE_XPATH ENABLE_XSLT;
+GCC_PREFIX_HEADER = WebCorePrefix.h;
+GCC_PREPROCESSOR_DEFINITIONS = $(DEBUG_DEFINES) $(FEATURE_DEFINES) $(GCC_PREPROCESSOR_DEFINITIONS);
+HEADER_SEARCH_PATHS = ForwardingHeaders icu /usr/include/libxslt /usr/include/libxml2 "${BUILT_PRODUCTS_DIR}/DerivedSources/WebCore" $(HEADER_SEARCH_PATHS);
+INFOPLIST_FILE = Info.plist;
+INFOPLIST_PREPROCESS = YES;
+INSTALL_PATH = $(SYSTEM_LIBRARY_DIR)/Frameworks/WebKit.framework/Versions/A/Frameworks;
+PRODUCT_NAME = WebCore;
index 5798753..3619ff5 100644 (file)
@@ -5,20 +5,20 @@
        <key>CFBundleDevelopmentRegion</key>
        <string>English</string>
        <key>CFBundleExecutable</key>
-       <string>WebCore</string>
+       <string>${PRODUCT_NAME}</string>
        <key>CFBundleGetInfoString</key>
-       <string>522+, Copyright 2003-2007 Apple Inc.; Copyright 1997 Martin Jones &lt;mjones@kde.org&gt;; Copyright 1998, 1999 Torben Weis &lt;weis@kde.org&gt;; Copyright 1998, 1999, 2002 Waldo Bastian &lt;bastian@kde.org&gt;; Copyright 1998-2000 Lars Knoll &lt;knoll@kde.org&gt;; Copyright 1999, 2001 Antti Koivisto &lt;koivisto@kde.org&gt;; Copyright 1999-2001 Harri Porten &lt;porten@kde.org&gt;; Copyright 2000 Simon Hausmann &lt;hausmann@kde.org&gt;; Copyright 2000, 2001 Dirk Mueller &lt;mueller@kde.org&gt;; Copyright 2000, 2001 Peter Kelly &lt;pmk@post.com&gt;; Copyright 2000 Daniel Molkentin &lt;molkentin@kde.org&gt;; Copyright 2000 Stefan Schimanski &lt;schimmi@kde.org&gt;; Copyright 1998-2000 Netscape Communications Corporation; Copyright 1998, 1999, 2000 Thai Open Source Software Center Ltd and Clark Cooper; Copyright 2001, 2002 Expat maintainers.</string>
+       <string>${BUNDLE_VERSION}, Copyright 2003-2007 Apple Inc.; Copyright 1997 Martin Jones &lt;mjones@kde.org&gt;; Copyright 1998, 1999 Torben Weis &lt;weis@kde.org&gt;; Copyright 1998, 1999, 2002 Waldo Bastian &lt;bastian@kde.org&gt;; Copyright 1998-2000 Lars Knoll &lt;knoll@kde.org&gt;; Copyright 1999, 2001 Antti Koivisto &lt;koivisto@kde.org&gt;; Copyright 1999-2001 Harri Porten &lt;porten@kde.org&gt;; Copyright 2000 Simon Hausmann &lt;hausmann@kde.org&gt;; Copyright 2000, 2001 Dirk Mueller &lt;mueller@kde.org&gt;; Copyright 2000, 2001 Peter Kelly &lt;pmk@post.com&gt;; Copyright 2000 Daniel Molkentin &lt;molkentin@kde.org&gt;; Copyright 2000 Stefan Schimanski &lt;schimmi@kde.org&gt;; Copyright 1998-2000 Netscape Communications Corporation; Copyright 1998, 1999, 2000 Thai Open Source Software Center Ltd and Clark Cooper; Copyright 2001, 2002 Expat maintainers.</string>
        <key>CFBundleIdentifier</key>
-       <string>com.apple.WebCore</string>
+       <string>com.apple.${PRODUCT_NAME}</string>
        <key>CFBundleInfoDictionaryVersion</key>
        <string>6.0</string>
        <key>CFBundleName</key>
-       <string>WebCore</string>
+       <string>${PRODUCT_NAME}</string>
        <key>CFBundlePackageType</key>
        <string>FMWK</string>
        <key>CFBundleShortVersionString</key>
-       <string>522+</string>
+       <string>${BUNDLE_VERSION}</string>
        <key>CFBundleVersion</key>
-       <string>522+</string>
+       <string>${BUNDLE_VERSION}</string>
 </dict>
 </plist>
index e56671e..667b0d9 100644 (file)
                1C4C8F000AD85D87009475CE /* DeleteButtonController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DeleteButtonController.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
                1C4C8F630AD8655D009475CE /* DeleteButton.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DeleteButton.cpp; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
                1C4C8F640AD8655D009475CE /* DeleteButton.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DeleteButton.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
+               1C904DF90BA9D2C80081E9D0 /* Version.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = Version.xcconfig; sourceTree = "<group>"; };
                1CAF347E0A6C405200ABE06E /* WebScriptObject.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebScriptObject.h; sourceTree = "<group>"; };
                1CAF347F0A6C405200ABE06E /* WebScriptObject.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebScriptObject.mm; sourceTree = "<group>"; };
                1CAF34800A6C405200ABE06E /* WebScriptObjectPrivate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebScriptObjectPrivate.h; sourceTree = "<group>"; };
                1CD0B6200AABDB5000D0A3FF /* PublicDOMInterfaces.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PublicDOMInterfaces.h; sourceTree = "<group>"; };
+               1CDD45E40BA9C84600F90147 /* DebugRelease.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = DebugRelease.xcconfig; sourceTree = "<group>"; };
+               1CDD45E50BA9C84600F90147 /* WebCore.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = WebCore.xcconfig; sourceTree = "<group>"; };
+               1CDD45E60BA9C84600F90147 /* Base.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = Base.xcconfig; sourceTree = "<group>"; };
                1CFAE3220A6D6A3F0032593D /* libobjc.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libobjc.dylib; path = /usr/lib/libobjc.dylib; sourceTree = "<absolute>"; };
                1CFCEE7F0AACC3B300348750 /* DOMHTMLAnchorElementPrivate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DOMHTMLAnchorElementPrivate.h; sourceTree = "<group>"; };
                1CFCEE880AACC3C000348750 /* DOMHTMLAreaElementPrivate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DOMHTMLAreaElementPrivate.h; sourceTree = "<group>"; };
                                089C1665FE841158C02AAC07 /* Resources */,
                                0867D69AFE84028FC02AAC07 /* Frameworks */,
                                034768DFFF38A50411DB9C8B /* Products */,
+                               1CDD44660BA9C80000F90147 /* Configurations */,
                        );
                        name = WebKit;
                        sourceTree = "<group>";
                        path = cf;
                        sourceTree = "<group>";
                };
+               1CDD44660BA9C80000F90147 /* Configurations */ = {
+                       isa = PBXGroup;
+                       children = (
+                               1CDD45E60BA9C84600F90147 /* Base.xcconfig */,
+                               1CDD45E40BA9C84600F90147 /* DebugRelease.xcconfig */,
+                               1CDD45E50BA9C84600F90147 /* WebCore.xcconfig */,
+                               1C904DF90BA9D2C80081E9D0 /* Version.xcconfig */,
+                       );
+                       path = Configurations;
+                       sourceTree = "<group>";
+               };
                5126E6B60A2E3AEF005C29FA /* icon */ = {
                        isa = PBXGroup;
                        children = (
                                93F199FD08245E59001E9ABC /* Resources */,
                                93F19A0C08245E59001E9ABC /* Sources */,
                                939D050109D9FF6B00984996 /* Check For Global Initializers */,
-                               93F19B1208245E59001E9ABC /* Frameworks */,
                                1CB71D4A0B02658D0061EA45 /* Generate 64-bit Export File */,
+                               93F19B1208245E59001E9ABC /* Frameworks */,
                        );
                        buildRules = (
                                1C8715220B0BA37B00E3CB7B /* PBXBuildRule */,
                0867D690FE84028FC02AAC07 /* Project object */ = {
                        isa = PBXProject;
                        buildConfigurationList = 149C284308902B11008A9EFC /* Build configuration list for PBXProject "WebCore" */;
+                       compatibilityVersion = "Xcode 2.4";
                        hasScannedForEncodings = 1;
                        knownRegions = (
                                English,
                        productRefGroup = 034768DFFF38A50411DB9C8B /* Products */;
                        projectDirPath = "";
                        projectRoot = "";
+                       shouldCheckCompatibility = 1;
                        targets = (
                                93F198A508245E59001E9ABC /* WebCore */,
                                DD041FBE09D9DDBE0010AF2A /* Derived Sources */,
 /* Begin XCBuildConfiguration section */
                149C283A08902B11008A9EFC /* Debug */ = {
                        isa = XCBuildConfiguration;
+                       baseConfigurationReference = 1CDD45E50BA9C84600F90147 /* WebCore.xcconfig */;
                        buildSettings = {
-                               DEBUG_DEFINES = "";
-                               DYLIB_COMPATIBILITY_VERSION = 1;
-                               DYLIB_CURRENT_VERSION = 1;
-                               EXPORTED_SYMBOLS_FILE = "$(EXPORTED_SYMBOLS_FILE_$(CURRENT_ARCH))";
-                               EXPORTED_SYMBOLS_FILE_ = WebCore.exp;
-                               EXPORTED_SYMBOLS_FILE_i386 = WebCore.exp;
-                               EXPORTED_SYMBOLS_FILE_ppc = WebCore.exp;
-                               EXPORTED_SYMBOLS_FILE_ppc64 = "$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/WebCore.LP64.exp";
-                               EXPORTED_SYMBOLS_FILE_x86_64 = "$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/WebCore.LP64.exp";
-                               FEATURE_DEFINES = "ENABLE_SVG ENABLE_XPATH ENABLE_XSLT";
-                               GCC_C_LANGUAGE_STANDARD = gnu99;
-                               GCC_PREFIX_HEADER = WebCorePrefix.h;
-                               GCC_PREPROCESSOR_DEFINITIONS = (
-                                       "$(DEBUG_DEFINES)",
-                                       "$(FEATURE_DEFINES)",
-                                       DISABLE_THREAD_CHECK,
-                               );
-                               HEADER_SEARCH_PATHS = (
-                                       ForwardingHeaders,
-                                       .,
-                                       icu,
-                                       /usr/include/libxslt,
-                                       /usr/include/libxml2,
-                                       "$(HEADER_SEARCH_PATHS_QUOTED_1)",
-                               );
-                               HEADER_SEARCH_PATHS_QUOTED_1 = "\"${BUILT_PRODUCTS_DIR}/DerivedSources/WebCore\"";
-                               INFOPLIST_FILE = Info.plist;
-                               INSTALL_PATH = "$(BUILT_PRODUCTS_DIR)";
-                               LINKER_DISPLAYS_MANGLED_NAMES = YES;
+                               DEBUG_DEFINES = DISABLE_THREAD_CHECK;
                                OTHER_LDFLAGS = (
                                        "-sub_library",
                                        libobjc,
                                );
-                               PRODUCT_NAME = WebCore;
                        };
                        name = Debug;
                };
                149C283B08902B11008A9EFC /* Release */ = {
                        isa = XCBuildConfiguration;
+                       baseConfigurationReference = 1CDD45E50BA9C84600F90147 /* WebCore.xcconfig */;
                        buildSettings = {
                                DEBUG_DEFINES = NDEBUG;
-                               DYLIB_COMPATIBILITY_VERSION = 1;
-                               DYLIB_CURRENT_VERSION = 1;
-                               EXPORTED_SYMBOLS_FILE = "$(EXPORTED_SYMBOLS_FILE_$(CURRENT_ARCH))";
-                               EXPORTED_SYMBOLS_FILE_ = WebCore.exp;
-                               EXPORTED_SYMBOLS_FILE_i386 = WebCore.exp;
-                               EXPORTED_SYMBOLS_FILE_ppc = WebCore.exp;
-                               EXPORTED_SYMBOLS_FILE_ppc64 = "$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/WebCore.LP64.exp";
-                               EXPORTED_SYMBOLS_FILE_x86_64 = "$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/WebCore.LP64.exp";
-                               FEATURE_DEFINES = "ENABLE_SVG ENABLE_XPATH ENABLE_XSLT";
-                               GCC_C_LANGUAGE_STANDARD = gnu99;
-                               GCC_PREFIX_HEADER = WebCorePrefix.h;
-                               GCC_PREPROCESSOR_DEFINITIONS = (
-                                       "$(DEBUG_DEFINES)",
-                                       "$(FEATURE_DEFINES)",
-                               );
-                               HEADER_SEARCH_PATHS = (
-                                       ForwardingHeaders,
-                                       .,
-                                       icu,
-                                       /usr/include/libxslt,
-                                       /usr/include/libxml2,
-                                       "$(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 = (
                                        "-sub_library",
                                        libobjc,
                                );
-                               PRODUCT_NAME = WebCore;
                        };
                        name = Release;
                };
                149C283D08902B11008A9EFC /* Production */ = {
                        isa = XCBuildConfiguration;
+                       baseConfigurationReference = 1CDD45E50BA9C84600F90147 /* WebCore.xcconfig */;
                        buildSettings = {
                                DEBUG_DEFINES = NDEBUG;
-                               DYLIB_COMPATIBILITY_VERSION = 1;
-                               DYLIB_CURRENT_VERSION = 1;
-                               EXPORTED_SYMBOLS_FILE = "$(EXPORTED_SYMBOLS_FILE_$(CURRENT_ARCH))";
-                               EXPORTED_SYMBOLS_FILE_ = WebCore.exp;
-                               EXPORTED_SYMBOLS_FILE_i386 = WebCore.exp;
-                               EXPORTED_SYMBOLS_FILE_ppc = WebCore.exp;
-                               EXPORTED_SYMBOLS_FILE_ppc64 = "$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/WebCore.LP64.exp";
-                               EXPORTED_SYMBOLS_FILE_x86_64 = "$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/WebCore.LP64.exp";
-                               FEATURE_DEFINES = "ENABLE_SVG ENABLE_XPATH ENABLE_XSLT";
-                               GCC_C_LANGUAGE_STANDARD = gnu99;
-                               GCC_PREFIX_HEADER = WebCorePrefix.h;
-                               GCC_PREPROCESSOR_DEFINITIONS = (
-                                       "$(DEBUG_DEFINES)",
-                                       "$(FEATURE_DEFINES)",
-                               );
-                               HEADER_SEARCH_PATHS = (
-                                       ForwardingHeaders,
-                                       .,
-                                       icu,
-                                       /usr/include/libxslt,
-                                       /usr/include/libxml2,
-                                       "$(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 = (
                                        "-sub_library",
                                        libobjc,
                                        "-umbrella",
                                        WebKit,
                                );
-                               PRODUCT_NAME = WebCore;
                                SECTORDER_FLAGS = (
                                        "-sectorder",
                                        __TEXT,
                };
                149C284408902B11008A9EFC /* Debug */ = {
                        isa = XCBuildConfiguration;
+                       baseConfigurationReference = 1CDD45E40BA9C84600F90147 /* DebugRelease.xcconfig */;
                        buildSettings = {
-                               DEBUG_INFORMATION_FORMAT = dwarf;
-                               FEATURE_DEFINES = "ENABLE_SVG ENABLE_XPATH";
-                               GCC_ENABLE_CPP_EXCEPTIONS = NO;
-                               GCC_ENABLE_CPP_RTTI = NO;
-                               GCC_ENABLE_OBJC_EXCEPTIONS = YES;
-                               GCC_ENABLE_OBJC_GC = YES;
-                               GCC_FAST_OBJC_DISPATCH = YES;
+                               DEAD_CODE_STRIPPING = NO;
                                GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
-                               GCC_MODEL_TUNING = G5;
                                GCC_OPTIMIZATION_LEVEL = 0;
-                               GCC_PRECOMPILE_PREFIX_HEADER = YES;
-                               GCC_THREADSAFE_STATICS = NO;
-                               GCC_TREAT_WARNINGS_AS_ERRORS = YES;
-                               GCC_WARN_ABOUT_MISSING_NEWLINE = YES;
-                               GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
-                               GCC_WARN_NON_VIRTUAL_DESTRUCTOR = YES;
-                               MACOSX_DEPLOYMENT_TARGET = "$(MACOSX_DEPLOYMENT_TARGET_$(MAC_OS_X_VERSION_MAJOR))";
-                               MACOSX_DEPLOYMENT_TARGET_ = 10.4;
-                               MACOSX_DEPLOYMENT_TARGET_1040 = 10.4;
-                               MACOSX_DEPLOYMENT_TARGET_1050 = 10.5;
-                               PREBINDING = NO;
                                STRIP_INSTALLED_PRODUCT = NO;
-                               WARNING_CFLAGS = (
-                                       "-Wall",
-                                       "-W",
-                                       "-Wcast-align",
-                                       "-Wchar-subscripts",
-                                       "-Wformat-security",
-                                       "-Wmissing-format-attribute",
-                                       "-Wpointer-arith",
-                                       "-Wwrite-strings",
-                                       "-Wno-format-y2k",
-                                       "-Wno-unused-parameter",
-                                       "-Wno-long-double",
-                                       "-Wundef",
-                                       "-Wshorten-64-to-32",
-                               );
                        };
                        name = Debug;
                };
                149C284508902B11008A9EFC /* Release */ = {
                        isa = XCBuildConfiguration;
+                       baseConfigurationReference = 1CDD45E40BA9C84600F90147 /* DebugRelease.xcconfig */;
                        buildSettings = {
-                               DEAD_CODE_STRIPPING = YES;
-                               DEBUG_INFORMATION_FORMAT = dwarf;
-                               FEATURE_DEFINES = "ENABLE_SVG ENABLE_XPATH";
-                               GCC_DEBUGGING_SYMBOLS = full;
-                               GCC_ENABLE_CPP_EXCEPTIONS = NO;
-                               GCC_ENABLE_CPP_RTTI = NO;
-                               GCC_ENABLE_OBJC_EXCEPTIONS = YES;
-                               GCC_ENABLE_OBJC_GC = YES;
-                               GCC_ENABLE_SYMBOL_SEPARATION = NO;
-                               GCC_FAST_OBJC_DISPATCH = YES;
                                GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
-                               GCC_MODEL_TUNING = G5;
-                               GCC_OPTIMIZATION_LEVEL = 2;
-                               GCC_PRECOMPILE_PREFIX_HEADER = YES;
-                               GCC_THREADSAFE_STATICS = NO;
-                               GCC_TREAT_WARNINGS_AS_ERRORS = YES;
-                               GCC_WARN_ABOUT_MISSING_NEWLINE = YES;
-                               GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
-                               GCC_WARN_NON_VIRTUAL_DESTRUCTOR = YES;
-                               MACOSX_DEPLOYMENT_TARGET = "$(MACOSX_DEPLOYMENT_TARGET_$(MAC_OS_X_VERSION_MAJOR))";
-                               MACOSX_DEPLOYMENT_TARGET_ = 10.4;
-                               MACOSX_DEPLOYMENT_TARGET_1040 = 10.4;
-                               MACOSX_DEPLOYMENT_TARGET_1050 = 10.5;
-                               PREBINDING = NO;
                                STRIP_INSTALLED_PRODUCT = NO;
-                               WARNING_CFLAGS = (
-                                       "-Wall",
-                                       "-W",
-                                       "-Wcast-align",
-                                       "-Wchar-subscripts",
-                                       "-Wformat-security",
-                                       "-Wmissing-format-attribute",
-                                       "-Wpointer-arith",
-                                       "-Wwrite-strings",
-                                       "-Wno-format-y2k",
-                                       "-Wno-unused-parameter",
-                                       "-Wno-long-double",
-                                       "-Wundef",
-                                       "-Wshorten-64-to-32",
-                               );
                        };
                        name = Release;
                };
                149C284708902B11008A9EFC /* Production */ = {
                        isa = XCBuildConfiguration;
+                       baseConfigurationReference = 1CDD45E60BA9C84600F90147 /* Base.xcconfig */;
                        buildSettings = {
-                               DEAD_CODE_STRIPPING = YES;
-                               DEBUG_INFORMATION_FORMAT = dwarf;
-                               FEATURE_DEFINES = "ENABLE_SVG ENABLE_XPATH";
-                               GCC_DEBUGGING_SYMBOLS = full;
-                               GCC_ENABLE_CPP_EXCEPTIONS = NO;
-                               GCC_ENABLE_CPP_RTTI = NO;
-                               GCC_ENABLE_OBJC_EXCEPTIONS = YES;
-                               GCC_ENABLE_OBJC_GC = YES;
-                               GCC_FAST_OBJC_DISPATCH = YES;
-                               GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
-                               GCC_MODEL_TUNING = G5;
-                               GCC_OPTIMIZATION_LEVEL = 2;
-                               GCC_PRECOMPILE_PREFIX_HEADER = YES;
-                               GCC_THREADSAFE_STATICS = NO;
-                               GCC_TREAT_WARNINGS_AS_ERRORS = YES;
-                               GCC_WARN_ABOUT_MISSING_NEWLINE = YES;
-                               GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
-                               GCC_WARN_NON_VIRTUAL_DESTRUCTOR = YES;
-                               WARNING_CFLAGS = (
-                                       "-Wall",
-                                       "-W",
-                                       "-Wcast-align",
-                                       "-Wchar-subscripts",
-                                       "-Wformat-security",
-                                       "-Wmissing-format-attribute",
-                                       "-Wpointer-arith",
-                                       "-Wwrite-strings",
-                                       "-Wno-format-y2k",
-                                       "-Wno-unused-parameter",
-                                       "-Wno-long-double",
-                                       "-Wundef",
-                                       "-Wshorten-64-to-32",
-                               );
                        };
                        name = Production;
                };
                DD041FC209D9DDDC0010AF2A /* Debug */ = {
                        isa = XCBuildConfiguration;
+                       baseConfigurationReference = 1CDD45E50BA9C84600F90147 /* WebCore.xcconfig */;
                        buildSettings = {
                                PRODUCT_NAME = "Derived Sources";
                        };
                };
                DD041FC309D9DDDC0010AF2A /* Release */ = {
                        isa = XCBuildConfiguration;
+                       baseConfigurationReference = 1CDD45E50BA9C84600F90147 /* WebCore.xcconfig */;
                        buildSettings = {
                                PRODUCT_NAME = "Derived Sources";
                        };
                };
                DD041FC409D9DDDC0010AF2A /* Production */ = {
                        isa = XCBuildConfiguration;
+                       baseConfigurationReference = 1CDD45E50BA9C84600F90147 /* WebCore.xcconfig */;
                        buildSettings = {
                                PRODUCT_NAME = "Derived Sources";
                        };
index 25450f7..b7cf617 100644 (file)
@@ -1,3 +1,25 @@
+2007-03-15  Timothy Hatcher  <timothy@apple.com>
+
+        Reviewed by John.
+
+        * Fixes: <rdar://problem/4927747> WebKit's Current Library Version number should match the Info.plist Version
+        * Factored out most of our common build settings into .xcconfig files. Anything that was common in
+          each build configuration was factored out into the shared .xcconfig file.
+        * Adds a Version.xcconfig file to define the current framework version, to be used in other places.
+        * Use the new $(BUNDLE_VERSION) (defined in Version.xcconfig) in the preprocessed Info.plist.
+        * Use the versions defined in Version.xcconfig to set $(DYLIB_CURRENT_VERSION).
+        * Make WebKit use the same warning flags as the other projects. This required two casts to be added to fix new warnings.
+
+        * Configurations/Base.xcconfig: Added.
+        * Configurations/DebugRelease.xcconfig: Added.
+        * Configurations/Version.xcconfig: Added.
+        * Configurations/WebKit.xcconfig: Added.
+        * Info.plist:
+        * Misc/WebKitVersionChecks.h:
+        * Plugins/WebBaseNetscapePluginStream.m:
+        (-[WebBaseNetscapePluginStream startStreamResponseURL:expectedContentLength:lastModifiedDate:MIMEType:]):
+        * WebKit.xcodeproj/project.pbxproj:
+
 2007-03-15  Kevin Decker  <kdecker@apple.com>
 
         Reviewed by Anders.
diff --git a/WebKit/Configurations/Base.xcconfig b/WebKit/Configurations/Base.xcconfig
new file mode 100644 (file)
index 0000000..a94d1fd
--- /dev/null
@@ -0,0 +1,22 @@
+DEAD_CODE_STRIPPING = YES;
+DEBUG_INFORMATION_FORMAT = dwarf;
+GCC_C_LANGUAGE_STANDARD = gnu99;
+GCC_DEBUGGING_SYMBOLS = full;
+GCC_DYNAMIC_NO_PIC = NO;
+GCC_ENABLE_CPP_EXCEPTIONS = NO;
+GCC_ENABLE_CPP_RTTI = NO;
+GCC_ENABLE_OBJC_EXCEPTIONS = YES;
+GCC_ENABLE_OBJC_GC = YES;
+GCC_FAST_OBJC_DISPATCH = YES;
+GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
+GCC_MODEL_TUNING = G5;
+GCC_OPTIMIZATION_LEVEL = 2;
+GCC_PRECOMPILE_PREFIX_HEADER = YES;
+GCC_THREADSAFE_STATICS = NO;
+GCC_TREAT_WARNINGS_AS_ERRORS = YES;
+GCC_WARN_ABOUT_MISSING_NEWLINE = YES;
+GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
+GCC_WARN_NON_VIRTUAL_DESTRUCTOR = YES;
+LINKER_DISPLAYS_MANGLED_NAMES = YES;
+VALID_ARCHS = i386 ppc x86_64 ppc64;
+WARNING_CFLAGS = -Wall -W -Wcast-align -Wchar-subscripts -Wformat-security -Wmissing-format-attribute -Wpointer-arith -Wwrite-strings -Wno-format-y2k -Wno-unused-parameter -Wno-long-double -Wundef -Wshorten-64-to-32;
diff --git a/WebKit/Configurations/DebugRelease.xcconfig b/WebKit/Configurations/DebugRelease.xcconfig
new file mode 100644 (file)
index 0000000..f93e177
--- /dev/null
@@ -0,0 +1,5 @@
+#include "Base.xcconfig"
+MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(MAC_OS_X_VERSION_MAJOR));
+MACOSX_DEPLOYMENT_TARGET_ = 10.4;
+MACOSX_DEPLOYMENT_TARGET_1040 = 10.4;
+MACOSX_DEPLOYMENT_TARGET_1050 = 10.5;
diff --git a/WebKit/Configurations/Version.xcconfig b/WebKit/Configurations/Version.xcconfig
new file mode 100644 (file)
index 0000000..8558156
--- /dev/null
@@ -0,0 +1,5 @@
+SYSTEM_BUNDLE_VERSION_PREFIX = ;
+MAJOR_BUNDLE_VERSION = 522;
+MINOR_BUNDLE_VERSION = 0;
+TINY_BUNDLE_VERSION = 0;
+BUNDLE_VERSION = $(MAJOR_BUNDLE_VERSION)+;
diff --git a/WebKit/Configurations/WebKit.xcconfig b/WebKit/Configurations/WebKit.xcconfig
new file mode 100644 (file)
index 0000000..f2e03d8
--- /dev/null
@@ -0,0 +1,21 @@
+#include "Version.xcconfig"
+DYLIB_COMPATIBILITY_VERSION = 1;
+DYLIB_CURRENT_VERSION = $(MAJOR_BUNDLE_VERSION).$(MINOR_BUNDLE_VERSION).$(TINY_BUNDLE_VERSION);
+EXPORTED_SYMBOLS_FILE = $(EXPORTED_SYMBOLS_FILE_$(CURRENT_ARCH));
+EXPORTED_SYMBOLS_FILE_ = WebKit.exp;
+EXPORTED_SYMBOLS_FILE_i386 = WebKit.exp;
+EXPORTED_SYMBOLS_FILE_ppc = WebKit.exp;
+EXPORTED_SYMBOLS_FILE_ppc64 = "${BUILT_PRODUCTS_DIR}/DerivedSources/WebKit/WebKit.LP64.exp";
+EXPORTED_SYMBOLS_FILE_x86_64 = "${BUILT_PRODUCTS_DIR}/DerivedSources/WebKit/WebKit.LP64.exp";
+FEATURE_DEFINES = ENABLE_SVG ENABLE_XPATH ENABLE_XSLT;
+FRAMEWORK_SEARCH_PATHS = $(SYSTEM_LIBRARY_DIR)/Frameworks/ApplicationServices.framework/Frameworks $(SYSTEM_LIBRARY_DIR)/Frameworks/Carbon.framework/Frameworks $(SYSTEM_LIBRARY_DIR)/Frameworks/Quartz.framework/Frameworks $(SYSTEM_LIBRARY_DIR)/PrivateFrameworks $(FRAMEWORK_SEARCH_PATHS);
+GCC_PREFIX_HEADER = WebKitPrefix.h;
+GCC_PREPROCESSOR_DEFINITIONS = $(DEBUG_DEFINES) $(FEATURE_DEFINES) FRAMEWORK_NAME=WebKit ENABLE_WEBKIT_UNSET_DYLD_FRAMEWORK_PATH REMOVE_SAFARI_DOM_TREE_DEBUG_ITEM $(GCC_PREPROCESSOR_DEFINITIONS);
+HEADER_SEARCH_PATHS = ForwardingHeaders icu "${BUILT_PRODUCTS_DIR}/usr/local/include" "${BUILT_PRODUCTS_DIR}/DerivedSources/WebKit" $(HEADER_SEARCH_PATHS);
+INFOPLIST_FILE = Info.plist;
+INFOPLIST_PREPROCESS = YES;
+INSTALL_PATH = $(SYSTEM_LIBRARY_DIR)/Frameworks;
+JAVASCRIPTCORE_PRIVATE_HEADERS_DIR = $(NEXT_ROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks/JavaScriptCore.framework/PrivateHeaders;
+PRODUCT_NAME = WebKit;
+UMBRELLA_FRAMEWORKS_DIR = $(NEXT_ROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks/WebKit.framework/Versions/A/Frameworks;
+WEBCORE_PRIVATE_HEADERS_DIR = $(UMBRELLA_FRAMEWORKS_DIR)/WebCore.framework/PrivateHeaders;
index b15d367..635fbe5 100644 (file)
@@ -5,20 +5,20 @@
        <key>CFBundleDevelopmentRegion</key>
        <string>English</string>
        <key>CFBundleExecutable</key>
-       <string>WebKit</string>
+       <string>${PRODUCT_NAME}</string>
        <key>CFBundleGetInfoString</key>
-       <string>522+, Copyright 2003-2007 Apple Inc.</string>
+       <string>${BUNDLE_VERSION}, Copyright 2003-2007 Apple Inc.</string>
        <key>CFBundleIdentifier</key>
-       <string>com.apple.WebKit</string>
+       <string>com.apple.${PRODUCT_NAME}</string>
        <key>CFBundleInfoDictionaryVersion</key>
        <string>6.0</string>
        <key>CFBundleName</key>
-       <string>WebKit</string>
+       <string>${PRODUCT_NAME}</string>
        <key>CFBundlePackageType</key>
        <string>FMWK</string>
        <key>CFBundleShortVersionString</key>
-       <string>522+</string>
+       <string>${BUNDLE_VERSION}</string>
        <key>CFBundleVersion</key>
-       <string>522+</string>
+       <string>${BUNDLE_VERSION}</string>
 </dict>
 </plist>
index 663de22..843455a 100644 (file)
    For example the version 1.2.3 is returned as 0x00010203 and version 200.3.5 is returned as 0x00C80305
    A version of -1 is returned if the main executable did not link against WebKit (should never happen). */
 
-
-// FIXME 4927747: We should make the framework version numbers match the info.plist version numbers
-#define WEBKIT_FIRST_VERSION_WITH_3_0_CONTEXT_MENU_TAGS 0x00020000
-#define WEBKIT_FIRST_VERSION_WITHOUT_ACROBAT_QUIRK 0x00020000
-#define WEBKIT_FIRST_VERSION_WITH_LOCAL_RESOURCE_SECURITY_RESTRICTION 0x00020000
-#define WEBKIT_FIRST_VERSION_WITHOUT_APERTURE_QUIRK 0x00020000
+#define WEBKIT_FIRST_VERSION_WITH_3_0_CONTEXT_MENU_TAGS 0x020A0000 // 522.0.0
+#define WEBKIT_FIRST_VERSION_WITHOUT_ACROBAT_QUIRK 0x020A0000 // 522.0.0
+#define WEBKIT_FIRST_VERSION_WITH_LOCAL_RESOURCE_SECURITY_RESTRICTION 0x020A0000 // 522.0.0
+#define WEBKIT_FIRST_VERSION_WITHOUT_APERTURE_QUIRK 0x020A0000 // 522.0.0
 
 #ifdef __cplusplus
 extern "C" {
index 4c2df1c..53b7b8b 100644 (file)
@@ -221,8 +221,8 @@ static char *CarbonPathFromPOSIXPath(const char *posixPath);
     stream.url = strdup([responseURL _web_URLCString]);
 
     stream.ndata = self;
-    stream.end = expectedContentLength > 0 ? expectedContentLength : 0;
-    stream.lastmodified = [lastModifiedDate timeIntervalSince1970];
+    stream.end = expectedContentLength > 0 ? (uint32)expectedContentLength : 0;
+    stream.lastmodified = (uint32)[lastModifiedDate timeIntervalSince1970];
     stream.notifyData = notifyData;
     
     transferMode = NP_NORMAL;
index 16788a6..230bccc 100644 (file)
                1C68F666095B5FC100C2984E /* WebNodeHighlightView.m */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.c.objc; path = WebNodeHighlightView.m; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
                1C6CB03E0AA6391D00D23BFD /* MigrateHeaders.make */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = MigrateHeaders.make; sourceTree = "<group>"; };
                1C8CB0790AE9830C00B1F6E9 /* WebEditingDelegatePrivate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebEditingDelegatePrivate.h; sourceTree = "<group>"; };
+               1C904FD20BA9DD0F0081E9D0 /* WebKit.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = WebKit.xcconfig; sourceTree = "<group>"; };
+               1C904FD30BA9DD0F0081E9D0 /* Version.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = Version.xcconfig; sourceTree = "<group>"; };
+               1C904FD40BA9DD0F0081E9D0 /* DebugRelease.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = DebugRelease.xcconfig; sourceTree = "<group>"; };
+               1C904FD50BA9DD0F0081E9D0 /* Base.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = Base.xcconfig; sourceTree = "<group>"; };
                1CA57D600AED6A470009BDD0 /* WebGraphicsExtras.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebGraphicsExtras.h; sourceTree = "<group>"; };
                1CA57D610AED6A470009BDD0 /* WebGraphicsExtras.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = WebGraphicsExtras.c; sourceTree = "<group>"; };
                1CCFFD120B1F81F2002EE926 /* OldWebAssertions.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = OldWebAssertions.c; sourceTree = "<group>"; };
                                089C1665FE841158C02AAC07 /* Resources */,
                                0867D69AFE84028FC02AAC07 /* Frameworks and Libraries */,
                                034768DFFF38A50411DB9C8B /* Products */,
+                               1C904FCE0BA9DCF20081E9D0 /* Configurations */,
                        );
                        name = WebKit;
                        sourceTree = "<group>";
                        path = WebInspector;
                        sourceTree = "<group>";
                };
+               1C904FCE0BA9DCF20081E9D0 /* Configurations */ = {
+                       isa = PBXGroup;
+                       children = (
+                               1C904FD50BA9DD0F0081E9D0 /* Base.xcconfig */,
+                               1C904FD40BA9DD0F0081E9D0 /* DebugRelease.xcconfig */,
+                               1C904FD20BA9DD0F0081E9D0 /* WebKit.xcconfig */,
+                               1C904FD30BA9DD0F0081E9D0 /* Version.xcconfig */,
+                       );
+                       path = Configurations;
+                       sourceTree = "<group>";
+               };
                254DC334016E1D3F0ECA149E /* Misc */ = {
                        isa = PBXGroup;
                        children = (
 /* Begin XCBuildConfiguration section */
                149C282E08902B0F008A9EFC /* Debug */ = {
                        isa = XCBuildConfiguration;
+                       baseConfigurationReference = 1C904FD20BA9DD0F0081E9D0 /* WebKit.xcconfig */;
                        buildSettings = {
-                               DEBUG_DEFINES = "";
-                               DYLIB_COMPATIBILITY_VERSION = 1;
-                               DYLIB_CURRENT_VERSION = 2;
-                               EXPORTED_SYMBOLS_FILE = WebKit.exp;
-                               FEATURE_DEFINES = "ENABLE_SVG ENABLE_XPATH ENABLE_XSLT";
-                               FRAMEWORK_SEARCH_PATHS = (
-                                       "$(SYSTEM_LIBRARY_DIR)/Frameworks/ApplicationServices.framework/Frameworks",
-                                       "$(SYSTEM_LIBRARY_DIR)/Frameworks/Carbon.framework/Frameworks",
-                                       "$(SYSTEM_LIBRARY_DIR)/Frameworks/Quartz.framework/Frameworks",
-                                       "$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks",
-                               );
-                               GCC_PREFIX_HEADER = WebKitPrefix.h;
-                               GCC_PREPROCESSOR_DEFINITIONS = (
-                                       "$(DEBUG_DEFINES)",
-                                       "$(FEATURE_DEFINES)",
-                                       "FRAMEWORK_NAME=WebKit",
-                                       "$(PER_CONFIGURATION_PREPROCESSOR_DEFINES)",
-                                       DISABLE_THREAD_CHECK,
-                               );
-                               HEADER_SEARCH_PATHS = (
-                                       ForwardingHeaders,
-                                       "$(HEADER_SEARCH_PATHS_QUOTED_1)",
-                                       icu,
-                                       "$(HEADER_SEARCH_PATHS_QUOTED_FOR_TARGET_1)",
-                               );
-                               HEADER_SEARCH_PATHS_QUOTED_1 = "\"$(BUILT_PRODUCTS_DIR)/usr/local/include\"";
-                               HEADER_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "\"${BUILT_PRODUCTS_DIR}/DerivedSources/WebKit\"";
-                               INFOPLIST_FILE = Info.plist;
-                               INSTALL_PATH = "$(BUILT_PRODUCTS_DIR)";
-                               JAVASCRIPTCORE_PRIVATE_HEADERS_DIR = "$(UMBRELLA_FRAMEWORKS_DIR)/JavaScriptCore.framework/PrivateHeaders";
-                               LINKER_DISPLAYS_MANGLED_NAMES = YES;
+                               DEBUG_DEFINES = DISABLE_THREAD_CHECK;
                                OTHER_LDFLAGS = (
-                                       "$(STYLE_LDFLAGS)",
                                        "-lobjc",
                                        "-sub_library",
                                        libobjc,
                                );
-                               PRODUCT_NAME = WebKit;
-                               STYLE_LDFLAGS = "";
                                UMBRELLA_FRAMEWORKS_DIR = "$(BUILT_PRODUCTS_DIR)";
-                               VALID_ARCHS = "i386 ppc ppc7400 ppc970 ppc64 x86_64";
-                               WEBCORE_PRIVATE_HEADERS_DIR = "$(UMBRELLA_FRAMEWORKS_DIR)/WebCore.framework/PrivateHeaders";
                        };
                        name = Debug;
                };
                149C282F08902B0F008A9EFC /* Release */ = {
                        isa = XCBuildConfiguration;
+                       baseConfigurationReference = 1C904FD20BA9DD0F0081E9D0 /* WebKit.xcconfig */;
                        buildSettings = {
                                DEBUG_DEFINES = NDEBUG;
-                               DEBUG_INFORMATION_FORMAT = dwarf;
-                               DYLIB_COMPATIBILITY_VERSION = 1;
-                               DYLIB_CURRENT_VERSION = 2;
-                               EXPORTED_SYMBOLS_FILE = WebKit.exp;
-                               FEATURE_DEFINES = "ENABLE_SVG ENABLE_XPATH ENABLE_XSLT";
-                               FRAMEWORK_SEARCH_PATHS = (
-                                       "$(SYSTEM_LIBRARY_DIR)/Frameworks/ApplicationServices.framework/Frameworks",
-                                       "$(SYSTEM_LIBRARY_DIR)/Frameworks/Carbon.framework/Frameworks",
-                                       "$(SYSTEM_LIBRARY_DIR)/Frameworks/Quartz.framework/Frameworks",
-                                       "$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks",
-                               );
-                               GCC_PREFIX_HEADER = WebKitPrefix.h;
-                               GCC_PREPROCESSOR_DEFINITIONS = (
-                                       "$(DEBUG_DEFINES)",
-                                       "$(FEATURE_DEFINES)",
-                                       "FRAMEWORK_NAME=WebKit",
-                                       "$(PER_CONFIGURATION_PREPROCESSOR_DEFINES)",
-                               );
-                               HEADER_SEARCH_PATHS = (
-                                       ForwardingHeaders,
-                                       "$(HEADER_SEARCH_PATHS_QUOTED_1)",
-                                       icu,
-                                       "$(HEADER_SEARCH_PATHS_QUOTED_FOR_TARGET_1)",
-                               );
-                               HEADER_SEARCH_PATHS_QUOTED_1 = "\"$(BUILT_PRODUCTS_DIR)/usr/local/include\"";
-                               HEADER_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "\"${BUILT_PRODUCTS_DIR}/DerivedSources/WebKit\"";
-                               INFOPLIST_FILE = Info.plist;
-                               INSTALL_PATH = "$(BUILT_PRODUCTS_DIR)";
-                               JAVASCRIPTCORE_PRIVATE_HEADERS_DIR = "$(UMBRELLA_FRAMEWORKS_DIR)/JavaScriptCore.framework/PrivateHeaders";
                                OTHER_LDFLAGS = (
-                                       "$(STYLE_LDFLAGS)",
                                        "-lobjc",
                                        "-sub_library",
                                        libobjc,
                                );
-                               PREBINDING = NO;
-                               PRODUCT_NAME = WebKit;
-                               STYLE_LDFLAGS = "";
                                UMBRELLA_FRAMEWORKS_DIR = "$(BUILT_PRODUCTS_DIR)";
-                               VALID_ARCHS = "i386 ppc ppc7400 ppc970 ppc64 x86_64";
-                               WEBCORE_PRIVATE_HEADERS_DIR = "$(UMBRELLA_FRAMEWORKS_DIR)/WebCore.framework/PrivateHeaders";
                        };
                        name = Release;
                };
                149C283108902B0F008A9EFC /* Production */ = {
                        isa = XCBuildConfiguration;
+                       baseConfigurationReference = 1C904FD20BA9DD0F0081E9D0 /* WebKit.xcconfig */;
                        buildSettings = {
                                DEBUG_DEFINES = NDEBUG;
-                               DYLIB_COMPATIBILITY_VERSION = 1;
-                               DYLIB_CURRENT_VERSION = 2;
-                               EXPORTED_SYMBOLS_FILE = WebKit.exp;
-                               FEATURE_DEFINES = "ENABLE_SVG ENABLE_XPATH ENABLE_XSLT";
-                               FRAMEWORK_SEARCH_PATHS = (
-                                       "$(SYSTEM_LIBRARY_DIR)/Frameworks/WebKit.framework/Frameworks",
-                                       "$(SYSTEM_LIBRARY_DIR)/Frameworks/ApplicationServices.framework/Frameworks",
-                                       "$(SYSTEM_LIBRARY_DIR)/Frameworks/Carbon.framework/Frameworks",
-                                       "$(SYSTEM_LIBRARY_DIR)/Frameworks/Quartz.framework/Frameworks",
-                                       "$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks",
-                               );
-                               GCC_PREFIX_HEADER = WebKitPrefix.h;
-                               GCC_PREPROCESSOR_DEFINITIONS = (
-                                       "$(DEBUG_DEFINES)",
-                                       "$(FEATURE_DEFINES)",
-                                       "FRAMEWORK_NAME=WebKit",
-                                       "$(PER_CONFIGURATION_PREPROCESSOR_DEFINES)",
-                               );
-                               HEADER_SEARCH_PATHS = (
-                                       ForwardingHeaders,
-                                       "$(HEADER_SEARCH_PATHS_QUOTED_1)",
-                                       icu,
-                                       "$(HEADER_SEARCH_PATHS_QUOTED_FOR_TARGET_1)",
+                               OTHER_LDFLAGS = (
+                                       "-sub_umbrella",
+                                       WebCore,
                                );
-                               HEADER_SEARCH_PATHS_QUOTED_1 = "\"$(BUILT_PRODUCTS_DIR)/usr/local/include\"";
-                               HEADER_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "\"${BUILT_PRODUCTS_DIR}/DerivedSources/WebKit\"";
-                               INFOPLIST_FILE = Info.plist;
-                               INSTALL_PATH = "$(SYSTEM_LIBRARY_DIR)/Frameworks";
-                               JAVASCRIPTCORE_PRIVATE_HEADERS_DIR = "$(NEXT_ROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks/JavaScriptCore.framework/PrivateHeaders";
-                               OTHER_LDFLAGS = "$(STYLE_LDFLAGS)";
-                               PRODUCT_NAME = WebKit;
                                SECTORDER_FLAGS = (
                                        "-sectorder",
                                        __TEXT,
                                        __text,
                                        /AppleInternal/OrderFiles/WebKit.order,
                                );
-                               STYLE_LDFLAGS = "-sub_umbrella WebCore";
-                               UMBRELLA_FRAMEWORKS_DIR = "$(NEXT_ROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks/WebKit.framework/Versions/A/Frameworks";
-                               VALID_ARCHS = "i386 ppc ppc7400 ppc970 ppc64 x86_64";
-                               WEBCORE_PRIVATE_HEADERS_DIR = "$(UMBRELLA_FRAMEWORKS_DIR)/WebCore.framework/PrivateHeaders";
                        };
                        name = Production;
                };
                149C283308902B0F008A9EFC /* Debug */ = {
                        isa = XCBuildConfiguration;
+                       baseConfigurationReference = 1C904FD40BA9DD0F0081E9D0 /* DebugRelease.xcconfig */;
                        buildSettings = {
-                               DEBUG_INFORMATION_FORMAT = dwarf;
-                               GCC_C_LANGUAGE_STANDARD = gnu99;
-                               GCC_ENABLE_CPP_EXCEPTIONS = NO;
-                               GCC_ENABLE_CPP_RTTI = NO;
-                               GCC_ENABLE_OBJC_EXCEPTIONS = YES;
-                               GCC_ENABLE_OBJC_GC = YES;
-                               GCC_FAST_OBJC_DISPATCH = YES;
                                GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
-                               GCC_MODEL_TUNING = G5;
                                GCC_OPTIMIZATION_LEVEL = 0;
-                               GCC_PRECOMPILE_PREFIX_HEADER = YES;
-                               GCC_THREADSAFE_STATICS = NO;
-                               GCC_TREAT_WARNINGS_AS_ERRORS = YES;
-                               GCC_WARN_ABOUT_MISSING_NEWLINE = YES;
-                               GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
-                               GCC_WARN_NON_VIRTUAL_DESTRUCTOR = YES;
-                               MACOSX_DEPLOYMENT_TARGET = "$(MACOSX_DEPLOYMENT_TARGET_$(MAC_OS_X_VERSION_MAJOR))";
-                               MACOSX_DEPLOYMENT_TARGET_ = 10.4;
-                               MACOSX_DEPLOYMENT_TARGET_1040 = 10.4;
-                               MACOSX_DEPLOYMENT_TARGET_1050 = 10.5;
-                               PER_CONFIGURATION_PREPROCESSOR_DEFINES = "ENABLE_WEBKIT_UNSET_DYLD_FRAMEWORK_PATH REMOVE_SAFARI_DOM_TREE_DEBUG_ITEM";
-                               PREBINDING = NO;
                                STRIP_INSTALLED_PRODUCT = NO;
-                               WARNING_CFLAGS = (
-                                       "-Wall",
-                                       "-W",
-                                       "-Wcast-align",
-                                       "-Wchar-subscripts",
-                                       "-Wformat-security",
-                                       "-Wmissing-format-attribute",
-                                       "-Wpointer-arith",
-                                       "-Wwrite-strings",
-                                       "-Wno-format-y2k",
-                                       "-Wno-unused-parameter",
-                                       "-Wundef",
-                               );
                        };
                        name = Debug;
                };
                149C283408902B0F008A9EFC /* Release */ = {
                        isa = XCBuildConfiguration;
+                       baseConfigurationReference = 1C904FD40BA9DD0F0081E9D0 /* DebugRelease.xcconfig */;
                        buildSettings = {
-                               DEAD_CODE_STRIPPING = YES;
-                               DEBUG_INFORMATION_FORMAT = dwarf;
-                               GCC_C_LANGUAGE_STANDARD = gnu99;
-                               GCC_DEBUGGING_SYMBOLS = full;
-                               GCC_ENABLE_CPP_EXCEPTIONS = NO;
-                               GCC_ENABLE_CPP_RTTI = NO;
-                               GCC_ENABLE_OBJC_EXCEPTIONS = YES;
-                               GCC_ENABLE_OBJC_GC = YES;
-                               GCC_ENABLE_SYMBOL_SEPARATION = NO;
-                               GCC_FAST_OBJC_DISPATCH = YES;
                                GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
-                               GCC_MODEL_TUNING = G5;
-                               GCC_OPTIMIZATION_LEVEL = 2;
-                               GCC_PRECOMPILE_PREFIX_HEADER = YES;
-                               GCC_THREADSAFE_STATICS = NO;
-                               GCC_TREAT_WARNINGS_AS_ERRORS = YES;
-                               GCC_WARN_ABOUT_MISSING_NEWLINE = YES;
-                               GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
-                               GCC_WARN_NON_VIRTUAL_DESTRUCTOR = YES;
-                               MACOSX_DEPLOYMENT_TARGET = "$(MACOSX_DEPLOYMENT_TARGET_$(MAC_OS_X_VERSION_MAJOR))";
-                               MACOSX_DEPLOYMENT_TARGET_ = 10.4;
-                               MACOSX_DEPLOYMENT_TARGET_1040 = 10.4;
-                               MACOSX_DEPLOYMENT_TARGET_1050 = 10.5;
-                               PER_CONFIGURATION_PREPROCESSOR_DEFINES = "ENABLE_WEBKIT_UNSET_DYLD_FRAMEWORK_PATH REMOVE_SAFARI_DOM_TREE_DEBUG_ITEM";
-                               PREBINDING = NO;
                                STRIP_INSTALLED_PRODUCT = NO;
-                               WARNING_CFLAGS = (
-                                       "-Wall",
-                                       "-W",
-                                       "-Wcast-align",
-                                       "-Wchar-subscripts",
-                                       "-Wformat-security",
-                                       "-Wmissing-format-attribute",
-                                       "-Wpointer-arith",
-                                       "-Wwrite-strings",
-                                       "-Wno-format-y2k",
-                                       "-Wno-unused-parameter",
-                                       "-Wundef",
-                               );
                        };
                        name = Release;
                };
                149C283608902B0F008A9EFC /* Production */ = {
                        isa = XCBuildConfiguration;
+                       baseConfigurationReference = 1C904FD50BA9DD0F0081E9D0 /* Base.xcconfig */;
                        buildSettings = {
-                               DEAD_CODE_STRIPPING = YES;
-                               DEBUG_INFORMATION_FORMAT = dwarf;
-                               GCC_C_LANGUAGE_STANDARD = gnu99;
-                               GCC_DEBUGGING_SYMBOLS = full;
-                               GCC_ENABLE_CPP_EXCEPTIONS = NO;
-                               GCC_ENABLE_CPP_RTTI = NO;
-                               GCC_ENABLE_OBJC_EXCEPTIONS = YES;
-                               GCC_ENABLE_OBJC_GC = YES;
-                               GCC_FAST_OBJC_DISPATCH = YES;
-                               GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
-                               GCC_MODEL_TUNING = G5;
-                               GCC_OPTIMIZATION_LEVEL = 2;
-                               GCC_PRECOMPILE_PREFIX_HEADER = YES;
-                               GCC_THREADSAFE_STATICS = NO;
-                               GCC_TREAT_WARNINGS_AS_ERRORS = YES;
-                               GCC_WARN_ABOUT_MISSING_NEWLINE = YES;
-                               GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
-                               GCC_WARN_NON_VIRTUAL_DESTRUCTOR = YES;
-                               WARNING_CFLAGS = (
-                                       "-Wall",
-                                       "-W",
-                                       "-Wcast-align",
-                                       "-Wchar-subscripts",
-                                       "-Wformat-security",
-                                       "-Wmissing-format-attribute",
-                                       "-Wpointer-arith",
-                                       "-Wwrite-strings",
-                                       "-Wno-format-y2k",
-                                       "-Wno-unused-parameter",
-                                       "-Wundef",
-                               );
                        };
                        name = Production;
                };