@@ -65,12 +65,12 @@ See https://github.com/intel/tinycbor.git.
65
65
```
66
66
cd <chosen working directory>
67
67
export CFS_HOME="$(pwd)" # Use CFS_HOME at your discretion
68
- git clone https://github.com/nasa/cFS "${CFS_HOME}"/cfs_bundle
69
- cd "${CFS_HOME}"/cfs_bundle
68
+ git clone https://github.com/nasa/cFS "${CFS_HOME}"/cfs-bundle
69
+ cd "${CFS_HOME}"/cfs-bundle
70
70
git submodule init
71
71
git submodule update
72
- git clone https://github.com/nasa/bp "${CFS_HOME}"/apps/bp
73
- git clone https://github.com/nasa/bplib "${CFS_HOME}"/libs/bplib
72
+ git clone https://github.com/nasa/bp "${CFS_HOME}"/cfs-bundle/ apps/bp
73
+ git clone https://github.com/nasa/bplib "${CFS_HOME}"/cfs-bundle/ libs/bplib
74
74
```
75
75
76
76
4 . Setup OSAL.
@@ -80,15 +80,15 @@ Run CMake for OSAL.
80
80
Run Make for OSAL with the destination directory ` ./osal-staging ` .
81
81
82
82
```
83
- cd . /cfs-bundle/osal
84
- # cmake options from .github/actions/setup-osal/action.yml
83
+ cd "${CFS_HOME}" /cfs-bundle/osal
84
+ # cmake options from .github/actions/setup-osal/action.yml:
85
85
CMAKE_OSAL_DEFS="-DCMAKE_INSTALL_PREFIX=/usr/local -DOSAL_SYSTEM_BSPTYPE=generic-linux "
86
86
# config-options:
87
87
CMAKE_OSAL_DEFS+="-DCMAKE_BUILD_TYPE=Release -DOSAL_OMIT_DEPRECATED=TRUE "
88
88
CMAKE_OSAL_DEFS+="-DENABLE_UNIT_TESTS=TRUE -DOSAL_CONFIG_DEBUG_PERMISSIVE_MODE=ON "
89
- cmake $CMAKE_OSAL_DEFS -B .. /osal-build
90
- cd .. /osal-build
91
- make DESTDIR=.. /osal-staging install
89
+ cmake $CMAKE_OSAL_DEFS -B "${CFS_HOME}" /osal-build
90
+ cd "${CFS_HOME}" /osal-build
91
+ make DESTDIR="${CFS_HOME}" /osal-staging install
92
92
```
93
93
94
94
5 . Build bplib and the test runners
@@ -100,13 +100,14 @@ Setup the required environment variables for CMake, choosing between Debug or Re
100
100
```
101
101
# MATRIX_BUILD_TYPE=[Debug|Release]
102
102
# MATRIX_OS_LAYER=[OSAL|POSIX]
103
- # BPLIB_SOURCE=$ CFS_HOME/cfs_bundle /libs/bplib
104
- # BPLIB_BUILD=. /bplib-build-matrix-< MATRIX_BUILD_TYPE>-< MATRIX_OS_LAYER>
103
+ # BPLIB_SOURCE="${ CFS_HOME}"/cfs-bundle /libs/bplib
104
+ # BPLIB_BUILD="${CFS_HOME} /bplib-build-matrix-${ MATRIX_BUILD_TYPE}-${ MATRIX_OS_LAYER}"
105
105
```
106
106
107
107
Run CMake and make all to build bplib and the bplib tests.
108
108
109
109
```
110
+ export NasaOsal_DIR="${CFS_HOME}/osal-staging/usr/local/lib/cmake"
110
111
cmake \
111
112
-DCMAKE_BUILD_TYPE="${MATRIX_BUILD_TYPE}" \
112
113
-DBPLIB_OS_LAYER="${MATRIX_OS_LAYER}" \
@@ -122,13 +123,12 @@ Run CMake and make all to build bplib and the bplib tests.
122
123
6 . Test bplib
123
124
124
125
```
125
- export NasaOsal_DIR=osal-staging/usr/local/lib/cmake
126
- cd ./bplib-build-matrix-Debug-OSAL
126
+ cd "${CFS_HOME}"/bplib-build-matrix-Debug-OSAL
127
127
common/ut-coverage/coverage-bplib_common-testrunner
128
128
```
129
129
130
130
#### Build bplib Stand Alone
131
- 1 . Clone bplib into a working directory.
131
+ 1 . Clone bplib into a working directory. The build uses BPLIB_HOME rather than CFS_HOME for a stand alone build.
132
132
133
133
```
134
134
cd <chosen working directory>
@@ -141,13 +141,13 @@ Run CMake and make all to build bplib and the bplib tests.
141
141
142
142
Note that the possible build folders are one of <Debug,Release>-POSIX for the build type and operating system layer respectively.
143
143
144
- Setup the required environment variables for CMake, choosing between Debug or Release, and POSIX.
144
+ Setup the required environment variables for CMake, choosing between Debug or Release. POSIX is the only operating system layer supported by the stand alone build .
145
145
146
146
```
147
147
# MATRIX_BUILD_TYPE=[Debug|Release]
148
148
# MATRIX_OS_LAYER=POSIX
149
- # BPLIB_SOURCE=$CFS_HOME/cfs_bundle/libs /bplib
150
- # BPLIB_BUILD=. /bplib-build-matrix-< MATRIX_BUILD_TYPE> -POSIX
149
+ # BPLIB_SOURCE="${BPLIB_HOME}" /bplib
150
+ # BPLIB_BUILD="${BPLIB_HOME} /bplib-build-matrix-${ MATRIX_BUILD_TYPE} -POSIX"
151
151
```
152
152
153
153
Run CMake and make all to build bplib and the bplib tests.
0 commit comments