From 4772b5c2e67460141221c89a527b3fef46cbabaf Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Tue, 8 Jun 2021 17:31:53 +0200 Subject: [PATCH] update --- .cproject | 346 ------------------ .gitignore | 1 + .project | 27 -- CMakeLists.txt | 2 +- bsp_hosted/main.cpp | 2 +- .../scripts/Hosted/create_cmake_debug_cfg.sh | 2 +- .../Hosted/create_cmake_release_cfg.sh | 2 +- .../Hosted/create_cmake_relwithdeb_cfg.sh | 4 +- cmake/scripts/Linux/create_cmake_debug_cfg.sh | 2 +- .../scripts/Linux/create_cmake_release_cfg.sh | 2 +- .../Linux/create_cmake_relwithdeb_cfg.sh | 2 +- cmake/scripts/Linux/create_cmake_size_cfg.sh | 2 +- example_common | 2 +- 13 files changed, 12 insertions(+), 384 deletions(-) delete mode 100644 .cproject delete mode 100644 .project diff --git a/.cproject b/.cproject deleted file mode 100644 index e5936a7..0000000 --- a/.cproject +++ /dev/null @@ -1,346 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.gitignore b/.gitignore index 624b849..2d55536 100644 --- a/.gitignore +++ b/.gitignore @@ -30,3 +30,4 @@ Makefile* # Visual Studio .vs out + diff --git a/.project b/.project deleted file mode 100644 index b7205be..0000000 --- a/.project +++ /dev/null @@ -1,27 +0,0 @@ - - - fsfw-example-hosted - - - - - - org.eclipse.cdt.managedbuilder.core.genmakebuilder - clean,full,incremental, - - - - - org.eclipse.cdt.managedbuilder.core.ScannerConfigBuilder - full,incremental, - - - - - - org.eclipse.cdt.core.cnature - org.eclipse.cdt.core.ccnature - org.eclipse.cdt.managedbuilder.core.managedBuildNature - org.eclipse.cdt.managedbuilder.core.ScannerConfigNature - - diff --git a/CMakeLists.txt b/CMakeLists.txt index 4d1f072..8a6ec10 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -105,7 +105,7 @@ add_subdirectory(${COMMON_PATH}) target_link_libraries(${TARGET_NAME} PRIVATE ${LIB_FSFW_NAME} ${LIB_OS_NAME} - ${LIB_FSFW_HAL_NAME} + # ${LIB_FSFW_HAL_NAME} ) # Add include paths for all sources. diff --git a/bsp_hosted/main.cpp b/bsp_hosted/main.cpp index 26b4414..01b9b2f 100644 --- a/bsp_hosted/main.cpp +++ b/bsp_hosted/main.cpp @@ -2,7 +2,7 @@ #include #include -#include +#include #include #include diff --git a/cmake/scripts/Hosted/create_cmake_debug_cfg.sh b/cmake/scripts/Hosted/create_cmake_debug_cfg.sh index 1f94bef..5acad0f 100755 --- a/cmake/scripts/Hosted/create_cmake_debug_cfg.sh +++ b/cmake/scripts/Hosted/create_cmake_debug_cfg.sh @@ -16,7 +16,7 @@ fi build_generator="" os_fsfw="host" -builddir="build-Debug-Host" +builddir="build-Debug" if [ "${OS}" = "Windows_NT" ]; then build_generator="MinGW Makefiles" # Could be other OS but this works for now. diff --git a/cmake/scripts/Hosted/create_cmake_release_cfg.sh b/cmake/scripts/Hosted/create_cmake_release_cfg.sh index 69ecde0..1aaef15 100755 --- a/cmake/scripts/Hosted/create_cmake_release_cfg.sh +++ b/cmake/scripts/Hosted/create_cmake_release_cfg.sh @@ -16,7 +16,7 @@ fi build_generator="" os_fsfw="host" -builddir="build-Release-Host" +builddir="build-Release" if [ "${OS}" = "Windows_NT" ]; then build_generator="MinGW Makefiles" # Could be other OS but this works for now. diff --git a/cmake/scripts/Hosted/create_cmake_relwithdeb_cfg.sh b/cmake/scripts/Hosted/create_cmake_relwithdeb_cfg.sh index 14eea21..5260f1e 100755 --- a/cmake/scripts/Hosted/create_cmake_relwithdeb_cfg.sh +++ b/cmake/scripts/Hosted/create_cmake_relwithdeb_cfg.sh @@ -16,7 +16,7 @@ fi build_generator="" os_fsfw="host" -builddir="build-Release-Host" +builddir="build-Release" if [ "${OS}" = "Windows_NT" ]; then build_generator="MinGW Makefiles" # Could be other OS but this works for now. @@ -28,4 +28,4 @@ echo "Running command (without the leading +):" set -x # Print command python3 cmake_build_config.py -o "${os_fsfw}" -g "${build_generator}" -b "reldeb" -l "${builddir}" # Use this if commands are added which should not be printed -# set +x \ No newline at end of file +# set +x diff --git a/cmake/scripts/Linux/create_cmake_debug_cfg.sh b/cmake/scripts/Linux/create_cmake_debug_cfg.sh index 2ec512a..39c9652 100755 --- a/cmake/scripts/Linux/create_cmake_debug_cfg.sh +++ b/cmake/scripts/Linux/create_cmake_debug_cfg.sh @@ -16,7 +16,7 @@ fi build_generator="Unix Makefiles" os_fsfw="linux" -builddir="build-Debug-Linux" +builddir="build-Debug" echo "Running command (without the leading +):" set -x # Print command diff --git a/cmake/scripts/Linux/create_cmake_release_cfg.sh b/cmake/scripts/Linux/create_cmake_release_cfg.sh index f0d0253..4003a98 100755 --- a/cmake/scripts/Linux/create_cmake_release_cfg.sh +++ b/cmake/scripts/Linux/create_cmake_release_cfg.sh @@ -16,7 +16,7 @@ fi build_generator="Unix Makefiles" os_fsfw="linux" -builddir="build-Release-Linux" +builddir="build-Release" echo "Running command (without the leading +):" set -x # Print command diff --git a/cmake/scripts/Linux/create_cmake_relwithdeb_cfg.sh b/cmake/scripts/Linux/create_cmake_relwithdeb_cfg.sh index 3c7efe7..228df8a 100755 --- a/cmake/scripts/Linux/create_cmake_relwithdeb_cfg.sh +++ b/cmake/scripts/Linux/create_cmake_relwithdeb_cfg.sh @@ -16,7 +16,7 @@ fi build_generator="Unix Makefiles" os_fsfw="linux" -builddir="build-Release-Linux" +builddir="build-Release" echo "Running command (without the leading +):" set -x # Print command diff --git a/cmake/scripts/Linux/create_cmake_size_cfg.sh b/cmake/scripts/Linux/create_cmake_size_cfg.sh index cc9711c..7c5cc17 100755 --- a/cmake/scripts/Linux/create_cmake_size_cfg.sh +++ b/cmake/scripts/Linux/create_cmake_size_cfg.sh @@ -16,7 +16,7 @@ fi build_generator="Unix Makefiles" os_fsfw="linux" -builddir="build-Release-Linux" +builddir="build-Release" echo "Running command (without the leading +):" set -x # Print command diff --git a/example_common b/example_common index f8bf448..338e7ee 160000 --- a/example_common +++ b/example_common @@ -1 +1 @@ -Subproject commit f8bf44893cfe330c87ecbcf3899e767c7422c75d +Subproject commit 338e7eed56c63b7b850e671045908c0f88942d0e