Skip to content

Commit e4a239c

Browse files
livecodesebastienlivecodesebastien
committed
Merge remote-tracking branch 'origin/develop-6.7' into develop-7.0
Refactored changes: * addition of `MCPlayer::setdontuseqt` in player-platform.cpp implementation * addition of PlaybleDuration property for Android Native player * Update to StringRef the Environment variable building update for iPhone (mbliphonedc.mm) Conflicts: engine/src/mbliphonedc.mm engine/src/player-platform.cpp engine/src/stack2.cpp ide
2 parents 28438a0 + aa19dbc commit e4a239c

31 files changed

+241
-90
lines changed

‎INSTALL-android.md‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ Create a standalone toolchain (this simplifies setting up the build environment)
3737
````bash
3838
android-ndk-r10e/build/tools/make-standalone-toolchain.sh \
3939
--toolchain=arm-linux-androideabi-clang3.5 \
40-
--platform=android-8 \
40+
--platform=android-10 \
4141
--install-dir=${HOME}/android/toolchain/standalone
4242
````
4343

@@ -75,11 +75,11 @@ LINK="${BINDIR}/${TRIPLE}-clang ${COMMON_FLAGS} -fuse-ld=bfd"
7575
AR="${BINDIR}/${TRIPLE}-ar"
7676

7777
# Android platform information
78-
ANDROID_NDK_VERSION=r10d
79-
ANDROID_PLATFORM=android-8
80-
ANDROID_NDK=${TOOLCHAIN}/android-ndk-r10d
78+
ANDROID_NDK_VERSION=r10e
79+
ANDROID_PLATFORM=android-10
80+
ANDROID_NDK=${TOOLCHAIN}/android-ndk-r10e
8181
ANDROID_SDK=${TOOLCHAIN}/android-sdk-linux
82-
ANDROID_BUILD_TOOLS=22.0.1
82+
ANDROID_BUILD_TOOLS=23.0.1
8383

8484
export JAVA_SDK
8585
export CC CXX LINK AR

‎builder/installer.rev‎

100644100755
1.24 KB
Binary file not shown.

‎builder/installer_utilities.livecodescript‎

Lines changed: 16 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -244,7 +244,14 @@ end runFacelessInstall
244244

245245
-- Faceless uninstall option
246246
command runFacelessUninstall
247-
send "runFaceless" to stack "UninstallerUI"
247+
put true into sIsFaceless
248+
249+
try
250+
send "runFaceless" to stack "UninstallerUI"
251+
catch tError
252+
quit 1
253+
end try
254+
quit 0
248255
end runFacelessUninstall
249256

250257
-- InstallerActions mode is backend process for installation. It reads the
@@ -1227,9 +1234,9 @@ command actionUninstall pPath, pRecord, pPreInstall
12271234
end if
12281235
end if
12291236

1230-
-- Notify the master that we are done (but only if this is not a pre-install uninstall)
1237+
-- Notify the master that uninstalling is done (but only if this is not a pre-install uninstall)
12311238
if not pPreInstall then
1232-
reportFinished
1239+
reportFinished true
12331240
end if
12341241
end actionUninstall
12351242

@@ -1400,14 +1407,18 @@ private command reportProgress pProgress, pMessage
14001407
end if
14011408
end reportProgress
14021409

1403-
private command reportFinished
1410+
private command reportFinished pIsUninstall
14041411
if not sIsFaceless then
14051412
if the environment is "installer" then
14061413
log "Done"
14071414
write "done" & return to stdout
14081415
end if
14091416
else
1410-
write "Installation succeded." & return to stdout
1417+
if pIsUninstall then
1418+
write "Successfully uninstalled." & return to stdout
1419+
else
1420+
write "Installation succeeded." & return to stdout
1421+
end if
14111422
end if
14121423
end reportFinished
14131424

‎builder/tools_builder.livecodescript‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -319,7 +319,8 @@ private command toolsBuilderMakeInstaller pVersion, pEdition, pPlatform, pIdeFol
319319
end repeat
320320
delete the last char of tParams["auxiliary_stackfiles"]
321321

322-
put "insert script of stack" && quote & "revLibUrl" & quote && "into back" into tParams["startup_script"]
322+
// revLibURL needs to initialise its custom props, and revLoadLibrary must therefore be called.
323+
put merge("send [[quote]]revLoadLibrary[[quote]] to stack [[quote]]revLibUrl[[quote]]") into tParams["startup_script"]
323324
put return & "insert script of stack" && quote & "InstallerUtilities" & quote && "into back" after tParams["startup_script"]
324325

325326
switch pPlatform

‎docs/dictionary/function/mobileControlGet.xml‎

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

‎docs/notes/bugfix-11133.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
# <installer> uninstall noui does not trigger uninstaller with no UI

‎docs/notes/bugfix-11709.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
# Set the vScroll property of a native scroller does not work on Android

‎docs/notes/bugfix-15255.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
# Windows videograbber should default to DirectX, not Qt

‎docs/notes/bugfix-15873.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
# Closing a minimized stack in LC676 saves the stacks rect as -32000,-32000,...

‎docs/notes/bugfix-15875.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
# Rotating Android causes app to restart if minimum version is set above 3.1 at deployment

0 commit comments

Comments
 (0)