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

Commit 261a207

Browse files
livecodesebastienlivecodesebastien
committed
Merge remote-tracking branch 'origin/develop-6.7' into develop-7.0
No unreviewed change made. Conflicts: libgraphics/libgraphics.gyp prebuilt version
2 parents d639869 + 19908af commit 261a207

File tree

12 files changed

+62
-16
lines changed

12 files changed

+62
-16
lines changed

‎HACKING.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
@@ -24,8 +24,8 @@ WINE ?= wine
2424

2525
# Some magic to control which versions of iOS we try to build. N.b. you may
2626
# also need to modify the buildbot configuration
27-
IPHONEOS_VERSIONS ?= 8.2 8.4
28-
IPHONESIMULATOR_VERSIONS ?= 5.1 6.1 7.1 8.2 8.4
27+
IPHONEOS_VERSIONS ?= 8.2 8.4 9.0
28+
IPHONESIMULATOR_VERSIONS ?= 5.1 6.1 7.1 8.2 8.4 9.0
2929

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

‎config.sh‎

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

241241
# Default target architectures
242+
# iOS architectures are restricted to 32-bit only for iOS 5.1, 6.1 and 7.1
242243
if test -z "$TARGET_ARCH"; then
243244
case ${PLATFORM} in
244245
*-x86) TARGET_ARCH="x86" ;;
@@ -247,11 +248,15 @@ if test -z "$TARGET_ARCH"; then
247248

248249
mac*|ios*)
249250
case ${XCODE_TARGET_SDK} in
250-
macosx*) TARGET_ARCH="i386" ;;
251-
iphoneos8*) TARGET_ARCH="armv7 arm64" ;;
252-
iphoneos*) TARGET_ARCH="armv7" ;;
253-
iphonesimulator8*) TARGET_ARCH="i386 x86_64" ;;
254-
iphonesimulator*) TARGET_ARCH="i386" ;;
251+
macosx*) TARGET_ARCH="i386" ;;
252+
iphoneos5* | \
253+
iphoneos6* | \
254+
iphoneos7*) TARGET_ARCH="armv7" ;;
255+
iphoneos*) TARGET_ARCH="armv7 arm64" ;;
256+
iphonesimulator5* | \
257+
iphonesimulator6* | \
258+
iphonesimulator7*) TARGET_ARCH="i386" ;;
259+
iphonesimulator*) TARGET_ARCH="i386 x86_64" ;;
255260
esac
256261
;;
257262

‎config/ios.gypi‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,10 @@
2929
'IPHONEOS_DEPLOYMENT_TARGET[arch=i386]': '5.1.1',
3030
'IPHONEOS_DEPLOYMENT_TARGET[arch=arm64]': '7.0.0',
3131
'IPHONEOS_DEPLOYMENT_TARGET[arch=x86_64]': '7.0.0',
32+
'ENABLE_BITCODE[arch=armv7]': 'No',
33+
'ENABLE_BITCODE[arch=i386]': 'No',
34+
'ENABLE_BITCODE[arch=arm64]': 'Yes',
35+
'ENABLE_BITCODE[arch=x86_64]': 'Yes',
3236
'TARGETED_DEVICE_FAMILY': '1,2',
3337
'DEBUG_INFORMATION_FORMAT': 'dwarf-with-dsym',
3438
'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
@@ -252,7 +252,8 @@ static MCKeyBinding s_mac_keybindings[] =
252252
{ XK_K, MK_CTRL, FT_DELEOP },
253253

254254
// Backward Deletion
255-
{ XK_BackSpace, MK_NONE, FT_DELBCHAR },
255+
// PM-2015-09-16: [[ Bug 15934 ]] Make sure pressing Backspace key works as expected, even if Shift key is down
256+
{ XK_BackSpace, MK_IGNORE_SHIFT, FT_DELBCHAR },
256257
{ XK_BackSpace, MK_CMD, FT_DELBOL },
257258
{ XK_BackSpace, MK_CTRL, FT_DELBSUBCHAR },
258259
{ 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 "5.1,6.1,7.1,8.2,8.4"
22+
return "5.1,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
@@ -559,10 +559,24 @@ private command revSaveAsMobileStandaloneMain pStack, pAppBundle, pTarget
559559
if pTarget is "Device" and not revEnvironmentIsInstalled() then
560560
revStandaloneProgress "Extracting debug symbols..."
561561

562+
// SN-2015-09-10: [[ Xcode 7.0 ]] Xcode 7.0 sets the env var MallocNanoZone to 1
563+
// but this makes dsymutil crash...
564+
// We reinstate it after symbol extraction as a user might as well set MallocNanoZone
565+
local tOldMallocNanoZone
566+
if $MallocNanoZone is not empty then
567+
put $MallocNanoZone into tOldMallocNanoZone
568+
put 0 into $MallocNanoZone
569+
end if
570+
562571
get shell("dsymutil" && quote & tDeploy["output"] & quote)
563572
if it is not empty then
564573
throw "extracting debug symbols failed with" && it
565574
end if
575+
576+
// Reinstate env var MallocNanoZone if it was set.
577+
if $MallocNanoZone is not empty then
578+
put tOldMallocNanoZone into $MallocNanoZone
579+
end if
566580
end if
567581

568582
-- Only need to sign the bundle if its heading for a device
@@ -632,7 +646,15 @@ private command revSaveAsMobileStandaloneMain pStack, pAppBundle, pTarget
632646
put uniDecode(uniEncode(tCertificate, "UTF8")) into tCertificate
633647

634648
-- Do the codesigning
635-
put tSdkRoot & slash & "Platforms/iPhoneOS.platform/Developer/usr/bin/codesign_allocate" into $CODESIGN_ALLOCATE
649+
// SN-2015-09-11: [[ Xcode 7.0 ]] codesign in Xcode 7.0 will not work if CODESIGN_ALLOCATE
650+
// environment variable is set, so we only set it up to Xcode 6.4
651+
// We use Clang version to get the Xcode version in use
652+
local tClangVersion, tClangMajorVersion
653+
put shell("clang++ --version") into tClangVersion
654+
if matchText(tClangVersion, "Apple LLVM version ([0-9]+)\.[0-9]+.[0-9]+", tClangMajorVersion) \
655+
and tClangMajorVersion < 7 then
656+
put tSdkRoot & slash & "Platforms/iPhoneOS.platform/Developer/usr/bin/codesign_allocate" into $CODESIGN_ALLOCATE
657+
end if
636658

637659
--try
638660
-- Perform the codesigning of the main bundle

0 commit comments

Comments
 (0)