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

Commit 22911ea

Browse files
author
Monte Goulding
authored
Merge branch 'develop' into lcidl-to-lcdoc
2 parents 3c52dcd + c68da63 commit 22911ea

File tree

242 files changed

+3223
-1522
lines changed

Some content is hidden

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

242 files changed

+3223
-1522
lines changed

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ extensions/*/*/*.xml
2424
extensions/*/*/*.lci
2525
extensions/*/*/*.lcm
2626
extensions/*/*/*.lce
27+
extensions/*/*/api.lcdoc
2728

2829
# Compiled source and intermediates #
2930
###################

‎Installer/package.txt‎

Lines changed: 55 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -452,6 +452,25 @@ component Extensions
452452
into [[ToolsFolder]]/Extensions place
453453
rfolder macosx:packaged_extensions/com.livecode.library.scriptitems
454454

455+
into [[ToolsFolder]]/Extensions place
456+
rfolder macosx:packaged_extensions/com.livecode.library.diff
457+
into [[ToolsFolder]]/Extensions place
458+
rfolder macosx:packaged_extensions/com.livecode.library.dropbox
459+
into [[ToolsFolder]]/Extensions place
460+
rfolder macosx:packaged_extensions/com.livecode.library.getopt
461+
into [[ToolsFolder]]/Extensions place
462+
rfolder macosx:packaged_extensions/com.livecode.library.httpd
463+
into [[ToolsFolder]]/Extensions place
464+
rfolder macosx:packaged_extensions/com.livecode.library.messageauthentication
465+
into [[ToolsFolder]]/Extensions place
466+
rfolder macosx:packaged_extensions/com.livecode.library.mime
467+
into [[ToolsFolder]]/Extensions place
468+
rfolder macosx:packaged_extensions/com.livecode.library.oauth2
469+
into [[ToolsFolder]]/Extensions place
470+
rfolder macosx:packaged_extensions/com.livecode.library.qr
471+
into [[ToolsFolder]]/Extensions place
472+
rfolder macosx:packaged_extensions/com.livecode.library.objectrepository
473+
455474
component Toolchain.MacOSX
456475
into [[ToolsFolder]]/Toolchain place
457476
executable macosx:lc-compile as lc-compile
@@ -637,22 +656,22 @@ component Runtime.iOS
637656
file ios:iphonesimulator10.2/mobile-disable-ats-template.plist as "DisableATS.plist"
638657
file ios:iphonesimulator10.2/Default-568h@2x.png as "Default4InchSplash.png" base ios:Default-568h@2x.png
639658
file ios:iphonesimulator10.2/fontmap as "fontmap"
640-
into "[[ToolsFolder]]/Runtime/iOS/Simulator-11_0" place
641-
executable ios:iphonesimulator11.0/standalone-mobile[[BaseEditionTagLower]].ios-engine as Standalone base ios:iphonesimulator8.2/standalone-mobile[[BaseEditionTagLower]].app/standalone-mobile[[BaseEditionTagLower]]
642-
executable ios:iphonesimulator11.0/revsecurity.ios-extension as RevSecurity base ios:iphonesimulator8.2/revsecurity.dylib
643-
executable ios:iphonesimulator11.0/revpdfprinter.ios-extension as RevPdfPrinter base ios:iphonesimulator8.2/revpdfprinter.dylib
644-
executable ios:iphonesimulator11.0/revzip.ios-extension as RevZip base ios:iphonesimulator8.2/revzip.dylib
645-
executable ios:iphonesimulator11.0/revxml.ios-extension as RevXml base ios:iphonesimulator8.2/revxml.dylib
646-
executable ios:iphonesimulator11.0/revdb.ios-extension as RevDb base ios:iphonesimulator8.2/revdb.dylib
647-
executable ios:iphonesimulator11.0/dbsqlite.ios-extension as DbSqlite base ios:iphonesimulator8.2/dbsqlite.dylib
648-
executable ios:iphonesimulator11.0/dbmysql.ios-extension as DbMysql base ios:iphonesimulator8.2/dbmysql.dylib
649-
file ios:iphonesimulator11.0/mobile-template.plist as "Settings.plist"
650-
file ios:iphonesimulator11.0/mobile-remote-notification-template.plist as "RemoteNotificationSettings.plist"
651-
file ios:iphonesimulator11.0/mobile-url-scheme-template.plist as "URLSchemeSettings.plist"
652-
file ios:iphonesimulator11.0/mobile-splashscreen-template.plist as "SplashscreenSettings.plist"
653-
file ios:iphonesimulator11.0/mobile-disable-ats-template.plist as "DisableATS.plist"
654-
file ios:iphonesimulator11.0/Default-568h@2x.png as "Default4InchSplash.png" base ios:Default-568h@2x.png
655-
file ios:iphonesimulator11.0/fontmap as "fontmap"
659+
into "[[ToolsFolder]]/Runtime/iOS/Simulator-11_1" place
660+
executable ios:iphonesimulator11.1/standalone-mobile[[BaseEditionTagLower]].ios-engine as Standalone base ios:iphonesimulator8.2/standalone-mobile[[BaseEditionTagLower]].app/standalone-mobile[[BaseEditionTagLower]]
661+
executable ios:iphonesimulator11.1/revsecurity.ios-extension as RevSecurity base ios:iphonesimulator8.2/revsecurity.dylib
662+
executable ios:iphonesimulator11.1/revpdfprinter.ios-extension as RevPdfPrinter base ios:iphonesimulator8.2/revpdfprinter.dylib
663+
executable ios:iphonesimulator11.1/revzip.ios-extension as RevZip base ios:iphonesimulator8.2/revzip.dylib
664+
executable ios:iphonesimulator11.1/revxml.ios-extension as RevXml base ios:iphonesimulator8.2/revxml.dylib
665+
executable ios:iphonesimulator11.1/revdb.ios-extension as RevDb base ios:iphonesimulator8.2/revdb.dylib
666+
executable ios:iphonesimulator11.1/dbsqlite.ios-extension as DbSqlite base ios:iphonesimulator8.2/dbsqlite.dylib
667+
executable ios:iphonesimulator11.1/dbmysql.ios-extension as DbMysql base ios:iphonesimulator8.2/dbmysql.dylib
668+
file ios:iphonesimulator11.1/mobile-template.plist as "Settings.plist"
669+
file ios:iphonesimulator11.1/mobile-remote-notification-template.plist as "RemoteNotificationSettings.plist"
670+
file ios:iphonesimulator11.1/mobile-url-scheme-template.plist as "URLSchemeSettings.plist"
671+
file ios:iphonesimulator11.1/mobile-splashscreen-template.plist as "SplashscreenSettings.plist"
672+
file ios:iphonesimulator11.1/mobile-disable-ats-template.plist as "DisableATS.plist"
673+
file ios:iphonesimulator11.1/Default-568h@2x.png as "Default4InchSplash.png" base ios:Default-568h@2x.png
674+
file ios:iphonesimulator11.1/fontmap as "fontmap"
656675
into "[[ToolsFolder]]/Runtime/iOS/Device-9_2" place
657676
executable ios:iphoneos9.2/standalone-mobile[[BaseEditionTagLower]].ios-engine as Standalone
658677
executable ios:iphoneos9.2/revsecurity.ios-extension as RevSecurity
@@ -693,26 +712,26 @@ component Runtime.iOS
693712
file ios:iphoneos10.2/mobile-disable-ats-template.plist as "DisableATS.plist"
694713
file ios:iphoneos10.2/Default-568h@2x.png as "Default4InchSplash.png" base ios:Default-568h@2x.png
695714
file ios:iphoneos10.2/fontmap as "fontmap"
696-
into "[[ToolsFolder]]/Runtime/iOS/Device-11_0" place
697-
executable ios:iphoneos11.0/standalone-mobile[[BaseEditionTagLower]].ios-engine as Standalone base ios:iphoneos9.2/standalone-mobile[[BaseEditionTagLower]].ios-engine
698-
executable ios:iphoneos11.0/revsecurity.ios-extension as RevSecurity base ios:iphoneos9.2/revsecurity.ios-extension
699-
executable ios:iphoneos11.0/revpdfprinter.ios-extension as RevPdfPrinter base ios:iphoneos9.2/revpdfprinter.ios-extension
700-
executable ios:iphoneos11.0/revzip.ios-extension as RevZip base ios:iphoneos9.2/revzip.ios-extension
701-
executable ios:iphoneos11.0/revxml.ios-extension as RevXml base ios:iphoneos9.2/revxml.ios-extension
702-
executable ios:iphoneos11.0/revdb.ios-extension as RevDb base ios:iphoneos9.2/revdb.ios-extension
703-
executable ios:iphoneos11.0/dbsqlite.ios-extension as DbSqlite base ios:iphoneos9.2/dbsqlite.ios-extension
704-
executable ios:iphoneos11.0/dbmysql.ios-extension as DbMysql base ios:iphoneos9.2/dbmysql.ios-extension
705-
file ios:iphoneos11.0/mobile-device-template.plist as "Settings.plist"
706-
file ios:iphoneos11.0/mobile-remote-notification-template.plist as "RemoteNotificationSettings.plist"
707-
file ios:iphoneos11.0/mobile-url-scheme-template.plist as "URLSchemeSettings.plist"
708-
file ios:iphoneos11.0/mobile-splashscreen-template.plist as "SplashscreenSettings.plist"
709-
file ios:iphoneos11.0/template-entitlements.xcent as "Entitlements.xcent"
710-
file ios:iphoneos11.0/template-beta-report-entitlement.xcent as "BetaReportEntitlement.xcent"
711-
file ios:iphoneos11.0/template-remote-notification-entitlements.xcent as "RemoteNotificationEntitlements.xcent"
712-
file ios:iphoneos11.0/template-remote-notification-store-entitlements.xcent as "RemoteNotificationStoreEntitlements.xcent"
713-
file ios:iphoneos11.0/mobile-disable-ats-template.plist as "DisableATS.plist"
714-
file ios:iphoneos11.0/Default-568h@2x.png as "Default4InchSplash.png" base ios:Default-568h@2x.png
715-
file ios:iphoneos11.0/fontmap as "fontmap"
715+
into "[[ToolsFolder]]/Runtime/iOS/Device-11_1" place
716+
executable ios:iphoneos11.1/standalone-mobile[[BaseEditionTagLower]].ios-engine as Standalone base ios:iphoneos9.2/standalone-mobile[[BaseEditionTagLower]].ios-engine
717+
executable ios:iphoneos11.1/revsecurity.ios-extension as RevSecurity base ios:iphoneos9.2/revsecurity.ios-extension
718+
executable ios:iphoneos11.1/revpdfprinter.ios-extension as RevPdfPrinter base ios:iphoneos9.2/revpdfprinter.ios-extension
719+
executable ios:iphoneos11.1/revzip.ios-extension as RevZip base ios:iphoneos9.2/revzip.ios-extension
720+
executable ios:iphoneos11.1/revxml.ios-extension as RevXml base ios:iphoneos9.2/revxml.ios-extension
721+
executable ios:iphoneos11.1/revdb.ios-extension as RevDb base ios:iphoneos9.2/revdb.ios-extension
722+
executable ios:iphoneos11.1/dbsqlite.ios-extension as DbSqlite base ios:iphoneos9.2/dbsqlite.ios-extension
723+
executable ios:iphoneos11.1/dbmysql.ios-extension as DbMysql base ios:iphoneos9.2/dbmysql.ios-extension
724+
file ios:iphoneos11.1/mobile-device-template.plist as "Settings.plist"
725+
file ios:iphoneos11.1/mobile-remote-notification-template.plist as "RemoteNotificationSettings.plist"
726+
file ios:iphoneos11.1/mobile-url-scheme-template.plist as "URLSchemeSettings.plist"
727+
file ios:iphoneos11.1/mobile-splashscreen-template.plist as "SplashscreenSettings.plist"
728+
file ios:iphoneos11.1/template-entitlements.xcent as "Entitlements.xcent"
729+
file ios:iphoneos11.1/template-beta-report-entitlement.xcent as "BetaReportEntitlement.xcent"
730+
file ios:iphoneos11.1/template-remote-notification-entitlements.xcent as "RemoteNotificationEntitlements.xcent"
731+
file ios:iphoneos11.1/template-remote-notification-store-entitlements.xcent as "RemoteNotificationStoreEntitlements.xcent"
732+
file ios:iphoneos11.1/mobile-disable-ats-template.plist as "DisableATS.plist"
733+
file ios:iphoneos11.1/Default-568h@2x.png as "Default4InchSplash.png" base ios:Default-568h@2x.png
734+
file ios:iphoneos11.1/fontmap as "fontmap"
716735

717736
////////////////////////////////////////////////////////////////////////////////
718737

@@ -855,13 +874,5 @@ component Toolset
855874
stack ide-support:revhtml5urllibrary.livecodescript
856875
file ide-support:revdocsparser.livecodescript
857876
file ide-support:revliburl.livecodescript
858-
file repo:extensions/script-libraries/dropbox/dropbox.livecodescript
859-
file repo:extensions/script-libraries/oauth2/oauth2.livecodescript
860-
file repo:extensions/script-libraries/getopt/getopt.livecodescript
861-
file repo:extensions/script-libraries/mime/mime.livecodescript
862-
file repo:extensions/script-libraries/diff/diff.livecodescript
863-
file repo:extensions/script-libraries/messageauthentication/messageauthentication.livecodescript
864-
file repo:extensions/script-libraries/httpd/httpd.livecodescript
865-
file repo:extensions/script-libraries/qr/qr.livecodescript
866877

867878
////////////////////////////////////////////////////////////////////////////////

‎Makefile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ EMMAKE ?= emmake
2525

2626
# Some magic to control which versions of iOS we try to build. N.b. you may
2727
# also need to modify the buildbot configuration
28-
IPHONEOS_VERSIONS ?= 9.2 10.2 11.0
29-
IPHONESIMULATOR_VERSIONS ?= 8.2 9.2 10.2 11.0
28+
IPHONEOS_VERSIONS ?= 9.2 10.2 11.1
29+
IPHONESIMULATOR_VERSIONS ?= 8.2 9.2 10.2 11.1
3030
SKIP_IPHONESIMULATOR_VERSIONS ?= 6.1 7.1
3131

3232
IOS_SDKS ?= \

‎buildbot.mk‎

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ dist-docs-guide:
121121
--stage guide --warn-as-error
122122

123123
ifeq ($(BUILD_EDITION),commercial)
124-
dist-server: dist-server-commercial
124+
dist-server: dist-server-communityplus dist-server-indy dist-server-business
125125
endif
126126

127127
dist-server: dist-server-community
@@ -130,10 +130,18 @@ dist-server-community:
130130
$(buildtool_command) --platform mac --platform win --platform linux \
131131
--stage server --edition community --warn-as-error
132132

133-
dist-server-commercial:
133+
dist-server-communityplus:
134134
$(buildtool_command) --platform mac --platform win --platform linux \
135-
--stage server --edition commercial --warn-as-error
135+
--stage server --edition communityplus --warn-as-error
136136

137+
dist-server-indy:
138+
$(buildtool_command) --platform mac --platform win --platform linux \
139+
--stage server --edition indy --warn-as-error
140+
141+
dist-server-business:
142+
$(buildtool_command) --platform mac --platform win --platform linux \
143+
--stage server --edition business --warn-as-error
144+
137145
ifeq ($(BUILD_EDITION),commercial)
138146
dist-tools: dist-tools-commercial
139147
distmac-disk: distmac-disk-communityplus distmac-disk-indy distmac-disk-business

‎buildbot.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,10 +42,10 @@
4242
'x86_64-linux-debian8',
4343
'armv6-android-api9',
4444
'universal-mac-macosx10.9', # Minimum deployment target
45-
'universal-ios-iphoneos11.0',
45+
'universal-ios-iphoneos11.1',
4646
'universal-ios-iphoneos10.2',
4747
'universal-ios-iphoneos9.2',
48-
'universal-ios-iphonesimulator11.0',
48+
'universal-ios-iphonesimulator11.1',
4949
'universal-ios-iphonesimulator10.2',
5050
'universal-ios-iphonesimulator9.2',
5151
'universal-ios-iphonesimulator8.2',

‎builder/builder_utilities.livecodescript‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
script "BuilderUtilities"
22

3-
constant kMergExtVersion = "2017-9-25"
4-
constant kTSNetVersion = "1.3.2"
3+
constant kMergExtVersion = "2017-11-3"
4+
constant kTSNetVersion = "1.3.3"
55

66
local sEngineDir
77
local sWorkDir

‎builder/docs_builder.livecodescript‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2209,7 +2209,7 @@ command docsBuilderGenerateDistributedAPI pEdition
22092209
docsBuilderPopulateDatabase pEdition, tLibrariesA
22102210
repeat for each element tLibA in tLibrariesA
22112211
local tJSON, tFolder
2212-
put revDocsFormatLibraryDocArrayAsJSON(tLibA["name"], tLibA["doc"]) into tJSON
2212+
put revDocsFormatLibraryDocArrayAsJSON(tLibA) into tJSON
22132213
put builderAPIFolder(pEdition, tLibA["api"]) into tFolder
22142214
pathEnsure tFolder
22152215
put textEncode(tJSON, "utf-8") into url ("binfile:" & tFolder \

‎builder/installer/installeruiinstallcardbehavior.livecodescript‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ on installerPhaseChanged pNewPhase
6161
case "Uninstall"
6262
set the uEnabled of control "Cancel" to false
6363
put "up" into sProgressDirection
64-
put "Uninstallling existing version..." into field "Phase"
64+
put "Uninstalling existing version..." into field "Phase"
6565
break
6666
case "Cleanup"
6767
set the uEnabled of control "Cancel" to false

‎builder/server_builder.livecodescript‎

Lines changed: 8 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -109,18 +109,17 @@ command serverBuilderRun pPlatform, pEdition
109109
end if
110110
end repeat
111111

112+
local tServerPath, tServerZipPath
113+
put tEngineFolder & slash & "server-" & toLower(pEdition) & tExeExtension into tServerPath
112114
if pEdition is "Community" then
113-
get tEngineFolder & slash & "server-community" & tExeExtension
115+
put "livecode-community-server" & tOutExeExtension into tServerZipPath
114116
else
115-
get tEngineFolder & slash & "server-commercial" & tExeExtension
117+
put "livecode-server" & tOutExeExtension into tServerZipPath
116118
end if
117-
if there is a file it then
119+
120+
if there is a file tServerPath then
118121
builderLog "message", "Adding livecode-server engine"
119-
if pEdition is "Community" then
120-
revZipAddItemWithFile tOutputFile, "livecode-community-server" & tOutExeExtension, it
121-
else
122-
revZipAddItemWithFile tOutputFile, "livecode-server" & tOutExeExtension, it
123-
end if
122+
revZipAddItemWithFile tOutputFile, tServerZipPath, tServerPath
124123
if the result is not empty then
125124
throw the result
126125
end if
@@ -183,9 +182,5 @@ function getZipFilenameStub pVersion, pPlatform, pEdition
183182
else if pPlatform is "linux-armv6hf" then
184183
put "Linux-armv6hf" into pPlatform
185184
end if
186-
if pEdition is "Community" then
187-
return "LiveCodeCommunityServer-" & pVersion & "-" & pPlatform & ".zip"
188-
else
189-
return "LiveCodeServer-" & pVersion & "-" & pPlatform & ".zip"
190-
end if
185+
return "LiveCode" & editionTitleCase(pEdition) & "Server-" & pVersion & "-" & pPlatform & ".zip"
191186
end getZipFilenameStub

‎builder/tools_builder.livecodescript‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,9 @@ private command toolsBuilderFilterExternals pFolder, pPlatform
112112
end repeat
113113
end if
114114

115+
-- remove windows 64 bit builds only required for filemaker
116+
get shell("rm -fv *x86_64.dll")
117+
115118
-- If the directory contains no code any more, remove it
116119
put the files & return & the folders into tFiles
117120
filter lines of tFiles with regex pattern "^.*\.(so|dylib|bundle|dll|lcext)$"
@@ -199,6 +202,7 @@ private command toolsBuilderMakePackage pVersion, pEdition, pPlatform, pEngineFo
199202
packageCompilerConfigureSource tPackager, "prebuilt", builderRepoFolder() & slash & "prebuilt"
200203
packageCompilerConfigureSource tPackager, "repo", builderRepoFolder()
201204
packageCompilerConfigureSource tPackager, "ext", builderUnpackFolder(pEdition)
205+
202206
if editionIsInPrivateRepo(tEditionType) then
203207
packageCompilerConfigureSource tPackager, "private", builderPrivateRepoFolder()
204208
end if
@@ -405,6 +409,7 @@ private command toolsBuilderMakeInstaller pVersion, pEdition, pPlatform, pIdeFol
405409
put pVersion into tParams["version"]["ProductVersion"]
406410
put pVersion into tParams["version"]["FileVersion"]
407411

412+
# TODO: Add the initialisation library and init libs in same way as normal standalone building
408413
# AL-2015-03-14: Use deploy parameters to include libURL scriptified stack in installer standalone
409414
local tAuxStackfiles
410415
if there is a stack "revLibUrl" then
@@ -415,8 +420,8 @@ private command toolsBuilderMakeInstaller pVersion, pEdition, pPlatform, pIdeFol
415420
put return & builderSystemFolder() & slash & "installer_utilities.livecodescript" after tAuxStackfiles
416421
put tAuxStackfiles into tParams["auxiliary_stackfiles"]
417422

418-
// revLibURL needs to initialise its custom props, and revLoadLibrary must therefore be called.
419-
put merge("send [[quote]]revLoadLibrary[[quote]] to stack [[quote]]revLibUrl[[quote]]") into tParams["startup_script"]
423+
// revLibURL needs to initialise its custom props, and extensionInitialize must therefore be called.
424+
put merge("send [[quote]]extensionInitialize[[quote]] to stack [[quote]]revLibUrl[[quote]]") into tParams["startup_script"]
420425
put return & "insert script of stack" && quote & "InstallerUtilities" & quote && "into back" after tParams["startup_script"]
421426

422427
switch pPlatform

0 commit comments

Comments
 (0)