From b5d998e54e1afd74e9641e67319d9085426b89c6 Mon Sep 17 00:00:00 2001 From: db4ple Date: Sat, 10 Aug 2019 15:02:07 +0200 Subject: [PATCH 01/12] Update .travis.yml --- .travis.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index f13cf45eb..9dedad270 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,3 +1,5 @@ +os: + - osx env: global: - GCC_BASE=gcc-arm-none-eabi-8-2018-q4-major @@ -48,4 +50,4 @@ before_install: && rm -f /tmp/ut_travis; fi - unset KEY_K KEY_IV -# DO NOT TOUCH END \ No newline at end of file +# DO NOT TOUCH END From b25d525c98552d02e5f85d2a0cacb848e5bf9e09 Mon Sep 17 00:00:00 2001 From: db4ple Date: Sat, 10 Aug 2019 15:15:09 +0200 Subject: [PATCH 02/12] Update .travis.yml --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index 9dedad270..9fb762de3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,6 +11,8 @@ addons: apt: packages: libc6-i386 octave-common octave gnuplot sox p7zip-full python3-numpy octave-signal valgrind + homebrew: + packages: p7zip cache: directories: - "$HOME/$GCC_BASE" From d9b1248ff5c3ff917940f6b9fd3513ba0c6cc39f Mon Sep 17 00:00:00 2001 From: db4ple Date: Sat, 10 Aug 2019 15:22:34 +0200 Subject: [PATCH 03/12] Update .travis.yml --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 9fb762de3..f5ed96c3d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,7 +12,8 @@ addons: packages: libc6-i386 octave-common octave gnuplot sox p7zip-full python3-numpy octave-signal valgrind homebrew: - packages: p7zip + packages: + - p7zip cache: directories: - "$HOME/$GCC_BASE" From aae6de7e3b944301d44bd4380a34590d533adb0f Mon Sep 17 00:00:00 2001 From: db4ple Date: Sat, 10 Aug 2019 15:28:27 +0200 Subject: [PATCH 04/12] Update .travis.yml --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index f5ed96c3d..236185ee4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,6 +14,7 @@ addons: homebrew: packages: - p7zip + update: true cache: directories: - "$HOME/$GCC_BASE" From 51a98e6165b5ac321208f25efbd5875b21f4911c Mon Sep 17 00:00:00 2001 From: db4ple Date: Sat, 10 Aug 2019 15:48:18 +0200 Subject: [PATCH 05/12] Update CMakeLists.txt --- unittest/CMakeLists.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/unittest/CMakeLists.txt b/unittest/CMakeLists.txt index 9b9681392..b3c6835c2 100644 --- a/unittest/CMakeLists.txt +++ b/unittest/CMakeLists.txt @@ -33,11 +33,12 @@ add_library(function_trace STATIC ../unittest/function_trace.c) add_executable(ofdm_stack ofdm_stack.c ../src/ofdm.c ../src/octave.c ../src/kiss_fft.c ../src/modem_probe.c ../src/mpdecode_core.c ../src/phi0.c ../src/filter.c) if (CMAKE_C_COMPILER MATCHES "gcc$") + target_link_libraries(ofdm_stack function_trace m -no-pie "-Wl,-Map=ofdm_stack.map") target_compile_options(ofdm_stack PUBLIC -fstack-usage -finstrument-functions -no-pie) else() target_compile_options(ofdm_stack PUBLIC -finstrument-functions -no-pie) + target_link_libraries(ofdm_stack function_trace m -no-pie) endif() -target_link_libraries(ofdm_stack function_trace m -no-pie "-Wl,-Map=ofdm_stack.map") add_definitions(-D__UNITTEST__) add_executable(tnewamp1 tnewamp1.c ../src/quantise.c ../src/newamp1.c ../src/mbest.c ../src/kiss_fft.c ../src/sine.c ../src/nlp.c ../src/dump.c ../src/octave.c ${CODEBOOKS}) From 22bd0b12a752c2a01d0bb4e5bf72ad25da8b4a05 Mon Sep 17 00:00:00 2001 From: db4ple Date: Sat, 10 Aug 2019 16:38:11 +0200 Subject: [PATCH 06/12] Update .travis.yml --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index 236185ee4..24d5017cf 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,6 +14,8 @@ addons: homebrew: packages: - p7zip + - python3-numpy + - octave update: true cache: directories: From bd992856152f21394e6bc75464a68d852e000473 Mon Sep 17 00:00:00 2001 From: db4ple Date: Sat, 10 Aug 2019 17:52:04 +0200 Subject: [PATCH 07/12] Update .travis.yml --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index 24d5017cf..00779e812 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,6 +16,8 @@ addons: - p7zip - python3-numpy - octave + - octave-signal + - sox update: true cache: directories: From 515dedf502108b7ab050451108023acded938694 Mon Sep 17 00:00:00 2001 From: db4ple Date: Sat, 10 Aug 2019 17:55:46 +0200 Subject: [PATCH 08/12] Update .travis.yml --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 00779e812..6955f3a3b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -36,6 +36,7 @@ install: - if [ ! "$STDLIBURL" == "" ]; then pwd; wget -q $STDLIBURL; 7z x -p$STDLIBKEY -o$HOME stdperiph_lib.zip; fi - unset STDLIBURL STDLIBKEY # DO NOT TOUCH +- python3 -m pip install numpy script: - mkdir -p $BUILDSTD - cd $BUILDSTD From 5e2af21eef1eca7d1220ead7a009fad2a94332c0 Mon Sep 17 00:00:00 2001 From: db4ple Date: Sat, 10 Aug 2019 17:56:23 +0200 Subject: [PATCH 09/12] Update .travis.yml --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 6955f3a3b..f6a4f50b9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,7 +14,6 @@ addons: homebrew: packages: - p7zip - - python3-numpy - octave - octave-signal - sox From 392fc7b82d356d43bc1909bdfeebc513e667d3da Mon Sep 17 00:00:00 2001 From: db4ple Date: Sat, 10 Aug 2019 19:47:37 +0200 Subject: [PATCH 10/12] Update .travis.yml --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index f6a4f50b9..709f2e6b0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,8 +15,8 @@ addons: packages: - p7zip - octave - - octave-signal - sox + - valgrind update: true cache: directories: @@ -36,6 +36,7 @@ install: stdperiph_lib.zip; fi - unset STDLIBURL STDLIBKEY # DO NOT TOUCH - python3 -m pip install numpy +- echo "pkg install -forge control signal" | octave-cli script: - mkdir -p $BUILDSTD - cd $BUILDSTD From d5e3bb0fa9c1f52d9357ea421a528b387728c567 Mon Sep 17 00:00:00 2001 From: db4ple Date: Sat, 10 Aug 2019 20:15:30 +0200 Subject: [PATCH 11/12] Update .travis.yml --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 709f2e6b0..c3dc411de 100644 --- a/.travis.yml +++ b/.travis.yml @@ -23,8 +23,8 @@ cache: - "$HOME/$GCC_BASE" install: - export GCC_DIR=$HOME/$GCC_BASE -- export GCC_ARCHIVE=$HOME/$GCC_BASE-linux.tar.bz2 -- export GCC_URL=https://armkeil.blob.core.windows.net/developer/Files/downloads/gnu-rm/$GCC_SHORT/$GCC_BASE-linux.tar.bz2 +- export GCC_ARCHIVE=$HOME/$GCC_BASE-mac.tar.bz2 +- export GCC_URL=https://armkeil.blob.core.windows.net/developer/Files/downloads/gnu-rm/$GCC_SHORT/$GCC_BASE-mac.tar.bz2 - if [ ! -e $GCC_DIR/bin/arm-none-eabi-g++ ]; then wget -q $GCC_URL -O $GCC_ARCHIVE; tar xfj $GCC_ARCHIVE -C $HOME; fi - export CODEC2DEV=${PWD} From 457a6fa0d87fc072dc28dd880406a2d17a79192b Mon Sep 17 00:00:00 2001 From: db4ple Date: Sun, 11 Aug 2019 12:03:23 +0200 Subject: [PATCH 12/12] linux/osx dual travis --- .travis.yml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index c3dc411de..f874e6231 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,6 @@ os: - osx + - linux env: global: - GCC_BASE=gcc-arm-none-eabi-8-2018-q4-major @@ -22,9 +23,10 @@ cache: directories: - "$HOME/$GCC_BASE" install: +- if [ $TRAVIS_OS_NAME = linux ]; then export GCC_OS=linux ; else GCC_OS=mac; fi - export GCC_DIR=$HOME/$GCC_BASE -- export GCC_ARCHIVE=$HOME/$GCC_BASE-mac.tar.bz2 -- export GCC_URL=https://armkeil.blob.core.windows.net/developer/Files/downloads/gnu-rm/$GCC_SHORT/$GCC_BASE-mac.tar.bz2 +- export GCC_ARCHIVE=$HOME/$GCC_BASE-$GCC_OS.tar.bz2 +- export GCC_URL=https://armkeil.blob.core.windows.net/developer/Files/downloads/gnu-rm/$GCC_SHORT/$GCC_BASE-$GCC_OS.tar.bz2 - if [ ! -e $GCC_DIR/bin/arm-none-eabi-g++ ]; then wget -q $GCC_URL -O $GCC_ARCHIVE; tar xfj $GCC_ARCHIVE -C $HOME; fi - export CODEC2DEV=${PWD} @@ -35,8 +37,7 @@ install: - if [ ! "$STDLIBURL" == "" ]; then pwd; wget -q $STDLIBURL; 7z x -p$STDLIBKEY -o$HOME stdperiph_lib.zip; fi - unset STDLIBURL STDLIBKEY # DO NOT TOUCH -- python3 -m pip install numpy -- echo "pkg install -forge control signal" | octave-cli +- if [ $TRAVIS_OS_NAME = osx ]; then python3 -m pip install numpy && echo "pkg install -forge control signal" | octave-cli ; fi script: - mkdir -p $BUILDSTD - cd $BUILDSTD