Upstream iOS changes for ANGLE project

<http://webkit.org/b/106913>

Reviewed by Joseph Pecoraro.

* ANGLE.xcodeproj/project.pbxproj:
- Use $(INSTALL_PATH_PREFIX) with CopyFiles build phase paths.
- Add iOS.xcconfig to project.
* Configurations/ANGLE.xcconfig:
- Use INSTALL_PATH_ACTUAL instead of INSTALL_PATH.  (See below.)
- Use $(INSTALL_PATH_PREFIX) with PUBLIC_HEADERS_FOLDER_PATH.
* Configurations/Base.xcconfig:
- Include iOS.xcconfig.
- Add per-platform values for GCC_ENABLE_OBJC_GC and
  GCC_MODEL_TUNING.
- Define INSTALL_PATH when building for macosx SDK.
* Configurations/iOS.xcconfig: Add.  Note that missing include
files are simply ignored without an error by Xcode.

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

diff --git a/Source/ThirdParty/ANGLE/ANGLE.xcodeproj/project.pbxproj b/Source/ThirdParty/ANGLE/ANGLE.xcodeproj/project.pbxproj
index 6c15de99170024dc9738bb70270dc70a952e4520..d499a6545231541526fd3eb3e374375d8e81c3ea 100644 (file)
--- a/Source/ThirdParty/ANGLE/ANGLE.xcodeproj/project.pbxproj
+++ b/Source/ThirdParty/ANGLE/ANGLE.xcodeproj/project.pbxproj
@@ -114,7 +114,7 @@
                312BDB0B15FECAB00097EBC7 /* CopyFiles */ = {
                        isa = PBXCopyFilesBuildPhase;
                        buildActionMask = 8;
-                       dstPath = /usr/local/OpenSourceVersions;
+                       dstPath = "$(INSTALL_PATH_PREFIX)/usr/local/OpenSourceVersions";
                        dstSubfolderSpec = 0;
                        files = (
                                312BDB0C15FECAC90097EBC7 /* ANGLE.plist in CopyFiles */,
@@ -124,7 +124,7 @@
                312BDB0D15FECACE0097EBC7 /* CopyFiles */ = {
                        isa = PBXCopyFilesBuildPhase;
                        buildActionMask = 8;
-                       dstPath = /usr/local/OpenSourceLicenses;
+                       dstPath = "$(INSTALL_PATH_PREFIX)/usr/local/OpenSourceLicenses";
                        dstSubfolderSpec = 0;
                        files = (
                                312BDB0E15FECAE50097EBC7 /* ANGLE.txt in CopyFiles */,
@@ -138,6 +138,7 @@
                312BDB0A15FECA3A0097EBC7 /* ANGLE.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = ANGLE.txt; sourceTree = "<group>"; };
                3158EA0C1630968D006BE5EE /* ArrayBoundsClamper.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ArrayBoundsClamper.cpp; sourceTree = "<group>"; };
                3158EA0D1630968D006BE5EE /* ArrayBoundsClamper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ArrayBoundsClamper.h; sourceTree = "<group>"; };
+               443A3E1512ECF6CC0004F9D7 /* iOS.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = iOS.xcconfig; sourceTree = "<group>"; };
                49951C0214B7AAB30060E96E /* length_limits.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = length_limits.h; sourceTree = "<group>"; };
                49951C0514B7AAD70060E96E /* BuiltInFunctionEmulator.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = BuiltInFunctionEmulator.cpp; sourceTree = "<group>"; };
                49951C0614B7AAD80060E96E /* BuiltInFunctionEmulator.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BuiltInFunctionEmulator.h; sourceTree = "<group>"; };
@@ -290,6 +291,7 @@
                                5D7C59C51208C68B001C873E /* ANGLE.xcconfig */,
                                5D7C59C61208C68B001C873E /* Base.xcconfig */,
                                5D7C59C71208C68B001C873E /* DebugRelease.xcconfig */,
+                               443A3E1512ECF6CC0004F9D7 /* iOS.xcconfig */,
                        );
                        path = Configurations;
                        sourceTree = "<group>";

diff --git a/Source/ThirdParty/ANGLE/ChangeLog b/Source/ThirdParty/ANGLE/ChangeLog
index 0373145b0bb63b20284ec109a2e05a75fc83b030..6e070cd267b8eac33fc24837c7ec9d77547484ac 100644 (file)
--- a/Source/ThirdParty/ANGLE/ChangeLog
+++ b/Source/ThirdParty/ANGLE/ChangeLog
@@ -1,3 +1,24 @@
+2013-01-15  David Kilzer  <ddkilzer@apple.com>
+
+        Upstream iOS changes for ANGLE project
+        <http://webkit.org/b/106913>
+
+        Reviewed by Joseph Pecoraro.
+
+        * ANGLE.xcodeproj/project.pbxproj:
+        - Use $(INSTALL_PATH_PREFIX) with CopyFiles build phase paths.
+        - Add iOS.xcconfig to project.
+        * Configurations/ANGLE.xcconfig:
+        - Use INSTALL_PATH_ACTUAL instead of INSTALL_PATH.  (See below.)
+        - Use $(INSTALL_PATH_PREFIX) with PUBLIC_HEADERS_FOLDER_PATH.
+        * Configurations/Base.xcconfig:
+        - Include iOS.xcconfig.
+        - Add per-platform values for GCC_ENABLE_OBJC_GC and
+          GCC_MODEL_TUNING.
+        - Define INSTALL_PATH when building for macosx SDK.
+        * Configurations/iOS.xcconfig: Add.  Note that missing include
+        files are simply ignored without an error by Xcode.
+
 2013-01-15  David Kilzer  <ddkilzer@apple.com>
 
         ANGLE should build with -Wshorten-64-to-32

diff --git a/Source/ThirdParty/ANGLE/Configurations/ANGLE.xcconfig b/Source/ThirdParty/ANGLE/Configurations/ANGLE.xcconfig
index 644b71dda1a65452fae9a0a60756b44ca4e2b353..6d4d0c6f581e5cc4429f79915c2a65260ca65f5b 100644 (file)
--- a/Source/ThirdParty/ANGLE/Configurations/ANGLE.xcconfig
+++ b/Source/ThirdParty/ANGLE/Configurations/ANGLE.xcconfig
@@ -1,5 +1,5 @@
 PRODUCT_NAME = ANGLE;
 
 HEADER_SEARCH_PATHS = include src;
-INSTALL_PATH = /usr/local/lib;
-PUBLIC_HEADERS_FOLDER_PATH = /usr/local/include/ANGLE;
+INSTALL_PATH_ACTUAL = /usr/local/lib;
+PUBLIC_HEADERS_FOLDER_PATH = $(INSTALL_PATH_PREFIX)/usr/local/include/ANGLE;

diff --git a/Source/ThirdParty/ANGLE/Configurations/Base.xcconfig b/Source/ThirdParty/ANGLE/Configurations/Base.xcconfig
index cc904e8528971a8292f5ad32310b71ce8ca52ce3..c530be2726c7dd1473a0b65c59be059b55baa3de 100644 (file)
--- a/Source/ThirdParty/ANGLE/Configurations/Base.xcconfig
+++ b/Source/ThirdParty/ANGLE/Configurations/Base.xcconfig
@@ -1,3 +1,5 @@
+#include "iOS.xcconfig"
+
 CLANG_CXX_LANGUAGE_STANDARD = gnu++0x;
 CLANG_CXX_LIBRARY = libc++;
 DEAD_CODE_STRIPPING = YES;
@@ -7,10 +9,14 @@ GCC_DEBUGGING_SYMBOLS = default;
 GCC_ENABLE_CPP_EXCEPTIONS = NO;
 GCC_ENABLE_CPP_RTTI = NO;
 GCC_ENABLE_OBJC_EXCEPTIONS = YES;
-GCC_ENABLE_OBJC_GC = supported;
+GCC_ENABLE_OBJC_GC = $(GCC_ENABLE_OBJC_GC_$(PLATFORM_NAME));
+GCC_ENABLE_OBJC_GC_iphoneos = NO;
+GCC_ENABLE_OBJC_GC_iphonesimulator = NO;
+GCC_ENABLE_OBJC_GC_macosx = supported;
 GCC_ENABLE_SYMBOL_SEPARATION = NO;
 GCC_FAST_OBJC_DISPATCH = YES;
-GCC_MODEL_TUNING = G5;
+GCC_MODEL_TUNING = $(GCC_MODEL_TUNING_$(PLATFORM_NAME));
+GCC_MODEL_TUNING_macosx = G5;
 GCC_OBJC_CALL_CXX_CDTORS = YES;
 GCC_OPTIMIZATION_LEVEL = s;
 GCC_PRECOMPILE_PREFIX_HEADER = NO;
@@ -33,6 +39,9 @@ TARGETING_SAME_OS_X_VERSION_1070_1070 = YES;
 TARGETING_SAME_OS_X_VERSION_1080_1080 = YES;
 TARGETING_SAME_OS_X_VERSION_1090_1090 = YES;
 
+// Make macosx SDK builds work without AspenFamily.xcconfig.
+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;

diff --git a/Source/ThirdParty/ANGLE/Configurations/iOS.xcconfig b/Source/ThirdParty/ANGLE/Configurations/iOS.xcconfig
new file mode 100644 (file)
index 0000000..177b319
--- /dev/null
+++ b/Source/ThirdParty/ANGLE/Configurations/iOS.xcconfig
@@ -0,0 +1 @@
+#include "<DEVELOPER_DIR>/AppleInternal/XcodeConfig/AspenFamily.xcconfig"