add automatic build/notarize

Author: ThomasMaul

Readme_GDrive.MD Documentation/Readme_GDrive.MDReadme_GDrive.MD renamed to Documentation/Readme_GDrive.MD

@@ -10,6 +10,7 @@ Function Compile($options : Object)->$error : Object
 	End if 
 
 Function Build($PathToSettings : Text)->$error : Object
+	// this function uses LAUNCH EXTERNAL PROCESS and not 4D.SystemWorker to allow v19 LTS to use the class
 	If (Count parameters:C259>0)
 		This:C1470._SettingsUsed:=$PathToSettings
 	Else 
@@ -24,29 +25,45 @@ Function Build($PathToSettings : Text)->$error : Object
 		$error:=New object:C1471("success"; True:C214)
 	End if 
 
-Function Notarize($zipfilepath : Text; $appleUserID : Text; $bundleID)->$error : Object
+Function Notarize($zipfilepath : Text)->$error : Object
 	ASSERT:C1129($zipfilepath#""; "zip file path must not be empty")
-	ASSERT:C1129($appleUserID#""; "apple ID must not be empty")
-	ASSERT:C1129($bundleID#""; "bundle ID must not be empty")
 	$in:=""
 	$out:=""
 	$err:=""
-	$cmd:="xcrun altool --notarize-app --primary-bundle-id "+Char:C90(34)+$bundleID+Char:C90(34)+" --username "+Char:C90(34)+$appleUserID+Char:C90(34)+\
-		" --password \"@keychain:altool\" --file "+Char:C90(34)+Convert path system to POSIX:C1106($zipfilepath)+Char:C90(34)
+	$cmd:="xcrun notarytool submit "+Char:C90(34)+Convert path system to POSIX:C1106($zipfilepath)+Char:C90(34)+" --keychain-profile notarytool --wait"
 	LAUNCH EXTERNAL PROCESS:C811($cmd; $in; $out; $err)
-	If (($err#"") & ($err#"@CFURLRequestSetHTTPCookieStorageAcceptPolicy@"))
+	If (($err#"") & ($err#"@Current status: Accepted@"))
 		$error:=New object:C1471("success"; False:C215; "log"; $err)
 	Else 
-		If ($out="No errors@")
-			$col:=Split string:C1554($out; Char:C90(10))
-			If ($col[1]="RequestUUID = @")
-				$error:=New object:C1471("success"; True:C214; "uuid"; Substring:C12($col[1]; Length:C16("RequestUUID = ")))
+		Case of 
+			: ($out="@  status: Accepted@")
+				$error:=New object:C1471("success"; True:C214)
+			: ($out="@  status: Invalid@")
+				$pos:=Position:C15("  id: "; $out)
+				If ($pos>0)
+					$id:=Substring:C12($out; $pos+7)
+					$pos:=Position:C15(Char:C90(10); $id)
+					$id:=Substring:C12($id; 1; $pos)
+					$in:=""
+					$out2:=""
+					$err:=""
+					$logpath:=Get 4D folder:C485(Logs folder:K5:19)+"notarizing log.json"
+					$cmd:="xcrun notarytool log "+$id+" --keychain-profile \"notarytool\" "+Char:C90(34)+Convert path system to POSIX:C1106($logpath)+Char:C90(34)
+					LAUNCH EXTERNAL PROCESS:C811($cmd; $in; $out2; $err)
+					If (Test path name:C476($logpath)=Is a document:K24:1)
+						$logtext:=Document to text:C1236($logpath)
+						$log:=JSON Parse:C1218($logtext)
+					Else 
+						$log:=New object:C1471
+					End if 
+					$error:=New object:C1471("success"; False:C215; "log"; $out; "id"; $id; "invalid"; $log)
+				Else 
+					$error:=New object:C1471("success"; False:C215; "log"; $out)
+				End if 
 			Else 
 				$error:=New object:C1471("success"; False:C215; "log"; $out)
-			End if 
-		Else 
-			$error:=New object:C1471("success"; False:C215; "log"; $out)
-		End if 
+		End case 
+		
 	End if 
 
 Function Zip($sourcepath : Text; $targetpath : Text)->$error : Object
@@ -62,7 +79,7 @@ Function Zip($sourcepath : Text; $targetpath : Text)->$error : Object
 					: ($value="::@")
 						// cannot use Folder(fk database folder).parent, as we need to go outside of protected area
 						$sourcefolder:=Folder:C1567(Get 4D folder:C485(Database folder:K5:14); fk platform path:K87:2)
-						$sourcefolder:=Folder:C1567($sourcefolder.parent.platformPath+Substring:C12($value; 3)+Folder separator:K24:12+"Components"; fk platform path:K87:2)
+						$sourcefolder:=Folder:C1567($sourcefolder.parent.platformPath+Substring:C12($value; 3)+"Components"; fk platform path:K87:2)
 						$sourcefolderfiles:=$sourcefolder.folders()
 						If ($sourcefolderfiles.length>0)
 							$source:=$sourcefolderfiles[0].platformPath
@@ -112,88 +129,17 @@ Function Zip($sourcepath : Text; $targetpath : Text)->$error : Object
 		$error:=New object:C1471("success"; False:C215; "reason"; "source or target path empty")
 	End if 
 
-Function CheckNotarizeResult($uuid : Text; $appleUserID : Text)->$error : Object
-	ASSERT:C1129($uuid#""; "uuid must not be empty")
-	ASSERT:C1129($appleUserID#""; "userid must not be empty")
-	
-	$cmd:="xcrun altool --notarization-info  "+$uuid+" -u "+Char:C90(34)+$appleUserID+Char:C90(34)+" -p \"@keychain:altool\""
-	$in:=""
-	$out:=""
-	$err:=""
-	LAUNCH EXTERNAL PROCESS:C811($cmd; $in; $out; $err)
-	If (($err#"") & ($err#"@CFURLRequestSetHTTPCookieStorageAcceptPolicy@"))
-		$error:=New object:C1471("success"; False:C215; "log"; "Notarize check: "+$err)
-	Else 
-/* out in form
-No errors getting notarization info.
-		
-          Date: 2020-10-21 09:37:09 +0000
-          Hash: dbc021eb12665fb13a9a18304214e89c9bb7560246a01b08f97dbae549697bfd
-    LogFileURL: https://osxapps-ssl.itunes.apple.com/itunes-assets/Enigma124/v4/3f/84/9f/3f849f12-4cd5-0546-4181-a5d93c9cb074/developer_log.json?accessKey=1603467816_2930840265156000602_k5fSZxEZa3Cs89MYH3GfQYEpecMBF1ErZYK2rgbGgY0HoMPs1CgH5nlLAaYQRtEymMK6IsLkdXUgfL2FTG7IfYQe12Zj8wzuirYUB3rQXvfF6a6DrX%2BQxe6Wjc1DkD8kz14lR%2Bqk6VdfVGAOAsy%2B2%2FJ80DgIxv779wR14Jn2a40%3D
-   RequestUUID: 7ee7da40-ef75-45f4-ba9d-6b8d61c29b67
-        Status: invalid
-   Status Code: 2
-Status Message: Package Invalid
-*/
-		C_COLLECTION:C1488($lines; $parts)
-		$lines:=Split string:C1554($out; Char:C90(10); sk trim spaces:K86:2+sk ignore empty strings:K86:1)
-		$result:=New object:C1471
-		For each ($line; $lines)
-			$parts:=Split string:C1554($line; ":"; sk trim spaces:K86:2+sk ignore empty strings:K86:1)
-			If ($parts.length=2)
-				$result[$parts[0]]:=$parts[1]
-			End if 
-		End for each 
-		
-		Case of 
-			: ($result.Status=Null:C1517)
-				$error:=New object:C1471("success"; False:C215; "log"; "Notarize check error  status missing "+$out)
-			: ($result.Status="invalid")
-				$error:=New object:C1471("success"; False:C215; "log"; "Notarize check error status invalid "+$out)
-			: ($result.Status="in progress")
-				$error:=New object:C1471("success"; True:C214; "status"; "in progress")
-			: ($result.Status="success")
-				$error:=New object:C1471("success"; True:C214; "status"; "success")
-		End case 
-	End if 
 
-Function Staple($zipfilepath : Text; )->$error : Object
-	$cmd:="xcrun stapler staple '"+Convert path system to POSIX:C1106($zipfilepath)+"'"
+Function Staple()->$error : Object
+	$cmd:="xcrun stapler staple '"+Convert path system to POSIX:C1106(This:C1470._Source)+"'"
 	$in:=""
 	$out:=""
 	$err:=""
 	LAUNCH EXTERNAL PROCESS:C811($cmd; $in; $out; $err)
-	If (($err#"") & ($err#"@CFURLRequestSetHTTPCookieStorageAcceptPolicy@"))
+	If ($err#"")
 		$error:=New object:C1471("success"; False:C215; "log"; "Staple error "+$out)
 	Else 
 		$source:=This:C1470._Source
 		$error:=This:C1470.Zip($source)
 	End if 
-	
-Function CommitAndPush($message : Text)->$error : Object
-	$path:=Get 4D folder:C485(Database folder:K5:14; *)
-	SET ENVIRONMENT VARIABLE:C812("_4D_OPTION_CURRENT_DIRECTORY"; $path)
-	$in:=""
-	$out:=""
-	$err:=""
-	LAUNCH EXTERNAL PROCESS:C811("git add --all"; $in; $out; $err)
-	If (($out#"") | ($err#""))
-		$error:=New object:C1471("success"; False:C215; "Error git add"; $out+" "+$err)
-	Else 
-		SET ENVIRONMENT VARIABLE:C812("_4D_OPTION_CURRENT_DIRECTORY"; $path)
-		$command:="git commit -a -q -m "+Char:C90(34)+$message+Char:C90(34)
-		LAUNCH EXTERNAL PROCESS:C811($command; $in; $out; $err)
-		If (($out#"") | ($err#""))
-			$error:=New object:C1471("success"; False:C215; "Error git commit"; $out+" "+$err)
-		Else 
-			SET ENVIRONMENT VARIABLE:C812("_4D_OPTION_CURRENT_DIRECTORY"; $path)
-			LAUNCH EXTERNAL PROCESS:C811("git push"; $in; $out; $err)
-			If ($err#"")
-				$error:=New object:C1471("success"; False:C215; "Error git push"; $err)
-			Else 
-				$error:=New object:C1471("success"; True:C214; "git commit"; $out)
-			End if 
-		End if 
-	End if 
-	
 

Readme_curl.MD Documentation/Readme_curl.MDReadme_curl.MD renamed to Documentation/Readme_curl.MD

@@ -19,18 +19,15 @@ After an XCode/System update another manual run might be necesssary to accept mo
 
 ###########
 expects that you have installed your password in keychain named "altool" with:
-security add-generic-password -a "<apple_id>" -w "<password>" -s "altool"
+xcrun altool --list-providers -u "AC_USERNAME" -p secret_2FA_password
 Sign in to your Apple ID account page. In the Security section, click the “Generate Password” option below the “App-Specific Passwords” option, enter a password label as requested and click the “Create” button.
-If unclear, read blog!
+If unclear, read Apple docu above!
 
 ###########  NOTES
 you might need to start Xcode once manually after every macOS update to accept Xcode changes
 you might need to start Xcode to accept Apple contract changes or update expired certificates (visit developer.apple.com)
 */
 
-$appleUserID:="Thomas.Maul"+Char:C90(64)+"4D.com"  // I don't like my email on github in clear text
-$bundleID:="FileTransfer.de.4D.com"
-
 var $builder : cs:C1710._Build
 
 $builder:=cs:C1710._Build.new()
@@ -41,7 +38,7 @@ Progress SET MESSAGE($progress; "Compile...")
 $error:=$builder.Compile()
 If ($error.success=True:C214)
 	Progress SET MESSAGE($progress; "Build...")
-	$error:=$builder.Build()
+	$error:=$builder.Build()  // $1 could be path to settings, if you have other than default ones
 End if 
 
 If ($error.success=True:C214)
@@ -51,43 +48,14 @@ End if
 
 If ($error.success=True:C214)
 	$target:=$error.target
-	Progress SET MESSAGE($progress; "Notarize...")
-	$error:=$builder.Notarize($target; $appleUserID; $bundleID)  // returned by zip
+	Progress SET MESSAGE($progress; "Notarize and wait for Apple's approval...")
+	$error:=$builder.Notarize($target)  // returned by zip
 End if 
 
 If ($error.success=True:C214)
-	$UUID:=$error.uuid
-	If ($uuid="")
-		$error:=New object:C1471("success"; False:C215; "log"; "Notarize UUID empty")
-	Else 
-		// now we need to wait - show progress bar?
-		
-		$finished:=False:C215
-		While ((Not:C34($finished)) & (Not:C34(Process aborted:C672)))
-			Progress SET MESSAGE($progress; "Checking Notarization: "+String:C10(Current time:C178))
-			DELAY PROCESS:C323(Current process:C322; 30*60)  // check twice a minute
-			$error:=$builder.CheckNotarizeResult($uuid; $appleUserID)
-			Case of 
-				: ($error.success=False:C215)
-					$finished:=True:C214
-				: (($error.success=True:C214) & ($error.status="in progress"))
-					// nothing, continue loop
-				: (($error.success=True:C214) & ($error.status="success"))
-					// finished! Now we can staple and rezip
-					Progress SET MESSAGE($progress; "Success - now running staple")
-					$error:=$builder.Staple($target)
-					$finished:=True:C214
-			End case 
-		End while 
-	End if 
+	$error:=$builder.Staple($target)
 End if 
 
-//If ($error.success=True)
-//Progress SET MESSAGE($progress; "Push to Git...")
-//$message:=Request("Commit message"; Timestamp)
-//$error:=$builder.CommitAndPush($message)
-//End if 
-
 Progress QUIT($progress)
 
 

Readme_dropbox.MD Documentation/Readme_dropbox.MDReadme_dropbox.MD renamed to Documentation/Readme_dropbox.MD

@@ -64,12 +64,12 @@ $result:=$ftp.download($source; $target)
 # Documentation
 
 ## cURL  (FTP - FTPS - SFTP - HTTP - HTTPS)
-[Documentation](ReadMe_curl.MD)
+[Documentation](Documentation/ReadMe_curl.MD)
 
 ## Dropbox
-[Documentation](ReadMe_dropbox.MD)
+[Documentation](Documentation/ReadMe_dropbox.MD)
 
 ## GDrive
-[Documentation](ReadMe_GDrive.MD)
+[Documentation](Documentation/ReadMe_GDrive.MD)