diff --git a/.ci/scripts/do_build.sh b/.ci/scripts/do_build.sh index 8f12f7f8..af45ee7f 100755 --- a/.ci/scripts/do_build.sh +++ b/.ci/scripts/do_build.sh @@ -16,25 +16,25 @@ set -- -DENABLE_RTLSDR=$RTLSDR -DENABLE_SOAPYSDR=$SOAPYSDR -DENABLE_OPENSSL=$OPE mkdir -p build cd build if [ -n "$CMAKE_TOOLCHAIN_FILE" ] ; then -cmake $@ -DCMAKE_TOOLCHAIN_FILE=../$CMAKE_TOOLCHAIN_FILE .. + cmake $@ -DCMAKE_TOOLCHAIN_FILE=../$CMAKE_TOOLCHAIN_FILE .. else -cmake $@ .. + cmake $@ .. fi make # make install if [ -n "$RUN_RTL_433_TESTS" ] ; then -cd .. -set -x -git clone --depth 1 https://github.com/merbanan/rtl_433_tests.git -cd rtl_433_tests -export PATH=../build/src:$PATH -test -f ../build/src/rtl_433 + cd .. + set -x + git clone --depth 1 https://github.com/merbanan/rtl_433_tests.git + cd rtl_433_tests + export PATH=../build/src:$PATH + test -f ../build/src/rtl_433 -# virtualenv --system-site-packages .venv -# source .venv/bin/activate -# pip install deepdiff -make test + # virtualenv --system-site-packages .venv + # source .venv/bin/activate + # pip install deepdiff + make test fi diff --git a/.ci/scripts/do_sysroot.sh b/.ci/scripts/do_sysroot.sh index 7459c02b..accd8aaf 100755 --- a/.ci/scripts/do_sysroot.sh +++ b/.ci/scripts/do_sysroot.sh @@ -17,9 +17,9 @@ sed="${sed:-sed}" # from https://libusb.info/ if [ ! -e libusb/include/libusb-1.0/libusb.h ] then -[ -e libusb-${libusb_ver}.7z ] || curl -L -O https://github.com/libusb/libusb/releases/download/v${libusb_ver}/libusb-${libusb_ver}.7z -mkdir -p libusb -7z x -olibusb -y libusb-${libusb_ver}.7z + [ -e libusb-${libusb_ver}.7z ] || curl -L -O https://github.com/libusb/libusb/releases/download/v${libusb_ver}/libusb-${libusb_ver}.7z + mkdir -p libusb + 7z x -olibusb -y libusb-${libusb_ver}.7z fi # remove this script name and two dir levels to get the source root @@ -46,64 +46,64 @@ cp libusb/MinGW64/dll/libusb-1.0.dll.a $sysroot64/usr/lib if [ ! -d rtl-sdr-${rtlsdr_ver} ] then -# or git clone https://github.com/osmocom/rtl-sdr.git -[ -e rtl-sdr-${rtlsdr_ver}.tar.gz ] || curl -L -o rtl-sdr-${rtlsdr_ver}.tar.gz https://github.com/osmocom/rtl-sdr/archive/${rtlsdr_ver}.tar.gz -tar xzf rtl-sdr-${rtlsdr_ver}.tar.gz + # or git clone https://github.com/osmocom/rtl-sdr.git + [ -e rtl-sdr-${rtlsdr_ver}.tar.gz ] || curl -L -o rtl-sdr-${rtlsdr_ver}.tar.gz https://github.com/osmocom/rtl-sdr/archive/${rtlsdr_ver}.tar.gz + tar xzf rtl-sdr-${rtlsdr_ver}.tar.gz fi cd rtl-sdr-${rtlsdr_ver} if [ ! -e $sysroot32/usr/lib/librtlsdr.a ] then -export CMAKE_SYSROOT=$sysroot32 ; echo $CMAKE_SYSROOT -mkdir build-tmp ; cd build-tmp ; cmake -DCMAKE_TOOLCHAIN_FILE=$source_dir/cmake/Toolchain-gcc-mingw-w64-i686.cmake .. && make && make install ; cd .. -rm -rf build-tmp -mv $sysroot32/usr/lib/librtlsdr_static.a $sysroot32/usr/lib/librtlsdr.a + export CMAKE_SYSROOT=$sysroot32 ; echo $CMAKE_SYSROOT + mkdir build-tmp ; cd build-tmp ; cmake -DCMAKE_TOOLCHAIN_FILE=$source_dir/cmake/Toolchain-gcc-mingw-w64-i686.cmake .. && make && make install ; cd .. + rm -rf build-tmp + mv $sysroot32/usr/lib/librtlsdr_static.a $sysroot32/usr/lib/librtlsdr.a fi if [ ! -e $sysroot32static/usr/lib/librtlsdr.a ] then -export CMAKE_SYSROOT=$sysroot32static ; echo $CMAKE_SYSROOT -mkdir build-tmp ; cd build-tmp ; cmake -DCMAKE_TOOLCHAIN_FILE=$source_dir/cmake/Toolchain-gcc-mingw-w64-i686.cmake -DBUILD_SHARED_LIBS:BOOL=OFF .. && make && make install ; cd .. -rm -rf build-tmp -mv $sysroot32static/usr/lib/librtlsdr_static.a $sysroot32static/usr/lib/librtlsdr.a -rm $sysroot32static/usr/lib/librtlsdr.dll.a -rm $sysroot32static/usr/bin/librtlsdr.dll + export CMAKE_SYSROOT=$sysroot32static ; echo $CMAKE_SYSROOT + mkdir build-tmp ; cd build-tmp ; cmake -DCMAKE_TOOLCHAIN_FILE=$source_dir/cmake/Toolchain-gcc-mingw-w64-i686.cmake -DBUILD_SHARED_LIBS:BOOL=OFF .. && make && make install ; cd .. + rm -rf build-tmp + mv $sysroot32static/usr/lib/librtlsdr_static.a $sysroot32static/usr/lib/librtlsdr.a + rm $sysroot32static/usr/lib/librtlsdr.dll.a + rm $sysroot32static/usr/bin/librtlsdr.dll fi if [ ! -e $sysroot64/usr/lib/librtlsdr.a ] then -export CMAKE_SYSROOT=$sysroot64 ; echo $CMAKE_SYSROOT -mkdir build-tmp ; cd build-tmp ; cmake -DCMAKE_TOOLCHAIN_FILE=$source_dir/cmake/Toolchain-gcc-mingw-w64-x86-64.cmake .. && make && make install ; cd .. -rm -rf build-tmp -mv $sysroot64/usr/lib/librtlsdr_static.a $sysroot64/usr/lib/librtlsdr.a + export CMAKE_SYSROOT=$sysroot64 ; echo $CMAKE_SYSROOT + mkdir build-tmp ; cd build-tmp ; cmake -DCMAKE_TOOLCHAIN_FILE=$source_dir/cmake/Toolchain-gcc-mingw-w64-x86-64.cmake .. && make && make install ; cd .. + rm -rf build-tmp + mv $sysroot64/usr/lib/librtlsdr_static.a $sysroot64/usr/lib/librtlsdr.a fi if [ ! -e $sysroot64static/usr/lib/librtlsdr.a ] then -export CMAKE_SYSROOT=$sysroot64static ; echo $CMAKE_SYSROOT -mkdir build-tmp ; cd build-tmp ; cmake -DCMAKE_TOOLCHAIN_FILE=$source_dir/cmake/Toolchain-gcc-mingw-w64-x86-64.cmake -DBUILD_SHARED_LIBS:BOOL=OFF .. && make && make install ; cd .. -rm -rf build-tmp -mv $sysroot64static/usr/lib/librtlsdr_static.a $sysroot64static/usr/lib/librtlsdr.a -rm $sysroot64static/usr/lib/librtlsdr.dll.a -rm $sysroot64static/usr/bin/librtlsdr.dll + export CMAKE_SYSROOT=$sysroot64static ; echo $CMAKE_SYSROOT + mkdir build-tmp ; cd build-tmp ; cmake -DCMAKE_TOOLCHAIN_FILE=$source_dir/cmake/Toolchain-gcc-mingw-w64-x86-64.cmake -DBUILD_SHARED_LIBS:BOOL=OFF .. && make && make install ; cd .. + rm -rf build-tmp + mv $sysroot64static/usr/lib/librtlsdr_static.a $sysroot64static/usr/lib/librtlsdr.a + rm $sysroot64static/usr/lib/librtlsdr.dll.a + rm $sysroot64static/usr/bin/librtlsdr.dll fi cd .. if [ ! -e $sysroot64/usr/bin/SoapySDR.dll -o ! -e $sysroot64/usr/lib/SoapySDR.lib ] then -# from https://downloads.myriadrf.org/builds/PothosSDR/ -[ -e PothosSDR-${pothos_ver}-x64.exe ] || curl -L -O https://downloads.myriadrf.org/builds/PothosSDR/PothosSDR-${pothos_ver}-x64.exe -mkdir -p pothos -7z x -opothos -y PothosSDR-${pothos_ver}-x64.exe -# workaround: 7-Zip 9.20 creates strange root directories -[ -e pothos/bin ] || mv pothos/*/* pothos/ || : -cp pothos/bin/SoapySDR.dll $sysroot64/usr/bin -cp -R pothos/include/SoapySDR $sysroot64/usr/include -cp pothos/lib/SoapySDR.lib $sysroot64/usr/lib -cp -R pothos/cmake $sysroot64/usr -$sed -i 's/.*INTERFACE_COMPILE_OPTIONS.*//g' $sysroot64/usr/cmake/SoapySDRExport.cmake + # from https://downloads.myriadrf.org/builds/PothosSDR/ + [ -e PothosSDR-${pothos_ver}-x64.exe ] || curl -L -O https://downloads.myriadrf.org/builds/PothosSDR/PothosSDR-${pothos_ver}-x64.exe + mkdir -p pothos + 7z x -opothos -y PothosSDR-${pothos_ver}-x64.exe + # workaround: 7-Zip 9.20 creates strange root directories + [ -e pothos/bin ] || mv pothos/*/* pothos/ || : + cp pothos/bin/SoapySDR.dll $sysroot64/usr/bin + cp -R pothos/include/SoapySDR $sysroot64/usr/include + cp pothos/lib/SoapySDR.lib $sysroot64/usr/lib + cp -R pothos/cmake $sysroot64/usr + $sed -i 's/.*INTERFACE_COMPILE_OPTIONS.*//g' $sysroot64/usr/cmake/SoapySDRExport.cmake fi # build rtl_433