diff --git a/.github/workflows/CompileMacOS.yml b/.github/workflows/CompileMacOS.yml index 2744c9b39..eed6acbf3 100755 --- a/.github/workflows/CompileMacOS.yml +++ b/.github/workflows/CompileMacOS.yml @@ -32,13 +32,13 @@ jobs: make -j4 - name: Creating DMG run: | - cd src/install/macx + cd install/macx ./macinstall_latest.sh - cd ../../.. - ls -la src/distrib/MeshLab${{steps.envs.outputs.date}}.dmg - mv src/distrib/MeshLab${{steps.envs.outputs.date}}.dmg src/distrib/MeshLab${{steps.envs.outputs.date}}-macos.dmg + cd ../.. + ls -la distrib/MeshLab${{steps.envs.outputs.date}}.dmg + mv distrib/MeshLab${{steps.envs.outputs.date}}.dmg distrib/MeshLab${{steps.envs.outputs.date}}-macos.dmg - name: Uploading DMG uses: actions/upload-artifact@v1 with: name: meshlab_macos - path: src/distrib/MeshLab${{steps.envs.outputs.date}}-macos.dmg + path: distrib/MeshLab${{steps.envs.outputs.date}}-macos.dmg diff --git a/.github/workflows/CompileUbuntu.yml b/.github/workflows/CompileUbuntu.yml index 6c77490d6..3e0a228e4 100755 --- a/.github/workflows/CompileUbuntu.yml +++ b/.github/workflows/CompileUbuntu.yml @@ -27,7 +27,7 @@ jobs: make -j4 - name: Creating Meshlab Portable ZIP run : | - cd src/install/linux + cd install/linux ./linux_install.sh cd ../../distrib/ mv *.AppImage ../MeshLab${{steps.envs.outputs.date}}-linux.AppImage @@ -35,12 +35,12 @@ jobs: uses: actions/upload-artifact@v1 with: name: meshlab_portable_linux - path: src/distrib/ + path: distrib/ - name: Uploading Meshlab AppImage uses: actions/upload-artifact@v1 with: name: meshlab_linux - path: src/MeshLab${{steps.envs.outputs.date}}-linux.AppImage + path: MeshLab${{steps.envs.outputs.date}}-linux.AppImage ubuntu_build_cmake: diff --git a/install/linux/linux_install.sh b/install/linux/linux_install.sh index e13b2d1e9..e44ea554b 100755 --- a/install/linux/linux_install.sh +++ b/install/linux/linux_install.sh @@ -15,21 +15,15 @@ else exit 1 fi -rm -r sample/ -mkdir lib -cp libcommon.so.1.0.0 lib/libcommon.so.1.0.0 -cp lib/libcommon.so.1.0.0 lib/libcommon.so.1.0 -cp lib/libcommon.so.1.0.0 lib/libcommon.so.1 -cp lib/libcommon.so.1.0.0 lib/libcommon.so cp $INSTALL_PATH/../meshlab.png . cp $INSTALL_PATH/default.desktop . -cp ../../LICENSE.txt . -cp ../../docs/readme.txt . +cp ../LICENSE.txt . +cp ../docs/readme.txt . rm -r plugins/U3D_OSX/ rm -r plugins/U3D_W32/ $INSTALL_PATH/linuxdeployqt meshlab -appimage -#at this moment, the distrib folder contains all the files necessary to execute meshlab +#at this point, distrib folder contains all the files necessary to execute meshlab echo "distrib folder is now a self contained meshlab application"