append _file_system_path_to_object($path : Text) : Object evaluate path like /PACKAGE inside host database

Author: delahaye-4D

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

@@ -923,22 +923,17 @@ Function build() : Boolean
 
 		// ACI0105675 update
 
-		var $formula : 4D.Function
-		var $cmd : Text
+		var $archive : Object
 
-		Case of 
-				
-			: (Value type(This.settings.macOSClientArchive)=Is text) && (Position(Folder separator; This.settings.macOSClientArchive)>0) && (Test path name(This.settings.macOSClientArchive)=Is a document)
-				This.settings.macOSClientArchive:=File(This.settings.macOSClientArchive; fk platform path)
-				
-			: (Value type(This.settings.macOSClientArchive)=Is text) && (Position("/"; This.settings.macOSClientArchive)=1)
-				$cmd:="File:C1566(\""+This.settings.macOSClientArchive+"\").platformPath"
-				$formula:=Formula from string($cmd; sk execute in host database)
-				This.settings.macOSClientArchive:=File($formula.call(); fk platform path)
-				
-		End case 
 
-		If (OB Instance of(This.settings.macOSClientArchive; 4D.File) && (This.settings.macOSClientArchive.exists))  //#2062
+		If (Value type(This.settings.macOSClientArchive)=Is text)
+			
+			$archive:=This._file_system_path_to_object(This.settings.macOSClientArchive)
+			This.settings.macOSClientArchive:=$archive.file
+			
+		End if 
+		
+		If (OB Instance of(This.settings.macOSClientArchive; 4D.File) && This.settings.macOSClientArchive.exists)  //#2062
 
 			This.settings.macOSClientArchive.copyTo($Upgrade4DClient)
 
@@ -948,20 +943,17 @@ Function build() : Boolean
 
 		// ACI0105675 update
 
-		Case of 
-				
-			: (Value type(This.settings.windowsClientArchive)=Is text) && (Position(Folder separator; This.settings.windowsClientArchive)>0) && (Test path name(This.settings.windowsClientArchive)=Is a document)
-				This.settings.windowsClientArchive:=File(This.settings.windowsClientArchive; fk platform path)
-				
-			: (Value type(This.settings.windowsClientArchive)=Is text) && (Position("/"; This.settings.windowsClientArchive)=1)
-				$cmd:="File:C1566(\""+This.settings.windowsClientArchive+"\").platformPath"
-				$formula:=Formula from string($cmd; sk execute in host database)
-				This.settings.windowsClientArchive:=File($formula.call(); fk platform path)
-				
-		End case 
+		
+		If (Value type(This.settings.windowsClientArchive)=Is text)
+			
+			$archive:=This._file_system_path_to_object(This.settings.windowsClientArchive)
+			This.settings.windowsClientArchive:=$archive.file
+			
+		End if 
+		
 
 
-		If (OB Instance of(This.settings.windowsClientArchive; 4D.File) && (This.settings.windowsClientArchive.exists))  //#2063
+		If (OB Instance of(This.settings.windowsClientArchive; 4D.File) && This.settings.windowsClientArchive.exists)  //#2063
 
 			This.settings.windowsClientArchive.copyTo($Upgrade4DClient)
 

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

@@ -769,6 +769,7 @@ Function _create4DZ() : Boolean
 		$zipStructure:=New object
 		$zipStructure.files:=New collection($structureFolder.folder("Project"))
 		$zipStructure.encryption:=(This.settings.obfuscated) ? -1 : ZIP Encryption none
+		
 		$return:=ZIP Create archive($zipStructure; $structureFolder.file(This.settings.buildName+".4DZ"))
 
 		If ($return.success)
@@ -1509,4 +1510,77 @@ Function _is_xml_reference($reference : Text) : Boolean
 
 		return False
 
-	End try
+	End try
+	
+	
+	
+	
+	
+Function _file_system_path_to_object($path : Text) : Object
+	var $formula : 4D.Function
+	var $cmd : Text
+	var $result : Object
+	
+	
+	Try
+		
+		$cmd:="Path to object:C1547(\""+$path+"\")"
+		
+		$formula:=Formula from string($cmd; sk execute in host database)
+		
+		// test path type file or folder
+		$result:=$formula.call()
+		
+		
+		// evaluate the plateformPath
+		If ($result.isFolder)
+			$cmd:="Folder:C1567(\""+Object to path($result)+"\").platformPath"
+			$formula:=Formula from string($cmd; sk execute in host database)
+			$result.platformPath:=$formula.call()
+		Else 
+			$cmd:="File:C1566(\""+Object to path($result)+"\").platformPath"
+			$formula:=Formula from string($cmd; sk execute in host database)
+			$result.platformPath:=$formula.call()
+		End if 
+		
+		
+		//convert the full path to object
+		$cmd:="Path to object:C1547(\""+$result.platformPath+"\")"
+		$formula:=Formula from string($cmd; sk execute in host database)
+		$result:=$formula.call()
+		
+		
+		//append the full platform path
+		$result.platformPath:=Object to path($result)
+		
+		$result.isFile:=Not($result.isFolder)
+		
+		//associate file or folder instance
+		//correct posix path
+		//correct parent folder
+		If ($result.isFolder)
+			$result.folder:=Folder($result.platformPath; fk platform path)
+			$result.path:=$result.folder.path
+			$result.parentFolder:=$result.folder.parent
+		Else 
+			$result.file:=File($result.platformPath; fk platform path)
+			$result.path:=$result.file.path
+			$result.parentFolder:=$result.file.parent
+		End if 
+		
+	Catch
+		
+		$result.errors:=Last errors
+		
+	End try
+	
+	$result:=$result || {isFolder: False; isFile: False}
+	
+	return $result
+	
+	
+	
+	
+	
+	
+