From: kilian <ksaffran@dks.lu>
Date: Mon, 21 Sep 2020 13:45:20 +0000 (+0200)
Subject: v macos 1
X-Git-Tag: 1.0.15~17
X-Git-Url: http://cloud.dks.lu/git/?a=commitdiff_plain;h=4333e028425a756ea0d92f2638078812f4964d63;p=pot_lu.git

v macos 1
---

diff --git a/desktopapp/img/POT-logo.icns b/desktopapp/img/POT-logo.icns
new file mode 100644
index 00000000..0886a5e9
Binary files /dev/null and b/desktopapp/img/POT-logo.icns differ
diff --git a/desktopapp/package.json b/desktopapp/package.json
index e0904858..dc0600d0 100644
--- a/desktopapp/package.json
+++ b/desktopapp/package.json
@@ -6,7 +6,8 @@
   "scripts": {
     "start": "electron .",
     "package-win64": "electron-packager . pot --overwrite --platform=win32 --arch=x64 --asar --out=../release-builds --version-string.CompanyName=DKS --version-string.FileDescription=DKS --version-string.ProductName=POT --icon=img/POT-logo.ico",
-    "package-win32": "electron-packager . pot --overwrite --platform=win32 --arch=ia32 --asar --out=../release-builds --version-string.CompanyName=DKS --version-string.FileDescription=DKS --version-string.ProductName=POT --icon=img/POT-logo.ico"
+    "package-win32": "electron-packager . pot --overwrite --platform=win32 --arch=ia32 --asar --out=../release-builds --version-string.CompanyName=DKS --version-string.FileDescription=DKS --version-string.ProductName=POT --icon=img/POT-logo.ico",
+    "package-macos": "electron-packager . pot --overwrite --plattform=darwin --arch=x64 --asar --out=../release-builds --icon=img/POT-logo.icns --prune=true"
   },
   "keywords": [
     "planning",
diff --git a/install/create_setup_macos.pl b/install/create_setup_macos.pl
index 0be107e8..c91cb538 100644
--- a/install/create_setup_macos.pl
+++ b/install/create_setup_macos.pl
@@ -3,31 +3,34 @@
 use strict;
 use File::Copy;
 #use File::Copy::Recursive qw(rcopy);
-use File::Find::Rule;
 #use Getopt::Long;
 use File::Basename;
 use FindBin qw($Bin);
-#use File::Path qw(make_path remove_tree);
-use Data::Dumper;
-my $tag="";
+
 # my $setup = "";
 my $reppath = dirname($Bin);
 
 chdir($reppath.'/desktopapp');
 system('npm run package-macos');
-print "Copy Tools\n";
-#make_path($reppath.'/release-builds/pot-darwin-x64/pot.app/Contents/Resources/tools');
-#copy($reppath.'/Workspace/pot/tools/potsrv',$reppath.'/Workspace/'.$app.'/pot/release-builds/pot-darwin-x64/pot.app/Contents/Resources/tools/potsrv');
-# chmod(0755,$reppath.'/Workspace/'.$app.'/pot/release-builds/pot-darwin-x64/pot.app/Contents/Resources/tools/potsrv');
+print "Move some Files\n";
+move($reppath."/release-builds/pot-darwin-x64/LICENSE",$reppath."/release-builds/pot-darwin-x64/pot.app/Contents/Resources/LICENSE");
+move($reppath."/release-builds/pot-darwin-x64/LICENSES.chromium.html",$reppath."/release-builds/pot-darwin-x64/pot.app/Contents/Resources/LICENSES.chromium.html");
+move($reppath."/release-builds/pot-darwin-x64/version",$reppath."/release-builds/pot-darwin-x64/pot.app/Contents/Resources/version");
+
 
 print "Sign App-Files\n";
-my @frm = ($reppath."/release-builds/pot-darwin-x64/pot.app/Contents/Frameworks/Electron Framework.framework",
-$reppath.'/release-builds/pot-darwin-x64/pot.app/Contents/Frameworks/Mantle.framework',
-$reppath.'/release-builds/pot-darwin-x64/pot.app/Contents/Frameworks/ReactiveCocoa.framework',
-$reppath.'/release-builds/pot-darwin-x64/pot.app/Contents/Frameworks/Squirrel.framework',
-$reppath.'/release-builds/pot-darwin-x64/pot.app/Contents/Frameworks/pot Helper.app',
+my @frm = ($reppath."/release-builds/pot-darwin-x64/pot.app/Contents/Frameworks/Electron Framework.framework/Versions/Current/Helpers/chrome_crashpad_handler",
+  $reppath."/release-builds/pot-darwin-x64/pot.app/Contents/Frameworks/Electron Framework.framework",
+$reppath."/release-builds/pot-darwin-x64/pot.app/Contents/Frameworks/Mantle.framework",
+$reppath."/release-builds/pot-darwin-x64/pot.app/Contents/Frameworks/ReactiveCocoa.framework",
+$reppath."/release-builds/pot-darwin-x64/pot.app/Contents/Frameworks/Squirrel.framework",
+$reppath."/release-builds/pot-darwin-x64/pot.app/Contents/Frameworks/pot Helper (GPU).app",
+$reppath."/release-builds/pot-darwin-x64/pot.app/Contents/Frameworks/pot Helper (Plugin).app",
+$reppath."/release-builds/pot-darwin-x64/pot.app/Contents/Frameworks/pot Helper (Renderer).app",
+$reppath."/release-builds/pot-darwin-x64/pot.app/Contents/Frameworks/pot Helper.app",
 $reppath.'/release-builds/pot-darwin-x64/pot.app/Contents/MacOS/pot',
 $reppath.'/release-builds/pot-darwin-x64/pot.app'
+
 );
 foreach my $fr (@frm){
   my $cmd = 'codesign -s "Developer ID Application: DKS sarl" -fv --ignore-resources "'.$fr.'"';
@@ -36,13 +39,13 @@ foreach my $fr (@frm){
 }
 
 print "Create DMG now\n";
-if (! -d $reppath.'/dmg'){
- make_path($reppath.'/dmg');
+if (! -d $reppath.'/website/downloads'){
+ make_path($reppath.'/website/downloads');
 }
-if (-e $reppath.'/dmg/POT_Setup.dmg'){
- unlink($reppath.'/dmg/POT_Setup.dmg');
+if (-e $reppath.'/website/downloads/POT_Setup.dmg'){
+ unlink($reppath.'/website/downloads/POT_Setup.dmg');
 }
-system('perl "'.$reppath.'/install/macos/pkg-dmg" --sourcefile --source "'.$reppath.'/release-builds/pot-darwin-x64/pot.app" --target "'.$reppath.'/dmg/pot_setup.dmg" --volname "POT_Setup" 	--symlink /Applications:"installer ici"');
-print "DMG created: ".$reppath.'/dmg/POT_Setup.dmg'."\n"; 
+system('perl "'.$reppath.'/install/macos/pkg-dmg" --sourcefile --source "'.$reppath.'/release-builds/pot-darwin-x64/pot.app" --target "'.$reppath.'/website/downloads/pot_setup.dmg" --volname "POT_Setup" 	--symlink /Applications:"installer ici"');
+print "DMG created: ".$reppath.'/website/downloads/POT_Setup.dmg'."\n"; 
 print  localtime()." Normal End!\n";