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

Cleaning up code

Browse Source
This commit is contained in:
Pherring04 2024-11-25 13:46:03 -06:00
parent be8a772362
commit ba693dc642
10 changed files with 7 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bin/trick-ify
View File

@ -3,7 +3,7 @@
$my_path = $0 ;
$my_path =~ s/trick-ify// ;
$source_dir = "" ; # Base path to build header from
$source_dir = "" ; # Base path to build source from
$header_dir = "" ; # Base path to find header files
$source_make_call = "" ; # Make call to build object files
$source_make_args = "" ; # Args to pass into default object make

4
share/trick/makefiles/trickify.mk
View File

@ -50,8 +50,6 @@
# The file into which generated Python modules are zipped. The default
# value is python (in the current directory).
#
# TRICKIFY_SOURCE
#
# -----------------------------------------------------------------------------
#
# EXAMPLE:
@ -122,7 +120,7 @@ TRICK_CFLAGS += $(TRICKIFY_CXX_FLAGS)
TRICK_CXXFLAGS += $(TRICKIFY_CXX_FLAGS)
# Ensure we can process all headers
TRICK_EXT_LIB_DIRS :=
TRICK_EXT_LIB_DIRS := $(TRICKIFY_EXT_LIB_DIRS)
.PHONY: all
all: $(TRICKIFY_OBJECT_NAME) $(TRICKIFY_PYTHON_DIR)

6
test/Makefile
View File

@ -6,9 +6,9 @@ include ${TRICK_HOME}/share/trick/makefiles/Makefile.common
SIM_DIRECTORIES = $(wildcard SIM_*)
UNIT_TEST_RESULTS = $(addprefix $(TRICK_HOME)/trick_test/, $(addsuffix .xml, $(SIM_DIRECTORIES)))
# The auto-generated makefile for each test does not know to call other makefiles the user may have included.
# User generated clean calls must be directly called here
# Otherwise build artifacts may not be cleaned and give misleading test results
# The auto-generated makefile for each test does not know to call other makefiles the developer may have included.
# Developer generated clean calls must be directly called here,
# Otherwise build artifacts may not be cleaned and give misleading test results.
clean_trickify:
for i in $(SIM_DIRECTORIES) ; do \
if [ -f "$$i/trickified_project/trickified/"[Mm]"akefile" ] ; then \

2
test/SIM_trickified_archive/trickified_project/include_bar/Bar.cpp
View File

@ -1,5 +1,3 @@
// @trick_parse{everything}
#include "Bar.hh"

2
test/SIM_trickified_archive/trickified_project/include_foo/Foo.cpp
View File

@ -1,5 +1,3 @@
// @trick_parse{everything}
#include "Foo.hh"

2
test/SIM_trickified_object/trickified_project/include_bar/Bar.cpp
View File

@ -1,5 +1,3 @@
// @trick_parse{everything}
#include "Bar.hh"

2
test/SIM_trickified_object/trickified_project/include_foo/Foo.cpp
View File

@ -1,5 +1,3 @@
// @trick_parse{everything}
#include "Foo.hh"

2
test/SIM_trickified_shared/trickified_project/include_bar/Bar.cpp
View File

@ -1,5 +1,3 @@
// @trick_parse{everything}
#include "Bar.hh"

2
test/SIM_trickified_shared/trickified_project/include_foo/Foo.cpp
View File

@ -1,5 +1,3 @@
// @trick_parse{everything}
#include "Foo.hh"

2
test_sims.yml
View File

@ -21,6 +21,8 @@ SIM_parse_s_define:
path: test/SIM_parse_s_define
SIM_target_specific_variables:
path: test/SIM_target_specific_variables
SIM_swig_template_scoping:
path: test/SIM_swig_template_scoping
SIM_test_abstract:
path: test/SIM_test_abstract
SIM_test_inherit: