From b45c991fcef9c14a25c4031b040d3c5230c07832 Mon Sep 17 00:00:00 2001 From: Ivan Perez Date: Tue, 21 Nov 2023 21:33:45 -0800 Subject: [PATCH 01/24] ogma-core: Remove trailing spaces from cFS app template. Refs #108. The cFS app template contains trailing spaces. Trailing spaces do not conform with our own style guide (and are commonly disallowed by style guides), and are consequently automatically removed by many editors. In turn that will produce changes to the generated files, which will be overwritten every time the user re-generates the app. This commit removes all trailing spaces from the cFS app template. --- .../copilot-cfs/fsw/for_build/Makefile | 28 +++++++++---------- .../fsw/mission_inc/copilot_cfs_perfids.h | 4 +-- .../fsw/platform_inc/copilot_cfs_msgids.h | 2 +- .../copilot-cfs/fsw/src/copilot_cfs.c | 12 ++++---- .../copilot-cfs/fsw/src/copilot_cfs_events.h | 10 +++---- .../copilot-cfs/fsw/src/copilot_cfs_msg.h | 6 ++-- .../copilot-cfs/fsw/src/copilot_cfs_version.h | 4 +-- 7 files changed, 33 insertions(+), 33 deletions(-) diff --git a/ogma-core/templates/copilot-cfs/fsw/for_build/Makefile b/ogma-core/templates/copilot-cfs/fsw/for_build/Makefile index ba7699f..0121168 100644 --- a/ogma-core/templates/copilot-cfs/fsw/for_build/Makefile +++ b/ogma-core/templates/copilot-cfs/fsw/for_build/Makefile @@ -1,10 +1,10 @@ ############################################################################### -# File: CFS Application Makefile +# File: CFS Application Makefile # # $Id: Makefile 1.8 2009/07/09 12:25:54EDT rmcgraw Exp $ # # $Log: Makefile $ -# Revision 1.8 2009/07/09 12:25:54EDT rmcgraw +# Revision 1.8 2009/07/09 12:25:54EDT rmcgraw # DCR8291:1 Changed CFE_MISSION_INC to CFS_MISSION_INC and added log # ############################################################################### @@ -13,9 +13,9 @@ # APPTARGET = copilot_cfs -# +# # Entry Point for task -# +# ENTRY_PT = COPILOT_CFSMain # @@ -33,7 +33,7 @@ SOURCES = $(OBJS:.o=.c) ## ## Specify extra C Flags needed to build this subsystem ## -LOCAL_COPTS = +LOCAL_COPTS = ## @@ -49,22 +49,22 @@ EXEDIR=../exe ## entry like the following: ## -R../tst_lib/tst_lib.elf ## -SHARED_LIB_LINK = +SHARED_LIB_LINK = ######################################################################## -# Should not have to change below this line, except for customized +# Should not have to change below this line, except for customized # Mission and cFE directory structures ######################################################################## # -# Set build type to CFE_APP. This allows us to +# Set build type to CFE_APP. This allows us to # define different compiler flags for the cFE Core and Apps. -# +# BUILD_TYPE = CFE_APP -## +## ## Include all necessary cFE make rules -## Any of these can be copied to a local file and +## Any of these can be copied to a local file and ## changed if needed. ## ## @@ -98,13 +98,13 @@ INCLUDE_PATH = \ -I../inc ## -## Define the VPATH make variable. +## Define the VPATH make variable. ## This can be modified to include source from another directory. ## If there is no corresponding app in the cfs-apps directory, then this can be discarded, or -## if the mission chooses to put the src in another directory such as "src", then that can be +## if the mission chooses to put the src in another directory such as "src", then that can be ## added here as well. ## -VPATH = $(CFS_APP_SRC)/$(APPTARGET)/fsw/src +VPATH = $(CFS_APP_SRC)/$(APPTARGET)/fsw/src ## ## Include the common make rules for building a cFE Application diff --git a/ogma-core/templates/copilot-cfs/fsw/mission_inc/copilot_cfs_perfids.h b/ogma-core/templates/copilot-cfs/fsw/mission_inc/copilot_cfs_perfids.h index 598be36..418c52a 100644 --- a/ogma-core/templates/copilot-cfs/fsw/mission_inc/copilot_cfs_perfids.h +++ b/ogma-core/templates/copilot-cfs/fsw/mission_inc/copilot_cfs_perfids.h @@ -2,7 +2,7 @@ ** File: ** $Id: copilot_cfs_perfids.h $ ** -** Purpose: +** Purpose: ** Define Sample App Performance IDs ** ** Notes: @@ -12,7 +12,7 @@ #define _copilot_cfs_perfids_h_ -#define COPILOT_CFS_PERF_ID 91 +#define COPILOT_CFS_PERF_ID 91 #endif /* _copilot_cfs_perfids_h_ */ diff --git a/ogma-core/templates/copilot-cfs/fsw/platform_inc/copilot_cfs_msgids.h b/ogma-core/templates/copilot-cfs/fsw/platform_inc/copilot_cfs_msgids.h index 8eaff84..b3039aa 100644 --- a/ogma-core/templates/copilot-cfs/fsw/platform_inc/copilot_cfs_msgids.h +++ b/ogma-core/templates/copilot-cfs/fsw/platform_inc/copilot_cfs_msgids.h @@ -2,7 +2,7 @@ ** File: ** $Id: copilot_cfs_msgids.h $ ** -** Purpose: +** Purpose: ** Define Sample App Message IDs ** ** Notes: diff --git a/ogma-core/templates/copilot-cfs/fsw/src/copilot_cfs.c b/ogma-core/templates/copilot-cfs/fsw/src/copilot_cfs.c index 4e7d747..5608861 100644 --- a/ogma-core/templates/copilot-cfs/fsw/src/copilot_cfs.c +++ b/ogma-core/templates/copilot-cfs/fsw/src/copilot_cfs.c @@ -60,7 +60,7 @@ void COPILOT_AppMain( void ) /* Pend on receipt of command packet -- timeout set to 500 millisecs */ status = CFE_SB_RcvMsg(&COPILOTMsgPtr, COPILOT_CommandPipe, 500); - + CFE_ES_PerfLogEntry(COPILOT_CFS_PERF_ID); if (status == CFE_SUCCESS) @@ -88,7 +88,7 @@ void COPILOT_AppInit(void) /* ** Register the events - */ + */ CFE_EVS_Register(COPILOT_EventFilters, sizeof(COPILOT_EventFilters)/sizeof(CFE_EVS_BinFilter_t), CFE_EVS_BINARY_FILTER); @@ -103,10 +103,10 @@ void COPILOT_AppInit(void) CFE_EVS_SendEvent (COPILOT_STARTUP_INF_EID, CFE_EVS_INFORMATION, "COPILOT App Initialized. Version %d.%d.%d.%d", COPILOT_CFS_MAJOR_VERSION, - COPILOT_CFS_MINOR_VERSION, - COPILOT_CFS_REVISION, + COPILOT_CFS_MINOR_VERSION, + COPILOT_CFS_REVISION, COPILOT_CFS_MISSION_REV); - + } /* End of COPILOT_AppInit() */ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * **/ @@ -147,7 +147,7 @@ void COPILOT_ProcessIcarousPosition(void) position_t* msg; msg = (position_t*) COPILOTMsgPtr; my_position = *msg; - + // Run all copilot monitors. step(); } diff --git a/ogma-core/templates/copilot-cfs/fsw/src/copilot_cfs_events.h b/ogma-core/templates/copilot-cfs/fsw/src/copilot_cfs_events.h index 096931d..7a37219 100644 --- a/ogma-core/templates/copilot-cfs/fsw/src/copilot_cfs_events.h +++ b/ogma-core/templates/copilot-cfs/fsw/src/copilot_cfs_events.h @@ -1,8 +1,8 @@ /************************************************************************ ** File: -** copilot_app_events.h +** copilot_app_events.h ** -** Purpose: +** Purpose: ** Define COPILOT App Events IDs ** ** Notes: @@ -14,11 +14,11 @@ #define COPILOT_RESERVED_EID 0 -#define COPILOT_STARTUP_INF_EID 1 +#define COPILOT_STARTUP_INF_EID 1 #define COPILOT_COMMAND_ERR_EID 2 #define COPILOT_COMMANDCPVIOL_INF_EID 3 -#define COPILOT_INVALID_MSGID_ERR_EID 4 -#define COPILOT_LEN_ERR_EID 5 +#define COPILOT_INVALID_MSGID_ERR_EID 4 +#define COPILOT_LEN_ERR_EID 5 #endif /* _copilot_app_events_h_ */ diff --git a/ogma-core/templates/copilot-cfs/fsw/src/copilot_cfs_msg.h b/ogma-core/templates/copilot-cfs/fsw/src/copilot_cfs_msg.h index 03f854d..6f687c6 100644 --- a/ogma-core/templates/copilot-cfs/fsw/src/copilot_cfs_msg.h +++ b/ogma-core/templates/copilot-cfs/fsw/src/copilot_cfs_msg.h @@ -1,8 +1,8 @@ /******************************************************************************* ** File: -** copilot_cfs_msg.h +** copilot_cfs_msg.h ** -** Purpose: +** Purpose: ** Define COPILOT App Messages and info ** ** Notes: @@ -26,7 +26,7 @@ typedef struct /* ** Type definition (COPILOT App housekeeping) */ -typedef struct +typedef struct { uint8 TlmHeader[CFE_SB_TLM_HDR_SIZE]; uint8 copilot_command_error_count; diff --git a/ogma-core/templates/copilot-cfs/fsw/src/copilot_cfs_version.h b/ogma-core/templates/copilot-cfs/fsw/src/copilot_cfs_version.h index 5d94b07..3d79d49 100644 --- a/ogma-core/templates/copilot-cfs/fsw/src/copilot_cfs_version.h +++ b/ogma-core/templates/copilot-cfs/fsw/src/copilot_cfs_version.h @@ -2,7 +2,7 @@ ** File: ** $Id: copilot_app_version.h $ ** -** Purpose: +** Purpose: ** The Sample Application header file containing version number ** ** Notes: @@ -16,7 +16,7 @@ #define COPILOT_CFS_MINOR_VERSION 0 #define COPILOT_CFS_REVISION 0 #define COPILOT_CFS_MISSION_REV 0 - + #endif /* _copilot_app_version_h_ */ /************************/ From b9753e29f6e0823fa8bf5e639b750528438d7b31 Mon Sep 17 00:00:00 2001 From: Ivan Perez Date: Tue, 21 Nov 2023 21:35:53 -0800 Subject: [PATCH 02/24] ogma-core: Document changes in CHANGELOG. Refs #108. --- ogma-core/CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/ogma-core/CHANGELOG.md b/ogma-core/CHANGELOG.md index 5bf07fc..0528a59 100644 --- a/ogma-core/CHANGELOG.md +++ b/ogma-core/CHANGELOG.md @@ -1,5 +1,9 @@ # Revision history for ogma-core +## [1.X.Y] - 2023-11-21 + +* Remove trailing spaces from cFS app template (#108). + ## [1.0.11] - 2023-09-21 * Version bump 1.0.11 (#103). From 594b36f3612df8e8677c2b0691a6551738537d65 Mon Sep 17 00:00:00 2001 From: Ivan Perez Date: Tue, 21 Nov 2023 22:02:21 -0800 Subject: [PATCH 03/24] ogma-core: Replace all mentions of the Sample App. Refs #105. The cFS application produced by Ogma includes multiple mentions of the Sample App. This is because template used is based on cFS' Sample Application. Keeping those references there is misleading, since this is not the sample app, but a monitoring app. This commit replaces all mentions of the sample app to the Copilot app. --- ogma-core/src/Command/CFSApp.hs | 2 +- ogma-core/templates/copilot-cfs/CMakeLists.txt | 2 +- .../templates/copilot-cfs/fsw/mission_inc/copilot_cfs_perfids.h | 2 +- .../templates/copilot-cfs/fsw/platform_inc/copilot_cfs_msgids.h | 2 +- ogma-core/templates/copilot-cfs/fsw/src/copilot_cfs.c | 2 +- ogma-core/templates/copilot-cfs/fsw/src/copilot_cfs_version.h | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/ogma-core/src/Command/CFSApp.hs b/ogma-core/src/Command/CFSApp.hs index fc46302..26bdc8f 100644 --- a/ogma-core/src/Command/CFSApp.hs +++ b/ogma-core/src/Command/CFSApp.hs @@ -209,7 +209,7 @@ fileContents variables msgIds msgNames msgDatas = cfsFileContents , "** File: copilot_cfs.c" , "**" , "** Purpose:" - , "** This file contains the source code for the Sample App." + , "** This file contains the source code for the Copilot App." , "**" , "*********************************************************************/" , "" diff --git a/ogma-core/templates/copilot-cfs/CMakeLists.txt b/ogma-core/templates/copilot-cfs/CMakeLists.txt index 4b49d30..abc798d 100644 --- a/ogma-core/templates/copilot-cfs/CMakeLists.txt +++ b/ogma-core/templates/copilot-cfs/CMakeLists.txt @@ -1,5 +1,5 @@ cmake_minimum_required(VERSION 2.6.4) -project(CFE_SAMPLE_APP C) +project(CFE_COPILOT_APP C) include_directories(../../Modules/Core/Interfaces) include_directories(../Icarouslib/fsw/platform_inc) diff --git a/ogma-core/templates/copilot-cfs/fsw/mission_inc/copilot_cfs_perfids.h b/ogma-core/templates/copilot-cfs/fsw/mission_inc/copilot_cfs_perfids.h index 418c52a..c270f49 100644 --- a/ogma-core/templates/copilot-cfs/fsw/mission_inc/copilot_cfs_perfids.h +++ b/ogma-core/templates/copilot-cfs/fsw/mission_inc/copilot_cfs_perfids.h @@ -3,7 +3,7 @@ ** $Id: copilot_cfs_perfids.h $ ** ** Purpose: -** Define Sample App Performance IDs +** Define Copilot App Performance IDs ** ** Notes: ** diff --git a/ogma-core/templates/copilot-cfs/fsw/platform_inc/copilot_cfs_msgids.h b/ogma-core/templates/copilot-cfs/fsw/platform_inc/copilot_cfs_msgids.h index b3039aa..0095b69 100644 --- a/ogma-core/templates/copilot-cfs/fsw/platform_inc/copilot_cfs_msgids.h +++ b/ogma-core/templates/copilot-cfs/fsw/platform_inc/copilot_cfs_msgids.h @@ -3,7 +3,7 @@ ** $Id: copilot_cfs_msgids.h $ ** ** Purpose: -** Define Sample App Message IDs +** Define Copilot App Message IDs ** ** Notes: ** diff --git a/ogma-core/templates/copilot-cfs/fsw/src/copilot_cfs.c b/ogma-core/templates/copilot-cfs/fsw/src/copilot_cfs.c index 5608861..74917cf 100644 --- a/ogma-core/templates/copilot-cfs/fsw/src/copilot_cfs.c +++ b/ogma-core/templates/copilot-cfs/fsw/src/copilot_cfs.c @@ -2,7 +2,7 @@ ** File: copilot_cfs.c ** ** Purpose: -** This file contains the source code for the Sample App. +** This file contains the source code for the Copilot App. ** *******************************************************************************/ diff --git a/ogma-core/templates/copilot-cfs/fsw/src/copilot_cfs_version.h b/ogma-core/templates/copilot-cfs/fsw/src/copilot_cfs_version.h index 3d79d49..f1ce263 100644 --- a/ogma-core/templates/copilot-cfs/fsw/src/copilot_cfs_version.h +++ b/ogma-core/templates/copilot-cfs/fsw/src/copilot_cfs_version.h @@ -3,7 +3,7 @@ ** $Id: copilot_app_version.h $ ** ** Purpose: -** The Sample Application header file containing version number +** The Copilot Application header file containing version number ** ** Notes: ** From 96bc35da1452014de074ec13361048a9cb9d787f Mon Sep 17 00:00:00 2001 From: Ivan Perez Date: Tue, 21 Nov 2023 22:04:25 -0800 Subject: [PATCH 04/24] ogma-core: Document changes in CHANGELOG. Refs #105. --- ogma-core/CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/ogma-core/CHANGELOG.md b/ogma-core/CHANGELOG.md index 0528a59..8382bf1 100644 --- a/ogma-core/CHANGELOG.md +++ b/ogma-core/CHANGELOG.md @@ -3,6 +3,7 @@ ## [1.X.Y] - 2023-11-21 * Remove trailing spaces from cFS app template (#108). +* Replace all mentions of the Sample App (#105). ## [1.0.11] - 2023-09-21 From 795b96ba06a135e2a524ffaed7f273430527266f Mon Sep 17 00:00:00 2001 From: Ivan Perez Date: Tue, 21 Nov 2023 22:26:35 -0800 Subject: [PATCH 05/24] ogma-cli: Document cabal update step in README. Refs #100. The installation instructions in the README do not mention the cabal update step. This is confusing users unfamiliar with Haskell, since it's not obvious that cabal should have to be updated before installing Ogma. This commit adds an update step prior to installing any tools in the installation instructions in the README. We use the v1 variant of the command, for consistency with the rest of the instructions. --- ogma-cli/README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/ogma-cli/README.md b/ogma-cli/README.md index e006647..1c89919 100644 --- a/ogma-cli/README.md +++ b/ogma-cli/README.md @@ -86,6 +86,7 @@ Once GHC and cabal are installed, the simplest way to install Ogma is with: $ git clone https://github.com/nasa/ogma.git $ cd ogma $ export PATH="$HOME/.cabal/bin/:$PATH" +$ cabal v1-update $ cabal v1-install alex happy $ cabal v1-install BNFC copilot $ cabal v1-install ogma-*/ From 94a59586aaa46765fccc67d327485940154fa811 Mon Sep 17 00:00:00 2001 From: Ivan Perez Date: Tue, 21 Nov 2023 22:29:02 -0800 Subject: [PATCH 06/24] ogma-cli: Document changes in CHANGELOG. Refs #100. --- ogma-cli/CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/ogma-cli/CHANGELOG.md b/ogma-cli/CHANGELOG.md index 309612e..7a74610 100644 --- a/ogma-cli/CHANGELOG.md +++ b/ogma-cli/CHANGELOG.md @@ -1,5 +1,9 @@ # Revision history for ogma-cli +## [1.X.Y] - 2023-11-21 + +* Document cabal update step in README (#100). + ## [1.0.11] - 2023-09-21 * Version bump 1.0.11 (#103). From f491cb2c4a1ee2d0f91d42c63baf12f597b3bd56 Mon Sep 17 00:00:00 2001 From: Ivan Perez Date: Tue, 21 Nov 2023 23:07:56 -0800 Subject: [PATCH 07/24] ogma-extra: Version bump (1.1.0). Refs #112. --- ogma-extra/ogma-extra.cabal | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ogma-extra/ogma-extra.cabal b/ogma-extra/ogma-extra.cabal index 2dc173a..43e3880 100644 --- a/ogma-extra/ogma-extra.cabal +++ b/ogma-extra/ogma-extra.cabal @@ -32,7 +32,7 @@ cabal-version: 2.0 build-type: Simple name: ogma-extra -version: 1.0.11 +version: 1.1.0 homepage: http://nasa.gov license: OtherLicense license-file: LICENSE.pdf From 643aa2e7a4057a52de7b94a88883a3eff5034840 Mon Sep 17 00:00:00 2001 From: Ivan Perez Date: Tue, 21 Nov 2023 23:07:56 -0800 Subject: [PATCH 08/24] ogma-language-smv: Version bump (1.1.0). Refs #112. --- ogma-language-smv/ogma-language-smv.cabal | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ogma-language-smv/ogma-language-smv.cabal b/ogma-language-smv/ogma-language-smv.cabal index 4608fea..68ef21d 100644 --- a/ogma-language-smv/ogma-language-smv.cabal +++ b/ogma-language-smv/ogma-language-smv.cabal @@ -32,7 +32,7 @@ cabal-version: 2.0 build-type: Custom name: ogma-language-smv -version: 1.0.11 +version: 1.1.0 homepage: http://nasa.gov license: OtherLicense license-file: LICENSE.pdf From c4da22e4644c92c4d7f10f7fe5f75e157fdae56f Mon Sep 17 00:00:00 2001 From: Ivan Perez Date: Tue, 21 Nov 2023 23:07:56 -0800 Subject: [PATCH 09/24] ogma-language-fret-reqs: Version bump (1.1.0). Refs #112. --- ogma-language-fret-reqs/ogma-language-fret-reqs.cabal | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ogma-language-fret-reqs/ogma-language-fret-reqs.cabal b/ogma-language-fret-reqs/ogma-language-fret-reqs.cabal index 77dd9e1..4e5f1e5 100644 --- a/ogma-language-fret-reqs/ogma-language-fret-reqs.cabal +++ b/ogma-language-fret-reqs/ogma-language-fret-reqs.cabal @@ -32,7 +32,7 @@ cabal-version: 2.0 build-type: Simple name: ogma-language-fret-reqs -version: 1.0.11 +version: 1.1.0 homepage: http://nasa.gov license: OtherLicense license-file: LICENSE.pdf @@ -69,8 +69,8 @@ library , aeson >= 2.0.0.0 && < 2.2 , text - , ogma-language-cocospec >= 1.0.10 && < 1.1 - , ogma-language-smv >= 1.0.10 && < 1.1 + , ogma-language-cocospec >= 1.1.0 && < 1.2 + , ogma-language-smv >= 1.1.0 && < 1.2 hs-source-dirs: src @@ -96,7 +96,7 @@ test-suite unit-tests , test-framework , test-framework-quickcheck2 - , ogma-extra >= 1.0.10 && < 1.1 + , ogma-extra >= 1.1.0 && < 1.2 , ogma-language-fret-reqs hs-source-dirs: From d173558deb259b8996a453cf6b033e31d187ced4 Mon Sep 17 00:00:00 2001 From: Ivan Perez Date: Tue, 21 Nov 2023 23:07:56 -0800 Subject: [PATCH 10/24] ogma-language-fret-cs: Version bump (1.1.0). Refs #112. --- ogma-language-fret-cs/ogma-language-fret-cs.cabal | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ogma-language-fret-cs/ogma-language-fret-cs.cabal b/ogma-language-fret-cs/ogma-language-fret-cs.cabal index 779ca5f..ba2fd46 100644 --- a/ogma-language-fret-cs/ogma-language-fret-cs.cabal +++ b/ogma-language-fret-cs/ogma-language-fret-cs.cabal @@ -32,7 +32,7 @@ cabal-version: 2.0 build-type: Simple name: ogma-language-fret-cs -version: 1.0.11 +version: 1.1.0 homepage: http://nasa.gov license: OtherLicense license-file: LICENSE.pdf @@ -68,8 +68,8 @@ library base >= 4.11.0.0 && < 5 , aeson >= 2.0.0.0 && < 2.2 - , ogma-language-cocospec >= 1.0.10 && < 1.1 - , ogma-language-smv >= 1.0.10 && < 1.1 + , ogma-language-cocospec >= 1.1.0 && < 1.2 + , ogma-language-smv >= 1.1.0 && < 1.2 hs-source-dirs: src @@ -95,7 +95,7 @@ test-suite unit-tests , test-framework , test-framework-quickcheck2 - , ogma-extra >= 1.0.10 && < 1.1 + , ogma-extra >= 1.1.0 && < 1.2 , ogma-language-fret-cs hs-source-dirs: From 6d606263ff78488d4d36116293a70db9a4621085 Mon Sep 17 00:00:00 2001 From: Ivan Perez Date: Tue, 21 Nov 2023 23:07:56 -0800 Subject: [PATCH 11/24] ogma-language-copilot: Version bump (1.1.0). Refs #112. --- ogma-language-copilot/ogma-language-copilot.cabal | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ogma-language-copilot/ogma-language-copilot.cabal b/ogma-language-copilot/ogma-language-copilot.cabal index 9011a54..ea1eba5 100644 --- a/ogma-language-copilot/ogma-language-copilot.cabal +++ b/ogma-language-copilot/ogma-language-copilot.cabal @@ -32,7 +32,7 @@ cabal-version: 2.0 build-type: Simple name: ogma-language-copilot -version: 1.0.11 +version: 1.1.0 homepage: http://nasa.gov license: OtherLicense license-file: LICENSE.pdf From 4571233485a4d98c8317f7bbc3e93898dcfe68e5 Mon Sep 17 00:00:00 2001 From: Ivan Perez Date: Tue, 21 Nov 2023 23:07:56 -0800 Subject: [PATCH 12/24] ogma-language-cocospec: Version bump (1.1.0). Refs #112. --- ogma-language-cocospec/ogma-language-cocospec.cabal | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ogma-language-cocospec/ogma-language-cocospec.cabal b/ogma-language-cocospec/ogma-language-cocospec.cabal index e3c57cd..fa3b8ac 100644 --- a/ogma-language-cocospec/ogma-language-cocospec.cabal +++ b/ogma-language-cocospec/ogma-language-cocospec.cabal @@ -32,7 +32,7 @@ cabal-version: 2.0 build-type: Custom name: ogma-language-cocospec -version: 1.0.11 +version: 1.1.0 homepage: http://nasa.gov license: OtherLicense license-file: LICENSE.pdf From 08b60c2b2265f6266174c419d87fa6a76f42809e Mon Sep 17 00:00:00 2001 From: Ivan Perez Date: Tue, 21 Nov 2023 23:07:56 -0800 Subject: [PATCH 13/24] ogma-language-c: Version bump (1.1.0). Refs #112. --- ogma-language-c/ogma-language-c.cabal | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ogma-language-c/ogma-language-c.cabal b/ogma-language-c/ogma-language-c.cabal index 723aac4..2185536 100644 --- a/ogma-language-c/ogma-language-c.cabal +++ b/ogma-language-c/ogma-language-c.cabal @@ -32,7 +32,7 @@ cabal-version: 2.0 build-type: Custom name: ogma-language-c -version: 1.0.11 +version: 1.1.0 homepage: http://nasa.gov license: OtherLicense license-file: LICENSE.pdf From ac7318d34897b467d6c251f05830415c59d8d034 Mon Sep 17 00:00:00 2001 From: Ivan Perez Date: Tue, 21 Nov 2023 23:07:56 -0800 Subject: [PATCH 14/24] ogma-core: Version bump (1.1.0). Refs #112. --- ogma-core/ogma-core.cabal | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/ogma-core/ogma-core.cabal b/ogma-core/ogma-core.cabal index d62ef98..87c37bc 100644 --- a/ogma-core/ogma-core.cabal +++ b/ogma-core/ogma-core.cabal @@ -32,7 +32,7 @@ cabal-version: 2.0 build-type: Simple name: ogma-core -version: 1.0.11 +version: 1.1.0 homepage: http://nasa.gov license: OtherLicense license-file: LICENSE.pdf @@ -109,13 +109,13 @@ library , IfElse , mtl - , ogma-extra >= 1.0.11 && < 1.1 - , ogma-language-c >= 1.0.11 && < 1.1 - , ogma-language-cocospec >= 1.0.11 && < 1.1 - , ogma-language-copilot >= 1.0.11 && < 1.1 - , ogma-language-fret-cs >= 1.0.11 && < 1.1 - , ogma-language-fret-reqs >= 1.0.11 && < 1.1 - , ogma-language-smv >= 1.0.11 && < 1.1 + , ogma-extra >= 1.1.0 && < 1.2 + , ogma-language-c >= 1.1.0 && < 1.2 + , ogma-language-cocospec >= 1.1.0 && < 1.2 + , ogma-language-copilot >= 1.1.0 && < 1.2 + , ogma-language-fret-cs >= 1.1.0 && < 1.2 + , ogma-language-fret-reqs >= 1.1.0 && < 1.2 + , ogma-language-smv >= 1.1.0 && < 1.2 hs-source-dirs: src From 3728f36c208346837ae31f2ef588953b9d034c25 Mon Sep 17 00:00:00 2001 From: Ivan Perez Date: Tue, 21 Nov 2023 23:07:56 -0800 Subject: [PATCH 15/24] ogma-cli: Version bump (1.1.0). Refs #112. --- ogma-cli/ogma-cli.cabal | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ogma-cli/ogma-cli.cabal b/ogma-cli/ogma-cli.cabal index 0ba54f2..140ac61 100644 --- a/ogma-cli/ogma-cli.cabal +++ b/ogma-cli/ogma-cli.cabal @@ -32,7 +32,7 @@ cabal-version: 2.0 build-type: Simple name: ogma-cli -version: 1.0.11 +version: 1.1.0 homepage: http://nasa.gov license: OtherLicense license-file: LICENSE.pdf @@ -141,7 +141,7 @@ executable ogma build-depends: base >= 4.11.0.0 && < 5 , optparse-applicative - , ogma-core >= 1.0.11 && < 1.1 + , ogma-core >= 1.1.0 && < 1.2 hs-source-dirs: src From 65fb61bf9a10220ef57c9eee1a6726f22a63ce82 Mon Sep 17 00:00:00 2001 From: Ivan Perez Date: Tue, 21 Nov 2023 23:10:12 -0800 Subject: [PATCH 16/24] ogma-extra: Document changes in CHANGELOG. Refs #112. --- ogma-extra/CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/ogma-extra/CHANGELOG.md b/ogma-extra/CHANGELOG.md index 18f2530..c1f44fa 100644 --- a/ogma-extra/CHANGELOG.md +++ b/ogma-extra/CHANGELOG.md @@ -1,5 +1,9 @@ # Revision history for ogma-extra +## [1.1.0] - 2023-11-21 + +* Version bump 1.1.0 (#112). + ## [1.0.11] - 2023-09-21 * Version bump 1.0.11 (#103). From ab56916934a2c9773b16d1977dac2b32294dee58 Mon Sep 17 00:00:00 2001 From: Ivan Perez Date: Tue, 21 Nov 2023 23:10:12 -0800 Subject: [PATCH 17/24] ogma-language-smv: Document changes in CHANGELOG. Refs #112. --- ogma-language-smv/CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/ogma-language-smv/CHANGELOG.md b/ogma-language-smv/CHANGELOG.md index b0c6d45..dc888eb 100644 --- a/ogma-language-smv/CHANGELOG.md +++ b/ogma-language-smv/CHANGELOG.md @@ -1,5 +1,9 @@ # Revision history for ogma-language-smv +## [1.1.0] - 2023-11-21 + +* Version bump 1.1.0 (#112). + ## [1.0.11] - 2023-09-21 * Version bump 1.0.11 (#103). From ee0ad9a13f0cf901cb81d7aa8b582d330ca68b3a Mon Sep 17 00:00:00 2001 From: Ivan Perez Date: Tue, 21 Nov 2023 23:10:12 -0800 Subject: [PATCH 18/24] ogma-language-fret-reqs: Document changes in CHANGELOG. Refs #112. --- ogma-language-fret-reqs/CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/ogma-language-fret-reqs/CHANGELOG.md b/ogma-language-fret-reqs/CHANGELOG.md index 11b0dd8..31ca4fd 100644 --- a/ogma-language-fret-reqs/CHANGELOG.md +++ b/ogma-language-fret-reqs/CHANGELOG.md @@ -1,5 +1,9 @@ # Revision history for ogma-language-fret-reqs +## [1.1.0] - 2023-11-21 + +* Version bump 1.1.0 (#112). + ## [1.0.11] - 2023-09-21 * Version bump 1.0.11 (#103). From aa83b8b840967edc0ab073b9a3e09860a80b9887 Mon Sep 17 00:00:00 2001 From: Ivan Perez Date: Tue, 21 Nov 2023 23:10:12 -0800 Subject: [PATCH 19/24] ogma-language-fret-cs: Document changes in CHANGELOG. Refs #112. --- ogma-language-fret-cs/CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/ogma-language-fret-cs/CHANGELOG.md b/ogma-language-fret-cs/CHANGELOG.md index b19d00e..38a32f2 100644 --- a/ogma-language-fret-cs/CHANGELOG.md +++ b/ogma-language-fret-cs/CHANGELOG.md @@ -1,5 +1,9 @@ # Revision history for ogma-language-fret-cs +## [1.1.0] - 2023-11-21 + +* Version bump 1.1.0 (#112). + ## [1.0.11] - 2023-09-21 * Version bump 1.0.11 (#103). From 5f2e20503960514145fd3ae9a77d9489c9c2d7c7 Mon Sep 17 00:00:00 2001 From: Ivan Perez Date: Tue, 21 Nov 2023 23:10:12 -0800 Subject: [PATCH 20/24] ogma-language-copilot: Document changes in CHANGELOG. Refs #112. --- ogma-language-copilot/CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/ogma-language-copilot/CHANGELOG.md b/ogma-language-copilot/CHANGELOG.md index 46f0553..bfb6a6a 100644 --- a/ogma-language-copilot/CHANGELOG.md +++ b/ogma-language-copilot/CHANGELOG.md @@ -1,5 +1,9 @@ # Revision history for ogma-language-copilot +## [1.1.0] - 2023-11-21 + +* Version bump 1.1.0 (#112). + ## [1.0.11] - 2023-09-21 * Version bump 1.0.11 (#103). From 04c8f8ba020b6d6a8d1aab35b038684a232ef01c Mon Sep 17 00:00:00 2001 From: Ivan Perez Date: Tue, 21 Nov 2023 23:10:12 -0800 Subject: [PATCH 21/24] ogma-language-cocospec: Document changes in CHANGELOG. Refs #112. --- ogma-language-cocospec/CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/ogma-language-cocospec/CHANGELOG.md b/ogma-language-cocospec/CHANGELOG.md index 76ad2f0..f94d8f9 100644 --- a/ogma-language-cocospec/CHANGELOG.md +++ b/ogma-language-cocospec/CHANGELOG.md @@ -1,5 +1,9 @@ # Revision history for ogma-language-cocospec +## [1.1.0] - 2023-11-21 + +* Version bump 1.1.0 (#112). + ## [1.0.11] - 2023-09-21 * Version bump 1.0.11 (#103). From 10b49d9070abfd502569bf22b27092b94e27b9f7 Mon Sep 17 00:00:00 2001 From: Ivan Perez Date: Tue, 21 Nov 2023 23:10:12 -0800 Subject: [PATCH 22/24] ogma-language-c: Document changes in CHANGELOG. Refs #112. --- ogma-language-c/CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/ogma-language-c/CHANGELOG.md b/ogma-language-c/CHANGELOG.md index b5626d9..d08b0f8 100644 --- a/ogma-language-c/CHANGELOG.md +++ b/ogma-language-c/CHANGELOG.md @@ -1,5 +1,9 @@ # Revision history for ogma-language-c +## [1.1.0] - 2023-11-21 + +* Version bump 1.1.0 (#112). + ## [1.0.11] - 2023-09-21 * Version bump 1.0.11 (#103). From 1b9a1d147382d286e8eb5f8685d05539e934888e Mon Sep 17 00:00:00 2001 From: Ivan Perez Date: Tue, 21 Nov 2023 23:10:12 -0800 Subject: [PATCH 23/24] ogma-core: Document changes in CHANGELOG. Refs #112. --- ogma-core/CHANGELOG.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ogma-core/CHANGELOG.md b/ogma-core/CHANGELOG.md index 8382bf1..f7ec75f 100644 --- a/ogma-core/CHANGELOG.md +++ b/ogma-core/CHANGELOG.md @@ -1,7 +1,8 @@ # Revision history for ogma-core -## [1.X.Y] - 2023-11-21 +## [1.1.0] - 2023-11-21 +* Version bump 1.1.0 (#112). * Remove trailing spaces from cFS app template (#108). * Replace all mentions of the Sample App (#105). From 91ba18c383856d655272acb5720fda28eef0653c Mon Sep 17 00:00:00 2001 From: Ivan Perez Date: Tue, 21 Nov 2023 23:10:12 -0800 Subject: [PATCH 24/24] ogma-cli: Document changes in CHANGELOG. Refs #112. --- ogma-cli/CHANGELOG.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ogma-cli/CHANGELOG.md b/ogma-cli/CHANGELOG.md index 7a74610..cc5b594 100644 --- a/ogma-cli/CHANGELOG.md +++ b/ogma-cli/CHANGELOG.md @@ -1,7 +1,8 @@ # Revision history for ogma-cli -## [1.X.Y] - 2023-11-21 +## [1.1.0] - 2023-11-21 +* Version bump 1.1.0 (#112). * Document cabal update step in README (#100). ## [1.0.11] - 2023-09-21