Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'develop-mentions-sampleApp' into develop. Close #105.
**Description** Ogma's cFS template is based on cFS' Sample Application, and the generated code includes multiple references to the sample app. Keeping those references there is misleading, since this is not the sample app, but a monitoring app. **Type** - Bug: The application produced by Ogma contains incorrect references. **Additional context** None. **Requester** - Ivan Perez **Method to check presence of bug** Searching for mentions of the sample app in the ogma directory brings up multiple results. It should not bring any. ```sh $ grep -niHre 'sample.\?app' * ogma-core/src/Command/CFSApp.hs:212: , "** This file contains the source code for the Sample App." ogma-core/templates/copilot-cfs/fsw/mission_inc/copilot_cfs_perfids.h:6:** Define Sample App Performance IDs ogma-core/templates/copilot-cfs/fsw/src/copilot_cfs.c:5:** This file contains the source code for the Sample App. ogma-core/templates/copilot-cfs/fsw/src/copilot_cfs_version.h:6:** The Sample Application header file containing version number ogma-core/templates/copilot-cfs/fsw/platform_inc/copilot_cfs_msgids.h:6:** Define Sample App Message IDs ogma-core/templates/copilot-cfs/CMakeLists.txt:2:project(CFE_SAMPLE_APP C) ``` The following dockerfile searches for mentions of the sample app in all files, printing the word Success if none are found: ```Dockerfile FROM ubuntu:focal RUN apt-get update RUN apt-get install --yes git SHELL ["/bin/bash", "-c"] CMD git clone $REPO \ && cd $NAME \ && git checkout $COMMIT \ && ! grep -niHre 'sample.\?app' --exclude='CHANGELOG.md' ogma** \ && echo "Success" ``` Command (substitute variables based on new path after merge): ```sh $ docker run -e "REPO=https://github.com/NASA/ogma" -e "NAME=ogma" -e PAT="ogma-" -e "COMMIT=<HASH>" -it ogma-verify-105 ``` **Expected result** The result of the `grep` command above should be empty, indicating that there are no mentions of the sample app. **Solution implemented** Replace all mentions of the sample app in the cFS template with mentions of the Copilot app. **Further notes** None.
- Loading branch information