Merge remote-tracking branch 'upstream/develop-8.1' into merge-develop-8.1_01.10.2017

livecodepanos · livecodepanos · commit a9f62a36d244 · 2017-10-01T12:26:08.000+01:00
diff --git a/Installer/package.txt b/Installer/package.txt
@@ -645,22 +645,22 @@ component Runtime.iOS
 		file ios:iphonesimulator10.2/mobile-disable-ats-template.plist as "DisableATS.plist"
 		file ios:iphonesimulator10.2/Default-568h@2x.png as "Default4InchSplash.png" base ios:Default-568h@2x.png
 		file ios:iphonesimulator10.2/fontmap as "fontmap"
-	into "[[ToolsFolder]]/Runtime/iOS/Simulator-10_3" place
-		executable ios:iphonesimulator10.3/standalone-mobile[[BaseEditionTagLower]].ios-engine as Standalone base ios:iphonesimulator8.2/standalone-mobile[[BaseEditionTagLower]].app/standalone-mobile[[BaseEditionTagLower]]
-		executable ios:iphonesimulator10.3/revsecurity.ios-extension as RevSecurity base ios:iphonesimulator8.2/revsecurity.dylib
-		executable ios:iphonesimulator10.3/revpdfprinter.ios-extension as RevPdfPrinter base ios:iphonesimulator8.2/revpdfprinter.dylib
-		executable ios:iphonesimulator10.3/revzip.ios-extension as RevZip base ios:iphonesimulator8.2/revzip.dylib
-		executable ios:iphonesimulator10.3/revxml.ios-extension as RevXml base ios:iphonesimulator8.2/revxml.dylib
-		executable ios:iphonesimulator10.3/revdb.ios-extension as RevDb base ios:iphonesimulator8.2/revdb.dylib
-		executable ios:iphonesimulator10.3/dbsqlite.ios-extension as DbSqlite base ios:iphonesimulator8.2/dbsqlite.dylib
-		executable ios:iphonesimulator10.3/dbmysql.ios-extension as DbMysql base ios:iphonesimulator8.2/dbmysql.dylib
-		file ios:iphonesimulator10.3/mobile-template.plist as "Settings.plist"
-		file ios:iphonesimulator10.3/mobile-remote-notification-template.plist as "RemoteNotificationSettings.plist"
-		file ios:iphonesimulator10.3/mobile-url-scheme-template.plist as "URLSchemeSettings.plist"
-		file ios:iphonesimulator10.3/mobile-splashscreen-template.plist as "SplashscreenSettings.plist"
-		file ios:iphonesimulator10.3/mobile-disable-ats-template.plist as "DisableATS.plist"
-		file ios:iphonesimulator10.3/Default-568h@2x.png as "Default4InchSplash.png" base ios:Default-568h@2x.png
-		file ios:iphonesimulator10.3/fontmap as "fontmap"
+	into "[[ToolsFolder]]/Runtime/iOS/Simulator-11_0" place
+		executable ios:iphonesimulator11.0/standalone-mobile[[BaseEditionTagLower]].ios-engine as Standalone base ios:iphonesimulator8.2/standalone-mobile[[BaseEditionTagLower]].app/standalone-mobile[[BaseEditionTagLower]]
+		executable ios:iphonesimulator11.0/revsecurity.ios-extension as RevSecurity base ios:iphonesimulator8.2/revsecurity.dylib
+		executable ios:iphonesimulator11.0/revpdfprinter.ios-extension as RevPdfPrinter base ios:iphonesimulator8.2/revpdfprinter.dylib
+		executable ios:iphonesimulator11.0/revzip.ios-extension as RevZip base ios:iphonesimulator8.2/revzip.dylib
+		executable ios:iphonesimulator11.0/revxml.ios-extension as RevXml base ios:iphonesimulator8.2/revxml.dylib
+		executable ios:iphonesimulator11.0/revdb.ios-extension as RevDb base ios:iphonesimulator8.2/revdb.dylib
+		executable ios:iphonesimulator11.0/dbsqlite.ios-extension as DbSqlite base ios:iphonesimulator8.2/dbsqlite.dylib
+		executable ios:iphonesimulator11.0/dbmysql.ios-extension as DbMysql base ios:iphonesimulator8.2/dbmysql.dylib
+		file ios:iphonesimulator11.0/mobile-template.plist as "Settings.plist"
+		file ios:iphonesimulator11.0/mobile-remote-notification-template.plist as "RemoteNotificationSettings.plist"
+		file ios:iphonesimulator11.0/mobile-url-scheme-template.plist as "URLSchemeSettings.plist"
+		file ios:iphonesimulator11.0/mobile-splashscreen-template.plist as "SplashscreenSettings.plist"
+		file ios:iphonesimulator11.0/mobile-disable-ats-template.plist as "DisableATS.plist"
+		file ios:iphonesimulator11.0/Default-568h@2x.png as "Default4InchSplash.png" base ios:Default-568h@2x.png
+		file ios:iphonesimulator11.0/fontmap as "fontmap"
 	into "[[ToolsFolder]]/Runtime/iOS/Device-9_2" place
 		executable ios:iphoneos9.2/standalone-mobile[[BaseEditionTagLower]].ios-engine as Standalone
 		executable ios:iphoneos9.2/revsecurity.ios-extension as RevSecurity
@@ -701,26 +701,26 @@ component Runtime.iOS
 		file ios:iphoneos10.2/mobile-disable-ats-template.plist as "DisableATS.plist"
 		file ios:iphoneos10.2/Default-568h@2x.png as "Default4InchSplash.png" base ios:Default-568h@2x.png
 		file ios:iphoneos10.2/fontmap as "fontmap"
-	into "[[ToolsFolder]]/Runtime/iOS/Device-10_3" place
-		executable ios:iphoneos10.3/standalone-mobile[[BaseEditionTagLower]].ios-engine as Standalone base ios:iphoneos9.2/standalone-mobile[[BaseEditionTagLower]].ios-engine
-		executable ios:iphoneos10.3/revsecurity.ios-extension as RevSecurity base ios:iphoneos9.2/revsecurity.ios-extension
-		executable ios:iphoneos10.3/revpdfprinter.ios-extension as RevPdfPrinter base ios:iphoneos9.2/revpdfprinter.ios-extension
-		executable ios:iphoneos10.3/revzip.ios-extension as RevZip base ios:iphoneos9.2/revzip.ios-extension
-		executable ios:iphoneos10.3/revxml.ios-extension as RevXml base ios:iphoneos9.2/revxml.ios-extension
-		executable ios:iphoneos10.3/revdb.ios-extension as RevDb base ios:iphoneos9.2/revdb.ios-extension
-		executable ios:iphoneos10.3/dbsqlite.ios-extension as DbSqlite base ios:iphoneos9.2/dbsqlite.ios-extension
-		executable ios:iphoneos10.3/dbmysql.ios-extension as DbMysql base ios:iphoneos9.2/dbmysql.ios-extension
-		file ios:iphoneos10.3/mobile-device-template.plist as "Settings.plist"
-		file ios:iphoneos10.3/mobile-remote-notification-template.plist as "RemoteNotificationSettings.plist"
-		file ios:iphoneos10.3/mobile-url-scheme-template.plist as "URLSchemeSettings.plist"
-		file ios:iphoneos10.3/mobile-splashscreen-template.plist as "SplashscreenSettings.plist"
-		file ios:iphoneos10.3/template-entitlements.xcent as "Entitlements.xcent"
-		file ios:iphoneos10.3/template-beta-report-entitlement.xcent as "BetaReportEntitlement.xcent"
-		file ios:iphoneos10.3/template-remote-notification-entitlements.xcent as "RemoteNotificationEntitlements.xcent"
-		file ios:iphoneos10.3/template-remote-notification-store-entitlements.xcent as "RemoteNotificationStoreEntitlements.xcent"
-		file ios:iphoneos10.3/mobile-disable-ats-template.plist as "DisableATS.plist"
-		file ios:iphoneos10.3/Default-568h@2x.png as "Default4InchSplash.png" base ios:Default-568h@2x.png
-		file ios:iphoneos10.3/fontmap as "fontmap"
+	into "[[ToolsFolder]]/Runtime/iOS/Device-11_0" place
+		executable ios:iphoneos11.0/standalone-mobile[[BaseEditionTagLower]].ios-engine as Standalone base ios:iphoneos9.2/standalone-mobile[[BaseEditionTagLower]].ios-engine
+		executable ios:iphoneos11.0/revsecurity.ios-extension as RevSecurity base ios:iphoneos9.2/revsecurity.ios-extension
+		executable ios:iphoneos11.0/revpdfprinter.ios-extension as RevPdfPrinter base ios:iphoneos9.2/revpdfprinter.ios-extension
+		executable ios:iphoneos11.0/revzip.ios-extension as RevZip base ios:iphoneos9.2/revzip.ios-extension
+		executable ios:iphoneos11.0/revxml.ios-extension as RevXml base ios:iphoneos9.2/revxml.ios-extension
+		executable ios:iphoneos11.0/revdb.ios-extension as RevDb base ios:iphoneos9.2/revdb.ios-extension
+		executable ios:iphoneos11.0/dbsqlite.ios-extension as DbSqlite base ios:iphoneos9.2/dbsqlite.ios-extension
+		executable ios:iphoneos11.0/dbmysql.ios-extension as DbMysql base ios:iphoneos9.2/dbmysql.ios-extension
+		file ios:iphoneos11.0/mobile-device-template.plist as "Settings.plist"
+		file ios:iphoneos11.0/mobile-remote-notification-template.plist as "RemoteNotificationSettings.plist"
+		file ios:iphoneos11.0/mobile-url-scheme-template.plist as "URLSchemeSettings.plist"
+		file ios:iphoneos11.0/mobile-splashscreen-template.plist as "SplashscreenSettings.plist"
+		file ios:iphoneos11.0/template-entitlements.xcent as "Entitlements.xcent"
+		file ios:iphoneos11.0/template-beta-report-entitlement.xcent as "BetaReportEntitlement.xcent"
+		file ios:iphoneos11.0/template-remote-notification-entitlements.xcent as "RemoteNotificationEntitlements.xcent"
+		file ios:iphoneos11.0/template-remote-notification-store-entitlements.xcent as "RemoteNotificationStoreEntitlements.xcent"
+		file ios:iphoneos11.0/mobile-disable-ats-template.plist as "DisableATS.plist"
+		file ios:iphoneos11.0/Default-568h@2x.png as "Default4InchSplash.png" base ios:Default-568h@2x.png
+		file ios:iphoneos11.0/fontmap as "fontmap"
 
 ////////////////////////////////////////////////////////////////////////////////
 
@@ -738,13 +738,11 @@ component Externals.Linux
 component Externals.Windows
 	into [[TargetFolder]]/Externals place
 		executable windows:revspeech.dll
-		executable windows:revvideograbber.dll
 		executable windows:revxml.dll
 		executable windows:revbrowser.dll
 		executable windows:revzip.dll
 		executable windows:revfont.dll
 	declare external "Speech" using revspeech.dll
-	declare external "Video Grabber" using revvideograbber.dll
 	declare external "XML" using revxml.dll
 	declare external "Browser" using revbrowser.dll
 	declare external "Revolution Zip" using revzip.dll
@@ -755,13 +753,11 @@ component Externals.Windows
 component Externals.MacOSX
 	into [[TargetFolder]]/Externals place
 		executable macosx:revspeech.bundle
-		executable macosx:revvideograbber.bundle
 		executable macosx:revxml.bundle
 		executable macosx:revbrowser.bundle
 		executable macosx:revzip.bundle
 		executable macosx:revfont.bundle
 	declare external "Speech" using revspeech.bundle
-	declare external "Video Grabber" using revvideograbber.bundle
 	declare external "XML" using revxml.bundle
 	declare external "Browser" using revbrowser.bundle
 	declare external "Revolution Zip" using revzip.bundle
diff --git a/Makefile b/Makefile
@@ -25,8 +25,8 @@ EMMAKE ?= emmake
 
 # Some magic to control which versions of iOS we try to build.  N.b. you may
 # also need to modify the buildbot configuration
-IPHONEOS_VERSIONS ?= 9.2 10.2 10.3
-IPHONESIMULATOR_VERSIONS ?= 6.1 7.1 8.2 9.2 10.2 10.3
+IPHONEOS_VERSIONS ?= 9.2 10.2 11.0
+IPHONESIMULATOR_VERSIONS ?= 6.1 7.1 8.2 9.2 10.2 11.0
 
 IOS_SDKS ?= \
 	$(addprefix iphoneos,$(IPHONEOS_VERSIONS)) \
diff --git a/buildbot.py b/buildbot.py
@@ -41,10 +41,10 @@
     'x86_64-linux-debian7',
     'armv6-android-api8',
     'universal-mac-macosx10.6', # Minimum deployment target
-    'universal-ios-iphoneos10.3',
+    'universal-ios-iphoneos11.0',
     'universal-ios-iphoneos10.2',
     'universal-ios-iphoneos9.2',
-    'universal-ios-iphonesimulator10.3',
+    'universal-ios-iphonesimulator11.0',
     'universal-ios-iphonesimulator10.2',
     'universal-ios-iphonesimulator9.2',
     'universal-ios-iphonesimulator8.2',
diff --git a/builder/builder_utilities.livecodescript b/builder/builder_utilities.livecodescript
@@ -1,7 +1,7 @@
 ﻿script "BuilderUtilities"
 
-constant kMergExtVersion = "2017-9-4"
-constant kTSNetVersion = "1.3.1"
+constant kMergExtVersion = "2017-9-25"
+constant kTSNetVersion = "1.3.2"
 
 local sEngineDir
 local sWorkDir
diff --git a/config.py b/config.py
@@ -203,11 +203,15 @@ def guess_xcode_arch(target_sdk):
     if sdk == 'iphoneos':
         if int(ver) < 8:
             return 'armv7'
+        elif int(ver) >= 11:
+        	return 'arm64'
         else:
             return 'armv7 arm64'
     if sdk == 'iphonesimulator':
         if int(ver) < 8:
             return 'i386'
+        elif int(ver) >= 11:
+        	return 'x86_64'
         else:
             return 'i386 x86_64'
 
diff --git a/docs/notes/bugfix-20405.md b/docs/notes/bugfix-20405.md
@@ -0,0 +1 @@
+# Fixed bug causing incorrect formattedWidth to be returned for buttons
diff --git a/docs/notes/bugfix-20423.md b/docs/notes/bugfix-20423.md
@@ -0,0 +1 @@
+# Add tsNet builds for iOS SDK 11.0
diff --git a/docs/notes/bugfix-20424.md b/docs/notes/bugfix-20424.md
@@ -0,0 +1 @@
+# Add mergExt builds for iOS SDK 11.0
diff --git a/docs/notes/bugfix-20489.md b/docs/notes/bugfix-20489.md
@@ -0,0 +1 @@
+# Remove revVideoGrabber external from IDE as it can no longer be supported
diff --git a/docs/notes/issues.md b/docs/notes/issues.md
@@ -7,4 +7,4 @@
 * The browser widget does not work on 32-bit Linux.
 
 * 64-bit standalones for Mac OS X do not have support for audio
-  recording or the revVideoGrabber external.
+  recording.
diff --git a/docs/notes/platforms.md b/docs/notes/platforms.md
@@ -66,7 +66,7 @@ Currently, the supported versions of Xcode are:
 * Xcode 6.2 on MacOS X 10.9
 * Xcode 6.2 and 7.2 on Mac OS X 10.10
 * Xcode 8.2 on MacOS X 10.11
-* Xcode 8.3 on MacOS 10.12
+* Xcode 9.0 on MacOS 10.12 (Note: You need to upgrade to 10.12.6)
 
 It is also possible to set other versions of Xcode, to allow testing on a wider range of iOS simulators. For instance, on OS X 10.10 (Yosemite), you can add *Xcode 5.1* in the *Mobile Support* preferences, to let you test your stack on the *iOS Simulator 7.1*.
 
@@ -77,7 +77,7 @@ We currently support deployment for the following versions of iOS:
 * 8.2 [simulator]
 * 9.2
 * 10.2
-* 10.3
+* 11.0
 
 ## Android
 
diff --git a/engine/src/exec-interface-button.cpp b/engine/src/exec-interface-button.cpp
@@ -924,23 +924,39 @@ void MCButton::SetMnemonic(MCExecContext& ctxt, uinteger_t p_mnemonic)
 
 void MCButton::GetFormattedWidth(MCExecContext& ctxt, integer_t& r_width)
 {
-	// MW-2012-02-16: [[ FontRefs ]] As 'formatted' properties require
+    // MW-2012-02-16: [[ FontRefs ]] As 'formatted' properties require
 	//   access to the font, we must be open before we can compute them.
 	if (opened)
 	{
-		// MW-2007-07-05: [[ Bug 2328 ]] - Formatted width of tab buttons incorrect.
+        // MW-2007-07-05: [[ Bug 2328 ]] - Formatted width of tab buttons incorrect.
 		if (getstyleint(flags) == F_MENU && menumode == WM_TOP_LEVEL)
 			r_width = (uinteger_t)formattedtabwidth();
 		else
 		{
 			uint2 fwidth;
 			
-			MCStringRef t_label = getlabeltext();
+			MCStringRef const t_label = getlabeltext();
 			if (MCStringIsEmpty(t_label))
 				fwidth = 0;
-			else 
-                fwidth = leftmargin + rightmargin + MCFontMeasureText(m_font, t_label, getstack() -> getdevicetransform());
-			
+			else
+            {
+                MCArrayRef lines;
+                MCStringSplit(t_label, MCSTR("\n"), nil, kMCCompareExact, lines);
+                uindex_t line_count = MCArrayGetCount(lines);
+                int32_t max_length = 0;
+                
+                for (uindex_t i = 0; i < line_count; ++i)
+                {
+                    MCValueRef line = nil;
+                    MCArrayFetchValueAtIndex(lines, i + 1, line);
+                    MCStringRef const string_line = static_cast<MCStringRef const>(line);
+                    
+                    int32_t string_line_length = MCFontMeasureText(m_font, string_line, getstack() -> getdevicetransform());
+                    
+                    max_length = MCMax<int32_t>(max_length, string_line_length);
+                }
+                fwidth = leftmargin + rightmargin + max_length;
+            }
 			if (flags & F_SHOW_ICON && icons != NULL)
 			{
 				reseticon();
diff --git a/ide-support/revdeploylibraryios.livecodescript b/ide-support/revdeploylibraryios.livecodescript
@@ -18,7 +18,7 @@ local sDeviceSDKs
 -- SN-2015-03-24: [[ Bug 15037 ]] Add a consistent, strict list of the
 --  SDKs and device relying on the engines we provide in the shipped version
 function deployUsableIosSdk
-   return "6.1,7.1,8.2,9.2,10.2,10.3"
+   return "6.1,7.1,8.2,9.2,10.2,11.0"
 end deployUsableIosSdk
 
 // SN-2015-05-01: Return the pair iOS SDK / Xcode for the current MacOS version
@@ -39,16 +39,19 @@ function deployGetIphoneOSes
       end if
    else if tMacVersion < 101200 then
       put "10.2,8.2" into tList[1]
+   else if tMacVersion < 101206 then
+      put empty into tList[1]
+      answer error "To use Xcode 9.0, you need to upgrade your Mac to MacOS Sierra 10.12.6"
    else
-      // Xcode 8.3 requires a Mac running Mac OS 10.12 or later
-      put "10.3,8.3" into tList[1]
+      // Xcode 9.0 requires a Mac running Mac OS 10.12.6 or later
+      put "11.0,9.0" into tList[1]
    end if
    
    return tList
 end deployGetIphoneOSes
 
 function deployGetIosMinimumVersions
-   return "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,10.0,10.1,10.2,10.3"
+   return "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,10.0,10.1,10.2,10.3,11.0"
 end deployGetIosMinimumVersions
 
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/livecode.gyp b/livecode.gyp
@@ -71,7 +71,6 @@
 							'revmobile/revmobile.gyp:external-revandroid',
 							'revmobile/revmobile.gyp:external-reviphone',
 							'revspeech/revspeech.gyp:external-revspeech',
-							'revvideograbber/revvideograbber.gyp:external-revvideograbber',
 							
 							# Server externals
 							'revdb/revdb.gyp:external-revdb-server',
diff --git a/prebuilt/fetch-libraries.sh b/prebuilt/fetch-libraries.sh
@@ -14,7 +14,7 @@ LIBS_ios=( OpenSSL ICU )
 LIBS_win32=( OpenSSL Curl ICU CEF )
 LIBS_linux=( OpenSSL Curl ICU CEF )
 LIBS_emscripten=( ICU )
-SUBPLATFORMS_ios=(iPhoneSimulator6.1 iPhoneSimulator7.1 iPhoneSimulator8.2 iPhoneSimulator9.2 iPhoneSimulator10.2 iPhoneSimulator10.3 iPhoneOS9.2 iPhoneOS10.2 iPhoneOS10.3)
+SUBPLATFORMS_ios=(iPhoneSimulator6.1 iPhoneSimulator7.1 iPhoneSimulator8.2 iPhoneSimulator9.2 iPhoneSimulator10.2 iPhoneSimulator11.0 iPhoneOS9.2 iPhoneOS10.2 iPhoneOS11.0)
 
 # Fetch settings
 SCRIPT_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
diff --git a/prebuilt/scripts/ios.inc b/prebuilt/scripts/ios.inc
@@ -46,5 +46,5 @@ checkiOS 7_2_1 iPhoneSimulator 9.2 "i386 x86_64"
 checkiOS 7_2_1 iPhoneOS 9.2 "armv7 arm64"
 checkiOS 8_2_0 iPhoneSimulator 10.2 "i386 x86_64"
 checkiOS 8_2_0 iPhoneOS 10.2 "armv7 arm64"
-checkiOS 8_3_0 iPhoneSimulator 10.3 "i386 x86_64"
-checkiOS 8_3_0 iPhoneOS 10.3 "armv7 arm64"
+checkiOS 9_0_0 iPhoneSimulator 11.0 "i386 x86_64"
+checkiOS 9_0_0 iPhoneOS 11.0 "armv7 arm64"
diff --git a/tests/lcs/core/interface/button.livecodescript b/tests/lcs/core/interface/button.livecodescript
@@ -65,3 +65,28 @@ on TestBug18293
    delete stack "popup menu"
    TestAssert "deleting popped up menu stack shouldn't crash", true
 end TestBug18293
+
+on TestBug20405
+
+   local text1, text2, text3
+   put "Ln1" into text1
+   put "Line 1" into text2
+   put "Ln1\nLine 1" into text3
+
+   create stack "test"
+   create button "b1"
+   create button "b2"
+   create button "b3"
+
+   set the label of button "b1" to text1
+   set the label of button "b2" to text2
+   set the label of button "b3" to text3
+
+   local fW1, fW2, fW3
+   put the formattedWith of button "b1" into fW1
+   put the formattedWidth of button "b2" into fW2
+   put the formattedWidth of button "b3" into fW3
+
+   TestAssert "returns correct formattedWidth", fW3 is max(fW1, fW2)
+
+end TestBug20405
diff --git a/tools/setup_xcode_sdks.py b/tools/setup_xcode_sdks.py
@@ -2,8 +2,8 @@
 
 # Update these lists if you need different SDK versions!
 
-iphoneos_versions = ["10.3", "10.2", "9.2"]
-iphonesimulator_versions = ["10.3", "10.2", "9.2", "8.2", "7.1", "6.1"]
+iphoneos_versions = ["11.0", "10.2", "9.2"]
+iphonesimulator_versions = ["11.0", "10.2", "9.2", "8.2", "7.1", "6.1"]
 macosx_versions = ["10.8", "10.6"]
 
 # This tool creates the symlinks required for Xcode builds of LiveCode.

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+# Fixed bug causing incorrect formattedWidth to be returned for buttons`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+# Remove revVideoGrabber external from IDE as it can no longer be supported`