Skip to content

Commit 86a117f

Browse files
committed
fix: update error file path and streamline source folder handling in build component
1 parent 7f62e9b commit 86a117f

File tree

1 file changed

+20
-14
lines changed

1 file changed

+20
-14
lines changed

Project/Sources/Methods/__buildComponent.4dm

Lines changed: 20 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
- //repos/4edimension/4DComponents/User Components/4D NetKit/Project/Sources/ (target folder)
66
*/
77

8-
var $errorFile : 4D.File:=File(Folder(fk logs folder).platformPath+"compilationErrors.json"; fk platform path)
8+
var $errorFile : 4D.File:=File("/LOGS/compilationErrors.json")
99
If ($errorFile.exists)
1010
$errorFile.delete()
1111
End if
@@ -14,40 +14,46 @@ var $status : Object:=Compile project({typeInference: "all"})
1414

1515
If ($status.success=True)
1616

17-
var $targetFolder : 4D.Folder:=Folder(Application file; fk platform path)
18-
var $netKitFolder : 4D.Folder:=Folder($targetFolder.parent.parent.parent.parent.parent.platformPath+\
17+
var $targetFolder : 4D.Folder:=Folder(Application file; fk platform path).parent
18+
var $netKitFolder : 4D.Folder:=Folder($targetFolder.parent.parent.parent.parent.platformPath+\
1919
"4DComponents"+Folder separator+"User Components"+Folder separator+"4D NetKit"+\
2020
Folder separator; fk platform path)
2121

2222
If (Not($netKitFolder.exists))
23-
2423
var $netKitFullPath : Text:=Select folder("Select 4D NetKit component folder"; $targetFolder.platformPath)
2524
$netKitFolder:=Folder($netKitFullPath; fk platform path)
2625
End if
2726

2827
// Copy Sources
29-
var $sourceFolder : 4D.Folder:=Folder(Structure file; fk platform path)
30-
$sourceFolder:=Folder($sourceFolder.parent.platformPath+"Sources"; fk platform path)
28+
var $sourceFolder : 4D.Folder:=Folder("/PACKAGE/Project/Sources/")
3129
$targetFolder:=Folder($netKitFolder.platformPath+"Project"+Folder separator; fk platform path)
3230
If (Not($targetFolder.exists))
3331
$targetFolder.create()
3432
End if
3533

36-
var $result : 4D.Folder:=$sourceFolder.copyTo($targetFolder; fk overwrite)
34+
var $result : Object:=$sourceFolder.copyTo($targetFolder; fk overwrite)
3735

3836
// Copy Resources
3937
If ($result#Null)
40-
41-
$sourceFolder:=Folder(Structure file; fk platform path)
42-
$sourceFolder:=Folder($sourceFolder.parent.parent.platformPath+"Resources"; fk platform path)
38+
$sourceFolder:=Folder("/PACKAGE/Resources/")
4339
$targetFolder:=Folder($netKitFolder.platformPath; fk platform path)
44-
If (Not($targetFolder.exists))
45-
$targetFolder.create()
46-
End if
47-
4840
$result:=$sourceFolder.copyTo($targetFolder; fk overwrite)
4941
End if
5042

43+
// Copy Documentation
44+
If ($result#Null)
45+
$sourceFolder:=Folder("/PACKAGE/Documentation/")
46+
$targetFolder:=Folder($netKitFolder.platformPath; fk platform path)
47+
$result:=$sourceFolder.copyTo($targetFolder; fk overwrite)
48+
End if
49+
50+
// Copy make.json
51+
If ($result#Null)
52+
var $makeJsonFile : 4D.File:=File("/PACKAGE/make.json")
53+
$targetFolder:=Folder($netKitFolder.platformPath; fk platform path)
54+
$result:=$makeJsonFile.copyTo($targetFolder; fk overwrite)
55+
End if
56+
5157
$status:={success: Bool($result#Null)}
5258
Else
5359
TEXT TO DOCUMENT($errorFile.platformPath; JSON Stringify($status; *))

0 commit comments

Comments
 (0)