From 12011846693d451e4efdcb4d93ae726a57402a35 Mon Sep 17 00:00:00 2001
From: Pierre-Antoine Rouby <pierre-antoine.rouby@inrae.fr>
Date: Fri, 22 Sep 2023 09:05:35 +0200
Subject: [PATCH] packages: windows: Add Desktop shortcuts and update wine
 script.

---
 packages/pamhyr.nsi |  6 ++++-
 packages/wine.sh    | 63 +++++++++++++++++++++++++++++++++------------
 2 files changed, 51 insertions(+), 18 deletions(-)

diff --git a/packages/pamhyr.nsi b/packages/pamhyr.nsi
index aa18830e..80ad4770 100644
--- a/packages/pamhyr.nsi
+++ b/packages/pamhyr.nsi
@@ -39,11 +39,14 @@ Section "Pamhyr2"
 SectionEnd
 
 Section "Start Menu Shortcuts"
-
   CreateDirectory "$SMPROGRAMS\Pamhyr2"
   CreateShortcut "$SMPROGRAMS\Pamhyr2\Uninstall.lnk" "$INSTDIR\uninstall.exe"
   CreateShortcut "$SMPROGRAMS\Pamhyr2\Pamhyr2.lnk" "$INSTDIR\pamhyr\pamhyr.exe"
+SectionEnd
 
+Section "Desktop Shortcuts"
+  SetShellVarContext all
+  CreateShortcut "$desktop\Pamhyr2.lnk" "$instdir\pamhyr\pamhyr.exe"
 SectionEnd
 
 Section "Uninstall"
@@ -51,6 +54,7 @@ Section "Uninstall"
   DeleteRegKey HKLM SOFTWARE\NSIS_Pamhyr2
 
   Delete "$SMPROGRAMS\Pamhyr2\*.lnk"
+  Delete "$desktop\Pamhyr2.lnk"
 
   RMDir "$SMPROGRAMS\Pamhyr2"
   RMDir /R "$INSTDIR"
diff --git a/packages/wine.sh b/packages/wine.sh
index 4f794c51..bb52352e 100755
--- a/packages/wine.sh
+++ b/packages/wine.sh
@@ -81,13 +81,42 @@ wine pyinstaller ../src/pamhyr.py -y
 
 echo " *** COPY DATA"
 
-mkdir -p dist/pamhyr/View/ui
-cp -r ../src/View/ui/ressources/ dist/pamhyr/View/ui/
-cp -r ../src/View/ui/Widgets/*.ui dist/pamhyr/View/ui/
-cp -r ../src/View/ui/*.ui dist/pamhyr/View/ui/
-
-cp ../VERSION dist/pamhyr/
-cp ../AUTHORS dist/pamhyr/
+mkdir -p pamhyr
+mkdir -p pamhyr/pamhyr
+
+# Copy Pamhyr info
+cp -v ../VERSION pamhyr/pamhyr/
+cp -v ../AUTHORS pamhyr/pamhyr/
+cp -v ../LICENSE pamhyr/pamhyr/
+
+# Copy mage
+mkdir -p pamhyr/mage
+cp -v ../mage/* pamhyr/mage/
+
+# Copy Pamhyr
+cp -r dist/pamhyr pamhyr/
+
+# Copy Pamhyr resources
+mkdir -p pamhyr/pamhyr/View
+mkdir -p pamhyr/pamhyr/View/ui
+mkdir -p pamhyr/pamhyr/View/ui/Widgets
+cp -r ../src/View/ui/*.ui pamhyr/pamhyr/View/ui/
+cp -r ../src/View/ui/ressources/ pamhyr/pamhyr/View/ui
+cp -r ../src/View/ui/Widgets/*.ui pamhyr/pamhyr/View/ui/Widgets
+
+# Copy lang
+mkdir -p pamhyr/pamhyr/lang
+cp -r ../src/lang/*.qm pamhyr/pamhyr/lang
+
+# Copy tests cases
+mkdir -p pamhyr/tests_cases/
+mkdir -p pamhyr/tests_cases/Saar
+cp ../tests_cases/Saar/Saar.pamhyr pamhyr/tests_cases/Saar/
+
+# Copy documentations
+mkdir -p pamhyr/doc/
+cp ../doc/users/documentation.pdf pamhyr/doc/Pamhyr2-users.pdf
+cp ../doc/dev/documentation.pdf pamhyr/doc/Pamhyr2-dev.pdf
 
 # Update TS and build QM files
 OLD_PWD=$PWD
@@ -102,19 +131,19 @@ echo " *** MAKE PACKAGES"
 
 echo " TAR pamhyr-win-amd64.tar.xz"
 
-OLD_PWD=$PWD
-cd dist/
-tar --xz -cf pamhyr-win-amd64.tar.xz pamhyr --checkpoint=.100
-cd $OLD_PWD
-mv dist/pamhyr-win-amd64.tar.xz ./
+# OLD_PWD=$PWD
+# cd dist/
+# tar --xz -cf pamhyr-win-amd64.tar.xz pamhyr --checkpoint=.100
+# cd $OLD_PWD
+# mv dist/pamhyr-win-amd64.tar.xz ./
 
 echo " ZIP pamhyr-win-amd64.zip"
 
-OLD_PWD=$PWD
-cd dist/
-zip -r pamhyr-win-amd64.zip pamhyr/
-cd $OLD_PWD
-mv dist/pamhyr-win-amd64.zip ./
+# OLD_PWD=$PWD
+# cd dist/
+# zip -r pamhyr-win-amd64.zip pamhyr/
+# cd $OLD_PWD
+# mv dist/pamhyr-win-amd64.zip ./
 
 echo " *** MAKE INSTALLER"
 
-- 
GitLab