Skip to content

Commit 5a72bb5

Browse files
committed
update readme and update build
1 parent d874c21 commit 5a72bb5

File tree

4 files changed

+32
-37
lines changed

4 files changed

+32
-37
lines changed

Project/Sources/Methods/__buildComponent.4dm

+25-27
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,11 @@ convert img to be read only
4141
zip
4242
*/
4343

44+
If (Is Windows:C1573)
45+
ALERT:C41("It is only possible on Mac to create a signed/notarized .img file, so we stop here")
46+
return
47+
End if
48+
4449
var $builder : cs:C1710._Build
4550

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

74-
// for Mac
75-
If (Is Windows:C1573)
76-
ALERT:C41("It is only possible on Mac to create a signed/notarized .img file, so we stop here")
77-
Else
78-
79-
// run only on Mac
80-
If ($error.success=True:C214)
81-
Progress SET MESSAGE($progress; "Build IMG...")
82-
var $tempimgpath : Text:=$sourcefile.parent.parent.platformPath+"tmp.dmg"
83-
$error:=$builder.CreateImage($sourcepath; $tempimgpath; $sourcefile.name)
84-
End if
85-
86-
If ($error.success=True:C214)
87-
Progress SET MESSAGE($progress; "Notarize and wait for Apple's approval...")
88-
$error:=$builder.Notarize($tempimgpath)
89-
End if
90-
91-
If ($error.success=True:C214)
92-
$error:=$builder.Staple($tempimgpath)
93-
End if
94-
79+
// run only on Mac
80+
If ($error.success=True:C214)
81+
Progress SET MESSAGE($progress; "Build IMG...")
82+
var $tempimgpath : Text:=$sourcefile.parent.parent.platformPath+"tmp.dmg"
83+
$error:=$builder.CreateImage($sourcepath; $tempimgpath; $sourcefile.name)
84+
End if
85+
86+
If ($error.success=True:C214)
87+
Progress SET MESSAGE($progress; "Notarize and wait for Apple's approval...")
88+
$error:=$builder.Notarize($tempimgpath)
89+
End if
90+
91+
If ($error.success=True:C214)
92+
$error:=$builder.Staple($tempimgpath)
93+
End if
94+
95+
If ($error.success=True:C214)
96+
var $finalimgpath : Text:=$sourcefile.parent.parent.platformPath+$sourcefile.name+".dmg"
97+
$error:=$builder.ConvertImage($tempimgpath; $finalimgpath)
9598
If ($error.success=True:C214)
96-
var $finalimgpath : Text:=$sourcefile.parent.parent.platformPath+$sourcefile.name+".dmg"
97-
$error:=$builder.ConvertImage($tempimgpath; $finalimgpath)
98-
If ($error.success=True:C214)
99-
DELETE DOCUMENT:C159($tempimgpath)
100-
End if
99+
DELETE DOCUMENT:C159($tempimgpath)
101100
End if
102101
End if
103102

104103

105-
106104
Progress QUIT($progress)
107105

108106

README.md

+1
Original file line numberDiff line numberDiff line change
@@ -13,3 +13,4 @@ The page Real Time Monitor behaves different, it shows always with peak time (op
1313
![alt text](https://github.com/ThomasMaul/AdminWindow/blob/master/Docu/image011.png "Screenshot")
1414

1515
Note: project requires 4D v17 R5 or newer.
16+
Precompiled build created for 4D 20 R5 or newer. This precompiled build is signed and notarized, so directly useable on Mac (using the image).

userPreferences.Thomas/methodPreferences.json

+5-5
Original file line numberDiff line numberDiff line change
@@ -378,13 +378,13 @@
378378
"stamp": "2019-04-26T12:33:38.478Z"
379379
},
380380
"Sources/Methods/__buildComponent.4dm": {
381-
"startSelection": 37,
382-
"endSelection": 37,
383-
"firstSelectedLine": 90,
384-
"lastSelectedLine": 90,
381+
"startSelection": 0,
382+
"endSelection": 0,
383+
"firstSelectedLine": 48,
384+
"lastSelectedLine": 48,
385385
"folding": [],
386386
"bookmarks": [],
387-
"stamp": "2024-06-17T10:11:02.688Z"
387+
"stamp": "2024-06-17T10:24:54.819Z"
388388
},
389389
"Sources/Classes/_Build.4dm": {
390390
"startSelection": 89,

userPreferences.Thomas/workspace.json

+1-5
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,3 @@
11
{
2-
"editors": [
3-
{
4-
"type": "explorer"
5-
}
6-
]
2+
"editors": []
73
}

0 commit comments

Comments
 (0)