Merge pull request #55 from nasa/integration-candidate

sample_lib Integration candidate: 2021-03-23
nasa · Mar 22, 2021 · 1b9eea3 · 1b9eea3
2 parents 5ded381 + d5fa851
commit 1b9eea3
Show file tree

Hide file tree

Showing 8 changed files with 19 additions and 10 deletions.
diff --git a/CONTRIBUTING.md 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. 
diff --git 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 <https://github.com/nasa/sample_lib/pull/55>
+
 ### Development Build: v1.2.0-rc1+dev24
 
 - Fix #46, simplify build to use wrappers and interface libs

diff --git 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 <sample_lib.h>
+#include "sample_lib.h"
 
 /*************************************************************************
 ** Macro Definitions

diff --git 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 */
 

diff --git 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 <OCS_string.h>
+#include "OCS_string.h"
 #include <stdbool.h>
 #include <stdarg.h>
 

diff --git a/unit-test/coveragetest/sample_lib_coveragetest_common.h b/unit-test/coveragetest/sample_lib_coveragetest_common.h
@@ -32,15 +32,15 @@
  * Includes
  */
 
-#include <utassert.h>
-#include <uttest.h>
-#include <utstubs.h>
+#include "utassert.h"
+#include "uttest.h"
+#include "utstubs.h"
 
 /*
  * Use the public API/definitions from CFE and SAMPLE LIB
  */
-#include <cfe.h>
-#include <sample_lib_internal.h>
+#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
@@ -33,7 +33,7 @@
 #ifndef _OVERRIDE_STRING_H_
 #define _OVERRIDE_STRING_H_
 
-#include <OCS_string.h>
+#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
@@ -47,7 +47,7 @@
 /*
  * This is for the prototype of the "OCS_strncpy()" function
  */
-#include <OCS_string.h>
+#include "OCS_string.h"
 
 /* **********************************
  * Implementation of OCS_strncpy stub