Tidying
This commit is contained in:
@@ -74,7 +74,7 @@ To compile Bloom, the following dependencies must be resolved.
|
|||||||
- CMake version 3.22 or later:
|
- CMake version 3.22 or later:
|
||||||
- G++10 or later
|
- G++10 or later
|
||||||
- libusb v1.0
|
- libusb v1.0
|
||||||
- libhidapi
|
- libhidapi (0.11.2 or later)
|
||||||
- yaml-cpp (version 0.7.0 or later)
|
- yaml-cpp (version 0.7.0 or later)
|
||||||
- libprocps
|
- libprocps
|
||||||
- PHP CLI version 8 or later, with the xml extension (`php8.0-cli`, `php8.0-xml`)
|
- PHP CLI version 8 or later, with the xml extension (`php8.0-cli`, `php8.0-xml`)
|
||||||
@@ -117,3 +117,5 @@ sudo cmake --install ./ --prefix [SOME_OTHER_INSTALLATION_DIR];
|
|||||||
- If Qt's shared objects cannot be found when running Bloom, you can either:
|
- If Qt's shared objects cannot be found when running Bloom, you can either:
|
||||||
1. Set `LD_LIBRARY_PATH` before running Bloom: `export LD_LIBRARY_PATH=[PATH_TO_QT_INSTALLATION]/gcc_64/lib;` OR:
|
1. Set `LD_LIBRARY_PATH` before running Bloom: `export LD_LIBRARY_PATH=[PATH_TO_QT_INSTALLATION]/gcc_64/lib;` OR:
|
||||||
2. Update Bloom's RUNPATH (with a tool like `patchelf`)
|
2. Update Bloom's RUNPATH (with a tool like `patchelf`)
|
||||||
|
- Once you've installed Bloom, you'll need to create a symlink to Bloom's binary, in `/usr/bin/`, to run `bloom` without
|
||||||
|
having to supply the full path.
|
||||||
|
|||||||
@@ -2,29 +2,26 @@ set(BLOOM_PACKAGE_NAME "Bloom")
|
|||||||
set(BLOOM_PACKAGE_FILE_NAME "Bloom-${CMAKE_PROJECT_VERSION}-Linux")
|
set(BLOOM_PACKAGE_FILE_NAME "Bloom-${CMAKE_PROJECT_VERSION}-Linux")
|
||||||
set(BLOOM_PACKAGE_DESCRIPTION "Debugger for AVR-based embedded systems")
|
set(BLOOM_PACKAGE_DESCRIPTION "Debugger for AVR-based embedded systems")
|
||||||
set(BLOOM_PACKAGE_CONTACT "Nav Mohammed <support@bloom.oscillate.io>")
|
set(BLOOM_PACKAGE_CONTACT "Nav Mohammed <support@bloom.oscillate.io>")
|
||||||
set(BLOOM_PACKAGE_RELEASE_DIR "${CMAKE_BINARY_DIR}/packaging/tmp/release")
|
|
||||||
|
|
||||||
string(TOLOWER ${BLOOM_PACKAGE_NAME} BLOOM_PACKAGE_NAME_LOWER)
|
string(TOLOWER ${BLOOM_PACKAGE_NAME} BLOOM_PACKAGE_NAME_LOWER)
|
||||||
|
|
||||||
file(MAKE_DIRECTORY "${BLOOM_PACKAGE_RELEASE_DIR}")
|
|
||||||
|
|
||||||
configure_file(
|
|
||||||
"${CMAKE_CURRENT_SOURCE_DIR}/build/packaging/deb/package-deb.sh.in"
|
|
||||||
"${CMAKE_BINARY_DIR}/packaging/package-deb.sh"
|
|
||||||
FILE_PERMISSIONS
|
|
||||||
OWNER_EXECUTE OWNER_READ OWNER_WRITE
|
|
||||||
GROUP_READ
|
|
||||||
WORLD_READ
|
|
||||||
@ONLY
|
|
||||||
)
|
|
||||||
|
|
||||||
file(MAKE_DIRECTORY "${CMAKE_BINARY_DIR}/packaging/tmp/deb")
|
file(MAKE_DIRECTORY "${CMAKE_BINARY_DIR}/packaging/tmp/deb")
|
||||||
file(MAKE_DIRECTORY "${CMAKE_BINARY_DIR}/packaging/tmp/rpm")
|
file(MAKE_DIRECTORY "${CMAKE_BINARY_DIR}/packaging/tmp/rpm")
|
||||||
file(MAKE_DIRECTORY "${CMAKE_BINARY_DIR}/packaging/tmp/pkgbuild")
|
file(MAKE_DIRECTORY "${CMAKE_BINARY_DIR}/packaging/tmp/pkgbuild")
|
||||||
|
|
||||||
# Generate the relevant configuration files for our DEB, RPM and PKGBUILD packages
|
# Generate the DEB control file and packaging script
|
||||||
configure_file(
|
configure_file(
|
||||||
"${CMAKE_CURRENT_SOURCE_DIR}/build/packaging/deb/control.in"
|
"${CMAKE_CURRENT_SOURCE_DIR}/build/packaging/deb/control.in"
|
||||||
"${CMAKE_BINARY_DIR}/packaging/tmp/deb/DEBIAN/control"
|
"${CMAKE_BINARY_DIR}/packaging/tmp/deb/DEBIAN/control"
|
||||||
@ONLY
|
@ONLY
|
||||||
)
|
)
|
||||||
|
|
||||||
|
configure_file(
|
||||||
|
"${CMAKE_CURRENT_SOURCE_DIR}/build/packaging/deb/package-deb.sh.in"
|
||||||
|
"${CMAKE_BINARY_DIR}/packaging/package-deb.sh"
|
||||||
|
FILE_PERMISSIONS
|
||||||
|
OWNER_EXECUTE OWNER_READ OWNER_WRITE
|
||||||
|
GROUP_READ
|
||||||
|
WORLD_READ
|
||||||
|
@ONLY
|
||||||
|
)
|
||||||
|
|||||||
Reference in New Issue
Block a user