From 4ecc1e2d7078aa408f38cfb35b68ce72c51b5398 Mon Sep 17 00:00:00 2001 From: alemuntoni Date: Mon, 17 Feb 2020 18:06:05 +0100 Subject: [PATCH] Fix and renaming --- .github/workflows/CompileAndRelease.yml | 74 ++++++++++++------------ .github/workflows/CompileMacOS.yml | 12 ++-- .github/workflows/CompileUbuntu.yml | 18 +++--- .github/workflows/CompileWindows.yml | 26 ++++----- install/windows/resources/meshlab.nsi | Bin 15780 -> 15778 bytes 5 files changed, 65 insertions(+), 65 deletions(-) diff --git a/.github/workflows/CompileAndRelease.yml b/.github/workflows/CompileAndRelease.yml index 8e28ef660..b6d866cb2 100755 --- a/.github/workflows/CompileAndRelease.yml +++ b/.github/workflows/CompileAndRelease.yml @@ -18,27 +18,27 @@ jobs: auth_header="$(git config --local --get http.https://github.com/.extraheader)" git submodule sync --recursive git -c "http.extraheader=$auth_header" -c protocol.version=2 submodule update --init --force --recursive --depth=1 - - name: Installing dependencies + - name: Install dependencies run: | sh install/linux/linux_setup_env_ubuntu.sh - - name: Setting env variables + - name: Setup env variables id: envs shell: bash run: | echo ::set-output name=date::"$(date +%Y.%m)" - - name: Compiling MeshLab + - name: Build MeshLab run: | sh install/linux/linux_build.sh - - name: Deploying MeshLab + - name: Deploy MeshLab run : | sh install/linux/linux_appimage.sh mv distrib/*.AppImage . - - name: Uploading Meshlab Portable + - name: Upload Meshlab Portable uses: actions/upload-artifact@v1 with: name: meshlab_linux_portable path: distrib/ - - name: Uploading Meshlab AppImage + - name: Upload Meshlab AppImage uses: actions/upload-artifact@v1 with: name: meshlab_linux_appimage @@ -56,11 +56,11 @@ jobs: auth_header="$(git config --local --get http.https://github.com/.extraheader)" git submodule sync --recursive git -c "http.extraheader=$auth_header" -c protocol.version=2 submodule update --init --force --recursive --depth=1 - - name: Installing dependencies + - name: Install dependencies run: | brew install llvm libomp qt npm install -g appdmg - - name: Setting env variables + - name: Setup env variables id: envs shell: bash run: | @@ -71,17 +71,17 @@ jobs: echo '::set-env name=LD_LIBRARY_PATH::/usr/local/opt/qt/lib:${{env.LD_LIBRARY_PATH}}' echo '::set-env name=PKG_CONFIG_PATH::/usr/local/opt/qt/lib:${{env.PKG_CONFIG_PATH}}' echo ::set-output name=date::"$(date +%Y.%m)" - - name: Compiling MeshLab + - name: Build MeshLab run: | sh install/macos/macos_build.sh - - name: Deploying MeshLab + - name: Deploy MeshLab run: | sh install/macos/macos_deploy.sh - - name: Creating DMG + - name: Create DMG run: | sh install/macos/macos_dmg.sh mv distrib/MeshLab${{steps.envs.outputs.date}}.dmg distrib/MeshLab${{steps.envs.outputs.date}}-macos.dmg - - name: Uploading DMG + - name: Upload DMG uses: actions/upload-artifact@v1 with: name: meshlab_macos_dmg @@ -99,41 +99,41 @@ jobs: auth_header="$(git config --local --get http.https://github.com/.extraheader)" git submodule sync --recursive git -c "http.extraheader=$auth_header" -c protocol.version=2 submodule update --init --force --recursive --depth=1 - - name: Setting env variables + - name: Setup env variables id: envs run: | echo '::set-env name=VCINSTALLDIR::C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC' echo "::set-output name=date::$(Get-Date -Format "yyyy.MM")" - - name: Setting MSVC + - name: Setup MSVC uses: ilammy/msvc-dev-cmd@v1 - - name: Installing QT + - name: Install QT uses: ouuan/install-qt-action@v2.3.1 with: modules: qtscript xmlpatterns - - name: Compiling MeshLab + - name: Build MeshLab run: | cd src\ qmake nmake - - name: Deploying MeshLab + - name: Deploy MeshLab run: | .\install\windows\windows_deploy.ps1 - - name: Creating NSIS script + - name: NSIS script run: | .\install\windows\windows_nsis_script.ps1 - - name: Creating installer + - name: Create Installer uses: joncloud/makensis-action@v1 with: script-file: "install/windows/resources/meshlab_final.nsi" - - name: Renaming installer + - name: Rename Installer run: | Rename-Item -Path install/windows/resources/MeshLab${{steps.envs.outputs.date}}.exe -NewName install/windows/resources/MeshLab${{steps.envs.outputs.date}}-windows.exe - - name: Uploading Meshlab Portable + - name: Upload Meshlab Portable uses: actions/upload-artifact@v1 with: name: meshlab_windows_portable path: distrib - - name: Uploading Meshlab Installer + - name: Upload Meshlab Installer uses: actions/upload-artifact@v1 with: name: meshlab_windows_installer @@ -141,15 +141,15 @@ jobs: #after building MeshLab for the three platforms, we create a release in github create_release: - name: Creating Release + name: Create Release needs: [ubuntu_build, macos_build, windows_build] runs-on: ubuntu-latest steps: - - name: Setting env variables + - name: Setup env variables id: envs run: | echo ::set-output name=date::"$(date +%Y.%m)" - - name: Publishing Release + - name: Publish Release id: create_release uses: actions/create-release@v1.0.0 env: @@ -161,18 +161,18 @@ jobs: prerelease: false #Linux Release - - name: Downloading Linux ZIP + - name: Download Linux ZIP uses: actions/download-artifact@v1 with: name: meshlab_linux_portable - - name: Creating Meshlab Linux Archive + - name: Create Meshlab Linux Archive run: | zip -r MeshLab${{steps.envs.outputs.date}}-linux.zip meshlab_linux_portable/ - - name: Downloading Linux AppImage + - name: Download Linux AppImage uses: actions/download-artifact@v1 with: name: meshlab_linux_appimage - - name: Uploading ReleaseLinuxPortable + - name: Upload ReleaseLinuxPortable id: upload-release-linux-portable uses: actions/upload-release-asset@v1.0.1 env: @@ -182,7 +182,7 @@ jobs: asset_path: MeshLab${{steps.envs.outputs.date}}-linux.zip asset_name: MeshLab${{steps.envs.outputs.date}}-linux.zip asset_content_type: MeshLab Portable for Linux - - name: Uploading ReleaseLinuxAppImage + - name: Upload ReleaseLinuxAppImage id: upload-release-linux-appimage uses: actions/upload-release-asset@v1.0.1 env: @@ -194,11 +194,11 @@ jobs: asset_content_type: MeshLab AppImage for Linux #MacOS Release - - name: Downloading MacOS DMG + - name: Download MacOS DMG uses: actions/download-artifact@v1 with: name: meshlab_macos_dmg - - name: Uploading ReleaseMacOSDMG + - name: Upload ReleaseMacOSDMG id: upload-release-macos uses: actions/upload-release-asset@v1.0.1 env: @@ -210,18 +210,18 @@ jobs: asset_content_type: MeshLab for MacOS #Windows Release - - name: Downloading Windows ZIP + - name: Download Windows ZIP uses: actions/download-artifact@v1 with: name: meshlab_windows_portable - - name: Downloading Windows Installer + - name: Download Windows Installer uses: actions/download-artifact@v1 with: name: meshlab_windows_installer - - name: Creating Meshlab Portable Archive + - name: Create Meshlab Portable Archive run: | zip -r MeshLab${{steps.envs.outputs.date}}-windows.zip meshlab_windows_portable/ - - name: Uploading ReleaseWindowsPortable + - name: Upload ReleaseWindowsPortable id: upload-release-windows-portable uses: actions/upload-release-asset@v1.0.1 env: @@ -231,7 +231,7 @@ jobs: asset_path: MeshLab${{steps.envs.outputs.date}}-windows.zip asset_name: MeshLab${{steps.envs.outputs.date}}-windows.zip asset_content_type: MeshLab Portable for Windows - - name: Uploading ReleaseWindowsInstaller + - name: Upload ReleaseWindowsInstaller id: upload-release-windows-installer uses: actions/upload-release-asset@v1.0.1 env: diff --git a/.github/workflows/CompileMacOS.yml b/.github/workflows/CompileMacOS.yml index 19cd67035..8bf151c3b 100755 --- a/.github/workflows/CompileMacOS.yml +++ b/.github/workflows/CompileMacOS.yml @@ -16,11 +16,11 @@ jobs: auth_header="$(git config --local --get http.https://github.com/.extraheader)" git submodule sync --recursive git -c "http.extraheader=$auth_header" -c protocol.version=2 submodule update --init --force --recursive --depth=1 - - name: Installing dependencies + - name: Install dependencies run: | brew install llvm libomp qt npm install -g appdmg - - name: Setting env variables + - name: Setup env variables id: envs shell: bash run: | @@ -31,17 +31,17 @@ jobs: echo '::set-env name=LD_LIBRARY_PATH::/usr/local/opt/qt/lib:${{env.LD_LIBRARY_PATH}}' echo '::set-env name=PKG_CONFIG_PATH::/usr/local/opt/qt/lib:${{env.PKG_CONFIG_PATH}}' echo ::set-output name=date::"$(date +%Y.%m)" - - name: Compiling MeshLab + - name: Build MeshLab run: | sh install/macos/macos_build.sh - - name: Deploying MeshLab + - name: Deploy MeshLab run: | sh install/macos/macos_deploy.sh - - name: Creating DMG + - name: Create DMG run: | sh install/macos/macos_dmg.sh mv distrib/MeshLab${{steps.envs.outputs.date}}.dmg distrib/MeshLab${{steps.envs.outputs.date}}-macos.dmg - - name: Uploading DMG + - name: Upload DMG uses: actions/upload-artifact@v1 with: name: meshlab_macos_dmg diff --git a/.github/workflows/CompileUbuntu.yml b/.github/workflows/CompileUbuntu.yml index dcaf6cffc..babe396c2 100755 --- a/.github/workflows/CompileUbuntu.yml +++ b/.github/workflows/CompileUbuntu.yml @@ -16,27 +16,27 @@ jobs: auth_header="$(git config --local --get http.https://github.com/.extraheader)" git submodule sync --recursive git -c "http.extraheader=$auth_header" -c protocol.version=2 submodule update --init --force --recursive --depth=1 - - name: Installing dependencies + - name: Install dependencies run: | sh install/linux/linux_setup_env_ubuntu.sh - - name: Setting env variables + - name: Setup env variables id: envs shell: bash run: | echo ::set-output name=date::"$(date +%Y.%m)" - - name: Compiling MeshLab + - name: Build MeshLab run: | sh install/linux/linux_build.sh - - name: Deploying MeshLab + - name: Deploy MeshLab run : | sh install/linux/linux_appimage.sh mv distrib/*.AppImage . - - name: Uploading Meshlab Portable + - name: Upload Meshlab Portable uses: actions/upload-artifact@v1 with: name: meshlab_linux_portable path: distrib/ - - name: Uploading Meshlab AppImage + - name: Upload Meshlab AppImage uses: actions/upload-artifact@v1 with: name: meshlab_linux_appimage @@ -55,13 +55,13 @@ jobs: auth_header="$(git config --local --get http.https://github.com/.extraheader)" git submodule sync --recursive git -c "http.extraheader=$auth_header" -c protocol.version=2 submodule update --init --force --recursive --depth=1 - - name: Installing dependencies + - name: Instal dependencies run: | sudo apt-get update sudo apt-get install -y qt5-default qtscript5-dev libqt5xmlpatterns5-dev mesa-common-dev libglu1-mesa-dev lib3ds-dev libglew-dev libeigen3-dev libopenctm-dev libgmp-dev libqhull-dev cmake ninja-build - - name: Configuring + - name: Configure run: | cmake src/ -G Ninja - - name: Compiling meshlab + - name: Build MeshLab run: ninja -C . diff --git a/.github/workflows/CompileWindows.yml b/.github/workflows/CompileWindows.yml index ede678a98..50c336871 100644 --- a/.github/workflows/CompileWindows.yml +++ b/.github/workflows/CompileWindows.yml @@ -15,41 +15,41 @@ jobs: auth_header="$(git config --local --get http.https://github.com/.extraheader)" git submodule sync --recursive git -c "http.extraheader=$auth_header" -c protocol.version=2 submodule update --init --force --recursive --depth=1 - - name: Setting env variables + - name: Setup env variables id: envs run: | echo '::set-env name=VCINSTALLDIR::C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC' echo "::set-output name=date::$(Get-Date -Format "yyyy.MM")" - - name: Setting MSVC + - name: Setup MSVC uses: ilammy/msvc-dev-cmd@v1 - - name: Installing QT + - name: Install QT uses: ouuan/install-qt-action@v2.3.1 with: modules: qtscript xmlpatterns - - name: Compiling MeshLab + - name: Build MeshLab run: | cd src\ qmake nmake - - name: Deploying MeshLab + - name: Deploy MeshLab run: | .\install\windows\windows_deploy.ps1 - - name: Creating NSIS script + - name: NSIS script run: | .\install\windows\windows_nsis_script.ps1 - - name: Creating installer + - name: Create Installer uses: joncloud/makensis-action@v1 with: script-file: "install/windows/resources/meshlab_final.nsi" - - name: Renaming installer + - name: Rename Installer run: | Rename-Item -Path install/windows/resources/MeshLab${{steps.envs.outputs.date}}.exe -NewName install/windows/resources/MeshLab${{steps.envs.outputs.date}}-windows.exe - - name: Uploading Meshlab Portable + - name: Upload Meshlab Portable uses: actions/upload-artifact@v1 with: name: meshlab_windows_portable path: distrib - - name: Uploading Meshlab Installer + - name: Upload Meshlab Installer uses: actions/upload-artifact@v1 with: name: meshlab_windows_installer @@ -67,9 +67,9 @@ jobs: auth_header="$(git config --local --get http.https://github.com/.extraheader)" git submodule sync --recursive git -c "http.extraheader=$auth_header" -c protocol.version=2 submodule update --init --force --recursive --depth=1 - - name: Setting MSVC + - name: Setup MSVC uses: ilammy/msvc-dev-cmd@v1 - - name: Installing QT + - name: Install QT uses: ouuan/install-qt-action@v2.3.1 with: modules: qtscript xmlpatterns @@ -77,7 +77,7 @@ jobs: run: | cmake -S ./src -B ./build -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_INSTALL_PREFIX=install # -DBUILD_MINI=ON - - name: Build + - name: Build MeshLab run: | cmake --build $env:GITHUB_WORKSPACE/build --config RelWithDebInfo -j 4 cmake --build $env:GITHUB_WORKSPACE/build --config RelWithDebInfo --target INSTALL diff --git a/install/windows/resources/meshlab.nsi b/install/windows/resources/meshlab.nsi index 9d7186fcaf22e1d5b6e1d46359fc7e4d4c93697b..f6e3ea5018abbb29f92c79e2d80b798a50c809d5 100644 GIT binary patch delta 20 ccmZ2dy{LM_3%<#V6h$T{s0eK43qHp9$rt5BC&#G>Z06ygrUw9V{|J!)