Bulk update for 2.6.0 release candidate 1, see VDD for change summary

CMakeLists.txt

@@ -1,9 +1,19 @@
-cmake_minimum_required(VERSION 2.6.4)
+cmake_minimum_required(VERSION 1.6.4)
 project(CFS_FM C)
 
 include_directories(fsw/mission_inc)
 include_directories(fsw/platform_inc)
 include_directories(${cfs_lib_MISSION_DIR}/fsw/public_inc)
+#include_directories(${fs_lib_MISSION_DIR}/fsw/public_inc)
+#include_directories(${fs_lib_MISSION_DIR}/fsw/src)
+include_directories(${cfs_lib_MISSION_DIR}/fsw/src)
+
+message(STATUS "cfs_lib loc: ${cfs_lib_MISSION_DIR}")
+#message(STATUS "fs_lib loc : ${fs_lib_MISSION_DIR}")
+
+# Uncomment the below include if decompress functionality is 
+# enabled in FM
+# include_directories(${fs_lib_MISSION_DIR}/fsw/public_inc)
 
 aux_source_directory(fsw/src APP_SRC_FILES)
 
@@ -13,3 +23,6 @@ add_cfe_app(fm ${APP_SRC_FILES})
 include_directories(fsw/src)
 aux_source_directory(fsw/tables APP_TABLE_FILES)
 add_cfe_tables(fm ${APP_TABLE_FILES})
+if (ENABLE_UNIT_TESTS)
+  add_subdirectory(unit-test)
+endif (ENABLE_UNIT_TESTS)

README.md

@@ -1,61 +1,57 @@
-core Flight System (cFS) File Manager Application (FM) 
-======================================================
-
-Open Source Release Readme
-==========================
-
-FM Release 2.5.3
-
-Date: 
-3/19/2020
-
-Introduction
----------------
-
-  The File Manager application (FM) is a core Flight System (cFS) application 
-  that is a plug-in to the Core Flight Executive (cFE) component of the cFS.  
-
-  The FM application provides onboard file system management services by 
-  processing ground commands for copying, moving, and renaming files, 
-  decompressing files, creating directories, deleting files and directories, 
-  providing file and directory informational telemetry messages, and providing 
-  open file and directory listings.
-
-  The FM application is written in C and depends on the cFS Operating System 
-  Abstraction Layer (OSAL) and cFE components. There is additional FM application 
-  specific configuration information contained in the application user's guide
-  available in https://github.com/nasa/FM/tree/master/docs/users_guide
-
-  This software is licensed under the NASA Open Source Agreement. 
-  http://ti.arc.nasa.gov/opensource/nosa
-
-
-Software Included
---------------------
-
-  File Manager application (FM) 2.5.3
-
-
-Software Required
---------------------
-
-  Operating System Abstraction Layer 5.0 or higher can be 
-  obtained at https://github.com/nasa/osal
-
-  core Flight Executive 6.7.0 or higher can be obtained at
-  https://github.com/nasa/cfe
-
-  Note: An integrated bundle including the cFE, OSAL, and PSP can 
-  be obtained at https://github.com/nasa/cfs
-
-About cFS
-------------
-
-  The cFS is a platform and project independent reusable software framework and
-  set of reusable applications developed by NASA Goddard Space Flight Center.  
-  This framework is used as the basis for the flight software for satellite data 
-  systems and instruments, but can be used on other embedded systems.  More 
-  information on the cFS can be found at http://cfs.gsfc.nasa.gov
-
-                      
-EOF                       
+core Flight System (cFS) File Manager Application (FM) 
+======================================================
+
+Open Source Release Readme
+==========================
+
+FM Release Candidate 2.6.0
+
+Date: 9/8/2021
+
+Introduction
+---------------
+
+  The File Manager application (FM) is a core Flight System (cFS) application 
+  that is a plug-in to the Core Flight Executive (cFE) component of the cFS.  
+
+  The FM application provides onboard file system management services by 
+  processing ground commands for copying, moving, and renaming files, 
+  decompressing files, creating directories, deleting files and directories, 
+  providing file and directory informational telemetry messages, and providing 
+  open file and directory listings.
+
+  The FM application is written in C and depends on the cFS Operating System 
+  Abstraction Layer (OSAL) and cFE components. There is additional FM application 
+  specific configuration information contained in the application user's guide.
+
+  Developer's guide information can be generated using Doxygen:
+  doxygen fm_doxygen_config.txt
+
+  This software is licensed under the Apache 2.0 license.
+
+
+Software Included
+--------------------
+
+  File Manager application (FM) 2.6.0
+
+
+Software Required
+--------------------
+
+  cFS Caelum
+
+  Note: An integrated bundle including the cFE, OSAL, and PSP can 
+  be obtained at https://github.com/nasa/cfs
+
+About cFS
+------------
+
+  The cFS is a platform and project independent reusable software framework and
+  set of reusable applications developed by NASA Goddard Space Flight Center.  
+  This framework is used as the basis for the flight software for satellite data 
+  systems and instruments, but can be used on other embedded systems.  More 
+  information on the cFS can be found at http://cfs.gsfc.nasa.gov
+
+                      
+EOF                       

docs/dox_src/users_guide/cfs_fm.dox

@@ -1,5 +1,5 @@
 /**
-  \mainpage CFS File Manager (FM) User's Guide
+    \mainpage CFS File Manager (FM) User's Guide    
 
        <UL>
            <LI> \subpage cfsfmrevhist
@@ -18,6 +18,7 @@
        </UL>
 **/
 
+
 /**
   \page cfsfmrevhist CFS File Manager User's Guide Revision History