Skip to content

Commit 75d293e

Browse files
livecodepanoslivecodepanos
committed
Merge remote-tracking branch 'upstream/develop-7.0' into merge-develop-7.0_29.03.2016
2 parents 49eb06c + 58e3d2d commit 75d293e

File tree

11 files changed

+60
-65
lines changed

11 files changed

+60
-65
lines changed

‎Installer/package.txt‎

Lines changed: 38 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -588,22 +588,6 @@ component Runtime.iOS
588588
file ios:iphonesimulator8.2/mobile-disable-ats-template.plist as "DisableATS.plist"
589589
file ios:iphonesimulator8.2/[email protected] as "Default4InchSplash.png" base ios:[email protected]
590590
file ios:iphonesimulator8.2/fontmap as "fontmap"
591-
into "[[ToolsFolder]]/Runtime/iOS/Simulator-8_4" place
592-
executable ios:iphonesimulator8.4/standalone-mobile[[BaseEditionTagLower]].ios-engine as Standalone base ios:iphonesimulator8.2/standalone-mobile[[BaseEditionTagLower]].app/standalone-mobile[[BaseEditionTagLower]]
593-
executable ios:iphonesimulator8.4/revsecurity.ios-extension as RevSecurity base ios:iphonesimulator8.2/revsecurity.dylib
594-
executable ios:iphonesimulator8.4/revpdfprinter.ios-extension as RevPdfPrinter base ios:iphonesimulator8.2/revpdfprinter.dylib
595-
executable ios:iphonesimulator8.4/revzip.ios-extension as RevZip base ios:iphonesimulator8.2/revzip.dylib
596-
executable ios:iphonesimulator8.4/revxml.ios-extension as RevXml base ios:iphonesimulator8.2/revxml.dylib
597-
executable ios:iphonesimulator8.4/revdb.ios-extension as RevDb base ios:iphonesimulator8.2/revdb.dylib
598-
executable ios:iphonesimulator8.4/dbsqlite.ios-extension as DbSqlite base ios:iphonesimulator8.2/dbsqlite.dylib
599-
executable ios:iphonesimulator8.4/dbmysql.ios-extension as DbMysql base ios:iphonesimulator8.2/dbmysql.dylib
600-
file ios:iphonesimulator8.4/mobile-template.plist as "Settings.plist"
601-
file ios:iphonesimulator8.4/mobile-remote-notification-template.plist as "RemoteNotificationSettings.plist"
602-
file ios:iphonesimulator8.4/mobile-url-scheme-template.plist as "URLSchemeSettings.plist"
603-
file ios:iphonesimulator8.4/mobile-splashscreen-template.plist as "SplashscreenSettings.plist"
604-
file ios:iphonesimulator8.4/mobile-disable-ats-template.plist as "DisableATS.plist"
605-
file ios:iphonesimulator8.4/[email protected] as "Default4InchSplash.png" base ios:[email protected]
606-
file ios:iphonesimulator8.4/fontmap as "fontmap"
607591
into "[[ToolsFolder]]/Runtime/iOS/Simulator-9_2" place
608592
executable ios:iphonesimulator9.2/standalone-mobile[[BaseEditionTagLower]].ios-engine as Standalone base ios:iphonesimulator8.2/standalone-mobile[[BaseEditionTagLower]].app/standalone-mobile[[BaseEditionTagLower]]
609593
executable ios:iphonesimulator9.2/revsecurity.ios-extension as RevSecurity base ios:iphonesimulator8.2/revsecurity.dylib
@@ -620,6 +604,22 @@ component Runtime.iOS
620604
file ios:iphonesimulator9.2/mobile-disable-ats-template.plist as "DisableATS.plist"
621605
file ios:iphonesimulator9.2/[email protected] as "Default4InchSplash.png" base ios:[email protected]
622606
file ios:iphonesimulator9.2/fontmap as "fontmap"
607+
into "[[ToolsFolder]]/Runtime/iOS/Simulator-9_3" place
608+
executable ios:iphonesimulator9.3/standalone-mobile[[BaseEditionTagLower]].ios-engine as Standalone base ios:iphonesimulator8.2/standalone-mobile[[BaseEditionTagLower]].app/standalone-mobile[[BaseEditionTagLower]]
609+
executable ios:iphonesimulator9.3/revsecurity.ios-extension as RevSecurity base ios:iphonesimulator8.2/revsecurity.dylib
610+
executable ios:iphonesimulator9.3/revpdfprinter.ios-extension as RevPdfPrinter base ios:iphonesimulator8.2/revpdfprinter.dylib
611+
executable ios:iphonesimulator9.3/revzip.ios-extension as RevZip base ios:iphonesimulator8.2/revzip.dylib
612+
executable ios:iphonesimulator9.3/revxml.ios-extension as RevXml base ios:iphonesimulator8.2/revxml.dylib
613+
executable ios:iphonesimulator9.3/revdb.ios-extension as RevDb base ios:iphonesimulator8.2/revdb.dylib
614+
executable ios:iphonesimulator9.3/dbsqlite.ios-extension as DbSqlite base ios:iphonesimulator8.2/dbsqlite.dylib
615+
executable ios:iphonesimulator9.3/dbmysql.ios-extension as DbMysql base ios:iphonesimulator8.2/dbmysql.dylib
616+
file ios:iphonesimulator9.3/mobile-template.plist as "Settings.plist"
617+
file ios:iphonesimulator9.3/mobile-remote-notification-template.plist as "RemoteNotificationSettings.plist"
618+
file ios:iphonesimulator9.3/mobile-url-scheme-template.plist as "URLSchemeSettings.plist"
619+
file ios:iphonesimulator9.3/mobile-splashscreen-template.plist as "SplashscreenSettings.plist"
620+
file ios:iphonesimulator9.3/mobile-disable-ats-template.plist as "DisableATS.plist"
621+
file ios:iphonesimulator9.3/[email protected] as "Default4InchSplash.png" base ios:[email protected]
622+
file ios:iphonesimulator9.3/fontmap as "fontmap"
623623
into "[[ToolsFolder]]/Runtime/iOS/Device-8_2" place
624624
executable ios:iphoneos8.2/standalone-mobile[[BaseEditionTagLower]].ios-engine as Standalone
625625
executable ios:iphoneos8.2/revsecurity.ios-extension as RevSecurity
@@ -642,28 +642,6 @@ component Runtime.iOS
642642
file ios:iphoneos8.2/mobile-disable-ats-template.plist as "DisableATS.plist"
643643
file ios:iphoneos8.2/[email protected] as "Default4InchSplash.png" base ios:[email protected]
644644
file ios:iphoneos8.2/fontmap as "fontmap"
645-
into "[[ToolsFolder]]/Runtime/iOS/Device-8_4" place
646-
executable ios:iphoneos8.4/standalone-mobile[[BaseEditionTagLower]].ios-engine as Standalone base ios:iphoneos8.2/standalone-mobile[[BaseEditionTagLower]].lcext
647-
executable ios:iphoneos8.4/revsecurity.ios-extension as RevSecurity base ios:iphoneos8.2/revsecurity.lcext
648-
executable ios:iphoneos8.4/revpdfprinter.ios-extension as RevPdfPrinter base ios:iphoneos8.2/revpdfprinter.lcext
649-
executable ios:iphoneos8.4/revzip.ios-extension as RevZip base ios:iphoneos8.2/revzip.lcext
650-
executable ios:iphoneos8.4/revxml.ios-extension as RevXml base ios:iphoneos8.2/revxml.lcext
651-
executable ios:iphoneos8.4/revdb.ios-extension as RevDb base ios:iphoneos8.2/revdb.lcext
652-
executable ios:iphoneos8.4/dbsqlite.ios-extension as DbSqlite base ios:iphoneos8.2/dbsqlite.lcext
653-
executable ios:iphoneos8.4/dbmysql.ios-extension as DbMysql base ios:iphoneos8.2/dbmysql.lcext
654-
file ios:iphoneos8.4/mobile-device-template.plist as "Settings.plist"
655-
file ios:iphoneos8.4/mobile-remote-notification-template.plist as "RemoteNotificationSettings.plist"
656-
file ios:iphoneos8.4/mobile-url-scheme-template.plist as "URLSchemeSettings.plist"
657-
file ios:iphoneos8.4/mobile-splashscreen-template.plist as "SplashscreenSettings.plist"
658-
file ios:iphoneos8.4/template-entitlements.xcent as "Entitlements.xcent"
659-
file ios:iphoneos8.4/template-store-entitlements.xcent as "StoreEntitlements.xcent"
660-
file ios:iphoneos8.4/template-beta-report-entitlement.xcent as "BetaReportEntitlement.xcent"
661-
file ios:iphoneos8.4/template-remote-notification-entitlements.xcent as "RemoteNotificationEntitlements.xcent"
662-
file ios:iphoneos8.4/template-remote-notification-store-entitlements.xcent as "RemoteNotificationStoreEntitlements.xcent"
663-
file ios:iphoneos8.4/template-ResourceRules.plist as "ResourceRules.plist"
664-
file ios:iphoneos8.4/mobile-disable-ats-template.plist as "DisableATS.plist"
665-
file ios:iphoneos8.4/[email protected] as "Default4InchSplash.png" base ios:[email protected]
666-
file ios:iphoneos8.4/fontmap as "fontmap"
667645
into "[[ToolsFolder]]/Runtime/iOS/Device-9_2" place
668646
executable ios:iphoneos9.2/standalone-mobile[[BaseEditionTagLower]].ios-engine as Standalone base ios:iphoneos8.2/standalone-mobile[[BaseEditionTagLower]].lcext
669647
executable ios:iphoneos9.2/revsecurity.ios-extension as RevSecurity base ios:iphoneos8.2/revsecurity.lcext
@@ -686,6 +664,28 @@ component Runtime.iOS
686664
file ios:iphoneos9.2/mobile-disable-ats-template.plist as "DisableATS.plist"
687665
file ios:iphoneos9.2/[email protected] as "Default4InchSplash.png" base ios:[email protected]
688666
file ios:iphoneos9.2/fontmap as "fontmap"
667+
into "[[ToolsFolder]]/Runtime/iOS/Device-9_3" place
668+
executable ios:iphoneos9.3/standalone-mobile[[BaseEditionTagLower]].ios-engine as Standalone base ios:iphoneos8.2/standalone-mobile[[BaseEditionTagLower]].lcext
669+
executable ios:iphoneos9.3/revsecurity.ios-extension as RevSecurity base ios:iphoneos8.2/revsecurity.lcext
670+
executable ios:iphoneos9.3/revpdfprinter.ios-extension as RevPdfPrinter base ios:iphoneos8.2/revpdfprinter.lcext
671+
executable ios:iphoneos9.3/revzip.ios-extension as RevZip base ios:iphoneos8.2/revzip.lcext
672+
executable ios:iphoneos9.3/revxml.ios-extension as RevXml base ios:iphoneos8.2/revxml.lcext
673+
executable ios:iphoneos9.3/revdb.ios-extension as RevDb base ios:iphoneos8.2/revdb.lcext
674+
executable ios:iphoneos9.3/dbsqlite.ios-extension as DbSqlite base ios:iphoneos8.2/dbsqlite.lcext
675+
executable ios:iphoneos9.3/dbmysql.ios-extension as DbMysql base ios:iphoneos8.2/dbmysql.lcext
676+
file ios:iphoneos9.3/mobile-device-template.plist as "Settings.plist"
677+
file ios:iphoneos9.3/mobile-remote-notification-template.plist as "RemoteNotificationSettings.plist"
678+
file ios:iphoneos9.3/mobile-url-scheme-template.plist as "URLSchemeSettings.plist"
679+
file ios:iphoneos9.3/mobile-splashscreen-template.plist as "SplashscreenSettings.plist"
680+
file ios:iphoneos9.3/template-entitlements.xcent as "Entitlements.xcent"
681+
file ios:iphoneos9.3/template-store-entitlements.xcent as "StoreEntitlements.xcent"
682+
file ios:iphoneos9.3/template-beta-report-entitlement.xcent as "BetaReportEntitlement.xcent"
683+
file ios:iphoneos9.3/template-remote-notification-entitlements.xcent as "RemoteNotificationEntitlements.xcent"
684+
file ios:iphoneos9.3/template-remote-notification-store-entitlements.xcent as "RemoteNotificationStoreEntitlements.xcent"
685+
file ios:iphoneos9.3/template-ResourceRules.plist as "ResourceRules.plist"
686+
file ios:iphoneos9.3/mobile-disable-ats-template.plist as "DisableATS.plist"
687+
file ios:iphoneos9.3/[email protected] as "Default4InchSplash.png" base ios:[email protected]
688+
file ios:iphoneos9.3/fontmap as "fontmap"
689689

690690
////////////////////////////////////////////////////////////////////////////////
691691

‎Makefile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ EMMAKE ?= emmake
2525

2626
# Some magic to control which versions of iOS we try to build. N.b. you may
2727
# also need to modify the buildbot configuration
28-
IPHONEOS_VERSIONS ?= 8.2 8.4 9.2
29-
IPHONESIMULATOR_VERSIONS ?= 6.1 7.1 8.2 8.4 9.2
28+
IPHONEOS_VERSIONS ?= 8.2 9.2 9.3
29+
IPHONESIMULATOR_VERSIONS ?= 6.1 7.1 8.2 9.2 9.3
3030

3131
IOS_SDKS ?= \
3232
$(addprefix iphoneos,$(IPHONEOS_VERSIONS)) \

‎docs/notes/platforms.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -61,8 +61,8 @@ Currently, the supported versions of Xcode are:
6161
* Xcode 4.6 on MacOS X 10.7
6262
* Xcode 5.1 on MacOS X 10.8
6363
* Xcode 6.2 on MacOS X 10.9
64-
* Xcode 6.2, 6.4, 7.1 and 7.2 on Mac OS X 10.10
65-
* Xcode 7.1 and 7.2 on MacOS X 10.11
64+
* Xcode 6.2 and 7.2 on Mac OS X 10.10
65+
* Xcode 7.3 on MacOS X 10.11
6666

6767
It is also possible to set other versions of Xcode, to allow testing on a wider range of iOS simulators. For instance, on Yosemite, you can add *Xcode 5.1* in the *Mobile Support* preferences, to let you test your stack on the *iOS Simulator 7.1*.
6868

@@ -71,8 +71,8 @@ We currently support the following iOS Simulators:
7171
* 6.1
7272
* 7.1
7373
* 8.2
74-
* 8.4
7574
* 9.2
75+
* 9.3
7676

7777
## Android
7878

‎ide-support/revdeploylibraryios.livecodescript‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,8 @@ local sDeviceSDKs
1717

1818
-- SN-2015-03-24: [[ Bug 15037 ]] Add a consistent, strict list of the
1919
-- SDKs and device relying on the engines we provide in the shipped version
20-
-- SN-2015-05-01: [[ Xcode 6.4 ]] Add iOS 8.4 amongst the uable iOS SDK
2120
function deployUsableIosSdk
22-
return "6.1,7.1,8.2,8.4,9.2"
21+
return "6.1,7.1,8.2,9.2,9.3"
2322
end deployUsableIosSdk
2423

2524
// SN-2015-05-01: [[ Xcode 6.4 ]] Return the pair iOS SDK / Xcode for the current MacOS version
@@ -33,21 +32,21 @@ function deployGetIphoneOSes
3332
else if tMacVersion < 101000 then
3433
put "8.2,6.2" into tList[1]
3534
else if tMacVersion < 101100 then
36-
put "8.4,6.4" into tList[1]
37-
put "8.2,6.2" into tList[2]
35+
put "8.2,6.2" into tList[1]
3836
// Xcode 7.0 can be installed from Mac OSX 10.10.4 onwards
3937
if tMacVersion >= 101004 then
40-
put "9.2,7.1" into tList[3]
38+
put "9.2,7.2" into tList[2]
4139
end if
4240
else
43-
put "9.2,7.1" into tList[1]
41+
// Xcode 7.3 requires a Mac running OS X 10.11 or later
42+
put "9.3,7.3" into tList[1]
4443
end if
4544

4645
return tList
4746
end deployGetIphoneOSes
4847

4948
function deployGetIosMinimumVersions
50-
return "5.1.1,6.0,6.1,7.0,7.1,8.0,8.1,8.2,8.3,8.4,9.0,9.1,9.2"
49+
return "5.1.1,6.0,6.1,7.0,7.1,8.0,8.1,8.2,8.3,8.4,9.0,9.1,9.2,9.3"
5150
end deployGetIosMinimumVersions
5251

5352
////////////////////////////////////////////////////////////////////////////////

‎prebuilt/fetch-libraries.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ LIBS_ios=( OpenSSL ICU )
1414
LIBS_win32=( OpenSSL Curl ICU CEF )
1515
LIBS_linux=( OpenSSL Curl ICU CEF )
1616
LIBS_emscripten=( ICU )
17-
SUBPLATFORMS_ios=( iPhoneSimulator5.1 iPhoneSimulator6.1 iPhoneSimulator7.1 iPhoneSimulator8.2 iPhoneSimulator8.3 iPhoneSimulator8.4 iPhoneSimulator9.2 iPhoneOS8.2 iPhoneOS8.3 iPhoneOS8.4 iPhoneOS9.2)
17+
SUBPLATFORMS_ios=( iPhoneSimulator5.1 iPhoneSimulator6.1 iPhoneSimulator7.1 iPhoneSimulator8.2 iPhoneSimulator9.2 iPhoneSimulator9.3 iPhoneOS8.2 iPhoneOS9.2 iPhoneOS9.3)
1818

1919
# Fetch settings
2020
SCRIPT_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)

‎prebuilt/package-libs.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ function doPackage {
3030
local LIBPATH="lib/${PLATFORM}/${ARCHDIR}/${SUBPLATFORM}"
3131

3232
local OPENSSL_TAR="${PACKAGE_DIR}/OpenSSL-${OpenSSL_VERSION}${SUFFIX}.tar"
33-
local CURL_TAR="${PACKAGE_DIR}/Curl-${CURL_VERSION}${SUFFIX}.tar"
33+
local CURL_TAR="${PACKAGE_DIR}/Curl-${Curl_VERSION}${SUFFIX}.tar"
3434
local ICU_TAR="${PACKAGE_DIR}/ICU-${ICU_VERSION}${SUFFIX}.tar"
3535
local CEF_TAR="${PACKAGE_DIR}/CEF-${CEF_VERSION}${SUFFIX}.tar"
3636

‎prebuilt/scripts/build-curl.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ cd "${BUILDDIR}"
2525
if [ ! -d "$CURL_SRC" ] ; then
2626
if [ ! -e "$CURL_TGZ" ] ; then
2727
echo "Fetching Curl source"
28-
curl http://curl.haxx.se/download/curl-${Curl_VERSION}.tar.gz -o ${CURL_TGZ}
28+
curl https://curl.haxx.se/download/curl-${Curl_VERSION}.tar.gz -o ${CURL_TGZ}
2929
if [ $? != 0 ] ; then
3030
echo " failed"
3131
if [ -e "${CURL_TGZ}" ] ; then

‎prebuilt/scripts/ios.inc‎

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -36,15 +36,11 @@ if [ -e "${XCODES_DIR}/Xcode_6_2_0" ] ; then
3636
addiOS "${XCODES_DIR}/Xcode_6_2_0/Xcode.app/Contents/Developer" iPhoneSimulator 8.2 "i386 x86_64"
3737
addiOS "${XCODES_DIR}/Xcode_6_2_0/Xcode.app/Contents/Developer" iPhoneOS 8.2 "armv7 arm64"
3838
fi
39-
if [ -e "${XCODES_DIR}/Xcode_6_3_0" ] ; then
40-
addiOS "${XCODES_DIR}/Xcode_6_3_0/Xcode.app/Contents/Developer" iPhoneSimulator 8.3 "i386 x86_64"
41-
addiOS "${XCODES_DIR}/Xcode_6_3_0/Xcode.app/Contents/Developer" iPhoneOS 8.3 "armv7 arm64"
42-
fi
43-
if [ -e "${XCODES_DIR}/Xcode_6_4_0" ] ; then
44-
addiOS "${XCODES_DIR}/Xcode_6_4_0/Xcode.app/Contents/Developer" iPhoneSimulator 8.4 "i386 x86_64"
45-
addiOS "${XCODES_DIR}/Xcode_6_4_0/Xcode.app/Contents/Developer" iPhoneOS 8.4 "armv7 arm64"
46-
fi
4739
if [ -e "${XCODES_DIR}/Xcode_7_2_0" ] ; then
4840
addiOS "${XCODES_DIR}/Xcode_7_2_0/Xcode.app/Contents/Developer" iPhoneSimulator 9.2 "i386 x86_64"
4941
addiOS "${XCODES_DIR}/Xcode_7_2_0/Xcode.app/Contents/Developer" iPhoneOS 9.2 "armv7 arm64"
42+
fi
43+
if [ -e "${XCODES_DIR}/Xcode_7_3_0" ] ; then
44+
addiOS "${XCODES_DIR}/Xcode_7_3_0/Xcode.app/Contents/Developer" iPhoneSimulator 9.3 "i386 x86_64"
45+
addiOS "${XCODES_DIR}/Xcode_7_3_0/Xcode.app/Contents/Developer" iPhoneOS 9.3 "armv7 arm64"
5046
fi

‎prebuilt/versions/curl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
7.43.0
1+
7.47.1

‎prebuilt/versions/openssl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.0.1q
1+
1.0.1s

0 commit comments

Comments
 (0)