Skip to content

Commit f6c0103

Browse files
ACI0106229 : Copy .ico file in good place with good name
1 parent 38a800d commit f6c0103

2 files changed

Lines changed: 12 additions & 2 deletions

File tree

Build4D/Project/Sources/Classes/Client.4dm

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -232,7 +232,7 @@ $status Boolean out True if the information has been corre
232232
Function _setAppOptions() : Boolean
233233
var $appInfo; $exeInfo : Object
234234
var $infoFile; $exeFile; $manifestFile : 4D.File
235-
var $identifier : Text
235+
var $identifier; $iconFileName : Text
236236
var $subFolder : 4D.Folder
237237
var $infoPlistFile : 4D.File
238238
var $resourcesSubFolders : Collection
@@ -382,6 +382,11 @@ Function _setAppOptions() : Boolean
382382
End if
383383

384384
$exeFile.setAppInfo($exeInfo)
385+
386+
If ((This.settings.iconPath#Null) && This.settings.iconPath.exists)
387+
$iconFileName:=This.settings.buildName+".ico"
388+
This.settings.iconPath.copyTo(This.settings.destinationFolder; $iconFileName; fk overwrite)
389+
End if
385390
Else
386391
This._log(New object(\
387392
"function"; "Setting app options"; \

Build4D/Project/Sources/Classes/_core.4dm

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -944,7 +944,7 @@ $status Boolean out True if the information has been cor
944944
Function _setAppOptions() : Boolean
945945
var $appInfo; $exeInfo : Object
946946
var $infoFile; $exeFile; $manifestFile : 4D.File
947-
var $identifier : Text
947+
var $identifier; $iconFileName : Text
948948
var $type : Integer
949949

950950
This._noError:=True
@@ -1122,6 +1122,11 @@ Function _setAppOptions() : Boolean
11221122
End if
11231123

11241124
$exeFile.setAppInfo($exeInfo)
1125+
1126+
If ((This.settings.iconPath#Null) && This.settings.iconPath.exists)
1127+
$iconFileName:=This.settings.buildName+".ico"
1128+
This.settings.iconPath.copyTo(This.settings.destinationFolder; $iconFileName; fk overwrite)
1129+
End if
11251130
Else
11261131
This._log(New object(\
11271132
"function"; "Setting app options"; \

0 commit comments

Comments
 (0)