Skip to content

Commit

Permalink
update readme and update build
Browse files Browse the repository at this point in the history
  • Loading branch information
ThomasMaul committed Jun 17, 2024
1 parent d874c21 commit 5a72bb5
Show file tree
Hide file tree
Showing 4 changed files with 32 additions and 37 deletions.
52 changes: 25 additions & 27 deletions Project/Sources/Methods/__buildComponent.4dm
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,11 @@ convert img to be read only
zip
*/

If (Is Windows:C1573)
ALERT:C41("It is only possible on Mac to create a signed/notarized .img file, so we stop here")
return
End if

var $builder : cs:C1710._Build

$builder:=cs:C1710._Build.new()
Expand Down Expand Up @@ -71,38 +76,31 @@ If ($error.success=True:C214)
$error:=$builder.Zip($sourcepath; $targetpath)
End if

// for Mac
If (Is Windows:C1573)
ALERT:C41("It is only possible on Mac to create a signed/notarized .img file, so we stop here")
Else

// run only on Mac
If ($error.success=True:C214)
Progress SET MESSAGE($progress; "Build IMG...")
var $tempimgpath : Text:=$sourcefile.parent.parent.platformPath+"tmp.dmg"
$error:=$builder.CreateImage($sourcepath; $tempimgpath; $sourcefile.name)
End if

If ($error.success=True:C214)
Progress SET MESSAGE($progress; "Notarize and wait for Apple's approval...")
$error:=$builder.Notarize($tempimgpath)
End if

If ($error.success=True:C214)
$error:=$builder.Staple($tempimgpath)
End if

// run only on Mac
If ($error.success=True:C214)
Progress SET MESSAGE($progress; "Build IMG...")
var $tempimgpath : Text:=$sourcefile.parent.parent.platformPath+"tmp.dmg"
$error:=$builder.CreateImage($sourcepath; $tempimgpath; $sourcefile.name)
End if

If ($error.success=True:C214)
Progress SET MESSAGE($progress; "Notarize and wait for Apple's approval...")
$error:=$builder.Notarize($tempimgpath)
End if

If ($error.success=True:C214)
$error:=$builder.Staple($tempimgpath)
End if

If ($error.success=True:C214)
var $finalimgpath : Text:=$sourcefile.parent.parent.platformPath+$sourcefile.name+".dmg"
$error:=$builder.ConvertImage($tempimgpath; $finalimgpath)
If ($error.success=True:C214)
var $finalimgpath : Text:=$sourcefile.parent.parent.platformPath+$sourcefile.name+".dmg"
$error:=$builder.ConvertImage($tempimgpath; $finalimgpath)
If ($error.success=True:C214)
DELETE DOCUMENT:C159($tempimgpath)
End if
DELETE DOCUMENT:C159($tempimgpath)
End if
End if



Progress QUIT($progress)


Expand Down
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,4 @@ The page Real Time Monitor behaves different, it shows always with peak time (op
![alt text](https://github.com/ThomasMaul/AdminWindow/blob/master/Docu/image011.png "Screenshot")

Note: project requires 4D v17 R5 or newer.
Precompiled build created for 4D 20 R5 or newer. This precompiled build is signed and notarized, so directly useable on Mac (using the image).
10 changes: 5 additions & 5 deletions userPreferences.Thomas/methodPreferences.json
Original file line number Diff line number Diff line change
Expand Up @@ -378,13 +378,13 @@
"stamp": "2019-04-26T12:33:38.478Z"
},
"Sources/Methods/__buildComponent.4dm": {
"startSelection": 37,
"endSelection": 37,
"firstSelectedLine": 90,
"lastSelectedLine": 90,
"startSelection": 0,
"endSelection": 0,
"firstSelectedLine": 48,
"lastSelectedLine": 48,
"folding": [],
"bookmarks": [],
"stamp": "2024-06-17T10:11:02.688Z"
"stamp": "2024-06-17T10:24:54.819Z"
},
"Sources/Classes/_Build.4dm": {
"startSelection": 89,
Expand Down
6 changes: 1 addition & 5 deletions userPreferences.Thomas/workspace.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
{
"editors": [
{
"type": "explorer"
}
]
"editors": []
}

0 comments on commit 5a72bb5

Please sign in to comment.