[iOS] Define SYSTEM_VERSION_PREFIX consistently

<http://webkit.org/b/130293>
<rdar://problem/15926359>

Reviewed by Dan Bernstein.

Source/JavaScriptCore:

* Configurations/Version.xcconfig:
(SYSTEM_VERSION_PREFIX_iphoneos): Sync with
Source/WebKit/mac/Version.xcconfig.

Source/WebCore:

* Configurations/Version.xcconfig:
(SYSTEM_VERSION_PREFIX_iphoneos): Sync with
Source/WebKit/mac/Version.xcconfig.

Source/WebInspectorUI:

* Configurations/Version.xcconfig:
(SYSTEM_VERSION_PREFIX): Sync with
Source/WebKit/mac/Version.xcconfig.

Source/WebKit2:

* Configurations/Version.xcconfig:
(SYSTEM_VERSION_PREFIX): Sync with
Source/WebKit/mac/Version.xcconfig.

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

diff --git a/Source/JavaScriptCore/ChangeLog b/Source/JavaScriptCore/ChangeLog
index 089684dd845cba3884b4c1b3ae1f66297c5c9b8d..9eec3814a614c0896ae057c4311351714d643d1a 100644 (file)
--- a/Source/JavaScriptCore/ChangeLog
+++ b/Source/JavaScriptCore/ChangeLog
@@ -1,3 +1,15 @@
+2014-03-15  David Kilzer  <ddkilzer@apple.com>
+
+        [iOS] Define SYSTEM_VERSION_PREFIX consistently
+        <http://webkit.org/b/130293>
+        <rdar://problem/15926359>
+
+        Reviewed by Dan Bernstein.
+
+        * Configurations/Version.xcconfig:
+        (SYSTEM_VERSION_PREFIX_iphoneos): Sync with
+        Source/WebKit/mac/Version.xcconfig.
+
 2014-03-15  David Kilzer  <ddkilzer@apple.com>
 
         Fix build: using integer absolute value function 'abs' when argument is of floating point type

diff --git a/Source/JavaScriptCore/Configurations/Version.xcconfig b/Source/JavaScriptCore/Configurations/Version.xcconfig
index e9aa31e06ba3172f79025386c28a7b33784367e9..1e55a7e2addc68f733b88f0d1656a30c9239fda1 100644 (file)
--- a/Source/JavaScriptCore/Configurations/Version.xcconfig
+++ b/Source/JavaScriptCore/Configurations/Version.xcconfig
@@ -32,7 +32,7 @@ SHORT_VERSION_STRING = $(SHORT_VERSION_STRING_$(CONFIGURATION))
 
 // The system version prefix is based on the current system version.
 SYSTEM_VERSION_PREFIX = $(SYSTEM_VERSION_PREFIX_$(PLATFORM_NAME));
-SYSTEM_VERSION_PREFIX_iphoneos = 6;
+SYSTEM_VERSION_PREFIX_iphoneos = 8;
 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_1080 = 8;

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index 6483aa1b25778b3d50f65851fd2be0659bc6364e..3f6f95a0d733297db762651e04e32ed79345f074 100644 (file)
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,15 @@
+2014-03-15  David Kilzer  <ddkilzer@apple.com>
+
+        [iOS] Define SYSTEM_VERSION_PREFIX consistently
+        <http://webkit.org/b/130293>
+        <rdar://problem/15926359>
+
+        Reviewed by Dan Bernstein.
+
+        * Configurations/Version.xcconfig:
+        (SYSTEM_VERSION_PREFIX_iphoneos): Sync with
+        Source/WebKit/mac/Version.xcconfig.
+
 2014-03-14  Mark Rowe  <mrowe@apple.com>
 
         Fix the production build.

diff --git a/Source/WebCore/Configurations/Version.xcconfig b/Source/WebCore/Configurations/Version.xcconfig
index 91c014b5967e9ef97264f28f86ba208d63b29335..210016c79b346bc19383a118d6d2bcd9c72ba16a 100644 (file)
--- a/Source/WebCore/Configurations/Version.xcconfig
+++ b/Source/WebCore/Configurations/Version.xcconfig
@@ -32,7 +32,7 @@ SHORT_VERSION_STRING = $(SHORT_VERSION_STRING_$(CONFIGURATION))
 
 // The system version prefix is based on the current system version.
 SYSTEM_VERSION_PREFIX = $(SYSTEM_VERSION_PREFIX_$(PLATFORM_NAME));
-SYSTEM_VERSION_PREFIX_iphoneos = 6; // iOS is most like SnowLeopard currently.
+SYSTEM_VERSION_PREFIX_iphoneos = 8;
 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_1080 = 8;

diff --git a/Source/WebInspectorUI/ChangeLog b/Source/WebInspectorUI/ChangeLog
index ff1fb1b48091ff868270561f23e3f7b198a4f18a..64e46536cc3b894fc8dc01d1be5eddffe5b5d62e 100644 (file)
--- a/Source/WebInspectorUI/ChangeLog
+++ b/Source/WebInspectorUI/ChangeLog
@@ -1,3 +1,15 @@
+2014-03-15  David Kilzer  <ddkilzer@apple.com>
+
+        [iOS] Define SYSTEM_VERSION_PREFIX consistently
+        <http://webkit.org/b/130293>
+        <rdar://problem/15926359>
+
+        Reviewed by Dan Bernstein.
+
+        * Configurations/Version.xcconfig:
+        (SYSTEM_VERSION_PREFIX): Sync with
+        Source/WebKit/mac/Version.xcconfig.
+
 2014-03-14  Maciej Stachowiak  <mjs@apple.com>
 
         Replace "Apple Computer, Inc." with "Apple Inc." in copyright headers

diff --git a/Source/WebInspectorUI/Configurations/Version.xcconfig b/Source/WebInspectorUI/Configurations/Version.xcconfig
index 3f744ecca645e0f924f6f64339b115137ba3a36d..e3376c64f4ec8c50b16aa6e6a49554d1c0c871c2 100644 (file)
--- a/Source/WebInspectorUI/Configurations/Version.xcconfig
+++ b/Source/WebInspectorUI/Configurations/Version.xcconfig
@@ -4,10 +4,13 @@ TINY_VERSION = 0;
 FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION);
 
 // 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_1080 = 8;
-SYSTEM_VERSION_PREFIX_1090 = 9;
-SYSTEM_VERSION_PREFIX_101000 = 10;
+SYSTEM_VERSION_PREFIX = $(SYSTEM_VERSION_PREFIX_$(PLATFORM_NAME));
+SYSTEM_VERSION_PREFIX_iphoneos = 8;
+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_1080 = 8;
+SYSTEM_VERSION_PREFIX_macosx_1090 = 9;
+SYSTEM_VERSION_PREFIX_macosx_101000 = 10;
 
 BUNDLE_VERSION = $(SYSTEM_VERSION_PREFIX)$(FULL_VERSION);
 SHORT_VERSION_STRING = $(SYSTEM_VERSION_PREFIX)$(MAJOR_VERSION);

diff --git a/Source/WebKit2/ChangeLog b/Source/WebKit2/ChangeLog
index a68973435e5a7e090ec8d339422985c2134f1325..05be9d3b9c43ac1e25550b4485ff8cd6b9b7d7f5 100644 (file)
--- a/Source/WebKit2/ChangeLog
+++ b/Source/WebKit2/ChangeLog
@@ -1,3 +1,15 @@
+2014-03-15  David Kilzer  <ddkilzer@apple.com>
+
+        [iOS] Define SYSTEM_VERSION_PREFIX consistently
+        <http://webkit.org/b/130293>
+        <rdar://problem/15926359>
+
+        Reviewed by Dan Bernstein.
+
+        * Configurations/Version.xcconfig:
+        (SYSTEM_VERSION_PREFIX): Sync with
+        Source/WebKit/mac/Version.xcconfig.
+
 2014-03-14  Alexey Proskuryakov  <ap@apple.com>
 
         [Mac] Sync extended attribute related rules with AppSandbox profile

diff --git a/Source/WebKit2/Configurations/Version.xcconfig b/Source/WebKit2/Configurations/Version.xcconfig
index f7ce2ded1b0f59a1e0c76e19b8f81b3938c41850..c2b03a791bbaff0df6794cc84fa3e2ba288cff19 100644 (file)
--- a/Source/WebKit2/Configurations/Version.xcconfig
+++ b/Source/WebKit2/Configurations/Version.xcconfig
@@ -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_1080 = 8;
-SYSTEM_VERSION_PREFIX_1090 = 9;
-SYSTEM_VERSION_PREFIX_101000 = 10;
+SYSTEM_VERSION_PREFIX = $(SYSTEM_VERSION_PREFIX_$(PLATFORM_NAME));
+SYSTEM_VERSION_PREFIX_iphoneos = 8;
+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_1080 = 8;
+SYSTEM_VERSION_PREFIX_macosx_1090 = 9;
+SYSTEM_VERSION_PREFIX_macosx_101000 = 10;
 
 // The production build always uses the full version with a system version prefix.
 BUNDLE_VERSION_Production = $(SYSTEM_VERSION_PREFIX)$(FULL_VERSION);