Skip to content

Commit 334d60e

Browse files
committed
fix : ACI0105675
1 parent 9caf829 commit 334d60e

File tree

1 file changed

+35
-4
lines changed

1 file changed

+35
-4
lines changed

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

Lines changed: 35 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -908,9 +908,8 @@ Function build() : Boolean
908908
var $path : Text
909909
var $hasClients : Boolean
910910
var $infos : Object
911-
//var $portNumber : Integer
912911

913-
$path:=This.settings.destinationFolder.path
912+
$path:=Folder(This.settings.destinationFolder.platformPath; fk platform path).path
914913

915914
$path+=(Is macOS) ? "Contents/Upgrade4DClient/" : "Upgrade4DClient/"
916915

@@ -922,15 +921,47 @@ Function build() : Boolean
922921

923922
$Upgrade4DClient.create()
924923

925-
If (OB Instance of(This.settings.macOSClientArchive; 4D.File)) //#2062
924+
// ACI0105675 update
925+
926+
var $formula : 4D.Function
927+
var $cmd : Text
928+
929+
Case of
930+
931+
: (Value type(This.settings.macOSClientArchive)=Is text) && (Position(Folder separator; This.settings.macOSClientArchive)>0) && (Test path name(This.settings.macOSClientArchive)=Is a document)
932+
This.settings.macOSClientArchive:=File(This.settings.macOSClientArchive; fk platform path)
933+
934+
: (Value type(This.settings.macOSClientArchive)=Is text) && (Position("/"; This.settings.macOSClientArchive)=1)
935+
$cmd:="File:C1566(\""+This.settings.macOSClientArchive+"\").platformPath"
936+
$formula:=Formula from string($cmd; sk execute in host database)
937+
This.settings.macOSClientArchive:=File($formula.call(); fk platform path)
938+
939+
End case
940+
941+
If (OB Instance of(This.settings.macOSClientArchive; 4D.File) && (This.settings.macOSClientArchive.exists)) //#2062
926942

927943
This.settings.macOSClientArchive.copyTo($Upgrade4DClient)
928944

929945
$hasClients:=True
930946

931947
End if
932948

933-
If (OB Instance of(This.settings.windowsClientArchive; 4D.File)) //#2063
949+
// ACI0105675 update
950+
951+
Case of
952+
953+
: (Value type(This.settings.windowsClientArchive)=Is text) && (Position(Folder separator; This.settings.windowsClientArchive)>0) && (Test path name(This.settings.windowsClientArchive)=Is a document)
954+
This.settings.windowsClientArchive:=File(This.settings.windowsClientArchive; fk platform path)
955+
956+
: (Value type(This.settings.windowsClientArchive)=Is text) && (Position("/"; This.settings.windowsClientArchive)=1)
957+
$cmd:="File:C1566(\""+This.settings.windowsClientArchive+"\").platformPath"
958+
$formula:=Formula from string($cmd; sk execute in host database)
959+
This.settings.windowsClientArchive:=File($formula.call(); fk platform path)
960+
961+
End case
962+
963+
964+
If (OB Instance of(This.settings.windowsClientArchive; 4D.File) && (This.settings.windowsClientArchive.exists)) //#2063
934965

935966
This.settings.windowsClientArchive.copyTo($Upgrade4DClient)
936967

0 commit comments

Comments
 (0)