From ba693dc6426141bbdf69887d9066a977f708ba16 Mon Sep 17 00:00:00 2001 From: Pherring04 Date: Mon, 25 Nov 2024 13:46:03 -0600 Subject: [PATCH] Cleaning up code --- bin/trick-ify | 2 +- share/trick/makefiles/trickify.mk | 4 +--- test/Makefile | 6 +++--- .../trickified_project/include_bar/Bar.cpp | 2 -- .../trickified_project/include_foo/Foo.cpp | 2 -- .../trickified_project/include_bar/Bar.cpp | 2 -- .../trickified_project/include_foo/Foo.cpp | 2 -- .../trickified_project/include_bar/Bar.cpp | 2 -- .../trickified_project/include_foo/Foo.cpp | 2 -- test_sims.yml | 2 ++ 10 files changed, 7 insertions(+), 19 deletions(-) diff --git a/bin/trick-ify b/bin/trick-ify index 9e503fc3..039c18d9 100755 --- a/bin/trick-ify +++ b/bin/trick-ify @@ -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 diff --git a/share/trick/makefiles/trickify.mk b/share/trick/makefiles/trickify.mk index 74c9fdcb..a0de4be6 100644 --- a/share/trick/makefiles/trickify.mk +++ b/share/trick/makefiles/trickify.mk @@ -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) diff --git a/test/Makefile b/test/Makefile index 5f15e1e6..da0b999f 100644 --- a/test/Makefile +++ b/test/Makefile @@ -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 \ diff --git a/test/SIM_trickified_archive/trickified_project/include_bar/Bar.cpp b/test/SIM_trickified_archive/trickified_project/include_bar/Bar.cpp index 55a07a84..b46af661 100644 --- a/test/SIM_trickified_archive/trickified_project/include_bar/Bar.cpp +++ b/test/SIM_trickified_archive/trickified_project/include_bar/Bar.cpp @@ -1,5 +1,3 @@ -// @trick_parse{everything} - #include "Bar.hh" diff --git a/test/SIM_trickified_archive/trickified_project/include_foo/Foo.cpp b/test/SIM_trickified_archive/trickified_project/include_foo/Foo.cpp index f8c4fe60..11513836 100644 --- a/test/SIM_trickified_archive/trickified_project/include_foo/Foo.cpp +++ b/test/SIM_trickified_archive/trickified_project/include_foo/Foo.cpp @@ -1,5 +1,3 @@ -// @trick_parse{everything} - #include "Foo.hh" diff --git a/test/SIM_trickified_object/trickified_project/include_bar/Bar.cpp b/test/SIM_trickified_object/trickified_project/include_bar/Bar.cpp index 55a07a84..b46af661 100644 --- a/test/SIM_trickified_object/trickified_project/include_bar/Bar.cpp +++ b/test/SIM_trickified_object/trickified_project/include_bar/Bar.cpp @@ -1,5 +1,3 @@ -// @trick_parse{everything} - #include "Bar.hh" diff --git a/test/SIM_trickified_object/trickified_project/include_foo/Foo.cpp b/test/SIM_trickified_object/trickified_project/include_foo/Foo.cpp index f8c4fe60..11513836 100644 --- a/test/SIM_trickified_object/trickified_project/include_foo/Foo.cpp +++ b/test/SIM_trickified_object/trickified_project/include_foo/Foo.cpp @@ -1,5 +1,3 @@ -// @trick_parse{everything} - #include "Foo.hh" diff --git a/test/SIM_trickified_shared/trickified_project/include_bar/Bar.cpp b/test/SIM_trickified_shared/trickified_project/include_bar/Bar.cpp index 55a07a84..b46af661 100644 --- a/test/SIM_trickified_shared/trickified_project/include_bar/Bar.cpp +++ b/test/SIM_trickified_shared/trickified_project/include_bar/Bar.cpp @@ -1,5 +1,3 @@ -// @trick_parse{everything} - #include "Bar.hh" diff --git a/test/SIM_trickified_shared/trickified_project/include_foo/Foo.cpp b/test/SIM_trickified_shared/trickified_project/include_foo/Foo.cpp index f8c4fe60..11513836 100644 --- a/test/SIM_trickified_shared/trickified_project/include_foo/Foo.cpp +++ b/test/SIM_trickified_shared/trickified_project/include_foo/Foo.cpp @@ -1,5 +1,3 @@ -// @trick_parse{everything} - #include "Foo.hh" diff --git a/test_sims.yml b/test_sims.yml index cefeecea..d0ec3077 100644 --- a/test_sims.yml +++ b/test_sims.yml @@ -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: