From 7d765b9cbad221cb0b4586995fc241b96b6d0bf0 Mon Sep 17 00:00:00 2001 From: alemuntoni Date: Thu, 13 Feb 2020 15:13:11 +0100 Subject: [PATCH] vc_redist.exe in meshlab portable, better linux scripts, documentation --- .github/workflows/CompileAndRelease.yml | 3 +++ .github/workflows/CompileWindows.yml | 3 +-- README.md | 2 +- distrib/meshlab_nous | 9 --------- docs/readme.txt | 6 ++++++ install/linux/linux_appimage.sh | 11 +++++++---- install/linux/linux_deploy.sh | 9 ++++++--- 7 files changed, 24 insertions(+), 19 deletions(-) delete mode 100755 distrib/meshlab_nous diff --git a/.github/workflows/CompileAndRelease.yml b/.github/workflows/CompileAndRelease.yml index 459a3093d..79f393780 100755 --- a/.github/workflows/CompileAndRelease.yml +++ b/.github/workflows/CompileAndRelease.yml @@ -105,6 +105,9 @@ jobs: uses: jurplel/install-qt-action@v2 with: modules: qtscript xmlpatterns + - name: Setting Env + run: | + echo '::set-env name=VCINSTALLDIR::C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC' - name: Compiling MeshLab run: | cd src\ diff --git a/.github/workflows/CompileWindows.yml b/.github/workflows/CompileWindows.yml index e77ae2593..2a641862c 100644 --- a/.github/workflows/CompileWindows.yml +++ b/.github/workflows/CompileWindows.yml @@ -23,7 +23,6 @@ jobs: modules: qtscript xmlpatterns - name: Setting Env run: | - ls "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC" echo '::set-env name=VCINSTALLDIR::C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC' - name: Compiling MeshLab run: | @@ -33,7 +32,7 @@ jobs: - name: Creating MeshLab Portable ZIP run: | cd distrib - windeployqt --no-translations --verbose=2 meshlab.exe + windeployqt --no-translations meshlab.exe - name: Uploading Meshlab Portable uses: actions/upload-artifact@v1 with: diff --git a/README.md b/README.md index db7afc93c..dae2e72da 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,7 @@ You can find the last MeshLab release in the [Releases Tab](https://github.com/c You can also test a built version of MeshLab generated by the last commit pushed in this repository, by downloading the artifacts of the last [Github Actions](https://github.com/cnr-isti-vclab/meshlab/actions) workflow. ### Note for Windows -Right now, the portable version of meshlab won't start if doesn't find a Visual C++ Compiler installed (Qt deployment still doesn't support MSVC19). If you get the error "MSVCP140.dll not found" or related, please install Visual C++ [here](https://support.microsoft.com/it-it/help/2977003/the-latest-supported-visual-c-downloads). +Right now, the portable version of meshlab won't start if doesn't find a Visual C++ Compiler installed. If you get the error "MSVCP140.dll not found" or related, please install Visual C++ Redist by executing the `vc_redist.exe` file contained in the meshlab portable archive. Alternatively, you can download Visual C++ Redist [here](https://support.microsoft.com/it-it/help/2977003/the-latest-supported-visual-c-downloads). # Build instructions diff --git a/distrib/meshlab_nous b/distrib/meshlab_nous deleted file mode 100755 index e1937860f..000000000 --- a/distrib/meshlab_nous +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/bash - -oldval = echo $LC_NUMERIC -export LC_NUMERIC="en_US.UTF-8" -chmod 744 ./meshlab -./meshlab & -export LC_NUMERIC=$oldval - - diff --git a/docs/readme.txt b/docs/readme.txt index a03100769..75a236787 100644 --- a/docs/readme.txt +++ b/docs/readme.txt @@ -20,6 +20,12 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License (http://www.gnu.org/licenses/gpl.txt) for more details. +--- Windows Note --- + +If you are running MeshLab portable and you are getting the error “MSVCP140.dll not found” +or related, please install Visual C++ Redist by executing the vc_redist.exe file contained +in the meshlab portable archive. + --- References ---- Please, when using this tool, cite the following reference: diff --git a/install/linux/linux_appimage.sh b/install/linux/linux_appimage.sh index 2e781f312..072252b43 100755 --- a/install/linux/linux_appimage.sh +++ b/install/linux/linux_appimage.sh @@ -16,11 +16,13 @@ cd "${0%/*}" #move to script directory #checking for parameters if [ "$#" -eq 0 ] then - DISTRIB_PATH="../../distrib" + DISTRIB_PATH=$PWD/../../distrib else DISTRIB_PATH=$1 fi +SOURCE_PATH=$PWD/../../src + INSTALL_PATH=$(pwd) cd $DISTRIB_PATH LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$(pwd) @@ -34,14 +36,15 @@ fi cp $INSTALL_PATH/../meshlab.png . cp $INSTALL_PATH/resources/default.desktop . -cp ../LICENSE.txt . -cp ../docs/readme.txt . +cp $SOURCE_PATH/../LICENSE.txt $DISTRIB_PATH +cp $SOURCE_PATH/../docs/readme.txt $DISTRIB_PATH rm -r plugins/U3D_OSX/ rm -r plugins/U3D_W32/ +rm -r README.md $INSTALL_PATH/resources/linuxdeployqt meshlab -appimage -executable=meshlabserver mv *.AppImage MeshLab$(date +%Y.%m)-linux.AppImage #at this point, distrib folder contains all the files necessary to execute meshlab -echo "distrib folder is now a self contained meshlab application" +echo MeshLab$(date +%Y.%m)-linux.AppImage generated diff --git a/install/linux/linux_deploy.sh b/install/linux/linux_deploy.sh index 348e53969..6a95f3682 100644 --- a/install/linux/linux_deploy.sh +++ b/install/linux/linux_deploy.sh @@ -14,11 +14,13 @@ cd "${0%/*}" #move to script directory #checking for parameters if [ "$#" -eq 0 ] then - DISTRIB_PATH="../../distrib" + DISTRIB_PATH=$PWD/../../distrib else DISTRIB_PATH=$1 fi +SOURCE_PATH=$PWD/../../src + INSTALL_PATH=$(pwd) cd $DISTRIB_PATH LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$(pwd) @@ -32,11 +34,12 @@ fi cp $INSTALL_PATH/../meshlab.png . cp $INSTALL_PATH/resources/default.desktop . -cp ../LICENSE.txt . -cp ../docs/readme.txt . +cp $SOURCE_PATH/../LICENSE.txt $DISTRIB_PATH +cp $SOURCE_PATH/../docs/readme.txt $DISTRIB_PATH rm -r plugins/U3D_OSX/ rm -r plugins/U3D_W32/ +rm -r README.md $INSTALL_PATH/resources/linuxdeployqt meshlab -bundle-non-qt-libs -executable=meshlabserver