Clean up the Xcode project configuration.
authormrowe@apple.com <mrowe@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sat, 10 Apr 2010 00:52:53 +0000 (00:52 +0000)
committermrowe@apple.com <mrowe@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sat, 10 Apr 2010 00:52:53 +0000 (00:52 +0000)
Reviewed by Sam Weinig.

Common target settings are pulled out in to BaseTarget.xcconfig.  The majority of setting overrides are
removed from the Xcode project itself.  Info.plist files are updated to match those used in other frameworks.

* Configurations/BaseTarget.xcconfig: Copied from WebKit2/Configurations/WebKit2.xcconfig.
* Configurations/WebKit2.xcconfig:
* Configurations/WebProcess.xcconfig: Copied from WebKit2/Configurations/WebKit2.xcconfig.
* Info.plist:
* WebKit2.xcodeproj/project.pbxproj:
* WebProcess-Info.plist: Removed.
* WebProcess/Info.plist: Moved from WebProcess-Info.plist.

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

WebKit2/ChangeLog
WebKit2/Configurations/Base.xcconfig
WebKit2/Configurations/BaseTarget.xcconfig [new file with mode: 0644]
WebKit2/Configurations/WebKit2.xcconfig
WebKit2/Configurations/WebProcess.xcconfig [new file with mode: 0644]
WebKit2/Info.plist
WebKit2/WebKit2.xcodeproj/project.pbxproj
WebKit2/WebProcess/Info.plist [moved from WebKit2/WebProcess-Info.plist with 69% similarity]

index 6a5967eee5cd20d9445e5d368f18a118215879c6..053f690d9f0d26dacc665ffca720418d204864df 100644 (file)
@@ -1,3 +1,20 @@
+2010-04-09  Mark Rowe  <mrowe@apple.com>
+
+        Reviewed by Sam Weinig.
+
+        Clean up the Xcode project configuration.
+
+        Common target settings are pulled out in to BaseTarget.xcconfig.  The majority of setting overrides are
+        removed from the Xcode project itself.  Info.plist files are updated to match those used in other frameworks.
+
+        * Configurations/BaseTarget.xcconfig: Copied from WebKit2/Configurations/WebKit2.xcconfig.
+        * Configurations/WebKit2.xcconfig:
+        * Configurations/WebProcess.xcconfig: Copied from WebKit2/Configurations/WebKit2.xcconfig.
+        * Info.plist:
+        * WebKit2.xcodeproj/project.pbxproj:
+        * WebProcess-Info.plist: Removed.
+        * WebProcess/Info.plist: Moved from WebProcess-Info.plist.
+
 2010-04-09  Mark Rowe  <mrowe@apple.com>
 
         Build fix.
index 5668f5cafd14b3fa85f7b43b5707e4746e3c943b..165d4d70af4d035fa900e6d05249e37e1c343f16 100644 (file)
@@ -40,7 +40,9 @@ GCC_TREAT_WARNINGS_AS_ERRORS = YES;
 GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = NO;
 GCC_WARN_ABOUT_MISSING_NEWLINE = YES;
 GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
+GCC_WARN_ABOUT_RETURN_TYPE = YES;
 GCC_WARN_NON_VIRTUAL_DESTRUCTOR = YES;
+GCC_WARN_UNUSED_VARIABLE = YES;
 LINKER_DISPLAYS_MANGLED_NAMES = YES;
 OTHER_MIGFLAGS = -F$(BUILT_PRODUCTS_DIR);
 PREBINDING = NO;
diff --git a/WebKit2/Configurations/BaseTarget.xcconfig b/WebKit2/Configurations/BaseTarget.xcconfig
new file mode 100644 (file)
index 0000000..ff4271f
--- /dev/null
@@ -0,0 +1,40 @@
+// Copyright (C) 2010 Apple Inc. All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// 1. Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// 2. Redistributions in binary form must reproduce the above copyright
+//    notice, this list of conditions and the following disclaimer in the
+//    documentation and/or other materials provided with the distribution.
+//
+// THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
+// EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+// PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE INC. OR
+// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+// EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+// OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+#include "FeatureDefines.xcconfig"
+#include "Version.xcconfig"
+
+FRAMEWORK_SEARCH_PATHS = $(UMBRELLA_FRAMEWORKS_DIR) $(SYSTEM_LIBRARY_DIR)/Frameworks/ApplicationServices.framework/Frameworks $(SYSTEM_LIBRARY_DIR)/Frameworks/Carbon.framework/Frameworks $(SYSTEM_LIBRARY_DIR)/Frameworks/Quartz.framework/Frameworks $(SYSTEM_LIBRARY_DIR)/Frameworks/CoreServices.framework/Frameworks $(FRAMEWORK_SEARCH_PATHS);
+GCC_PREFIX_HEADER = WebKit2_Prefix.pch;
+GCC_PREPROCESSOR_DEFINITIONS = $(DEBUG_DEFINES) $(FEATURE_DEFINES) FRAMEWORK_NAME=WebKit2
+HEADER_SEARCH_PATHS = $(WEBCORE_PRIVATE_HEADERS_DIR)/ForwardingHeaders $(WEBCORE_PRIVATE_HEADERS_DIR)/icu $(BUILT_PRODUCTS_DIR)/usr/local/include $(BUILT_PRODUCTS_DIR)/DerivedSources/WebKit2 $(HEADER_SEARCH_PATHS);
+INSTALLHDRS_COPY_PHASE = YES;
+INSTALLHDRS_SCRIPT_PHASE = YES;
+
+UMBRELLA_FRAMEWORKS_DIR = $(UMBRELLA_FRAMEWORKS_DIR_$(REAL_PLATFORM_NAME)_$(CONFIGURATION));
+UMBRELLA_FRAMEWORKS_DIR_macosx_Release = $(UMBRELLA_FRAMEWORKS_DIR_engineering);
+UMBRELLA_FRAMEWORKS_DIR_macosx_Debug = $(UMBRELLA_FRAMEWORKS_DIR_engineering);
+UMBRELLA_FRAMEWORKS_DIR_macosx_Production = $(NEXT_ROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks/WebKit2.framework/Versions/A/Frameworks;
+UMBRELLA_FRAMEWORKS_DIR_engineering = $(BUILT_PRODUCTS_DIR);
+
+WEBCORE_PRIVATE_HEADERS_DIR = $(UMBRELLA_FRAMEWORKS_DIR)/WebCore.framework/PrivateHeaders;
index 59a7f89cbbb4987b4a37334efb75d3b27211dbde..9ad2cdfe327fb39483f8bc89d6282ef1b882acfe 100644 (file)
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
 
-#include "FeatureDefines.xcconfig"
-#include "Version.xcconfig"
+#include "BaseTarget.xcconfig"
 
-//EXPORTED_SYMBOLS_FILE = $(EXPORTED_SYMBOLS_FILE_$(CURRENT_ARCH));
-//EXPORTED_SYMBOLS_FILE_ = mac/WebKit.exp;
-//EXPORTED_SYMBOLS_FILE_i386 = mac/WebKit.exp;
-//EXPORTED_SYMBOLS_FILE_ppc = mac/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;
-FRAMEWORK_SEARCH_PATHS = $(UMBRELLA_FRAMEWORKS_DIR) $(SYSTEM_LIBRARY_DIR)/Frameworks/ApplicationServices.framework/Frameworks $(SYSTEM_LIBRARY_DIR)/Frameworks/Carbon.framework/Frameworks $(SYSTEM_LIBRARY_DIR)/Frameworks/Quartz.framework/Frameworks $(SYSTEM_LIBRARY_DIR)/Frameworks/CoreServices.framework/Frameworks $(SYSTEM_LIBRARY_DIR)/PrivateFrameworks $(FRAMEWORK_SEARCH_PATHS);
-GCC_PREFIX_HEADER = WebKit2_Prefix.pch;
-GCC_PREPROCESSOR_DEFINITIONS = $(DEBUG_DEFINES) $(FEATURE_DEFINES) FRAMEWORK_NAME=WebKit2
-HEADER_SEARCH_PATHS = $(WEBCORE_PRIVATE_HEADERS_DIR)/ForwardingHeaders $(WEBCORE_PRIVATE_HEADERS_DIR)/icu "${BUILT_PRODUCTS_DIR}/usr/local/include" "${BUILT_PRODUCTS_DIR}/DerivedSources/WebKit2" $(HEADER_SEARCH_PATHS);
-INFOPLIST_FILE = mac/Info.plist;
-INSTALL_PATH = $(SYSTEM_LIBRARY_DIR)/Frameworks;
-INSTALLHDRS_COPY_PHASE = YES;
-INSTALLHDRS_SCRIPT_PHASE = YES;
 PRODUCT_NAME = WebKit2;
-UMBRELLA_FRAMEWORKS_DIR = $(NEXT_ROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks/WebKit2.framework/Versions/A/Frameworks;
+INFOPLIST_FILE = Info.plist;
+INSTALL_PATH = $(SYSTEM_LIBRARY_DIR)/Frameworks;
 OTHER_LDFLAGS = -sub_umbrella WebCore $(OTHER_LDFLAGS);
 
-WEBCORE_PRIVATE_HEADERS_DIR = $(WEBCORE_PRIVATE_HEADERS_DIR_$(REAL_PLATFORM_NAME)_$(CONFIGURATION));
-WEBCORE_PRIVATE_HEADERS_DIR_macosx_Release = $(WEBCORE_PRIVATE_HEADERS_engineering);
-WEBCORE_PRIVATE_HEADERS_DIR_macosx_Debug = $(WEBCORE_PRIVATE_HEADERS_engineering);
-WEBCORE_PRIVATE_HEADERS_DIR_macosx_Production = $(UMBRELLA_FRAMEWORKS_DIR)/WebCore.framework/PrivateHeaders;
-WEBCORE_PRIVATE_HEADERS_engineering = $(BUILT_PRODUCTS_DIR)/WebCore.framework/PrivateHeaders;
+// FIXME: We need to add an exports file to limit the set of exported symbols.
+// EXPORTED_SYMBOLS_FILE = $(EXPORTED_SYMBOLS_FILE_$(CURRENT_ARCH));
+// EXPORTED_SYMBOLS_FILE_ = mac/WebKit.exp;
+// EXPORTED_SYMBOLS_FILE_i386 = mac/WebKit.exp;
+// EXPORTED_SYMBOLS_FILE_ppc = mac/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;
diff --git a/WebKit2/Configurations/WebProcess.xcconfig b/WebKit2/Configurations/WebProcess.xcconfig
new file mode 100644 (file)
index 0000000..a0a3cd5
--- /dev/null
@@ -0,0 +1,28 @@
+// Copyright (C) 2010 Apple Inc. All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// 1. Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// 2. Redistributions in binary form must reproduce the above copyright
+//    notice, this list of conditions and the following disclaimer in the
+//    documentation and/or other materials provided with the distribution.
+//
+// THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
+// EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+// PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE INC. OR
+// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+// EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+// OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
+
+#include "BaseTarget.xcconfig"
+
+PRODUCT_NAME = WebProcess;
+INFOPLIST_FILE = WebProcess/Info.plist;
+INSTALL_PATH = $(SYSTEM_LIBRARY_DIR)/Frameworks/WebKit2.framework/Resources;
index 0ceab756da9ce7f91147a0f7d17d2a89f77861b0..723229337d59a69e88f8d2278d1bd912f6d06ea7 100644 (file)
@@ -5,24 +5,20 @@
        <key>CFBundleDevelopmentRegion</key>
        <string>English</string>
        <key>CFBundleExecutable</key>
-       <string>${EXECUTABLE_NAME}</string>
-       <key>CFBundleName</key>
        <string>${PRODUCT_NAME}</string>
-       <key>CFBundleIconFile</key>
-       <string></string>
+       <key>CFBundleGetInfoString</key>
+       <string>${BUNDLE_VERSION}, Copyright 2003-2010 Apple Inc.</string>
        <key>CFBundleIdentifier</key>
-       <string>com.apple.${PRODUCT_NAME:rfc1034Identifier}</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>CFBundleSignature</key>
-       <string>????</string>
-       <key>CFBundleVersion</key>
-       <string>1</string>
        <key>CFBundleShortVersionString</key>
-       <string>1.0</string>
-       <key>NSPrincipalClass</key>
-       <string></string>
+       <string>${SHORT_VERSION_STRING}</string>
+       <key>CFBundleVersion</key>
+       <string>${BUNDLE_VERSION}</string>
 </dict>
 </plist>
index a04fa16de280c21239766e00abb4519da95934cd..2851604bd7951621dc4f9c902195330eb4293cf9 100644 (file)
                1A30EAC6115D7DA30053E937 /* ConnectionMac.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A30EAC5115D7DA30053E937 /* ConnectionMac.cpp */; };
                1A39A54B1149D0700083E625 /* WebProcessMain.mm in Sources */ = {isa = PBXBuildFile; fileRef = BC111B02112F5D1900337BAB /* WebProcessMain.mm */; };
                1A433F0D113C53DD00FACDE9 /* WebErrors.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A433F0C113C53DD00FACDE9 /* WebErrors.h */; };
-               1A4F976F100E7B6600637A18 /* Base.xcconfig in Resources */ = {isa = PBXBuildFile; fileRef = 1A4F976A100E7B6600637A18 /* Base.xcconfig */; };
-               1A4F9770100E7B6600637A18 /* DebugRelease.xcconfig in Resources */ = {isa = PBXBuildFile; fileRef = 1A4F976B100E7B6600637A18 /* DebugRelease.xcconfig */; };
-               1A4F9771100E7B6600637A18 /* FeatureDefines.xcconfig in Resources */ = {isa = PBXBuildFile; fileRef = 1A4F976C100E7B6600637A18 /* FeatureDefines.xcconfig */; };
-               1A4F9773100E7B6600637A18 /* Version.xcconfig in Resources */ = {isa = PBXBuildFile; fileRef = 1A4F976E100E7B6600637A18 /* Version.xcconfig */; };
                1A50DB66110A3D57000D3FE5 /* WebProcess.app in CopyFiles */ = {isa = PBXBuildFile; fileRef = 1A50DB1E110A3BDC000D3FE5 /* WebProcess.app */; };
                1A594ABA112A1FB6009DE7C7 /* WebUIClient.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A594AB8112A1FB6009DE7C7 /* WebUIClient.cpp */; };
                1A594ABB112A1FB6009DE7C7 /* WebUIClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A594AB9112A1FB6009DE7C7 /* WebUIClient.h */; };
@@ -40,6 +36,7 @@
                1AA1CD07100FA1BA0078DEBC /* Carbon.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1AA1CD06100FA1BA0078DEBC /* Carbon.framework */; };
                1AADE6FF10D855FC00D3D63D /* ApplicationServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1AADE6FE10D855FC00D3D63D /* ApplicationServices.framework */; };
                1AF3060A111B599E00F96436 /* WebKit2.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8DC2EF5B0486A6940098B216 /* WebKit2.framework */; };
+               5DAD729C116FF86200EE5396 /* AppKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0867D6A5FE840307C02AAC07 /* AppKit.framework */; };
                8DC2EF530486A6940098B216 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 089C1666FE841158C02AAC07 /* InfoPlist.strings */; };
                8DC2EF570486A6940098B216 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1058C7B1FEA5585E11CA2CBB /* Cocoa.framework */; };
                BC0092F7115837A300E0AE2A /* RunLoopMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = BC0092F5115837A300E0AE2A /* RunLoopMac.mm */; };
                1AA1CD06100FA1BA0078DEBC /* Carbon.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Carbon.framework; path = /System/Library/Frameworks/Carbon.framework; sourceTree = "<absolute>"; };
                1AADE6FE10D855FC00D3D63D /* ApplicationServices.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ApplicationServices.framework; path = System/Library/Frameworks/ApplicationServices.framework; sourceTree = SDKROOT; };
                32DBCF5E0370ADEE00C91783 /* WebKit2_Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebKit2_Prefix.pch; sourceTree = "<group>"; };
+               5DAD7294116FF70B00EE5396 /* WebProcess.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = WebProcess.xcconfig; sourceTree = "<group>"; };
+               5DAD73F1116FF90C00EE5396 /* BaseTarget.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = BaseTarget.xcconfig; sourceTree = "<group>"; };
                8DC2EF5A0486A6940098B216 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
                8DC2EF5B0486A6940098B216 /* WebKit2.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = WebKit2.framework; sourceTree = BUILT_PRODUCTS_DIR; };
                BC0092F5115837A300E0AE2A /* RunLoopMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = RunLoopMac.mm; sourceTree = "<group>"; };
                        files = (
                                1A10475A110A5AD500A43ECD /* JavaScriptCore.framework in Frameworks */,
                                1AF3060A111B599E00F96436 /* WebKit2.framework in Frameworks */,
+                               5DAD729C116FF86200EE5396 /* AppKit.framework in Frameworks */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
                1058C7B0FEA5585E11CA2CBB /* Linked Frameworks */ = {
                        isa = PBXGroup;
                        children = (
+                               0867D6A5FE840307C02AAC07 /* AppKit.framework */,
                                1AADE6FE10D855FC00D3D63D /* ApplicationServices.framework */,
                                1AA1CD06100FA1BA0078DEBC /* Carbon.framework */,
                                1058C7B1FEA5585E11CA2CBB /* Cocoa.framework */,
                1058C7B2FEA5585E11CA2CBB /* Other Frameworks */ = {
                        isa = PBXGroup;
                        children = (
-                               0867D6A5FE840307C02AAC07 /* AppKit.framework */,
                        );
                        name = "Other Frameworks";
                        sourceTree = "<group>";
                        isa = PBXGroup;
                        children = (
                                1A4F976A100E7B6600637A18 /* Base.xcconfig */,
+                               5DAD73F1116FF90C00EE5396 /* BaseTarget.xcconfig */,
                                1A4F976B100E7B6600637A18 /* DebugRelease.xcconfig */,
                                1A4F976C100E7B6600637A18 /* FeatureDefines.xcconfig */,
                                1A4F976E100E7B6600637A18 /* Version.xcconfig */,
+                               5DAD7294116FF70B00EE5396 /* WebProcess.xcconfig */,
                                BCB86F4B116AAACD00CE20B7 /* WebKit2.xcconfig */,
                        );
                        path = Configurations;
                        buildActionMask = 2147483647;
                        files = (
                                8DC2EF530486A6940098B216 /* InfoPlist.strings in Resources */,
-                               1A4F976F100E7B6600637A18 /* Base.xcconfig in Resources */,
-                               1A4F9770100E7B6600637A18 /* DebugRelease.xcconfig in Resources */,
-                               1A4F9771100E7B6600637A18 /* FeatureDefines.xcconfig in Resources */,
-                               1A4F9773100E7B6600637A18 /* Version.xcconfig in Resources */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
 /* Begin XCBuildConfiguration section */
                1A50DB21110A3BDD000D3FE5 /* Debug */ = {
                        isa = XCBuildConfiguration;
-                       baseConfigurationReference = BCB86F4B116AAACD00CE20B7 /* WebKit2.xcconfig */;
+                       baseConfigurationReference = 5DAD7294116FF70B00EE5396 /* WebProcess.xcconfig */;
                        buildSettings = {
-                               ALWAYS_SEARCH_USER_PATHS = NO;
-                               COPY_PHASE_STRIP = NO;
-                               GCC_DYNAMIC_NO_PIC = NO;
-                               GCC_ENABLE_FIX_AND_CONTINUE = YES;
-                               GCC_MODEL_TUNING = G5;
-                               GCC_OPTIMIZATION_LEVEL = 0;
-                               GCC_PRECOMPILE_PREFIX_HEADER = YES;
-                               GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/AppKit.framework/Headers/AppKit.h";
-                               INFOPLIST_FILE = "WebProcess-Info.plist";
-                               INSTALL_PATH = "$(HOME)/Applications";
-                               OTHER_LDFLAGS = (
-                                       "-framework",
-                                       Foundation,
-                                       "-framework",
-                                       AppKit,
-                               );
-                               PREBINDING = NO;
-                               PRODUCT_NAME = WebProcess;
-                               USER_HEADER_SEARCH_PATHS = "$(WEBCORE_PRIVATE_HEADERS_DIR)/ForwardingHeaders $(WEBCORE_PRIVATE_HEADERS_DIR)/icu \"${BUILT_PRODUCTS_DIR}/usr/local/include\" \"${BUILT_PRODUCTS_DIR}/DerivedSources/WebKit2\" $(HEADER_SEARCH_PATHS)";
                        };
                        name = Debug;
                };
                1A50DB22110A3BDD000D3FE5 /* Release */ = {
                        isa = XCBuildConfiguration;
-                       baseConfigurationReference = BCB86F4B116AAACD00CE20B7 /* WebKit2.xcconfig */;
+                       baseConfigurationReference = 5DAD7294116FF70B00EE5396 /* WebProcess.xcconfig */;
                        buildSettings = {
-                               ALWAYS_SEARCH_USER_PATHS = NO;
-                               COPY_PHASE_STRIP = YES;
-                               DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
-                               GCC_ENABLE_FIX_AND_CONTINUE = NO;
-                               GCC_MODEL_TUNING = G5;
-                               GCC_PRECOMPILE_PREFIX_HEADER = YES;
-                               GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/AppKit.framework/Headers/AppKit.h";
-                               INFOPLIST_FILE = "WebProcess-Info.plist";
-                               INSTALL_PATH = "$(HOME)/Applications";
-                               OTHER_LDFLAGS = (
-                                       "-framework",
-                                       Foundation,
-                                       "-framework",
-                                       AppKit,
-                               );
-                               PREBINDING = NO;
-                               PRODUCT_NAME = WebProcess;
-                               ZERO_LINK = NO;
                        };
                        name = Release;
                };
                1A50DB39110A3C13000D3FE5 /* Debug */ = {
                        isa = XCBuildConfiguration;
                        buildSettings = {
-                               COPY_PHASE_STRIP = NO;
-                               GCC_DYNAMIC_NO_PIC = NO;
-                               GCC_OPTIMIZATION_LEVEL = 0;
-                               PRODUCT_NAME = WebKit2;
+                               PRODUCT_NAME = All;
                        };
                        name = Debug;
                };
                1A50DB3A110A3C13000D3FE5 /* Release */ = {
                        isa = XCBuildConfiguration;
                        buildSettings = {
-                               COPY_PHASE_STRIP = YES;
-                               DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
-                               GCC_ENABLE_FIX_AND_CONTINUE = NO;
-                               PRODUCT_NAME = WebKit2;
-                               ZERO_LINK = NO;
+                               PRODUCT_NAME = All;
                        };
                        name = Release;
                };
                        isa = XCBuildConfiguration;
                        baseConfigurationReference = BCB86F4B116AAACD00CE20B7 /* WebKit2.xcconfig */;
                        buildSettings = {
-                               ALWAYS_SEARCH_USER_PATHS = NO;
-                               COPY_PHASE_STRIP = NO;
-                               DYLIB_COMPATIBILITY_VERSION = 1;
-                               DYLIB_CURRENT_VERSION = 1;
-                               FRAMEWORK_VERSION = A;
-                               GCC_DYNAMIC_NO_PIC = NO;
-                               GCC_ENABLE_FIX_AND_CONTINUE = YES;
-                               GCC_MODEL_TUNING = G5;
-                               GCC_OPTIMIZATION_LEVEL = 0;
-                               GCC_PRECOMPILE_PREFIX_HEADER = YES;
-                               GCC_PREFIX_HEADER = WebKit2_Prefix.pch;
-                               INFOPLIST_FILE = Info.plist;
-                               INSTALL_PATH = "$(BUILT_PRODUCTS_DIR)";
                                OTHER_LDFLAGS = (
                                        "$(OTHER_LDFLAGS)",
                                        "-l$(WEBKIT_SYSTEM_INTERFACE_LIBRARY)",
                                );
-                               PRODUCT_NAME = WebKit2;
-                               WRAPPER_EXTENSION = framework;
                        };
                        name = Debug;
                };
                        isa = XCBuildConfiguration;
                        baseConfigurationReference = BCB86F4B116AAACD00CE20B7 /* WebKit2.xcconfig */;
                        buildSettings = {
-                               ALWAYS_SEARCH_USER_PATHS = NO;
-                               DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
-                               DYLIB_COMPATIBILITY_VERSION = 1;
-                               DYLIB_CURRENT_VERSION = 1;
-                               FRAMEWORK_VERSION = A;
-                               GCC_MODEL_TUNING = G5;
-                               GCC_PRECOMPILE_PREFIX_HEADER = YES;
-                               GCC_PREFIX_HEADER = WebKit2_Prefix.pch;
-                               INFOPLIST_FILE = Info.plist;
-                               INSTALL_PATH = "$(BUILT_PRODUCTS_DIR)";
                                OTHER_LDFLAGS = (
                                        "$(OTHER_LDFLAGS)",
                                        "-l$(WEBKIT_SYSTEM_INTERFACE_LIBRARY)",
                                );
-                               PRODUCT_NAME = WebKit2;
-                               WRAPPER_EXTENSION = framework;
                        };
                        name = Release;
                };
                        isa = XCBuildConfiguration;
                        baseConfigurationReference = 1A4F976B100E7B6600637A18 /* DebugRelease.xcconfig */;
                        buildSettings = {
-                               ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
-                               DEBUG_DEFINES = "$(DEBUG_DEFINES_debug)";
-                               GCC_C_LANGUAGE_STANDARD = gnu99;
-                               GCC_OPTIMIZATION_LEVEL = 0;
-                               GCC_WARN_ABOUT_RETURN_TYPE = YES;
-                               GCC_WARN_UNUSED_VARIABLE = YES;
-                               ONLY_ACTIVE_ARCH = YES;
-                               PREBINDING = NO;
                        };
                        name = Debug;
                };
                        isa = XCBuildConfiguration;
                        baseConfigurationReference = 1A4F976B100E7B6600637A18 /* DebugRelease.xcconfig */;
                        buildSettings = {
-                               ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
-                               GCC_C_LANGUAGE_STANDARD = gnu99;
-                               GCC_WARN_ABOUT_RETURN_TYPE = YES;
-                               GCC_WARN_UNUSED_VARIABLE = YES;
-                               PREBINDING = NO;
                        };
                        name = Release;
                };
similarity index 69%
rename from WebKit2/WebProcess-Info.plist
rename to WebKit2/WebProcess/Info.plist
index 3ba93b5fd3ccedc7af80472e0a3bcfb06eeb9a1f..90f4fa24c0e81ff71cb0ebb6993588e8fc17b861 100644 (file)
@@ -5,19 +5,21 @@
        <key>CFBundleDevelopmentRegion</key>
        <string>English</string>
        <key>CFBundleExecutable</key>
-       <string>${EXECUTABLE_NAME}</string>
+       <string>${PRODUCT_NAME}</string>
+       <key>CFBundleGetInfoString</key>
+       <string>${BUNDLE_VERSION}, Copyright 2003-2010 Apple Inc.</string>
        <key>CFBundleIdentifier</key>
-       <string>com.yourcompany.${PRODUCT_NAME:rfc1034identifier}</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>APPL</string>
        <key>CFBundleShortVersionString</key>
-       <string>1.0</string>
-       <key>CFBundleSignature</key>
-       <string>????</string>
+       <string>${SHORT_VERSION_STRING}</string>
        <key>CFBundleVersion</key>
-       <string>1</string>
+       <string>${BUNDLE_VERSION}</string>
        <key>LSMinimumSystemVersion</key>
        <string>${MACOSX_DEPLOYMENT_TARGET}</string>
        <key>NSMainNibFile</key>