From 14c4e36947c9a54a8d612943b1ccf64526c9c1dd Mon Sep 17 00:00:00 2001 From: Alessandro Muntoni Date: Mon, 6 Nov 2023 15:26:58 +0100 Subject: [PATCH 1/3] update meshlab --- src/meshlab | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/meshlab b/src/meshlab index 108e98b..8744bca 160000 --- a/src/meshlab +++ b/src/meshlab @@ -1 +1 @@ -Subproject commit 108e98b7b6be34219cf05543e8aac1660adf03b3 +Subproject commit 8744bca3aa580cbf21fc31247e5484fadb4a99dd From 66dd0b50ffbd7931730c2a527a6818d375e83f7e Mon Sep 17 00:00:00 2001 From: Alessandro Muntoni Date: Wed, 15 Nov 2023 14:05:39 +0100 Subject: [PATCH 2/3] update meshlab submodule --- src/meshlab | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/meshlab b/src/meshlab index 8744bca..30bd2e8 160000 --- a/src/meshlab +++ b/src/meshlab @@ -1 +1 @@ -Subproject commit 8744bca3aa580cbf21fc31247e5484fadb4a99dd +Subproject commit 30bd2e8bb898855f9c687eb83d7a0a9688c9c1bb From feac829ba27ec31125873daea580c58b7a1ce567 Mon Sep 17 00:00:00 2001 From: Alessandro Muntoni Date: Wed, 15 Nov 2023 14:53:36 +0100 Subject: [PATCH 3/3] python 3.7 end of life --- .github/workflows/BuildAndTest.yml | 8 ++++---- .github/workflows/CreateAndTestRelease.yml | 8 ++++---- scripts/macOS/2_deploy.sh | 18 ++++++++++++------ 3 files changed, 20 insertions(+), 14 deletions(-) diff --git a/.github/workflows/BuildAndTest.yml b/.github/workflows/BuildAndTest.yml index a9436e0..970f7cd 100644 --- a/.github/workflows/BuildAndTest.yml +++ b/.github/workflows/BuildAndTest.yml @@ -13,7 +13,7 @@ jobs: strategy: fail-fast: false matrix: - pyversion: ['3.7', '3.8', '3.9', '3.10', '3.11'] + pyversion: ['3.8', '3.9', '3.10', '3.11'] os: ['ubuntu-20.04', 'macos-latest', 'windows-latest'] steps: - uses: actions/checkout@v3 @@ -67,7 +67,7 @@ jobs: strategy: fail-fast: false matrix: - pyversion: ['3.7', '3.8', '3.9', '3.10', '3.11'] + pyversion: ['3.8', '3.9', '3.10', '3.11'] os: ['ubuntu-20.04', 'macos-latest', 'windows-latest'] steps: - uses: actions/checkout@v3 @@ -100,7 +100,7 @@ jobs: strategy: fail-fast: false matrix: - pyversion: ['3.7', '3.8', '3.9', '3.10', '3.11'] + pyversion: ['3.8', '3.9', '3.10', '3.11'] os: ['ubuntu-latest', 'macos-latest', 'windows-latest'] steps: - name: Download PyMeshLab_${{ runner.os }}_python${{ matrix.pyversion }} @@ -135,7 +135,7 @@ jobs: strategy: fail-fast: false matrix: - pyversion: ['3.7', '3.8', '3.9', '3.10', '3.11'] + pyversion: ['3.8', '3.9', '3.10', '3.11'] os: ['ubuntu-latest', 'macos-latest', 'windows-latest'] steps: - name: Download pymeshlab_whl_${{ runner.os }}_python${{ matrix.pyversion }} diff --git a/.github/workflows/CreateAndTestRelease.yml b/.github/workflows/CreateAndTestRelease.yml index 9721db5..a34d7b4 100644 --- a/.github/workflows/CreateAndTestRelease.yml +++ b/.github/workflows/CreateAndTestRelease.yml @@ -32,7 +32,7 @@ jobs: needs: update_version strategy: matrix: - pyversion: ['3.7', '3.8', '3.9', '3.10', '3.11'] + pyversion: ['3.8', '3.9', '3.10', '3.11'] os: ['ubuntu-20.04', 'macos-latest', 'windows-latest'] steps: - uses: actions/checkout@v3 @@ -86,7 +86,7 @@ jobs: needs: build_pymeshlab strategy: matrix: - pyversion: ['3.7', '3.8', '3.9', '3.10', '3.11'] + pyversion: ['3.8', '3.9', '3.10', '3.11'] os: ['ubuntu-20.04', 'macos-latest', 'windows-latest'] steps: - uses: actions/checkout@v3 @@ -118,7 +118,7 @@ jobs: needs: build_pymeshlab strategy: matrix: - pyversion: ['3.7', '3.8', '3.9', '3.10', '3.11'] + pyversion: ['3.8', '3.9', '3.10', '3.11'] os: ['ubuntu-latest', 'macos-latest', 'windows-latest'] steps: - name: Download PyMeshLab_${{ runner.os }}_python${{ matrix.pyversion }} @@ -152,7 +152,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - pyversion: ['3.7', '3.8', '3.9', '3.10', '3.11'] + pyversion: ['3.8', '3.9', '3.10', '3.11'] os: ['ubuntu-latest', 'macos-latest', 'windows-latest'] steps: - name: Download pymeshlab_whl_${{ runner.os }}_python${{ matrix.pyversion }} diff --git a/scripts/macOS/2_deploy.sh b/scripts/macOS/2_deploy.sh index 9ba1c27..1d91e84 100644 --- a/scripts/macOS/2_deploy.sh +++ b/scripts/macOS/2_deploy.sh @@ -32,11 +32,17 @@ do ARGUMENTS="${ARGUMENTS} -executable=${plugin}" done -${QT_DIR}macdeployqt $INSTALL_PATH/dummybin.app \ +if ${QT_DIR}macdeployqt $INSTALL_PATH/dummybin.app \ -executable=$MODULE_NAME \ - $ARGUMENTS + $ARGUMENTS; \ +then + rsync -a $INSTALL_PATH/dummybin.app/Contents/Frameworks/ $INSTALL_PATH/Frameworks/ + rsync -a $INSTALL_PATH/dummybin.app/Contents/PlugIns/ $INSTALL_PATH/PlugIns/ + mv $INSTALL_PATH/dummybin.app/Contents/pmeshlab* $INSTALL_PATH/ + rm -rf $INSTALL_PATH/dummybin.app +else + echo "macdeployqt failed with error code $?. Script was not completed successfully." + exit 1 +fi + -rsync -a $INSTALL_PATH/dummybin.app/Contents/Frameworks/ $INSTALL_PATH/Frameworks/ -rsync -a $INSTALL_PATH/dummybin.app/Contents/PlugIns/ $INSTALL_PATH/PlugIns/ -mv $INSTALL_PATH/dummybin.app/Contents/pmeshlab* $INSTALL_PATH/ -rm -rf $INSTALL_PATH/dummybin.app