vc_redist.exe in meshlab portable, better linux scripts, documentation

This commit is contained in:
alemuntoni 2020-02-13 15:13:11 +01:00
parent 6fd61e2c0f
commit 7d765b9cba
7 changed files with 24 additions and 19 deletions

View File

@ -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\

View File

@ -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:

View File

@ -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

View File

@ -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

View File

@ -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:

View File

@ -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

View File

@ -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