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

Commit d52888d

Browse files
livecodealilivecodeali
committed
Merge remote-tracking branch 'upstream/develop-8.1' into merge-develop-8.1_07.04.17
Conflicts: buildbot.py engine/src/exec-multimedia.cpp engine/src/mbliphonesound.mm ide
2 parents 0e53aca + 4b9e9af commit d52888d

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

52 files changed

+531
-365
lines changed

‎buildbot.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
'universal-ios-iphonesimulator9.2',
4848
'universal-ios-iphonesimulator8.2',
4949
'x86-win32', # TODO[2017-03-23] More specific ABI
50-
'js-emscripten', # TODO[2017-03-23] More specific ABI
50+
'js-emscripten-sdk1.35',
5151
)
5252
# The set of build tasks that this branch supports
5353
BUILDBOT_TARGETS = ('config', 'compile', 'bin-archive', 'bin-extract',

‎builder/tools_builder.livecodescript‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -545,6 +545,23 @@ private function escapeArg pArg
545545
return pArg
546546
end escapeArg
547547

548+
-- Needed on MacOS Sierra
549+
private command clearExtendedAttributes pAppBundle
550+
-- make sure you have permission to clear extended attributes from bundle files
551+
get shell("chmod -R u+w" && pAppBundle)
552+
if the result is not zero then
553+
builderLog "error", "Setting permissions failed with error:" && it
554+
throw "failure"
555+
end if
556+
557+
-- clear extended attributes from bundle files
558+
get shell("xattr -cr" && pAppBundle)
559+
if the result is not zero then
560+
builderLog "error", "Clearing extended attributes failed with error:" && it
561+
throw "failure"
562+
end if
563+
end clearExtendedAttributes
564+
548565
private function findSigningIdentity
549566
get shell("/usr/bin/security -q find-identity -v")
550567
filter it with "*Developer ID Application: Runtime Revolution Ltd*"
@@ -656,6 +673,8 @@ command toolsBuilderMakeAppBundle pVersion, pEdition, pPlatform
656673
get shell("file" && escapeArg(tFullPath))
657674
if tFile is "Standalone" or "Mach-O" is not among the words of it then next repeat
658675

676+
clearExtendedAttributes escapeArg(tFullPath)
677+
659678
-- Sign the extension
660679
-- The "--force" parameter strips the existing signature (which was
661680
-- made using a not-valid-for-distribution profile)
@@ -668,6 +687,8 @@ command toolsBuilderMakeAppBundle pVersion, pEdition, pPlatform
668687
end repeat
669688
end repeat
670689

690+
clearExtendedAttributes escapeArg(tAppBundle)
691+
671692
builderLog "message", "Signing macosx app bundle" && "'" & tAppBundle & "'"
672693
wait 1 second
673694
get shell("/usr/bin/codesign --sign" && word 2 of tSigningId && "--deep --verbose=2" && escapeArg(tAppBundle))

‎docs/notes/bugfix-10947.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
# Fix hypercard-compatibility dynamic path behavior

‎docs/notes/bugfix-19248.md‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎docs/notes/bugfix-19307.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
# Prevent crash when saving standalone while player is playing

‎docs/notes/bugfix-19404.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
# Fix crash on iOS when calling `play empty` followed by `play path/to/audio/file`

‎docs/notes/bugfix-19469.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
# Make sure the long time format is correct if `twelveHourTime` is false

‎docs/notes/bugfix-19490.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
# Make sure launch url sets the result to empty on success

‎docs/notes/bugfix-19500.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
# Fix crash when invalid url is used with iOS native browser

‎docs/notes/bugfix-19515.md‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
# Ensure the formattedRect of line N always returns the correct result
2+

0 commit comments

Comments
 (0)