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

Commit 71b76af

Browse files
livecodesebastienlivecodesebastien
committed
Merge remote-tracking branch 'origin/develop-6.7' into merge_6.7.5-rc-1
Conflicts: engine/src/dskspec.cpp engine/src/mblandroidfs.cpp engine/src/mbliphone.mm engine/src/osspec.h engine/src/sysspec.cpp ide prebuilt tools/build-android.osx version
2 parents 4b933b4 + ca14f9a commit 71b76af

42 files changed

Lines changed: 335 additions & 100 deletions

Some content is hidden

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

‎Livecode.files‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3445,8 +3445,11 @@ thirdparty/libzip/src/zipint.h
34453445
thirdparty/libzip/src/zipintw32.h
34463446
thirdparty/libzip/score.txt
34473447
thirdparty/tools/perfect.c
3448+
tools/build-android.osx
3449+
tools/build-ios.osx
34483450
tools/build-extension-ios.sh
34493451
score.txt
3452+
version
34503453
Makefile
34513454
engine/Makefile.standalone
34523455
engine/Makefile.server

‎docs/dictionary/function/specialFolderPath.xml‎

Lines changed: 35 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,12 @@
2525
<introduced version="1.1">Added.</introduced>
2626
<deprecated version=""></deprecated>
2727
<removed version=""></removed>
28+
<changed version="6.7.5">Added &quot;resources&quot; folder for Desktop platform</changed>
2829
<changed version="6.7.0">Added &quot;engine&quot; folder for Desktop platforms</changed>
29-
<changed version="4.6.1">Added Android Support.</changed>
30-
<changed version="5.5.3">5.5.3</changed>
31-
<changed version="4.5.2">Added iOS Support.</changed>
32-
<changed version="2.9">2.9</changed>
30+
<changed version="4.6.1">Added Android Support.</changed>
31+
<changed version="5.5.3">5.5.3</changed>
32+
<changed version="4.5.2">Added iOS Support.</changed>
33+
<changed version="2.9">2.9</changed>
3334
<experimental version=""></experimental>
3435
<nonexperimental version=""></nonexperimental>
3536
</history>
@@ -114,7 +115,11 @@
114115
</option>
115116
<option>
116117
<item>Engine</item>
117-
<description>The folder containing the engine.</description>
118+
<description>The folder containing the engine and the executable files copied in the standalone application.</description>
119+
</option>
120+
<option>
121+
<item>Resources</item>
122+
<description>In development mode, the current stack folder. In a standalone, the resources folder where non-executable files, or folders specified from the Standalone Builder, are copied.</description>
118123
</option>
119124
</options>
120125
<options title="For Mac OS X systems:">
@@ -156,7 +161,11 @@
156161
</option>
157162
<option>
158163
<item>Engine</item>
159-
<description>The folder containing the engine.</description>
164+
<description>The folder containing the engine and the executable files copied in the standalone application.</description>
165+
</option>
166+
<option>
167+
<item>Resources</item>
168+
<description>In development mode, the current stack folder. In a standalone, the resources folder where non-executable files, or folders specified from the Standalone Builder, are copied.</description>
160169
</option>
161170
</options>
162171
<options title="For Windows systems:">
@@ -196,6 +205,10 @@
196205
<item>Engine</item>
197206
<description>The folder containing the engine.</description>
198207
</option>
208+
<option>
209+
<item>Resources</item>
210+
<description>In development mode, the current stack folder. In a standalone, the resources folder where files or folders specified from the Standalone Builder are copied.</description>
211+
</option>
199212
</options>
200213
<options title="Windows CSIDL numbers:">
201214
<option>
@@ -226,6 +239,10 @@
226239
<item>Engine</item>
227240
<description>The folder containing the engine.</description>
228241
</option>
242+
<option>
243+
<item>Resources</item>
244+
<description>In development mode, the current stack folder. In a standalone, the resources folder where files or folders specified from the Standalone Builder are copied.</description>
245+
</option>
229246
</options>
230247
<options title="For Unix systems:">
231248
<option>
@@ -248,6 +265,10 @@
248265
<item>Engine</item>
249266
<description>The folder containing the engine.</description>
250267
</option>
268+
<option>
269+
<item>Resources</item>
270+
<description>In development mode, the current stack folder. In a standalone, the resources folder where files or folders specified from the Standalone Builder are copied.</description>
271+
</option>
251272
</options>
252273
<options title="For iOS systems:">
253274
<option>
@@ -274,6 +295,10 @@
274295
<item>engine</item>
275296
<description>The folder containing the built standalone engine (i.e. the bundle). This is useful for constructing paths to resources that have been copied into the bundle at build time.</description>
276297
</option>
298+
<option>
299+
<item>resources</item>
300+
<description>The path to the folder where the files and folders are copied in the standalone application (same as the engine folder).</description>
301+
</option>
277302
</options>
278303
<options title="For Android systems:">
279304
<option>
@@ -288,6 +313,10 @@
288313
<item>cache</item>
289314
<description>The path to a folder that can be used for transient per-application data files.</description>
290315
</option>
316+
<option>
317+
<item>resources</item>
318+
<description>The path to the folder where files and folders are copied in the standalone application (same as the engine folder).</description>
319+
</option>
291320
</options>
292321
</parameter> </parameters>
293322

‎docs/notes/bugfix-13452.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
# revVideoGrabber crashes in Windows 8

‎docs/notes/bugfix-14244.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
# acceleratedRendering property causes crash

‎docs/notes/bugfix-14295.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
# standalone built for Yosemite cannot connect to database if it is within the app bundle

‎docs/notes/bugfix-14879.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
# android mobile app launch hangs up while processing the opencard handler

‎docs/notes/bugfix-15187.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
# Xcode 6.3 cannot be selected for iOS deployment

‎docs/notes/bugfix-15231.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
#All root folders are added (empty) in the Mac standalone's Externals folders if ~/Documents/My LiveCode/Runtime/Mac OS X/x86-32/Externals/externals.txt file does not exist

‎docs/notes/feature-specialFolderPath-resources.md‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
# Relocation of resources for Mac standalone applications
2+
3+
As stated in their [Technical Note 2206](https://developer.apple.com/library/mac/technotes/tn2206/_index.html#//apple_ref/doc/uid/DTS40007919-CH1-TNTAG205), Apple does not allow application to have unsigned code in the MacOS folder.
4+
5+
To comply with this new rule, every non-executable file is now copied in the folder `<App>.app/Contents/Resources/_MacOS`.
6+
7+
As for the executable files, they are still copied alongside the engine, and located in `specialFolderPath("engine")`.
8+
9+
This change does not impact any of the engine functions, which automatically redirect any path targeting the former location of the resource files.
10+
11+
However, the same does not apply to the externals, as they cannot determine if a path belongs to the app bundle or not; that affects also LiveCode external, such as revDatabase, this relocation breaks any script calling externals with a resource file.
12+
13+
In order to help with this overcoming this issue, the option **Resources** has been added for *specialFolderPath* on Desktop platforms, in LiveCode 6.7.2.
14+
15+
That will allow you to get the right path to the resources, being in development or standalone mode.
16+
17+
For instance, a code which used to be
18+
19+
// Get the place Resources folder
20+
put the filename of this stack into tDatabasePath
21+
delete the last item of tDatabasePath
22+
// Append the SQLite file
23+
put "/database/db.sqlite" after tDatabasePath
24+
put revOpenDatabase("sqlite",tDatabasePath) into tDatabaseID
25+
26+
can be updated to
27+
28+
put specialFolderPath("resources") into tDbPath
29+
// Append the SQLite file
30+
put "/database/db.sqlite" after tDatabasePath
31+
put revOpenDatabase("sqlite",tDatabasePath) into tDatabaseID

‎engine/src/dsklnx.cpp‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1463,7 +1463,10 @@ class MCLinuxDesktop: public MCSystemInterface
14631463
else if (MCNameIsEqualTo(p_type, MCN_temporary, kMCCompareCaseless))
14641464
return MCStringCreateWithCString("/tmp", r_folder);
14651465
// SN-2014-08-08: [[ Bug 13026 ]] Fix ported from 6.7
1466-
else if (MCNameIsEqualTo(p_type, MCN_engine, kMCCompareCaseless))
1466+
else if (MCNameIsEqualTo(p_type, MCN_engine, kMCCompareCaseless)
1467+
// SN-2015-04-20: [[ Bug 14295 ]] If we are here, we are a standalone
1468+
// so the resources folder is the engine folder.
1469+
|| MCNameIsEqualTo(p_type, MCN_resources, kMCCompareCaseless))
14671470
{
14681471
uindex_t t_last_slash;
14691472

0 commit comments

Comments
 (0)