VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2024-11-22 08:04:49 -05:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1754 from srcejon/fix_1740

Browse Source 
Fix syntax error in cmake/ci/build_sdrangel.sh and remote external files from .deb
This commit is contained in:
Edouard Griffiths 2023-07-31 22:41:47 +02:00 committed by GitHub
commit c50e5991d2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cmake/ci/build_sdrangel.sh
View File

@ -1,6 +1,6 @@
#!/bin/sh -e
#!/bin/bash -e
if [ "${TRAVIS_OS_NAME}" == "linux" ] || [ ${CI_LINUX} = true ]; then
if [ "${TRAVIS_OS_NAME}" == "linux" ] || [ "${CI_LINUX}" == true ]; then
debuild -i -us -uc -b
else
mkdir -p build; cd build

6
debian/rules vendored
View File

@ -5,6 +5,12 @@
override_dh_auto_configure:
dh_auto_configure -- -DARCH_OPT=nehalem -DENABLE_EXTERNAL_LIBRARIES=AUTO -DDEBUG_OUTPUT=ON -DBUILD_SERVER=OFF
# delete any external projects (such as libsigmf) that are installed
# would be better if we could prevent them from being installed in CMakeLists.txt
override_dh_install:
-find debian/sdrangel -type d -name external -exec rm -r {} \; -exec mkdir {} \; -exec rmdir -p {} \;
dh_install
override_dh_auto_test:
echo "Skipping test step"