Skip to content

Commit a67597d

Browse files
committed
Merge pull request livecode#3756 from peter-b/app-bundle-name
build: Fix app bundle name.
2 parents e5707ba + 588bb00 commit a67597d

File tree

1 file changed

+17
-5
lines changed

1 file changed

+17
-5
lines changed

builder/tools_builder.livecodescript

Lines changed: 17 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -669,13 +669,10 @@ function getTaggedVersion pVersion
669669
return pVersion
670670
end getTaggedVersion
671671

672-
function getReadableVersion pVersion
672+
function getFullReadableVersion pVersion
673673
local tNumber
674674
set the itemDelimiter to "-"
675675
put item 1 of pVersion into tNumber
676-
if tNumber ends with ".0" then
677-
delete char -2 to -1 of tNumber
678-
end if
679676

680677
if item 2 of pVersion is "gm" then
681678
delete item -2 to -1 of pVersion
@@ -689,10 +686,25 @@ function getReadableVersion pVersion
689686
end if
690687

691688
return tNumber & tTag
689+
end getFullReadableVersion
690+
691+
function getReadableVersion pVersion
692+
put getFullReadableVersion(pVersion) into pVersion
693+
set the itemDelimiter to space
694+
695+
local tNumber, tTag
696+
put item 1 of pVersion into tNumber
697+
698+
if tNumber ends with ".0" then
699+
delete char -2 to -1 of tNumber
700+
put tNumber into item 1 of pVersion
701+
end if
702+
703+
return pVersion
692704
end getReadableVersion
693705

694706
function getBundleFilenameStub pVersion, pPlatform, pEdition
695-
return "LiveCode" && the upper of char 1 of pEdition & the lower of char 2 to -1 of pEdition && getReadableVersion(pVersion)
707+
return "LiveCode" && the upper of char 1 of pEdition & the lower of char 2 to -1 of pEdition && getFullReadableVersion(pVersion)
696708
end getBundleFilenameStub
697709

698710
function getInstallerFilenameStub pVersion, pPlatform, pEdition

0 commit comments

Comments
 (0)