Fixed mac packaging

EX3exp · Oct 4, 2024 · 33eb384 · 33eb384
1 parent abd5d26
commit 33eb384
Show file tree

Hide file tree

Showing 10 changed files with 14 additions and 9 deletions.
diff --git a/Mirivoice.Desktop/appveyor.py b/Mirivoice.Desktop/appveyor.py
@@ -88,9 +88,12 @@ def write_info_plist():
     write_info_plist()
     os.system("dotnet restore Mirivoice.Desktop/Mirivoice.Desktop.csproj -r osx-x64")
     os.system("dotnet publish Mirivoice.Desktop/Mirivoice.Desktop.csproj -r osx-x64 -c Release -o Mirivoice.Desktop/bin/osx-x64 -p:AssemblyVersion=%s" % (appcast_ver))
-    os.system("cp -a Mirivoice.Desktop/bin/osx-x64/ Mirivoice.Desktop/osxbuild/MiriVoice.app/Contents/MacOS/")
-    os.system("chmod +x Mirivoice.Desktop/osxbuild/MiriVoice.app/Contents/MacOS/run.sh")
-    os.system("ditto -c -k --keepParent Mirivoice.Desktop/osxbuild/MiriVoice.app Mirivoice.Desktop/osxbuild/MiriVoice-osx-x64.zip")
+    #os.system("cp -a Mirivoice.Desktop/bin/osx-x64/ Mirivoice.Desktop/osxbuild/MiriVoice.app/Contents/MacOS/")
+    os.system("cp -a Mirivoice.Desktop/bin/osx-x64/ Mirivoice.Desktop/osxbuild/MiriVoice/")
+    #os.system("chmod +x Mirivoice.Desktop/osxbuild/MiriVoice.app/Contents/MacOS/run.sh")
+    os.system("chmod +x Mirivoice.Desktop/osxbuild/MiriVoice/run.sh")
+    #os.system("ditto -c -k --keepParent Mirivoice.Desktop/osxbuild/MiriVoice.app Mirivoice.Desktop/osxbuild/MiriVoice-osx-x64.zip")
+    os.system("ditto -c -k --keepParent Mirivoice.Desktop/osxbuild/MiriVoice Mirivoice.Desktop/osxbuild/MiriVoice-osx-x64.zip")
     os.system("git checkout Mirivoice.Desktop/Mirivoice.Desktop.csproj")
 
     write_appcast("macos", "osx-x64", "MiriVoice-osx-x64.zip")

diff --git a/Mirivoice.Desktop/mirivoice.icns b/Mirivoice.Desktop/mirivoice.icns
diff --git a/Mirivoice.Desktop/osxbuild/MiriVoice.app/Contents/MacOS/run.sh b/Mirivoice.Desktop/osxbuild/MiriVoice.app/Contents/MacOS/run.sh
diff --git a/Mirivoice.Desktop/osxbuild/MiriVoice/run.sh b/Mirivoice.Desktop/osxbuild/MiriVoice/run.sh
@@ -0,0 +1,7 @@
+#!/bin/bash
+PROJECT_PATH=$1
+CANONICAL_DIR=`readlink -f $RELATIVE_DIR`
+
+APP_PATH=$CANONICAL_DIR/MiriVoice
+
+"$APP_PATH" --args $PROJECT_PATH
diff --git a/Misc/app_preview.jpg b/Misc/app_preview.jpg
diff --git a/Misc/title.png b/Misc/title.png
diff --git a/Misc/voicer-yaml-1.png b/Misc/voicer-yaml-1.png
diff --git a/Misc/voicer-yaml-2.png b/Misc/voicer-yaml-2.png
diff --git a/Misc/voicer-yaml.png b/Misc/voicer-yaml.png
diff --git a/appveyor.yml b/appveyor.yml
@@ -1,4 +1,4 @@
-version: 0.1.0.{build}
+version: 1.0.0.{build}
 environment:
   access_token:
     secure: EZGpxMjy4Z14QdM0UqgRTRn+GRbehi7bp6TtZVjH04PqNqMljX9d1QU29YDHOhld