Merge remote-tracking branch 'origin/rc-6.6.0a'

CMakeLists.txt

@@ -0,0 +1,103 @@
+##########################################################################
+#
+# Core Flight Software Mission top-level CMake build script
+# This will build cFS for all target machine(s) defined by the mission
+#
+# Note that the target CPUs may use different architectures, therefore each
+# architecture must be done as a separate sub-build since none of the binaries 
+# can be shared.
+#
+# This is actually two build scripts in one:
+#   - A "top-level" script which divides the overall build by architecture
+#       (This is run when TARGETSYSTEM is unset)
+#   - An architecture-specific build that generates the binaries 
+#       (This is run when TARGETSYSTEM is set)
+#
+# This file implements the common operation sequence between the mission build
+# and the architecture-specific sub build.  It relies on several functions 
+# that are implemented in a separate include files:
+# 
+# initialize_globals: 
+#   This function sets up the basic global variables such as MISSION_SOURCE_DIR, 
+#   MISSIONCONFIG, ENABLE_UNIT_TESTS, SIMULATION and others.  These are the 
+#   basic variables that must exist _before_ the mission configuration is read. 
+# 
+# read_targetconfig: 
+#   Parse the information from targets.cmake and create the build lists.  Note
+#   this function is common to both mission and arch-specific builds. 
+# 
+# prepare:
+#   Use the information in the target config to set up additional variables
+#   and satisfy any preequisites for targets.  Most importantly this stage
+#   is reposible for finding the actual location of all source files for apps
+#   listed in the mission configuration, along with collecting any supplemental
+#   sources, such as EDS files or additional compiler flags. 
+#   
+# process_arch:
+#   This is called multiple times, once for each CPU architecture specfied in
+#   the main targets.cmake file.  At the mission level, this creates a sub
+#   project target using the correct toolchain for cross compile.  In the arch
+#   specific level (inside the sub-project) it generates the actual library and
+#   executable targets.
+#
+# 
+##########################################################################
+
+# Squelch a warning when building on Win32/Cygwin
+set(CMAKE_LEGACY_CYGWIN_WIN32 0)
+
+# The minimum CMake version is chosen because 2.6.4 is what is
+# included by default with RHEL/Centos 5.x
+cmake_minimum_required(VERSION 2.6.4)
+
+# This top-level file does not define ANY targets directly but we know
+# that the subdirectories will at least use the "C" language, so
+# indicate that now.  Doing this early initializes the CFLAGS
+# so they won't change later.
+project(CFETOP C)
+
+# Allow unit tests to be added by any recipe
+enable_testing()
+
+# Include the global routines
+include("cmake/global_functions.cmake")
+
+# Load a sub-script that defines the other functions, 
+# depending on whether TARGETSYSTEM is defined or not
+if (TARGETSYSTEM)
+    # Arch-specific/CPU build mode -- use the "arch_build" implementation
+    include("cmake/arch_build.cmake")
+else (TARGETSYSTEM)
+    # Host System/Top Level build mode -- use the "mission_build" implementation
+    include("cmake/mission_build.cmake")
+endif (TARGETSYSTEM)
+
+# Call the initialization function defined by the sub-script
+# This is implemented differently depending on whether this is a 
+# top-level or arch-specific build
+initialize_globals()
+
+# Load the target configuration information (used by all builds)
+# This is at the top level so all vars set in here will become globals.
+include(${MISSION_DEFS}/targets.cmake)
+
+# Scan the list of targets and organize by target system type.
+read_targetconfig()
+
+# Define preprocessor directive(s) which can be used to 
+# gate conditionally compiled code when using these CMake scripts.  
+# Macro defined here at the topmost level will be defined in all targets 
+# on all processors. These macros can preserve compatibility with the old makefiles 
+# such that the code can still be built using the old method without the new features.
+add_definitions("-D_ENHANCED_BUILD_")
+
+# Call the prepare function defined by the sub-script
+# This is implemented differently depending on whether this is a 
+# top-level or arch-specific build
+prepare()
+
+# Call the process_arch macro for each architecture
+foreach(SYSVAR ${TGTSYS_LIST})
+  process_arch(${SYSVAR})
+endforeach(SYSVAR IN LISTS TGTSYS_LIST)
+

README.md

@@ -1,44 +1,21 @@
-# cFE
+# Core Flight System : Framework : Core Flight Executive
 
-This repository contains the code for cFE, NASA's core Flight Executive. It also contains a number of submodules including OSAL, example "lab" applications, and mission ready applications. Together, these repositories constitute the core Flight System (cFS). Please note that this configuration has not been verified as an operational system.
+This repository contains NASA's Core Flight Executive (cFE), which is a framework component of the Core Flight System.
 
-The official releases are tagged and assigned a version number. Applications (in the `apps` directory) that have the `_lab` postfix or `sample_` prefix are not intended to be used for flight.
+This is a collection of services and associated framework to be located in the `cfe` subdirectory of a cFS Mission Tree.  The Core Flight System is bundled at https://github.com/nasa/cFS, which includes build and execution instructions.
 
-## Intent
+## Release Notes
 
-This repository is intend to:
-* help foster a larger community of cFS users
-* allow easier distribution of cFS
-* provide a way for users to submit issues for suspected bugs
+cFE 6.6.0a is released under the Apache 2.0 license, see [LICENSE](LICENSE-18128-Apache-2_0.pdf).
 
-Active development of cFS is not performed with this repository. We are working on ways to improve communication between public users and developers (for now use GitHub's issue tracker here). We are also looking into ways to better keep the public abreast of cFS development.
+Additional release notes are found in [release notes](docs/cFE_release_notes.md).  See the [version description document](docs/cFE_6_6_0_version_description.pdf) for the full version description document.  Test results can be found in [test results](test-and-ground/test-review-packages/Results).  This is a point release from major development work currently being performed on an internal repository.
 
-## Getting Help
-
-The cFS community page ([http://coreflightsystem.org](http://coreflightsystem.org)) should be your first stop for getting help. Please post questions to the [Q&A section](http://coreflightsystem.org/questions/). There is also a [forum](http://coreflightsystem.org/forums/) for more general discussions.
-
-Official cFS page: [http://cfs.gsfc.nasa.gov](http://cfs.gsfc.nasa.gov)
-
-## Setup
+## Known issues
 
-We suggest that users fork the repositories included here and modify as needed for their specific missions.
+Version description document contains references to internal repositories and sourceforge, which is no longer in use.  Markdown document formats have not been updated for GitHub.
 
-To setup cFS directly from the latest release:
-
-    git clone https://github.com/nasa/cFE.git
-    cd cFE
-    git submodule init
-    git submodule update
-
-## Build and Run
-
-The latest release include sample applications and an example build target that uses the pc-linux platform support package (should run on most Linux distributions).
+## Getting Help
 
-To compile and run:
+For best results, submit issues:questions or issues:help wanted requests at https://github.com/nasa/cFS.
 
-    . ./setvars
-    cd build/cpu1
-    make config
-    make
-    cd exe
-    sudo ./core-linux.bin
+Official cFS page: http://cfs.gsfc.nasa.gov