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

Commit 5e1fb48

Browse files
livecodefraserlivecodefraser
committed
Enable building of the Linux x86_64 installer
1 parent f4a8504 commit 5e1fb48

File tree

5 files changed

+33
-38
lines changed

5 files changed

+33
-38
lines changed

‎builder/builder_tool.livecodescript‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,17 @@ on startup
2828
repeat while tArgIndex is among the keys of tArgs
2929
if tArgs[tArgIndex] is "--platform" then
3030
get tArgs[tArgIndex + 1]
31-
if it is not among the items of "windows,win,macosx,mac,linux" then
31+
if it is not among the items of "windows,win,macosx,mac,linux,linux-x86,linux-x86_64" then
3232
__builderLog "error", "Unknown platform '" & tArgs[tArgIndex + 1] & "'"
3333
end if
34-
if it is "win" then get "windows"
35-
if it is "mac" then get "macosx"
36-
put true into tPlatforms[it]
34+
if it is "linux" then
35+
put true into tPlatforms["linux-x86"]
36+
put true into tPlatforms["linux-x86_64"]
37+
else
38+
if it is "win" then get "windows"
39+
if it is "mac" then get "macosx"
40+
put true into tPlatforms[it]
41+
end if
3742
add 1 to tArgIndex
3843
else if tArgs[tArgIndex] is "--stage" then
3944
if tArgs[tArgIndex + 1] is not among the items of "environment,tools,server,notes,docs,disk" then

‎builder/builder_utilities.livecodescript‎

Lines changed: 6 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -49,23 +49,17 @@ on builderBuild pWhich, pPlatforms, pEdition, pType
4949
switch pWhich
5050
case "Tools"
5151
repeat for each line tPlatform in pPlatforms
52-
# Only one linux target for LiveCode 6.7
53-
if (char 1 of tVersion) < 7 and tPlatform begins with "linux" and tPlatform is not "linux" then next repeat
5452
dispatch "toolsBuilderRun" to stack builderToolsBuilderStack() with tPlatform, pEdition, tVersion
5553
end repeat
5654
break
5755
case "Engine"
5856
dispatch "engineBuilderRun" to stack builderEngineBuilderStack() with "environment", pEdition, tVersion
5957
repeat for each line tPlatform in pPlatforms
60-
# Only one linux target for LiveCode 6.7
61-
if (char 1 of tVersion) < 7 and tPlatform begins with "linux" and tPlatform is not "linux" then next repeat
6258
dispatch "engineBuilderRun" to stack builderEngineBuilderStack() with tPlatform, pEdition, tVersion
6359
end repeat
6460
break
6561
case "Server"
6662
repeat for each line tPlatform in pPlatforms
67-
# Only one linux target for LiveCode 6.7
68-
if (char 1 of tVersion) < 7 and tPlatform begins with "linux" and tPlatform is not "linux" then next repeat
6963
dispatch "serverBuilderRun" to stack builderServerBuilderStack() with tPlatform, pEdition, tVersion
7064
end repeat
7165
break
@@ -95,9 +89,9 @@ command builderFetchEngine pVersion, pPlatform
9589
switch pPlatform
9690
case "windows"
9791
return sEngineDir & slash & "win-x86-bin"
98-
case "linux"
92+
case "linux-x86"
9993
return sEngineDir & slash & "linux-x86-bin"
100-
case "linux-x64"
94+
case "linux-x86_64"
10195
return sEngineDir & slash & "linux-x86_64-bin"
10296
case "linux-armv6hf"
10397
return sEngineDir & slash & "linux-armv6hf-bin"
@@ -118,8 +112,8 @@ command builderFetchEngine pVersion, pPlatform
118112
case "windows"
119113
get "windows/release"
120114
break
121-
case "linux"
122-
case "linux-x64"
115+
case "linux-x86"
116+
case "linux-x86_64"
123117
case "linux-armv6hf"
124118
get "linux"
125119
break
@@ -316,9 +310,9 @@ function builderInstallerEngine pPlatform
316310
switch pPlatform
317311
case "windows"
318312
return tEngineFolder & slash & "installer.exe"
319-
case "linux"
313+
case "linux-x86"
320314
return tEngineFolder & slash & "installer"
321-
case "linux-x64"
315+
case "linux-x86_64"
322316
return tEngineFolder & slash & "installer"
323317
case "linux-armv6hf"
324318
return tEngineFolder & slash & "installer"
@@ -400,9 +394,6 @@ command dietAndStrip pArchs, pInput, pOutput
400394

401395
local tActualArchs
402396
repeat for each item tArch in pArchs
403-
if tArch is "x86" then
404-
put "i386" into tArch
405-
end if
406397
if tArch is "x86-64" then
407398
put "x86_64" into tArch
408399
end if

‎builder/server_builder.livecodescript‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -183,9 +183,9 @@ function getZipFilenameStub pVersion, pPlatform, pEdition
183183
put "Mac" into pPlatform
184184
else if pPlatform is "windows" then
185185
put "Windows" into pPlatform
186-
else if pPlatform is "linux" then
186+
else if pPlatform is "linux-x86" then
187187
put "Linux" into pPlatform
188-
else if pPlatform is "linux-x64" then
188+
else if pPlatform is "linux-x86_64" then
189189
put "Linux-x86_64" into pPlatform
190190
else if pPlatform is "linux-armv6hf" then
191191
put "Linux-armv6hf" into pPlatform

‎builder/tools_builder.livecodescript‎

Lines changed: 15 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ command toolsBuilderRun pPlatform, pEdition, pVersion
1515
-- If on windows or linux, we can't do anything macosxy due to lack of lipo/strip :o(
1616
local tEngineFolders
1717

18-
get "windows linux linux-x64 linux-armv6hf macosx ios android"
18+
get "windows linux-x86 linux-x86_64 linux-armv6hf macosx ios android"
1919

2020
repeat for each word tPlatform in it
2121
builderFetchEngine pVersion, tPlatform
@@ -95,9 +95,8 @@ private command toolsBuilderMakePackage pVersion, pEdition, pPlatform, pEngineFo
9595
packageCompilerConfigureSource tPackager, "docs", pDocsFolder
9696
packageCompilerConfigureSource tPackager, "engine", pEngineFolders[pPlatform]
9797
packageCompilerConfigureSource tPackager, "macosx", pEngineFolders["macosx"]
98-
packageCompilerConfigureSource tPackager, "linux", pEngineFolders["linux"]
99-
packageCompilerConfigureSource tPackager, "linux-i386", pEngineFolders["linux"]
100-
packageCompilerConfigureSource tPackager, "linux-x86_64", pEngineFolders["linux-x64"]
98+
packageCompilerConfigureSource tPackager, "linux-x86", pEngineFolders["linux-x86"]
99+
packageCompilerConfigureSource tPackager, "linux-x86_64", pEngineFolders["linux-x86_64"]
101100
packageCompilerConfigureSource tPackager, "linux-armv6-hf", pEngineFolders["linux-armv6hf"]
102101
packageCompilerConfigureSource tPackager, "windows", pEngineFolders["windows"]
103102
packageCompilerConfigureSource tPackager, "ios", pEngineFolders["ios"]
@@ -117,7 +116,7 @@ private command toolsBuilderMakePackage pVersion, pEdition, pPlatform, pEngineFo
117116
packageCompilerConfigureVariable tPackager, "SupportFolder", "[[installFolder]]"
118117
packageCompilerConfigureVariable tPackager, "ToolsFolder", "[[installFolder]]"
119118
end if
120-
if pPlatform is "linux-x64" or pPlatform is "linux-armv6hf" or pPlatform is "linux" then
119+
if pPlatform begins with "linux" then
121120
packageCompilerConfigureVariable tPackager, "TargetPlatform", "linux"
122121
else
123122
packageCompilerConfigureVariable tPackager, "TargetPlatform", pPlatform
@@ -126,9 +125,9 @@ private command toolsBuilderMakePackage pVersion, pEdition, pPlatform, pEngineFo
126125
packageCompilerConfigureVariable tPackager, "VersionTag", pVersion
127126
packageCompilerConfigureVariable tPackager, "ProductBranch", char 1 to 3 of pVersion
128127
packageCompilerConfigureVariable tPackager, "TargetArchitectures", "i386"
129-
if pPlatform is "linux" then
130-
packageCompilerConfigureVariable tPackager, "TargetArchitecture", "i386"
131-
else if pPlatform is "linux-x64" then
128+
if pPlatform is "linux-x86" then
129+
packageCompilerConfigureVariable tPackager, "TargetArchitecture", "x86"
130+
else if pPlatform is "linux-x86_64" then
132131
packageCompilerConfigureVariable tPackager, "TargetArchitecture", "x86_64"
133132
else if pPlatform is "linux-armv6hf" then
134133
packageCompilerConfigureVariable tPackager, "TargetArchitecture", "armv6-hf"
@@ -138,15 +137,15 @@ private command toolsBuilderMakePackage pVersion, pEdition, pPlatform, pEngineFo
138137
if pEdition is "Community" then
139138
packageCompilerConfigureVariable tPackager, "ProductTitle", "LiveCode Community" && getReadableVersion(pVersion)
140139
packageCompilerConfigureVariable tPackager, "ProductTag", "livecodecommunity_" & getTaggedVersion(pVersion)
141-
if pPlatform is "Linux" or pPlatform is "Linux-x64" or pPlatform is "Linux-armv6hf" then
140+
if pPlatform is "Linux" or pPlatform is "Linux-x86_64" or pPlatform is "Linux-armv6hf" then
142141
packageCompilerConfigureVariable tPackager, "ProductName", "livecodecommunity"
143142
else
144143
packageCompilerConfigureVariable tPackager, "ProductName", "LiveCode Community"
145144
end if
146145
else
147146
packageCompilerConfigureVariable tPackager, "ProductTitle", "LiveCode" && getReadableVersion(pVersion)
148147
packageCompilerConfigureVariable tPackager, "ProductTag", "livecode_" & getTaggedVersion(pVersion)
149-
if pPlatform is "Linux" or pPlatform is "Linux-x64" or pPlatform is "Linux-armv6hf" then
148+
if pPlatform is "Linux" or pPlatform is "Linux-x86_64" or pPlatform is "Linux-armv6hf" then
150149
packageCompilerConfigureVariable tPackager, "ProductName", "livecode"
151150
else
152151
packageCompilerConfigureVariable tPackager, "ProductName", "LiveCode"
@@ -355,16 +354,16 @@ private command toolsBuilderMakeInstaller pVersion, pEdition, pPlatform, pIdeFol
355354
builderLog "report", "Deployed windows installer to '" && tOutputFileStub & ".exe" & "'"
356355
break
357356

358-
case "linux"
359-
case "linux-x64"
357+
case "linux-x86"
358+
case "linux-x86_64"
360359
case "linux-armv6hf"
361360
put abstractPinFile(builderInstallerEngine(pPlatform)) into tParams["engine"]
362361
put tInstallerStackFile into tParams["stackfile"]
363362
put pPackageFile into tParams["payload"]
364-
if pPlatform is "linux" then
363+
if pPlatform is "linux-x86" then
365364
put tOutputFileStub & ".x86" into tParams["output"]
366-
else if pPlatform is "linux-x64" then
367-
put tOutputFileStub & ".x64" into tParams["output"]
365+
else if pPlatform is "linux-x86_64" then
366+
put tOutputFileStub & ".x86_64" into tParams["output"]
368367
else -- if pPlatform is "linux-armv6hf"
369368
put tOutputFileStub & ".rpi" into tParams["output"]
370369
end if
@@ -534,7 +533,7 @@ function getInstallerFilenameStub pVersion, pPlatform, pEdition
534533
put "Mac" into pPlatform
535534
else if pPlatform is "windows" then
536535
put "Windows" into pPlatform
537-
else if pPlatform is "linux" or pPlatform is "linux-x64" or pPlatform is "linux-armv6hf" then
536+
else if pPlatform begins with "linux" then
538537
put "Linux" into pPlatform
539538
end if
540539
if pEdition is "Community" then

‎ide‎

Submodule ide updated from ff5cecc to 9bdffeb

0 commit comments

Comments
 (0)