[iOS] Upstream more JavaScriptCore build configuration changes
authordbates@webkit.org <dbates@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 23 Oct 2013 17:02:34 +0000 (17:02 +0000)
committerdbates@webkit.org <dbates@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 23 Oct 2013 17:02:34 +0000 (17:02 +0000)
https://bugs.webkit.org/show_bug.cgi?id=123169

Reviewed by David Kilzer.

* Configurations/Base.xcconfig:
* Configurations/Version.xcconfig:
* Configurations/iOS.xcconfig: Added.
* JavaScriptCore.xcodeproj/project.pbxproj:

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

Source/JavaScriptCore/ChangeLog
Source/JavaScriptCore/Configurations/Base.xcconfig
Source/JavaScriptCore/Configurations/Version.xcconfig
Source/JavaScriptCore/Configurations/iOS.xcconfig [new file with mode: 0644]
Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj

index 8dcfc59..dbd709f 100644 (file)
@@ -1,5 +1,17 @@
 2013-10-23  Daniel Bates  <dabates@apple.com>
 
+        [iOS] Upstream more JavaScriptCore build configuration changes
+        https://bugs.webkit.org/show_bug.cgi?id=123169
+
+        Reviewed by David Kilzer.
+
+        * Configurations/Base.xcconfig:
+        * Configurations/Version.xcconfig:
+        * Configurations/iOS.xcconfig: Added.
+        * JavaScriptCore.xcodeproj/project.pbxproj:
+
+2013-10-23  Daniel Bates  <dabates@apple.com>
+
         [iOS] Export DefaultGCActivityCallback member functions
         https://bugs.webkit.org/show_bug.cgi?id=123175
 
index 8fe606b..1f8a37c 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_BOOL_CONVERSION = YES;
index 3f742cd..03e90f9 100644 (file)
@@ -31,10 +31,13 @@ BUNDLE_VERSION = $(BUNDLE_VERSION_$(CONFIGURATION));
 SHORT_VERSION_STRING = $(SHORT_VERSION_STRING_$(CONFIGURATION))
 
 // The system version prefix is based on the current system version.
-SYSTEM_VERSION_PREFIX = $(SYSTEM_VERSION_PREFIX_$(TARGET_MAC_OS_X_VERSION_MAJOR));
-SYSTEM_VERSION_PREFIX_1070 = 7;
-SYSTEM_VERSION_PREFIX_1080 = 8;
-SYSTEM_VERSION_PREFIX_1090 = 9;
+SYSTEM_VERSION_PREFIX = $(SYSTEM_VERSION_PREFIX_$(PLATFORM_NAME));
+SYSTEM_VERSION_PREFIX_iphoneos = 6;
+SYSTEM_VERSION_PREFIX_iphonesimulator = $(SYSTEM_VERSION_PREFIX_iphoneos);
+SYSTEM_VERSION_PREFIX_macosx = $(SYSTEM_VERSION_PREFIX_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR));
+SYSTEM_VERSION_PREFIX_macosx_1070 = 7;
+SYSTEM_VERSION_PREFIX_macosx_1080 = 8;
+SYSTEM_VERSION_PREFIX_macosx_1090 = 9;
 
 // The production build always uses the full version with a system version prefix.
 BUNDLE_VERSION_Production = $(SYSTEM_VERSION_PREFIX)$(FULL_VERSION);
diff --git a/Source/JavaScriptCore/Configurations/iOS.xcconfig b/Source/JavaScriptCore/Configurations/iOS.xcconfig
new file mode 100644 (file)
index 0000000..177b319
--- /dev/null
@@ -0,0 +1 @@
+#include "<DEVELOPER_DIR>/AppleInternal/XcodeConfig/AspenFamily.xcconfig"
index 0eb999b..9f1f215 100644 (file)
                C2F0F2D016BAEEE900187C19 /* StructureRareData.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = StructureRareData.cpp; sourceTree = "<group>"; };
                C2FC9BD216644DFB00810D33 /* CopiedBlockInlines.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CopiedBlockInlines.h; sourceTree = "<group>"; };
                C2FE18A316BAEC4000AF3061 /* StructureRareData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = StructureRareData.h; sourceTree = "<group>"; };
+               FEE7D5A00D99AC04005351F6 /* iOS.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = iOS.xcconfig; sourceTree = "<group>"; };
                D21202280AD4310C00ED79B6 /* DateConversion.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = DateConversion.cpp; sourceTree = "<group>"; };
                D21202290AD4310C00ED79B6 /* DateConversion.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = DateConversion.h; sourceTree = "<group>"; };
                DDF7ABD211F60ED200108E36 /* GCActivityCallback.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GCActivityCallback.h; sourceTree = "<group>"; };
                                1C9051450BA9E8A70081E9D0 /* Base.xcconfig */,
                                1C9051440BA9E8A70081E9D0 /* DebugRelease.xcconfig */,
                                449097EE0F8F81B50076A327 /* FeatureDefines.xcconfig */,
+                               FEE7D5A00D99AC04005351F6 /* iOS.xcconfig */,
                                1C9051430BA9E8A70081E9D0 /* JavaScriptCore.xcconfig */,
                                5DAFD6CB146B686300FBEFB4 /* JSC.xcconfig */,
                                BC021BF2136900C300FC5467 /* ToolExecutable.xcconfig */,