From 6fd4b0730d3ac0e8109e3560ab73f477dbabddf8 Mon Sep 17 00:00:00 2001
From: alemuntoni <muntoni.alessandro@gmail.com>
Date: Tue, 22 Nov 2022 18:00:23 +0100
Subject: [PATCH] using pack script on windows workflow

---
 .github/workflows/Windows.yml | 17 +++--------------
 scripts/Windows/3_pack.sh     |  9 ++++++++-
 2 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/.github/workflows/Windows.yml b/.github/workflows/Windows.yml
index d8bd449d7..c68391185 100644
--- a/.github/workflows/Windows.yml
+++ b/.github/workflows/Windows.yml
@@ -40,6 +40,7 @@ jobs:
         choco install ccache
         choco install ninja
         choco install wget
+        choco install nsis
     - name: Cache external libraries sources
       id: cache-ext-libs
       uses: actions/cache@v3
@@ -58,22 +59,10 @@ jobs:
       shell: bash
       run: |
         bash scripts/${{ runner.os }}/2_deploy.sh
-    - name: NSIS script
-      shell: bash
-      run: |
-        bash scripts/${{ runner.os }}/internal/nsis_script.sh
     - name: Create Installer
-      uses: joncloud/makensis-action@v3.7
-      with:
-        script-file: "install/meshlab_final.nsi"
-    - name: Move Installer
       shell: bash
       run: |
-        mkdir installer
-        mv install/MeshLab*-windows.exe  installer/
-        rm install/meshlab_final.nsi
-        rm install/ExecWaitJob.nsh
-        rm install/FileAssociation.nsh
+        bash scripts/${{ runner.os }}/3_pack.sh
     - name: Uploading MeshLab Portable
       uses: actions/upload-artifact@v3
       with:
@@ -83,4 +72,4 @@ jobs:
       uses: actions/upload-artifact@v3
       with:
         name: meshlab_windows_installer${{steps.envs.outputs.artifact_suffix}}
-        path: installer/MeshLab*-windows.exe
+        path: package/MeshLab*-windows.exe
diff --git a/scripts/Windows/3_pack.sh b/scripts/Windows/3_pack.sh
index e788bfcd6..659aa163b 100644
--- a/scripts/Windows/3_pack.sh
+++ b/scripts/Windows/3_pack.sh
@@ -12,7 +12,7 @@
 SCRIPTS_PATH="$(dirname "$(realpath "$0")")"
 RESOURCES_PATH=$SCRIPTS_PATH/../../resources
 INSTALL_PATH=$SCRIPTS_PATH/../../install
-
+PACKAGE_PATH=$SCRIPTS_PATH/../../package
 
 #checking for parameters
 for i in "$@"
@@ -22,6 +22,10 @@ case $i in
         INSTALL_PATH="${i#*=}"
         shift # past argument=value
         ;;
+    -p=*|--package_path=*)
+        PACKAGE_PATH="${i#*=}"
+        shift # past argument=value
+        ;;
     *)
         # unknown option
         ;;
@@ -35,3 +39,6 @@ makensis.exe $INSTALL_PATH/meshlab_final.nsi
 rm $INSTALL_PATH/meshlab_final.nsi
 rm $INSTALL_PATH/ExecWaitJob.nsh
 rm $INSTALL_PATH/FileAssociation.nsh
+
+mkdir $PACKAGE_PATH
+mv $INSTALL_PATH/MeshLab*-windows.exe  $PACKAGE_PATH