diff --git a/build/distributed/bin/lib/libQt6Core.so.6 b/build/distributed/bin/lib/libQt6Core.so.6 deleted file mode 120000 index bf1c2ca1..00000000 --- a/build/distributed/bin/lib/libQt6Core.so.6 +++ /dev/null @@ -1 +0,0 @@ -libQt6Core.so.6.2.4 \ No newline at end of file diff --git a/build/distributed/bin/lib/libQt6Core.so.6.2.4 b/build/distributed/bin/lib/libQt6Core.so.6.2.4 deleted file mode 100755 index 5feeef97..00000000 Binary files a/build/distributed/bin/lib/libQt6Core.so.6.2.4 and /dev/null differ diff --git a/build/distributed/bin/lib/libQt6DBus.so.6 b/build/distributed/bin/lib/libQt6DBus.so.6 deleted file mode 120000 index 389ddb59..00000000 --- a/build/distributed/bin/lib/libQt6DBus.so.6 +++ /dev/null @@ -1 +0,0 @@ -libQt6DBus.so.6.2.4 \ No newline at end of file diff --git a/build/distributed/bin/lib/libQt6DBus.so.6.2.4 b/build/distributed/bin/lib/libQt6DBus.so.6.2.4 deleted file mode 100755 index e981abd7..00000000 Binary files a/build/distributed/bin/lib/libQt6DBus.so.6.2.4 and /dev/null differ diff --git a/build/distributed/bin/lib/libQt6Gui.so b/build/distributed/bin/lib/libQt6Gui.so deleted file mode 120000 index dd0d1a0a..00000000 --- a/build/distributed/bin/lib/libQt6Gui.so +++ /dev/null @@ -1 +0,0 @@ -libQt6Gui.so.6 \ No newline at end of file diff --git a/build/distributed/bin/lib/libQt6Gui.so.6 b/build/distributed/bin/lib/libQt6Gui.so.6 deleted file mode 120000 index 041acebd..00000000 --- a/build/distributed/bin/lib/libQt6Gui.so.6 +++ /dev/null @@ -1 +0,0 @@ -libQt6Gui.so.6.2.4 \ No newline at end of file diff --git a/build/distributed/bin/lib/libQt6Gui.so.6.2.4 b/build/distributed/bin/lib/libQt6Gui.so.6.2.4 deleted file mode 100755 index 221abefa..00000000 Binary files a/build/distributed/bin/lib/libQt6Gui.so.6.2.4 and /dev/null differ diff --git a/build/distributed/bin/lib/libQt6Network.so.6 b/build/distributed/bin/lib/libQt6Network.so.6 deleted file mode 120000 index 4f096e3e..00000000 --- a/build/distributed/bin/lib/libQt6Network.so.6 +++ /dev/null @@ -1 +0,0 @@ -libQt6Network.so.6.2.4 \ No newline at end of file diff --git a/build/distributed/bin/lib/libQt6Network.so.6.2.4 b/build/distributed/bin/lib/libQt6Network.so.6.2.4 deleted file mode 100755 index 414e0c3c..00000000 Binary files a/build/distributed/bin/lib/libQt6Network.so.6.2.4 and /dev/null differ diff --git a/build/distributed/bin/lib/libQt6OpenGL.so.6 b/build/distributed/bin/lib/libQt6OpenGL.so.6 deleted file mode 120000 index a3248a15..00000000 --- a/build/distributed/bin/lib/libQt6OpenGL.so.6 +++ /dev/null @@ -1 +0,0 @@ -libQt6OpenGL.so.6.2.4 \ No newline at end of file diff --git a/build/distributed/bin/lib/libQt6OpenGL.so.6.2.4 b/build/distributed/bin/lib/libQt6OpenGL.so.6.2.4 deleted file mode 100755 index aa046a0b..00000000 Binary files a/build/distributed/bin/lib/libQt6OpenGL.so.6.2.4 and /dev/null differ diff --git a/build/distributed/bin/lib/libQt6OpenGLWidgets.so.6 b/build/distributed/bin/lib/libQt6OpenGLWidgets.so.6 deleted file mode 120000 index 2895375e..00000000 --- a/build/distributed/bin/lib/libQt6OpenGLWidgets.so.6 +++ /dev/null @@ -1 +0,0 @@ -libQt6OpenGLWidgets.so.6.2.4 \ No newline at end of file diff --git a/build/distributed/bin/lib/libQt6OpenGLWidgets.so.6.2.4 b/build/distributed/bin/lib/libQt6OpenGLWidgets.so.6.2.4 deleted file mode 100755 index e4480948..00000000 Binary files a/build/distributed/bin/lib/libQt6OpenGLWidgets.so.6.2.4 and /dev/null differ diff --git a/build/distributed/bin/lib/libQt6Svg.so b/build/distributed/bin/lib/libQt6Svg.so deleted file mode 120000 index 171d6679..00000000 --- a/build/distributed/bin/lib/libQt6Svg.so +++ /dev/null @@ -1 +0,0 @@ -libQt6Svg.so.6 \ No newline at end of file diff --git a/build/distributed/bin/lib/libQt6Svg.so.6 b/build/distributed/bin/lib/libQt6Svg.so.6 deleted file mode 120000 index 4213cb70..00000000 --- a/build/distributed/bin/lib/libQt6Svg.so.6 +++ /dev/null @@ -1 +0,0 @@ -libQt6Svg.so.6.2.4 \ No newline at end of file diff --git a/build/distributed/bin/lib/libQt6Svg.so.6.2.4 b/build/distributed/bin/lib/libQt6Svg.so.6.2.4 deleted file mode 100755 index e2f74079..00000000 Binary files a/build/distributed/bin/lib/libQt6Svg.so.6.2.4 and /dev/null differ diff --git a/build/distributed/bin/lib/libQt6SvgWidgets.so.6 b/build/distributed/bin/lib/libQt6SvgWidgets.so.6 deleted file mode 120000 index e714cca7..00000000 --- a/build/distributed/bin/lib/libQt6SvgWidgets.so.6 +++ /dev/null @@ -1 +0,0 @@ -libQt6SvgWidgets.so.6.2.4 \ No newline at end of file diff --git a/build/distributed/bin/lib/libQt6SvgWidgets.so.6.2.4 b/build/distributed/bin/lib/libQt6SvgWidgets.so.6.2.4 deleted file mode 100755 index 26ced804..00000000 Binary files a/build/distributed/bin/lib/libQt6SvgWidgets.so.6.2.4 and /dev/null differ diff --git a/build/distributed/bin/lib/libQt6UiTools.so.6 b/build/distributed/bin/lib/libQt6UiTools.so.6 deleted file mode 120000 index 0ba6e075..00000000 --- a/build/distributed/bin/lib/libQt6UiTools.so.6 +++ /dev/null @@ -1 +0,0 @@ -libQt6UiTools.so.6.2.4 \ No newline at end of file diff --git a/build/distributed/bin/lib/libQt6UiTools.so.6.2.4 b/build/distributed/bin/lib/libQt6UiTools.so.6.2.4 deleted file mode 100755 index 607113e3..00000000 Binary files a/build/distributed/bin/lib/libQt6UiTools.so.6.2.4 and /dev/null differ diff --git a/build/distributed/bin/lib/libQt6Widgets.so b/build/distributed/bin/lib/libQt6Widgets.so deleted file mode 120000 index 21c80c70..00000000 --- a/build/distributed/bin/lib/libQt6Widgets.so +++ /dev/null @@ -1 +0,0 @@ -libQt6Widgets.so.6 \ No newline at end of file diff --git a/build/distributed/bin/lib/libQt6Widgets.so.6 b/build/distributed/bin/lib/libQt6Widgets.so.6 deleted file mode 120000 index d10d2c06..00000000 --- a/build/distributed/bin/lib/libQt6Widgets.so.6 +++ /dev/null @@ -1 +0,0 @@ -libQt6Widgets.so.6.2.4 \ No newline at end of file diff --git a/build/distributed/bin/lib/libQt6Widgets.so.6.2.4 b/build/distributed/bin/lib/libQt6Widgets.so.6.2.4 deleted file mode 100755 index 82be7d07..00000000 Binary files a/build/distributed/bin/lib/libQt6Widgets.so.6.2.4 and /dev/null differ diff --git a/build/distributed/bin/lib/libQt6XcbQpa.so b/build/distributed/bin/lib/libQt6XcbQpa.so deleted file mode 120000 index ea228e1e..00000000 --- a/build/distributed/bin/lib/libQt6XcbQpa.so +++ /dev/null @@ -1 +0,0 @@ -libQt6XcbQpa.so.6 \ No newline at end of file diff --git a/build/distributed/bin/lib/libQt6XcbQpa.so.6 b/build/distributed/bin/lib/libQt6XcbQpa.so.6 deleted file mode 120000 index 71142d22..00000000 --- a/build/distributed/bin/lib/libQt6XcbQpa.so.6 +++ /dev/null @@ -1 +0,0 @@ -libQt6XcbQpa.so.6.2.4 \ No newline at end of file diff --git a/build/distributed/bin/lib/libQt6XcbQpa.so.6.2.4 b/build/distributed/bin/lib/libQt6XcbQpa.so.6.2.4 deleted file mode 100755 index 88be2a69..00000000 Binary files a/build/distributed/bin/lib/libQt6XcbQpa.so.6.2.4 and /dev/null differ diff --git a/build/distributed/bin/lib/libQt6Xml.so b/build/distributed/bin/lib/libQt6Xml.so deleted file mode 120000 index e9bbaf21..00000000 --- a/build/distributed/bin/lib/libQt6Xml.so +++ /dev/null @@ -1 +0,0 @@ -libQt6Xml.so.6 \ No newline at end of file diff --git a/build/distributed/bin/lib/libQt6Xml.so.6 b/build/distributed/bin/lib/libQt6Xml.so.6 deleted file mode 120000 index 8dacc401..00000000 --- a/build/distributed/bin/lib/libQt6Xml.so.6 +++ /dev/null @@ -1 +0,0 @@ -libQt6Xml.so.6.2.4 \ No newline at end of file diff --git a/build/distributed/bin/lib/libQt6Xml.so.6.2.4 b/build/distributed/bin/lib/libQt6Xml.so.6.2.4 deleted file mode 100755 index 6d6213d5..00000000 Binary files a/build/distributed/bin/lib/libQt6Xml.so.6.2.4 and /dev/null differ diff --git a/build/distributed/bin/lib/libhidapi-libusb.so b/build/distributed/bin/lib/libhidapi-libusb.so deleted file mode 120000 index 2525f477..00000000 --- a/build/distributed/bin/lib/libhidapi-libusb.so +++ /dev/null @@ -1 +0,0 @@ -libhidapi-libusb.so.0 \ No newline at end of file diff --git a/build/distributed/bin/lib/libhidapi-libusb.so.0 b/build/distributed/bin/lib/libhidapi-libusb.so.0 index b4afef12..f0a0874a 120000 --- a/build/distributed/bin/lib/libhidapi-libusb.so.0 +++ b/build/distributed/bin/lib/libhidapi-libusb.so.0 @@ -1 +1 @@ -libhidapi-libusb.so.0.11.2 \ No newline at end of file +./libhidapi-libusb.so.0.0.0 \ No newline at end of file diff --git a/build/distributed/bin/lib/libhidapi-libusb.so.0.0.0 b/build/distributed/bin/lib/libhidapi-libusb.so.0.0.0 new file mode 100644 index 00000000..721796ff Binary files /dev/null and b/build/distributed/bin/lib/libhidapi-libusb.so.0.0.0 differ diff --git a/build/distributed/bin/lib/libhidapi-libusb.so.0.11.2 b/build/distributed/bin/lib/libhidapi-libusb.so.0.11.2 deleted file mode 100644 index d9e857a3..00000000 Binary files a/build/distributed/bin/lib/libhidapi-libusb.so.0.11.2 and /dev/null differ diff --git a/build/distributed/bin/lib/libprocps.so.6 b/build/distributed/bin/lib/libprocps.so.6 deleted file mode 120000 index 1de38603..00000000 --- a/build/distributed/bin/lib/libprocps.so.6 +++ /dev/null @@ -1 +0,0 @@ -libprocps.so.6.0.0 \ No newline at end of file diff --git a/build/distributed/bin/lib/libprocps.so.6.0.0 b/build/distributed/bin/lib/libprocps.so.6.0.0 deleted file mode 100644 index 68aa0569..00000000 Binary files a/build/distributed/bin/lib/libprocps.so.6.0.0 and /dev/null differ diff --git a/build/distributed/bin/lib/libprocps.so.8 b/build/distributed/bin/lib/libprocps.so.8 new file mode 120000 index 00000000..0de5a4ec --- /dev/null +++ b/build/distributed/bin/lib/libprocps.so.8 @@ -0,0 +1 @@ +./libprocps.so.8.0.3 \ No newline at end of file diff --git a/build/distributed/bin/lib/libprocps.so.8.0.3 b/build/distributed/bin/lib/libprocps.so.8.0.3 new file mode 100644 index 00000000..4b6b8432 Binary files /dev/null and b/build/distributed/bin/lib/libprocps.so.8.0.3 differ diff --git a/build/distributed/bin/lib/libstdc++.so.6.0.32 b/build/distributed/bin/lib/libstdc++.so.6.0.32 old mode 100755 new mode 100644 index fe888c1c..c3800ba7 Binary files a/build/distributed/bin/lib/libstdc++.so.6.0.32 and b/build/distributed/bin/lib/libstdc++.so.6.0.32 differ diff --git a/build/distributed/bin/lib/libusb-1.0.so.0 b/build/distributed/bin/lib/libusb-1.0.so.0 deleted file mode 100644 index 0fc69d9c..00000000 Binary files a/build/distributed/bin/lib/libusb-1.0.so.0 and /dev/null differ diff --git a/build/distributed/bin/lib/libusb-1.0.so.0 b/build/distributed/bin/lib/libusb-1.0.so.0 new file mode 120000 index 00000000..f1989e33 --- /dev/null +++ b/build/distributed/bin/lib/libusb-1.0.so.0 @@ -0,0 +1 @@ +./libusb-1.0.so.0.3.0 \ No newline at end of file diff --git a/build/distributed/bin/lib/libusb-1.0.so.0.3.0 b/build/distributed/bin/lib/libusb-1.0.so.0.3.0 new file mode 100644 index 00000000..f4ec1531 Binary files /dev/null and b/build/distributed/bin/lib/libusb-1.0.so.0.3.0 differ diff --git a/build/distributed/bin/lib/libxcb-xinput.so b/build/distributed/bin/lib/libxcb-xinput.so deleted file mode 120000 index 38850014..00000000 --- a/build/distributed/bin/lib/libxcb-xinput.so +++ /dev/null @@ -1 +0,0 @@ -libxcb-xinput.so.0.1.0 \ No newline at end of file diff --git a/build/distributed/bin/lib/libxcb-xinput.so.0 b/build/distributed/bin/lib/libxcb-xinput.so.0 deleted file mode 120000 index 38850014..00000000 --- a/build/distributed/bin/lib/libxcb-xinput.so.0 +++ /dev/null @@ -1 +0,0 @@ -libxcb-xinput.so.0.1.0 \ No newline at end of file diff --git a/build/distributed/bin/lib/libxcb-xinput.so.0.1.0 b/build/distributed/bin/lib/libxcb-xinput.so.0.1.0 deleted file mode 100644 index 1fb018ab..00000000 Binary files a/build/distributed/bin/lib/libxcb-xinput.so.0.1.0 and /dev/null differ diff --git a/build/distributed/bin/lib/libyaml-cpp.so.0.7.0 b/build/distributed/bin/lib/libyaml-cpp.so.0.7.0 old mode 100755 new mode 100644 index 68bd1854..d4338831 Binary files a/build/distributed/bin/lib/libyaml-cpp.so.0.7.0 and b/build/distributed/bin/lib/libyaml-cpp.so.0.7.0 differ diff --git a/build/distributed/bin/plugins/iconengines/libqsvgicon.so b/build/distributed/bin/plugins/iconengines/libqsvgicon.so deleted file mode 100755 index f2049c10..00000000 Binary files a/build/distributed/bin/plugins/iconengines/libqsvgicon.so and /dev/null differ diff --git a/build/distributed/bin/plugins/imageformats/libqgif.so b/build/distributed/bin/plugins/imageformats/libqgif.so deleted file mode 100755 index d64ce612..00000000 Binary files a/build/distributed/bin/plugins/imageformats/libqgif.so and /dev/null differ diff --git a/build/distributed/bin/plugins/imageformats/libqicns.so b/build/distributed/bin/plugins/imageformats/libqicns.so deleted file mode 100755 index fcea625b..00000000 Binary files a/build/distributed/bin/plugins/imageformats/libqicns.so and /dev/null differ diff --git a/build/distributed/bin/plugins/imageformats/libqico.so b/build/distributed/bin/plugins/imageformats/libqico.so deleted file mode 100755 index 93fd39d7..00000000 Binary files a/build/distributed/bin/plugins/imageformats/libqico.so and /dev/null differ diff --git a/build/distributed/bin/plugins/imageformats/libqjpeg.so b/build/distributed/bin/plugins/imageformats/libqjpeg.so deleted file mode 100755 index 734f4fa7..00000000 Binary files a/build/distributed/bin/plugins/imageformats/libqjpeg.so and /dev/null differ diff --git a/build/distributed/bin/plugins/imageformats/libqsvg.so b/build/distributed/bin/plugins/imageformats/libqsvg.so deleted file mode 100755 index ace20173..00000000 Binary files a/build/distributed/bin/plugins/imageformats/libqsvg.so and /dev/null differ diff --git a/build/distributed/bin/plugins/imageformats/libqtga.so b/build/distributed/bin/plugins/imageformats/libqtga.so deleted file mode 100755 index df8194f0..00000000 Binary files a/build/distributed/bin/plugins/imageformats/libqtga.so and /dev/null differ diff --git a/build/distributed/bin/plugins/imageformats/libqtiff.so b/build/distributed/bin/plugins/imageformats/libqtiff.so deleted file mode 100755 index 1582e295..00000000 Binary files a/build/distributed/bin/plugins/imageformats/libqtiff.so and /dev/null differ diff --git a/build/distributed/bin/plugins/imageformats/libqwbmp.so b/build/distributed/bin/plugins/imageformats/libqwbmp.so deleted file mode 100755 index dcc97fe9..00000000 Binary files a/build/distributed/bin/plugins/imageformats/libqwbmp.so and /dev/null differ diff --git a/build/distributed/bin/plugins/imageformats/libqwebp.so b/build/distributed/bin/plugins/imageformats/libqwebp.so deleted file mode 100755 index 2b073a3c..00000000 Binary files a/build/distributed/bin/plugins/imageformats/libqwebp.so and /dev/null differ diff --git a/build/distributed/bin/plugins/platforms/libqxcb.so b/build/distributed/bin/plugins/platforms/libqxcb.so deleted file mode 100755 index c9fc324c..00000000 Binary files a/build/distributed/bin/plugins/platforms/libqxcb.so and /dev/null differ diff --git a/build/distributed/bin/plugins/xcbglintegrations/libqxcb-glx-integration.so b/build/distributed/bin/plugins/xcbglintegrations/libqxcb-glx-integration.so deleted file mode 100755 index 1eb1586c..00000000 Binary files a/build/distributed/bin/plugins/xcbglintegrations/libqxcb-glx-integration.so and /dev/null differ diff --git a/build/packaging/deb/control.in b/build/packaging/deb/control.in deleted file mode 100644 index 3eaa6fdb..00000000 --- a/build/packaging/deb/control.in +++ /dev/null @@ -1,30 +0,0 @@ -Package: @BLOOM_PACKAGE_NAME_LOWER@ -Version: @CMAKE_PROJECT_VERSION@ -Architecture: amd64 -Description: @BLOOM_PACKAGE_DESCRIPTION@ -Section: devel -Priority: optional -Homepage: @CMAKE_PROJECT_HOMEPAGE_URL@ -Maintainer: @BLOOM_PACKAGE_CONTACT@ -Depends: libc6 (>= 2.18), - libgtk3-nocsd0, - libglx0, - libgl1, - libopengl0 (>= 1.0.0), - libgcc-s1 | libgcc1 (>= 1:4.2), - libudev1 (>= 183), - zlib1g (>= 1:1.1.4), - libsystemd0, - libfontconfig1 (>= 2.11.94), - libx11-6, - libxcb-icccm4 (>= 0.4.1), - libxcb-image0 (>= 0.2.1), - libxcb-keysyms1 (>= 0.4.0), - libxkbcommon-x11-0 (>= 0.5.0), - libxkbcommon0 (>= 0.5.0), - libpng16-16, - libfreetype6 (>= 2.6), - libglvnd0, - libzstd1, - liblz4-1, - libxcb1 diff --git a/build/packaging/full/deb/control.in b/build/packaging/full/deb/control.in new file mode 100644 index 00000000..b6404af8 --- /dev/null +++ b/build/packaging/full/deb/control.in @@ -0,0 +1,20 @@ +Package: @BLOOM_PACKAGE_NAME_LOWER@ +Version: @CMAKE_PROJECT_VERSION@ +Architecture: amd64 +Description: @BLOOM_PACKAGE_DESCRIPTION@ +Section: devel +Priority: optional +Homepage: @CMAKE_PROJECT_HOMEPAGE_URL@ +Maintainer: @BLOOM_PACKAGE_CONTACT@ +Depends: libc6 (>= 2.18), + libudev1 (>= 183), + libgcc1 (>= 1:4.2), + libsystemd0, + libqt6core6, + libqt6network6, + libqt6xml6, + qt6-qpa-plugins, + libqt6gui6, + libqt6widgets6, + libqt6uitools6, + libqt6svg6 diff --git a/build/packaging/deb/package-deb.sh.in b/build/packaging/full/deb/package-deb.sh.in similarity index 93% rename from build/packaging/deb/package-deb.sh.in rename to build/packaging/full/deb/package-deb.sh.in index 691f531b..06648b7a 100644 --- a/build/packaging/deb/package-deb.sh.in +++ b/build/packaging/full/deb/package-deb.sh.in @@ -37,7 +37,6 @@ cp -a @CMAKE_CURRENT_SOURCE_DIR@/build/distributed/fonts ${BLOOM_INSTALLATION_DI echo "Copying distributed binaries..."; cp -a @CMAKE_CURRENT_SOURCE_DIR@/build/distributed/bin/lib ${BLOOM_INSTALLATION_DIR}/; -cp -a @CMAKE_CURRENT_SOURCE_DIR@/build/distributed/bin/plugins ${BLOOM_INSTALLATION_DIR}/; echo "Copying udev rules..."; cp -a @CMAKE_CURRENT_SOURCE_DIR@/build/distributed/udevrules/99-bloom.rules ${PLAYGROUND_DIR}/lib/udev/rules.d/; @@ -45,7 +44,6 @@ cp -a @CMAKE_CURRENT_SOURCE_DIR@/build/distributed/udevrules/99-bloom.rules ${PL echo "Adjusting permissions..."; chmod u=rwx,g=rx,o=rx -R ${BLOOM_INSTALLATION_DIR}/bin/; chmod u=rwx,g=rx,o=rx -R ${BLOOM_INSTALLATION_DIR}/lib/; -chmod u=rwx,g=rx,o=rx -R ${BLOOM_INSTALLATION_DIR}/plugins/; chmod u=rwX,g=rX,o=rX -R ${BLOOM_INSTALLATION_DIR}/resources/; diff --git a/build/packaging/pkgbuild/PKGBUILD.in b/build/packaging/full/pkgbuild/PKGBUILD.in similarity index 53% rename from build/packaging/pkgbuild/PKGBUILD.in rename to build/packaging/full/pkgbuild/PKGBUILD.in index 005ed7ea..df69213d 100644 --- a/build/packaging/pkgbuild/PKGBUILD.in +++ b/build/packaging/full/pkgbuild/PKGBUILD.in @@ -8,24 +8,11 @@ license=('LGPLv3') package(){ depends=( - 'fontconfig>=2.11.94' - 'freetype2>=2.6' 'gcc-libs>=13.2.0' 'glibc>=2.18' - 'libgl' - 'libglvnd' - 'libpng' - 'libx11' - 'libxcb' - 'libxext' - 'libxkbcommon>=0.5.0' - 'libxkbcommon-x11>=0.5.0' - 'libxrender' - 'xcb-util-image>=0.2.1' - 'xcb-util-keysyms>=0.4.0' - 'xcb-util-renderutil' - 'xcb-util-wm>=0.4.1' - 'zlib>=1.1.4' + 'qt6-base' + 'qt6-tools' + 'qt6-svg' ) mkdir -p "${pkgdir}/" diff --git a/build/packaging/pkgbuild/package-pkgbuild.sh.in b/build/packaging/full/pkgbuild/package-pkgbuild.sh.in similarity index 93% rename from build/packaging/pkgbuild/package-pkgbuild.sh.in rename to build/packaging/full/pkgbuild/package-pkgbuild.sh.in index 0a0c25b1..b597a7df 100644 --- a/build/packaging/pkgbuild/package-pkgbuild.sh.in +++ b/build/packaging/full/pkgbuild/package-pkgbuild.sh.in @@ -37,7 +37,6 @@ cp -a @CMAKE_CURRENT_SOURCE_DIR@/build/distributed/fonts ${BLOOM_INSTALLATION_DI echo "Copying distributed binaries..."; cp -a @CMAKE_CURRENT_SOURCE_DIR@/build/distributed/bin/lib ${BLOOM_INSTALLATION_DIR}/; -cp -a @CMAKE_CURRENT_SOURCE_DIR@/build/distributed/bin/plugins ${BLOOM_INSTALLATION_DIR}/; # We don't ship libstdc++ shared objects in Arch packages - the package manager will install the one we need rm -f ${BLOOM_INSTALLATION_DIR}/lib/libstdc++.so.*; @@ -48,7 +47,6 @@ cp -a @CMAKE_CURRENT_SOURCE_DIR@/build/distributed/udevrules/99-bloom.rules ${BU echo "Adjusting permissions..."; chmod u=rwx,g=rx,o=rx -R ${BLOOM_INSTALLATION_DIR}/bin/; chmod u=rwx,g=rx,o=rx -R ${BLOOM_INSTALLATION_DIR}/lib/; -chmod u=rwx,g=rx,o=rx -R ${BLOOM_INSTALLATION_DIR}/plugins/; chmod u=rwX,g=rX,o=rX -R ${BLOOM_INSTALLATION_DIR}/resources/; diff --git a/build/packaging/headless/deb/control.in b/build/packaging/headless/deb/control.in new file mode 100644 index 00000000..6ae82290 --- /dev/null +++ b/build/packaging/headless/deb/control.in @@ -0,0 +1,16 @@ +Package: @BLOOM_PACKAGE_NAME_LOWER@ +Version: @CMAKE_PROJECT_VERSION@ +Architecture: amd64 +Description: @BLOOM_PACKAGE_DESCRIPTION@ +Section: devel +Priority: optional +Homepage: @CMAKE_PROJECT_HOMEPAGE_URL@ +Maintainer: @BLOOM_PACKAGE_CONTACT@ +Depends: libc6 (>= 2.18), + libudev1 (>= 183), + libgcc1 (>= 1:4.2), + libsystemd0, + libudev1 (>= 183), + libqt6core6, + libqt6network6, + libqt6xml6 diff --git a/build/packaging/headless/deb/package-deb.sh.in b/build/packaging/headless/deb/package-deb.sh.in new file mode 100644 index 00000000..06648b7a --- /dev/null +++ b/build/packaging/headless/deb/package-deb.sh.in @@ -0,0 +1,56 @@ +#!/bin/sh + +PLAYGROUND_DIR=@CMAKE_BINARY_DIR@/packaging/deb/playground; +DEBIAN_DIR=${PLAYGROUND_DIR}/DEBIAN +BLOOM_INSTALLATION_PREFIX=@BLOOM_INSTALLATION_PREFIX@/ +BLOOM_INSTALLATION_DIR=${PLAYGROUND_DIR}/${BLOOM_INSTALLATION_PREFIX} +BLOOM_PACKAGE_PATH=@CMAKE_BINARY_DIR@/packaging/@BLOOM_PACKAGE_FILE_NAME@.deb + +if [ ! -f @CMAKE_BINARY_DIR@/bin/bloom ]; then + echo "Build files not found. Did you forget to build?" + exit 1; +fi + +echo "Preparing playground directory..."; +rm -fr ${PLAYGROUND_DIR}; + +mkdir -p ${PLAYGROUND_DIR}; +mkdir -p ${DEBIAN_DIR}; +mkdir -p ${BLOOM_INSTALLATION_DIR}; +mkdir -p ${BLOOM_INSTALLATION_DIR}/bin; + +mkdir -p ${PLAYGROUND_DIR}/lib/udev/rules.d/; +mkdir -p ${PLAYGROUND_DIR}/usr/bin/; + +echo "Copying Debian control file..."; +cp -a @CMAKE_BINARY_DIR@/packaging/deb/control ${DEBIAN_DIR}/; + +echo "Copying Bloom binary..."; +cp -a @CMAKE_BINARY_DIR@/bin/bloom ${BLOOM_INSTALLATION_DIR}/bin/; + +echo "Copying Bloom invocation script..."; +cp -a @CMAKE_BINARY_DIR@/packaging/bloom.sh ${BLOOM_INSTALLATION_DIR}/bin/; + +echo "Copying resources..."; +cp -a @CMAKE_BINARY_DIR@/resources ${BLOOM_INSTALLATION_DIR}/; +cp -a @CMAKE_CURRENT_SOURCE_DIR@/build/distributed/fonts ${BLOOM_INSTALLATION_DIR}/resources/; + +echo "Copying distributed binaries..."; +cp -a @CMAKE_CURRENT_SOURCE_DIR@/build/distributed/bin/lib ${BLOOM_INSTALLATION_DIR}/; + +echo "Copying udev rules..."; +cp -a @CMAKE_CURRENT_SOURCE_DIR@/build/distributed/udevrules/99-bloom.rules ${PLAYGROUND_DIR}/lib/udev/rules.d/; + +echo "Adjusting permissions..."; +chmod u=rwx,g=rx,o=rx -R ${BLOOM_INSTALLATION_DIR}/bin/; +chmod u=rwx,g=rx,o=rx -R ${BLOOM_INSTALLATION_DIR}/lib/; + +chmod u=rwX,g=rX,o=rX -R ${BLOOM_INSTALLATION_DIR}/resources/; + +chmod u=rw,g=r,o=r ${PLAYGROUND_DIR}/lib/udev/rules.d/99-bloom.rules; + +echo "Creating symbolic link for Bloom's invocation script..." +ln -s -f ${BLOOM_INSTALLATION_PREFIX}./bin/bloom.sh ${PLAYGROUND_DIR}/usr/bin/bloom; + +echo "Building Debian package..."; +dpkg-deb --build ${PLAYGROUND_DIR} ${BLOOM_PACKAGE_PATH}; diff --git a/build/packaging/headless/pkgbuild/PKGBUILD.in b/build/packaging/headless/pkgbuild/PKGBUILD.in new file mode 100644 index 00000000..4557762c --- /dev/null +++ b/build/packaging/headless/pkgbuild/PKGBUILD.in @@ -0,0 +1,18 @@ +pkgname=@BLOOM_PACKAGE_NAME_LOWER@ +pkgver=@CMAKE_PROJECT_VERSION@ +pkgrel=1 +pkgdesc="@BLOOM_PACKAGE_DESCRIPTION@" +arch=('i686' 'x86_64') +url="@CMAKE_PROJECT_HOMEPAGE_URL@" +license=('LGPLv3') + +package(){ + depends=( + 'gcc-libs>=13.2.0' + 'glibc>=2.18' + 'qt6-tools' + ) + + mkdir -p "${pkgdir}/" + cp -R @CMAKE_BINARY_DIR@/packaging/pkgbuild/playground/build_root/* "${pkgdir}/" +} diff --git a/build/packaging/headless/pkgbuild/package-pkgbuild.sh.in b/build/packaging/headless/pkgbuild/package-pkgbuild.sh.in new file mode 100644 index 00000000..b597a7df --- /dev/null +++ b/build/packaging/headless/pkgbuild/package-pkgbuild.sh.in @@ -0,0 +1,61 @@ +#!/bin/sh + +PLAYGROUND_DIR=@CMAKE_BINARY_DIR@/packaging/pkgbuild/playground; +BUILD_ROOT_DIR=${PLAYGROUND_DIR}/build_root +BLOOM_INSTALLATION_PREFIX=@BLOOM_INSTALLATION_PREFIX@/ +BLOOM_INSTALLATION_DIR=${BUILD_ROOT_DIR}/${BLOOM_INSTALLATION_PREFIX} +BLOOM_PACKAGE_PATH=@CMAKE_BINARY_DIR@/packaging/@BLOOM_PACKAGE_FILE_NAME@.pkg.tar.gz + +if [ ! -f @CMAKE_BINARY_DIR@/bin/bloom ]; then + echo "Build files not found. Did you forget to build?" + exit 1; +fi + +echo "Preparing playground directory..."; +rm -fr ${PLAYGROUND_DIR}; + +mkdir -p ${PLAYGROUND_DIR}; +mkdir -p ${BUILD_ROOT_DIR}; +mkdir -p ${BLOOM_INSTALLATION_DIR}; +mkdir -p ${BLOOM_INSTALLATION_DIR}/bin; + +mkdir -p ${BUILD_ROOT_DIR}/usr/lib/udev/rules.d/; +mkdir -p ${BUILD_ROOT_DIR}/usr/bin/; + +echo "Copying PKGBUILD control file..."; +cp -a @CMAKE_BINARY_DIR@/packaging/pkgbuild/PKGBUILD ${PLAYGROUND_DIR}/; + +echo "Copying Bloom binary..."; +cp -a @CMAKE_BINARY_DIR@/bin/bloom ${BLOOM_INSTALLATION_DIR}/bin/; + +echo "Copying Bloom invocation script..."; +cp -a @CMAKE_BINARY_DIR@/packaging/bloom.sh ${BLOOM_INSTALLATION_DIR}/bin/; + +echo "Copying resources..."; +cp -a @CMAKE_BINARY_DIR@/resources ${BLOOM_INSTALLATION_DIR}/; +cp -a @CMAKE_CURRENT_SOURCE_DIR@/build/distributed/fonts ${BLOOM_INSTALLATION_DIR}/resources/; + +echo "Copying distributed binaries..."; +cp -a @CMAKE_CURRENT_SOURCE_DIR@/build/distributed/bin/lib ${BLOOM_INSTALLATION_DIR}/; + +# We don't ship libstdc++ shared objects in Arch packages - the package manager will install the one we need +rm -f ${BLOOM_INSTALLATION_DIR}/lib/libstdc++.so.*; + +echo "Copying udev rules..."; +cp -a @CMAKE_CURRENT_SOURCE_DIR@/build/distributed/udevrules/99-bloom.rules ${BUILD_ROOT_DIR}/usr/lib/udev/rules.d/; + +echo "Adjusting permissions..."; +chmod u=rwx,g=rx,o=rx -R ${BLOOM_INSTALLATION_DIR}/bin/; +chmod u=rwx,g=rx,o=rx -R ${BLOOM_INSTALLATION_DIR}/lib/; + +chmod u=rwX,g=rX,o=rX -R ${BLOOM_INSTALLATION_DIR}/resources/; + +chmod u=rw,g=r,o=r ${BUILD_ROOT_DIR}/usr/lib/udev/rules.d/99-bloom.rules; + +echo "Creating symbolic link for Bloom's invocation script..." +ln -s -f ${BLOOM_INSTALLATION_PREFIX}./bin/bloom.sh ${BUILD_ROOT_DIR}/usr/bin/bloom; + +echo "Building Arch package..."; +cd ${PLAYGROUND_DIR}; +makepkg; +mv ./@BLOOM_PACKAGE_NAME_LOWER@-@CMAKE_PROJECT_VERSION@-1-x86_64.pkg.tar.gz ${BLOOM_PACKAGE_PATH}; diff --git a/cmake/Packaging.cmake b/cmake/Packaging.cmake index a9c975f5..3eb459eb 100644 --- a/cmake/Packaging.cmake +++ b/cmake/Packaging.cmake @@ -1,5 +1,13 @@ set(BLOOM_PACKAGE_NAME "Bloom") -set(BLOOM_PACKAGE_FILE_NAME "Bloom-${CMAKE_PROJECT_VERSION}-Linux-x86_64") + +if (NOT ${EXCLUDE_INSIGHT}) + set(BLOOM_PACKAGE_FILE_NAME "Bloom-${CMAKE_PROJECT_VERSION}-Linux-x86_64") + set(PACKAGING_TEMPLATE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/build/packaging/full") +else () + set(BLOOM_PACKAGE_FILE_NAME "Bloom-headless-${CMAKE_PROJECT_VERSION}-Linux-x86_64") + set(PACKAGING_TEMPLATE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/build/packaging/headless") +endif() + set(BLOOM_PACKAGE_DESCRIPTION "Debugger for AVR-based embedded systems") set(BLOOM_PACKAGE_CONTACT "Nav Mohammed ") @@ -20,13 +28,13 @@ configure_file( file(MAKE_DIRECTORY "${CMAKE_BINARY_DIR}/packaging/deb") configure_file( - "${CMAKE_CURRENT_SOURCE_DIR}/build/packaging/deb/control.in" + "${PACKAGING_TEMPLATE_DIR}/deb/control.in" "${CMAKE_BINARY_DIR}/packaging/deb/control" @ONLY ) configure_file( - "${CMAKE_CURRENT_SOURCE_DIR}/build/packaging/deb/package-deb.sh.in" + "${PACKAGING_TEMPLATE_DIR}/deb/package-deb.sh.in" "${CMAKE_BINARY_DIR}/packaging/package-deb.sh" FILE_PERMISSIONS OWNER_EXECUTE OWNER_READ OWNER_WRITE @@ -39,13 +47,13 @@ configure_file( file(MAKE_DIRECTORY "${CMAKE_BINARY_DIR}/packaging/pkgbuild") configure_file( - "${CMAKE_CURRENT_SOURCE_DIR}/build/packaging/pkgbuild/PKGBUILD.in" + "${PACKAGING_TEMPLATE_DIR}/pkgbuild/PKGBUILD.in" "${CMAKE_BINARY_DIR}/packaging/pkgbuild/PKGBUILD" @ONLY ) configure_file( - "${CMAKE_CURRENT_SOURCE_DIR}/build/packaging/pkgbuild/package-pkgbuild.sh.in" + "${PACKAGING_TEMPLATE_DIR}/pkgbuild/package-pkgbuild.sh.in" "${CMAKE_BINARY_DIR}/packaging/package-pkgbuild.sh" FILE_PERMISSIONS OWNER_EXECUTE OWNER_READ OWNER_WRITE diff --git a/src/Application.cpp b/src/Application.cpp index 74f163c9..d8c1ef16 100644 --- a/src/Application.cpp +++ b/src/Application.cpp @@ -130,10 +130,6 @@ void Application::startup() { QCoreApplication::setAttribute(Qt::AA_ShareOpenGLContexts, true); -#ifndef BLOOM_DEBUG_BUILD - QCoreApplication::addLibraryPath(QString::fromStdString(Services::PathService::applicationDirPath() + "/plugins")), -#endif - #ifndef EXCLUDE_INSIGHT this->qtApplication = std::make_unique(this->qtApplicationArgc, this->qtApplicationArgv.data()); #else