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

Commit a3ada3a

Browse files
author
livecodeali
committed
Merge remote-tracking branch 'upstream/develop-7.0' into develop
Conflicts: ide prebuilt/libcef.gyp thirdparty version
2 parents cf60420 + 2fd16c5 commit a3ada3a

36 files changed

+362
-122
lines changed

‎buildbot.mk‎

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,15 @@ BUILDTOOL_STACK = builder/builder_tool.livecodescript
8585

8686
WKHTMLTOPDF ?= $(shell which wkhtmltopdf 2>/dev/null)
8787

88-
bin_dir = $(BUILD_PLATFORM)-bin
88+
# Those directories are given to the tool builder, and they might get passed
89+
# (like private-dir) to engine functions, to which a path relative to this file
90+
# becomes invalid).
91+
top_src_dir=${PWD}
92+
engine_dir=${top_src_dir}
93+
output_dir=${top_src_dir}
94+
work_dir=${top_src_dir}/_cache/builder_tool
95+
private_dir=${top_src_dir}/..
96+
bin_dir = ${top_src_dir}/$(BUILD_PLATFORM)-bin
8997

9098
ifeq ($(BUILD_PLATFORM),mac)
9199
LIVECODE = $(bin_dir)/LiveCode-Community.app/Contents/MacOS/LiveCode-Community
@@ -101,8 +109,8 @@ endif
101109
# FIXME add --warn-as-error
102110
buildtool_command = $(LIVECODE) -ui $(BUILDTOOL_STACK) \
103111
--build $(BUILD_STABILITY) \
104-
--engine-dir . --output-dir . --work-dir ./_cache/builder_tool \
105-
--private-dir ..
112+
--engine-dir ${engine_dir} --output-dir ${output_dir} --work-dir ${work_dir} \
113+
--private-dir ${private_dir}
106114

107115
# Settings for upload
108116
RSYNC ?= rsync
@@ -149,6 +157,10 @@ dist-upload-files.txt:
149157
find . -maxdepth 1 -name 'LiveCode*Installer-*-Mac.dmg' \
150158
-o -name 'LiveCode*Installer-*-Windows.exe' \
151159
-o -name 'LiveCode*Installer-*-Linux.*' \
160+
-o -name 'LiveCode*Server-*-Linux*.zip' \
161+
-o -name 'LiveCode*Server-*-Mac.zip' \
162+
-o -name 'LiveCode*Server-*-Windows.zip' \
163+
-o -name '*-bin.tar.xz' \
152164
> $@
153165

154166
# Perform the upload. This is in two steps:

‎builder/builder_utilities.livecodescript‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -263,6 +263,15 @@ function builderCommercialResourceFolder
263263
return builderCommercialFolder() & "/engine/rsrc"
264264
end builderCommercialResourceFolder
265265

266+
function builderCommunityFolder
267+
set the itemDel to slash
268+
return item 1 to -3 of the filename of me
269+
end builderCommunityFolder
270+
271+
function builderCommunityResourceFolder
272+
return builderCommunityFolder() & "/engine/rsrc"
273+
end builderCommunityResourceFolder
274+
266275
function builderBuildsFolder
267276
set the itemDelimiter to slash
268277
return item 1 to -4 of the filename of me

‎builder/server_builder.livecodescript‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ command serverBuilderRun pPlatform, pEdition
2727

2828
-- Make sure that the output directory exists
2929
local tOutputDir
30-
put builderWorkspaceFolder() & slash & "deploy" into tOutputDir
30+
put builderOutputFolder() into tOutputDir
3131
builderEnsureFolder tOutputDir
3232

3333
local tOutputFile

‎builder/tools_builder.livecodescript‎

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -315,6 +315,9 @@ private command toolsBuilderMakeInstaller pVersion, pEdition, pPlatform, pIdeFol
315315
put pPackageFile into tParams["payload"]
316316
put tOutputFileStub & ".unsigned.exe" into tParams["output"]
317317

318+
// libURL is needed in the timestamp processing
319+
start using stack (builderRepoFolder() & slash & "ide-support" & slash & "revliburl.livecodescript")
320+
318321
if pEdition is "Commercial" then
319322
put builderCommercialResourceFolder() & "/installer.ico" into tParams["appicon"]
320323
end if
@@ -327,12 +330,13 @@ private command toolsBuilderMakeInstaller pVersion, pEdition, pPlatform, pIdeFol
327330
end if
328331

329332
-- Next we sign the installer using the certificate (if available)
330-
if there is a folder (builderSystemFolder() & slash & "certificates") then
333+
put builderPrivateRepoFolder() & slash & "certificates" into tCertificatesFolder
334+
if there is a folder (tCertificatesFolder) then
331335
put tParams["output"] into tSignParams["input"]
332336
put tOutputFileStub & ".exe" into tSignParams["output"]
333-
put builderSystemFolder() & slash & "certificates/runrev_bin.spc" into tSignParams["certificate"]
334-
put builderSystemFolder() & slash & "certificates/runrev.pvk" into tSignParams["privatekey"]
335-
put word 1 of url ("file:" & builderSystemFolder() & slash & "certificates/runrev_password.txt") into tSignParams["passphrase"]
337+
put tCertificatesFolder & "/runrev_bin.spc" into tSignParams["certificate"]
338+
put tCertificatesFolder & "/runrev.pvk" into tSignParams["privatekey"]
339+
put word 1 of url ("file:" & tCertificatesFolder & "/runrev_password.txt") into tSignParams["passphrase"]
336340
put "http://timestamp.verisign.com/scripts/timstamp.dll" into tSignParams["timestamper"]
337341
put "http://www.runrev.com" into tSignParams["url"]
338342
if pEdition is "Community" then
@@ -390,7 +394,7 @@ private command toolsBuilderMakeInstaller pVersion, pEdition, pPlatform, pIdeFol
390394
create folder tOutputFileStub & ".app" & slash & "Contents/Resources"
391395
put tPlistFile into url ("file:" & tOutputFileStub & ".app" & slash & "Contents/Info.plist")
392396
if pEdition is "Community" then
393-
put url ("binfile:" & builderInstallerEngine("macosx") & slash & "Contents/Resources/Installer.icns") into url ("binfile:" & tOutputFileStub & ".app" & slash & "Contents/Resources/Installer.icns")
397+
put url ("binfile:" & builderCommunityResourceFolder() & "/Installer.icns") into url ("binfile:" & tOutputFileStub & ".app" & slash & "Contents/Resources/Installer.icns")
394398
else
395399
put url ("binfile:" & builderCommercialResourceFolder() & "/Installer.icns") into url ("binfile:" & tOutputFileStub & ".app" & slash & "Contents/Resources/Installer.icns")
396400
end if

‎config/ios.gypi‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
'SDKROOT': '<(target_sdk)',
1818
'SUPPORTED_PLATFORMS': 'iphoneos iphonesimulator',
1919

20-
'SOLUTION_DIR': '<(DEPTH)',
20+
'SOLUTION_DIR': '$(SOURCE_ROOT)/<(DEPTH)',
2121
'SYMROOT': '$(SOLUTION_DIR)/_build/ios/$(SDK_NAME)',
2222
'OBJROOT': '$(SOLUTION_DIR)/_cache/ios/$(SDK_NAME)',
2323
'CONFIGURATION_BUILD_DIR': '$(SYMROOT)/$(CONFIGURATION)',

‎docs/dictionary/function/mobileGetLaunchData.xml‎

Lines changed: 89 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,89 @@
1+
<doc>
2+
<legacy_id></legacy_id>
3+
<name>mobileGetLaunchData</name>
4+
<type>function</type>
5+
6+
<syntax>
7+
<example>get mobileGetLaunchData()</example>
8+
</syntax>
9+
10+
<synonyms>
11+
</synonyms>
12+
13+
<summary>Returns an array containing information set by the launcher of the application.</summary>
14+
15+
<examples>
16+
<example>put mobileGetLaunchData() into tLaunchData</example>
17+
<example>
18+
<p>constant kActionView = "android.intent.action.VIEW"</p>
19+
<p></p>
20+
<p>put mobileGetLaunchData() into tLaunchData</p>
21+
<p>if tLaunchData is an array and tLaunchData["action"] is kActionView then</p>
22+
<p> -- view content specified in tLaunchData["data"]</p>
23+
<p>else</p>
24+
<p> -- launched as main application</p>
25+
<p>end if</p></example>
26+
</examples>
27+
28+
<history>
29+
<introduced version="7.0">Added.</introduced>
30+
<deprecated version=""></deprecated>
31+
<removed version=""></removed>
32+
33+
</history>
34+
35+
<objects>
36+
</objects>
37+
38+
<platforms>
39+
<android/>
40+
</platforms>
41+
42+
<classes>
43+
<mobile/>
44+
</classes>
45+
46+
<security>
47+
</security>
48+
49+
50+
<classification>
51+
</classification>
52+
53+
<references>
54+
</references>
55+
56+
<description>
57+
<overview>>Returns an array containing information set by the launcher of the application.</overview>
58+
59+
<parameters>
60+
<parameter>
61+
<name/>
62+
<description/>
63+
<options title="Launch Data - The application launch data is stored as an array and has the following keys:">
64+
<option>
65+
<item>action</item>
66+
<description>The general action the app was launched to perform.</description>
67+
</option>
68+
<option>
69+
<item>data</item>
70+
<description>The data to operate on.</description>
71+
</option>
72+
<option>
73+
<item>type</item>
74+
<description>The MIME type of the data provided.</description>
75+
</option>
76+
<option>
77+
<item>categories</item>
78+
<description>Additional information about the action to perform.</description>
79+
</option>
80+
</options>
81+
</parameter>
82+
</parameters>
83+
84+
<value>Use the <b>mobileGetLaunchData</b> function to get the application launch parameters.<p></p><p>The returned array will contain the information that is set by the launching application</p></value>
85+
<comments>The <b>mobileGetLaunchData</b> function returns the information that was set by the launching application. This can be used to perform specific actions supported by an application on the provided data. <p></p>
86+
<p></p>
87+
<note> On Android, custom Intent filters can be specified in the manifest to allow an application to perform actions for other applications</note><p></p>When the application is launched to handle one of these actions, its launch Intent can be queried to determine what action was requested, and the data to use to fulfil that request.</comments>
88+
</description>
89+
</doc>

‎docs/notes/bugfix-11866.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
# iphoneHeadingCalibrationTimeout returns empty

‎docs/notes/bugfix-14056.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
# Cannot hide cursor on Mac from LiveCode 6.7

‎docs/notes/feature-launch_data_android.md‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
# mobileLaunchData function
2+
3+
This new function is available on Android and returns an array containing information from the Intent object used to launch the currently running app.
4+
5+
## Available information
6+
* `action` - The general action the app was launched to perform.
7+
* `data` - The data to operate on.
8+
* `type` - The MIME type of the data provided.
9+
* `categories` - Additional information about the action to perform.

‎engine/app-bundle-template.gypi‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
'target_conditions':
1010
[
1111
[
12-
'_type != "none"',
12+
'_type == "executable"',
1313
{
1414
'mac_bundle': 1,
1515
},

0 commit comments

Comments
 (0)