From 6f53a36ffbc1a04cdca53d7d3b97cca1048d3469 Mon Sep 17 00:00:00 2001
From: alemuntoni <muntoni.alessandro@gmail.com>
Date: Tue, 22 Nov 2022 17:34:59 +0100
Subject: [PATCH] rename and unify meshlab packaging stage

---
 .github/workflows/Linux.yml                             | 4 ++--
 .github/workflows/MacOS.yml                             | 2 +-
 scripts/Linux/{0_setup_env_ubuntu.sh => 0_setup_env.sh} | 0
 scripts/Linux/{3_appimage.sh => 3_pack.sh}              | 0
 scripts/Linux/make_it.sh                                | 3 ++-
 scripts/Windows/{3_installer.sh => 3_pack.sh}           | 0
 scripts/Windows/make_it.sh                              | 2 +-
 scripts/macOS/{3_dmg.sh => 3_pack.sh}                   | 0
 scripts/macOS/make_it.sh                                | 2 +-
 9 files changed, 7 insertions(+), 6 deletions(-)
 rename scripts/Linux/{0_setup_env_ubuntu.sh => 0_setup_env.sh} (100%)
 rename scripts/Linux/{3_appimage.sh => 3_pack.sh} (100%)
 rename scripts/Windows/{3_installer.sh => 3_pack.sh} (100%)
 rename scripts/macOS/{3_dmg.sh => 3_pack.sh} (100%)

diff --git a/.github/workflows/Linux.yml b/.github/workflows/Linux.yml
index 232dbe3cd..695094c69 100644
--- a/.github/workflows/Linux.yml
+++ b/.github/workflows/Linux.yml
@@ -25,7 +25,7 @@ jobs:
         version: ${{ env.QT_VERSION }}
     - name: Install dependencies
       run: |
-        bash scripts/${{ runner.os }}/0_setup_env_ubuntu.sh --dont_install_qt --dont_install_cgal_and_boost
+        bash scripts/${{ runner.os }}/0_setup_env.sh --dont_install_qt --dont_install_cgal_and_boost
         #needed by qt 5.15 on linux
         sudo apt-get install libxcb-icccm4-dev libxcb-image0-dev libxcb-keysyms1-dev libxcb-render-util0-dev libxcb-xinerama0-dev
     - name: Setup env variables
@@ -58,7 +58,7 @@ jobs:
     - name: AppImage
       shell: bash
       run: |
-        bash scripts/${{ runner.os }}/3_appimage.sh
+        bash scripts/${{ runner.os }}/3_pack.sh
     #todo: try deb when ubuntu16.04 won't be required anymore by linuxdeployqt...
     #- name: Build deb package
     #  uses: jiro4989/build-deb-action@v2
diff --git a/.github/workflows/MacOS.yml b/.github/workflows/MacOS.yml
index db767cc2c..cde211ccb 100644
--- a/.github/workflows/MacOS.yml
+++ b/.github/workflows/MacOS.yml
@@ -57,7 +57,7 @@ jobs:
     - name: Create DMG
       shell: bash
       run: |
-        bash scripts/${{ runner.os }}/3_dmg.sh
+        bash scripts/${{ runner.os }}/3_pack.sh
     - name: Upload MeshLab Portable
       uses: actions/upload-artifact@v3
       with:
diff --git a/scripts/Linux/0_setup_env_ubuntu.sh b/scripts/Linux/0_setup_env.sh
similarity index 100%
rename from scripts/Linux/0_setup_env_ubuntu.sh
rename to scripts/Linux/0_setup_env.sh
diff --git a/scripts/Linux/3_appimage.sh b/scripts/Linux/3_pack.sh
similarity index 100%
rename from scripts/Linux/3_appimage.sh
rename to scripts/Linux/3_pack.sh
diff --git a/scripts/Linux/make_it.sh b/scripts/Linux/make_it.sh
index 384d72955..d63a3419e 100644
--- a/scripts/Linux/make_it.sh
+++ b/scripts/Linux/make_it.sh
@@ -55,4 +55,5 @@ esac
 done
 
 bash $SCRIPTS_PATH/1_build.sh -b=$BUILD_PATH -i=$INSTALL_PATH $QT_DIR_OPTION $DOUBLE_PRECISION_OPTION $CORES
-bash $SCRIPTS_PATH/2_deploy_and_appimage.sh -i=$INSTALL_PATH $QT_DIR_OPTION
+bash $SCRIPTS_PATH/2_deploy.sh -i=$INSTALL_PATH $QT_DIR_OPTION
+bash $SCRIPTS_PATH/3_pack.sh -i=$INSTALL_PATH
diff --git a/scripts/Windows/3_installer.sh b/scripts/Windows/3_pack.sh
similarity index 100%
rename from scripts/Windows/3_installer.sh
rename to scripts/Windows/3_pack.sh
diff --git a/scripts/Windows/make_it.sh b/scripts/Windows/make_it.sh
index b315e465f..421884b1d 100644
--- a/scripts/Windows/make_it.sh
+++ b/scripts/Windows/make_it.sh
@@ -50,4 +50,4 @@ done
 
 sh $SCRIPTS_PATH/1_build.sh -b=$BUILD_PATH -i=$INSTALL_PATH $DOUBLE_PRECISION_OPTION $CORES
 sh $SCRIPTS_PATH/2_deploy.sh -i=$INSTALL_PATH
-sh $SCRIPTS_PATH/3_installer.sh -i=$INSTALL_PATH $DOUBLE_PRECISION_OPTION
+sh $SCRIPTS_PATH/3_pack.sh -i=$INSTALL_PATH
diff --git a/scripts/macOS/3_dmg.sh b/scripts/macOS/3_pack.sh
similarity index 100%
rename from scripts/macOS/3_dmg.sh
rename to scripts/macOS/3_pack.sh
diff --git a/scripts/macOS/make_it.sh b/scripts/macOS/make_it.sh
index d420f788e..835c388ef 100644
--- a/scripts/macOS/make_it.sh
+++ b/scripts/macOS/make_it.sh
@@ -51,4 +51,4 @@ done
 
 sh $SCRIPTS_PATH/1_build.sh -b=$BUILD_PATH -i=$INSTALL_PATH $DOUBLE_PRECISION_OPTION $CORES
 sh $SCRIPTS_PATH/2_deploy.sh -i=$INSTALL_PATH
-sh $SCRIPTS_PATH/3_dmg.sh -i=$INSTALL_PATH $DOUBLE_PRECISION_OPTION
+sh $SCRIPTS_PATH/3_pack.sh -i=$INSTALL_PATH