ExternalVendorCode/trick
1
0
Fork 0
mirror of https://github.com/nasa/trick.git synced 2025-04-06 19:06:46 +00:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Updated tests to use trickify s overrides

Browse Source
This commit is contained in:
plherrin 2025-04-02 09:32:04 -05:00
parent 9f8f0575c9
commit 7d9c125c58
6 changed files with 7 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
test/SIM_trickified_archive/S_overrides.mk
View File

@ -1,4 +1,6 @@
LOCAL_DIR := $(abspath $(dir $(lastword $(MAKEFILE_LIST))))
include trickified_project/trickified/S_overrides_trickify.mk
TRICK_CXXFLAGS += -I$(LOCAL_DIR)/models
include $(CURDIR)/trickified_project/trickified/myproject.mk

13
test/SIM_trickified_archive/trickified_project/trickified/myproject_vars.mk
View File

@ -13,16 +13,3 @@ TRICK_CXXFLAGS += $(MYPROJECT_INCLUDE) $(MYPROJECT_SOURCE)
export TRICKIFY_OBJECT_NAME := trickified_myproject.a
MYPROJECT_TRICK := $(MYPROJECT_HOME)/trickified/$(TRICKIFY_OBJECT_NAME)
# Tell Trick the headers and source at this location are part of a
# Trickified project
TRICK_EXT_LIB_DIRS += :$(MYPROJECT_HOME)
# Tell Trick where to find the Python modules generated by SWIG
TRICK_PYTHON_PATH += :$(MYPROJECT_HOME)/trickified/python
# Tell SWIG where to find py_*.i files
TRICK_SWIG_FLAGS += -I$(MYPROJECT_HOME)/trickified
# Link in the Trickified object
TRICK_LDFLAGS += $(MYPROJECT_TRICK)

2
test/SIM_trickified_object/S_overrides.mk
View File

@ -1,4 +1,6 @@
LOCAL_DIR := $(abspath $(dir $(lastword $(MAKEFILE_LIST))))
include trickified_project/trickified/S_overrides_trickify.mk
TRICK_CXXFLAGS += -I$(LOCAL_DIR)/models
include $(CURDIR)/trickified_project/trickified/myproject.mk

13
test/SIM_trickified_object/trickified_project/trickified/myproject_vars.mk
View File

@ -13,16 +13,3 @@ TRICK_CXXFLAGS += $(MYPROJECT_INCLUDE) $(MYPROJECT_SOURCE)
export TRICKIFY_OBJECT_NAME := trickified_myproject.o
MYPROJECT_TRICK := $(MYPROJECT_HOME)/trickified/$(TRICKIFY_OBJECT_NAME)
# Tell Trick the headers and source at this location are part of a
# Trickified project
TRICK_EXT_LIB_DIRS += :$(MYPROJECT_HOME)
# Tell Trick where to find the Python modules generated by SWIG
TRICK_PYTHON_PATH += :$(MYPROJECT_HOME)/trickified/python
# Tell SWIG where to find py_*.i files
TRICK_SWIG_FLAGS += -I$(MYPROJECT_HOME)/trickified
# Link in the Trickified object
TRICK_LDFLAGS += $(MYPROJECT_TRICK)

2
test/SIM_trickified_shared/S_overrides.mk
View File

@ -1,4 +1,6 @@
LOCAL_DIR := $(abspath $(dir $(lastword $(MAKEFILE_LIST))))
include trickified_project/trickified/S_overrides_trickify.mk
TRICK_CXXFLAGS += -I$(LOCAL_DIR)/models
include $(CURDIR)/trickified_project/trickified/myproject.mk

15
test/SIM_trickified_shared/trickified_project/trickified/myproject_vars.mk
View File

@ -21,18 +21,5 @@ export TRICKIFY_OBJECT_NAME := trickified_myproject.$(BUILD_TYPE)
MYPROJECT_TRICK := $(MYPROJECT_HOME)/trickified/$(TRICKIFY_OBJECT_NAME)
# Tell Trick the headers and source at this location are part of a
# Trickified project
TRICK_EXT_LIB_DIRS += :$(MYPROJECT_HOME)
# Tell Trick where to find the Python modules generated by SWIG
TRICK_PYTHON_PATH += :$(MYPROJECT_HOME)/trickified/python
# Tell SWIG where to find py_*.i files
TRICK_SWIG_FLAGS += -I$(MYPROJECT_HOME)/trickified
# Link in the Trickified object
TRICK_LDFLAGS += $(MYPROJECT_TRICK)
# Link in code coverage libraries for Trick code coverage CI
export USER_ADDITIONAL_OPTIONS := -fprofile-arcs -ftest-coverage -O0
export USER_ADDITIONAL_OPTIONS := -fprofile-arcs -ftest-coverage -O0