From 4a54ff169b79588fd9bfe1aa6f411bd035acffd6 Mon Sep 17 00:00:00 2001 From: Alex Lin Date: Wed, 15 Jun 2016 16:58:57 -0500 Subject: [PATCH] Need to include SimTime.hh for ICG and swig processing. Added the sim time header files to files_to_ICG.hh and sim_services.i so it will be processed. refs #247 --- bin/pm/s_source.pm | 5 ++--- trick_source/sim_objects/default_trick_sys.sm | 2 ++ trick_source/sim_services/include/files_to_ICG.hh | 2 ++ trick_source/trick_swig/sim_services.i | 3 +++ 4 files changed, 9 insertions(+), 3 deletions(-) diff --git a/bin/pm/s_source.pm b/bin/pm/s_source.pm index ad7037c0..210cd84c 100644 --- a/bin/pm/s_source.pm +++ b/bin/pm/s_source.pm @@ -20,7 +20,6 @@ sub s_source($) { # Get Trick version my ($version, $thread) = get_trick_version() ; - $thread =~ s/\d+\.// ; #--------------------------- # Get date @@ -182,9 +181,9 @@ PURPOSE: "void memory_init( void ) {\n\n" ; print S_SOURCE " " x 4 , "ALLOC_INFO * ai ;\n" ; - print S_SOURCE " " x 4 , "exec_set_version_date_tag\( \"@(#)CP Version $version-$thread, $date\" \) ;\n" ; + print S_SOURCE " " x 4 , "exec_set_version_date_tag\( \"@(#)CP Version $version, $date\" \) ;\n" ; print S_SOURCE " " x 4 , "exec_set_build_date\( \"$date\" \) ;\n" ; - print S_SOURCE " " x 4 , "exec_set_current_version\( \"$version-$thread\" \) ;\n\n" ; + print S_SOURCE " " x 4 , "exec_set_current_version\( \"$version\" \) ;\n\n" ; print S_SOURCE " " x 4 , "populate_sim_services_class_map\(\) ;\n" ; print S_SOURCE " " x 4 , "populate_sim_services_enum_map\(\) ;\n" ; diff --git a/trick_source/sim_objects/default_trick_sys.sm b/trick_source/sim_objects/default_trick_sys.sm index 1af4df90..62ad0e25 100644 --- a/trick_source/sim_objects/default_trick_sys.sm +++ b/trick_source/sim_objects/default_trick_sys.sm @@ -92,6 +92,8 @@ a replacement SimObject will create an uncompilable sim. ##include "sim_services/Zeroconf/include/Zeroconf.hh" ##include "sim_services/RealtimeInjector/include/RtiStager.hh" ##include "sim_services/RealtimeInjector/include/RtiExec.hh" +##include "sim_services/SimTime/include/SimTime.hh" +##include "sim_services/SimTime/include/simtime_proto.h" // TODO: move users away from this STL checkpoint method ##include "sim_services/CheckPointRestart/include/checkpoint_stl.hh" diff --git a/trick_source/sim_services/include/files_to_ICG.hh b/trick_source/sim_services/include/files_to_ICG.hh index 32568b33..8916e1d6 100644 --- a/trick_source/sim_services/include/files_to_ICG.hh +++ b/trick_source/sim_services/include/files_to_ICG.hh @@ -91,4 +91,6 @@ #include "trick_utils/math/include/wave_form.h" #include "trick_utils/math/include/rand_generator.h" +#include "sim_services/SimTime/include/SimTime.hh" + #endif diff --git a/trick_source/trick_swig/sim_services.i b/trick_source/trick_swig/sim_services.i index 2e840509..2b8fb9e3 100644 --- a/trick_source/trick_swig/sim_services.i +++ b/trick_source/trick_swig/sim_services.i @@ -144,6 +144,9 @@ #include "sim_services/VariableServer/include/variable_server_proto.h" #include "sim_services/include/Flag.h" #include "trick_utils/units/include/Unit.hh" +#include "sim_services/SimTime/include/SimTime.hh" +#include "sim_services/SimTime/include/simtime_proto.h" + #ifdef USE_ER7_UTILS_INTEGRATORS #include "er7_utils/integration/core/include/integrator_constructor_factory.hh"