diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index c2c6e2e87..000000000 --- a/.travis.yml +++ /dev/null @@ -1,105 +0,0 @@ -# Enable C++ support -language: cpp - -compiler: - - clang - -addons: - apt: - sources: - - sourceline: ppa:beineri/opt-qt-5.12.0-bionic - packages: - - qt512[QTPACKAGE] - - qt512script - - qt512xmlpatterns - - mesa-common-dev - - libglu1-mesa-dev - homebrew: - packages: - - llvm - - libomp - - qt - -matrix: - include: - - os: osx - osx_image: xcode11 - - - os: linux - dist: bionic - sudo: required - -git: - depth: 1 - -install: - - | - if [[ "$TRAVIS_OS_NAME" == "osx" ]] - then - export CXX = /usr/local/opt/llvm/bin/clang++ - npm install -g appdmg - echo "appdmg version: " - npm list --depth=0 - export COLUMNS=80 - - #Set up Qt from brew - export QTDIR=/usr/local/opt/qt - export PATH=$QTDIR/bin:$PATH - export LD_LIBRARY_PATH=$QTDIR/lib:$LD_LIBRARY_PATH - export PKG_CONFIG_PATH=$QTDIR/lib:$PKG_CONFIG_PATH - fi - if [[ "$TRAVIS_OS_NAME" == "linux" ]] - then - export QMAKESPEC="linux-clang" - fi - - cd .. - - git clone --depth=1 --branch=devel https://github.com/cnr-isti-vclab/vcglib.git - - cd meshlab - -script: - - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then PATH="/usr/local/opt/llvm/bin:$PATH" ;fi - - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then which clang ;fi - - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then LDFLAGS=-L$QTDIR/lib ;fi - - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then CPPFLAGS=-I$QTDIR/include ;fi - - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then source /opt/qt512/bin/qt512-env.sh ;fi - - cd src - - cd external - - qmake --version - - qmake - - make -j4 - - cd .. - - qmake meshlab_full.pro - - make -j4 - -#after_success: -# - | -# if [[ "$TRAVIS_OS_NAME" == "osx" ]] -# then -# pwd -# ls distrib -# cd install/macx -# ./macinstall_v2018.sh -# pwd -# echo "------ Completed!!! We should have a dmg here " -# cd ../../.. -# ls -la src/distrib/MeshLab201804.dmg -# fi -#before_deploy: -# - ls -la src/distrib/MeshLab201804.dmg -# - git config --local user.name "cignoni" -# - git config --local user.email "cignoni@isti.cnr.it" -# #- git tag "MeshLab-$(date +'%Y%m%d')-$(echo 'beta')" -# - git tag "$(git log --format=%h -1)" -# #- git tag "$(date +'%Y%m%d%H%M%S')-$(git log --format=%h -1)" -#deploy: -# overwrite: true -# provider: releases -# api_key: -# secure: DwQcZjW9DJQvfSh0hIc1xHu3mrX6TJ5IqEBz8H6W4Y+/hln4+qGHBBqYBB2KfdhA1Tlb0cy6vthZIVXWL0LWdFVX9Al8hZeQ1EXIJO3WlqTqZUQgy01lgT5FxXBDeaACH9+InyGM2nXw3i0WJW+bUdWJ2dQQaDyEc+JMmvg5Pi5vzK4DusbpBxZkL0T2egfJuxlNi+C5a8kPu31L6uew5pf5EhBEcjLjayB+QulfX9XN/cmGqFIy8+nlRXjay7dankCsOaznEbZh9PRzeLX+YO2A5qVHtcJpBxMkm50BhpuWQtSFa8JA08spVhVABCB7sY35qL2BzVJH0KeoqNKZRBOAkLSvQefyg7nAR093YUiB+1LgyefBZWU17THMjp2XMwyYsA57eF58EPP3uZal/w2voQ1FgZh7uIN+2b/lXl2qBm0dy4E9XGNR+hSsTJOQd5VNPsP76P9Uc9iTidGHi2KN34tL+ySvPAZ1DWLfR4lrjloe3PhHUMrYOg9pvv9lCfbL/23sAWyBsIII+YXohuXp/PR5hbYxRFyVQM4lizgXNICHc++RldqjlsLbd3uSzSaAmTftclcoL7hB2X7SkLKOlYaQl6lz+B9elo4Y92Zi8tv7t31SlgbjpDX9FUX0GOS/XIjvZX1xqe0lLuJgLTt6bo8X5rDCoXkNVNhvtzw= -# file: "./src/distrib/MeshLab201804.dmg" -# skip_cleanup: true -# name: "MeshLab-$(date +'%Y%m%d')-beta" -# prerelease: true -# on: -# repo: cnr-isti-vclab/meshlab -# condition: $TRAVIS_OS_NAME = osx diff --git a/.travis_old.yml b/.travis_old.yml deleted file mode 100644 index 95997bba3..000000000 --- a/.travis_old.yml +++ /dev/null @@ -1,122 +0,0 @@ -# Enable C++ support -language: cpp - -os: - - osx - - linux - -dist: trusty -sudo: required - -compiler: - - clang - -git: - depth: 1 - -before_install: - - | - if [[ "$TRAVIS_OS_NAME" == "linux" ]] - then - # suggested by https://stackoverflow.com/questions/29721240/ci-for-qt-app-build-with-different-qt-versions - #sudo add-apt-repository --yes ppa:beineri/opt-qt551-trusty - sudo add-apt-repository --yes ppa:beineri/opt-qt594-trusty - sudo apt-get update -qq - fi - -install: - - | - if [[ "$TRAVIS_OS_NAME" == "osx" ]] - then - npm install -g appdmg - echo "appdmg version: " - npm list --depth=0 - export COLUMNS=80 - curl -LO https://raw.githubusercontent.com/GiovanniBussi/macports-ci/master/macports-ci - chmod +x ./macports-ci - ./macports-ci install - PATH="/opt/local/bin:$PATH" - sudo port -N install clang-6.0 - sudo port -N install libomp - sudo port -N install qt59 - sudo port -N install qt59-qtscript - sudo port -N install qt59-qttools - #Set up Qt environment - #Use Qt from MacPorts, change QTDIR if using own version of Qt - export QTDIR=/opt/local/libexec/qt5 - export PATH=$QTDIR/bin:$PATH - export LD_LIBRARY_PATH=$QTDIR/lib:$LD_LIBRARY_PATH - export PKG_CONFIG_PATH=$QTDIR/lib:$PKG_CONFIG_PATH - echo "----------" - echo $PATH - echo "----------" - clang --version - echo "----------" - qmake --version - fi - if [[ "$TRAVIS_OS_NAME" == "linux" ]] - then - sudo apt-get -y install qt59[QTPACKAGE] - #sudo apt-get -y install qt5-default - #sudo apt-get -y install qtscript5-dev - #sudo apt-get -y install libqt5xmlpatterns5-dev - qmake --version - echo $QMAKESPEC - export QMAKESPEC="linux-clang" - fi - - cd .. - - git clone --depth=1 --branch=devel https://github.com/cnr-isti-vclab/vcglib.git - - cd meshlab -cache: -# directories: -# - $HOME/.macports-ci-ccache -script: - #- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then PATH="/usr/local/opt/llvm/bin:$PATH" ;fi - - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then which clang ;fi - #- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then ln -s /usr/local/opt/llvm/bin/clang /usr/local/opt/llvm/bin/clang++-mp-3.9 ;fi - #- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then PATH="$QTDIR/bin:$PATH" ;fi - - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then LDFLAGS=-L$QTDIR/lib ;fi - - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then CPPFLAGS=-I$QTDIR/include ;fi - #- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then source /opt/qt55/bin/qt55-env.sh ;fi - - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then source /opt/qt59/bin/qt59-env.sh ;fi - - cd src - - cd external - - qmake --version - - qmake - - make -j4 - - cd .. - #- qmake meshlab_mini.pro - - qmake meshlab_full.pro - - make -j4 -after_success: - - | - if [[ "$TRAVIS_OS_NAME" == "osx" ]] - then - pwd - ls distrib - cd install/macx - ./macinstall_v2018.sh - pwd - echo "------ Completed!!! We should have a dmg here " - cd ../../.. - ls -la src/distrib/MeshLab201804.dmg - fi -before_deploy: - - ls -la src/distrib/MeshLab201804.dmg - - git config --local user.name "cignoni" - - git config --local user.email "cignoni@isti.cnr.it" - #- git tag "MeshLab-$(date +'%Y%m%d')-$(echo 'beta')" - - git tag "$(git log --format=%h -1)" - #- git tag "$(date +'%Y%m%d%H%M%S')-$(git log --format=%h -1)" -deploy: - overwrite: true - provider: releases - api_key: - secure: DwQcZjW9DJQvfSh0hIc1xHu3mrX6TJ5IqEBz8H6W4Y+/hln4+qGHBBqYBB2KfdhA1Tlb0cy6vthZIVXWL0LWdFVX9Al8hZeQ1EXIJO3WlqTqZUQgy01lgT5FxXBDeaACH9+InyGM2nXw3i0WJW+bUdWJ2dQQaDyEc+JMmvg5Pi5vzK4DusbpBxZkL0T2egfJuxlNi+C5a8kPu31L6uew5pf5EhBEcjLjayB+QulfX9XN/cmGqFIy8+nlRXjay7dankCsOaznEbZh9PRzeLX+YO2A5qVHtcJpBxMkm50BhpuWQtSFa8JA08spVhVABCB7sY35qL2BzVJH0KeoqNKZRBOAkLSvQefyg7nAR093YUiB+1LgyefBZWU17THMjp2XMwyYsA57eF58EPP3uZal/w2voQ1FgZh7uIN+2b/lXl2qBm0dy4E9XGNR+hSsTJOQd5VNPsP76P9Uc9iTidGHi2KN34tL+ySvPAZ1DWLfR4lrjloe3PhHUMrYOg9pvv9lCfbL/23sAWyBsIII+YXohuXp/PR5hbYxRFyVQM4lizgXNICHc++RldqjlsLbd3uSzSaAmTftclcoL7hB2X7SkLKOlYaQl6lz+B9elo4Y92Zi8tv7t31SlgbjpDX9FUX0GOS/XIjvZX1xqe0lLuJgLTt6bo8X5rDCoXkNVNhvtzw= - file: "./src/distrib/MeshLab201804.dmg" - skip_cleanup: true - name: "MeshLab-$(date +'%Y%m%d')-beta" - prerelease: true - on: - repo: cnr-isti-vclab/meshlab - condition: $TRAVIS_OS_NAME = osx diff --git a/README.md b/README.md index 904e7e786..c5ab1c31a 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,5 @@ # ![MeshLab Logo](src/meshlab/images/eye64.png) MeshLab -[![Build Status](https://travis-ci.org/cnr-isti-vclab/meshlab.svg?branch=master)](https://travis-ci.org/cnr-isti-vclab/meshlab) -[![Build status](https://ci.appveyor.com/api/projects/status/bdxm2m4n5ud7vm47?svg=true)](https://ci.appveyor.com/project/cignoni/meshlab) [![Actions Status](https://github.com/cnr-isti-vclab/meshlab/workflows/CompileUbuntu/badge.svg)](https://github.com/cnr-isti-vclab/meshlab/actions) [![Actions Status](https://github.com/cnr-isti-vclab/meshlab/workflows/CompileMacOS/badge.svg)](https://github.com/cnr-isti-vclab/meshlab/actions) @@ -15,6 +13,17 @@ MeshLab is mostly based on the open source C++ mesh processing library [VCGlib]( MeshLab is available for Windows, MacOSX, and Linux. +# Build instructions + +MeshLab requires [Qt](https://www.qt.io/) >= 5.9, with "script" and "xmlpatterns" as additional packages. + +After setting up the Qt environment: + + git clone --recursive https://github.com/cnr-isti-vclab/meshlab + cd src + qmake + make + Compiling instructions can be found in the [src](https://github.com/cnr-isti-vclab/meshlab/tree/master/src) folder or simply looking at the continous integration setup on [Github Actions](https://github.com/cnr-isti-vclab/meshlab/actions), [travis](https://travis-ci.org/cnr-isti-vclab/meshlab/builds) and [appveyor](https://ci.appveyor.com/project/cignoni/meshlab/history). # License @@ -71,3 +80,4 @@ For documented and repeatable bugs, feature requests, etc., please use the [GitH For general questions use [StackOverflow](http://stackoverflow.com/questions/tagged/meshlab). + diff --git a/appveyor.yml b/appveyor.yml deleted file mode 100644 index 9a3db50f2..000000000 --- a/appveyor.yml +++ /dev/null @@ -1,99 +0,0 @@ -branches: - only: - - master - -# Build worker image (VM template) -image: Visual Studio 2015 - -# clone directory -shallow_clone: true -clone_folder: c:\projects\meshlab -# Build Configuration, i.e. Debug, Release, etc. -configuration: - - release -# - debug - -environment: - matrix: - # Microsoft Visual Studio 64bit -# - QTDIR: C:\Qt\5.10.0\msvc2015 -# - QTDIR: C:\Qt\5.10.0\msvc2015_64 - - QTDIR: C:\Qt\5.9\msvc2015_64 - VSVER: 14.0 -# SPEC: win32-msvc2015 - SPEC: win64-msvc2015 - COMPILER: nmake - PATH: C:\Program Files (x86)\NSIS\;%PATH% - #ARTIFACT: $(APPVEYOR_PROJECT_NAME)-%APPVEYOR_REPO_TAG_NAME%.%APPVEYOR_BUILD_NUMBER%-win64.zip - #ARTIFACT: $(APPVEYOR_PROJECT_NAME)-%APPVEYOR_REPO_TAG_NAME%-win64.zip - - - -# Set paths, etc. -before_build: -# - path - - cd %APPVEYOR_BUILD_FOLDER% - - cd .. - - git clone --depth=1 --branch=devel https://github.com/cnr-isti-vclab/vcglib.git - - dir - - set DISTRIBNAME=MeshLab_%DATE:~-4%%DATE:~4,2%%DATE:~7,2%.zip - # Set paths - #- '%QTDIR%\bin\qtenv2.bat' - - call "%QTDIR%\bin\qtenv2.bat" - # Show qmake and make version - - qmake -v - # Detect architecture (32bit or 64bit) - - if %QTDIR:_64=%==%QTDIR% (set ARCH=x86) else (set ARCH=x64) - # Set more... if Microsoft Visual Studio - - if %COMPILER%==nmake call "%ProgramFiles(x86)%\Microsoft Visual Studio %VSVER%\VC\vcvarsall.bat" %ARCH% - # Show build folder - - echo %APPVEYOR_BUILD_FOLDER% - - echo %CONFIGURATION% - - echo %ARCH% - - echo %DISTRIBNAME% -# - appveyor SetVariable -Name DISTRIBNAME -Value %DISTRIBNAME% - - - -#artifacts: -# - path: src/distrib.zip -# name: meshlab-portable - -# To run your custom scripts instead of automatic MSBuild -build_script: - # Go to clone directory - - cd %APPVEYOR_BUILD_FOLDER% - - cd src - - cd external - - qmake external.pro -r - - call %COMPILER% - - dir lib - - dir lib\win32-msvc - - dir lib\win32-msvc2015 - # for some reason it seems that external get different defaults lib... - - copy lib\win32-msvc\*.lib lib\win32-msvc2015 - - dir lib\win32-msvc2015 - - cd .. - - dir - # Run qmake for the REAL project - # - qmake meshlab_mini.pro -r -spec %SPEC% "CONFIG+=%CONFIGURATION%" - - qmake meshlab.pro - - dir - # Run compiler - #- '%COMPILER%' - - call %COMPILER% - - dir - - cd %APPVEYOR_BUILD_FOLDER% - - dir - - cd src\distrib - - dir - - windeployqt --no-translations meshlab.exe - - dir - - cd %APPVEYOR_BUILD_FOLDER% - - cd src - - 7z a %DISTRIBNAME% distrib - - appveyor PushArtifact %DISTRIBNAME% -DeploymentName MeshLabPortable - - dir -# - cd ..\install -# - makensis /V4 meshlab-64bit-appveyor.nsi -# - dir ..\distrib