diff --git a/.github/workflows/BuildAndRelease.yml b/.github/workflows/BuildAndRelease.yml index 452425aa2..8c8c56ef1 100644 --- a/.github/workflows/BuildAndRelease.yml +++ b/.github/workflows/BuildAndRelease.yml @@ -30,8 +30,7 @@ jobs: /usr/libexec/PlistBuddy -c "Set CFBundleVersion ${{steps.envs.outputs.date}}" src/meshlab/Info.plist - name: Update Snap file run: | - sed "s%MESHLAB_VERSION%$(cat ML_VERSION)%g" snap_noversion.yaml > snapcraft.yaml - sed "s%MESHLAB_VERSION%$(cat ML_VERSION)%g" install/linux/snap/local/snap_noversion.yaml > install/linux/snap/snapcraft.yaml + sed "s%MESHLAB_VERSION%$(cat ML_VERSION)%g" install/linux/snap/snap_noversion.yaml > snapcraft.yaml - name: commit ML_VERSION, snapcraft.yaml and Info.plist change uses: stefanzweifel/git-auto-commit-action@v4.1.1 with: @@ -109,11 +108,10 @@ jobs: echo ::set-output name=date::"$(cat ML_VERSION)" - name: Build MeshLab Snap run: | - cd install/linux/ snapcraft - name: Rename Snap run: | - mv install/linux/meshlab*.snap ./MeshLab${{steps.envs.outputs.date}}-linux.snap + mv ./meshlab*.snap ./MeshLab${{steps.envs.outputs.date}}-linux.snap - name: Upload Meshlab Snap uses: actions/upload-artifact@v1 with: diff --git a/.github/workflows/BuildUbuntu.yml b/.github/workflows/BuildUbuntu.yml index cc896d5aa..49f8d06b9 100644 --- a/.github/workflows/BuildUbuntu.yml +++ b/.github/workflows/BuildUbuntu.yml @@ -74,11 +74,10 @@ jobs: echo ::set-output name=date::"$(cat ML_VERSION)" - name: Build MeshLab Snap run: | - cd install/linux/ snapcraft - name: Rename Snap run: | - mv install/linux/meshlab*.snap ./MeshLab${{steps.envs.outputs.date}}-linux.snap + mv ./meshlab*.snap ./MeshLab${{steps.envs.outputs.date}}-linux.snap - name: Upload Meshlab Snap uses: actions/upload-artifact@v1 with: diff --git a/install/linux/snap/local/README.md b/install/linux/snap/README.md similarity index 100% rename from install/linux/snap/local/README.md rename to install/linux/snap/README.md diff --git a/install/linux/snap/gui/meshlab.desktop b/install/linux/snap/meshlab.desktop similarity index 97% rename from install/linux/snap/gui/meshlab.desktop rename to install/linux/snap/meshlab.desktop index 6491010c6..14df30877 100644 --- a/install/linux/snap/gui/meshlab.desktop +++ b/install/linux/snap/meshlab.desktop @@ -6,7 +6,7 @@ GenericName=Mesh processing GenericName[en_GB]=Mesh processing Comment=View and process meshes Type=Application -Icon=meshlab +Icon=meshlab.png Exec=meshlab %F Terminal=false MimeType=model/mesh;application/x-3ds;image/x-3ds;model/x-ply;application/sla;model/x-quad-object;model/x-geomview-off;application/x-cyclone-ptx;application/x-vmi;application/x-bre;model/vnd.collada+xml;model/openctm;application/x-expe-binary;application/x-expe-ascii;application/x-xyz;application/x-gts;chemical/x-pdb;application/x-tri;application/x-asc;model/x3d+xml;model/x3d+vrml;model/vrml;model/u3d;model/idtf; diff --git a/install/linux/snap/local/snap_noversion.yaml b/install/linux/snap/snap_noversion.yaml similarity index 92% rename from install/linux/snap/local/snap_noversion.yaml rename to install/linux/snap/snap_noversion.yaml index e37293783..e91c26b8a 100644 --- a/install/linux/snap/local/snap_noversion.yaml +++ b/install/linux/snap/snap_noversion.yaml @@ -9,7 +9,7 @@ description: | rendering, texturing and converting meshes. It offers features for processing raw data produced by 3D digitization tools/devices and for preparing models for 3D printing. -icon: snap/gui/meshlab.png +icon: meshlab.png grade: stable confinement: strict @@ -94,6 +94,7 @@ parts: rm -r README.md mkdir -p $SNAPCRAFT_PART_INSTALL/usr/bin + mkdir -p $SNAPCRAFT_PART_INSTALL/snap/local mkdir -p $SNAPCRAFT_PART_INSTALL/usr/lib/meshlab mkdir -p $SNAPCRAFT_PART_INSTALL/usr/share/applications mkdir -p $SNAPCRAFT_PART_INSTALL/usr/share/meshlab @@ -101,7 +102,9 @@ parts: mkdir -p $SNAPCRAFT_PART_INSTALL/usr/share/icons/hicolor/512x512/apps/ mkdir -p $SNAPCRAFT_PART_INSTALL/usr/share/icons/Yaru/512x512/apps/ - cp ../install/linux/snap/gui/meshlab.desktop $SNAPCRAFT_PART_INSTALL/usr/share/applications/ + cp ../install/linux/snap/meshlab.desktop $SNAPCRAFT_PART_INSTALL/usr/share/applications/ + cp meshlab.png $SNAPCRAFT_PART_INSTALL/usr/share/applications/ + cp ../install/linux/snap/README.md $SNAPCRAFT_PART_INSTALL/snap/local/ cp meshlab.png $SNAPCRAFT_PART_INSTALL/usr/share/icons/hicolor/512x512/apps/meshlab.png mv meshlab.png $SNAPCRAFT_PART_INSTALL/usr/share/icons/Yaru/512x512/apps/meshlab.png mv meshlabserver $SNAPCRAFT_PART_INSTALL/usr/bin diff --git a/install/linux/snap/snapcraft.yaml b/install/linux/snap/snapcraft.yaml deleted file mode 100644 index 7a47b8c72..000000000 --- a/install/linux/snap/snapcraft.yaml +++ /dev/null @@ -1,115 +0,0 @@ -# Known to build in Ubuntu 18.04 -name: meshlab -base: core18 -version: '2020.06' -summary: MeshLab -description: | - The open source system for processing and editing 3D triangular meshes. - It provides a set of tools for editing, cleaning, healing, inspecting, - rendering, texturing and converting meshes. It offers features for processing - raw data produced by 3D digitization tools/devices and for preparing models - for 3D printing. -icon: snap/gui/meshlab.png - -grade: stable -confinement: strict - -apps: - meshlab: - command: desktop-launch meshlab - plugs: [home, x11, mir, opengl] - desktop: usr/share/applications/meshlab.desktop - meshlabserver: - command: desktop-launch meshlabserver - plugs: [home, x11, opengl] - - -parts: - desktop-qt5: - build-packages: - - build-essential - - qtbase5-dev - - dpkg-dev - make-parameters: - - FLAVOR=qt5 - plugin: make - source: https://github.com/ubuntu/snapcraft-desktop-helpers.git - source-subdir: qt - stage-packages: - - libxkbcommon0 - - ttf-ubuntu-font-family - - dmz-cursor-theme - - light-themes - - adwaita-icon-theme - - gnome-themes-standard - - shared-mime-info - - libqt5gui5 - - libgdk-pixbuf2.0-0 - - libqt5svg5 - - try: - - appmenu-qt5 - - locales-all - - xdg-user-dirs - - fcitx-frontend-qt5 - meshlab: - after: [desktop-qt5] - plugin: qmake - qt-version: qt5 - source: https://github.com/cnr-isti-vclab/meshlab.git - build-packages: - - qt5-default - - qttools5-dev-tools - - qtdeclarative5-dev - - libqt5xmlpatterns5-dev - - mesa-common-dev - - libglu1-mesa-dev - - lib3ds-dev - - libglew-dev - - libeigen3-dev - - libopenctm-dev - - libgmp-dev - - libqhull-dev - stage-packages: - - lib3ds-1-3 - - libgomp1 - - libopenctm1 - - libqhull7 - - libglew-dev - - libqt5opengl5-dev - - libqt5xmlpatterns5-dev - - libqt5gui5 - override-build: | - qmake src/meshlab.pro "CONFIG+= system_eigen3 system_glew system_bzip2 system_openctm system_lib3ds" - make -j4 - cd distrib - - rm -r lib/macx64/ - rm -r lib/win32-msvc/ - rm -r lib/win32-msvc2008/ - rm -r lib/win32-msvc2015/ - rm -r lib/readme.txt - rm -r plugins/U3D_OSX/ - rm -r plugins/U3D_W32/ - rm -r plugins/plugins.txt - rm -r README.md - - mkdir -p $SNAPCRAFT_PART_INSTALL/usr/bin - mkdir -p $SNAPCRAFT_PART_INSTALL/usr/lib/meshlab - mkdir -p $SNAPCRAFT_PART_INSTALL/usr/share/applications - mkdir -p $SNAPCRAFT_PART_INSTALL/usr/share/meshlab - mkdir -p $SNAPCRAFT_PART_INSTALL/usr/share/doc/meshlab - mkdir -p $SNAPCRAFT_PART_INSTALL/usr/share/icons/hicolor/512x512/apps/ - mkdir -p $SNAPCRAFT_PART_INSTALL/usr/share/icons/Yaru/512x512/apps/ - - cp ../install/linux/snap/gui/meshlab.desktop $SNAPCRAFT_PART_INSTALL/usr/share/applications/ - cp meshlab.png $SNAPCRAFT_PART_INSTALL/usr/share/icons/hicolor/512x512/apps/meshlab.png - mv meshlab.png $SNAPCRAFT_PART_INSTALL/usr/share/icons/Yaru/512x512/apps/meshlab.png - mv meshlabserver $SNAPCRAFT_PART_INSTALL/usr/bin - mv meshlab $SNAPCRAFT_PART_INSTALL/usr/bin - mv LICENSE.txt $SNAPCRAFT_PART_INSTALL/usr/share/doc/meshlab/ - mv privacy.txt $SNAPCRAFT_PART_INSTALL/usr/share/doc/meshlab/ - mv readme.txt $SNAPCRAFT_PART_INSTALL/usr/share/doc/meshlab/ - mv lib/libmeshlab-common* $SNAPCRAFT_PART_INSTALL/usr/lib/ - mv plugins/ $SNAPCRAFT_PART_INSTALL/usr/lib/meshlab/ - mv lib/linux/* $SNAPCRAFT_PART_INSTALL/usr/lib/meshlab/plugins - mv shaders/ $SNAPCRAFT_PART_INSTALL/usr/share/meshlab/ diff --git a/install/linux/snap/gui/meshlab.png b/meshlab.png similarity index 100% rename from install/linux/snap/gui/meshlab.png rename to meshlab.png diff --git a/snap_noversion.yaml b/snap_noversion.yaml deleted file mode 100644 index 0d83758fd..000000000 --- a/snap_noversion.yaml +++ /dev/null @@ -1,115 +0,0 @@ -# Known to build in Ubuntu 18.04 -name: meshlab -base: core18 -version: 'MESHLAB_VERSION' -summary: MeshLab -description: | - The open source system for processing and editing 3D triangular meshes. - It provides a set of tools for editing, cleaning, healing, inspecting, - rendering, texturing and converting meshes. It offers features for processing - raw data produced by 3D digitization tools/devices and for preparing models - for 3D printing. -icon: install/linux/snap/gui/meshlab.png - -grade: stable -confinement: strict - -apps: - meshlab: - command: desktop-launch meshlab - plugs: [home, x11, mir, opengl] - desktop: usr/share/applications/meshlab.desktop - meshlabserver: - command: desktop-launch meshlabserver - plugs: [home, x11, opengl] - - -parts: - desktop-qt5: - build-packages: - - build-essential - - qtbase5-dev - - dpkg-dev - make-parameters: - - FLAVOR=qt5 - plugin: make - source: https://github.com/ubuntu/snapcraft-desktop-helpers.git - source-subdir: qt - stage-packages: - - libxkbcommon0 - - ttf-ubuntu-font-family - - dmz-cursor-theme - - light-themes - - adwaita-icon-theme - - gnome-themes-standard - - shared-mime-info - - libqt5gui5 - - libgdk-pixbuf2.0-0 - - libqt5svg5 - - try: - - appmenu-qt5 - - locales-all - - xdg-user-dirs - - fcitx-frontend-qt5 - meshlab: - after: [desktop-qt5] - plugin: qmake - qt-version: qt5 - source: https://github.com/cnr-isti-vclab/meshlab.git - build-packages: - - qt5-default - - qttools5-dev-tools - - qtdeclarative5-dev - - libqt5xmlpatterns5-dev - - mesa-common-dev - - libglu1-mesa-dev - - lib3ds-dev - - libglew-dev - - libeigen3-dev - - libopenctm-dev - - libgmp-dev - - libqhull-dev - stage-packages: - - lib3ds-1-3 - - libgomp1 - - libopenctm1 - - libqhull7 - - libglew-dev - - libqt5opengl5-dev - - libqt5xmlpatterns5-dev - - libqt5gui5 - override-build: | - qmake src/meshlab.pro "CONFIG+= system_eigen3 system_glew system_bzip2 system_openctm system_lib3ds" - make -j4 - cd distrib - - rm -r lib/macx64/ - rm -r lib/win32-msvc/ - rm -r lib/win32-msvc2008/ - rm -r lib/win32-msvc2015/ - rm -r lib/readme.txt - rm -r plugins/U3D_OSX/ - rm -r plugins/U3D_W32/ - rm -r plugins/plugins.txt - rm -r README.md - - mkdir -p $SNAPCRAFT_PART_INSTALL/usr/bin - mkdir -p $SNAPCRAFT_PART_INSTALL/usr/lib/meshlab - mkdir -p $SNAPCRAFT_PART_INSTALL/usr/share/applications - mkdir -p $SNAPCRAFT_PART_INSTALL/usr/share/meshlab - mkdir -p $SNAPCRAFT_PART_INSTALL/usr/share/doc/meshlab - mkdir -p $SNAPCRAFT_PART_INSTALL/usr/share/icons/hicolor/512x512/apps/ - mkdir -p $SNAPCRAFT_PART_INSTALL/usr/share/icons/Yaru/512x512/apps/ - - cp ../install/linux/snap/gui/meshlab.desktop $SNAPCRAFT_PART_INSTALL/usr/share/applications/ - cp meshlab.png $SNAPCRAFT_PART_INSTALL/usr/share/icons/hicolor/512x512/apps/meshlab.png - mv meshlab.png $SNAPCRAFT_PART_INSTALL/usr/share/icons/Yaru/512x512/apps/meshlab.png - mv meshlabserver $SNAPCRAFT_PART_INSTALL/usr/bin - mv meshlab $SNAPCRAFT_PART_INSTALL/usr/bin - mv LICENSE.txt $SNAPCRAFT_PART_INSTALL/usr/share/doc/meshlab/ - mv privacy.txt $SNAPCRAFT_PART_INSTALL/usr/share/doc/meshlab/ - mv readme.txt $SNAPCRAFT_PART_INSTALL/usr/share/doc/meshlab/ - mv lib/libmeshlab-common* $SNAPCRAFT_PART_INSTALL/usr/lib/ - mv plugins/ $SNAPCRAFT_PART_INSTALL/usr/lib/meshlab/ - mv lib/linux/* $SNAPCRAFT_PART_INSTALL/usr/lib/meshlab/plugins - mv shaders/ $SNAPCRAFT_PART_INSTALL/usr/share/meshlab/ diff --git a/snapcraft.yaml b/snapcraft.yaml index fe6230e0c..a8f1d298c 100644 --- a/snapcraft.yaml +++ b/snapcraft.yaml @@ -9,7 +9,7 @@ description: | rendering, texturing and converting meshes. It offers features for processing raw data produced by 3D digitization tools/devices and for preparing models for 3D printing. -icon: install/linux/snap/gui/meshlab.png +icon: meshlab.png grade: stable confinement: strict @@ -93,6 +93,7 @@ parts: rm -r plugins/plugins.txt rm -r README.md + mkdir -p $SNAPCRAFT_PART_INSTALL/snap/local/ mkdir -p $SNAPCRAFT_PART_INSTALL/usr/bin mkdir -p $SNAPCRAFT_PART_INSTALL/usr/lib/meshlab mkdir -p $SNAPCRAFT_PART_INSTALL/usr/share/applications @@ -101,7 +102,9 @@ parts: mkdir -p $SNAPCRAFT_PART_INSTALL/usr/share/icons/hicolor/512x512/apps/ mkdir -p $SNAPCRAFT_PART_INSTALL/usr/share/icons/Yaru/512x512/apps/ - cp ../install/linux/snap/gui/meshlab.desktop $SNAPCRAFT_PART_INSTALL/usr/share/applications/ + cp ../install/linux/snap/meshlab.desktop $SNAPCRAFT_PART_INSTALL/usr/share/applications/ + cp meshlab.png $SNAPCRAFT_PART_INSTALL/usr/share/applications/ + cp ../install/linux/snap/README.md $SNAPCRAFT_PART_INSTALL/snap/local/ cp meshlab.png $SNAPCRAFT_PART_INSTALL/usr/share/icons/hicolor/512x512/apps/meshlab.png mv meshlab.png $SNAPCRAFT_PART_INSTALL/usr/share/icons/Yaru/512x512/apps/meshlab.png mv meshlabserver $SNAPCRAFT_PART_INSTALL/usr/bin