Upstream iOS build file changes for WTF
authorddkilzer@apple.com <ddkilzer@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 30 Jan 2013 22:24:53 +0000 (22:24 +0000)
committerddkilzer@apple.com <ddkilzer@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 30 Jan 2013 22:24:53 +0000 (22:24 +0000)
<http://webkit.org/b/108221>

Reviewed by Mark Rowe.

* Configurations/Base.xcconfig:
- Import iOS.xcconfig.
- Remove VALID_ARCHS.  Modern Xcodes define these correctly.
- Make HEADER_SEARCH_PATHS work with iOS Simulator builds.
- Add SUPPORTED_PLATFORMS so both Mac and iOS SDKs appear in
  schemes.
- Define INSTALL_PATH when building for macosx SDK.
* Configurations/CopyWTFHeaders.xcconfig:
- Make PRIVATE_HEADERS_FOLDER_PATH work with iOS Simulator
  builds.
* Configurations/DebugRelease.xcconfig:
- Simplify ARCHS.  This works correctly on 32-bit-only SDKs.
* Configurations/WTF.xcconfig:
- Fix installation directory for iOS Simulator builds by
  defining INSTALL_PATH_ACTUAL.
* Configurations/iOS.xcconfig: Add.
* WTF.xcodeproj/project.pbxproj:
- Add iOS.xcconfig to the project.

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

Source/WTF/ChangeLog
Source/WTF/Configurations/Base.xcconfig
Source/WTF/Configurations/CopyWTFHeaders.xcconfig
Source/WTF/Configurations/DebugRelease.xcconfig
Source/WTF/Configurations/WTF.xcconfig
Source/WTF/Configurations/iOS.xcconfig [new file with mode: 0644]
Source/WTF/WTF.xcodeproj/project.pbxproj

index 0201c68..08c2342 100644 (file)
@@ -1,3 +1,29 @@
+2013-01-30  David Kilzer  <ddkilzer@apple.com>
+
+        Upstream iOS build file changes for WTF
+        <http://webkit.org/b/108221>
+
+        Reviewed by Mark Rowe.
+
+        * Configurations/Base.xcconfig:
+        - Import iOS.xcconfig.
+        - Remove VALID_ARCHS.  Modern Xcodes define these correctly.
+        - Make HEADER_SEARCH_PATHS work with iOS Simulator builds.
+        - Add SUPPORTED_PLATFORMS so both Mac and iOS SDKs appear in
+          schemes.
+        - Define INSTALL_PATH when building for macosx SDK.
+        * Configurations/CopyWTFHeaders.xcconfig:
+        - Make PRIVATE_HEADERS_FOLDER_PATH work with iOS Simulator
+          builds.
+        * Configurations/DebugRelease.xcconfig:
+        - Simplify ARCHS.  This works correctly on 32-bit-only SDKs.
+        * Configurations/WTF.xcconfig:
+        - Fix installation directory for iOS Simulator builds by
+          defining INSTALL_PATH_ACTUAL.
+        * Configurations/iOS.xcconfig: Add.
+        * WTF.xcodeproj/project.pbxproj:
+        - Add iOS.xcconfig to the project.
+
 2013-01-29  Mark Hahnenberg  <mhahnenberg@apple.com>
 
         Structure::m_outOfLineCapacity is unnecessary
index 5f00c83..a1ccc1d 100644 (file)
@@ -21,6 +21,8 @@
 // (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 "iOS.xcconfig"
+
 CLANG_CXX_LANGUAGE_STANDARD = gnu++0x;
 CLANG_CXX_LIBRARY = libc++;
 CLANG_WARN_CXX0X_EXTENSIONS = NO;
@@ -55,10 +57,6 @@ GCC_WARN_NON_VIRTUAL_DESTRUCTOR = YES;
 GCC_WARN_SIGN_COMPARE = YES;
 LINKER_DISPLAYS_MANGLED_NAMES = YES;
 PREBINDING = NO;
-VALID_ARCHS = $(VALID_ARCHS_$(PLATFORM_NAME));
-VALID_ARCHS_iphoneos = $(ARCHS_STANDARD_32_BIT);
-VALID_ARCHS_iphonesimulator = $(ARCHS_STANDARD_32_BIT);
-VALID_ARCHS_macosx = i386 ppc x86_64 ppc64 $(ARCHS_UNIVERSAL_IPHONE_OS);
 WARNING_CFLAGS_BASE = -Wall -Wextra -Wcast-qual -Wchar-subscripts -Wextra-tokens -Wformat=2 -Winit-self -Wmissing-format-attribute -Wmissing-noreturn -Wpacked -Wpointer-arith -Wredundant-decls -Wundef -Wwrite-strings -Wexit-time-destructors -Wglobal-constructors -Wtautological-compare;
 WARNING_CFLAGS = $(WARNING_CFLAGS_$(PLATFORM_NAME));
 WARNING_CFLAGS_iphoneos = $(WARNING_CFLAGS_BASE) -Wshorten-64-to-32;
@@ -69,11 +67,11 @@ WARNING_CFLAGS_macosx_i386 = $(WARNING_CFLAGS_BASE) -Wshorten-64-to-32;
 WARNING_CFLAGS_macosx_ppc = $(WARNING_CFLAGS_BASE) -Wshorten-64-to-32;
 // FIXME: JavaScriptCore 64-bit builds should build with -Wshorten-64-to-32
 WARNING_CFLAGS_macosx_x86_64 = $(WARNING_CFLAGS_BASE);
-HEADER_SEARCH_PATHS = $(BUILT_PRODUCTS_DIR)/usr/local/include $(DSTROOT)/usr/local/include icu $(HEADER_SEARCH_PATHS);
-
+HEADER_SEARCH_PATHS = $(BUILT_PRODUCTS_DIR)/$(INSTALL_PATH_PREFIX)/usr/local/include $(DSTROOT)/$(INSTALL_PATH_PREFIX)/usr/local/include icu $(HEADER_SEARCH_PATHS);
 
 TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR);
 
+SUPPORTED_PLATFORMS = iphoneos iphonesimulator macosx;
 
 JAVASCRIPTCORE_FRAMEWORKS_DIR = $(JAVASCRIPTCORE_FRAMEWORKS_DIR_$(PLATFORM_NAME));
 JAVASCRIPTCORE_FRAMEWORKS_DIR_iphoneos = $(SYSTEM_LIBRARY_DIR)/PrivateFrameworks;
@@ -104,6 +102,8 @@ TARGETING_SAME_OS_X_VERSION_1070_1070 = YES;
 TARGETING_SAME_OS_X_VERSION_1080_1080 = YES;
 TARGETING_SAME_OS_X_VERSION_1090_1090 = YES;
 
+INSTALL_PATH = $(INSTALL_PATH_PREFIX)$(INSTALL_PATH_ACTUAL);
+
 // Don't build against an SDK unless we're targeting an older OS version.
 SDKROOT = $(SDKROOT_TARGETING_SAME_OS_X_VERSION_$(TARGETING_SAME_OS_X_VERSION));
 SDKROOT_TARGETING_SAME_OS_X_VERSION_ = macosx;
index 112af7a..c049a9e 100644 (file)
@@ -21,6 +21,5 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
 
-
-PRIVATE_HEADERS_FOLDER_PATH = /usr/local/include/wtf;
+PRIVATE_HEADERS_FOLDER_PATH = $(INSTALL_PATH_PREFIX)/usr/local/include/wtf;
 INSTALLHDRS_SCRIPT_PHASE = YES;
index b4d3522..06006ea 100644 (file)
 
 #include "Base.xcconfig"
 
-ARCHS = $(ARCHS_$(PLATFORM_NAME));
-ARCHS_iphoneos = $(ARCHS_UNIVERSAL_IPHONE_OS);
-ARCHS_iphonesimulator = $(NATIVE_ARCH);
-ARCHS_macosx = $(ARCHS_STANDARD_32_64_BIT);
-
+ARCHS = $(ARCHS_STANDARD_32_64_BIT);
 ONLY_ACTIVE_ARCH = YES;
 
 MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(PLATFORM_NAME));
index 8d7887e..924f8d0 100644 (file)
@@ -22,6 +22,7 @@
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
 
 EXECUTABLE_PREFIX = lib;
+INSTALL_PATH_ACTUAL = /usr/local/lib;
 PRODUCT_NAME = WTF;
 
 GCC_SYMBOLS_PRIVATE_EXTERN = YES;
diff --git a/Source/WTF/Configurations/iOS.xcconfig b/Source/WTF/Configurations/iOS.xcconfig
new file mode 100644 (file)
index 0000000..177b319
--- /dev/null
@@ -0,0 +1 @@
+#include "<DEVELOPER_DIR>/AppleInternal/XcodeConfig/AspenFamily.xcconfig"
index 9ff3239..5cd52bc 100644 (file)
                2C05385315BC819000F21B96 /* GregorianDateTime.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GregorianDateTime.h; sourceTree = "<group>"; };
                2CCD892915C0390200285083 /* GregorianDateTime.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GregorianDateTime.cpp; sourceTree = "<group>"; };
                4330F38E15745B0500AAFA8F /* URLString.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = URLString.cpp; sourceTree = "<group>"; };
+               44DEE74A152274BB00C6EC37 /* iOS.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = iOS.xcconfig; sourceTree = "<group>"; };
                4F0321BB156AA8D1006EBAF6 /* BitArray.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BitArray.h; sourceTree = "<group>"; };
                4F1B2DB5160B44AA00586559 /* MemoryInstrumentationHashSet.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MemoryInstrumentationHashSet.h; sourceTree = "<group>"; };
                4F1D115315FF11BE0026E908 /* MemoryInstrumentation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MemoryInstrumentation.h; sourceTree = "<group>"; };
                                5D247B6E14689C4700E78B76 /* Base.xcconfig */,
                                6541CAF41630DB26006D0DEC /* CopyWTFHeaders.xcconfig */,
                                5D247B7014689C4700E78B76 /* DebugRelease.xcconfig */,
+                               44DEE74A152274BB00C6EC37 /* iOS.xcconfig */,
                                5D247B7314689C4700E78B76 /* WTF.xcconfig */,
                        );
                        path = Configurations;