From 0f4c519e98efda933e64576ce3b6d9f4f82f4bdd Mon Sep 17 00:00:00 2001 From: Jacob Hageman Date: Fri, 12 Mar 2021 13:51:16 -0500 Subject: [PATCH 1/3] Fix #51, Use quotes for local includes --- fsw/src/sample_lib_internal.h | 2 +- unit-test/coveragetest/coveragetest_sample_lib.c | 2 +- .../coveragetest/sample_lib_coveragetest_common.h | 10 +++++----- unit-test/override_inc/string.h | 2 +- unit-test/override_src/libc_string_stubs.c | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/fsw/src/sample_lib_internal.h b/fsw/src/sample_lib_internal.h index 6cff8c1..d9f065f 100644 --- a/fsw/src/sample_lib_internal.h +++ b/fsw/src/sample_lib_internal.h @@ -30,7 +30,7 @@ #define _sample_lib_internal_h_ /* Include all external/public definitions */ -#include +#include "sample_lib.h" /************************************************************************* ** Macro Definitions diff --git a/unit-test/coveragetest/coveragetest_sample_lib.c b/unit-test/coveragetest/coveragetest_sample_lib.c index 3395534..08d0a28 100644 --- a/unit-test/coveragetest/coveragetest_sample_lib.c +++ b/unit-test/coveragetest/coveragetest_sample_lib.c @@ -45,7 +45,7 @@ * as well as the normal system string.h. It is differentiated * by explicitly specifying the "overrides/" prefix here. */ -#include +#include "OCS_string.h" #include #include diff --git a/unit-test/coveragetest/sample_lib_coveragetest_common.h b/unit-test/coveragetest/sample_lib_coveragetest_common.h index e6cf7ce..38ffe9f 100644 --- a/unit-test/coveragetest/sample_lib_coveragetest_common.h +++ b/unit-test/coveragetest/sample_lib_coveragetest_common.h @@ -32,15 +32,15 @@ * Includes */ -#include -#include -#include +#include "utassert.h" +#include "uttest.h" +#include "utstubs.h" /* * Use the public API/definitions from CFE and SAMPLE LIB */ -#include -#include +#include "cfe.h" +#include "sample_lib_internal.h" /* * Macro to call a function and check its int32 return code diff --git a/unit-test/override_inc/string.h b/unit-test/override_inc/string.h index abc7cd7..0dcf24d 100644 --- a/unit-test/override_inc/string.h +++ b/unit-test/override_inc/string.h @@ -33,7 +33,7 @@ #ifndef _OVERRIDE_STRING_H_ #define _OVERRIDE_STRING_H_ -#include +#include "OCS_string.h" /* ----------------------------------------- */ /* mappings for declarations in string.h */ diff --git a/unit-test/override_src/libc_string_stubs.c b/unit-test/override_src/libc_string_stubs.c index 505ff72..6eeb78f 100644 --- a/unit-test/override_src/libc_string_stubs.c +++ b/unit-test/override_src/libc_string_stubs.c @@ -47,7 +47,7 @@ /* * This is for the prototype of the "OCS_strncpy()" function */ -#include +#include "OCS_string.h" /* ********************************** * Implementation of OCS_strncpy stub From c0f1a7bfcaf292cd1dcdd358f349a63f979bb48a Mon Sep 17 00:00:00 2001 From: Ariel Adams Date: Tue, 16 Mar 2021 13:13:39 -0500 Subject: [PATCH 2/3] Fix #52, Add Contributing Guide --- CONTRIBUTING.md | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 CONTRIBUTING.md diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md new file mode 100644 index 0000000..2da34ba --- /dev/null +++ b/CONTRIBUTING.md @@ -0,0 +1,3 @@ +# Contributing Guide + +Please see our [top-level contributing guide](https://github.com/nasa/cFS/blob/main/CONTRIBUTING.md) for more information on how to contribute. \ No newline at end of file From d5fa8515010c043a2bb252c53d7aba00aaff054f Mon Sep 17 00:00:00 2001 From: "Gerardo E. Cruz-Ortiz" <59618057+astrogeco@users.noreply.github.com> Date: Mon, 22 Mar 2021 15:11:38 -0400 Subject: [PATCH 3/3] IC:2021-03-23, Bump to v1.2.0-rc1+dev30 --- README.md | 6 ++++++ fsw/src/sample_lib_version.h | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 7e8bae4..50f89a8 100644 --- a/README.md +++ b/README.md @@ -11,6 +11,12 @@ sample_lib implements SAMPLE_Function, as an example for how to build and link a ## Version History +### Development Build: v1.2.0-rc1+dev30 + +- Replace <> with " for local includes +- Adds CONTRIBUTING.md that links to the main cFS contributing guide. +- See + ### Development Build: v1.2.0-rc1+dev24 - Fix #46, simplify build to use wrappers and interface libs diff --git a/fsw/src/sample_lib_version.h b/fsw/src/sample_lib_version.h index 65b131f..47296d1 100644 --- a/fsw/src/sample_lib_version.h +++ b/fsw/src/sample_lib_version.h @@ -32,7 +32,7 @@ /* Development Build Macro Definitions */ -#define SAMPLE_LIB_BUILD_NUMBER 24 /*!< Development Build: Number of commits since baseline */ +#define SAMPLE_LIB_BUILD_NUMBER 30 /*!< Development Build: Number of commits since baseline */ #define SAMPLE_LIB_BUILD_BASELINE \ "v1.2.0-rc1" /*!< Development Build: git tag that is the base for the current development */