Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

sample_lib Integration candidate: 2021-03-23 #55

Merged
merged 5 commits into from
Mar 22, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -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.
6 changes: 6 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion fsw/src/sample_lib_internal.h
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
#define _sample_lib_internal_h_

/* Include all external/public definitions */
#include <sample_lib.h>
#include "sample_lib.h"

/*************************************************************************
** Macro Definitions
Expand Down
2 changes: 1 addition & 1 deletion fsw/src/sample_lib_version.h
Original file line number Diff line number Diff line change
Expand Up @@ -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 */

Expand Down
2 changes: 1 addition & 1 deletion unit-test/coveragetest/coveragetest_sample_lib.c
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
10 changes: 5 additions & 5 deletions unit-test/coveragetest/sample_lib_coveragetest_common.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion unit-test/override_inc/string.h
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand Down
2 changes: 1 addition & 1 deletion unit-test/override_src/libc_string_stubs.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down