Skip to content

Commit

Permalink
Merge pull request #40 from nasa/rc-1.05.00
Browse files Browse the repository at this point in the history
RC 1.05.00
  • Loading branch information
mgrubb-gsfc committed Jul 11, 2020
2 parents 55b3a52 + c948caa commit c668bfa
Show file tree
Hide file tree
Showing 5,821 changed files with 8,610 additions and 1,671,150 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
105 changes: 105 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -0,0 +1,105 @@
[submodule "deployment"]
path = deployment
url = https://github.com/nasa-itc/deployment.git
[submodule "fsw/apps/ci"]
path = fsw/apps/ci
url = https://github.com/nasa-itc/CFS_CI.git
[submodule "fsw/apps/to"]
path = fsw/apps/to
url = https://github.com/nasa-itc/CFS_TO.git
[submodule "fsw/apps/io_lib"]
path = fsw/apps/io_lib
url = https://github.com/nasa-itc/CFS_IO_LIB.git
[submodule "fsw/cfe"]
path = fsw/cfe
url = https://github.com/nasa-itc/cFE.git
[submodule "fsw/osal"]
path = fsw/osal
url = https://github.com/nasa-itc/osal.git
[submodule "fsw/psp"]
path = fsw/psp
url = https://github.com/nasa-itc/PSP.git
[submodule "fsw/tools/cFS-GroundSystem"]
path = fsw/tools/cFS-GroundSystem
url = https://github.com/nasa-itc/cFS-GroundSystem.git
[submodule "fsw/tools/elf2cfetbl"]
path = fsw/tools/elf2cfetbl
url = https://github.com/nasa-itc/elf2cfetbl.git
[submodule "fsw/apps/sch"]
path = fsw/apps/sch
url = https://github.com/nasa-itc/SCH.git
[submodule "fsw/apps/sc"]
path = fsw/apps/sc
url = https://github.com/nasa-itc/SC.git
[submodule "fsw/apps/cf"]
path = fsw/apps/cf
url = https://github.com/nasa-itc/CF.git
[submodule "fsw/apps/hk"]
path = fsw/apps/hk
url = https://github.com/nasa-itc/HK.git
[submodule "fsw/apps/cfs_lib"]
path = fsw/apps/cfs_lib
url = https://github.com/nasa-itc/cfs_lib.git
[submodule "fsw/apps/lc"]
path = fsw/apps/lc
url = https://github.com/nasa-itc/LC.git
[submodule "fsw/components/hwlib"]
path = fsw/components/hwlib
url = https://github.com/nasa-itc/hwlib.git
[submodule "fsw/apps/hs"]
path = fsw/apps/hs
url = https://github.com/nasa-itc/HS.git
[submodule "fsw/components/arducam"]
path = fsw/components/arducam
url = https://github.com/nasa-itc/arducam.git
[submodule "fsw/components/clyde_eps"]
path = fsw/components/clyde_eps
url = https://github.com/nasa-itc/clyde_eps.git
[submodule "fsw/components/novatel_oem615"]
path = fsw/components/novatel_oem615
url = https://github.com/nasa-itc/novatel_oem615.git
[submodule "sims/clyde_battery_sim"]
path = sims/clyde_battery_sim
url = https://github.com/nasa-itc/clyde_battery_sim.git
[submodule "sims/arducam_sim"]
path = sims/arducam_sim
url = https://github.com/nasa-itc/arducam_sim.git
[submodule "sims/clyde_eps_sim"]
path = sims/clyde_eps_sim
url = https://github.com/nasa-itc/clyde_eps_sim.git
[submodule "sims/nos_time_driver"]
path = sims/nos_time_driver
url = https://github.com/nasa-itc/nos_time_driver.git
[submodule "sims/novatel_oem615_sim"]
path = sims/novatel_oem615_sim
url = https://github.com/nasa-itc/novatel_oem615_sim.git
[submodule "sims/sim_common"]
path = sims/sim_common
url = https://github.com/nasa-itc/sim_common.git
[submodule "sims/sim_server"]
path = sims/sim_server
url = https://github.com/nasa-itc/sim_server.git
[submodule "sims/sim_terminal"]
path = sims/sim_terminal
url = https://github.com/nasa-itc/sim_terminal.git
[submodule "gsw/ait"]
path = gsw/ait
url = https://github.com/nasa-itc/gsw-ait.git
[submodule "gsw/OrbitInviewPowerPrediction"]
path = gsw/OrbitInviewPowerPrediction
url = https://github.com/nasa-itc/OrbitInviewPowerPrediction.git
[submodule "gsw/cosmos"]
path = gsw/cosmos
url = https://github.com/nasa-itc/gsw-cosmos.git
[submodule "fsw/components/generic_reaction_wheel"]
path = fsw/components/generic_reaction_wheel
url = https://github.com/nasa-itc/generic_reaction_wheel.git
[submodule "sims/generic_reaction_wheel_sim"]
path = sims/generic_reaction_wheel_sim
url = https://github.com/nasa-itc/generic_reaction_wheel_sim.git
[submodule "fsw/components/sample"]
path = fsw/components/sample
url = https://github.com/nasa-itc/sample_app.git
[submodule "sims/sample_sim"]
path = sims/sample_sim
url = https://github.com/nasa-itc/sample_sim.git
54 changes: 0 additions & 54 deletions CMakeLists.txt

This file was deleted.

86 changes: 86 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,86 @@
#
# Top Level Mission Makefile
#
BUILDTYPE ?= debug
INSTALLPREFIX ?= exe
FSWBUILDDIR ?= $(CURDIR)/fsw/build
SIMBUILDDIR ?= $(CURDIR)/sims/build

export CFS_APP_PATH = components

# The "prep" step requires extra options that are specified via enviroment variables.
# Certain special ones should be passed via cache (-D) options to CMake.
# These are only needed for the "prep" target but they are computed globally anyway.
PREP_OPTS :=

ifneq ($(INSTALLPREFIX),)
PREP_OPTS += -DCMAKE_INSTALL_PREFIX=$(INSTALLPREFIX)
endif

ifneq ($(VERBOSE),)
PREP_OPTS += --trace
endif

ifneq ($(BUILDTYPE),)
PREP_OPTS += -DCMAKE_BUILD_TYPE=$(BUILDTYPE)
endif

# The "LOCALTGTS" defines the top-level targets that are implemented in this makefile
# Any other target may also be given, in that case it will simply be passed through.
LOCALTGTS := all fsw fsw-prep sim sim-prep clean clean-fsw clean-sim launch stop
OTHERTGTS := $(filter-out $(LOCALTGTS),$(MAKECMDGOALS))

# As this makefile does not build any real files, treat everything as a PHONY target
# This ensures that the rule gets executed even if a file by that name does exist
.PHONY: $(LOCALTGTS) $(OTHERTGTS)

#
# Generic Commands
#
all:
$(MAKE) fsw
$(MAKE) sim

#
# FSW
#
fsw:
$(MAKE) fsw-prep
$(MAKE) --no-print-directory -C $(FSWBUILDDIR) mission-install

fsw-prep:
mkdir -p $(FSWBUILDDIR)
cd $(FSWBUILDDIR) && cmake $(PREP_OPTS) ../cfe

#
# Sims
#
sim:
$(MAKE) sim-prep
$(MAKE) --no-print-directory -C $(SIMBUILDDIR) install

sim-prep:
mkdir -p $(SIMBUILDDIR)
cd $(SIMBUILDDIR) && cmake -DCMAKE_INSTALL_PREFIX=$(SIMBUILDDIR) ..

#
# Clean
#
clean:
$(MAKE) clean-fsw
$(MAKE) clean-sim

clean-fsw:
rm -rf fsw/build

clean-sim:
rm -rf sims/build

#
# Script Calls
#
launch:
./gsw/scripts/launch.sh

stop:
./gsw/scripts/stop.sh
Loading

0 comments on commit c668bfa

Please sign in to comment.