From 6052a444da20df3402180b1d7e648e2e374d92a4 Mon Sep 17 00:00:00 2001 From: alemuntoni Date: Sat, 13 Jun 2020 21:02:24 +0200 Subject: [PATCH] tmp solution appimage and snap: moving libIFX to bin dir --- install/linux/linux_appimages.sh | 69 +++++-------------- install/linux/linux_deploy.sh | 40 +---------- install/linux/linux_make_boundle.sh | 58 ++++++++++++++++ .../linux/resources/snap/snap_noversion.yaml | 4 ++ snapcraft.yaml | 4 ++ 5 files changed, 85 insertions(+), 90 deletions(-) create mode 100644 install/linux/linux_make_boundle.sh diff --git a/install/linux/linux_appimages.sh b/install/linux/linux_appimages.sh index f9b205c1d..93c4026a1 100644 --- a/install/linux/linux_appimages.sh +++ b/install/linux/linux_appimages.sh @@ -12,6 +12,7 @@ # You can give as argument the DISTRIB_PATH. cd "${0%/*}" #move to script directory +INSTALL_PATH=$(pwd) #checking for parameters if [ "$#" -eq 0 ] @@ -21,68 +22,32 @@ else DISTRIB_PATH=$1 fi -SOURCE_PATH=$PWD/../../src +sh linux_make_boundle.sh $@ -INSTALL_PATH=$(pwd) cd $DISTRIB_PATH -LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$(pwd) - -#check if we have an exec in distrib -if ! [ -f meshlab ] -then - echo "ERROR: meshlab bin not found inside distrib" - exit 1 -fi - -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/plugins.txt -rm -r README.md - -mkdir -p usr/bin -mkdir -p usr/lib/meshlab -mkdir -p usr/share/applications -mkdir -p usr/share/meshlab -mkdir -p usr/share/doc/meshlab -mkdir -p usr/share/icons/hicolor/512x512/apps/ -mkdir -p usr/share/icons/Yaru/512x512/apps/ - -cp $INSTALL_PATH/resources/meshlab_server.desktop usr/share/applications/ -cp meshlab.png usr/share/icons/hicolor/512x512/apps/meshlab.png -mv meshlab.png usr/share/icons/Yaru/512x512/apps/meshlab.png -mv meshlabserver usr/bin -mv LICENSE.txt usr/share/doc/meshlab/ -mv privacy.txt usr/share/doc/meshlab/ -mv readme.txt usr/share/doc/meshlab/ -mv lib/libmeshlab-common* usr/lib/ -mv plugins/ usr/lib/meshlab/ -mv lib/linux/* usr/lib/meshlab/ -#chrpath -r ../lib/ usr/lib/meshlab/plugins/*.so -mv shaders/ usr/share/meshlab/ export VERSION=$(cat $INSTALL_PATH/../../ML_VERSION) +mv usr/bin/meshlabserver . +$INSTALL_PATH/resources/linuxdeployqt usr/share/applications/meshlab.desktop -appimage +mv *.AppImage ../MeshLab$VERSION-linux.AppImage +chmod +x ../MeshLab$VERSION-linux.AppImage + +rm AppRun +rm *.desktop +rm *.png +rm usr/share/applications/meshlab.desktop +cp $INSTALL_PATH/resources/meshlab_server.desktop usr/share/applications/ +mv usr/bin/meshlab . +mv meshlabserver usr/bin + $INSTALL_PATH/resources/linuxdeployqt usr/share/applications/meshlab_server.desktop -appimage mv *.AppImage ../MeshLabServer$VERSION-linux.AppImage chmod +x ../MeshLabServer$VERSION-linux.AppImage -rm AppRun -rm *.desktop -rm *.png -rm usr/share/applications/meshlab_server.desktop + cp $INSTALL_PATH/resources/default.desktop usr/share/applications/meshlab.desktop -mv usr/bin/meshlabserver . -mv meshlab usr/bin - -$INSTALL_PATH/resources/linuxdeployqt usr/share/applications/meshlab.desktop -appimage -mv *.AppImage ../MeshLab$VERSION-linux.AppImage -chmod +x ../MeshLab$VERSION-linux.AppImage - -cp $INSTALL_PATH/resources/meshlab_server.desktop usr/share/applications/ -mv meshlabserver usr/bin/ +mv meshlab usr/bin/ rm -r lib diff --git a/install/linux/linux_deploy.sh b/install/linux/linux_deploy.sh index f99407124..8fffb34ec 100644 --- a/install/linux/linux_deploy.sh +++ b/install/linux/linux_deploy.sh @@ -10,6 +10,7 @@ # You can give as argument the DISTRIB_PATH. cd "${0%/*}" #move to script directory +INSTALL_PATH=$(pwd) #checking for parameters if [ "$#" -eq 0 ] @@ -19,46 +20,9 @@ else DISTRIB_PATH=$1 fi -SOURCE_PATH=$PWD/../../src +sh linux_make_boundle.sh $@ -INSTALL_PATH=$(pwd) cd $DISTRIB_PATH -LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$(pwd) - -#check if we have an exec in distrib -if ! [ -f meshlab ] -then - echo "ERROR: meshlab bin not found inside distrib" - exit 1 -fi - -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/plugins.txt -rm -r README.md - -mkdir -p usr/bin -mkdir -p usr/lib/meshlab -mkdir -p usr/share/applications -mkdir -p usr/share/meshlab -mkdir -p usr/share/doc/meshlab -mkdir -p usr/share/icons/hicolor/512x512/apps/ - -cp $INSTALL_PATH/resources/default.desktop usr/share/applications/meshlab.desktop -mv meshlab.png usr/share/icons/hicolor/512x512/apps/meshlab.png -mv meshlab usr/bin -mv meshlabserver usr/bin -mv LICENSE.txt usr/share/doc/meshlab/ -mv privacy.txt usr/share/doc/meshlab/ -mv readme.txt usr/share/doc/meshlab/ -mv lib/libmeshlab-common* usr/lib/ -mv plugins/ usr/lib/meshlab/ -mv lib/linux/* usr/lib/meshlab/ -#chrpath -r ../lib/ usr/lib/meshlab/plugins/*.so -mv shaders/ usr/share/meshlab/ $INSTALL_PATH/resources/linuxdeployqt usr/share/applications/meshlab.desktop -bundle-non-qt-libs -executable=usr/bin/meshlabserver diff --git a/install/linux/linux_make_boundle.sh b/install/linux/linux_make_boundle.sh new file mode 100644 index 000000000..52317bf37 --- /dev/null +++ b/install/linux/linux_make_boundle.sh @@ -0,0 +1,58 @@ +#!/bin/bash + +cd "${0%/*}" #move to script directory + +#checking for parameters +if [ "$#" -eq 0 ] +then + 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) + +#check if we have an exec in distrib +if ! [ -f meshlab ] +then + echo "ERROR: meshlab bin not found inside distrib" + exit 1 +fi + +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/plugins.txt +rm -r README.md + +mkdir -p usr/bin +mkdir -p usr/lib/meshlab +mkdir -p usr/share/applications +mkdir -p usr/share/meshlab +mkdir -p usr/share/doc/meshlab +mkdir -p usr/share/icons/hicolor/512x512/apps/ +mkdir -p usr/share/icons/Yaru/512x512/apps/ + +cp $INSTALL_PATH/resources/default.desktop usr/share/applications/meshlab.desktop +mv meshlab.png usr/share/icons/hicolor/512x512/apps/meshlab.png +mv meshlab.png usr/share/icons/Yaru/512x512/apps/meshlab.png +mv meshlab usr/bin +mv meshlabserver usr/bin +mv LICENSE.txt usr/share/doc/meshlab/ +mv privacy.txt usr/share/doc/meshlab/ +mv readme.txt usr/share/doc/meshlab/ +mv lib/libmeshlab-common* usr/lib/ +mv plugins/ usr/lib/meshlab/ +mv lib/linux/* usr/lib/meshlab/ +#chrpath -r ../lib/ usr/lib/meshlab/plugins/*.so +mv shaders/ usr/share/meshlab/ + +#tmp: moving libIXF to bin directory +mv usr/lib/meshlab/libIFX* usr/bin/ +mv usr/bin/libIFXCoreStatic.a usr/lib/meshlab/ diff --git a/install/linux/resources/snap/snap_noversion.yaml b/install/linux/resources/snap/snap_noversion.yaml index be6bf2f39..ebae6b841 100644 --- a/install/linux/resources/snap/snap_noversion.yaml +++ b/install/linux/resources/snap/snap_noversion.yaml @@ -110,3 +110,7 @@ parts: mv plugins/ $SNAPCRAFT_PART_INSTALL/usr/lib/meshlab/ mv lib/linux/* $SNAPCRAFT_PART_INSTALL/usr/lib/meshlab/ mv shaders/ $SNAPCRAFT_PART_INSTALL/usr/share/meshlab/ + + #tmp: moving libIXF to bin directory + mv $SNAPCRAFT_PART_INSTALL/usr/lib/meshlab/libIFX* $SNAPCRAFT_PART_INSTALL/usr/bin/ + mv $SNAPCRAFT_PART_INSTALL/usr/bin/libIFXCoreStatic.a $SNAPCRAFT_PART_INSTALL/usr/lib/meshlab/ diff --git a/snapcraft.yaml b/snapcraft.yaml index 25d4c03fd..f0e28ed14 100644 --- a/snapcraft.yaml +++ b/snapcraft.yaml @@ -110,3 +110,7 @@ parts: mv plugins/ $SNAPCRAFT_PART_INSTALL/usr/lib/meshlab/ mv lib/linux/* $SNAPCRAFT_PART_INSTALL/usr/lib/meshlab/ mv shaders/ $SNAPCRAFT_PART_INSTALL/usr/share/meshlab/ + + #tmp: moving libIXF to bin directory + mv $SNAPCRAFT_PART_INSTALL/usr/lib/meshlab/libIFX* $SNAPCRAFT_PART_INSTALL/usr/bin/ + mv $SNAPCRAFT_PART_INSTALL/usr/bin/libIFXCoreStatic.a $SNAPCRAFT_PART_INSTALL/usr/lib/meshlab/