From 3392e2e678be32255992cd1dc0b7b0b9032dd7d0 Mon Sep 17 00:00:00 2001
From: zlynch2 <zachary.j.lynch@nasa.gov>
Date: Mon, 30 Sep 2024 14:39:40 +0000
Subject: [PATCH] [nasa/nos3#84] Sample runnning, build with docker container,
 switch between fprime and cosmos/cfs

---
 Makefile                           | 1 -
 cfg/nos3-mission.xml               | 3 +++
 cfg/nos3_defs/targets.cmake        | 5 +++++
 components/ComponentSettings.cmake | 0
 4 files changed, 8 insertions(+), 1 deletion(-)
 mode change 100644 => 100755 Makefile
 mode change 100644 => 100755 components/ComponentSettings.cmake

diff --git a/Makefile b/Makefile
old mode 100644
new mode 100755
index 5074c1a6..f0729a8f
--- a/Makefile
+++ b/Makefile
@@ -107,7 +107,6 @@ fprime:
 
 fsw: 
 	./scripts/docker_build_fsw.sh
-	# ./cfg/build/fsw_build.sh
 
 gsw:
 	./scripts/docker_build_cryptolib.sh
diff --git a/cfg/nos3-mission.xml b/cfg/nos3-mission.xml
index 8d1abbe6..ff73150f 100644
--- a/cfg/nos3-mission.xml
+++ b/cfg/nos3-mission.xml
@@ -1,8 +1,11 @@
 <nos3-mission-cfg>
     <start-time>814048200.0</start-time>
+    <!-- <gsw>cosmos</gsw>
+    <fsw>cfs</fsw> -->
     <gsw>fprime</gsw>
     <fsw>fprime</fsw>
     <number-spacecraft>1</number-spacecraft>
+    <!-- <sc-1-cfg>sc-full-config.xml</sc-1-cfg> -->
     <sc-1-cfg>sc-minimal-config.xml</sc-1-cfg>
     <!--
     <sc-2-cfg>sc-minimal-config.xml</sc-2-cfg>
diff --git a/cfg/nos3_defs/targets.cmake b/cfg/nos3_defs/targets.cmake
index ea878be0..7551e72f 100644
--- a/cfg/nos3_defs/targets.cmake
+++ b/cfg/nos3_defs/targets.cmake
@@ -123,18 +123,23 @@ list(APPEND MISSION_GLOBAL_APPLIST
 FOREACH(X ${MISSION_GLOBAL_APPLIST})
     LIST(APPEND APPLICATION_PLATFORM_INC_LIST ${${X}_MISSION_DIR}/mission_inc)
     LIST(APPEND APPLICATION_PLATFORM_INC_LIST ${${X}_MISSION_DIR}/fsw/cfs/mission_inc)
+    LIST(APPEND APPLICATION_PLATFORM_INC_LIST ${${X}_MISSION_DIR}/fsw/mission_inc)
 
     LIST(APPEND APPLICATION_PLATFORM_INC_LIST ${${X}_MISSION_DIR}/inc)
     LIST(APPEND APPLICATION_PLATFORM_INC_LIST ${${X}_MISSION_DIR}/fsw/cfs/inc)
+    LIST(APPEND APPLICATION_PLATFORM_INC_LIST ${${X}_MISSION_DIR}/fsw/inc)
 
     LIST(APPEND APPLICATION_PLATFORM_INC_LIST ${${X}_MISSION_DIR}/platform_inc)
     LIST(APPEND APPLICATION_PLATFORM_INC_LIST ${${X}_MISSION_DIR}/fsw/cfs/platform_inc)
+    LIST(APPEND APPLICATION_PLATFORM_INC_LIST ${${X}_MISSION_DIR}/fsw/platform_inc)
 
     LIST(APPEND APPLICATION_PLATFORM_INC_LIST ${${X}_MISSION_DIR}/public_inc)
     LIST(APPEND APPLICATION_PLATFORM_INC_LIST ${${X}_MISSION_DIR}/fsw/cfs/public_inc)
+    LIST(APPEND APPLICATION_PLATFORM_INC_LIST ${${X}_MISSION_DIR}/fsw/public_inc)
 
     LIST(APPEND APPLICATION_PLATFORM_INC_LIST ${${X}_MISSION_DIR}/src)
     LIST(APPEND APPLICATION_PLATFORM_INC_LIST ${${X}_MISSION_DIR}/fsw/cfs/src)
+    LIST(APPEND APPLICATION_PLATFORM_INC_LIST ${${X}_MISSION_DIR}/fsw/src)
 ENDFOREACH(X)
 
 # FT_INSTALL_SUBDIR indicates where the black box test data files (lua scripts) should
diff --git a/components/ComponentSettings.cmake b/components/ComponentSettings.cmake
old mode 100644
new mode 100755