diff --git a/app/meson.build b/app/meson.build index ab5f45f..5244c3a 100644 --- a/app/meson.build +++ b/app/meson.build @@ -30,7 +30,7 @@ endif app_libs = [] cpp_args = [] if 'static' == get_option('default_library') - app_libs = [sciqlop_mockplugin, sciqlop_python_providers] + app_libs = [sciqlop_python_providers] cpp_args += ['-DQT_STATICPLUGIN'] endif diff --git a/build_cfg/linux/appImage.sh b/build_cfg/linux/appImage.sh index 021a798..447fca9 100644 --- a/build_cfg/linux/appImage.sh +++ b/build_cfg/linux/appImage.sh @@ -1,10 +1,14 @@ #!/bin/bash mkdir build cd build +mkdir -p $(pwd)/AppDir/usr +virtualenv -p python3 $(pwd)/AppDir/usr +source $(pwd)/AppDir/usr/bin/activate +pip install git+https://github.com/jeandet/spwc meson --prefix=/usr .. ninja -DESTDIR=AppDir ninja install +DESTDIR=$(pwd)/AppDir ninja install mv AppDir/usr/lib64 AppDir/usr/lib wget https://github.com/probonopd/linuxdeployqt/releases/download/continuous/linuxdeployqt-continuous-x86_64.AppImage chmod +x linuxdeployqt-continuous-x86_64.AppImage && ./linuxdeployqt-continuous-x86_64.AppImage --appimage-extract -LD_LIBRARY_PATH=AppDir/usr/lib/ ./squashfs-root/AppRun AppDir/usr/share/applications/*.desktop -appimage -extra-plugins=iconengines,platformthemes/libqgtk3.so +LD_LIBRARY_PATH=AppDir/usr/lib/:AppDir/usr/lib/SciQLop/ ./squashfs-root/AppRun AppDir/usr/share/applications/*.desktop -appimage -extra-plugins=iconengines,platformthemes/libqgtk3.so diff --git a/core b/core index 0c2e5a7..854c014 160000 --- a/core +++ b/core @@ -1 +1 @@ -Subproject commit 0c2e5a797af54f4f9e5ee1a715b642abb74d4368 +Subproject commit 854c0145877d96f95e0fb6ba08e32cb15cd49cf9