packages inside the package folder

.github/workflows/Linux.yml

@@ -78,7 +78,7 @@ jobs:
       uses: actions/upload-artifact@v3
       with:
         name: meshlab_linux_appimage${{steps.envs.outputs.artifact_suffix}}
-        path: MeshLab*-linux.AppImage
+        path: package/MeshLab*
     #- name: Upload MeshLab deb
     #  uses: actions/upload-artifact@v3
     #  with:

.github/workflows/MacOS.yml

@@ -67,4 +67,4 @@ jobs:
       uses: actions/upload-artifact@v3
       with:
         name: meshlab_macos_dmg${{steps.envs.outputs.artifact_suffix}}
-        path: install/MeshLab*.dmg
+        path: package/MeshLab*

.github/workflows/Windows.yml

@@ -37,10 +37,7 @@ jobs:
     - name: Install dependencies
       shell: bash
       run: |
-        choco install ccache
-        choco install ninja
-        choco install wget
-        choco install nsis
+        choco install ccache ninja wget nsis
     - name: Cache external libraries sources
       id: cache-ext-libs
       uses: actions/cache@v3
@@ -72,4 +69,4 @@ jobs:
       uses: actions/upload-artifact@v3
       with:
         name: meshlab_windows_installer${{steps.envs.outputs.artifact_suffix}}
-        path: package/MeshLab*-windows.exe
+        path: package/MeshLab*

scripts/Linux/3_pack.sh

@@ -11,6 +11,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 "$@"
@@ -20,6 +21,10 @@ case $i in
         INSTALL_PATH="${i#*=}"
         shift # past argument=value
         ;;
+    -p=*|--package_path=*)
+        PACKAGE_PATH="${i#*=}"
+        shift # past argument=value
+        ;;
     *)
         # unknown option
         ;;
@@ -36,4 +41,5 @@ STR_VERSION=$($INSTALL_PATH/AppRun --version)
 read -a strarr <<< "$STR_VERSION"
 ML_VERSION=${strarr[1]} #get the meshlab version from the string
 
-mv MeshLab-*.AppImage MeshLab$ML_VERSION-linux.AppImage
+mkdir $PACKAGE_PATH
+mv MeshLab-*.AppImage $PACKAGE_PATH/MeshLab$ML_VERSION-linux.AppImage

scripts/macOS/3_pack.sh

@@ -12,6 +12,7 @@
 SCRIPTS_PATH=$(cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd)
 RESOURCES_PATH=$SCRIPTS_PATH/../../resources
 INSTALL_PATH=$SCRIPTS_PATH/../../install
+PACKAGE_PATH=$SCRIPTS_PATH/../../package
 
 #checking for parameters
 for i in "$@"
@@ -21,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
         ;;
@@ -49,10 +54,8 @@ rm -f $INSTALL_PATH/*.dmg
 
 mv $INSTALL_PATH/meshlab.app $INSTALL_PATH/MeshLab$ML_VERSION.app
 
-echo "Running appdmg"
-appdmg $RESOURCES_PATH/macos/meshlab_dmg_final.json $INSTALL_PATH/MeshLab$ML_VERSION-macos.dmg
+mkdir $PACKAGE_PATH
+
+appdmg $RESOURCES_PATH/macos/meshlab_dmg_final.json $PACKAGE_PATH/MeshLab$ML_VERSION-macos.dmg
 
 rm $RESOURCES_PATH/macos/meshlab_dmg_final.json
-
-#at this point, distrib folder contains a DMG MeshLab file
-echo "$INSTALL_PATH folder now contains a DMG file"