Skip to content
This repository was archived by the owner on Aug 31, 2021. It is now read-only.

Commit ea0bcc1

Browse files
author
livecodeali
committed
Merge remote-tracking branch 'upstream/develop-7.0' into merge-develop-7.0-17.09.15
Conflicts: Makefile ide-support/revdeploylibraryios.livecodescript libgraphics/libgraphics.gyp prebuilt/fetch-libraries.sh
2 parents 09a464c + ef02599 commit ea0bcc1

File tree

13 files changed

+63
-17
lines changed

13 files changed

+63
-17
lines changed

‎CONTRIBUTING.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ If you wish to contribute to development of LiveCode, you must sign the [Contrib
1616

1717
## Using GitHub
1818

19-
The LiveCode workflow is a typical git workflow, where contributors fork the [runrev/livecode](https://github.com/runrev/livecode) repository, make their changes on a branch, and then submit a pull request.
19+
The LiveCode workflow is a typical git workflow, where contributors fork the [livecode/livecode](https://github.com/livecode/livecode) repository, make their changes on a branch, and then submit a pull request.
2020

2121
### Setting up git with your user information
2222

‎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
29-
IPHONESIMULATOR_VERSIONS ?= 6.1 7.1 8.2 8.4
28+
IPHONEOS_VERSIONS ?= 8.2 8.4 9.0
29+
IPHONESIMULATOR_VERSIONS ?= 6.1 7.1 8.2 8.4 9.0
3030

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

‎config.sh‎

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -242,6 +242,7 @@ if test -z "$XCODE_HOST_SDK"; then
242242
fi
243243

244244
# Default target architectures
245+
# iOS architectures are restricted to 32-bit only for iOS 5.1, 6.1 and 7.1
245246
if test -z "$TARGET_ARCH"; then
246247
case ${PLATFORM} in
247248
*-x86) TARGET_ARCH="x86" ;;
@@ -251,11 +252,15 @@ if test -z "$TARGET_ARCH"; then
251252

252253
mac*|ios*)
253254
case ${XCODE_TARGET_SDK} in
254-
macosx*) TARGET_ARCH="i386" ;;
255-
iphoneos8*) TARGET_ARCH="armv7 arm64" ;;
256-
iphoneos*) TARGET_ARCH="armv7" ;;
257-
iphonesimulator8*) TARGET_ARCH="i386 x86_64" ;;
258-
iphonesimulator*) TARGET_ARCH="i386" ;;
255+
macosx*) TARGET_ARCH="i386" ;;
256+
iphoneos5* | \
257+
iphoneos6* | \
258+
iphoneos7*) TARGET_ARCH="armv7" ;;
259+
iphoneos*) TARGET_ARCH="armv7 arm64" ;;
260+
iphonesimulator5* | \
261+
iphonesimulator6* | \
262+
iphonesimulator7*) TARGET_ARCH="i386" ;;
263+
iphonesimulator*) TARGET_ARCH="i386 x86_64" ;;
259264
esac
260265
;;
261266

‎config/ios.gypi‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,10 @@
3232
'IPHONEOS_DEPLOYMENT_TARGET[arch=i386]': '5.1.1',
3333
'IPHONEOS_DEPLOYMENT_TARGET[arch=arm64]': '7.0.0',
3434
'IPHONEOS_DEPLOYMENT_TARGET[arch=x86_64]': '7.0.0',
35+
'ENABLE_BITCODE[arch=armv7]': 'No',
36+
'ENABLE_BITCODE[arch=i386]': 'No',
37+
'ENABLE_BITCODE[arch=arm64]': 'Yes',
38+
'ENABLE_BITCODE[arch=x86_64]': 'Yes',
3539
'TARGETED_DEVICE_FAMILY': '1,2',
3640
'DEBUG_INFORMATION_FORMAT': 'dwarf-with-dsym',
3741
'ARCHS_STANDARD': 'armv7 arm64',

‎docs/notes/bugfix-15898.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
# Building 32-bit slice only causes app to crash on iPad 1

‎docs/notes/bugfix-15934.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
# Holding down the SHIFT key while pressing the Backspace key does nothing

‎docs/notes/feature-xcode_7_0.md‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
# Xcode 7.0
2+
3+
iOS 9.0 SDK is now part of the valid SDKs that can be used for iOS standalone application deployment, from Mac OSX 10.10.4.
4+
5+
If you installed the new version of Xcode at another location than the previous one, we invite you to update the Xcode in Preferences > Mobile Preferences.
6+
7+
All the previously existing versions of iOS supported are still supported.

‎engine/src/fieldf.cpp‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -253,7 +253,8 @@ static MCKeyBinding s_mac_keybindings[] =
253253
{ XK_K, MK_CTRL, FT_DELEOP },
254254

255255
// Backward Deletion
256-
{ XK_BackSpace, MK_NONE, FT_DELBCHAR },
256+
// PM-2015-09-16: [[ Bug 15934 ]] Make sure pressing Backspace key works as expected, even if Shift key is down
257+
{ XK_BackSpace, MK_IGNORE_SHIFT, FT_DELBCHAR },
257258
{ XK_BackSpace, MK_CMD, FT_DELBOL },
258259
{ XK_BackSpace, MK_CTRL, FT_DELBSUBCHAR },
259260
{ XK_BackSpace, MK_OPT, FT_DELBWORD },

‎ide-support/revdeploylibraryios.livecodescript‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ local sDeviceSDKs
1919
-- SDKs and device relying on the engines we provide in the shipped version
2020
-- SN-2015-05-01: [[ Xcode 6.4 ]] Add iOS 8.4 amongst the uable iOS SDK
2121
function deployUsableIosSdk
22-
return "6.1,7.1,8.2,8.4"
22+
return "6.1,7.1,8.2,8.4,9.0"
2323
end deployUsableIosSdk
2424

2525
// SN-2015-05-01: [[ Xcode 6.4 ]] Return the pair iOS SDK / Xcode for the current MacOS version
@@ -32,16 +32,22 @@ function deployGetIphoneOSes
3232
put "7.1,5.1" into tList[1]
3333
else if tMacVersion < 101000 then
3434
put "8.2,6.2" into tList[1]
35-
else
35+
else if tMacVersion < 101100 then
3636
put "8.4,6.4" into tList[1]
3737
put "8.2,6.2" into tList[2]
38+
// Xcode 7.0 can be installed from Mac OSX 10.10.4 onwards
39+
if tMacVersion >= 101004 then
40+
put "9.0,7.0" into tList[3]
41+
end if
42+
else
43+
put "9.0,7.0" into tList[1]
3844
end if
3945

4046
return tList
4147
end deployGetIphoneOSes
4248

4349
function deployGetIosMinimumVersions
44-
return "5.1.1,6.0,6.1,7.0,7.1,8.0,8.1,8.2,8.3,8.4"
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"
4551
end deployGetIosMinimumVersions
4652

4753
////////////////////////////////////////////////////////////////////////////////

‎ide-support/revsaveasiosstandalone.livecodescript‎

Lines changed: 23 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -570,10 +570,24 @@ private command revSaveAsMobileStandaloneMain pStack, pAppBundle, pTarget
570570
if pTarget is "Device" and not revEnvironmentIsInstalled() then
571571
revStandaloneProgress "Extracting debug symbols..."
572572

573+
// SN-2015-09-10: [[ Xcode 7.0 ]] Xcode 7.0 sets the env var MallocNanoZone to 1
574+
// but this makes dsymutil crash...
575+
// We reinstate it after symbol extraction as a user might as well set MallocNanoZone
576+
local tOldMallocNanoZone
577+
if $MallocNanoZone is not empty then
578+
put $MallocNanoZone into tOldMallocNanoZone
579+
put 0 into $MallocNanoZone
580+
end if
581+
573582
get shell("dsymutil" && quote & tDeploy["output"] & quote)
574583
if it is not empty then
575584
throw "extracting debug symbols failed with" && it
576585
end if
586+
587+
// Reinstate env var MallocNanoZone if it was set.
588+
if $MallocNanoZone is not empty then
589+
put tOldMallocNanoZone into $MallocNanoZone
590+
end if
577591
end if
578592

579593
-- Only need to sign the bundle if its heading for a device
@@ -643,7 +657,15 @@ private command revSaveAsMobileStandaloneMain pStack, pAppBundle, pTarget
643657
put uniDecode(uniEncode(tCertificate, "UTF8")) into tCertificate
644658

645659
-- Do the codesigning
646-
put tSdkRoot & slash & "Platforms/iPhoneOS.platform/Developer/usr/bin/codesign_allocate" into $CODESIGN_ALLOCATE
660+
// SN-2015-09-11: [[ Xcode 7.0 ]] codesign in Xcode 7.0 will not work if CODESIGN_ALLOCATE
661+
// environment variable is set, so we only set it up to Xcode 6.4
662+
// We use Clang version to get the Xcode version in use
663+
local tClangVersion, tClangMajorVersion
664+
put shell("clang++ --version") into tClangVersion
665+
if matchText(tClangVersion, "Apple LLVM version ([0-9]+)\.[0-9]+.[0-9]+", tClangMajorVersion) \
666+
and tClangMajorVersion < 7 then
667+
put tSdkRoot & slash & "Platforms/iPhoneOS.platform/Developer/usr/bin/codesign_allocate" into $CODESIGN_ALLOCATE
668+
end if
647669

648670
--try
649671
-- Perform the codesigning of the main bundle

0 commit comments

Comments
 (0)