From 975b3cd294dab45c213acfdee3592ab5fbb305e3 Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Mon, 17 Jan 2022 15:57:52 +0100 Subject: [PATCH 1/4] added clang script and forward declarations --- .clang-format | 8 ++++++++ bsp_q7s/boardtest/Q7STestTask.h | 2 ++ mission/tmtc/VirtualChannel.h | 2 ++ scripts/apply-clang-format.sh | 11 +++++++++++ 4 files changed, 23 insertions(+) create mode 100644 .clang-format create mode 100755 scripts/apply-clang-format.sh diff --git a/.clang-format b/.clang-format new file mode 100644 index 00000000..ada61da2 --- /dev/null +++ b/.clang-format @@ -0,0 +1,8 @@ +--- +BasedOnStyle: Google +IndentWidth: 2 +--- +Language: Cpp +ColumnLimit: 100 +ReflowComments: true +--- diff --git a/bsp_q7s/boardtest/Q7STestTask.h b/bsp_q7s/boardtest/Q7STestTask.h index 91e8c3d6..631c238a 100644 --- a/bsp_q7s/boardtest/Q7STestTask.h +++ b/bsp_q7s/boardtest/Q7STestTask.h @@ -3,6 +3,8 @@ #include "test/testtasks/TestTask.h" +class CoreController; + class Q7STestTask: public TestTask { public: Q7STestTask(object_id_t objectId); diff --git a/mission/tmtc/VirtualChannel.h b/mission/tmtc/VirtualChannel.h index c6e2eb6d..213a3421 100644 --- a/mission/tmtc/VirtualChannel.h +++ b/mission/tmtc/VirtualChannel.h @@ -7,6 +7,8 @@ #include #include +class StorageManagerIF; + /** * @brief This class represents a virtual channel. Sending a tm message to an object of this class * will forward the tm packet to the respective virtual channel of the PTME IP Core. diff --git a/scripts/apply-clang-format.sh b/scripts/apply-clang-format.sh new file mode 100755 index 00000000..55a31487 --- /dev/null +++ b/scripts/apply-clang-format.sh @@ -0,0 +1,11 @@ +#!/bin/bash +if [[ ! -f README.md ]]; then + cd .. +fi + +find ./mission -iname *.h -o -iname *.cpp -o -iname *.c | xargs clang-format --style=file -i +find ./linux -iname *.h -o -iname *.cpp -o -iname *.c | xargs clang-format --style=file -i +find ./bsp_q7s -iname *.h -o -iname *.cpp -o -iname *.c | xargs clang-format --style=file -i +find ./bsp_linux_board -iname *.h -o -iname *.cpp -o -iname *.c | xargs clang-format --style=file -i +find ./bsp_hosted -iname *.h -o -iname *.cpp -o -iname *.c | xargs clang-format --style=file -i +find ./test -iname *.h -o -iname *.cpp -o -iname *.c | xargs clang-format --style=file -i -- 2.43.0 From 0724215b6a3c9aa2c3b1cf2b2f3a6db9ad5a1ecf Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Wed, 19 Jan 2022 11:16:42 +0100 Subject: [PATCH 2/4] change dockerfile to trigger container rebuild --- automation/Dockerfile-q7s | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/automation/Dockerfile-q7s b/automation/Dockerfile-q7s index 21b56439..b2604ff8 100644 --- a/automation/Dockerfile-q7s +++ b/automation/Dockerfile-q7s @@ -13,7 +13,7 @@ curl https://buggy.irs.uni-stuttgart.de/eive/tools/cortexa9hf-neon-xiphos-linux- RUN mkdir -p /usr/tools; \ curl https://buggy.irs.uni-stuttgart.de/eive/tools/gcc-arm-8.3-2019.03-x86_64-arm-linux-gnueabihf.tar.gz \ | tar -xz -C /usr/tools - +RUN echo "test" ENV Q7S_SYSROOT="/usr/rootfs/cortexa9hf-neon-xiphos-linux-gnueabi" ENV PATH=$PATH:"/usr/tools/gcc-arm-8.3-2019.03-x86_64-arm-linux-gnueabihf/bin" -- 2.43.0 From 890d28fb7f006467d9141807cd816e52368d73d3 Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Wed, 19 Jan 2022 11:16:57 +0100 Subject: [PATCH 3/4] removed dummy change --- automation/Dockerfile-q7s | 1 - 1 file changed, 1 deletion(-) diff --git a/automation/Dockerfile-q7s b/automation/Dockerfile-q7s index b2604ff8..207afa04 100644 --- a/automation/Dockerfile-q7s +++ b/automation/Dockerfile-q7s @@ -13,7 +13,6 @@ curl https://buggy.irs.uni-stuttgart.de/eive/tools/cortexa9hf-neon-xiphos-linux- RUN mkdir -p /usr/tools; \ curl https://buggy.irs.uni-stuttgart.de/eive/tools/gcc-arm-8.3-2019.03-x86_64-arm-linux-gnueabihf.tar.gz \ | tar -xz -C /usr/tools -RUN echo "test" ENV Q7S_SYSROOT="/usr/rootfs/cortexa9hf-neon-xiphos-linux-gnueabi" ENV PATH=$PATH:"/usr/tools/gcc-arm-8.3-2019.03-x86_64-arm-linux-gnueabihf/bin" -- 2.43.0 From bd7958f6c5a2d6e4b06d0f2584833b756bf959ff Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Wed, 19 Jan 2022 11:28:37 +0100 Subject: [PATCH 4/4] cleanDocker --- automation/Jenkinsfile | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/automation/Jenkinsfile b/automation/Jenkinsfile index 7b184280..8d45b2d7 100644 --- a/automation/Jenkinsfile +++ b/automation/Jenkinsfile @@ -3,8 +3,11 @@ pipeline { stages { stage('Build Container') { when { - changeset "automation/Dockerfile-q7s" - branch 'develop' + anyOf { + changeset "automation/Dockerfile-q7s" + branch 'develop'; + changelog 'cleanDocker' + } } steps { sh 'docker build -t eive-fsw-build-q7s:gcc8 - < automation/Dockerfile-q7s' -- 2.43.0