From c798bf0cc5a642488729c44cf8de66e82958ada2 Mon Sep 17 00:00:00 2001 From: alemuntoni Date: Thu, 9 Apr 2020 12:44:17 +0200 Subject: [PATCH 1/9] update Info.plist on CompileAndRelease workflow --- .github/workflows/CompileAndRelease.yml | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/.github/workflows/CompileAndRelease.yml b/.github/workflows/CompileAndRelease.yml index a25021dda..1812337ea 100755 --- a/.github/workflows/CompileAndRelease.yml +++ b/.github/workflows/CompileAndRelease.yml @@ -1,14 +1,14 @@ name: CompileAndRelease on: - #[push, pull_request] #just for test release scripts - schedule: - - cron: '0 0 1 * *' #every first day of the month at midnight + [push, pull_request] #just for test release scripts + #schedule: + # - cron: '0 0 1 * *' #every first day of the month at midnight jobs: update_ml_version: name: Update ML_VERSION - runs-on: ubuntu-latest + runs-on: macos steps: - uses: actions/checkout@v2 - name: Checkout submodules @@ -24,6 +24,10 @@ jobs: - name: Update MeshLab version run : | echo ${{steps.envs.outputs.date}} | tr -d '\n'> ML_VERSION + - name: Update Info.plist + run: | + /usr/libexec/PlistBuddy -c "Set CFBundleShortVersionString ${{steps.envs.outputs.date}}" src/meshlab/Info.plist +/usr/libexec/PlistBuddy -c "Set CFBundleVersion ${{steps.envs.outputs.date}}" src/meshlab/Info.plist - name: commit ML_VERSION change uses: stefanzweifel/git-auto-commit-action@v4.1.1 with: From bb45c0d8f1c07b475c12c17a798c135dcebc390f Mon Sep 17 00:00:00 2001 From: alemuntoni Date: Thu, 9 Apr 2020 12:45:15 +0200 Subject: [PATCH 2/9] fix error CompileAndRelease --- .github/workflows/CompileAndRelease.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/CompileAndRelease.yml b/.github/workflows/CompileAndRelease.yml index 1812337ea..b78916bed 100755 --- a/.github/workflows/CompileAndRelease.yml +++ b/.github/workflows/CompileAndRelease.yml @@ -27,7 +27,7 @@ jobs: - name: Update Info.plist run: | /usr/libexec/PlistBuddy -c "Set CFBundleShortVersionString ${{steps.envs.outputs.date}}" src/meshlab/Info.plist -/usr/libexec/PlistBuddy -c "Set CFBundleVersion ${{steps.envs.outputs.date}}" src/meshlab/Info.plist + /usr/libexec/PlistBuddy -c "Set CFBundleVersion ${{steps.envs.outputs.date}}" src/meshlab/Info.plist - name: commit ML_VERSION change uses: stefanzweifel/git-auto-commit-action@v4.1.1 with: From 3520405c15997c53eb14ba65f8953508240f794b Mon Sep 17 00:00:00 2001 From: alemuntoni Date: Thu, 9 Apr 2020 12:50:09 +0200 Subject: [PATCH 3/9] add CFBundleShortVersionString --- .github/workflows/CompileAndRelease.yml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/CompileAndRelease.yml b/.github/workflows/CompileAndRelease.yml index b78916bed..8a1b9d135 100755 --- a/.github/workflows/CompileAndRelease.yml +++ b/.github/workflows/CompileAndRelease.yml @@ -7,7 +7,7 @@ on: jobs: update_ml_version: - name: Update ML_VERSION + name: Update ML_VERSION and Info.plist runs-on: macos steps: - uses: actions/checkout@v2 @@ -26,12 +26,13 @@ jobs: echo ${{steps.envs.outputs.date}} | tr -d '\n'> ML_VERSION - name: Update Info.plist run: | - /usr/libexec/PlistBuddy -c "Set CFBundleShortVersionString ${{steps.envs.outputs.date}}" src/meshlab/Info.plist + /usr/libexec/PlistBuddy -c "Add :CFBundleShortVersionString string 2020.03" src/meshlab/Info.plist + #/usr/libexec/PlistBuddy -c "Set CFBundleShortVersionString ${{steps.envs.outputs.date}}" src/meshlab/Info.plist /usr/libexec/PlistBuddy -c "Set CFBundleVersion ${{steps.envs.outputs.date}}" src/meshlab/Info.plist - - name: commit ML_VERSION change + - name: commit ML_VERSION and Info.plist change uses: stefanzweifel/git-auto-commit-action@v4.1.1 with: - commit_message: Apply automatic ML_VERSION change + commit_message: Apply automatic ML_VERSION and Info.plist change ubuntu_build: needs: [update_ml_version] From d404d1133ed26d1817f780a8ddf9043539e849d8 Mon Sep 17 00:00:00 2001 From: alemuntoni Date: Thu, 9 Apr 2020 12:53:17 +0200 Subject: [PATCH 4/9] add CFBundleVersion --- .github/workflows/CompileAndRelease.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/CompileAndRelease.yml b/.github/workflows/CompileAndRelease.yml index 8a1b9d135..46d6bf280 100755 --- a/.github/workflows/CompileAndRelease.yml +++ b/.github/workflows/CompileAndRelease.yml @@ -28,7 +28,8 @@ jobs: run: | /usr/libexec/PlistBuddy -c "Add :CFBundleShortVersionString string 2020.03" src/meshlab/Info.plist #/usr/libexec/PlistBuddy -c "Set CFBundleShortVersionString ${{steps.envs.outputs.date}}" src/meshlab/Info.plist - /usr/libexec/PlistBuddy -c "Set CFBundleVersion ${{steps.envs.outputs.date}}" src/meshlab/Info.plist + /usr/libexec/PlistBuddy -c "Add :CFBundleVersion string 2020.03" src/meshlab/Info.plist + #/usr/libexec/PlistBuddy -c "Set CFBundleVersion ${{steps.envs.outputs.date}}" src/meshlab/Info.plist - name: commit ML_VERSION and Info.plist change uses: stefanzweifel/git-auto-commit-action@v4.1.1 with: From 54e486f9004ef866b83c4699d6decc9cb1b74918 Mon Sep 17 00:00:00 2001 From: alemuntoni Date: Thu, 9 Apr 2020 10:53:48 +0000 Subject: [PATCH 5/9] Apply automatic ML_VERSION and Info.plist change --- src/meshlab/Info.plist | 52 +++++++++++++++++++++++------------------- 1 file changed, 28 insertions(+), 24 deletions(-) diff --git a/src/meshlab/Info.plist b/src/meshlab/Info.plist index f92b0f272..59136e639 100644 --- a/src/meshlab/Info.plist +++ b/src/meshlab/Info.plist @@ -5,56 +5,56 @@ CFBundleDocumentTypes + CFBundleTypeExtensions + + obj + + CFBundleTypeIconFile + meshlab.icns + CFBundleTypeName + OBJ 3D File CFBundleTypeOSTypes OBJ CFBundleTypeRole Editor - CFBundleTypeIconFile - meshlab.icns - CFBundleTypeName - OBJ 3D File - CFBundleTypeExtensions - - obj - LSHandlerRank Default + CFBundleTypeExtensions + + stl + + CFBundleTypeIconFile + meshlab.icns + CFBundleTypeName + STL 3D File CFBundleTypeOSTypes STL CFBundleTypeRole Editor - CFBundleTypeIconFile - meshlab.icns - CFBundleTypeName - STL 3D File - CFBundleTypeExtensions - - stl - LSHandlerRank Default + CFBundleTypeExtensions + + ply + + CFBundleTypeIconFile + meshlab.icns + CFBundleTypeName + PLY 3D File CFBundleTypeOSTypes PLY CFBundleTypeRole Editor - CFBundleTypeIconFile - meshlab.icns - CFBundleTypeName - PLY 3D File - CFBundleTypeExtensions - - ply - LSHandlerRank Default @@ -69,8 +69,12 @@ com.vcg.meshlab CFBundlePackageType APPL + CFBundleShortVersionString + 2020.03 CFBundleSignature ???? + CFBundleVersion + 2020.03 LSMinimumSystemVersion 10.12 NOTE From 4870c04792e136acff924c59c8b075314b03d06c Mon Sep 17 00:00:00 2001 From: alemuntoni Date: Thu, 9 Apr 2020 12:55:42 +0200 Subject: [PATCH 6/9] Set CFBundleVersion and CFBundleShortVersionString --- .github/workflows/CompileAndRelease.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/CompileAndRelease.yml b/.github/workflows/CompileAndRelease.yml index 46d6bf280..e2191b4ee 100755 --- a/.github/workflows/CompileAndRelease.yml +++ b/.github/workflows/CompileAndRelease.yml @@ -26,10 +26,8 @@ jobs: echo ${{steps.envs.outputs.date}} | tr -d '\n'> ML_VERSION - name: Update Info.plist run: | - /usr/libexec/PlistBuddy -c "Add :CFBundleShortVersionString string 2020.03" src/meshlab/Info.plist - #/usr/libexec/PlistBuddy -c "Set CFBundleShortVersionString ${{steps.envs.outputs.date}}" src/meshlab/Info.plist - /usr/libexec/PlistBuddy -c "Add :CFBundleVersion string 2020.03" src/meshlab/Info.plist - #/usr/libexec/PlistBuddy -c "Set CFBundleVersion ${{steps.envs.outputs.date}}" src/meshlab/Info.plist + /usr/libexec/PlistBuddy -c "Set CFBundleShortVersionString ${{steps.envs.outputs.date}}" src/meshlab/Info.plist + /usr/libexec/PlistBuddy -c "Set CFBundleVersion ${{steps.envs.outputs.date}}" src/meshlab/Info.plist - name: commit ML_VERSION and Info.plist change uses: stefanzweifel/git-auto-commit-action@v4.1.1 with: From d89fcea373fd39a27bc0b148ce96c04b507e1caa Mon Sep 17 00:00:00 2001 From: alemuntoni Date: Thu, 9 Apr 2020 10:56:40 +0000 Subject: [PATCH 7/9] Apply automatic ML_VERSION and Info.plist change --- src/meshlab/Info.plist | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/meshlab/Info.plist b/src/meshlab/Info.plist index 59136e639..a2a4a6b3d 100644 --- a/src/meshlab/Info.plist +++ b/src/meshlab/Info.plist @@ -70,11 +70,11 @@ CFBundlePackageType APPL CFBundleShortVersionString - 2020.03 + 2020.04 CFBundleSignature ???? CFBundleVersion - 2020.03 + 2020.04 LSMinimumSystemVersion 10.12 NOTE From 94f4a45b18cbe0639e868a0008d2178f6c8d42dc Mon Sep 17 00:00:00 2001 From: alemuntoni Date: Thu, 9 Apr 2020 14:39:43 +0200 Subject: [PATCH 8/9] Copyright in Info.plist, rescheduling CompileAndRelease --- .github/workflows/CompileAndRelease.yml | 6 +++--- src/meshlab/Info.plist | 6 ++++-- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/.github/workflows/CompileAndRelease.yml b/.github/workflows/CompileAndRelease.yml index e2191b4ee..23c0cfedb 100755 --- a/.github/workflows/CompileAndRelease.yml +++ b/.github/workflows/CompileAndRelease.yml @@ -1,9 +1,9 @@ name: CompileAndRelease on: - [push, pull_request] #just for test release scripts - #schedule: - # - cron: '0 0 1 * *' #every first day of the month at midnight + #[push, pull_request] #just for test release scripts + schedule: + - cron: '0 0 1 * *' #every first day of the month at midnight jobs: update_ml_version: diff --git a/src/meshlab/Info.plist b/src/meshlab/Info.plist index a2a4a6b3d..a8940ad0e 100644 --- a/src/meshlab/Info.plist +++ b/src/meshlab/Info.plist @@ -61,8 +61,6 @@ CFBundleExecutable meshlab - CFBundleGetInfoString - MeshLab VCG-ISTI-CNR CFBundleIconFile meshlab.icns CFBundleIdentifier @@ -79,6 +77,10 @@ 10.12 NOTE This file was generated for MeshLab. + NSHumanReadableCopyright + Created by Paolo Cignoni - VCG-ISTI-CNR + Copyright © 2005-2020. All rights reserved. + NSPrincipalClass NSApplication NSSupportsAutomaticGraphicsSwitching From f1935ee85112347d0bffa35c135f1f8e1cc471ac Mon Sep 17 00:00:00 2001 From: alemuntoni Date: Thu, 9 Apr 2020 15:01:55 +0200 Subject: [PATCH 9/9] removed error message for 64-bit meshlab version --- src/meshlab/mainwindow_RunTime.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/meshlab/mainwindow_RunTime.cpp b/src/meshlab/mainwindow_RunTime.cpp index d95585586..c47bf816b 100644 --- a/src/meshlab/mainwindow_RunTime.cpp +++ b/src/meshlab/mainwindow_RunTime.cpp @@ -1619,7 +1619,9 @@ void MainWindow::executeFilter(QAction *action, RichParameterSet ¶ms, bool i { meshDoc()->setBusy(false); qApp->restoreOverrideCursor(); - QMessageBox::warning(this, tr("Filter Failure"), QString("Operating system was not able to allocate the requested memory.
Failure of filter : '%1'
We warmly suggest you to try a 64-bit version of MeshLab.
").arg(action->text())+bdall.what()); // text + QMessageBox::warning(this, tr("Filter Failure"), + QString("Operating system was not able to allocate the requested memory.
" + "Failure of filter : '%1'
").arg(action->text())+bdall.what()); // text MainWindow::globalStatusBar()->showMessage("Filter failed...",2000); } qb->reset();