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

Commit 315ebf3

Browse files
livecodepanoslivecodepanos
committed
Merge remote-tracking branch 'upstream/develop-9.6' into merge-develop-9.6_10_06_2021
2 parents f820b87 + 94ec39c commit 315ebf3

22 files changed

+167
-111
lines changed

‎docs/dictionary/function/iphoneDeviceModel.lcdoc‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
Name: iphoneDeviceModel
2+
3+
Type: function
4+
5+
Syntax: iphoneDeviceModel()
6+
7+
Summary:
8+
Returns the machine name of the device the app is running on
9+
10+
11+
Introduced: 9.6.3
12+
13+
OS: ios
14+
15+
Platforms: mobile
16+
17+
Example:
18+
local tModel
19+
put iphoneDeviceModel() into tModel
20+
21+
22+
Description:
23+
Use the <iphoneDeviceModel> function to get the machine name of the device the app is running on
24+
25+
Note: The machine name is different from the full readable name of the device.
26+
You can find a mapping between these two names here: http://theiphonewiki.com/wiki/Models
27+
28+
29+

‎docs/notes/bugfix-16745.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
# An issue causing `$_POST_RAW` on Windows to not be set for large uploads has been fixed.

‎docs/notes/bugfix-21769.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
# Added new function iphoneDeviceModel() that returns the machine name of the iOS device the app is running on

‎engine/bind-ios-standalone.sh‎

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,23 @@
11
#!/bin/bash
22

3+
read SDK_MAJORVERSION SDK_MINORVERSION <<<${SDK_NAME//[^0-9]/ }
4+
35
set -e
46

57
case "$1" in
68
*-community.lcext)
7-
DEPS_FILE="${SRCROOT}/standalone.ios"
9+
if [[ $SDK_MAJORVERSION -lt 14 ]] ; then
10+
DEPS_FILE="${SRCROOT}/standalone.ios"
11+
else
12+
DEPS_FILE="${SRCROOT}/standalone14.ios"
13+
fi
814
;;
915
*-commercial.lcext)
10-
DEPS_FILE="${SRCROOT}/../livecode/engine/standalone.ios"
16+
if [[ $SDK_MAJORVERSION -lt 14 ]] ; then
17+
DEPS_FILE="${SRCROOT}/../livecode/engine/standalone.ios"
18+
else
19+
DEPS_FILE="${SRCROOT}/../livecode/engine/standalone14.ios"
20+
fi
1121
;;
1222
esac
1323

‎engine/engine.gyp‎

Lines changed: 19 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -289,12 +289,26 @@
289289

290290
# Forces all dependencies to be linked properly
291291
'type': 'shared_library',
292+
293+
'conditions':
294+
[
295+
[
296+
'("11" not in target_sdk) and ("12" not in target_sdk) and ("13" not in target_sdk)',
297+
{
298+
'variables':
299+
{
300+
'deps_file': '${SRCROOT}/standalone14.ios',
301+
},
302+
},
303+
{
304+
'variables':
305+
{
306+
'deps_file': '${SRCROOT}/standalone.ios',
307+
},
308+
}
309+
],
310+
],
292311

293-
'variables':
294-
{
295-
'deps_file': '${SRCROOT}/standalone.ios',
296-
},
297-
298312
'xcode_settings':
299313
{
300314
'DEAD_CODE_STRIPPING': 'NO',

‎engine/kernel.gyp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,7 @@
187187
},
188188
],
189189
[
190-
'OS == "ios" and target_sdk >= "14.0"',
190+
'OS == "ios" and ("11" not in target_sdk) and ("12" not in target_sdk) and ("13" not in target_sdk)',
191191
{
192192
'libraries':
193193
[

‎engine/rsrc/android-manifest.xml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,14 @@ ${USES_PERMISSION}${USES_FEATURE}
1313
android:normalScreens="true"
1414
android:smallScreens="true"
1515
android:anyDensity="true" />
16-
<application android:label="${LABEL}" ${ICON} android:debuggable="false">
16+
<application android:label="${LABEL}" ${ICON} android:debuggable="false" ${ALLOW_HTTP_CONNECTIONS}>
1717
<activity android:name="${NAME}"
1818
android:theme="${THEME}"
1919
android:screenOrientation="${ORIENTATION}"
2020
android:configChanges="${CONFIG_CHANGES}"
2121
android:windowSoftInputMode="stateHidden"
2222
android:launchMode="singleTask"
2323
android:hardwareAccelerated="${HARDWARE_ACCELERATED}">
24-
${ALLOW_HTTP_CONNECTIONS}
2524
<intent-filter>
2625
<action android:name="android.intent.action.MAIN" />
2726
<category android:name="android.intent.category.LAUNCHER" />

‎engine/src/exec-misc.cpp‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -117,6 +117,14 @@ void MCMiscExecVibrate(MCExecContext& ctxt, int32_t* p_number_of_times)
117117
ctxt.Throw();
118118
}
119119

120+
void MCMiscGetDeviceModel(MCExecContext& ctxt, MCStringRef& r_model)
121+
{
122+
if(MCSystemGetDeviceModel(r_model))
123+
return;
124+
125+
ctxt.Throw();
126+
}
127+
120128
void MCMiscGetDeviceResolution(MCExecContext& ctxt, MCStringRef& r_resolution)
121129
{
122130
if(MCSystemGetDeviceResolution(r_resolution))

‎engine/src/exec.h‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4017,6 +4017,7 @@ void MCMiscGetLaunchData(MCExecContext &ctxt, MCArrayRef &r_data);
40174017
void MCMiscExecBeep(MCExecContext& ctxt, int32_t* p_number_of_times);
40184018
void MCMiscExecVibrate(MCExecContext& ctxt, int32_t* p_number_of_times);
40194019

4020+
void MCMiscGetDeviceModel(MCExecContext& ctxt, MCStringRef& r_model);
40204021
void MCMiscGetDeviceResolution(MCExecContext& ctxt, MCStringRef& r_resolution);
40214022
void MCMiscSetUseDeviceResolution(MCExecContext& ctxt, bool p_use_device_res, bool p_use_control_device_res);
40224023
void MCMiscGetDeviceScale(MCExecContext& ctxt, real64_t& r_scale);

‎engine/src/mblandroidmisc.cpp‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -655,6 +655,12 @@ bool MCSystemGetPixelDensity(real64_t& r_density)
655655

656656
////////////////////////////////////////////////////////////////////////////////
657657

658+
bool MCSystemGetDeviceModel(MCStringRef& p_model)
659+
{
660+
// Not implemented
661+
return false;
662+
}
663+
658664
bool MCSystemGetDeviceResolution(MCStringRef& p_resolution)
659665
{
660666
// Not implemented

0 commit comments

Comments
 (0)