From 19025d77ad6c103b9b9b9fef6b14e21bc49e45bb Mon Sep 17 00:00:00 2001 From: Alex Lin <alexander.s.lin@nasa.gov> Date: Mon, 1 Jun 2015 10:28:29 -0500 Subject: [PATCH] Standardize directory names Reorganized. Created a new top level include directory that will hold all of Trick's header files. Moved all of the Trick headers to this directory. Created a libexec directory that holds all of the executables that users don't need to execute directly. Changed all of the executables remaining in bin to start with "trick-". In the sim_services directories changed all source files to find the Trick headers in their new location. Since all of the include files are gone in sim_services, removed the src directories as well, moving all of the source files up a level. Moved the makefiles, docs, man, and other architecture independent files into a top level share directory. Renamed lib_${TRICK_HOST_CPU} to lib64 or lib depending on the platform we're currently on. refs #63 --- .gitignore | 7 + Makefile | 31 +- bin/ICG | 20 - bin/dre | 12 - bin/fxplot | 11 - bin/gxplot | 11 - bin/install_user | 15 - bin/tex/longtable.dvi | Bin 102052 -> 0 bytes bin/tex/longtable.sty | 442 --- bin/{CP => trick-CP} | 2 +- bin/{trick_dp => trick-dp} | 8 +- bin/trick-dre | 12 + bin/{gte => trick-gte} | 2 +- bin/{jxplot => trick-jxplot} | 6 +- bin/{kill_sim => trick-killsim} | 0 bin/{mm => trick-mm} | 6 +- bin/{mtv => trick-mtv} | 6 +- bin/{trick_qp => trick-qp} | 6 +- bin/{sie => trick-sie} | 6 +- bin/{sim_control => trick-simcontrol} | 6 +- bin/{sniffer => trick-sniffer} | 6 +- bin/{trick_stripchart => trick-stripchart} | 6 +- bin/{tv => trick-tv} | 6 +- bin/{trick_version => trick-version} | 2 +- bin/trk2ascii | 11 - bin/trk2csv | 11 - configure | 16 +- .../trick}/ABM_Integrator.hh | 31 + .../trick}/ADefParseContext.hh | 2 +- .../trick}/AttributesMap.hh | 2 +- .../trick}/AttributesTypeID.hh | 0 .../include => include/trick}/BC635Clock.hh | 2 +- .../trick}/CheckPointAgent.hh | 4 +- .../trick}/CheckPointRestart.hh | 2 +- .../trick}/CheckPointRestart_c_intf.hh | 0 .../trick}/ChkPtParseContext.hh | 4 +- .../trick}/ClassicCheckPointAgent.hh | 2 +- .../Clock/include => include/trick}/Clock.hh | 0 .../trick}/CommandLineArguments.hh | 0 .../DMTCP/include => include/trick}/DMTCP.hh | 4 +- .../include => include/trick}/DRAscii.hh | 2 +- .../include => include/trick}/DRBinary.hh | 2 +- .../include => include/trick}/DRHDF5.hh | 2 +- .../trick}/DataRecordDispatcher.hh | 6 +- .../trick}/DataRecordGroup.hh | 4 +- .../include => include/trick}/DebugPause.hh | 2 +- .../include => include/trick}/EchoJobs.hh | 2 +- .../trick}/EnumAttributesMap.hh | 2 +- .../include => include/trick}/Environment.hh | 0 .../trick}/Euler_Cromer_Integrator.hh | 34 + .../trick}/Euler_Integrator.hh | 29 + .../include => include/trick}/Event.hh | 4 +- .../trick}/EventInstrument.hh | 6 +- .../include => include/trick}/EventManager.hh | 6 +- .../trick}/EventManager_c_intf.hh | 2 +- .../trick}/EventProcessor.hh | 4 +- .../trick}/Exec_exception.hh | 0 .../include => include/trick}/Executive.hh | 10 +- .../trick}/ExternalApplication.hh | 0 .../trick}/ExternalApplicationManager.hh | 2 +- .../include => include/trick}/Flag.h | 0 .../trick}/FrameDataRecordGroup.hh | 4 +- .../include => include/trick}/FrameLog.hh | 6 +- .../trick}/GetTimeOfDayClock.hh | 2 +- .../include => include/trick}/IPPython.hh | 2 +- .../trick}/IPPythonEvent.hh | 6 +- .../Timer/include => include/trick}/ITimer.hh | 2 +- .../trick}/InputProcessor.hh | 0 .../trick}/InstrumentBase.hh | 2 +- include/trick/IntegAlgorithms.hh | 23 + .../trick}/IntegJobClassId.hh | 0 .../trick}/IntegLoopManager.hh | 4 +- .../trick}/IntegLoopScheduler.hh | 10 +- .../trick}/IntegLoopSimObject.hh | 8 +- .../include => include/trick}/Integrator.hh | 4 +- .../include => include/trick}/Interpolator.hh | 0 .../include => include/trick}/JITEvent.hh | 4 +- .../include => include/trick}/JITInputFile.hh | 4 +- .../trick}/JSONVariableServer.hh | 4 +- .../trick}/JSONVariableServerThread.hh | 4 +- .../include => include/trick}/JobData.hh | 2 +- .../trick}/MM4_Integrator.hh | 26 + .../include => include/trick}/MSConnect.hh | 2 +- .../include => include/trick}/MSSharedMem.hh | 6 +- .../include => include/trick}/MSSocket.hh | 4 +- .../include => include/trick}/MTV.hh | 2 +- include/trick/Makefile | 13 + .../trick}/MalfunctionsTrickView.hh | 2 +- .../include => include/trick}/MapStrToPtr.h | 2 +- .../include => include/trick}/Master.hh | 6 +- .../trick}/MemoryManager.hh | 16 +- .../include => include/trick}/MessageCout.hh | 2 +- .../include => include/trick}/MessageFile.hh | 2 +- .../include => include/trick}/MessageLCout.hh | 2 +- .../trick}/MessagePublisher.hh | 2 +- .../trick}/MessageSubscriber.hh | 0 .../trick}/MessageTCDevice.hh | 6 +- .../trick}/Message_proto.hh | 2 +- .../include => include/trick}/MonteCarlo.hh | 8 +- .../include => include/trick}/MonteMonitor.hh | 2 +- .../include => include/trick}/MonteVar.hh | 0 .../trick}/MonteVarCalculated.hh | 4 +- .../include => include/trick}/MonteVarFile.hh | 2 +- .../trick}/MonteVarFixed.hh | 2 +- .../trick}/MonteVarRandom.hh | 6 +- .../trick}/NL2_Integrator.hh | 30 + .../include => include/trick}/PlaybackFile.hh | 2 +- .../include => include/trick}/PythonPrint.hh | 2 +- .../trick}/RK2_Integrator.hh | 25 + .../trick}/RK4_Integrator.hh | 28 + .../trick}/RKF45_Integrator.hh | 30 + .../trick}/RKF78_Integrator.hh | 29 + .../trick}/RKG4_Integrator.hh | 27 + .../include => include/trick}/RealtimeSync.hh | 4 +- .../trick}/RefParseContext.hh | 4 +- .../include => include/trick}/RemoteShell.hh | 0 .../include => include/trick}/RtiEvent.hh | 10 +- .../include => include/trick}/RtiExec.hh | 2 +- .../include => include/trick}/RtiList.hh | 2 +- .../include => include/trick}/RtiStager.hh | 6 +- .../include => include/trick}/STLInterface.hh | 0 .../include => include/trick}/STLManager.hh | 2 +- .../include => include/trick}/STLUtilities.hh | 0 .../trick}/ScheduledJobQueue.hh | 2 +- .../trick}/ScheduledJobQueueInstrument.hh | 4 +- .../include => include/trick}/Scheduler.hh | 4 +- .../Sie/include => include/trick}/Sie.hh | 4 +- .../trick}/SimControlPanel.hh | 2 +- .../include => include/trick}/SimObject.hh | 2 +- .../include => include/trick}/SimTime.hh | 2 +- .../include => include/trick}/Slave.hh | 2 +- .../trick}/StlRandomGenerator.hh | 4 +- .../trick}/StlRandomGeneratorSub.hh | 0 .../include => include/trick}/StripChart.hh | 2 +- .../include => include/trick}/TPROCTEClock.hh | 2 +- .../include => include/trick}/ThreadBase.hh | 0 .../include => include/trick}/Threads.hh | 6 +- .../Timer/include => include/trick}/Timer.hh | 0 .../trick}/TrickConstant.hh | 0 .../include => include/trick}/TrickView.hh | 2 +- .../units/include => include/trick}/UCFn.hh | 0 .../units/include => include/trick}/Unit.hh | 4 +- .../include => include/trick}/UnitTest.hh | 0 .../include => include/trick}/UnitsMap.hh | 0 .../trick}/VariableServer.hh | 14 +- .../trick}/VariableServerListenThread.hh | 4 +- .../trick}/VariableServerReference.hh | 4 +- .../trick}/VariableServerThread.hh | 8 +- .../include => include/trick}/Zeroconf.hh | 0 .../include => include/trick}/attributes.h | 2 +- .../trick}/bitfield_proto.h | 2 +- .../trick_adt/include => include/trick}/bst.h | 0 .../trick}/checkpoint_map.hh | 4 +- .../trick}/checkpoint_pair.hh | 4 +- .../trick}/checkpoint_queue.hh | 6 +- .../trick}/checkpoint_sequence_stl.hh | 4 +- .../trick}/checkpoint_stack.hh | 6 +- .../trick}/checkpoint_stl.hh | 10 +- .../trick}/checkpoint_trick_map_stl.hh | 6 +- .../trick}/checkpoint_trick_pair_stl.hh | 6 +- .../trick}/checkpoint_trick_sequence_stl.hh | 6 +- .../include => include/trick}/clock_proto.h | 0 .../trick}/collect_macros.h | 2 +- .../trick}/collect_proto.hh | 0 .../trick}/command_line_protos.h | 0 .../Executive/include/exec_proto.h | 1 + .../Executive/include/exec_proto.hh | 1 + .../Integrator/include/Integrator.hh | 1 + .../Integrator/include/integrator_c_intf.h | 1 + .../MemoryManager/include/MemoryManager.hh | 1 + .../MemoryManager/include/attributes.h | 1 + .../include/memorymanager_c_intf.h | 1 + .../MemoryManager/include/parameter_types.h | 1 + .../MemoryManagerWrapper_c_intf.hh | 2 + .../MemoryManagerWrapper/checkpoint_map.hh | 2 + .../MemoryManagerWrapper/checkpoint_pair.hh | 3 + .../MemoryManagerWrapper/checkpoint_queue.hh | 2 + .../checkpoint_sequence_stl.hh | 3 + .../MemoryManagerWrapper/checkpoint_stack.hh | 2 + .../MemoryManagerWrapper/checkpoint_stl.hh | 3 + .../Message/include/message_proto.h | 1 + .../Message/include/message_type.h | 1 + .../UnitTest/include/trick_tests.h | 1 + .../sim_services/include/collect_macros.h | 1 + .../compat/sim_services/include/constant.h | 1 + .../compat/sim_services/include/mm_macros.hh | 1 + .../trick_utils/units/include/constant.h | 1 + .../math/include => include/trick}/complex.h | 0 .../include => include/trick}/constant.h | 0 .../trick}/data_record_proto.h | 2 +- .../trick}/debug_pause_proto.h | 0 .../include => include/trick}/dllist.h | 0 .../trick}/dmtcp_checkpoint_c_intf.hh | 0 .../trick}/echojobs_proto.h | 0 .../include => include/trick}/env_proto.h | 0 include/trick/er7_algorithms/Makefile | 4 + .../include => include/trick}/exec_proto.h | 2 +- .../include => include/trick}/exec_proto.hh | 4 +- .../trick}/external_application_c_intf.h | 0 include/trick/files_to_ICG.hh | 84 + .../trick}/framelog_proto.h | 0 .../comm/include => include/trick}/hs_msg.h | 0 .../trick}/input_processor_proto.h | 0 .../trick}/integrator_c_intf.h | 0 .../include => include/trick}/io_alloc.h | 4 +- .../trick}/jit_input_file_proto.hh | 0 .../include => include/trick}/lqueue.h | 2 +- .../include => include/trick}/lstack.h | 2 +- .../include => include/trick}/master_proto.h | 0 .../include => include/trick}/matrix_macros.h | 0 .../trick}/memorymanager_c_intf.h | 10 +- .../include => include/trick}/message_proto.h | 2 +- .../include => include/trick}/message_type.h | 0 .../include => include/trick}/mm_error.h | 0 .../include => include/trick}/mm_macros.hh | 4 +- .../trick}/montecarlo_c_intf.h | 2 +- .../include => include/trick}/ms_sim_mode.h | 0 .../include => include/trick}/outdllist.h | 0 .../trick}/parameter_types.h | 0 .../trick}/populate_attribute_maps.hh | 0 .../include => include/trick}/quat_macros.h | 2 +- .../trick}/rand_generator.h | 0 .../trick}/realtimesync_proto.h | 4 +- .../include => include/trick}/record_array.h | 2 +- .../include => include/trick}/reference.h | 6 +- .../trick}/reference_frame.h | 0 .../include => include/trick}/regula_falsi.h | 0 .../include => include/trick}/release.h | 0 .../include => include/trick}/roundoff.h | 0 .../include => include/trick}/sie_c_intf.h | 0 .../include => include/trick}/sim_mode.h | 0 include/trick/simtime.h | 4 + .../include => include/trick}/simtime_proto.h | 2 +- .../include => include/trick}/sizedata.h | 0 .../trick}/stl_s_define_macro.hh | 0 .../comm/include => include/trick}/tc.h | 0 .../comm/include => include/trick}/tc_proto.h | 2 +- .../include => include/trick}/time_offset.h | 0 .../trick}/trick_algorithms/ABM_Integrator.hh | 2 +- .../Euler_Cromer_Integrator.hh | 2 +- .../trick_algorithms/Euler_Integrator.hh | 2 +- .../trick}/trick_algorithms/MM4_Integrator.hh | 2 +- .../trick}/trick_algorithms/NL2_Integrator.hh | 2 +- .../trick}/trick_algorithms/RK2_Integrator.hh | 2 +- .../trick}/trick_algorithms/RK4_Integrator.hh | 2 +- .../trick_algorithms/RKF45_Integrator.hh | 2 +- .../trick_algorithms/RKF78_Integrator.hh | 2 +- .../trick_algorithms/RKG4_Integrator.hh | 2 +- .../trick}/trick_byteswap.h | 0 .../include => include/trick}/trick_deque.hh | 2 +- .../trick}/trick_error_hndlr.h | 0 .../include => include/trick}/trick_list.hh | 2 +- .../include => include/trick}/trick_map.hh | 4 +- .../include => include/trick}/trick_math.h | 0 .../trick}/trick_math_error.h | 0 .../trick}/trick_math_proto.h | 6 +- .../include => include/trick}/trick_pair.hh | 4 +- .../include => include/trick}/trick_queue.hh | 2 +- .../include => include/trick}/trick_set.hh | 2 +- .../include => include/trick}/trick_stack.hh | 2 +- .../include => include/trick}/trick_tests.h | 0 .../include => include/trick}/trick_vector.hh | 2 +- .../shm/include => include/trick}/tsm.h | 0 .../shm/include => include/trick}/tsm_proto.h | 2 +- .../include => include/trick}/units_conv.h | 0 .../include => include/trick}/unix_commands.h | 0 .../include => include/trick}/value.h | 2 +- .../include => include/trick}/var.h | 2 +- .../trick}/variable_server.h | 4 +- .../trick}/variable_server_message_types.h | 0 .../trick}/variable_server_proto.h | 0 .../trick}/variable_server_sync_types.h | 0 .../include => include/trick}/vector_macros.h | 0 .../include => include/trick}/vval.h | 2 +- .../include => include/trick}/wave_form.h | 0 .../include => include/trick}/wcs_ext.h | 0 {bin => libexec/trick}/ICG_10 | 0 {bin => libexec/trick}/MIS | 0 {bin => libexec/trick}/condense_list.pl | 0 .../trick/configuration_processor | 0 {bin => libexec/trick}/convert_swig | 2 +- {bin => libexec/trick}/convert_tv_file | 0 {bin => libexec/trick}/dd_convert | 0 {bin => libexec/trick}/default_data_convert | 0 {bin => libexec/trick}/depend_cp | 0 {bin => libexec/trick}/depend_objs | 0 {bin => libexec/trick}/java/.gitignore | 0 {bin => libexec/trick}/java/bin/README | 0 .../trick}/java/bin/sim_control.bat | 0 {bin => libexec/trick}/java/bin/sniffer.bat | 0 {bin => libexec/trick}/java/bin/tv.bat | 0 {bin => libexec/trick}/java/lib/.gitignore | 0 .../trick}/java/lib/CatalogManager.properties | 0 {bin => libexec/trick}/java/lib/Makefile | 0 {bin => libexec/trick}/make_build | 0 {bin => libexec/trick}/make_changelog | 0 {bin => libexec/trick}/mis_dep | 0 {bin => libexec/trick}/pm/ICG.pm | 0 {bin => libexec/trick}/pm/MIS.pm | 0 {bin => libexec/trick}/pm/auto_doc.pm | 0 {bin => libexec/trick}/pm/default_data.pm | 0 {bin => libexec/trick}/pm/edit.pm | 0 {bin => libexec/trick}/pm/find_module.pm | 0 {bin => libexec/trick}/pm/get_headers.pm | 0 {bin => libexec/trick}/pm/gte.pm | 0 {bin => libexec/trick}/pm/html.pm | 0 {bin => libexec/trick}/pm/make_makefile.pm | 28 +- .../trick}/pm/make_no_swig_makefile.pm | 0 .../trick}/pm/make_swig_makefile.pm | 5 +- {bin => libexec/trick}/pm/mis_dep.pm | 0 {bin => libexec/trick}/pm/parse_s_define.pm | 0 {bin => libexec/trick}/pm/s_source.pm | 10 +- {bin => libexec/trick}/pm/trick_print.pm | 0 {bin => libexec/trick}/pm/trick_units.pm | 0 {bin => libexec/trick}/pm/trick_version.pm | 4 +- {bin => libexec/trick}/run_java_test | 0 {bin => libexec/trick}/s_main_dmtcp.py | 0 {bin => libexec/trick}/start_sim | 0 {bin => libexec/trick}/trick_make_checksums | 0 {bin => libexec/trick}/trick_verify_checksums | 0 {bin => libexec/trick}/vc | 0 {docs => share/doc/trick}/.gitignore | 0 ...Basics_of_Program_Memory_and_Variables.pdf | Bin ...Basics_of_Program_Memory_and_Variables.ppt | Bin {docs => share/doc/trick}/CP.txt | 0 .../trick}/Compiling_and_Linking_Overview.pdf | Bin .../trick}/Compiling_and_Linking_Overview.ppt | Bin .../doc/trick}/Trick_Advanced_Topics.pdf | Bin .../doc/trick}/Trick_Advanced_Topics.pptx | Bin .../trick}/Trick_Software_Design_Document.doc | Bin .../Trick_Software_Development_Plan.doc | Bin .../Trick_Software_Quality_Assurance_Plan.doc | Bin ...ick_Software_Requirement_Specification.doc | Bin .../doc/trick}/Trick_Tutorial_Review.pdf | Bin .../doc/trick}/Trick_Tutorial_Review.pptx | Bin .../doc/trick}/advanced/Cplusplus.ppt | Bin .../doc/trick}/advanced/Distributed_Sims.ppt | Bin .../advanced/Events_and_Malfunctions.ppt | Bin .../advanced/MonteCarlo_Presentation.pdf | Bin .../advanced/MonteCarlo_Presentation.pptx | Bin .../doc/trick}/advanced/Multithreads.pptx | Bin .../doc/trick}/advanced/Realtime.pptx | Bin .../doc/trick}/advanced/Trick_07_to_10.pptx | Bin .../trick}/advanced/Trick_Checkpointing.pptx | Bin .../advanced/Trick_Checkpointing_DMTCP.pdf | Bin .../advanced/Trick_Checkpointing_DMTCP.pptx | Bin .../Trick_Memory_Manager_Overview.ppt | Bin .../doc/trick}/advanced/VariableServer.pptx | Bin {docs => share/doc/trick}/design.doc | Bin {docs => share/doc/trick}/design.pdf | Bin {docs => share/doc/trick}/trick_module.xsl | 0 .../doc/trick}/trick_module_tex.xsl | 0 {docs => share/doc/trick}/trick_s_define.xsl | 0 {docs => share/doc/trick}/trick_struct.xsl | 0 .../doc/trick}/trick_struct_tex.xsl | 0 {docs => share/doc/trick}/tutorial.doc | Bin {docs => share/doc/trick}/tutorial.pdf | Bin {docs => share/doc/trick}/users_guide.html | 0 {man => share/man}/man1/CP.1 | 0 {man => share/man}/man1/Create_Token.1 | 0 {man => share/man}/man1/ICG.1 | 0 {man => share/man}/man1/MIS.1 | 0 {man => share/man}/man1/Replace_Token.1 | 0 {man => share/man}/man1/catalog.1 | 0 {man => share/man}/man1/kill_sim.1 | 0 {man => share/man}/man1/make_build.1 | 0 {bin => share/trick}/MAKE_out_header.txt | 0 {bin => share/trick/env}/Trick.cshrc | 0 {bin => share/trick/env}/Trick.profile | 0 {bin => share/trick}/gdb_commands | 0 .../trick/makefiles}/Makefile.common | 42 +- .../trick/makefiles}/Makefile.sim | 18 +- .../trick/makefiles}/Makefile.tricklib | 6 +- .../trick}/sim_objects/BC635Clock.sm | 2 +- .../trick}/sim_objects/EmptyInputProcessor.sm | 0 .../trick}/sim_objects/STL.sm | 2 +- .../trick}/sim_objects/SegmentedExecutive.sm | 0 .../trick}/sim_objects/TPROClock.sm | 2 +- .../trick}/sim_objects/default_trick_sys.sm | 132 +- {bin => share/trick}/trick_ver.txt | 0 {bin => share/trick}/valgrind_supressions.txt | 0 .../Interface_Code_Gen/FieldDescription.cpp | 3 +- .../Interface_Code_Gen/HeaderSearchDirs.cpp | 4 +- .../Interface_Code_Gen/PrintAttributes.cpp | 2 +- .../PrintFileContents10.cpp | 19 +- .../codegen/Interface_Code_Gen/main.cpp | 2 +- .../codegen/Interface_Code_Gen/makefile | 6 +- .../Apps/ExternalPrograms/makefile | 6 +- .../data_products/Apps/Trk2csv/makefile | 8 +- .../data_products/DPX/APPS/FXPLOT/makefile | 12 +- .../data_products/DPX/APPS/GXPLOT/makefile | 10 +- .../DPX/DPC/DPC_UnitConvDataStream.hh | 2 +- .../data_products/DPX/DPC/DPC_column_info.hh | 2 +- .../DPX/DPC/DPC_datastream_supplier.hh | 2 +- .../data_products/DPX/DPC/DPC_delta_curve.cpp | 2 +- .../data_products/DPX/DPC/DPC_std_curve.cpp | 2 +- trick_source/data_products/DPX/DPC/makefile | 4 +- .../data_products/DPX/DPM/DPM_axis.cpp | 2 +- .../data_products/DPX/DPM/DPM_column.cpp | 2 +- .../data_products/DPX/DPM/DPM_measurement.cpp | 2 +- trick_source/data_products/DPX/DPM/makefile | 4 +- .../data_products/DPX/DPV/UTILS/makefile | 2 +- trick_source/data_products/DPX/makefile | 2 +- trick_source/data_products/EQParse/makefile | 2 +- trick_source/data_products/Log/MatLab.cpp | 2 +- trick_source/data_products/Log/MatLab4.cpp | 2 +- .../data_products/Log/TrickBinary.cpp | 4 +- trick_source/data_products/Log/makefile | 4 +- .../data_products/Log/parameter_types.h | 1 - trick_source/data_products/Var/makefile | 9 +- trick_source/data_products/Var/var.h | 2 +- trick_source/data_products/makefile | 2 +- trick_source/java/makefile | 8 +- .../dataproducts/DataProductsApplication.java | 2 +- .../DataProductsApplication.properties | 6 +- .../simcontrol/SimControlApplication.java | 4 +- .../{src => }/CheckPointAgent.cpp | 2 +- .../{src => }/ChkPtParseContext.cpp | 2 +- .../{src => }/ClassicCheckPointerAgent.cpp | 18 +- .../sim_services/CheckPointAgent/Makefile | 4 +- .../CheckPointAgent/Makefile_deps | 50 + .../CheckPointAgent/{src => }/PythonPrint.cpp | 12 +- .../{ => docs}/main_page.dox_in | 0 .../CheckPointAgent/{src => }/input_parser.l | 8 +- .../CheckPointAgent/{src => }/input_parser.y | 12 +- .../{src => }/CheckPointRestart.cpp | 24 +- .../{src => }/CheckPointRestart_c_intf.cpp | 10 +- .../sim_services/CheckPointRestart/Makefile | 4 +- .../CheckPointRestart/Makefile_deps | 246 +- .../{src => }/checkpoint_map.cpp | 2 +- .../{src => }/checkpoint_pair.cpp | 2 +- .../{src => }/checkpoint_queue.cpp | 2 +- .../{src => }/checkpoint_sequence_stl.cpp | 2 +- .../{src => }/checkpoint_stack.cpp | 2 +- .../{src => }/next_attr_name.cpp | 2 +- .../CheckPointRestart/src/makefile | 6 - .../Clock/{src => }/BC635Clock.cpp | 8 +- .../sim_services/Clock/{src => }/Clock.cpp | 6 +- trick_source/sim_services/Clock/Clock.doxygen | 1417 ---------- .../Clock/{src => }/GetTimeOfDayClock.cpp | 6 +- trick_source/sim_services/Clock/Makefile | 4 +- trick_source/sim_services/Clock/Makefile_deps | 32 +- .../Clock/{src => }/TPROCTEClock.cpp | 8 +- .../Clock/{src => }/clock_c_intf.cpp | 4 +- .../Clock/{ => docs}/design.dox_in | 0 .../Clock/{ => docs}/main_page.dox_in | 0 .../Clock/{ => docs}/requirements.dox_in | 0 trick_source/sim_services/Clock/src/makefile | 6 - trick_source/sim_services/Collect/Makefile | 4 +- .../sim_services/Collect/Makefile_deps | 8 +- .../Collect/{src => }/collect.cpp | 2 +- .../sim_services/Collect/src/makefile | 6 - .../{src => }/CommandLineArguments.cpp | 4 +- .../CommandLineArguments/Makefile | 4 +- .../CommandLineArguments/Makefile_deps | 16 +- .../{src => }/command_line_c_intf.cpp | 2 +- .../{ => docs}/design.dox_in | 0 .../{ => docs}/main_page.dox_in | 0 .../{ => docs}/requirements.dox_in | 0 .../CommandLineArguments/src/makefile | 6 - .../sim_services/DMTCP/{src => }/DMTCP.cpp | 12 +- trick_source/sim_services/DMTCP/Makefile | 4 +- trick_source/sim_services/DMTCP/Makefile_deps | 47 +- .../{src => }/dmtcp_checkpoint_c_intf.cpp | 2 +- trick_source/sim_services/DMTCP/src/makefile | 6 - .../DataRecord/{src => }/DRAscii.cpp | 12 +- .../DataRecord/{src => }/DRBinary.cpp | 8 +- .../DataRecord/{src => }/DRHDF5.cpp | 10 +- .../{src => }/DataRecordDispatcher.cpp | 12 +- .../DataRecord/{src => }/DataRecordGroup.cpp | 14 +- trick_source/sim_services/DataRecord/Makefile | 4 +- .../sim_services/DataRecord/Makefile_deps | 192 +- .../{src => }/data_record_utilities.cpp | 6 +- .../DataRecord/{ => docs}/design.dox_in | 0 .../DataRecord/{ => docs}/main_page.dox_in | 0 .../DataRecord/{ => docs}/requirements.dox_in | 0 .../sim_services/DataRecord/src/makefile | 6 - .../DebugPause/{src => }/DebugPause.cpp | 10 +- .../{src => }/DebugPause_c_intf.cpp | 2 +- trick_source/sim_services/DebugPause/Makefile | 4 +- .../sim_services/DebugPause/Makefile_deps | 40 +- .../sim_services/DebugPause/src/makefile | 6 - .../EchoJobs/{src => }/EchoJobs.cpp | 8 +- .../EchoJobs/{src => }/EchoJobs_c_intf.cpp | 2 +- trick_source/sim_services/EchoJobs/Makefile | 4 +- .../sim_services/EchoJobs/Makefile_deps | 23 +- .../EchoJobs/{ => docs}/main_page.dox_in | 0 .../sim_services/EchoJobs/src/makefile | 6 - .../Environment/{src => }/Environment.cpp | 2 +- .../{src => }/Environment_c_intf.cpp | 4 +- .../sim_services/Environment/Makefile | 4 +- .../sim_services/Environment/Makefile_deps | 10 +- .../Environment/{ => docs}/main_page.dox_in | 0 .../sim_services/Environment/src/makefile | 6 - .../{src => }/EventInstrument.cpp | 4 +- .../EventManager/{src => }/EventManager.cpp | 14 +- .../{src => }/EventManager_c_intf.cpp | 6 +- .../EventManager/{src => }/EventProcessor.cpp | 8 +- .../sim_services/EventManager/Makefile | 4 +- .../sim_services/EventManager/Makefile_deps | 236 +- .../EventManager/{ => docs}/main_page.dox_in | 0 .../sim_services/EventManager/src/makefile | 6 - .../Executive/{src => }/Exec_exception.cpp | 2 +- .../Executive/{src => }/Executive.cpp | 6 +- .../Executive_add_depends_on_job.cpp | 6 +- .../{src => }/Executive_add_jobs_to_queue.cpp | 8 +- .../Executive_add_scheduled_job_class.cpp | 2 +- .../{src => }/Executive_add_sim_object.cpp | 2 +- .../{src => }/Executive_advance_sim_time.cpp | 4 +- .../Executive/{src => }/Executive_c_intf.cpp | 8 +- .../{src => }/Executive_call_default_data.cpp | 4 +- .../Executive_call_initialization.cpp | 4 +- .../Executive_call_input_processor.cpp | 4 +- .../Executive_check_all_job_cycle_times.cpp | 8 +- .../Executive_check_all_jobs_handled.cpp | 6 +- .../{src => }/Executive_checkpoint.cpp | 8 +- .../Executive_clear_scheduled_queues.cpp | 2 +- .../{src => }/Executive_create_threads.cpp | 2 +- .../{src => }/Executive_fpe_handler.cpp | 6 +- .../Executive/{src => }/Executive_freeze.cpp | 10 +- .../{src => }/Executive_freeze_loop.cpp | 10 +- .../{src => }/Executive_get_curr_job.cpp | 2 +- .../Executive/{src => }/Executive_get_job.cpp | 2 +- .../{src => }/Executive_get_job_cycle.cpp | 2 +- .../{src => }/Executive_get_process_id.cpp | 2 +- .../{src => }/Executive_get_sim_time.cpp | 2 +- .../Executive/{src => }/Executive_init.cpp | 6 +- .../Executive_init_freeze_scheduled.cpp | 2 +- .../Executive_init_signal_handlers.cpp | 2 +- .../{src => }/Executive_instrument_job.cpp | 2 +- .../Executive/{src => }/Executive_loop.cpp | 4 +- .../{src => }/Executive_loop_multi_thread.cpp | 8 +- .../Executive_loop_single_thread.cpp | 6 +- .../{src => }/Executive_post_checkpoint.cpp | 8 +- .../{src => }/Executive_process_sim_args.cpp | 4 +- .../Executive_register_scheduler.cpp | 2 +- .../{src => }/Executive_remove_jobs.cpp | 8 +- .../{src => }/Executive_remove_sim_object.cpp | 2 +- .../Executive/{src => }/Executive_restart.cpp | 16 +- .../Executive/{src => }/Executive_run.cpp | 4 +- .../{src => }/Executive_set_job_cycle.cpp | 6 +- .../{src => }/Executive_set_job_onoff.cpp | 6 +- .../{src => }/Executive_set_lock_memory.cpp | 6 +- .../Executive_set_simobject_onoff.cpp | 2 +- .../Executive_set_thread_amf_cycle_time.cpp | 2 +- .../Executive_set_thread_async_wait.cpp | 2 +- .../Executive_set_thread_cpu_affinity.cpp | 2 +- .../Executive_set_thread_enabled.cpp | 2 +- .../Executive_set_thread_priority.cpp | 2 +- .../Executive_set_thread_process_type.cpp | 2 +- .../Executive_set_thread_rt_semaphore.cpp | 2 +- .../Executive_set_time_tic_value.cpp | 8 +- .../{src => }/Executive_shutdown.cpp | 10 +- .../{src => }/Executive_signal_handler.cpp | 2 +- .../Executive/{src => }/Executive_stop.cpp | 4 +- .../{src => }/Executive_terminate.cpp | 6 +- .../Executive_write_s_job_execution.cpp | 8 +- .../Executive_write_s_run_summary.cpp | 10 +- trick_source/sim_services/Executive/Makefile | 4 +- .../sim_services/Executive/Makefile_deps | 2444 ++++++++++++----- .../Executive/{src => }/Threads.cpp | 4 +- .../Executive/{src => }/Threads_child.cpp | 12 +- .../{src => }/Threads_set_amf_cycle_tics.cpp | 2 +- .../{src => }/Threads_set_async_wait.cpp | 2 +- .../{src => }/Threads_set_process_type.cpp | 2 +- .../Executive/{src => }/child_handler.cpp | 0 .../Executive/{ => docs}/design.dox_in | 0 .../Executive/{ => docs}/main_page.dox_in | 0 .../Executive/{ => docs}/requirements.dox_in | 0 .../Executive/{src => }/fpe_handler.cpp | 4 +- .../Executive/{src => }/sig_hand.cpp | 4 +- .../sim_services/Executive/src/makefile | 6 - .../{src => }/ExternalApplication.cpp | 10 +- .../{src => }/ExternalApplicationManager.cpp | 4 +- .../{src => }/ExternalApplication_c_intf.cpp | 12 +- .../ExternalApplications/Makefile | 4 +- .../ExternalApplications/Makefile_deps | 33 + .../{src => }/MalfunctionsTrickView.cpp | 4 +- .../ExternalApplications/MonteMonitor.cpp | 8 + .../{src => }/SimControlPanel.cpp | 4 +- .../{src => }/StripChart.cpp | 6 +- .../{src => }/TrickView.cpp | 6 +- .../{ => docs}/main_page.dox_in | 0 .../ExternalApplications/{ => docs}/mm.dox_in | 0 .../{ => docs}/mtv.dox_in | 0 .../{ => docs}/scp.dox_in | 0 .../ExternalApplications/{ => docs}/tv.dox_in | 0 .../ExternalApplications/src/MonteMonitor.cpp | 8 - .../{src => }/FrameDataRecordGroup.cpp | 6 +- .../FrameLog/{src => }/FrameLog.cpp | 18 +- .../FrameLog/{src => }/FrameLog_c_intf.cpp | 2 +- trick_source/sim_services/FrameLog/Makefile | 4 +- .../sim_services/FrameLog/Makefile_deps | 115 +- .../FrameLog/{ => docs}/main_page.dox_in | 0 .../sim_services/FrameLog/src/makefile | 6 - .../InputProcessor/{src => }/IPPython.cpp | 8 +- .../{src => }/IPPythonEvent.cpp | 16 +- .../{src => }/InputProcessor.cpp | 4 +- .../InputProcessor/{src => }/MTV.cpp | 6 +- .../InputProcessor/{src => }/MTV_c_intf.cpp | 2 +- .../sim_services/InputProcessor/Makefile | 4 +- .../sim_services/InputProcessor/Makefile_deps | 305 +- .../{ => docs}/main_page.dox_in | 0 .../{src => }/input_processor_ext.cpp | 14 +- .../sim_services/InputProcessor/src/makefile | 6 - trick_source/sim_services/Integrator/Makefile | 19 +- .../sim_services/Integrator/Makefile_deps | 591 +++- .../Integrator/er7_algorithms/Makefile | 4 - .../Integrator/include/IntegAlgorithms.hh | 36 - .../Integrator/src/IntegLoopManager.cpp | 18 +- .../Integrator/src/IntegLoopScheduler.cpp | 12 +- .../Integrator/src/IntegLoopSimObject.cpp | 6 +- .../Integrator/src/Integrator.cpp | 6 +- .../Integrator/src/Integrator_C_Intf.cpp | 8 +- .../Integrator/src/getIntegrator.cpp | 10 +- .../Integrator/src/regula_falsi.c | 2 +- .../Integrator/src/reset_regula_falsi.c | 2 +- .../trick_algorithms/ABM_Integrator.cpp | 4 +- .../Euler_Cromer_Integrator.cpp | 4 +- .../trick_algorithms/Euler_Integrator.cpp | 4 +- .../trick_algorithms/MM4_Integrator.cpp | 4 +- .../trick_algorithms/NL2_Integrator.cpp | 4 +- .../trick_algorithms/RK2_Integrator.cpp | 4 +- .../trick_algorithms/RK4_Integrator.cpp | 4 +- .../trick_algorithms/RKF45_Integrator.cpp | 4 +- .../trick_algorithms/RKF78_Integrator.cpp | 4 +- .../trick_algorithms/RKG4_Integrator.cpp | 4 +- .../JITInputFile/{src => }/JITEvent.cpp | 8 +- .../JITInputFile/{src => }/JITInputFile.cpp | 16 +- .../sim_services/JITInputFile/Makefile | 4 +- .../sim_services/JITInputFile/Makefile_deps | 153 +- .../JITInputFile/{ => docs}/main_page.dox_in | 0 .../{src => }/jit_input_file_c_intf.cpp | 8 +- .../sim_services/JITInputFile/src/makefile | 6 - .../{src => }/JSONVariableServer.cpp | 10 +- .../{src => }/JSONVariableServerThread.cpp | 14 +- .../sim_services/JSONVariableServer/Makefile | 4 +- .../JSONVariableServer/Makefile_deps | 37 + .../JSONVariableServer/src/makefile | 6 - .../MasterSlave/{src => }/MSSharedMem.cpp | 6 +- .../MasterSlave/{src => }/MSSocket.cpp | 10 +- .../sim_services/MasterSlave/Makefile | 4 +- .../sim_services/MasterSlave/Makefile_deps | 106 +- .../MasterSlave/{src => }/Master.cpp | 24 +- .../MasterSlave/{src => }/Slave.cpp | 12 +- .../MasterSlave/{ => docs}/design.dox_in | 0 .../MasterSlave/{ => docs}/main_page.dox_in | 0 .../sim_services/MasterSlave/src/makefile | 6 - .../{src => }/ADefParseContext.cpp | 2 +- .../sim_services/MemoryManager/Makefile | 4 +- .../sim_services/MemoryManager/Makefile_deps | 1023 ++++--- .../MemoryManager/{src => }/MemoryManager.cpp | 4 +- .../{src => }/MemoryManager_C_Intf.cpp | 4 +- .../{src => }/MemoryManager_add_attr_info.cpp | 4 +- ...moryManager_add_shared_library_symbols.cpp | 2 +- .../MemoryManager_add_template_name_trans.cpp | 2 +- .../{src => }/MemoryManager_add_var.cpp | 6 +- .../{src => }/MemoryManager_alloc_depends.cpp | 4 +- .../MemoryManager_alloc_info_map.cpp | 2 +- .../{src => }/MemoryManager_clear_memory.cpp | 4 +- .../{src => }/MemoryManager_declare_var.cpp | 4 +- .../{src => }/MemoryManager_delete_var.cpp | 2 +- .../MemoryManager_get_enumerated.cpp | 2 +- .../{src => }/MemoryManager_get_size.cpp | 2 +- .../MemoryManager_get_type_attributes.cpp | 2 +- .../{src => }/MemoryManager_io_src_intf.cpp | 2 +- .../{src => }/MemoryManager_is_alloced.cpp | 2 +- .../MemoryManager_make_declaration.cpp | 2 +- .../MemoryManager_make_reference_attr.cpp | 2 +- .../MemoryManager_map_external_object.cpp | 4 +- .../{src => }/MemoryManager_realloc.cpp | 2 +- .../{src => }/MemoryManager_ref_allocate.cpp | 6 +- .../MemoryManager_ref_assignment.cpp | 12 +- .../MemoryManager_ref_attributes.cpp | 4 +- .../{src => }/MemoryManager_ref_dim.cpp | 10 +- .../{src => }/MemoryManager_ref_name.cpp | 10 +- .../MemoryManager_ref_name_from_address.cpp | 4 +- .../{src => }/MemoryManager_ref_var.cpp | 6 +- .../{src => }/MemoryManager_restore.cpp | 4 +- .../MemoryManager_set_checkpointagent.cpp | 2 +- .../MemoryManager_set_debug_level.cpp | 2 +- .../{src => }/MemoryManager_strdup.cpp | 2 +- .../MemoryManager_write_checkpoint.cpp | 2 +- .../{src => }/MemoryManager_write_var.cpp | 2 +- .../{src => }/RefParseContext.cpp | 2 +- .../MemoryManager/{src => }/addr_bitfield.c | 4 +- .../MemoryManager/{src => }/adef_parser.l | 6 +- .../MemoryManager/{src => }/adef_parser.y | 8 +- .../MemoryManager/definitions_page.dox | 68 - .../MemoryManager/{ => docs}/MM.doxygen | 0 .../MemoryManager/{ => docs}/main_page.dox_in | 0 .../{src => }/extract_bitfield.c | 2 +- .../{src => }/extract_unsigned_bitfield.c | 2 +- .../{src => }/follow_address_path.c | 4 +- .../MemoryManager/{src => }/insert_bitfield.c | 2 +- .../MemoryManager/{src => }/parameter_types.c | 2 +- .../MemoryManager/{src => }/ref_free.cpp | 4 +- .../MemoryManager/{src => }/ref_parser.l | 6 +- .../MemoryManager/{src => }/ref_parser.y | 8 +- .../MemoryManager/{src => }/ref_to_value.c | 8 +- .../MemoryManager/src/convert_07_to_10.dox | 109 - .../sim_services/MemoryManager/src/makefile | 15 - .../MemoryManager/src/placement_new_init.dox | 39 - .../{src => }/trickTypeCharString.c | 2 +- .../MemoryManager/{src => }/vval.c | 8 +- .../MemoryManager/{src => }/wcs_ext.c | 2 +- .../MemoryManagerWrapper/Makefile | 9 - .../MemoryManagerWrapper/Makefile_deps | 161 -- .../include/MemoryManagerWrapper_c_intf.hh | 2 - .../include/checkpoint_map.hh | 2 - .../include/checkpoint_pair.hh | 3 - .../include/checkpoint_queue.hh | 2 - .../include/checkpoint_sequence_stl.hh | 3 - .../include/checkpoint_stack.hh | 2 - .../include/checkpoint_stl.hh | 3 - .../MemoryManagerWrapper/main_page.dox_in | 122 - trick_source/sim_services/Message/Makefile | 4 +- .../sim_services/Message/Makefile_deps | 113 +- .../Message/{src => }/MessageCout.cpp | 4 +- .../Message/{src => }/MessageFile.cpp | 4 +- .../Message/{src => }/MessageLCout.cpp | 2 +- .../Message/{src => }/MessagePublisher.cpp | 6 +- .../Message/{src => }/MessageSubscriber.cpp | 2 +- .../Message/{src => }/MessageTCDevice.cpp | 8 +- .../Message/{src => }/Message_c_intf.cpp | 10 +- .../Message/{src => }/PlaybackFile.cpp | 4 +- .../Message/{ => docs}/main_page.dox_in | 0 .../{src => }/message_publish_standalone.cpp | 0 .../sim_services/Message/src/makefile | 6 - trick_source/sim_services/MonteCarlo/Makefile | 4 +- .../sim_services/MonteCarlo/Makefile_deps | 796 +++--- .../MonteCarlo/{src => }/MonteCarlo.cpp | 4 +- .../{src => }/MonteCarlo_c_intf.cpp | 6 +- .../MonteCarlo_dispatch_run_to_slave.cpp | 8 +- .../{src => }/MonteCarlo_dryrun.cpp | 6 +- .../{src => }/MonteCarlo_execute_monte.cpp | 6 +- .../MonteCarlo/{src => }/MonteCarlo_funcs.cpp | 16 +- .../MonteCarlo_initialize_sockets.cpp | 8 +- .../{src => }/MonteCarlo_master.cpp | 4 +- .../{src => }/MonteCarlo_master_file_io.cpp | 8 +- .../{src => }/MonteCarlo_master_init.cpp | 4 +- .../{src => }/MonteCarlo_master_shutdown.cpp | 12 +- .../{src => }/MonteCarlo_receive_results.cpp | 8 +- .../MonteCarlo_receive_slave_results.cpp | 8 +- .../{src => }/MonteCarlo_run_queue.cpp | 6 +- .../MonteCarlo/{src => }/MonteCarlo_slave.cpp | 8 +- .../{src => }/MonteCarlo_slave_funcs.cpp | 2 +- .../{src => }/MonteCarlo_slave_init.cpp | 10 +- .../MonteCarlo_slave_process_run.cpp | 14 +- .../{src => }/MonteCarlo_spawn_slaves.cpp | 10 +- .../{src => }/MonteVarCalculated.cpp | 8 +- .../MonteCarlo/{src => }/MonteVarFile.cpp | 6 +- .../MonteCarlo/{src => }/MonteVarFixed.cpp | 2 +- .../MonteCarlo/{src => }/MonteVarRandom.cpp | 4 +- .../{src => }/StlRandomGenerator.cpp | 2 +- .../MonteCarlo/{ => docs}/design.dox_in | 0 .../MonteCarlo/{ => docs}/main_page.dox_in | 0 .../sim_services/MonteCarlo/src/makefile | 6 - .../sim_services/RealtimeInjector/Makefile | 4 +- .../RealtimeInjector/Makefile_deps | 58 + .../RealtimeInjector/{src => }/RtiEvent.cpp | 6 +- .../RealtimeInjector/{src => }/RtiExec.cpp | 6 +- .../RealtimeInjector/{src => }/RtiList.cpp | 4 +- .../RealtimeInjector/{src => }/RtiStager.cpp | 8 +- .../{ => docs}/main_page.dox_in | 0 .../RealtimeInjector/src/makefile | 6 - .../sim_services/RealtimeSync/Makefile | 4 +- .../sim_services/RealtimeSync/Makefile_deps | 34 +- .../RealtimeSync/{src => }/RealtimeSync.cpp | 12 +- .../{src => }/RealtimeSync_c_intf.cpp | 6 +- .../RealtimeSync/{ => docs}/design.dox_in | 0 .../RealtimeSync/{ => docs}/main_page.dox_in | 0 .../{ => docs}/requirements.dox_in | 0 .../sim_services/RealtimeSync/src/makefile | 6 - trick_source/sim_services/STL/Makefile | 4 +- trick_source/sim_services/STL/Makefile_deps | 17 + .../STL/{src => }/STLInterface.cpp | 6 +- .../sim_services/STL/{src => }/STLManager.cpp | 2 +- .../STL/{src => }/STLUtilities.cpp | 4 +- .../STL/{ => docs}/main_page.dox_in | 0 trick_source/sim_services/STL/src/makefile | 6 - .../sim_services/ScheduledJobQueue/Makefile | 4 +- .../ScheduledJobQueue/Makefile_deps | 22 +- .../{src => }/ScheduledJobQueue.cpp | 6 +- .../{src => }/ScheduledJobQueueInstrument.cpp | 4 +- .../ScheduledJobQueue/src/makefile | 6 - trick_source/sim_services/Scheduler/Makefile | 4 +- .../sim_services/Scheduler/Makefile_deps | 10 +- .../Scheduler/{src => }/Scheduler.cpp | 2 +- .../sim_services/Scheduler/src/makefile | 6 - .../Sie/{src => }/AttributesMap.cpp | 6 +- .../Sie/{src => }/EnumAttributesMap.cpp | 6 +- trick_source/sim_services/Sie/Makefile | 4 +- trick_source/sim_services/Sie/Makefile_deps | 87 +- .../sim_services/Sie/{src => }/Sie.cpp | 18 +- .../sim_services/Sie/{src => }/sie_c_intf.cpp | 4 +- trick_source/sim_services/Sie/src/makefile | 6 - .../SimObject/{src => }/JobData.cpp | 4 +- trick_source/sim_services/SimObject/Makefile | 4 +- .../sim_services/SimObject/Makefile_deps | 14 +- .../SimObject/{src => }/SimObject.cpp | 2 +- .../sim_services/SimObject/src/makefile | 6 - trick_source/sim_services/SimTime/Makefile | 4 +- .../sim_services/SimTime/Makefile_deps | 14 +- .../SimTime/{src => }/SimTime.cpp | 4 +- .../SimTime/{src => }/SimTime_c_intf.cpp | 4 +- trick_source/sim_services/ThreadBase/Makefile | 4 +- .../sim_services/ThreadBase/Makefile_deps | 8 +- .../ThreadBase/{src => }/ThreadBase.cpp | 6 +- .../sim_services/ThreadBase/src/makefile | 6 - .../sim_services/Timer/{src => }/ITimer.cpp | 6 +- trick_source/sim_services/Timer/Makefile | 4 +- trick_source/sim_services/Timer/Makefile_deps | 15 +- .../sim_services/Timer/{src => }/Timer.cpp | 2 +- .../Timer/{ => docs}/design.dox_in | 0 .../Timer/{ => docs}/main_page.dox_in | 0 .../Timer/{ => docs}/requirements.dox_in | 0 .../Timer/{src => }/it_handler.cpp | 2 +- trick_source/sim_services/Timer/src/makefile | 6 - trick_source/sim_services/UnitTest/Makefile | 4 +- .../sim_services/UnitTest/Makefile_deps | 5 + .../UnitTest/{src => }/UnitTest.cpp | 6 +- .../UnitTest/{src => }/UnitTest_c_intf.cpp | 2 +- .../sim_services/UnitTest/src/makefile | 6 - trick_source/sim_services/Units/Makefile | 4 +- trick_source/sim_services/Units/Makefile_deps | 3 +- .../sim_services/Units/{src => }/UnitsMap.cpp | 2 +- .../sim_services/VariableServer/Makefile | 4 +- .../sim_services/VariableServer/Makefile_deps | 1191 ++++---- .../{src => }/VariableReference.cpp | 10 +- .../{src => }/VariableServer.cpp | 4 +- .../{src => }/VariableServerListenThread.cpp | 14 +- .../{src => }/VariableServerThread.cpp | 6 +- .../VariableServerThread_commands.cpp | 22 +- .../VariableServerThread_connect.cpp | 4 +- .../VariableServerThread_copy_data.cpp | 8 +- .../VariableServerThread_copy_sim_data.cpp | 4 +- .../VariableServerThread_create_socket.cpp | 8 +- .../VariableServerThread_freeze_init.cpp | 4 +- .../{src => }/VariableServerThread_loop.cpp | 18 +- .../VariableServerThread_restart.cpp | 2 +- .../VariableServerThread_write_data.cpp | 16 +- .../VariableServerThread_write_stdio.cpp | 6 +- .../VariableServer_copy_data_freeze.cpp | 2 +- ...iableServer_copy_data_freeze_scheduled.cpp | 4 +- .../VariableServer_copy_data_scheduled.cpp | 4 +- .../VariableServer_copy_data_top.cpp | 2 +- .../{src => }/VariableServer_default_data.cpp | 2 +- .../{src => }/VariableServer_freeze_init.cpp | 8 +- ...riableServer_get_next_freeze_call_time.cpp | 6 +- ...VariableServer_get_next_sync_call_time.cpp | 6 +- .../VariableServer_get_var_server_port.cpp | 2 +- .../{src => }/VariableServer_init.cpp | 4 +- .../{src => }/VariableServer_restart.cpp | 8 +- .../{src => }/VariableServer_shutdown.cpp | 2 +- .../{ => docs}/main_page.dox_in | 0 .../{src => }/exit_var_thread.cpp | 4 +- .../sim_services/VariableServer/src/makefile | 6 - .../{src => }/var_server_ext.cpp | 10 +- .../{src => }/vs_format_ascii.cpp | 12 +- trick_source/sim_services/Zeroconf/Makefile | 4 +- .../sim_services/Zeroconf/Makefile_deps | 2 + .../Zeroconf/{src => }/Zeroconf.cpp | 4 +- .../sim_services/Zeroconf/src/makefile | 6 - trick_source/sim_services/include/Makefile | 4 +- .../sim_services/include/attributes.h | 1 - trick_source/sim_services/include/constant.h | 3 - .../sim_services/include/exec_proto.h | 2 - .../sim_services/include/files_to_ICG.hh | 94 - .../sim_services/include/parameter_types.h | 2 - trick_source/sim_services/include/simtime.h | 4 - trick_source/sim_services/mains/Makefile | 61 +- trick_source/sim_services/mains/Makefile_deps | 24 +- trick_source/sim_services/mains/master.cpp | 6 +- trick_source/trick_swig/Makefile | 4 +- .../trick_swig/PrimitiveAttributesMap.hh | 2 +- trick_source/trick_swig/sim_services.i | 205 +- .../trick_swig/swig_convert_units.cpp | 2 +- trick_source/trick_swig/swig_double.cpp | 2 +- trick_source/trick_swig/swig_int.cpp | 2 +- trick_source/trick_swig/swig_int_typemap.i | 8 +- trick_source/trick_swig/swig_ref.cpp | 6 +- trick_source/trick_swig/swig_ref.hh | 2 +- trick_source/trick_swig/trick_swig.i | 12 +- trick_source/trick_swig/units_attach.i | 2 +- trick_source/trick_utils/comm/Makefile | 8 +- .../trick_utils/comm/include/attributes.h | 134 - trick_source/trick_utils/comm/src/stubs.c | 2 +- trick_source/trick_utils/comm/src/tc_accept.c | 4 +- .../trick_utils/comm/src/tc_blockio.c | 4 +- .../comm/src/tc_broadcast_conninfo.c | 4 +- .../trick_utils/comm/src/tc_clock_init.c | 4 +- .../trick_utils/comm/src/tc_clock_time.c | 4 +- .../trick_utils/comm/src/tc_connect.c | 4 +- .../trick_utils/comm/src/tc_dev_copy.c | 4 +- .../trick_utils/comm/src/tc_disconnect.c | 4 +- trick_source/trick_utils/comm/src/tc_error.c | 4 +- trick_source/trick_utils/comm/src/tc_init.c | 4 +- .../comm/src/tc_init_mcast_client.c | 4 +- .../comm/src/tc_init_mcast_server.c | 4 +- .../trick_utils/comm/src/tc_init_udp_client.c | 4 +- .../trick_utils/comm/src/tc_init_udp_server.c | 4 +- .../trick_utils/comm/src/tc_isValid.c | 4 +- trick_source/trick_utils/comm/src/tc_listen.c | 4 +- .../trick_utils/comm/src/tc_multiconnect.c | 4 +- .../trick_utils/comm/src/tc_pending.c | 4 +- trick_source/trick_utils/comm/src/tc_read.c | 4 +- .../trick_utils/comm/src/tc_read_byteswap.c | 4 +- .../trick_utils/comm/src/tc_set_blockio.c | 4 +- trick_source/trick_utils/comm/src/tc_write.c | 4 +- .../trick_utils/comm/src/tc_write_byteswap.c | 4 +- .../trick_utils/comm/src/trick_bswap_buffer.c | 12 +- .../trick_utils/comm/src/trick_byteswap.c | 4 +- .../trick_utils/comm/src/trick_error_hndlr.c | 4 +- .../trick_utils/interpolator/Makefile | 4 +- .../interpolator/src/Interpolator.cpp | 2 +- trick_source/trick_utils/makefile | 2 +- trick_source/trick_utils/math/Makefile | 4 +- trick_source/trick_utils/math/src/LUD_inv.c | 2 +- trick_source/trick_utils/math/src/LUT_inv.c | 2 +- trick_source/trick_utils/math/src/LU_bksb.c | 2 +- trick_source/trick_utils/math/src/LU_dcmp.c | 2 +- .../trick_utils/math/src/dLU_Choleski.c | 2 +- .../trick_utils/math/src/dLU_solver.c | 2 +- .../trick_utils/math/src/dS_function.c | 2 +- .../trick_utils/math/src/deuler_123.c | 2 +- .../trick_utils/math/src/deuler_132.c | 2 +- .../trick_utils/math/src/deuler_213.c | 2 +- .../trick_utils/math/src/deuler_231.c | 2 +- .../trick_utils/math/src/deuler_312.c | 2 +- .../trick_utils/math/src/deuler_321.c | 2 +- trick_source/trick_utils/math/src/dm_add.c | 2 +- trick_source/trick_utils/math/src/dm_copy.c | 2 +- trick_source/trick_utils/math/src/dm_ident.c | 2 +- trick_source/trick_utils/math/src/dm_init.c | 2 +- trick_source/trick_utils/math/src/dm_invert.c | 2 +- .../trick_utils/math/src/dm_invert_symm.c | 2 +- .../trick_utils/math/src/dm_orthonormal.c | 2 +- trick_source/trick_utils/math/src/dm_print.c | 2 +- trick_source/trick_utils/math/src/dm_scale.c | 2 +- trick_source/trick_utils/math/src/dm_sub.c | 2 +- trick_source/trick_utils/math/src/dm_trans.c | 2 +- trick_source/trick_utils/math/src/dmtxm.c | 2 +- trick_source/trick_utils/math/src/dmtxmt.c | 2 +- trick_source/trick_utils/math/src/dmtxv.c | 2 +- trick_source/trick_utils/math/src/dmxm.c | 2 +- trick_source/trick_utils/math/src/dmxmt.c | 2 +- trick_source/trick_utils/math/src/dmxv.c | 2 +- .../trick_utils/math/src/drandom_gaussian.c | 2 +- .../trick_utils/math/src/dsingle_axis_rot.c | 2 +- trick_source/trick_utils/math/src/dv_add.c | 2 +- trick_source/trick_utils/math/src/dv_copy.c | 2 +- trick_source/trick_utils/math/src/dv_cross.c | 2 +- trick_source/trick_utils/math/src/dv_dot.c | 2 +- trick_source/trick_utils/math/src/dv_init.c | 2 +- trick_source/trick_utils/math/src/dv_mag.c | 2 +- trick_source/trick_utils/math/src/dv_norm.c | 2 +- trick_source/trick_utils/math/src/dv_print.c | 2 +- trick_source/trick_utils/math/src/dv_scale.c | 2 +- trick_source/trick_utils/math/src/dv_skew.c | 2 +- trick_source/trick_utils/math/src/dv_store.c | 2 +- trick_source/trick_utils/math/src/dv_sub.c | 2 +- trick_source/trick_utils/math/src/dvxm.c | 2 +- trick_source/trick_utils/math/src/dvxv_add.c | 2 +- trick_source/trick_utils/math/src/dvxv_sub.c | 2 +- .../trick_utils/math/src/eigen_hh_red.c | 2 +- .../trick_utils/math/src/eigen_jacobi.c | 2 +- .../trick_utils/math/src/eigen_jacobi_4.c | 2 +- trick_source/trick_utils/math/src/eigen_ql.c | 2 +- .../trick_utils/math/src/euler_matrix.c | 4 +- .../trick_utils/math/src/gauss_rnd_bell.c | 4 +- .../trick_utils/math/src/gauss_rnd_pseudo.c | 4 +- trick_source/trick_utils/math/src/mat_copy.c | 2 +- .../trick_utils/math/src/mat_permute.c | 2 +- trick_source/trick_utils/math/src/mat_print.c | 2 +- .../trick_utils/math/src/mat_to_quat.c | 2 +- trick_source/trick_utils/math/src/mat_trans.c | 2 +- trick_source/trick_utils/math/src/matxmat.c | 2 +- trick_source/trick_utils/math/src/matxtrans.c | 2 +- trick_source/trick_utils/math/src/matxvec.c | 2 +- trick_source/trick_utils/math/src/quat_mult.c | 2 +- trick_source/trick_utils/math/src/quat_norm.c | 2 +- .../trick_utils/math/src/quat_norm_integ.c | 2 +- .../trick_utils/math/src/quat_to_mat.c | 2 +- trick_source/trick_utils/math/src/rand_num.c | 2 +- trick_source/trick_utils/math/src/roundoff.c | 2 +- .../trick_utils/math/src/tm_print_error.c | 2 +- trick_source/trick_utils/math/src/transxmat.c | 2 +- .../trick_utils/math/src/transxtrans.c | 2 +- trick_source/trick_utils/math/src/transxvec.c | 2 +- .../trick_utils/math/src/trick_gsl_rand.c | 8 +- .../trick_utils/math/src/trns_fnct_1o.c | 2 +- .../trick_utils/math/src/trns_fnct_2o.c | 2 +- .../trick_utils/math/src/uniform_rnd_1.c | 4 +- .../trick_utils/math/src/uniform_rnd_triple.c | 4 +- trick_source/trick_utils/math/src/vec_print.c | 2 +- trick_source/trick_utils/math/src/wave_form.c | 4 +- trick_source/trick_utils/shm/Makefile | 4 +- .../trick_utils/shm/src/tsm_disconnect.c | 4 +- trick_source/trick_utils/shm/src/tsm_init.c | 4 +- .../trick_utils/shm/src/tsm_init_with_lock.c | 4 +- .../trick_utils/shm/src/tsm_reconnect.c | 4 +- trick_source/trick_utils/trick_adt/Makefile | 4 +- .../trick_utils/trick_adt/src/MapStrToPtr.c | 6 +- trick_source/trick_utils/trick_adt/src/bst.c | 2 +- .../trick_utils/trick_adt/src/bubble_sort.c | 2 +- .../trick_utils/trick_adt/src/dllist.c | 2 +- .../trick_utils/trick_adt/src/lqueue.c | 4 +- .../trick_utils/trick_adt/src/lstack.c | 4 +- .../trick_utils/trick_adt/src/record_array.c | 2 +- trick_source/trick_utils/units/Makefile | 4 +- trick_source/trick_utils/units/src/UCFn.cpp | 2 +- trick_source/trick_utils/units/src/Unit.cpp | 4 +- .../trick_utils/units/src/units_conv.c | 2 +- 1014 files changed, 7205 insertions(+), 7870 deletions(-) delete mode 100755 bin/ICG delete mode 100755 bin/dre delete mode 100755 bin/fxplot delete mode 100755 bin/gxplot delete mode 100755 bin/install_user delete mode 100644 bin/tex/longtable.dvi delete mode 100644 bin/tex/longtable.sty rename bin/{CP => trick-CP} (95%) rename bin/{trick_dp => trick-dp} (58%) create mode 100755 bin/trick-dre rename bin/{gte => trick-gte} (67%) rename bin/{jxplot => trick-jxplot} (53%) rename bin/{kill_sim => trick-killsim} (100%) rename bin/{mm => trick-mm} (58%) rename bin/{mtv => trick-mtv} (60%) rename bin/{trick_qp => trick-qp} (53%) rename bin/{sie => trick-sie} (58%) rename bin/{sim_control => trick-simcontrol} (65%) rename bin/{sniffer => trick-sniffer} (61%) rename bin/{trick_stripchart => trick-stripchart} (63%) rename bin/{tv => trick-tv} (58%) rename bin/{trick_version => trick-version} (94%) delete mode 100755 bin/trk2ascii delete mode 100755 bin/trk2csv rename {trick_source/sim_services/Integrator/er7_algorithms => include/trick}/ABM_Integrator.hh (75%) rename {trick_source/sim_services/MemoryManager/include => include/trick}/ADefParseContext.hh (96%) rename {trick_source/sim_services/Sie/include => include/trick}/AttributesMap.hh (97%) rename {trick_source/sim_services/MemoryManager/include => include/trick}/AttributesTypeID.hh (100%) rename {trick_source/sim_services/Clock/include => include/trick}/BC635Clock.hh (96%) rename {trick_source/sim_services/CheckPointAgent/include => include/trick}/CheckPointAgent.hh (95%) rename {trick_source/sim_services/CheckPointRestart/include => include/trick}/CheckPointRestart.hh (99%) rename {trick_source/sim_services/CheckPointRestart/include => include/trick}/CheckPointRestart_c_intf.hh (100%) rename {trick_source/sim_services/CheckPointAgent/include => include/trick}/ChkPtParseContext.hh (91%) rename {trick_source/sim_services/CheckPointAgent/include => include/trick}/ClassicCheckPointAgent.hh (98%) rename {trick_source/sim_services/Clock/include => include/trick}/Clock.hh (100%) rename {trick_source/sim_services/CommandLineArguments/include => include/trick}/CommandLineArguments.hh (100%) rename {trick_source/sim_services/DMTCP/include => include/trick}/DMTCP.hh (94%) rename {trick_source/sim_services/DataRecord/include => include/trick}/DRAscii.hh (98%) rename {trick_source/sim_services/DataRecord/include => include/trick}/DRBinary.hh (98%) rename {trick_source/sim_services/DataRecord/include => include/trick}/DRHDF5.hh (98%) rename {trick_source/sim_services/DataRecord/include => include/trick}/DataRecordDispatcher.hh (96%) rename {trick_source/sim_services/DataRecord/include => include/trick}/DataRecordGroup.hh (99%) rename {trick_source/sim_services/DebugPause/include => include/trick}/DebugPause.hh (97%) rename {trick_source/sim_services/EchoJobs/include => include/trick}/EchoJobs.hh (97%) rename {trick_source/sim_services/Sie/include => include/trick}/EnumAttributesMap.hh (97%) rename {trick_source/sim_services/Environment/include => include/trick}/Environment.hh (100%) rename {trick_source/sim_services/Integrator/er7_algorithms => include/trick}/Euler_Cromer_Integrator.hh (75%) rename {trick_source/sim_services/Integrator/er7_algorithms => include/trick}/Euler_Integrator.hh (75%) rename {trick_source/sim_services/EventManager/include => include/trick}/Event.hh (98%) rename {trick_source/sim_services/EventManager/include => include/trick}/EventInstrument.hh (85%) rename {trick_source/sim_services/EventManager/include => include/trick}/EventManager.hh (97%) rename {trick_source/sim_services/EventManager/include => include/trick}/EventManager_c_intf.hh (91%) rename {trick_source/sim_services/EventManager/include => include/trick}/EventProcessor.hh (96%) rename {trick_source/sim_services/Executive/include => include/trick}/Exec_exception.hh (100%) rename {trick_source/sim_services/Executive/include => include/trick}/Executive.hh (99%) rename {trick_source/sim_services/ExternalApplications/include => include/trick}/ExternalApplication.hh (100%) rename {trick_source/sim_services/ExternalApplications/include => include/trick}/ExternalApplicationManager.hh (97%) rename {trick_source/sim_services/include => include/trick}/Flag.h (100%) rename {trick_source/sim_services/FrameLog/include => include/trick}/FrameDataRecordGroup.hh (95%) rename {trick_source/sim_services/FrameLog/include => include/trick}/FrameLog.hh (97%) rename {trick_source/sim_services/Clock/include => include/trick}/GetTimeOfDayClock.hh (97%) rename {trick_source/sim_services/InputProcessor/include => include/trick}/IPPython.hh (97%) rename {trick_source/sim_services/InputProcessor/include => include/trick}/IPPythonEvent.hh (99%) rename {trick_source/sim_services/Timer/include => include/trick}/ITimer.hh (98%) rename {trick_source/sim_services/InputProcessor/include => include/trick}/InputProcessor.hh (100%) rename {trick_source/sim_services/SimObject/include => include/trick}/InstrumentBase.hh (95%) create mode 100644 include/trick/IntegAlgorithms.hh rename {trick_source/sim_services/Integrator/include => include/trick}/IntegJobClassId.hh (100%) rename {trick_source/sim_services/Integrator/include => include/trick}/IntegLoopManager.hh (99%) rename {trick_source/sim_services/Integrator/include => include/trick}/IntegLoopScheduler.hh (98%) rename {trick_source/sim_services/Integrator/include => include/trick}/IntegLoopSimObject.hh (88%) rename {trick_source/sim_services/Integrator/include => include/trick}/Integrator.hh (98%) rename {trick_source/trick_utils/interpolator/include => include/trick}/Interpolator.hh (100%) rename {trick_source/sim_services/JITInputFile/include => include/trick}/JITEvent.hh (91%) rename {trick_source/sim_services/JITInputFile/include => include/trick}/JITInputFile.hh (96%) rename {trick_source/sim_services/JSONVariableServer/include => include/trick}/JSONVariableServer.hh (96%) rename {trick_source/sim_services/JSONVariableServer/include => include/trick}/JSONVariableServerThread.hh (95%) rename {trick_source/sim_services/SimObject/include => include/trick}/JobData.hh (99%) rename {trick_source/sim_services/Integrator/er7_algorithms => include/trick}/MM4_Integrator.hh (77%) rename {trick_source/sim_services/MasterSlave/include => include/trick}/MSConnect.hh (98%) rename {trick_source/sim_services/MasterSlave/include => include/trick}/MSSharedMem.hh (97%) rename {trick_source/sim_services/MasterSlave/include => include/trick}/MSSocket.hh (98%) rename {trick_source/sim_services/InputProcessor/include => include/trick}/MTV.hh (94%) create mode 100644 include/trick/Makefile rename {trick_source/sim_services/ExternalApplications/include => include/trick}/MalfunctionsTrickView.hh (90%) rename {trick_source/trick_utils/trick_adt/include => include/trick}/MapStrToPtr.h (99%) rename {trick_source/sim_services/MasterSlave/include => include/trick}/Master.hh (98%) rename {trick_source/sim_services/MemoryManager/include => include/trick}/MemoryManager.hh (98%) rename {trick_source/sim_services/Message/include => include/trick}/MessageCout.hh (95%) rename {trick_source/sim_services/Message/include => include/trick}/MessageFile.hh (97%) rename {trick_source/sim_services/Message/include => include/trick}/MessageLCout.hh (93%) rename {trick_source/sim_services/Message/include => include/trick}/MessagePublisher.hh (97%) rename {trick_source/sim_services/Message/include => include/trick}/MessageSubscriber.hh (100%) rename {trick_source/sim_services/Message/include => include/trick}/MessageTCDevice.hh (95%) rename {trick_source/sim_services/Message/include => include/trick}/Message_proto.hh (92%) rename {trick_source/sim_services/MonteCarlo/include => include/trick}/MonteCarlo.hh (99%) rename {trick_source/sim_services/ExternalApplications/include => include/trick}/MonteMonitor.hh (87%) rename {trick_source/sim_services/MonteCarlo/include => include/trick}/MonteVar.hh (100%) rename {trick_source/sim_services/MonteCarlo/include => include/trick}/MonteVarCalculated.hh (94%) rename {trick_source/sim_services/MonteCarlo/include => include/trick}/MonteVarFile.hh (98%) rename {trick_source/sim_services/MonteCarlo/include => include/trick}/MonteVarFixed.hh (97%) rename {trick_source/sim_services/MonteCarlo/include => include/trick}/MonteVarRandom.hh (97%) rename {trick_source/sim_services/Integrator/er7_algorithms => include/trick}/NL2_Integrator.hh (75%) rename {trick_source/sim_services/Message/include => include/trick}/PlaybackFile.hh (92%) rename {trick_source/sim_services/CheckPointAgent/include => include/trick}/PythonPrint.hh (97%) rename {trick_source/sim_services/Integrator/er7_algorithms => include/trick}/RK2_Integrator.hh (78%) rename {trick_source/sim_services/Integrator/er7_algorithms => include/trick}/RK4_Integrator.hh (76%) rename {trick_source/sim_services/Integrator/er7_algorithms => include/trick}/RKF45_Integrator.hh (74%) rename {trick_source/sim_services/Integrator/er7_algorithms => include/trick}/RKF78_Integrator.hh (75%) rename {trick_source/sim_services/Integrator/er7_algorithms => include/trick}/RKG4_Integrator.hh (75%) rename {trick_source/sim_services/RealtimeSync/include => include/trick}/RealtimeSync.hh (99%) rename {trick_source/sim_services/MemoryManager/include => include/trick}/RefParseContext.hh (93%) rename {trick_source/sim_services/include => include/trick}/RemoteShell.hh (100%) rename {trick_source/sim_services/RealtimeInjector/include => include/trick}/RtiEvent.hh (95%) rename {trick_source/sim_services/RealtimeInjector/include => include/trick}/RtiExec.hh (98%) rename {trick_source/sim_services/RealtimeInjector/include => include/trick}/RtiList.hh (90%) rename {trick_source/sim_services/RealtimeInjector/include => include/trick}/RtiStager.hh (97%) rename {trick_source/sim_services/STL/include => include/trick}/STLInterface.hh (100%) rename {trick_source/sim_services/STL/include => include/trick}/STLManager.hh (91%) rename {trick_source/sim_services/STL/include => include/trick}/STLUtilities.hh (100%) rename {trick_source/sim_services/ScheduledJobQueue/include => include/trick}/ScheduledJobQueue.hh (99%) rename {trick_source/sim_services/ScheduledJobQueue/include => include/trick}/ScheduledJobQueueInstrument.hh (93%) rename {trick_source/sim_services/Scheduler/include => include/trick}/Scheduler.hh (97%) rename {trick_source/sim_services/Sie/include => include/trick}/Sie.hh (91%) rename {trick_source/sim_services/ExternalApplications/include => include/trick}/SimControlPanel.hh (91%) rename {trick_source/sim_services/SimObject/include => include/trick}/SimObject.hh (98%) rename {trick_source/sim_services/SimTime/include => include/trick}/SimTime.hh (96%) rename {trick_source/sim_services/MasterSlave/include => include/trick}/Slave.hh (98%) rename {trick_source/sim_services/MonteCarlo/include => include/trick}/StlRandomGenerator.hh (98%) rename {trick_source/sim_services/MonteCarlo/include => include/trick}/StlRandomGeneratorSub.hh (100%) rename {trick_source/sim_services/ExternalApplications/include => include/trick}/StripChart.hh (95%) rename {trick_source/sim_services/Clock/include => include/trick}/TPROCTEClock.hh (95%) rename {trick_source/sim_services/ThreadBase/include => include/trick}/ThreadBase.hh (100%) rename {trick_source/sim_services/Executive/include => include/trick}/Threads.hh (97%) rename {trick_source/sim_services/Timer/include => include/trick}/Timer.hh (100%) rename {trick_source/sim_services/include => include/trick}/TrickConstant.hh (100%) rename {trick_source/sim_services/ExternalApplications/include => include/trick}/TrickView.hh (97%) rename {trick_source/trick_utils/units/include => include/trick}/UCFn.hh (100%) rename {trick_source/trick_utils/units/include => include/trick}/Unit.hh (97%) rename {trick_source/sim_services/UnitTest/include => include/trick}/UnitTest.hh (100%) rename {trick_source/sim_services/Units/include => include/trick}/UnitsMap.hh (100%) rename {trick_source/sim_services/VariableServer/include => include/trick}/VariableServer.hh (96%) rename {trick_source/sim_services/VariableServer/include => include/trick}/VariableServerListenThread.hh (95%) rename {trick_source/sim_services/VariableServer/include => include/trick}/VariableServerReference.hh (90%) rename {trick_source/sim_services/VariableServer/include => include/trick}/VariableServerThread.hh (98%) rename {trick_source/sim_services/Zeroconf/include => include/trick}/Zeroconf.hh (100%) rename {trick_source/sim_services/MemoryManager/include => include/trick}/attributes.h (98%) rename {trick_source/sim_services/MemoryManager/include => include/trick}/bitfield_proto.h (97%) rename {trick_source/trick_utils/trick_adt/include => include/trick}/bst.h (100%) rename {trick_source/sim_services/CheckPointRestart/include => include/trick}/checkpoint_map.hh (99%) rename {trick_source/sim_services/CheckPointRestart/include => include/trick}/checkpoint_pair.hh (98%) rename {trick_source/sim_services/CheckPointRestart/include => include/trick}/checkpoint_queue.hh (97%) rename {trick_source/sim_services/CheckPointRestart/include => include/trick}/checkpoint_sequence_stl.hh (98%) rename {trick_source/sim_services/CheckPointRestart/include => include/trick}/checkpoint_stack.hh (93%) rename {trick_source/sim_services/CheckPointRestart/include => include/trick}/checkpoint_stl.hh (53%) rename {trick_source/sim_services/STL/include => include/trick}/checkpoint_trick_map_stl.hh (99%) rename {trick_source/sim_services/STL/include => include/trick}/checkpoint_trick_pair_stl.hh (98%) rename {trick_source/sim_services/STL/include => include/trick}/checkpoint_trick_sequence_stl.hh (96%) rename {trick_source/sim_services/Clock/include => include/trick}/clock_proto.h (100%) rename {trick_source/sim_services/include => include/trick}/collect_macros.h (89%) rename {trick_source/sim_services/Collect/include => include/trick}/collect_proto.hh (100%) rename {trick_source/sim_services/CommandLineArguments/include => include/trick}/command_line_protos.h (100%) create mode 120000 include/trick/compat/sim_services/Executive/include/exec_proto.h create mode 120000 include/trick/compat/sim_services/Executive/include/exec_proto.hh create mode 100644 include/trick/compat/sim_services/Integrator/include/Integrator.hh create mode 120000 include/trick/compat/sim_services/Integrator/include/integrator_c_intf.h create mode 120000 include/trick/compat/sim_services/MemoryManager/include/MemoryManager.hh create mode 120000 include/trick/compat/sim_services/MemoryManager/include/attributes.h create mode 120000 include/trick/compat/sim_services/MemoryManager/include/memorymanager_c_intf.h create mode 120000 include/trick/compat/sim_services/MemoryManager/include/parameter_types.h create mode 100644 include/trick/compat/sim_services/MemoryManagerWrapper/MemoryManagerWrapper_c_intf.hh create mode 100644 include/trick/compat/sim_services/MemoryManagerWrapper/checkpoint_map.hh create mode 100644 include/trick/compat/sim_services/MemoryManagerWrapper/checkpoint_pair.hh create mode 100644 include/trick/compat/sim_services/MemoryManagerWrapper/checkpoint_queue.hh create mode 100644 include/trick/compat/sim_services/MemoryManagerWrapper/checkpoint_sequence_stl.hh create mode 100644 include/trick/compat/sim_services/MemoryManagerWrapper/checkpoint_stack.hh create mode 100644 include/trick/compat/sim_services/MemoryManagerWrapper/checkpoint_stl.hh create mode 120000 include/trick/compat/sim_services/Message/include/message_proto.h create mode 120000 include/trick/compat/sim_services/Message/include/message_type.h create mode 120000 include/trick/compat/sim_services/UnitTest/include/trick_tests.h create mode 120000 include/trick/compat/sim_services/include/collect_macros.h create mode 120000 include/trick/compat/sim_services/include/constant.h create mode 120000 include/trick/compat/sim_services/include/mm_macros.hh create mode 120000 include/trick/compat/trick_utils/units/include/constant.h rename {trick_source/trick_utils/math/include => include/trick}/complex.h (100%) rename {trick_source/trick_utils/units/include => include/trick}/constant.h (100%) rename {trick_source/sim_services/DataRecord/include => include/trick}/data_record_proto.h (90%) rename {trick_source/sim_services/DebugPause/include => include/trick}/debug_pause_proto.h (100%) rename {trick_source/trick_utils/trick_adt/include => include/trick}/dllist.h (100%) rename {trick_source/sim_services/DMTCP/include => include/trick}/dmtcp_checkpoint_c_intf.hh (100%) rename {trick_source/sim_services/EchoJobs/include => include/trick}/echojobs_proto.h (100%) rename {trick_source/sim_services/Environment/include => include/trick}/env_proto.h (100%) create mode 100644 include/trick/er7_algorithms/Makefile rename {trick_source/sim_services/Executive/include => include/trick}/exec_proto.h (98%) rename {trick_source/sim_services/Executive/include => include/trick}/exec_proto.hh (85%) rename {trick_source/sim_services/ExternalApplications/include => include/trick}/external_application_c_intf.h (100%) create mode 100644 include/trick/files_to_ICG.hh rename {trick_source/sim_services/FrameLog/include => include/trick}/framelog_proto.h (100%) rename {trick_source/trick_utils/comm/include => include/trick}/hs_msg.h (100%) rename {trick_source/sim_services/InputProcessor/include => include/trick}/input_processor_proto.h (100%) rename {trick_source/sim_services/Integrator/include => include/trick}/integrator_c_intf.h (100%) rename {trick_source/sim_services/MemoryManager/include => include/trick}/io_alloc.h (93%) rename {trick_source/sim_services/JITInputFile/include => include/trick}/jit_input_file_proto.hh (100%) rename {trick_source/trick_utils/trick_adt/include => include/trick}/lqueue.h (96%) rename {trick_source/trick_utils/trick_adt/include => include/trick}/lstack.h (96%) rename {trick_source/sim_services/MasterSlave/include => include/trick}/master_proto.h (100%) rename {trick_source/trick_utils/math/include => include/trick}/matrix_macros.h (100%) rename {trick_source/sim_services/MemoryManager/include => include/trick}/memorymanager_c_intf.h (91%) rename {trick_source/sim_services/Message/include => include/trick}/message_proto.h (94%) rename {trick_source/sim_services/Message/include => include/trick}/message_type.h (100%) rename {trick_source/sim_services/MemoryManager/include => include/trick}/mm_error.h (100%) rename {trick_source/sim_services/include => include/trick}/mm_macros.hh (93%) rename {trick_source/sim_services/MonteCarlo/include => include/trick}/montecarlo_c_intf.h (99%) rename {trick_source/sim_services/MasterSlave/include => include/trick}/ms_sim_mode.h (100%) rename {trick_source/trick_utils/trick_adt/include => include/trick}/outdllist.h (100%) rename {trick_source/sim_services/MemoryManager/include => include/trick}/parameter_types.h (100%) rename {trick_source/sim_services/include => include/trick}/populate_attribute_maps.hh (100%) rename {trick_source/trick_utils/math/include => include/trick}/quat_macros.h (98%) rename {trick_source/trick_utils/math/include => include/trick}/rand_generator.h (100%) rename {trick_source/sim_services/RealtimeSync/include => include/trick}/realtimesync_proto.h (84%) rename {trick_source/trick_utils/trick_adt/include => include/trick}/record_array.h (98%) rename {trick_source/sim_services/MemoryManager/include => include/trick}/reference.h (92%) rename {trick_source/trick_utils/math/include => include/trick}/reference_frame.h (100%) rename {trick_source/sim_services/Integrator/include => include/trick}/regula_falsi.h (100%) rename {trick_source/sim_services/include => include/trick}/release.h (100%) rename {trick_source/sim_services/include => include/trick}/roundoff.h (100%) rename {trick_source/sim_services/Sie/include => include/trick}/sie_c_intf.h (100%) rename {trick_source/sim_services/Executive/include => include/trick}/sim_mode.h (100%) create mode 100644 include/trick/simtime.h rename {trick_source/sim_services/SimTime/include => include/trick}/simtime_proto.h (90%) rename {trick_source/trick_utils/trick_adt/include => include/trick}/sizedata.h (100%) rename {trick_source/sim_services/CheckPointRestart/include => include/trick}/stl_s_define_macro.hh (100%) rename {trick_source/trick_utils/comm/include => include/trick}/tc.h (100%) rename {trick_source/trick_utils/comm/include => include/trick}/tc_proto.h (98%) rename {trick_source/sim_services/SimTime/include => include/trick}/time_offset.h (100%) rename {trick_source/sim_services/Integrator => include/trick}/trick_algorithms/ABM_Integrator.hh (94%) rename {trick_source/sim_services/Integrator => include/trick}/trick_algorithms/Euler_Cromer_Integrator.hh (96%) rename {trick_source/sim_services/Integrator => include/trick}/trick_algorithms/Euler_Integrator.hh (94%) rename {trick_source/sim_services/Integrator => include/trick}/trick_algorithms/MM4_Integrator.hh (94%) rename {trick_source/sim_services/Integrator => include/trick}/trick_algorithms/NL2_Integrator.hh (94%) rename {trick_source/sim_services/Integrator => include/trick}/trick_algorithms/RK2_Integrator.hh (94%) rename {trick_source/sim_services/Integrator => include/trick}/trick_algorithms/RK4_Integrator.hh (94%) rename {trick_source/sim_services/Integrator => include/trick}/trick_algorithms/RKF45_Integrator.hh (95%) rename {trick_source/sim_services/Integrator => include/trick}/trick_algorithms/RKF78_Integrator.hh (94%) rename {trick_source/sim_services/Integrator => include/trick}/trick_algorithms/RKG4_Integrator.hh (94%) rename {trick_source/trick_utils/comm/include => include/trick}/trick_byteswap.h (100%) rename {trick_source/sim_services/STL/include => include/trick}/trick_deque.hh (98%) rename {trick_source/trick_utils/comm/include => include/trick}/trick_error_hndlr.h (100%) rename {trick_source/sim_services/STL/include => include/trick}/trick_list.hh (98%) rename {trick_source/sim_services/STL/include => include/trick}/trick_map.hh (99%) rename {trick_source/trick_utils/math/include => include/trick}/trick_math.h (100%) rename {trick_source/trick_utils/math/include => include/trick}/trick_math_error.h (100%) rename {trick_source/trick_utils/math/include => include/trick}/trick_math_proto.h (99%) rename {trick_source/sim_services/STL/include => include/trick}/trick_pair.hh (99%) rename {trick_source/sim_services/STL/include => include/trick}/trick_queue.hh (99%) rename {trick_source/sim_services/STL/include => include/trick}/trick_set.hh (99%) rename {trick_source/sim_services/STL/include => include/trick}/trick_stack.hh (97%) rename {trick_source/sim_services/UnitTest/include => include/trick}/trick_tests.h (100%) rename {trick_source/sim_services/STL/include => include/trick}/trick_vector.hh (98%) rename {trick_source/trick_utils/shm/include => include/trick}/tsm.h (100%) rename {trick_source/trick_utils/shm/include => include/trick}/tsm_proto.h (96%) rename {trick_source/trick_utils/units/include => include/trick}/units_conv.h (100%) rename {trick_source/sim_services/include => include/trick}/unix_commands.h (100%) rename {trick_source/sim_services/MemoryManager/include => include/trick}/value.h (97%) rename {trick_source/sim_services/MemoryManager/include => include/trick}/var.h (91%) rename {trick_source/sim_services/VariableServer/include => include/trick}/variable_server.h (94%) rename {trick_source/sim_services/VariableServer/include => include/trick}/variable_server_message_types.h (100%) rename {trick_source/sim_services/VariableServer/include => include/trick}/variable_server_proto.h (100%) rename {trick_source/sim_services/VariableServer/include => include/trick}/variable_server_sync_types.h (100%) rename {trick_source/trick_utils/math/include => include/trick}/vector_macros.h (100%) rename {trick_source/sim_services/MemoryManager/include => include/trick}/vval.h (93%) rename {trick_source/trick_utils/math/include => include/trick}/wave_form.h (100%) rename {trick_source/sim_services/MemoryManager/include => include/trick}/wcs_ext.h (100%) rename {bin => libexec/trick}/ICG_10 (100%) rename {bin => libexec/trick}/MIS (100%) rename {bin => libexec/trick}/condense_list.pl (100%) rename bin/C3PO => libexec/trick/configuration_processor (100%) rename {bin => libexec/trick}/convert_swig (99%) rename {bin => libexec/trick}/convert_tv_file (100%) rename {bin => libexec/trick}/dd_convert (100%) rename {bin => libexec/trick}/default_data_convert (100%) rename {bin => libexec/trick}/depend_cp (100%) rename {bin => libexec/trick}/depend_objs (100%) rename {bin => libexec/trick}/java/.gitignore (100%) rename {bin => libexec/trick}/java/bin/README (100%) rename {bin => libexec/trick}/java/bin/sim_control.bat (100%) rename {bin => libexec/trick}/java/bin/sniffer.bat (100%) rename {bin => libexec/trick}/java/bin/tv.bat (100%) rename {bin => libexec/trick}/java/lib/.gitignore (100%) rename {bin => libexec/trick}/java/lib/CatalogManager.properties (100%) rename {bin => libexec/trick}/java/lib/Makefile (100%) rename {bin => libexec/trick}/make_build (100%) rename {bin => libexec/trick}/make_changelog (100%) rename {bin => libexec/trick}/mis_dep (100%) rename {bin => libexec/trick}/pm/ICG.pm (100%) rename {bin => libexec/trick}/pm/MIS.pm (100%) rename {bin => libexec/trick}/pm/auto_doc.pm (100%) rename {bin => libexec/trick}/pm/default_data.pm (100%) rename {bin => libexec/trick}/pm/edit.pm (100%) rename {bin => libexec/trick}/pm/find_module.pm (100%) rename {bin => libexec/trick}/pm/get_headers.pm (100%) rename {bin => libexec/trick}/pm/gte.pm (100%) rename {bin => libexec/trick}/pm/html.pm (100%) rename {bin => libexec/trick}/pm/make_makefile.pm (97%) rename {bin => libexec/trick}/pm/make_no_swig_makefile.pm (100%) rename {bin => libexec/trick}/pm/make_swig_makefile.pm (98%) rename {bin => libexec/trick}/pm/mis_dep.pm (100%) rename {bin => libexec/trick}/pm/parse_s_define.pm (100%) rename {bin => libexec/trick}/pm/s_source.pm (97%) rename {bin => libexec/trick}/pm/trick_print.pm (100%) rename {bin => libexec/trick}/pm/trick_units.pm (100%) rename {bin => libexec/trick}/pm/trick_version.pm (88%) rename {bin => libexec/trick}/run_java_test (100%) rename {bin => libexec/trick}/s_main_dmtcp.py (100%) rename {bin => libexec/trick}/start_sim (100%) rename {bin => libexec/trick}/trick_make_checksums (100%) rename {bin => libexec/trick}/trick_verify_checksums (100%) rename {bin => libexec/trick}/vc (100%) rename {docs => share/doc/trick}/.gitignore (100%) rename {docs => share/doc/trick}/Basics_of_Program_Memory_and_Variables.pdf (100%) rename {docs => share/doc/trick}/Basics_of_Program_Memory_and_Variables.ppt (100%) rename {docs => share/doc/trick}/CP.txt (100%) rename {docs => share/doc/trick}/Compiling_and_Linking_Overview.pdf (100%) rename {docs => share/doc/trick}/Compiling_and_Linking_Overview.ppt (100%) rename {docs => share/doc/trick}/Trick_Advanced_Topics.pdf (100%) rename {docs => share/doc/trick}/Trick_Advanced_Topics.pptx (100%) rename {docs => share/doc/trick}/Trick_Software_Design_Document.doc (100%) rename {docs => share/doc/trick}/Trick_Software_Development_Plan.doc (100%) rename {docs => share/doc/trick}/Trick_Software_Quality_Assurance_Plan.doc (100%) rename {docs => share/doc/trick}/Trick_Software_Requirement_Specification.doc (100%) rename {docs => share/doc/trick}/Trick_Tutorial_Review.pdf (100%) rename {docs => share/doc/trick}/Trick_Tutorial_Review.pptx (100%) rename {docs => share/doc/trick}/advanced/Cplusplus.ppt (100%) rename {docs => share/doc/trick}/advanced/Distributed_Sims.ppt (100%) rename {docs => share/doc/trick}/advanced/Events_and_Malfunctions.ppt (100%) rename {docs => share/doc/trick}/advanced/MonteCarlo_Presentation.pdf (100%) rename {docs => share/doc/trick}/advanced/MonteCarlo_Presentation.pptx (100%) rename {docs => share/doc/trick}/advanced/Multithreads.pptx (100%) rename {docs => share/doc/trick}/advanced/Realtime.pptx (100%) rename {docs => share/doc/trick}/advanced/Trick_07_to_10.pptx (100%) rename {docs => share/doc/trick}/advanced/Trick_Checkpointing.pptx (100%) rename {docs => share/doc/trick}/advanced/Trick_Checkpointing_DMTCP.pdf (100%) rename {docs => share/doc/trick}/advanced/Trick_Checkpointing_DMTCP.pptx (100%) rename {docs => share/doc/trick}/advanced/Trick_Memory_Manager_Overview.ppt (100%) rename {docs => share/doc/trick}/advanced/VariableServer.pptx (100%) rename {docs => share/doc/trick}/design.doc (100%) rename {docs => share/doc/trick}/design.pdf (100%) rename {docs => share/doc/trick}/trick_module.xsl (100%) rename {docs => share/doc/trick}/trick_module_tex.xsl (100%) rename {docs => share/doc/trick}/trick_s_define.xsl (100%) rename {docs => share/doc/trick}/trick_struct.xsl (100%) rename {docs => share/doc/trick}/trick_struct_tex.xsl (100%) rename {docs => share/doc/trick}/tutorial.doc (100%) rename {docs => share/doc/trick}/tutorial.pdf (100%) rename {docs => share/doc/trick}/users_guide.html (100%) rename {man => share/man}/man1/CP.1 (100%) rename {man => share/man}/man1/Create_Token.1 (100%) rename {man => share/man}/man1/ICG.1 (100%) rename {man => share/man}/man1/MIS.1 (100%) rename {man => share/man}/man1/Replace_Token.1 (100%) rename {man => share/man}/man1/catalog.1 (100%) rename {man => share/man}/man1/kill_sim.1 (100%) rename {man => share/man}/man1/make_build.1 (100%) rename {bin => share/trick}/MAKE_out_header.txt (100%) rename {bin => share/trick/env}/Trick.cshrc (100%) rename {bin => share/trick/env}/Trick.profile (100%) rename {bin => share/trick}/gdb_commands (100%) rename {makefiles => share/trick/makefiles}/Makefile.common (74%) rename {makefiles => share/trick/makefiles}/Makefile.sim (74%) rename {makefiles => share/trick/makefiles}/Makefile.tricklib (97%) rename {trick_source => share/trick}/sim_objects/BC635Clock.sm (80%) rename {trick_source => share/trick}/sim_objects/EmptyInputProcessor.sm (100%) rename {trick_source => share/trick}/sim_objects/STL.sm (93%) rename {trick_source => share/trick}/sim_objects/SegmentedExecutive.sm (100%) rename {trick_source => share/trick}/sim_objects/TPROClock.sm (79%) rename {trick_source => share/trick}/sim_objects/default_trick_sys.sm (85%) rename {bin => share/trick}/trick_ver.txt (100%) rename {bin => share/trick}/valgrind_supressions.txt (100%) delete mode 120000 trick_source/data_products/Log/parameter_types.h rename trick_source/sim_services/CheckPointAgent/{src => }/CheckPointAgent.cpp (94%) rename trick_source/sim_services/CheckPointAgent/{src => }/ChkPtParseContext.cpp (89%) rename trick_source/sim_services/CheckPointAgent/{src => }/ClassicCheckPointerAgent.cpp (98%) create mode 100644 trick_source/sim_services/CheckPointAgent/Makefile_deps rename trick_source/sim_services/CheckPointAgent/{src => }/PythonPrint.cpp (97%) rename trick_source/sim_services/CheckPointAgent/{ => docs}/main_page.dox_in (100%) rename trick_source/sim_services/CheckPointAgent/{src => }/input_parser.l (98%) rename trick_source/sim_services/CheckPointAgent/{src => }/input_parser.y (98%) rename trick_source/sim_services/CheckPointRestart/{src => }/CheckPointRestart.cpp (95%) rename trick_source/sim_services/CheckPointRestart/{src => }/CheckPointRestart_c_intf.cpp (94%) rename trick_source/sim_services/CheckPointRestart/{src => }/checkpoint_map.cpp (92%) rename trick_source/sim_services/CheckPointRestart/{src => }/checkpoint_pair.cpp (96%) rename trick_source/sim_services/CheckPointRestart/{src => }/checkpoint_queue.cpp (97%) rename trick_source/sim_services/CheckPointRestart/{src => }/checkpoint_sequence_stl.cpp (95%) rename trick_source/sim_services/CheckPointRestart/{src => }/checkpoint_stack.cpp (96%) rename trick_source/sim_services/CheckPointRestart/{src => }/next_attr_name.cpp (80%) delete mode 100644 trick_source/sim_services/CheckPointRestart/src/makefile rename trick_source/sim_services/Clock/{src => }/BC635Clock.cpp (95%) rename trick_source/sim_services/Clock/{src => }/Clock.cpp (95%) delete mode 100644 trick_source/sim_services/Clock/Clock.doxygen rename trick_source/sim_services/Clock/{src => }/GetTimeOfDayClock.cpp (92%) rename trick_source/sim_services/Clock/{src => }/TPROCTEClock.cpp (93%) rename trick_source/sim_services/Clock/{src => }/clock_c_intf.cpp (87%) rename trick_source/sim_services/Clock/{ => docs}/design.dox_in (100%) rename trick_source/sim_services/Clock/{ => docs}/main_page.dox_in (100%) rename trick_source/sim_services/Clock/{ => docs}/requirements.dox_in (100%) delete mode 100644 trick_source/sim_services/Clock/src/makefile rename trick_source/sim_services/Collect/{src => }/collect.cpp (98%) delete mode 100644 trick_source/sim_services/Collect/src/makefile rename trick_source/sim_services/CommandLineArguments/{src => }/CommandLineArguments.cpp (98%) rename trick_source/sim_services/CommandLineArguments/{src => }/command_line_c_intf.cpp (97%) rename trick_source/sim_services/CommandLineArguments/{ => docs}/design.dox_in (100%) rename trick_source/sim_services/CommandLineArguments/{ => docs}/main_page.dox_in (100%) rename trick_source/sim_services/CommandLineArguments/{ => docs}/requirements.dox_in (100%) delete mode 100644 trick_source/sim_services/CommandLineArguments/src/makefile rename trick_source/sim_services/DMTCP/{src => }/DMTCP.cpp (96%) rename trick_source/sim_services/DMTCP/{src => }/dmtcp_checkpoint_c_intf.cpp (96%) delete mode 100644 trick_source/sim_services/DMTCP/src/makefile rename trick_source/sim_services/DataRecord/{src => }/DRAscii.cpp (94%) rename trick_source/sim_services/DataRecord/{src => }/DRBinary.cpp (95%) rename trick_source/sim_services/DataRecord/{src => }/DRHDF5.cpp (96%) rename trick_source/sim_services/DataRecord/{src => }/DataRecordDispatcher.cpp (96%) rename trick_source/sim_services/DataRecord/{src => }/DataRecordGroup.cpp (98%) rename trick_source/sim_services/DataRecord/{src => }/data_record_utilities.cpp (89%) rename trick_source/sim_services/DataRecord/{ => docs}/design.dox_in (100%) rename trick_source/sim_services/DataRecord/{ => docs}/main_page.dox_in (100%) rename trick_source/sim_services/DataRecord/{ => docs}/requirements.dox_in (100%) delete mode 100644 trick_source/sim_services/DataRecord/src/makefile rename trick_source/sim_services/DebugPause/{src => }/DebugPause.cpp (88%) rename trick_source/sim_services/DebugPause/{src => }/DebugPause_c_intf.cpp (94%) delete mode 100644 trick_source/sim_services/DebugPause/src/makefile rename trick_source/sim_services/EchoJobs/{src => }/EchoJobs.cpp (87%) rename trick_source/sim_services/EchoJobs/{src => }/EchoJobs_c_intf.cpp (94%) rename trick_source/sim_services/EchoJobs/{ => docs}/main_page.dox_in (100%) delete mode 100644 trick_source/sim_services/EchoJobs/src/makefile rename trick_source/sim_services/Environment/{src => }/Environment.cpp (94%) rename trick_source/sim_services/Environment/{src => }/Environment_c_intf.cpp (92%) rename trick_source/sim_services/Environment/{ => docs}/main_page.dox_in (100%) delete mode 100644 trick_source/sim_services/Environment/src/makefile rename trick_source/sim_services/EventManager/{src => }/EventInstrument.cpp (71%) rename trick_source/sim_services/EventManager/{src => }/EventManager.cpp (95%) rename trick_source/sim_services/EventManager/{src => }/EventManager_c_intf.cpp (86%) rename trick_source/sim_services/EventManager/{src => }/EventProcessor.cpp (94%) rename trick_source/sim_services/EventManager/{ => docs}/main_page.dox_in (100%) delete mode 100644 trick_source/sim_services/EventManager/src/makefile rename trick_source/sim_services/Executive/{src => }/Exec_exception.cpp (87%) rename trick_source/sim_services/Executive/{src => }/Executive.cpp (98%) rename trick_source/sim_services/Executive/{src => }/Executive_add_depends_on_job.cpp (91%) rename trick_source/sim_services/Executive/{src => }/Executive_add_jobs_to_queue.cpp (97%) rename trick_source/sim_services/Executive/{src => }/Executive_add_scheduled_job_class.cpp (91%) rename trick_source/sim_services/Executive/{src => }/Executive_add_sim_object.cpp (96%) rename trick_source/sim_services/Executive/{src => }/Executive_advance_sim_time.cpp (97%) rename trick_source/sim_services/Executive/{src => }/Executive_c_intf.cpp (99%) rename trick_source/sim_services/Executive/{src => }/Executive_call_default_data.cpp (89%) rename trick_source/sim_services/Executive/{src => }/Executive_call_initialization.cpp (88%) rename trick_source/sim_services/Executive/{src => }/Executive_call_input_processor.cpp (91%) rename trick_source/sim_services/Executive/{src => }/Executive_check_all_job_cycle_times.cpp (92%) rename trick_source/sim_services/Executive/{src => }/Executive_check_all_jobs_handled.cpp (85%) rename trick_source/sim_services/Executive/{src => }/Executive_checkpoint.cpp (80%) rename trick_source/sim_services/Executive/{src => }/Executive_clear_scheduled_queues.cpp (93%) rename trick_source/sim_services/Executive/{src => }/Executive_create_threads.cpp (93%) rename trick_source/sim_services/Executive/{src => }/Executive_fpe_handler.cpp (95%) rename trick_source/sim_services/Executive/{src => }/Executive_freeze.cpp (88%) rename trick_source/sim_services/Executive/{src => }/Executive_freeze_loop.cpp (92%) rename trick_source/sim_services/Executive/{src => }/Executive_get_curr_job.cpp (81%) rename trick_source/sim_services/Executive/{src => }/Executive_get_job.cpp (93%) rename trick_source/sim_services/Executive/{src => }/Executive_get_job_cycle.cpp (85%) rename trick_source/sim_services/Executive/{src => }/Executive_get_process_id.cpp (88%) rename trick_source/sim_services/Executive/{src => }/Executive_get_sim_time.cpp (95%) rename trick_source/sim_services/Executive/{src => }/Executive_init.cpp (94%) rename trick_source/sim_services/Executive/{src => }/Executive_init_freeze_scheduled.cpp (88%) rename trick_source/sim_services/Executive/{src => }/Executive_init_signal_handlers.cpp (98%) rename trick_source/sim_services/Executive/{src => }/Executive_instrument_job.cpp (98%) rename trick_source/sim_services/Executive/{src => }/Executive_loop.cpp (96%) rename trick_source/sim_services/Executive/{src => }/Executive_loop_multi_thread.cpp (98%) rename trick_source/sim_services/Executive/{src => }/Executive_loop_single_thread.cpp (96%) rename trick_source/sim_services/Executive/{src => }/Executive_post_checkpoint.cpp (61%) rename trick_source/sim_services/Executive/{src => }/Executive_process_sim_args.cpp (95%) rename trick_source/sim_services/Executive/{src => }/Executive_register_scheduler.cpp (76%) rename trick_source/sim_services/Executive/{src => }/Executive_remove_jobs.cpp (94%) rename trick_source/sim_services/Executive/{src => }/Executive_remove_sim_object.cpp (96%) rename trick_source/sim_services/Executive/{src => }/Executive_restart.cpp (92%) rename trick_source/sim_services/Executive/{src => }/Executive_run.cpp (67%) rename trick_source/sim_services/Executive/{src => }/Executive_set_job_cycle.cpp (89%) rename trick_source/sim_services/Executive/{src => }/Executive_set_job_onoff.cpp (87%) rename trick_source/sim_services/Executive/{src => }/Executive_set_lock_memory.cpp (87%) rename trick_source/sim_services/Executive/{src => }/Executive_set_simobject_onoff.cpp (89%) rename trick_source/sim_services/Executive/{src => }/Executive_set_thread_amf_cycle_time.cpp (92%) rename trick_source/sim_services/Executive/{src => }/Executive_set_thread_async_wait.cpp (92%) rename trick_source/sim_services/Executive/{src => }/Executive_set_thread_cpu_affinity.cpp (86%) rename trick_source/sim_services/Executive/{src => }/Executive_set_thread_enabled.cpp (90%) rename trick_source/sim_services/Executive/{src => }/Executive_set_thread_priority.cpp (89%) rename trick_source/sim_services/Executive/{src => }/Executive_set_thread_process_type.cpp (92%) rename trick_source/sim_services/Executive/{src => }/Executive_set_thread_rt_semaphore.cpp (86%) rename trick_source/sim_services/Executive/{src => }/Executive_set_time_tic_value.cpp (90%) rename trick_source/sim_services/Executive/{src => }/Executive_shutdown.cpp (94%) rename trick_source/sim_services/Executive/{src => }/Executive_signal_handler.cpp (98%) rename trick_source/sim_services/Executive/{src => }/Executive_stop.cpp (82%) rename trick_source/sim_services/Executive/{src => }/Executive_terminate.cpp (57%) rename trick_source/sim_services/Executive/{src => }/Executive_write_s_job_execution.cpp (95%) rename trick_source/sim_services/Executive/{src => }/Executive_write_s_run_summary.cpp (86%) rename trick_source/sim_services/Executive/{src => }/Threads.cpp (93%) rename trick_source/sim_services/Executive/{src => }/Threads_child.cpp (97%) rename trick_source/sim_services/Executive/{src => }/Threads_set_amf_cycle_tics.cpp (93%) rename trick_source/sim_services/Executive/{src => }/Threads_set_async_wait.cpp (67%) rename trick_source/sim_services/Executive/{src => }/Threads_set_process_type.cpp (88%) rename trick_source/sim_services/Executive/{src => }/child_handler.cpp (100%) rename trick_source/sim_services/Executive/{ => docs}/design.dox_in (100%) rename trick_source/sim_services/Executive/{ => docs}/main_page.dox_in (100%) rename trick_source/sim_services/Executive/{ => docs}/requirements.dox_in (100%) rename trick_source/sim_services/Executive/{src => }/fpe_handler.cpp (88%) rename trick_source/sim_services/Executive/{src => }/sig_hand.cpp (92%) delete mode 100644 trick_source/sim_services/Executive/src/makefile rename trick_source/sim_services/ExternalApplications/{src => }/ExternalApplication.cpp (94%) rename trick_source/sim_services/ExternalApplications/{src => }/ExternalApplicationManager.cpp (89%) rename trick_source/sim_services/ExternalApplications/{src => }/ExternalApplication_c_intf.cpp (96%) create mode 100644 trick_source/sim_services/ExternalApplications/Makefile_deps rename trick_source/sim_services/ExternalApplications/{src => }/MalfunctionsTrickView.cpp (77%) create mode 100644 trick_source/sim_services/ExternalApplications/MonteMonitor.cpp rename trick_source/sim_services/ExternalApplications/{src => }/SimControlPanel.cpp (79%) rename trick_source/sim_services/ExternalApplications/{src => }/StripChart.cpp (82%) rename trick_source/sim_services/ExternalApplications/{src => }/TrickView.cpp (90%) rename trick_source/sim_services/ExternalApplications/{ => docs}/main_page.dox_in (100%) rename trick_source/sim_services/ExternalApplications/{ => docs}/mm.dox_in (100%) rename trick_source/sim_services/ExternalApplications/{ => docs}/mtv.dox_in (100%) rename trick_source/sim_services/ExternalApplications/{ => docs}/scp.dox_in (100%) rename trick_source/sim_services/ExternalApplications/{ => docs}/tv.dox_in (100%) delete mode 100644 trick_source/sim_services/ExternalApplications/src/MonteMonitor.cpp rename trick_source/sim_services/FrameLog/{src => }/FrameDataRecordGroup.cpp (95%) rename trick_source/sim_services/FrameLog/{src => }/FrameLog.cpp (98%) rename trick_source/sim_services/FrameLog/{src => }/FrameLog_c_intf.cpp (95%) rename trick_source/sim_services/FrameLog/{ => docs}/main_page.dox_in (100%) delete mode 100644 trick_source/sim_services/FrameLog/src/makefile rename trick_source/sim_services/InputProcessor/{src => }/IPPython.cpp (96%) rename trick_source/sim_services/InputProcessor/{src => }/IPPythonEvent.cpp (97%) rename trick_source/sim_services/InputProcessor/{src => }/InputProcessor.cpp (88%) rename trick_source/sim_services/InputProcessor/{src => }/MTV.cpp (94%) rename trick_source/sim_services/InputProcessor/{src => }/MTV_c_intf.cpp (94%) rename trick_source/sim_services/InputProcessor/{ => docs}/main_page.dox_in (100%) rename trick_source/sim_services/InputProcessor/{src => }/input_processor_ext.cpp (90%) delete mode 100644 trick_source/sim_services/InputProcessor/src/makefile delete mode 100644 trick_source/sim_services/Integrator/er7_algorithms/Makefile delete mode 100644 trick_source/sim_services/Integrator/include/IntegAlgorithms.hh rename trick_source/sim_services/JITInputFile/{src => }/JITEvent.cpp (84%) rename trick_source/sim_services/JITInputFile/{src => }/JITInputFile.cpp (95%) rename trick_source/sim_services/JITInputFile/{ => docs}/main_page.dox_in (100%) rename trick_source/sim_services/JITInputFile/{src => }/jit_input_file_c_intf.cpp (90%) delete mode 100644 trick_source/sim_services/JITInputFile/src/makefile rename trick_source/sim_services/JSONVariableServer/{src => }/JSONVariableServer.cpp (94%) rename trick_source/sim_services/JSONVariableServer/{src => }/JSONVariableServerThread.cpp (96%) create mode 100644 trick_source/sim_services/JSONVariableServer/Makefile_deps delete mode 100644 trick_source/sim_services/JSONVariableServer/src/makefile rename trick_source/sim_services/MasterSlave/{src => }/MSSharedMem.cpp (98%) rename trick_source/sim_services/MasterSlave/{src => }/MSSocket.cpp (95%) rename trick_source/sim_services/MasterSlave/{src => }/Master.cpp (97%) rename trick_source/sim_services/MasterSlave/{src => }/Slave.cpp (97%) rename trick_source/sim_services/MasterSlave/{ => docs}/design.dox_in (100%) rename trick_source/sim_services/MasterSlave/{ => docs}/main_page.dox_in (100%) delete mode 100644 trick_source/sim_services/MasterSlave/src/makefile rename trick_source/sim_services/MemoryManager/{src => }/ADefParseContext.cpp (97%) rename trick_source/sim_services/MemoryManager/{src => }/MemoryManager.cpp (96%) rename trick_source/sim_services/MemoryManager/{src => }/MemoryManager_C_Intf.cpp (99%) rename trick_source/sim_services/MemoryManager/{src => }/MemoryManager_add_attr_info.cpp (98%) rename trick_source/sim_services/MemoryManager/{src => }/MemoryManager_add_shared_library_symbols.cpp (92%) rename trick_source/sim_services/MemoryManager/{src => }/MemoryManager_add_template_name_trans.cpp (74%) rename trick_source/sim_services/MemoryManager/{src => }/MemoryManager_add_var.cpp (93%) rename trick_source/sim_services/MemoryManager/{src => }/MemoryManager_alloc_depends.cpp (98%) rename trick_source/sim_services/MemoryManager/{src => }/MemoryManager_alloc_info_map.cpp (95%) rename trick_source/sim_services/MemoryManager/{src => }/MemoryManager_clear_memory.cpp (98%) rename trick_source/sim_services/MemoryManager/{src => }/MemoryManager_declare_var.cpp (99%) rename trick_source/sim_services/MemoryManager/{src => }/MemoryManager_delete_var.cpp (98%) rename trick_source/sim_services/MemoryManager/{src => }/MemoryManager_get_enumerated.cpp (92%) rename trick_source/sim_services/MemoryManager/{src => }/MemoryManager_get_size.cpp (98%) rename trick_source/sim_services/MemoryManager/{src => }/MemoryManager_get_type_attributes.cpp (98%) rename trick_source/sim_services/MemoryManager/{src => }/MemoryManager_io_src_intf.cpp (99%) rename trick_source/sim_services/MemoryManager/{src => }/MemoryManager_is_alloced.cpp (91%) rename trick_source/sim_services/MemoryManager/{src => }/MemoryManager_make_declaration.cpp (91%) rename trick_source/sim_services/MemoryManager/{src => }/MemoryManager_make_reference_attr.cpp (95%) rename trick_source/sim_services/MemoryManager/{src => }/MemoryManager_map_external_object.cpp (98%) rename trick_source/sim_services/MemoryManager/{src => }/MemoryManager_realloc.cpp (99%) rename trick_source/sim_services/MemoryManager/{src => }/MemoryManager_ref_allocate.cpp (87%) rename trick_source/sim_services/MemoryManager/{src => }/MemoryManager_ref_assignment.cpp (98%) rename trick_source/sim_services/MemoryManager/{src => }/MemoryManager_ref_attributes.cpp (89%) rename trick_source/sim_services/MemoryManager/{src => }/MemoryManager_ref_dim.cpp (91%) rename trick_source/sim_services/MemoryManager/{src => }/MemoryManager_ref_name.cpp (92%) rename trick_source/sim_services/MemoryManager/{src => }/MemoryManager_ref_name_from_address.cpp (74%) rename trick_source/sim_services/MemoryManager/{src => }/MemoryManager_ref_var.cpp (84%) rename trick_source/sim_services/MemoryManager/{src => }/MemoryManager_restore.cpp (96%) rename trick_source/sim_services/MemoryManager/{src => }/MemoryManager_set_checkpointagent.cpp (88%) rename trick_source/sim_services/MemoryManager/{src => }/MemoryManager_set_debug_level.cpp (91%) rename trick_source/sim_services/MemoryManager/{src => }/MemoryManager_strdup.cpp (90%) rename trick_source/sim_services/MemoryManager/{src => }/MemoryManager_write_checkpoint.cpp (98%) rename trick_source/sim_services/MemoryManager/{src => }/MemoryManager_write_var.cpp (98%) rename trick_source/sim_services/MemoryManager/{src => }/RefParseContext.cpp (87%) rename trick_source/sim_services/MemoryManager/{src => }/addr_bitfield.c (96%) rename trick_source/sim_services/MemoryManager/{src => }/adef_parser.l (96%) rename trick_source/sim_services/MemoryManager/{src => }/adef_parser.y (94%) delete mode 100644 trick_source/sim_services/MemoryManager/definitions_page.dox rename trick_source/sim_services/MemoryManager/{ => docs}/MM.doxygen (100%) rename trick_source/sim_services/MemoryManager/{ => docs}/main_page.dox_in (100%) rename trick_source/sim_services/MemoryManager/{src => }/extract_bitfield.c (98%) rename trick_source/sim_services/MemoryManager/{src => }/extract_unsigned_bitfield.c (96%) rename trick_source/sim_services/MemoryManager/{src => }/follow_address_path.c (85%) rename trick_source/sim_services/MemoryManager/{src => }/insert_bitfield.c (98%) rename trick_source/sim_services/MemoryManager/{src => }/parameter_types.c (96%) rename trick_source/sim_services/MemoryManager/{src => }/ref_free.cpp (88%) rename trick_source/sim_services/MemoryManager/{src => }/ref_parser.l (95%) rename trick_source/sim_services/MemoryManager/{src => }/ref_parser.y (95%) rename trick_source/sim_services/MemoryManager/{src => }/ref_to_value.c (95%) delete mode 100644 trick_source/sim_services/MemoryManager/src/convert_07_to_10.dox delete mode 100644 trick_source/sim_services/MemoryManager/src/makefile delete mode 100644 trick_source/sim_services/MemoryManager/src/placement_new_init.dox rename trick_source/sim_services/MemoryManager/{src => }/trickTypeCharString.c (96%) rename trick_source/sim_services/MemoryManager/{src => }/vval.c (98%) rename trick_source/sim_services/MemoryManager/{src => }/wcs_ext.c (99%) delete mode 100644 trick_source/sim_services/MemoryManagerWrapper/Makefile delete mode 100644 trick_source/sim_services/MemoryManagerWrapper/Makefile_deps delete mode 100644 trick_source/sim_services/MemoryManagerWrapper/include/MemoryManagerWrapper_c_intf.hh delete mode 100644 trick_source/sim_services/MemoryManagerWrapper/include/checkpoint_map.hh delete mode 100644 trick_source/sim_services/MemoryManagerWrapper/include/checkpoint_pair.hh delete mode 100644 trick_source/sim_services/MemoryManagerWrapper/include/checkpoint_queue.hh delete mode 100644 trick_source/sim_services/MemoryManagerWrapper/include/checkpoint_sequence_stl.hh delete mode 100644 trick_source/sim_services/MemoryManagerWrapper/include/checkpoint_stack.hh delete mode 100644 trick_source/sim_services/MemoryManagerWrapper/include/checkpoint_stl.hh delete mode 100644 trick_source/sim_services/MemoryManagerWrapper/main_page.dox_in rename trick_source/sim_services/Message/{src => }/MessageCout.cpp (93%) rename trick_source/sim_services/Message/{src => }/MessageFile.cpp (90%) rename trick_source/sim_services/Message/{src => }/MessageLCout.cpp (97%) rename trick_source/sim_services/Message/{src => }/MessagePublisher.cpp (94%) rename trick_source/sim_services/Message/{src => }/MessageSubscriber.cpp (81%) rename trick_source/sim_services/Message/{src => }/MessageTCDevice.cpp (96%) rename trick_source/sim_services/Message/{src => }/Message_c_intf.cpp (91%) rename trick_source/sim_services/Message/{src => }/PlaybackFile.cpp (77%) rename trick_source/sim_services/Message/{ => docs}/main_page.dox_in (100%) rename trick_source/sim_services/Message/{src => }/message_publish_standalone.cpp (100%) delete mode 100644 trick_source/sim_services/Message/src/makefile rename trick_source/sim_services/MonteCarlo/{src => }/MonteCarlo.cpp (96%) rename trick_source/sim_services/MonteCarlo/{src => }/MonteCarlo_c_intf.cpp (97%) rename trick_source/sim_services/MonteCarlo/{src => }/MonteCarlo_dispatch_run_to_slave.cpp (91%) rename trick_source/sim_services/MonteCarlo/{src => }/MonteCarlo_dryrun.cpp (72%) rename trick_source/sim_services/MonteCarlo/{src => }/MonteCarlo_execute_monte.cpp (73%) rename trick_source/sim_services/MonteCarlo/{src => }/MonteCarlo_funcs.cpp (97%) rename trick_source/sim_services/MonteCarlo/{src => }/MonteCarlo_initialize_sockets.cpp (85%) rename trick_source/sim_services/MonteCarlo/{src => }/MonteCarlo_master.cpp (94%) rename trick_source/sim_services/MonteCarlo/{src => }/MonteCarlo_master_file_io.cpp (92%) rename trick_source/sim_services/MonteCarlo/{src => }/MonteCarlo_master_init.cpp (86%) rename trick_source/sim_services/MonteCarlo/{src => }/MonteCarlo_master_shutdown.cpp (92%) rename trick_source/sim_services/MonteCarlo/{src => }/MonteCarlo_receive_results.cpp (91%) rename trick_source/sim_services/MonteCarlo/{src => }/MonteCarlo_receive_slave_results.cpp (97%) rename trick_source/sim_services/MonteCarlo/{src => }/MonteCarlo_run_queue.cpp (83%) rename trick_source/sim_services/MonteCarlo/{src => }/MonteCarlo_slave.cpp (93%) rename trick_source/sim_services/MonteCarlo/{src => }/MonteCarlo_slave_funcs.cpp (95%) rename trick_source/sim_services/MonteCarlo/{src => }/MonteCarlo_slave_init.cpp (88%) rename trick_source/sim_services/MonteCarlo/{src => }/MonteCarlo_slave_process_run.cpp (93%) rename trick_source/sim_services/MonteCarlo/{src => }/MonteCarlo_spawn_slaves.cpp (93%) rename trick_source/sim_services/MonteCarlo/{src => }/MonteVarCalculated.cpp (90%) rename trick_source/sim_services/MonteCarlo/{src => }/MonteVarFile.cpp (94%) rename trick_source/sim_services/MonteCarlo/{src => }/MonteVarFixed.cpp (90%) rename trick_source/sim_services/MonteCarlo/{src => }/MonteVarRandom.cpp (98%) rename trick_source/sim_services/MonteCarlo/{src => }/StlRandomGenerator.cpp (99%) rename trick_source/sim_services/MonteCarlo/{ => docs}/design.dox_in (100%) rename trick_source/sim_services/MonteCarlo/{ => docs}/main_page.dox_in (100%) delete mode 100644 trick_source/sim_services/MonteCarlo/src/makefile create mode 100644 trick_source/sim_services/RealtimeInjector/Makefile_deps rename trick_source/sim_services/RealtimeInjector/{src => }/RtiEvent.cpp (86%) rename trick_source/sim_services/RealtimeInjector/{src => }/RtiExec.cpp (93%) rename trick_source/sim_services/RealtimeInjector/{src => }/RtiList.cpp (90%) rename trick_source/sim_services/RealtimeInjector/{src => }/RtiStager.cpp (94%) rename trick_source/sim_services/RealtimeInjector/{ => docs}/main_page.dox_in (100%) delete mode 100644 trick_source/sim_services/RealtimeInjector/src/makefile rename trick_source/sim_services/RealtimeSync/{src => }/RealtimeSync.cpp (97%) rename trick_source/sim_services/RealtimeSync/{src => }/RealtimeSync_c_intf.cpp (92%) rename trick_source/sim_services/RealtimeSync/{ => docs}/design.dox_in (100%) rename trick_source/sim_services/RealtimeSync/{ => docs}/main_page.dox_in (100%) rename trick_source/sim_services/RealtimeSync/{ => docs}/requirements.dox_in (100%) delete mode 100644 trick_source/sim_services/RealtimeSync/src/makefile create mode 100644 trick_source/sim_services/STL/Makefile_deps rename trick_source/sim_services/STL/{src => }/STLInterface.cpp (70%) rename trick_source/sim_services/STL/{src => }/STLManager.cpp (97%) rename trick_source/sim_services/STL/{src => }/STLUtilities.cpp (89%) rename trick_source/sim_services/STL/{ => docs}/main_page.dox_in (100%) delete mode 100644 trick_source/sim_services/STL/src/makefile rename trick_source/sim_services/ScheduledJobQueue/{src => }/ScheduledJobQueue.cpp (98%) rename trick_source/sim_services/ScheduledJobQueue/{src => }/ScheduledJobQueueInstrument.cpp (87%) delete mode 100644 trick_source/sim_services/ScheduledJobQueue/src/makefile rename trick_source/sim_services/Scheduler/{src => }/Scheduler.cpp (97%) delete mode 100644 trick_source/sim_services/Scheduler/src/makefile rename trick_source/sim_services/Sie/{src => }/AttributesMap.cpp (94%) rename trick_source/sim_services/Sie/{src => }/EnumAttributesMap.cpp (84%) rename trick_source/sim_services/Sie/{src => }/Sie.cpp (87%) rename trick_source/sim_services/Sie/{src => }/sie_c_intf.cpp (85%) delete mode 100644 trick_source/sim_services/Sie/src/makefile rename trick_source/sim_services/SimObject/{src => }/JobData.cpp (98%) rename trick_source/sim_services/SimObject/{src => }/SimObject.cpp (98%) delete mode 100644 trick_source/sim_services/SimObject/src/makefile rename trick_source/sim_services/SimTime/{src => }/SimTime.cpp (95%) rename trick_source/sim_services/SimTime/{src => }/SimTime_c_intf.cpp (90%) rename trick_source/sim_services/ThreadBase/{src => }/ThreadBase.cpp (98%) delete mode 100644 trick_source/sim_services/ThreadBase/src/makefile rename trick_source/sim_services/Timer/{src => }/ITimer.cpp (97%) rename trick_source/sim_services/Timer/{src => }/Timer.cpp (90%) rename trick_source/sim_services/Timer/{ => docs}/design.dox_in (100%) rename trick_source/sim_services/Timer/{ => docs}/main_page.dox_in (100%) rename trick_source/sim_services/Timer/{ => docs}/requirements.dox_in (100%) rename trick_source/sim_services/Timer/{src => }/it_handler.cpp (90%) delete mode 100644 trick_source/sim_services/Timer/src/makefile create mode 100644 trick_source/sim_services/UnitTest/Makefile_deps rename trick_source/sim_services/UnitTest/{src => }/UnitTest.cpp (96%) rename trick_source/sim_services/UnitTest/{src => }/UnitTest_c_intf.cpp (93%) delete mode 100644 trick_source/sim_services/UnitTest/src/makefile rename trick_source/sim_services/Units/{src => }/UnitsMap.cpp (96%) rename trick_source/sim_services/VariableServer/{src => }/VariableReference.cpp (88%) rename trick_source/sim_services/VariableServer/{src => }/VariableServer.cpp (95%) rename trick_source/sim_services/VariableServer/{src => }/VariableServerListenThread.cpp (94%) rename trick_source/sim_services/VariableServer/{src => }/VariableServerThread.cpp (93%) rename trick_source/sim_services/VariableServer/{src => }/VariableServerThread_commands.cpp (94%) rename trick_source/sim_services/VariableServer/{src => }/VariableServerThread_connect.cpp (54%) rename trick_source/sim_services/VariableServer/{src => }/VariableServerThread_copy_data.cpp (89%) rename trick_source/sim_services/VariableServer/{src => }/VariableServerThread_copy_sim_data.cpp (94%) rename trick_source/sim_services/VariableServer/{src => }/VariableServerThread_create_socket.cpp (86%) rename trick_source/sim_services/VariableServer/{src => }/VariableServerThread_freeze_init.cpp (69%) rename trick_source/sim_services/VariableServer/{src => }/VariableServerThread_loop.cpp (92%) rename trick_source/sim_services/VariableServer/{src => }/VariableServerThread_restart.cpp (94%) rename trick_source/sim_services/VariableServer/{src => }/VariableServerThread_write_data.cpp (95%) rename trick_source/sim_services/VariableServer/{src => }/VariableServerThread_write_stdio.cpp (63%) rename trick_source/sim_services/VariableServer/{src => }/VariableServer_copy_data_freeze.cpp (85%) rename trick_source/sim_services/VariableServer/{src => }/VariableServer_copy_data_freeze_scheduled.cpp (88%) rename trick_source/sim_services/VariableServer/{src => }/VariableServer_copy_data_scheduled.cpp (88%) rename trick_source/sim_services/VariableServer/{src => }/VariableServer_copy_data_top.cpp (85%) rename trick_source/sim_services/VariableServer/{src => }/VariableServer_default_data.cpp (59%) rename trick_source/sim_services/VariableServer/{src => }/VariableServer_freeze_init.cpp (76%) rename trick_source/sim_services/VariableServer/{src => }/VariableServer_get_next_freeze_call_time.cpp (77%) rename trick_source/sim_services/VariableServer/{src => }/VariableServer_get_next_sync_call_time.cpp (77%) rename trick_source/sim_services/VariableServer/{src => }/VariableServer_get_var_server_port.cpp (95%) rename trick_source/sim_services/VariableServer/{src => }/VariableServer_init.cpp (73%) rename trick_source/sim_services/VariableServer/{src => }/VariableServer_restart.cpp (88%) rename trick_source/sim_services/VariableServer/{src => }/VariableServer_shutdown.cpp (86%) rename trick_source/sim_services/VariableServer/{ => docs}/main_page.dox_in (100%) rename trick_source/sim_services/VariableServer/{src => }/exit_var_thread.cpp (85%) delete mode 100644 trick_source/sim_services/VariableServer/src/makefile rename trick_source/sim_services/VariableServer/{src => }/var_server_ext.cpp (97%) rename trick_source/sim_services/VariableServer/{src => }/vs_format_ascii.cpp (95%) create mode 100644 trick_source/sim_services/Zeroconf/Makefile_deps rename trick_source/sim_services/Zeroconf/{src => }/Zeroconf.cpp (95%) delete mode 100644 trick_source/sim_services/Zeroconf/src/makefile delete mode 100644 trick_source/sim_services/include/attributes.h delete mode 100644 trick_source/sim_services/include/constant.h delete mode 100644 trick_source/sim_services/include/exec_proto.h delete mode 100644 trick_source/sim_services/include/files_to_ICG.hh delete mode 100644 trick_source/sim_services/include/parameter_types.h delete mode 100644 trick_source/sim_services/include/simtime.h delete mode 100644 trick_source/trick_utils/comm/include/attributes.h diff --git a/.gitignore b/.gitignore index 35d1eb0f..ee1b38bc 100644 --- a/.gitignore +++ b/.gitignore @@ -3,6 +3,8 @@ config_*.mk object_* io_src swig +lib +lib64 lib_Linux_* lib_Darwin_* *.lex.c @@ -12,3 +14,8 @@ lib_Darwin_* *.dox Makefile_jsc_dirs .DS_Store +bin/trick-ICG +bin/trick-fxplot +bin/trick-gxplot +bin/trick-trk2ascii +bin/trick-trk2csv diff --git a/Makefile b/Makefile index e202e2fa..efbc6888 100644 --- a/Makefile +++ b/Makefile @@ -14,7 +14,7 @@ export TRICK_HOME = $(CURDIR) # Include the build configuration information. -include $(TRICK_HOME)/makefiles/Makefile.common +include $(TRICK_HOME)/share/trick/makefiles/Makefile.common #------------------------------------------------------------------------------- # Specify the contents of: libtrick.a @@ -56,7 +56,10 @@ SIM_SERV_DIRS = \ ${TRICK_HOME}/trick_source/sim_services/Units \ ${TRICK_HOME}/trick_source/sim_services/VariableServer \ ${TRICK_HOME}/trick_source/sim_services/Zeroconf \ - ${TRICK_HOME}/trick_source/sim_services/include + ${TRICK_HOME}/trick_source/sim_services/include \ + ${TRICK_HOME}/trick_source/sim_services/mains \ + ${TRICK_HOME}/include/trick + SIM_SERV_OBJS = $(addsuffix /object_$(TRICK_HOST_CPU)/*.o ,$(SIM_SERV_DIRS)) ER7_UTILS_DIRS = \ @@ -145,7 +148,7 @@ MODEL_DIRS = \ # distributed in the installation package. The reason for distributing pre-built # ICG binaries is because the user's machine may not have the requisite clang # libraries. -ICG_EXE := ${TRICK_HOME}/trick_source/codegen/Interface_Code_Gen/ICG_$(shell uname -s)_$(shell uname -m) +ICG_EXE := ${TRICK_HOME}/bin/trick-ICG ################################################################################ # RULES @@ -157,7 +160,7 @@ all: no_dp dp java #------------------------------------------------------------------------------- # 1.1 Build Trick-core -no_dp: $(TRICK_LIB) $(TRICK_SWIG_LIB) $(TRICK_LIB_DIR)/master.o +no_dp: $(TRICK_LIB) $(TRICK_SWIG_LIB) @ echo ; echo "Trick libs compiled:" ; date # 1.1.1 Build libTrick.a @@ -199,11 +202,11 @@ endif # header files. .PHONY: icg_sim_serv icg_sim_serv: $(ICG_EXE) - ${TRICK_HOME}/bin/ICG -s ${TRICK_CXXFLAGS} ${TRICK_HOME}/trick_source/sim_services/include/files_to_ICG.hh + ${TRICK_HOME}/bin/trick-ICG -s ${TRICK_CXXFLAGS} ${TRICK_HOME}/include/trick/files_to_ICG.hh # 1.1.1.4.1 Build the Interface Code Generator (ICG) executable. $(ICG_EXE) : - $(MAKE) -C ${@D} + $(MAKE) -C trick_source/codegen/Interface_Code_Gen # 1.1.1.5 Create Trick Library directory. $(TRICK_LIB_DIR): @@ -217,11 +220,6 @@ $(TRICK_SWIG_LIB): $(SWIG_DIRS) | $(TRICK_LIB_DIR) $(SWIG_DIRS): icg_sim_serv $(TRICK_LIB_DIR) @ $(MAKE) -C $@ trick -# 1.1.3 Build master.o. This object contains the main() function for Trick-based -# simulations. -$(TRICK_LIB_DIR)/master.o: | $(TRICK_LIB_DIR) - @ $(MAKE) -C ${TRICK_HOME}/trick_source/sim_services/mains trick - #------------------------------------------------------------------------------- # 1.2 Build Trick's Data-products Applications. .PHONY: dp @@ -508,11 +506,16 @@ stand_alone_utils: # ICG all sim_services files (for testing and debugging ICG). # The -f flag forces io_src files to be regenerated whether or not they need to be. ICG: $(ICG_EXE) - ${TRICK_HOME}/bin/ICG -f -s ${TRICK_CXXFLAGS} ${TRICK_HOME}/trick_source/sim_services/include/files_to_ICG.hh + ${TRICK_HOME}/bin/ICG -f -s ${TRICK_CXXFLAGS} ${TRICK_HOME}/include/trick/files_to_ICG.hh # This builds a tricklib share library. -trick_lib: - ${TRICK_CPPC} $(SHARED_LIB_OPT) -o $(TRICK_LIB) $(SIM_SERV_OBJS) $(ER7_UTILS_OBJS) $(UTILS_OBJS) $(SWIG_OBJS) +ifeq ($(USE_ER7_UTILS_INTEGRATORS), 1) +trick_lib: $(SIM_SERV_DIRS) $(ER7_UTILS_DIRS) $(UTILS_DIRS) | $(TRICK_LIB_DIR) + ${TRICK_CPPC} $(SHARED_LIB_OPT) -o ${TRICK_LIB_DIR}/libtrick.so $(SIM_SERV_OBJS) $(ER7_UTILS_OBJS) $(UTILS_OBJS) +else +trick_lib: $(SIM_SERV_DIRS) $(UTILS_DIRS) | $(TRICK_LIB_DIR) + ${TRICK_CPPC} $(SHARED_LIB_OPT) -o ${TRICK_LIB_DIR}/libtrick.so $(SIM_SERV_OBJS) $(UTILS_OBJS) +endif # For NASA/JSC developers include optional rules -include Makefile_jsc_dirs diff --git a/bin/ICG b/bin/ICG deleted file mode 100755 index 66551dba..00000000 --- a/bin/ICG +++ /dev/null @@ -1,20 +0,0 @@ -#!/usr/bin/perl - -use File::Basename ; -use Cwd 'abs_path'; - -if ( ! exists $ENV{TRICK_HOME} ) { - $trick_bin = dirname(abs_path($0)) ; - $trick_home = dirname($trick_bin) ; - - # set TRICK_HOME based on the value of trick_home - $ENV{TRICK_HOME} = $trick_home ; -} - -$kernel = `uname -s` ; -chomp $kernel ; -$machine = `uname -m` ; -chomp $machine ; - -system ("$ENV{TRICK_HOME}/trick_source/codegen/Interface_Code_Gen/ICG_${kernel}_${machine}", @ARGV) ; -exit $? >> 8 ; diff --git a/bin/dre b/bin/dre deleted file mode 100755 index 89fef00c..00000000 --- a/bin/dre +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/sh - -if [ "${OSTYPE}" = "darwin" ] -then - java -classpath ${TRICK_HOME}/bin/java/dist/*:${TRICK_HOME}/bin/java/lib/* \ - -Xdock:name="Data Recording Editor" \ - -Xdock:icon=${TRICK_HOME}/bin/java/resources/trick_icon.png \ - trick.dre.DreApplication $@ -else - java -classpath ${TRICK_HOME}/bin/java/dist/*:${TRICK_HOME}/bin/java/lib/* trick.dre.DreApplication $@ -fi - diff --git a/bin/fxplot b/bin/fxplot deleted file mode 100755 index 6a9a789b..00000000 --- a/bin/fxplot +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/bash - -TRICK_HOST_CPU=`${TRICK_HOME}/bin/gte TRICK_HOST_CPU` -FXPLOT="${TRICK_HOME}/trick_source/data_products/DPX/APPS/FXPLOT/object_${TRICK_HOST_CPU}/fxplot" - -if [ -f ${FXPLOT} ] ; then - ${FXPLOT} $@ -else - echo "${FXPLOT} has not been built" -fi - diff --git a/bin/gxplot b/bin/gxplot deleted file mode 100755 index 1333e474..00000000 --- a/bin/gxplot +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/bash - -TRICK_HOST_CPU=`${TRICK_HOME}/bin/gte TRICK_HOST_CPU` -GXPLOT="${TRICK_HOME}/trick_source/data_products/DPX/APPS/GXPLOT/object_${TRICK_HOST_CPU}/gxplot" - -if [ -f ${GXPLOT} ] ; then - ${GXPLOT} $@ -else - echo "${GXPLOT} has not been built" -fi - diff --git a/bin/install_user b/bin/install_user deleted file mode 100755 index 9c59d99e..00000000 --- a/bin/install_user +++ /dev/null @@ -1,15 +0,0 @@ -#! /usr/bin/perl -# install_user tells users to add Trick's bin to their path. - -use File::Basename ; -use Cwd 'abs_path'; - -$trick_bin = dirname(abs_path($0)) ; -$trick_home = dirname($trick_bin) ; - -print "if you use bash add this line to your .bashrc\n" ; -print "export PATH=\"\${PATH}:$trick_home/bin\"\n\n" ; - -print "if you use [t]csh add this line to your .cshrc\n" ; -print "setenv PATH \"\${PATH}:$trick_home/bin\"\n" ; - diff --git a/bin/tex/longtable.dvi b/bin/tex/longtable.dvi deleted file mode 100644 index fb2bde3b56e4322e7186bdbb1bf84161e68177c1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 102052 zcmeFa37njDeLue0nQ$c{3SL|qQpn+E-6JRGE(u2<gh)0JWuckfd1iOW9Lqd2*({q? zRMb-3Et98Ar-|*xivA2<Wvu;!Rzy((vI!Q8f=AV2u|Hcp8h=(R$p8KRe2?e*%x++V zEu|s*GO|1KJm2&4{T%Pl@%@j+8SmMC@5yI1;3xJkC%vi5+xVt@sW?z7zNxLHWpQ&$ zdvojJGh5o*m)(LVX7I7+`*{{WyBhCkXc*n~jNj0(t1&OX{$oSq==O$B{<e4jv8%rE zRI%Yz7kx_p&Fsw<T9@73)$dhiE-UVT<;-v1|3>@e5xrU8Z(a7eOg`6FO!Q>D;O>D$ z@2wxWeslTR*Z(Nd=Z%hz|K@X_-haZJ)0%cP%*N1;!9Tt=)Y|gJ*x1<E_$duDM)|Y7 z;nClHa{qA~KmOKP@*p3UzS};(Dsk&43R}|2a_lD`TbU?i(td^w|Mnwo``>WSr4P(% zI1115AD;JzmVadk?eb^*_3g{h?)Tnw!soeIZ)s_JOH1q6cr$w3-tgp{OZT5roPG0| z4M*cm{=?fnTUR{L+2a=riQeMa_$xp0_oL<f_n+Q>a{g~_*<+uJV?|c%>FQ7WmDnHt zE9Sf7o)wtywgToGB)!==&ku_IUa<evNAi0H?Q0yIzv97gsrGoe>XvjNpUdKxVpBO* zC?|q!wUjBQ7Y(qjEmg1Jr}McWpBfvVg<UH5G&DYlbuMKRx8Ad&u%~%!{MGn)bhNy> zp<(}<zWmL#yBdy7rDXlE$UR$I+a6kz_KTI7sZ>4{bd`Vi(G+*d9~*zok59sD8yjZq zKl0LFY#Ne%;oiuSx71q4%K3(wow-VE!-o7o5rar%0=2`v3HdviU-G?Vkj}|mu_r|g zQ$6A@D9>DQ6Pj;)=hMw&W0fQKyvF_!{2srJmS1<}XxrG>?Vt@c_%=06j`9`xL@}M~ zQzIxhUicB)(SKS0zt7lTn(xYrE*=~EkXp|6a5<CdV|zh~!Tvel|H;`~EqQ>dipAEJ ziS8`Pv^SqAWphETH=n)rt|xlZIcz~bcV;<${hon@?+2~r8N2`fe{LUSc1!K-7Ehkt zH0ROwlA6bo7d(&lm()C#zTkN*eo4(^SvU{Bl+7jzL*Rtv_{oL+r)B4U;R^TcKv=fy z4J7~%PBxKC`rucq|L4xh@57tqjIE%w-PN%DRbRm*Ac`J>_(-gIXm#$^4@?vb`CI+= zWT}^|LCGCHQlml<zu<fBYEYEk^#nxe^?Mvqnh0{<U=Wp+mH4}U7rt3*3I_Yrz14m; z*q`u&Y+j_%81;(s@k5{6Kll5$uT?@`3;JSl#Xh?a9KFaC85l%&rSaJ>ro2S4RDdX_ zRD(3%tK{x&cRf)k$L6l7dAYy{?|{PlxbO9pihOYZ6TavaOqgnbNLv{lX4W5M6V;)h z2VZ+ZPa(g#>gB+C*=rB@=TIg7j%8h=<=<^Mcf4`l$rp^3V^3_|IL{CKB4{L0NCwmj z7WEXo#AZsmM5ZraNEiFF&E+HiExWpi5Bz-K_a``NKcDpiJBL9$rhDS_Vh`QP=|Ek> zG%%xZBF*KQ|M1<_5c?0^IgluT!$Z|51nFV`VXw3rKY@mO^Q9a{T=WV}mDvBictRS( zHej55m3xrT{rTx^8f{eKZ@z1y+vpC4@SDp={PO3W7<N-Ro><3awsW26rcRMh=_NF8 z1pL%DbCKnx^bZ$38T4SOhXM~%_6m0EIM;k32#JPMchoPxnQd-tXz1elto&XopULFW z&>&aZ+nUG@paoe3O<dBlU0_2bmZs{Om)5b*N~7|U=^}I|PKC|um(w|@^+5`wEJC-m zohAkbNHB?lPi1SpCkH85ZpOR+4^I5|)2?)x4Aj1shu7wd-kDh4vuanCpIvxIqL9v) z{7Ss?C)`#`)R9>#iWp31GQq>Sd@-nH(mBj|0J~i%pxew)P=cbG&Y0B~4S4;#lKCAM zozh!^7E6){xcNO*59gy$%3&&ne5tQLSTj2Q%>E^#<)>4r{YN|=?7E`iNNAh<M|FDH zot<N2<%YdC*Cx?_;CoxJ4_<)^Xgcfp%}_7iOzk_s{}KU?eS+$`SKw;)>appK5%rbl z7mv~~3Aqbs)rYd~_ZHGU7(R9bW6tF9#9;FnPvrQ9vCf+t8lX*&K3f<+x<l0LWB%ih z#-CYq=Kd3}|Iq2P8jir|`A^J_rC)_PQ-0-|@9uxiw&AxOX>AftZ~47qEi^v5aW<%k z3$$g&ePdd=&s9s=YR|1_7eK9B7B{!HHU*gk_*cQ(lBR|onl4cHkN(zd^0Zl3zmDVh zDl8p#iRMAHA3v9j(sBi%q(mm&mm`gB>b>p0v3_jeW`7<Z1<fTCdm>ef9`B54v7$+} zYSqoRzW-!0<iTnJmc!9EHjF0K*eaM&Z+^$wg(O<Q*$<NWst^KZM*{Bww_BCKDN6>I zVoHV5KvS^)r0=i%ns1i}Yga5TzdxDS+>!H2g?u`P1CWItxw*Me>MtxR<<g6K^1c0~ zY;)4Pw;4v=sZjp8L8IjvA1v0I$0|oO#O3$qvEUH-Z~2JFZdeCW#G;qM+*->sA5R@3 zQ!`sMHuiyAaC92+Z#q8<9mGQE82^j6zdY*?|8Bxcie|q!RE}@@u$hoqq5m!ah32Or zr0@OWzR~f2D8iWJ&-R8d{plZeiSU7@K~CH%mSJbWsVm+?%?n5R*o}*@sSv(5k>Sp0 zoxK4HSz{_S>BI4(Qc3mU!ksIgjR{w!^oL9f966aNigYgK2aIeL*;ZYMz6^HIuyA|B z-=6ya?LYkki++8A6`x1;W_$hK)|Rhdm@fFm^2~|7<FP;g;7x+4U})tTf4;;1LG^O` zjI;JEg-p)pl4E1rXWTTqtHw^^0MqIxq-<<=ietOO>69;dG!ZH%TrFrkw5}oJ3Q&tg z2k1@D_L9>aR60l20Ubz>3&XOwNyEbOHOF2|O>QTi8H5Iy2!_Dit7*vhey^%^-JnpO z`SZ6=V*w^<kzt>D)(gvn@9&@J7+yG1*tTt8xHX*{;UCkSOD!!xl!)=(gzq&^(SG6N zcVCd`#Z>w^r$Qdm%7bN9rRrNvOtYhj?ryG{Q8uUQCwcw1McQuIfQJS8pamyFJ&~Jc zHwICgVj5e&`_4q6&nQ#St~YGBt^{oWIs<ledh{6Cbh8258$L63x!zca7PYmnAZ@>v z4A{`N{=?Gtb8PK6p4Er3d~L&<*L!lv(Rtv_g1X3~hb6kYwPm1q%``_|J8$xmY;V}P z^;c{1MWC&~B2&<s0kBT9y-a#D<|;yz#52Wy9&Q~xV#<{%U-Rf7O*1b0M0dX!1GQ`d z>uF3_DvnLl+=+y29}F0W1fjeso=M&`70aB&LqBThZQI?)boD2S9NQojC0YV{kkcHH z+xcYHJU*55vAug^g}UB#-)fm&zz8&JzG`Cc?FW=MJ1_dxN5`K|C5_Y*^CyB}4!4aA zZ`;<pZQDroLsm>hWftrs5lpp(<vEXDzdFSgObD<5L;}D<K=7isw*+ewQq(SLP{X;N zF8@ieQK1(MF<BtV4CcbEHXNzE==!gzEhNt%Dv~c2^I7tZJPc29fsnN-X+F(Gh0JH~ zXoHRBysbrt$flIb2PU!w4b5HsA|fZQE?!fadEPTu_goWP-Fr>7rg=2PO|h!LzJr#T zy$KO&w6ql>#N*@))-Kb+pL`O-kXac|jP4$GanZ$;xNI2B^rXbZ)fqLXg3L+p57igj z^Zf4)7Ulf=1GJHQ)2Sg~Ssqqa0V@hI@cZ+njM&f9>^YI7Nb`)w<n*|`;g4ItrMl$y zWxQ0eDJZ1-`awd|)yDF`=QeEURcHiIgUk?hP-kJMq=M%>@P~!OfrP~2l{vgJqCHxL z@vzEeRB1*qK(9W$GS6#3AEud?7tM?xm+BuK-~Z=3Ch1<2J}^4>_J*4u?K7HhAC*-2 zqYg?lv<l|)sREP6P!Br495Cm$Ll<+7kuN|0&vD;9j5)tlF=&f9Kil<&KONomyFVsB z`Nos|#GQ#e-?#g3Eb=TK6hWTn1E!_L1{9*?B^Qjz&-k%VPR5y^7kpl@;1h-!JvaF5 zZGq|HF(gE+CK|PqVCcJcT>tQkjW_?vjP-~RForrpCK50vhk(i>D1koT1W<Z`@O=19 zJ-8&({DM%?nY8kDHQYz3KEY#TWS9O!={wi#xS0#Y#iut@Vb9xVoOj|)3f5-N0$_9x zoCbq)`;1jP-Wz^{I0kklUtAVk*Nu=0U<jv$mc4v)VdAgE0_DfBra5>nwtRQ)mS2|y z34r@pb^z{UK@RCR-#+8wZ~qZJ<Q!gq9yEaflP!T)P~ZLV?xMz)CVQjl9#>C&<GP$~ zn*A&Agh3D6XRQ0#ceu}Noal2pC!b#N-o<{20WSS~J`oi1Rk)h@{N+2|?|A#9B{lUc zxBNPvgZ+x<4J;!soO|wT1u`hAk$X7<dHVn(<cU?E{toDk9Vr_fK?RATe3Se@N`qDM z=lT=hYtU{N9^J*QRe}(HlK&0>)^SGs_jF)TjKi%TN+#-*;LRkBEz}w-Prrx01B8n| zeeJV%wjy5Q$iIJ}29OL#<0b1!(4$4DvxCYV?9Bf=4()&MnHrx@G5(!{GYdwq|4vuG z=R2Z|EPA>~q=~JXj81QF*nUy7@;eS>AOf`~d72HE{8A!A8cUIJ=ZjOd|KU9?A^Z(r z<usel3uaGvR9Ji1^7IG<#>^rcr-}G^#A&YVN1P@igUUz~Sf9SZbD}g?=PHe(Kg}b+ z2Z(Pzm@E&o5NKh>f{e&-DmQ-iVZ;nVzUMrILHZ1d#oJ0oLb<SmhflMLFZ?WET1a0i zZ{=f-7~8j|3lTpERpMaq69#9BgIA)M5OVptd+41yY9pof6hljDE0G9$e*&Ts5?&t9 z2b(c!&l`ZyM~cM|MRXs7>#|-pkD;P9BI%4aL$KM#Q_mlQsAR}d(n}>U*-GQrmxsRk zpeA8~Z7q=KXm${hX0%QVj7+Oy5?GC&d<(ImqR|A@Qxx3qdjS3sAjQQ%3k7+O`a<9} z_cb@^E+@M29K$UU;5O_m%gAtR%Sf$RbBcEGwb@U-u_h;BXZ(&e;W||jlZ6$iCg_u` zivB74fGL|kiv8R~L<i1zYdVEMfP6_}4oW_kB{9Xy$|$Xds8)?2JEAz7*2(*vCMP)I z3>iM8yq=Y;KqY?nwT^biq1nJhA*AN=QGfBoWRjBzMaCAUpjcv^&1m2h@gg0<#V3(` zM~%MQiR8QF93it=r!A3CzSrK}nfRCu<zuwo(l0?wn7BG5`5?$mG*uksvkUnm783yo zw;%n-=eq5DiOgEU|IWDIUs`tK+kAid-`i*(wstQSRmA@xN_POkbMUJ`IUT@%6D0;o z`%Qu9zaYa@zN$K;f{s@}n~d>AsG^P9+cYo_0h$siLT!>KNKfrcpb9mOx0Rp0<c@qv z!u7B*(gsLQNDs^nl+RVZt#f?FT~9FV__Eh;4E&)SIxHr(2KRS6n|MxZOLILQ^0ElR zYd>@Wk@)k2A$(%qy2F6TOCAt;<~y&wcXa#*jgNy7Y;XA3|GQ-TXKVH<?)Tx>WX2J1 zY5%xgqR(!9u8;$$B>Nb0&{;n5_@}~<g0a!^TlUO#B00*h`o>d{I59kteBv+agNL3+ z!x`I+AP_q|@Um%*O_|tix_*EODquP<a8lQ5gq%ahE6)pl9vOaJ%*03Spdt$h_Bwv* ztW8|#uWY!yW)UZv-EBJ7F_M-jFX-^)iyhdZsS@A*fpltTeEmsQVG?=j<SSHbkf~J$ zyW|U-RaBcRT&p#RTj)|%gpWh1Vm=HW?GIHa#?4h?-&{&{L+d#ZL)3$Sh7BlPtq;-S zX{-mbKz?~0@exP}NFk#X7?EMJmKb5K1v)xsDnljq$m>GouHQ=}10WA6CI~<Yo9}yw z^I(`g^`r&R;C^utpLXXF)Q|y-csHdZq4SIfDUa|s-4Rkr`b5`9$PeEopjXPO#|vC| zM1B}O406p&Knv5Vdk~ICbaE&tl1t&FelVr?hAZn58vKDOMD%Qk>*rC%%JCmOxEcx+ z_oxK?teW4fT@-roknvk24<mM`Lawj`4}3O}q87u+?4S2c!@M(XFe;NR)2%I!%w{NR z{Pr7aRC+K!Czs+m@+R~!L|fv*%T{iY<SI!9L4Zw|38Dumr=b!bhSC^NZI&RO(f|^S ze)K2P>s7iF1;eP^JJH-g0egXnk7}Zd421$S5)f#b0Kp>KRB11I1cT{hu^&3uH}>{} zcmys><oXa8Q;uJ_!&SNmk@|!!vH1c_lNMt_D5^P8+8Wf5Z2_(Nsm~g93N{H2k)b5S z5msVfdY86GlIdAq!OMX%@sQHok!mvYZ!cMg)e_^!reiNw1O=rK*l5+{t6?v{`vIbs z?wHK1&@3b1e)~zTD$Y?7HVpExRoEI1kJS(TFr<{}7C4tauxc=f(^vKbFszEj(uB>a z4wlgzCab$}7NQb6dp$MQjE?L@$7io+rx;>qmr?5@$s*d0SPX^n$h+>ZG3*M9CiLzO z4Xx&k4$sd$9JvRO@a`c21dH|HzpWOlPm<u1!F*aha+t7Dm^jU>1(KG+Jpv=hd9z_^ zA>0e$Lnd_uhbPSM(l9I;Pa1(-<8!R#id1D<t|}MZXM#J&d@(o<I??&<RQ_w7+|f$> z5@CFPk&)s$I82CLEImofGa=T9aS~ui=M;)51RK?cm+K=9gLXhKJuUJlPO?Zp4H;y| z=fq~lM9Fs8BCMk$M!6)y+rT@O0<Ihbs!Mld3y>Ul(urNzU{UH{-@a~NH&6n$205a; zmK-hY?`=yMC9cR9WQ?FWt~e5DGT8HvEK=qt0;<SMBXP^v(Sj!chf3FB#GmO!8NCJ` z#{T}R&w#;itl;*MDXADe9sgy{J0C~{`Z#enWdX1&7|Fj&7$H~@x;0^AG?vvA8-gC0 zVv4c%b@L3TR%v|rGIA4)L2?msOsW#%MFaXIQUTa$mbvIy2C)tKsLaYXY!4aO$_28< zYOby%s>F}$teHVF{EZuLq!Ct<)@Gd$0+_(Ju#3uJK~^9G<z%n|G|)(tT?n8<lIc4) zbJK)bs^R6q9OUfDpWLjJd}IZ#5$oDM#{`{~h|&q)B%O?o611DS=GWX-)1*T{nnzUP zvB&0Pf?TUd<d~G>zxrzcrSgd!l?B9boJc@3$N6+F<gmgLBV3cma9XNJS&WK5(!GRu zR^m%PfR-VgaX9;hiXdWMvw3wc==BOk8l--@SdwZ2K$GIR#|2c7V~Xtto99pzEa#q8 zy}X%xU%Hopf0fufFOlp%@+z}b>e%;G^VOt4J)AL?#&CtbBy8?i4fJ~R9<qKs0A|&f z&PgVncv!fL_#BM&roC!WWo|XlQ~F(9B=3GNGXNDO593^fN+F*y97PQ|WGE0_>_biz z=~qsva1pmJDzh?np(2y1%Ghk3RXg0=+&p3_n;IPij5;>}7?8c`U0+Ho1t7zUBN&`R zGP;qFGNO^ixsl=Ck>PIW3_ba+!$brU10t(Oq}vh0j}RUT(vDy1PoORYhQNtMbu@g3 zz1NV1S#>qB@{wJ0fK@C6RzbXj4oQMYY(x6ePwT$)h%2!-Wi$k&&q)A38(!|`@l+zr zLwTD1=&0L}f`SpMrH5jc$S%_DO19E{&ti~6AkTcM0NI4ymBhwsv3cjrFMOp7Bhp|X z*LiU|*Ic#xfFn$hMk^>Byd#@+AB=Im<+EYdG7pfBSRFEi%Jg8Fv1B=e{hshIoxaP_ z^a40rF0;{H?48|L!dAro?zh5Hl%*5Yn`Ag%v2Xq}Ly`aPw<awG+{I>~*aJ`fmvbp1 zq?%-{Pq^+3KzZZOe#q~mqo(bkbRtB8I~rE1fI#oM<|qi5Y_7IMPYws_@?UiUNHqok zUaG{tu*u9_(xoMpy*1F807j4_S4vTUe)ei4Un7Rw&QdV~{iU9V6t&?~dKA&wEVyRa z&0g!yBznBeFqz8;uvj*MW2p(a(zyN^?NlF3`~5OmGiV(648&7GIG->HW$x$|QtVCi zb(b}eBNzz+Tt3$Dh^#CPyMUSFTuz4w&0)|p5$>Yp5cd34cazibwFHh!kDpGafzs<$ z(BrH${`_*hO_jhb;WhQdhI5KXjC?D{*PR3lh$FGf>=2V~9>gF2<FDFAg->|dfg(<u z7Uc2A=H&7?5Y-~!cpR{7BFR%E4M(>G81buL-<iQ;viJ;CbQSImq4C(9bV}pD<CiD{ zUNX6(`0tk%gX2jK^{Ns?@}nC;+Nd{m-<XrM-2AcxJQp9jfalEV0iMefhXK!*KH&K` z8c<Whx)MLJpur2HDN<;Ogiw_hsLG2yPcI6A2^xqH6$&b%(+|w!(z^}VW!coi5KFTr zk!JZ_kV)}5KhR7PmNzqYp}6#bHAAt~0*y)p*qBHxjA<_;u2^D)rAd0B^8s!+;#>U$ zkm!NyN8JPru;3ZBL>bkU*iEa*UZJ9^nlKaH9ofWY_>NRnHZwF)kZmOz@Nm~4!w^tn z!GZ74VkQ3Lon`_^>RZ#K))TB3K1y2nY!N+SOuD3tl->XaAOehIa^V>RmKY!71XM<M zpwyJF-{a(r_Uh%)pqwldys^}?U=U<1NY`18{n0c0VrT5;V^lyN{JOa`V9a7Qi`*n> z2XRoSMByWyEbYVas+yTq(|)xt%@?XYSZ9p7x>tWUziok*Pc^_gfE7bvr}5oa)A9=X zcQ#)3K`3pg{DaaV0IpQ^rYhER%HCj+zWZwIQ#Da25XJH>=oJ;Tz`K6a3h`z)wXP}; zm9$xZiH3IKIiwq7<dO12J^(f~sH98_;}6W}jovgro$Jk%XoZ$zTmLECs@ehxN5evA zW#yP+PEm`>D*5aHWGd8Q?0YWf73wvd*p63g4JSM-q7sElf<fM_Q@FQ~2kKSuQUu!& zRpAW8jFifJC7v%#bmKA5$&vS-B3QH=sD~r^+22q@;)A3;lnbIV=Jc$x(ulVy<%$59 zOiZu6)>$gCpLL6>r45eIEEDR(R|FP&fr%e+-uKo?BuKhwstakA#I+gYulYyVjOm>2 z1!H4yUe9eXeS;*HAtgko?HwF})y1j;8N^H96L|8y#(XbcWX>~F^Aj|rWb2_8siZas z5kq-9AYzw=b@>?10h@v)xYDNNqd;O^IPHz!#roD4@smt;y`|Ab3%5yZCKN=HdO%$H z5QKrYt!Iq`QEA+`Uweqi=Xl;v`9JIPin-NU^8V&DgF>L_>C=ycb4ym$^rHG#NT4I| zY!AR}j;6hQAL60rH01|C-jt`K{$ZhmM-<wuGZDQYWD4X8Wo3$qamj8P(KRgyC( zmeCSS$-tD(B7%Fz(r_s-r<ntrv6?s^pahlmF0_=8hz{6lsHH^g9evB^2Hn8Xf`MuZ zCNk<lPa!hqO5@!hfW1cf#2r-4p|}^eSe;PUE)^b)>EjsVEW=YEu@ut-?PagAX9i2g zYLh9r&H~gAqD8Ii2Z@`-)DMyxLxwkCH7fDf|43KN(g0Yvu~syy9dZH-0y?lLW6*g3 z_%6*ADrNP$XxIWOdTi)lV3}hl!4u!}3Ot`g&`ypeTg6?aiw|J2kgp7`5Fv4GVRJ3X z>zL-ug-oVXM#u_V!c4LE8#Z9)Wx{4|E71=aKQQm7?y=6kpdFmytj5(!$b)`S3M8<L z1wM8BV<E-xP0Ul9(!ew@RZi2^($v!x{%;O>`N-`*?+n1{HucIGVR#YhB#|swnGK&I zQcBSm*G>$*B3uQ8p27+u6vz<dkVK3-mNq4l*&<mV%)1y%U;?{T8;&goMFr(4L>*8( zLNh^(110Lz<2V=>oiM)(Ct6Pkj<xuPD-*#cU6^YgfsIL_J*agDg)EzfA%|5VQ|}kz zvRu7+LHWq*zZR~iN=t_s?d$S%raMzbDi1sPtYhTtVQp|QK#B>1NyOg6@fx~QR=M3h z%H57NB9EjMs$)ETx)(Ofb7EIrik{N1%UE*rjnX~I0Z4Peh0wX7D8T8BPu<A(H~Bh3 z4Kn_z8(F?&UX>sTqybbG?kQroe3UZ*ldVE2Oy>|XMvod-KOf4JDxF}^YMA-1hspP( zkO=!xqZtJ8NYXZ;NOAvCdm_oGrECi5F~HxF*o|R>POBxlQq@!L9J+Yo*Ua!iYm8n} zONr@f=4u0#uB60LHP28PR?3C7;dtEqaShwxC{v9f+OU~H_Tu$8W7DhmsXt++YkvgC zj5GJ@Avz;|a2DdwI0^KqUaZm26>t21Qc@93k|(Nff|?N|6zbvzN$~tc@Lx7&l-4x1 z_ghb(WurSl^spi#UEP|}xt+y+63VaN$2BW}8z}-nCB$z%VR5e6wtzCu#&53gVn(~g zw2X5@q}R81+j*dm0by1OQW0EOZ2%83%ItAx$hTz@Le;8%bmY+Lbu)Wji4E+@dRPEC z72y#B1y%>=g)IsC!rt}yp3GM;>A?>ZM)HkMFzjRD>D0V9Bz9DH+8Fi-&CrmPu`9$} z0WOFc$vf^`^dt;Ms<a;kxDgB6yvQN1pdBL{_^>J*YUz?=10c+ZQ)?H|t^ApF8nMFs z!6cKCm|-S8VI9e46|ry71LCL76U~ywB#D6p0;*egwac4?Y5=cE`~X7yHlY?qsyL7H zlPVVx=>&HJUgv4oJ%#FcCHAipRY407yfL4{qsP5pRBNbT1JKPm1g$8bLIeHA$V~ym z2LUOO<??H8iiz6*4dg2E4{hZZ8EFBTB8}3ed(@S!(AmNW1t9`qDCPJs-^I7W6@vK! zQiNczK56!Z>f`aob;=hRj*(le3~tpcX0+%}0QqUcl_?1EpuJ=X<Ri{#OtqFn-3Y}9 z^mr-DUVA=@r*1mYK=SS;p#Gs5l`~fK_g4=o(&ad?sr^!}5>jbeDwClGp{Yvz6TY+1 z3F8~3MSs-boXctF$Wk$u*L9~SJ=p!=No1QcWtgV0><s(CJ3HeuPOy@pDpjpWz+mvQ z?o}1y5O0dp%H+r3x+?s*YN>@bM}*X>HKaR1*{iFi*!(gmrMTqK1vOcTbQ(XGU2z!H ze5r$)<2SDUDY9C>@W>xg34;6npRbEX7q*|d6VO2?EEiR!KXSZ9TLwon=H;29IR*@B z$ItF)vBie=2Gp%Z7pD56`al<2tglB^VQC@6gSG~dSj&9F4CIT~)k+*gSmccjjfk7B z|3U$&qviV6ck0&3_^CZdO`}lKwGOvC^{uEEPHxMLG};EOy4K;g$mq8>{OE}fx0jdw z)te(BpwHbbhbWEJH8uX-8`{cmT>rCZQ&@?om;dKfebnXbH2m<`w?%hDJ{UiNWiN#i zF8{^%t?9`%TKobiLGsGR#&nXL)Z9E!$ErYO{YF(@H8?bx47N8M?Chu7xc@04_~M=4 zY%jlh;M(ZUJtu7)hzS0)bzfWg_}wd`O@Rmw&__KHymLc;lnCSlhX~&InpA`cmb?HW zU~&k4B1CY2jt`Cq4tDl0B_epJ``zv3Q%^c3x^w@vL~wvU>WQFo#}}hSARjnHu<+hj zM~GnQ3m}5UQxL%cI{q&rf&<L{FcGj)RDI##hN<`B<*2wXJ#-a!UV<=<pPqS#75A6A z;=bz{6OBOZ2T0%b4-llh<Kqd!^+UiM>--TC;Do$S6(?Yl%q<iH*h69L8VdogbuZ#h zff3o1XeYL?()iiqkSdH|`q1kscrHS_)zv!0Q4nL7NfR2<Ne=L(J$kB!LWojmgjiv} zXh=gH_7adv?8!efuyIMe5NX`ZVIe+t2z2)Ju`Ub~!Oi-P8fGIfP}|4caPJDRDI|3$ zl&#<yzmo!=EAi7F27(p2oFjpFT?MN)?Tla945XD$0hzRpCMV{TgMouckV`8f{h)n# zX%jILJs~2pmDpPz!_or44G0g?LBOSB>>5Jn89m6h<Ow<~G&%*?I=1Yp&^?I=1&KJv zgotdKn{OhUU5PDw$oTRMM2DU>Gm!(}51m!)N?>BuA0aZ`VY@<yW^V<^s7DV_tP+3U z<JeEWmV!GLzW~jCq^JDs$UNi}lxJRgc4P$Bi4xA$hie05fN={>t?^0SLzY=v$`C^@ zn-qdK5AH=EOC|?Ge7}+>&zE3AUb)kP{FT_Bu3e06&miXszB#p&#wlRnGQ{N!RdG(5 zKhwq8!_6Tc2nl<|2bvaD%^iBG(#Wdt;3E0iPffakpk6o<g``d-s%8WFY>^8`cMCG* z;BG+>>3?1fpNgvTgYAnib^IjCvl4=adI4&5-y%u<?I4M?hVVSN&lv3vl-T1HPqO+3 zv?L(~iC&x(hFR#kv&doprU1-14ZQiq=D-uFOY~u7D)HKDvBII(i62Cv{kn~$_jBjW zqb~%ApGe{^A>fD1AjioAt!6S!stOR-3+$la(^Wcnwgkch{4bewo%nrctcC{>o|<aj z_a)AQ!w_dGuIo~Zj~2ymMy7*GyaNL``hdI5#R__<G;^pl4!=qtC*&5=n{Th~QAeBn zXH&=k=E+K8A+S@jn#QFp-eHiAWm38y@dipV*z!eg0%fJ~WA6nsuyraVUJ20*KtYCN zT|j<x{_}Hgfip|DOWg}z1g{y|8T-Roh^hfpnn6$qrd^Ms^32jPkL67aVYIl#N4W!p z=n9}rrYg`G$E(B=8Gc;sH~2oXhT=E=HBYYwvPnzuivZ*XI{nc5NMu|B<EiGlV~%bV zwPE3a!1q74T02^*Ljw$vFgwGv&-hzdv)N(B5}1H}(5^~kRN@hX@`E3%tW9{w)wUu1 z%=^C>PZNj8M`fbS-f}`0a7qw-cRZJvL&YNVnkzXVbqSRSyaRJnXGa(w^BVCyXc-bR zf|1t@zeDep#wRb~G^Fz)!>1*EB+s)6<}59_N6~t&BtjZbD1Q<!@`{`%y;6odV?!(P z%XZ5W^(!zvRbu)?7!NeSm^kuh4hN3b0xPI%7c_XVM7OYFwmMcQmtQqPN1r`*32wPw zifea~XG(x#JL%Hy38GC<Crpw<7n_ZsNJ9KTj+D?<m6w(pXR-}E|MU(izk!>&5Pc%v z0C0E?)omS4iJgs~-oYq1v}IjlB=hSKCf3V5RS-N~u~n6221ViPUreVk^?XUMSw9X2 zU10FQ!3~}VgHxmDpXkgldKr34@f)19Qk+f35lVA2c4|qVIZ=lk=6lKwW6Q7O9TN0n z32jWvD+8~19~{WMWD9Om&;?HB*KU#6Go8q#0vNd#B5OpCvB5W*Tj4gI?GJ|101;+q z*Nj(MUy3H8789&8SIH^~@O7Cu39N;Xsr4L-v&)=G3Cn;`0)(5%Fgz^e{TMbD90SZ% zIk;*G%vmuJ4p<~rvzrHr%RmwJ)hQL#c>^1wy`1trT{y0d|M~U$SbV5D%q%I#zVuW$ zPwEHg33*CtLjAa0@CKP86d_(CCf5{4B(v-uq>Oa);BO=_MN1OZr3!_eK*{`C)6T|! zethC;6q{EWZm2$AYhvUiQocy@;G{?qtg_fUVqF>^{0;dZ3&4Xduw1;pUe53X1Y!tf zBZGSj-qvCNvZiY#?=b`ZjfGV_8bpmK3al!07b)S>RD}wO5AbOiL<OP=b4Pp?fN=7^ zJ-H8|s~iZi5|vGdTugk%p~{E5k7o$-Wp`JEcS)|1eueo`R9SM^lvz_fByDu3u;*jr zC+I+CBqdeiKj^_|SrjIb#q<!R27$lwbQOilZ|TA3K7rlvK~a>{YBP-L6(wYxNcDWq z6U+ibfGkA3h$ca~BN5R^ZG2gZRe{6c0_#FzpkF->(&oX1D!<~I&KwRsa>kHE1^pdb zhv*XEEh;e{>Z9U?EGdK04hAM3fNdfs7f~NLiRl>C_Lz4(#;o!vDU!jLF@~&72PHef z87`E1z%>iHS4IoSTp>_qXF#AOlY5JID~&(8MXAiHEzG13C%^HxC+Zw)w#8;mYigY! zZA4-B)R4hc*$~&m$YY5e(F?|YKu<`_B)i8GKFUX#;7lRA3ng)l0cAd7vwJ;2tK}>F zrhVN#OdTA?4)HF{g-D`f3Y83aWVmD4ZBV7sF^$im2B=3Eyxb=$0wJI@(l&`~JEU?x z=)<lf)IeRfsY4M(i*gUR+OX6RhX!)pH;G<{aaYgC*zE@<RrLU*7pYxM%sRB6V>Wf3 zX5>m8`nUEiJ9H7Nqox5@;gReQ4kK3oI}j_$N`Gjnt_CQn3K1=WRnVT=Yf>}%A^4yW zuxcC(0CLQ1LNqoCb6m$NIUzps4ZMIrkI(RyHrn8;I#G?ICVI5W>Hq`QFO2QRbqO*I zWN%kuC-j(`rbHfq2Uf`e&1FDPvuwh4uK*Iv3Z(XzR-tkenc~)DzPGtI)hA^@tgJ$5 zh*!PmTFsd|i|3O!ugXhqZ*jQ$3WV<#k}K5|z=VYnf{Ax`7B9#p!{<;FBv-VL-TrE} z2z|b$KO&!<pE#h)9Hdp+Z7)k_+Nj+Yry6thQ5!!Vg}bvHulwPHWoXmVfbwT3haV zCG?JRPeWs^i?Z&mBUw-4l@htMuVUqh0np;YMlh*CjA~PJM~g%Sq=Z-VGPffG!JH9U zfW`|R^OcJp1pZMA)?6hi7~2ux1*@NhLfk%Ko&Ipb6)SF`MX|ggkJ5+|h8(A)LF-7O zg2XRSFjrzfo?X*g3j}3dIS#Zv>jr9mI=W4bTc;$b#}N{oA|6&XLx*(<odYJw-!-Y5 ztbiwd^wLh|U~@^PuBBjd@k6}SPo%IMN^RG}PIHl<c#_aP#B*-g5LWeI%@UvB8S=#h z*pa=4x+!`E3IrbC`DwGUb_>H*tHd7uOf4s6t<_pVDFK=(@DgZPrV4VWX@)uY2m~dz zKy7KFyEvFvDhf*!{PYr~d+8zXH2|}e-iA#J;tMkx9AdL$60(Y2_i-pRj73AjRpdTr z6`e+t%DJ)>8ca|NsVS?_T+uf$Ts;(IAz|T69uilN^?2N7l0`J5B6Ke!@nry0SNjnK zzE>&b0W+~|ft@J_zrG|ED3XAXaPk`Jp-#=jaD-}8kb-i}T9&nPQ;GPV=#~@RteF8A z1NnGj{o_|X6<v0#5_|hby(61=(h$X7KuEhPZ#55wxvD1>wUNs48y{ZnU{fmR+K$qY z8t8ZIF=Venhqmp^mr9^JV}G$6N+obiXm~nVZ9x+<;z`?P$k{|;Gb}4w1Nc9&#L}Yj zH|Y)tpv3lH8onWk{IJD{ktvK%PfeY<M|vs*l997ijz9W9jm`3XS(udIQkpcO;M)yX z3F?}i)lpdS^+i}SwBvZ36eSyC#XYBrp0qSzrJ~^nV62m`nc!{O!_fSZiH4f8i*%np zvev11OMts(E65>GkdTiO_e7_eaE96!v@o%R0u~FPf?p@yPJZBuT2s<rm$3`LCCT2b zO#nv%*%CMv>a`Jy(i<4E0BFHhavY4{Xcxh;c*@}*JMx!XFqBH{m*b)D1x#E#OgtW9 z%5xz?%mFsu<sa?zcj6r&<bWTLVt`{TC?+rmF;yHgUGXh|8JJtYHk7be=Uo*}3sLsq ziM-OBCKvJJG<MY>xl9YtXfH7-j4Yejng%kLZPs0M;loP2{0`8VuBS^B5s)o-Etr8K za56>nA|Y%De;7sN9%({G!Z=kj2Q#5e)183S_MGSrmBy^*!buMpy09=~|M~r(7$HIJ z2qG6mXT&w7nAQ_C7xl2~fJ?Hwnm+^tEX!9A+DtnMCa6LHMMmTEWZEZ)hkO5~lovIY zteF3|3SyK6H6^pS0Feq_;F^h^bS7OC%p2<!&S#UI$UHq*J;O@;zFRN|V_9=C5P^)X zbwSqoI%f!)+ycGh%KD7ptGeNQYG>@JV@wLn^Wf$H9;+J82J~XGtw4GjHaF$+blaAm z8F=TA(Ub?Fi|6vnm<hSB%VyFWBl3Y{3bD<^4T=8;IbYeF;BF~uD0n0!W;UThj8bQq zCkay8u)%RUGQrtlXE@weuZuFm_>bSfT~Df%HerV38(L9|>?tY7-5fYokbW)tv%;GV zVRN?eAAm`Fz}4Zb0wv4oz*eF-B3c1X3l$m%4O4-VqtH>b%{vwe>#%!dXOaD;bB0P- z*KFb)<}}FBsM}e7AHmXDUxq-Fc8mPv;zR~AtprRD!es!!iFne|My?9-1f(v$@mLp| z_Q`=*-Pv#=C|gydIm6j8w156pl8;@5R~h3TVlH-0Ts812gRJyEfxW9si8VUUJYI;C zh=&2P9s|Y!=h)PqV7Hr@3tlhBkTJAS&NUU(iS8Wzcb+P0Zjc~*k%}Bv#dXQMG_oqt zl&XUc7To-D4CGmU=)xjLPY)Kkar<Fd<fRUajQ{$)j?rDueE!~hVVc9k@z65CM%I^5 z@d0I$#^;=PDcJ+Qyy3IgMq~4r>B_&zlI64DtmXL0g^1Fj>qfw?$Itj{H@=xAgztIg zqKDVr`l%HbGDobwx)giX+JppY&)9Y6xWt4;KhUxIv)1-d28pKv1KZy4C(qtpyC}ny zY4Ob|W)FXg3kfur-w}IsK8ymWPqhUcj=q;ix2Aj?2WpPrlH1ocIe5h@B26;5Q@00^ zPQOZYaKbC0n<|em$0;UAbNOwLUxbEw(tRutkjU~D1T{#v#XN48n$)E6W$PxXV>OpI zo&C+{Z4UO8(syl>T}s2Z9tL6z1rC|o=~l(sAvCE{bLiSYYc8L)Z`1t6>6|R88LyM? z9*!9u5E-JSZYvoxXN%chsO%wXw9$^5kyCNoE%V!2q}lOT0W%vd7yEzn@a6hy=t}I- zE>m&qQ!5D1<*6=V6~zk?g7ssNk=&MPlGY<RIBUW&ufyE)sL=={i{wSGv~tHu`4C1y z8CultKI1QgUW6aB9&ikXZLZX+gCbZ<1(D}7&ht`?Lx|fv8~VMXy%eVLmZ4>NQ!VWF zhVnOhA6}_XD_0hxoXDfHkYUJtYQ>;`kP8VVBAoJiyJ(_Ll72L@$@{@@v<BVTcXwZX zSN|i)bhg~^mEOD36V9xFP6DF6Y=tU)4d>UpXQ43xqkI8jl~U*fPeE;3Y?rq6b%l;< zq1-rdKXkXM!HTNI1(7v`>Jttd6w7s&=r6P-nbh<%Qm?gETjW;x@H|TSfyk_|n)Hl8 z^QDC!_7YZg!$JW0EZ}x{)feqp!XJ7PegqwZ7ZXaLFfK)V+9?L26Sf0A-s<n7TqBYT ziM3P=yA^egzg~`&uq=~`t~k~evL~E7bm~p~&P&cy$@2I>Y;26l%@P;30Rt32hUjg5 zUCUzD>+97~W07sEo#)XtRTfRW9cm7f*G5VWPios%xeb@{pgJHG>PS4|IdvnKy0Qm9 za>Q?9`y}o8xkt|=_usz{&Oy@UsiMmq%#p4f{rUa#f3dmqVvDmM)tmMGo~^Ad->}?~ zXZ>N#$!Yir!5s8K*9{Eg(DpJaQ<dn_hj%30ot5f~O6-h%n{2#la31uCx4(z)?yP&a zHV-yx%gMAtV6*Xws@rsJ9+(KlGHWL)kWSZ3G)F-Amm<pD4z26)lF8um$8y8JKSm}q z?cv8C-5nkNk%fV&rq1EdTyjr1eB0SUja-Q@=safF(;q3$SahU_#5ur7r4WYHqMUL? zl_;n?-+Dj`r@e9<&+p&=Zlw(r{_&)U%u4L|)C$<O-33%plYlXel8TFg+(cbP2}Sgv zwM}dPhP14sAbLeWxFR6RNbH*=wk^0SZN^bIM<rS(IpHSMwt=RBnhByKvi1eBnihf2 z78|t_k>crs0>2oX#u<rK9_`XG*TdniE9CprJ*@M=D>*r;=Xv$NV!U)BO>4voQVvJ^ z+>6TtaowiRKa8i2`FQ@;x9(BS4DvF=!h!@;mIyIuTsmZZFN6+^6QX{k@ZIX`s|22> zilE)PaIG*Z(uz#-Yo%3*2lEW&#ffg9>4mP21NOu(r8DC{eu16PJ95BING*Jz$<;#C z@Ks%LRi0!_B*ylJ&%O0?53hGCKfI7Nj(}F-$S&_effG1#IV8Qy5{<NqC_5Y<SZJJ~ zJ`Hlqf};0RwXc1&JmZ77SK-hP##wRbqE5$54|OW<K8!lO)KMpuKBfSt<pMZex$}1) zMNPUMc;U0W<iv#DFwPfc3t2^7hk>^uWbnr)>A1dnV;^yb3r7muwhauoqU=5YaH9M! zUA<<_1*?$gQaK}7vwH0XbMO<WqFXx9&uCciM&T(NO{_Sc{xU$=;&YToht;balUpLx zT@mIZ$8R#+#xTN#BfT=n)A@w=wws2PQ}FHzpclkB4h$fe1c*Jo-H;o~D6%4CB<zb! z+V35f%hgBDkibj)xn7F&Igd>-B$(l$9aXms*9`L}d4wDB7WwCH=DBBf-SH<*XJ+1( z=mqjlmz-cvDl$R*In4=D)S4}jCD4DE#qP^PfT%@2qeslQ=5T4<7iiIn&E{^gZH$-m zf^3xgp78@`s13AjG2R(l>)f&%oB_#-8+4%t<csz>R(rj>!hJ@6XBh2IsL(zWB`iE= z?MXd0FSkW1_RDJ{m81P8<KRNoX14DS;I^+++CvZ8da{iZ@ZckZ31s>CWxQ*iV5?}6 zIL62s7@mPqis6dke3-?qql#_Ydbe#Gv6Mh}9ZyrZ&Ec!-5z)XAsKv};9PkNx`2GyG zy=nZXQ1c0Y5C!IQ+)8B#t67RKFxZ4kL(Q$Bx^2FyCt!dWwP0c2yhodDLcx~q&tOgm z0oJrX<t$wa;k!0gMZ%n)w<YQB*rqSr?$o?>kI}~L4n?;AU<V9paY$qALv?x*z@bA( zQ7Rv^@g3`6)57GDLN+bs*xNj<55838<iU<>Z0rNKKs!Pd=X8E<f8${d>0np*#d>~h zY*%9*MvJQ<tq={VtKVax>&p_XEUt8*(ej$7{X1L7%Ioj=)c%FL@4WSE4Rp=&-%MbA zLn|KbAB{Z-D17s+_pAW@kCo^4&3ZIFHqJaA(Z2RC`tmo|?rK0tvi!qEjKBxm9$V3j zM*Hq<Sj{qw04?G-BEk07O}H0)Z2Z+Fl(U7Wuy(#AH_{$c<^7CfC>jo_??=I1&ww<T znTXsm1w%7v4Zlj760eae0KdHbH5?hnb}DayLnVC#io&{-{;&Y-Oofj2;Z8jk6l8pt zf-O<-OJ>C-!FBIgl6~E1T{kk^y$;KOHMoG0rw;eyg--174MU&fql3Wb>pGOM3AxG< z$tRO~B^bdjaZjJyCEKxmUZrk=oTArf-n5jxrf`c}Cek<Z1mkZ!OI1@S$IpKtbgR~w zUM*K95L?iR!U!jR>u2@o7(I!wVKri{I)dXHHG(;)38ZP6F!YIN%r}_7nGy=EyHg4W zIefZGol!GKX5KZYe0yKC89YKa09OXl_Nnp_vYWChT?FSS<GMSPuaOhl0*9hRqbHk# zD?E;IO`^-&*xcRGm+!&z2n8M)3EPC1TKeqE<a-jCZhRkIMpV?#B(@^3{iNS5#V|mw zplMJAXj(ZCae^!%ld$63^5P08s<bZtZ8H19_%cO$7$&bd>_dFck59n6P?6x#1r?f0 z1Z;S)U1Qx8$ya<Ql9eVpJ!;m&Q<ci$K0KToCj@xhoP-nZ{eykdF)};pCF5isxjcug z`}nd)cyAwYLxe%<gTeG~Wh|(>0W$)UY%=uVBNH8iWu76TZ;=H_-%F7`gnS><NyE*D zStgsmN=kQnYSo7AKt`Mm27i*x(5Edz`m0f(+NFDJiJ2IV_y7umU?t6gyDYI8%MT~< zzdYeF3Ti04L=~~EK29$}o-ktGj3*<h`uXal;@VXoh7wD2G!0yakSP_P$tYsvlgSMh zNnABzx2C7m*T>Bis>jma+1fJY%=J*syyZzS$@+=UZPg1S4}jtf>0`XZb6X?IFV8O` zg_&|~LgGhYui6D_eZ$89hA|LgR1J6DN4Lo##Co|r@r{?T2)1Fg;RYilP2Uy;5<#@} z5Yu?K!qiat+>_$NoGPu(au~)IB?Js?WLS77>G951!z-ds$!PhU<b29Gyt5VjLMRK6 zG~%0mdmi1RicWD<H~73~^2P>WiUR1byLDGX7&RgX*pU?~b=5AGV(2Qa!>-p<VIuU; z@G;`=hDl0)O-4GwW6HRZpf*2^gD&-=VGuiO1QsV#f<?gy4)7ulrab5P6ZNm>sMJ@o zL|HEIueujxpyiX_b`#!^-}Nh&8czGSC-D{IN<xCb5#ncz44E{=FxW&KQ1<R+N0JC{ zuyH3rO;r-tBH5Xq;RWIJFpTo)6MwA+bWSvKMHs)#5{#j4mK>^H7XDiQ=F7?uX+3le z5$coE`1xe#VMFA_GAs_ZpE^SXjOz&ATI>dPX&JPVoD=t@PzUkTHz4c=N>QNhAd{Fb zGF4T_U*ftEAFVz%CHZT(0UD0!Rmv0y+FD=-C|#ahq|L}<a33VG<*4cP_Va!g^i`%B z>HK{Tp5AQ~3@X>X9nQB#YIZUsp2LMUab<gR%Q9*~CZI>up=nj&uo6`ysf^7l3_Jae z47awZ`!W^VZ&Rk)KG9brBXj3KO$5t53pW{~Efc1v7yBw!*5S~xrqtUe^i8!=)PkP- zsUq~8#YLc=1ni3#YBP2cmKM=gUe4)|pr7;SIe0OuO+(^~g?QVp22nG_N?Zr+Ll;6& z3N~i~Ni5pGz_6k4n(;V8=V1Hjdx$B)@Hpc#fyillOwd;63w#4Q<a-wH<a?Y>?R*9; zZB?N~M#)i%gZNr022=DF=HUr6lDN&NH&_B(_{)Z6m{J-*@0!tV!bid}+jfjr<2=NR zsqOcUilF<k6HxoDCk*(~HxpV3a;H|J?pWcJ>Q0qLbff3R(Jjn*>5x_<{S@+y=u-<f zxgT|0QT+-B1Gy4aecYUNb94gRi?peF;U<y7J7fc<>M8!#p2#Mlaz^}C0QD?Zq0eO- zOf2tb>k25WmM^LBK1nH7_KR3jJOk4@tYINR4%e*eCq6VG17w2fmwo!}iSnY%94_Kx zinaPyE^b937L=YymUMDmGLM_iB%Qiil$Sl+H~01Cy#<uZ$X5%vSLqWUQnwv~21uUr zzJ$FY&C68a;o>5sDZFw{ToSP#-=r_`;Md5e(sk>QiV^Zay|Qvm8JXB(SUmH)rnMF@ zR!gu2n6w6KP>&BP9n@{Pj|dg0?m5lYK~zQiCc4$VdR`u;rz{B9AB_9F#A;=6;(e<> zGl5J_x88oW1k9u*?-JEiQjx?Lf@*@;4@S~D6vNb1X4K&J#!>;h%o>4Nuqa$i9gz-> zjwy5~99XZ-h-Rgh7?s>GWPcT-7X(u>$=rrCKm{salH_IRpJI%cWUDDDpX8O&gv$I! zn2y6++v~-a8kicv$kp~_T%*Ux<KL^s?I`#Z0;yanYrb$f<Z(xg(UXC^CT6DcN4Ox7 zqp{s08{}I`21D>FLr(*6$zZ-GmDVNzpMV%}F<G%Xl<^keAb$6E3ZqLGktTo2ee*?P z;#h`uGf8f#${rF~(r#p1I<?hIq?-XiumMqx$Kj{#kUC;E8)C-F$VfwTvK?I6TGrwG zQBlUs_Z_&)P+5h}TZU1m(w6VG8@|k8*|(j683x@B25q~v4-R*+L#GSFT+xMMbjk$l z0HN9qKz*GLe*u^BNO`8fmqbM*gqIuloFAr^GanpYN7*NP_YT=@K}s{o7uuDjLu<?N zrMF#$GZAt!y>ZQcai}J-Kxh)+pG|O|XwDQ9QWioKEW3-M^r+2aHHWn*Xopj&6E;Q6 zpb~;63Uy&CggL-fZuGuxuB61&$widDvzDr!4$DXokn2d4wqjY#e>I!w_E1rXzvHpt z?v8X0Y2w4(*X4Ui#T+kTzL%99*mmgJfv=c`5r{|b{@P(X@L=t;7wh?`9jFR@fpN2l zif4~@c<|GZ(MguU?amK)Ip_GF<DPND3&2IK#|Jn!weNwBR552*sRW68St&7DK#m#N z6wqC`{?+x;wzveYOa%f8wGnaR1J>hjTtYM>+Z~0qnBVM&eL(_PbE^Z6k`4^q3}F2L zv^<1KBv8HZ{XZH&zym;4VAMkbB!hXQYGbnQuG^VMmsTN%NEO|atX-7ot@;V3?E;1d z*vw*w31srZ%TWxuc>#$_NTV-=z+1afZjjB~5BEqxBkX#R=d`!rCu)^J+`%gAqDSM# zhW&4m_<y1?44$*`|KGOp|G{G@oU*IIL~&p^7FC6M0Yeqp;UWypf~<s@OxyX_=NX-? zJ_M@<J@oDGlXwhMRz{cDL%|grtEtLGaK~)1QcV;}=y9hZi7;^>`LJKb&PAGwm<Mob zDUFvhShSDDM%&^F*+GYXDpJ5=Xec7#5nF}6^ovFrp;R;BDt>oIsJYlDjZUHkn0_BR z$L32uNT~=lts8^yz<+zZ!nxfY$nmi+V_%A2cwk?5hplN-ER>w@p?yd*j_R@)x`vF` z{R~trpQTe_OJOgd7uVll7lPh4dK<9Zt&6l)k<BN)k?sz!zt_IM1gluz;}WxKvd?`` ziwDNWU#XP=)PeG(_Kn^y`Z1KR3n5K9JC6#x*`_6CwL7p}II*PZt9cT6Z}`x#{q5?l z*SL-l%^Kt(Lx}5HQmGPOH4dw+h%+S$lPTXx^A5J-c^^3+Re|MVdfXl_uLm`IQ|0tb zB@`k+#ujD+^Z@5QJg$3L0v5v#hIr37y?6F1a*2O}Vzr*7!77dSAMct8(3??Lz44zu z7XtCBB#gCZRVn~oH>eA(Ew!j|gfkXD|45v2Y#r%;T2tX3Ii`SP+Nz==7%U5#&@e>B zCtZiqW}UzuQw3hEU8rKe?baF~Me`_G?W^auUNg5XdJLD~#0Zh$(sQu80S*aVPn!VH zEW?kikpz`6q&awlI2D2uu+I9B_zO})BdYYTa4VYbQ;;Ibf`vc8v>lqn(bPwZXkun= z>*?Wvz_HW^iVmIb8#*-LC?1-qPiKiauH+A32Yj*+X$)uAZHz9ZNOL!IgdO7~%b=Xb zdfmpB;;24nV^V6>u%D&o5U0`@H2!y><&<1Q!ia|YR7RNi3`2TFjKJ+;4@lY1s1H8d zJJ?akDgV2j&Qf#kwWB@@9%Q*KY9hV76#n+|Asc}P*nT=cdmcHg@V{6J{K589r|?6% ztW_Z<@f}x&8N>vnv_KWif?7EtKZ%7ksqjXhlB#D$qVO$Tj}i(}NY+Yxb`A|Ps+eUM zAp=xlE2Dh|^MQRsd6B#|;`0#r66s<!9Qn#$5a<GSS}wx=sKoC2!R41W2kR5y{#%Tq zfRf*c`ha}3m&c++6{|GM9S~-yQc#`6qB40@o20bao2bh0b^Db1;FfObztHWDA**cg z2;<aIYE(#<8jVtOMZ2cZ67}l3xY<%8IL+hz85;$xl+mR|lu-uTHk^QzrAD5y3E3*D zTpj(HvD>96_tj5s6zIm;I6gpj9rAL>IiqCSJ|LhSgm0<QQrS&6ThN=^Taf1UUoayP zN9A>QhXQx0k$ap0zUPJyqX3a8cEjD0?MQ$~lANje)Gh<vQ60c)XAn&SxDE6KOUc<; zmA5Y8U4mP|NMunXX;X*0aXXe7?U#MqyiKQfQSmp8oYO)X+JT#15N8DJ3e(HwI|llC zHZK}kjIkM^yUYk(nM+th>G@i88f0_3kCU)Q8KEmi?e@tpqDXMLnXAth<iGqtr>*ca z{cAWvLx7k}b^sp0M0bA?8d#xJgpbN<?aN%kqlG-6Jy`lzXE#FKEULt6HNxH*L!fg_ zB1=awDq6C-q*E6&0`M<0G))5yCIeuAJgPV%UI)lxXr=A8CW($&O(PitWPw8qokoX< z!rdVSA#^baFoc5W?k~(F2%TZe++)?jqUq}N@z^-WVwpKP+?EajR&S68)vtC7)mP~) z;dkjR;hq^SQqH*0Gq+>7dkd(Mn`}RFNzoXF(sTGoclfLAV7bvO)w5>1&Ax}vfxLwe z@HzCmW=+S1mv!KThlf3U))21P&ZsTNlk05M5r43B>W#8C7A&6G|G0UgJK2GYHVPHI zfa;6Jdju9t?~(dW?9@=Y=ua_?O6;iJH3$(x2kj(4fD5X;qv7i1Skuzlm2J%}{jje# zE?52`$OR^sN<BlqMK55qFYVkCIkx39<~#HVIj9hR$5xE*=!n>gJL6kE1Cu21q!eXV z>QQPFtBM5X>-QvJ;Gj+%FL3~-lsESQ;I=7D+sibMjfb%k%W<G(Pf&G_rTMWJ=3qyU zj!TxyalGXvkZT8g2XvF*SNs<49}c12>yTz5<R+XwLI<KB^oCf=avT!_FK8O*VoZ1L z=+Jct=WCV`?(|e;5zD|r#m0trRxwttL{<?V*y2*Tbs=}Oz5zvR0w&xs^jsMU!E6xC z39yoi6R5kiqHAjGI&3`o9&iN1A-nt4$t#pHw8WJVUTzL30tv{aB+^-y0<U?1Jc4jn z!k5ee?MQk92=HK7OZ1)OKoD|f)7J`fR#hamaF821oP)o@$RIh)KH!#txpQTwP$sd6 zGQQeSvqzF9vR8mFSZr*NoVuE$3NM%o=r}aD0%tq%tpR=gg93=`_zXREWH+PDM0R*? z8%FoCa_=lYbgeze-0A#$<G#bz-oaX7FV^#utvwwT(fF$;O;kidA`Bq(I^+zK71YE| zf^@sE`LbqI<n=|60zG7*2o}mxpb*1qj((8PsU-ifl)b&rldV_ctN#Ncl@=eH*GvL$ z#ozx%#3s-cT~~FLMpX`Gn89A57aV!{C-j)nT2xqrzf#puqCmNi5;V|Y7aB9uG0rHf zS;BRW>o;0qq~lg9T##=)62bwaYCKfTS3o`rysxn^BYq{GMTLBbJ3#JPP-0>QgrWNi zT4wkZAV!vLrJ%uYTln7|4Z5@HjVMkcG++1DR9=@LqftvkidjEUaZLo(mc`92OQ6VH zbJA+3Dm(AbAzOz-MVwi<1um#z4+Pz1Vvt%gTQs{8TeORp3K3w%9Zz_AEjEsd5P~_W zfv7UQy-X|Nb!S*vRb*Xuou%0(x;Z$;#RoN_wYmphwej;kGFl9B-Ac>~8}3ZW@fJyC z52iBd40r}*fVARIuoI|sgajBNWN&)KR}AJ#=X7T(76a7>|DgvCJr;Yf+8O%QH15Ol zio6951inQiaJ4ocPCMKZgl;zc5^W*p1i2(uBSU5iFQCPxS__zj!uo2ut8luN*q85+ z8Kb^3vIo>%QhLHO@BS)x0Uk1->M&WclH3=;Cq&<r0^Cxzjn4_n%~o_Lf-=y)QM>(! z01f4M|39J5Jw*7BQwoojkPC2N(g<SnV(d(1|E_?dBNPcz#B$iBh!8rI8+isgqLb+$ z`bsYEZN;6A$!=U+fm_tDS>64N(KQ6@SVAkH?l3dpbjbyXwxwUEE>qtE)rt#Zqe#(# z-ZKzy+ecMZhH*oO48iDTP_Znlvd`$eilDo<pfx1bmQj(Qu-Bio3vr>CfD51{m1qT} zly`(dKL)6Un(xSI)Y*9ReSyG0jS~1q4H|*XVnnNctPLcqBs)falFO&~Y{**9a6TQo z-P*MmK_zS4y^Yl1>)Qu$KkV*pte#orrh<IYT)Ng=nQ_M*%|WvoM|vwrS-!@b)d_|g zRci>(LzGwJL*L04s<?cB#~2Q2;4RSe61mNxuB<Bbxw9~k0lLDQ9+{S=$(mHMO7RjE zVu9*bhUfDm(0!zq$AAoob?a9eY67+-%$Fj{(DHs7^Pm9)q*_F8VR*#y7qU!R3x?m| zZ!@;_;x1HxfGYZD&%Zl6W1(PniqE5bhzTcG0oexYF@DIE350t+o<!|M+!&ienF8*Q z!Jr`1G&H15L0C2T-<GUg4S-tcV&8zc@D}RxYsT7}!Q~j?9^gAw*)$4Ssa3<7l@uE- zoOEw<Td$tmcFnM6@yHasyE3;GsgyX?UXD7ra#wE}7Ay;{R-7!XulBQI_=TdGp9)C* z^LHz&OukY!Eer@qQf6>5FcMK*)(eY62^B%-A@-IE&>w`o5mUpJHRoQo8k|`wHig;% zN=Zsw!R}AktF}GFx`C+^tm_VHq6*-MhKR2zMb07_tR$hiKN$8sUxpmy(Nx-irU6_* z4Xt5tXY8YY#=wg-Z=Zx&Ef^F|Eo!c*QtPNli;fZCQ7Tj!{*m|P&S2cikU*$M0bc}p z3Ji4z3IcS|DnmPTRIBdIDHChl!K-nAhd(Bd0etp#)T_eO$(hqdkZua+^8d6N1R4Vg z)N*3Mgj!?=#HZcs%_+whEZ+c!EiNXPfCzJGq>3J{#E$uAjo6F8o>0afm9jTH!27tR zs+U|Fg!>Rvq6R?aLg7?)%iUTefGa%Ul=sjsSe3st;2s#r1DF0}bfLdj(Wt?6HBcna zu#yTpCFLmwz`RT4@>Jg#;uSqe%Nj6s*K?^t08aQMVlBaSIADD(7TJ#w7-&O^^2^nN zs3Am+GF(&cD6afn^&W{MYNC(796#ZcEC6itLj^bC`6E+tX5MPVh9pjO2w+^y7v(-; zGb6+CjXJ0v6)PR+WjeJbpH7lz+jIi{!9huoWb_*y1R^WiYMAg84JQYFpN0(+o}yul zm_ub!!^_HkUvlW$?=WDd^Yg<y58LlAmOXy3{Y<vsI|<=c8u#7-YXVo^)7r)LGsR$a zxpD9NRg96jft)Us5Y04RTX2x*rxdQZhSx8F`&#pzccwg$XGvA`HyBXShirf7wHHIK zRCzTK87&4t_bJn9Ox^TiqL*%7;JRYn%iXeCmsa;DWdWLExFROCEalC>C0v_Ri3LyM zUED5&t`^;}&L##?fmOE+GGGc9)<L>JP^o)uLVhojhmuw*G$b$ru1?WNO+1Jq@6`#n zKC05p66(IeNB9H`>bKyU>`mfNB(t7Zo^f(vPI>0pP3vj7VJy5xP?k$%jXX%{p=ZOD z6US7bBs-j9CEiCzs9S8eiS8{vl*wXEG%92Z(Wut>e$trMbeauLp@f3bi<Oi~r@ObL zN;lkKkbd=y(QoCeZd{!s4?98_`lJB;8iObfb|9v4U`T1wMy?rz+j&Th7&rEbAqH)M zo<xU?oGuL1?Y=EIdMPJ(2ikD$Gv<GaUZBQoW*0WdtV(%cN}=UE2XQ<!cr8OU(Ma9+ z&gI{ntutmNh54Z?e3>ygMR(mv<t~wRZi5_kx{98tbMfeNcBO$O)sorO$&*_oI!7P; z*v=fy2Fn~p(@+a`uBcH63R6CG2?4W!(t291BuepEkbj6uPkjoI0b-UlrRwtn(+)a0 za|#Rjd{%qV)o4LJVwY<i%se9x_anI2TC>Pf(ucq{N`(zKL&D(05gOXbyY7$-!`o2h z81YmvyI9?-Zo9|dy}Zj5$2v1qbriHVP^s*bqi3<mo(<nsBR14%)>k@NL~1bFj@3|^ z(j|wZ4&^hmJiuEZPkBpigx$1m)1&&_eK~waeHZR8bEl*+9$k8hA_vo^O+^Cy)-edi zWjJJ7#yq3aEQ+sUbUrwvT)IkypNx}=HP{dDazu<J7?P_4w;OfQSz?pTtJp?FpCy>d zMYWG0j3Sp86T_LIA$ZlRgjc9v-H2f34!g#nu~toZI&%z_Qy5P<^=DjSWyY7aUEIcq z?OH;;!1vWfj)2fINI>ZMDIhlp#Mz7<lA9FD@g3#!u|C@76vGO(Cd?~YK-~DJuL$I! z!sS~m_vj#%sV>ONP_B}}BOIy>XCVMn+Ln?+z>hEh2sR#1!C?_Ui=r|VXV@!9XnnmP z9;vb-z6el6FhLS>97@*Ar%c9T6Gw(*uEak55wR+fgeq4v<Ro%dKOEjF3YTgDSLVuH zfcLM6*ihy+7YKX|g$?qxKH5;K8^&D?7KWJPzh>oX-aY@Iz?!`PYQ#tfu8TW!S&)eK z9HF%gZEMU+qpj(rkYO67gqRS(Tb4zDb6QNIHuJ$+_2b%1DMTRR66%Lc8v#HfSk={c zvSN5u6`w+ZQ!F(+%_dG=*g`uPnJ|yu0vy;Hxm4d6wqk;kPIqY6FcWR*dO2(aNnU>G z=<OHpy_TX(S&*Y_91A{*U=dCek~e>tqF2(l&0t`Y;#LUzUTlm_d?yR(d}Sn-7O*<b zST$*mFkS;Zr2NPzj%DdzTq{iWF+3!R>z>qV3W+N=A-H0gX}DhQ#3m%MRFw|bnTVqD zVR3*+OVXmlt{0ngkIV*$DbFXYXqE~ml}j~jVhrjQRwW~asYj9IB%J1#mA$(3(6v{g zuuSLY7uO%QR}a>Xe6gONY_AHhsKoAFG&xBo_U$J^_v}F@$>4roq|JF?-=@?d<PJpM zpWz;{X%>y3HK}Vw1Pm3*cr{p_%eN5}hZY>lql{RRxc->JH;v+hL%1Vq7D`&u@)nO9 zE#gIBX_UMyVo`||&T4ntfP8%5hV{JO7x?T@i9Txr*tvOO=$UrJbNC95XU?<|^u4I0 zM`;Mosyji!&Wlb-A`fuJpNspEf(}<}EBw<PJG2LbVe?_!0Rs_C?-tzfO?S}4T9gVu zfYj;6WN8GY+vtvPXDMYvGJ#xktFNf!ARX+iB#pHV=&Mk!LgfTAj>CwYT?{!ZCRDG_ zS<;k&i0X!)E0IHn9g2Tu+;S1r2Gx^}*jO>Pz2V(I`D4fp3PmkmQDV;#*>1{PDD)JD z62Imj>o61ppQL@CSx1D#RhdoZ8$la%;-(e3YM+1v4Z><l0`Yb-KD8SN;bvhr4MwU` zXjGL}aro0%y69}9?t~Xw^HXYDn$)NnDy@bd8sIK`gZd;0>XKt+tnv|NQ2@1NPw33h z&wx;P-q)Pa+bO;SnUzR<79@~zoTKB<>|Zikema#p@Xg_-Qav`q02b<kdu&)#!Ln(E z4C{4vhripciV%d&9gG@qOQ76{8ig07^5jY(UgZv+s=jFVWpG)+>Ny|rXq!V~L0THF z!F%1BeX2;iQkTOb6E4X>Q!zbCfkRce)oLqCj13MeEOg&SuC!sMfjCL~;8uZ~OSZ*j zbq6%L!Ys3>mxSkIky15P0<+>YwYBylH}NV;N8;tC(SRtwQh|<o`50QGikzQp=q)iy zFE-Xh_z7iR!J;^%6Grdwx=3~T83RgSt!OL^h#ks2FttOELG|YliL7=r%3MBu?X!0- zfib7u!mUe;@5lfOVJEbFUB#RkaiX%*q$Mh%@PcrMZ4#VJB7qox34kHC1zS7`1Phf| zv4m1iG2{hm;{+%~7_jH#<Xpdp7p#NjaUbbA#5vn*&b}0K1@ksZA&!n~)8MqdOlJxl zfeL5BFJ7T2<=*ityxOUBUHw|n6>_^*LL{LMCJiLkWme?wmb2BLRA%0fy2Ffp*CGsM zb`ZJXZA}2vp$&vBGeHt?2_Df?QQ{J_0qYQd_7Dmli(5Aoq1<N`%2{dr`Y*Z9CT&!> z4_AU6vbc~0+XKigr8Dr)@*C++LP<maCNXNK@U6py@`cSP!@vA(azIqrg$6<07a)}s zZcMXWoON1!8NeAAb%OFR&}k*f&hzyM%xR$O58I5J&v2rU)9Yv{mH6idTix}=;`j`) ztsx=~9m1zgth=c2tEo$O;fA>5zbI0M!CSg-38s^}PnDVX4AN+FdJWq2!aDI$5JXt5 zkd>^xaQ*t`U@hge+Kpi13=B%<0R3bBL?(rMJ^W^%JC*owcWpkUyoRp1QR@vWnAVzw zsWuDbR|x=Q7J$lYKwY7{o)}2Wa0^)|sUrnyhh75tDVzl*g>1=FL|jPWI2|HmKpqp7 z!;wnmTTHHr1ja-y9@Nc2LNG4uf$zc4N3Y@!26?!r5t75=Kad`}m$|KH5CC!_PHf^; zssw)NNhme`uLETyq-0)4u0uk2Mx+4K_>pILH#an-QVpZe7RHah<Q!FA;<P2>&n!Cg zOJr{4SFZW)y;LD9u@jG^e}w4;J-42X!^$b?=zs8;+ZJ7%zwN%UL6i#%SOf0FBcW%& zAAmE1ST0!6Nl5lLx8o({@P^}}kcX0*Rg{1$!ZhP;8XG_Q#)eT)Ql;_Hjbs4>Dndhi z=Iu&Wqg9a9*##+ThHi_^<=CD#bt3GIFI}!cz$+k`00IUVl?s4`@dt-o@XmXA+1Set zT^k#k=rn$2G|V|{W4~B7^TGBLwXt<^8^uT!qcV)NGl@!nzgYwE20k+Dv%*1r#@K>i zf-Olrq2`JbfMvKVB@#K6VZLBh>rd>$2LR>6;KopCsKLfyxZUQRvG@Hg;B2HbF-RH3 z+^ddYtF~hl!LbP#B@%!|vyaz-iy$-+jw~suhg603QH4rjt!h*+gc4$bN*R7oLo?KN zVE*#b1e)h8)3^H-f0{7xBGYCgf<UcOT^Q3+qt+Y04MqY(8MR_`ofolkmm1)hc1=fA zN~l0jh(Zl(GEG(t31`vFeFx4{Mg@-AJ<L{}^m4d3;rliXRq2x-x&_@s2f%#@7^+h% zsO9_b`)rqc6G*Yx+V&lU-aSU;;5(978a%er+!1W+1i=*}v;}!j$3Eb4U5F3_QHh<^ z<i>&8Y->s!?L0}pa<$T+Cl;bO3lM%#K?md(wP7);wTlRjK3l_F5gr109U4Q5xC)ab zWY5T3rLQSD`^h7Si8JINOBo3zfq{#p3*sy=q3O;6Xd`q<m0kzW&)oVQZMX@+gW6On zQa`;FNvrIFaE`YH#O>vHxjhtY7&=0~s$M1H3MF?ht!}tSECxRD6X_(fX5ae0(Q;2i z;~q7}wXX}8hlc>ZqF%W8{9qsMB;SKo>Ask%?v8s_^wW(bnXEj8ayvP+M=1B02p-;p z^LYQ=52_8R7L+a{9YMZ#?m>av#@~F7IwwL6pFNLp@(+elm3yc{0O`X0vPgwMXOQqr zm1O822NK``hIbIy6750!cUVcH7@QDv<cVPwU)plcCYmvoxc@0#xrr;wGpZ_P!avXo zkm>U)3*Pl5pk|2WS5=KA%7I<*W@mtE@CjFk6r`k<9JIAFe%$>knFEW@_)Bn;6xOAR zm4-r9?PGyfMEYZ>oC*3l@5A6cv?i)y{zy5#czq<3kjVhh$>gF5Arv~Gs|FmI7#^v_ zI#$$_360snAJq?2UZ6H?(W-)M5gk!*@sV>W%ZIil*Qgx7?jA&m5Ub<XNxlPyWPM!- z)W@uio(}$O>r`)PZ*E=eXs^rQ?{S%yJ$`j;YngHWKygiM#lECKTga)0?^W{I^&UC= z!gz#Gqlt&c`9=dD!*Z_<kC^~#{KcfxGq+s`VgymyOg=B*e>w$J_#;!LrO*{vRk1^J z3>T0yNz&4E_yppxkN?6Sh$?LgC9_@p*a-4vV5hPo?3m1%<1)R2>FxjIG5i>S1u0m( z=OL@2GQMGh%G1DRdW<~qX2au2>c=axT~2-oxRLsdOC;eE2tWoQiUZQ!CU9?eP;T#G zksORpSHre5j!ca?*^$jQD@RM^SV%Gj6Y2s^w8RCw1BDr5T>1DB53Ms^tA$(Vj?zvw z!PT>KX<y+`HoC~-=EBL3xH=-;5iJa%j;>&KM$(QPi5|3r;IAsKf4=3@d{hNSsbJo4 zEeW^GXF)wqNh}?(Mp{hV6`Vj?dH@^j3%;9lvE0N4)rD+;4kX)(vfBlbmK!gsD(9vj zI|p>5vbYd{5}pT}ZQZA%@7>MC&R9Xu3~LFCv4ls=Ne#()3dhS0p3!9NHmWGbJub|t zo=OeaYWacFfzeH(nuJYQHvB-aC+9We)ppestc*$c51(W@vOsWDHC|Ru*X4(<L5REJ zrtvf5mG3=l5FV_d_F_Fh*&xK#7^1X0Y{F{oN)+;nFx;rB@HAA!hsg(%u)eq>lxJuw z`nC=c@T@rCimI>&aKzmXs>Zqj!Yn4&f@H~2WlK<Co61l~+Y6yVeQ{p+T`0;SC_egL zN6Qra7+%f#u|v-)&-AWBVSASDgdRktXas`YCeXrVOIIz#SW7F^TjNGvsZ3JJBgh}6 zmswuFq8?SWbHV(ruEMNhnY`_rin8-PWPyB-`RhoZ@Lgkw;yckkoYxG84<miT*NhJb zuQ`!E;rGVQ#P=rm%_6Z{cLJbjr}I1uJ_WJ-w=8%Yb3t8#bH~W~lg_fYwHS3^>Sb?h zF*IqzXXmyua@MYJTZ?fwmU5Dl)Ug%)=|U&G-!0tZwidI;B5ut(x3y?3y1QfOz^|Gu zjs$YT958BKBnV6CcA)}i@719lp|FOw7DE}6397Bdp^PX&wY3<cm`qS@HeqXOf@-rF zQd1Gsak#u797-MUfrCz&O)7bi`mBkVRC85<d{u2+aWP>0GAzNFaciA{q>hnG4K|HR zECr0lgb2`V@syv_Zd<F_O|3~nEn_?@6v%GIAmVo?XigO7{x?O^*_i=Qrz&fZA%4ev z*Y^uUjcNAaJ7Frh%A618D_>WLdXQKD`0GehUqCwrraRVZ3%w~~goW83NH(NZgB-`I z2RDfak6XViSRkG_6CRo+h#*hGdxi`I=+`JY1S+C^L2KW-!PaRcq!Rn#wRDLfm=n?h zHBz;q#M$zI=z(ivNxOW}J;o^}GH;f_EBL-&-O-MYbkIa4p8cxg#V9DCAfgD_JBx`T z5TAc779DO7F-E}cRb5!eM$@yPk@2mwXnYHZWX%SC3ixEwZIUoG5OhjxNN#+|qfiqc zr2)dA=t*0oXR0a{=spvb_&IOpthhZ}G1vu{5b|M`2w@bNzU_uXGvUF(Y&v<cwP4to zoxV6Lh45Hh|H%OPa(r-3Kj>a%-01FXa(^X0va)9L|1mPhM&);5T?b^eODIuQ?(~&C z6bwe?f16kiu9)s4T(`!rwGu)K!8yD2?iN^QKc;Qpg>|?xCEynt!55tRU;#xR1F7s~ z@^ZZ9zGh%6M|Gx=*YwM$xoW_Kr2G{NzMD!GLnsT-(h}5Mzo;*0wmuEmUiMJGWqL-4 z`-tsb&j)Cw$%R9Rdd-?Z`AixS%HaWHPE^M0LnybLG@E7xmE!Sxf$&KDw_#K4*6xj2 zo=W5U=cwusvj6(RAEA9HTM8d?I2)5w<v3bU3KJpEa^VbhP=SkA;;-L=Z}fbv**O`t z;C!P80W`Jx++uzwS^(+?T#b2Os4ZZ|ttTQw7Zu2q9FgENs7b0E8I{2{-t{TgsgjnV z7;QBIPO;gSnYFm$(6ts(MsylKGft@-wiaJ3>+fLunQSfc3Tn~Tn9pGJeqD1Z_BVed zau+oWA>0((+Jqt;>E3x^T!?b_P~T$<EI=@^f$lv>RbhS-R|#9n)bFo4L6WRsNY>&* zT3miIYbZRmo<Waf{F_l;1fEG&(a@d)$%4T^N?AG%P?UpGmv;b25N^VRN<!*dnA3U` z$jxXC_Va24;G3*U1yR6h0W%j~>NqAu{;IptAbxeEF0>Dk=qkgOKGZXia^!@;wzWbL zcg+=9k-4pIm3+lIjZ&`1)2;HR@(A4VhR>k2*v%LaaAU3Ew;EMlY@4~Q=cw>lg<FP? z*>uVX2-wCXO5xO8(z$IRG%dv$+IUl>MfR*!sEu$ZyTw)H8`rJ~9a_W>C~IKyFcy@! zfh7u~cH3L!1at2#B;bgafMaZ+N^eSpny>M*RARsS7(j01{HiD#V)u--M%WkcmE-L# z5*m%p;nJ!y*VfThtXiTqVBB4@K|*u1l#?8(zj}X|9%X1P5x@{e49yfdQc|p%bM@iX z@^bY1ARnrTRLZRwQfXj;ZrhjJAz~l-FrT$L2V!lZL-gFa7O{rvaL`jnV#XuT<sgjD zEYEy(FJGeJ5o%KvG^KBHU;-Ap)g3_{0A;K4Q&0+&31!1hCEYJSFi^$dGHH+$bbM>| z*y}Mh!X0k)6eP>6S0NG;&>iv&OQmgEBhVf~n%7Q|G>1%~Ah6IBZcK-D6JqIYZ8$&T zK&qo(92Y*%E7s?>xzFQR=$lpC1j1jZcG=N&NWPHaYjWpMzS8*259MQ`UOMScrL1$| zCs0L6vYo)mUipVS{`BbK<~0<)Lh?G;5tOEZLK<7#=Wsz~y^&@@I!1Gq*pA(P9>g?& zmlVI^*-&+5P$C44?8GB^ULaJ!CH9%B=wel|27~@8Gv?t`7Dco=$$**X<8f{)>f7LA zBgO3y`^;u5vAaKAKc7dwYCXV1V14=0JRB`unMjwqLgqZuLU}7_l1^JhK}azytGgPy zlMpvJZIE0@>yzFzm<qN&mE)*sv)3g?2u*eXCcERJY2!tMQ&ZWs*IwdmyuD_yLjrq! z2RzgsM3%_5yDnq>%x|6pdZ2e*Ih+|tf}MZpuW0y4q9)AsS*##bMNl=&F?iPTEmwAv zqr%S%cOA-nC3fLw<OvP~E29c2%v0vKSO9{>kb?M_Qqom{J4nLJlk07c-D32%dKVu; zDu$73;23tV#m)oE1^=nUwlC8rsx)s*J5=t&W^a`+8TSt1Xty)xXT@-3Y&T{}3Cxrb z7#zAUApvq5Bhi(2&To<^UGxBFIr7O7?nur|d#cJn3{0QWKj3-6Ily2zT89rYv)PrJ z?6#gR4EG6PCChbq3#5Tl9qcpw-kKv}_!8Me!P7a*lK@d&DoY+PG_<OaAE?C6{es;I z;}71659f>hA8c(|Q0?JWK~6<ybAK4?uOZ%vDXiGhmFLrZ47OlNB%DN%Nr*x#(;TF5 zy^bH*ut6mSDa-_$d?j#eCuE?FNv-Z8%HUBKOcj{Ka)#@nl@I%+^OaFELPXHM#*|iB zW^L|;UzjtiQ8RcyHE32B;*Ng9kfc@2G~LxO6kGvfQx}topSz1J6VdmPL{tb!gs2P< zvXXFO9V)JtL|Mu@0SF3Noo}*vta3y{96tCD!kKZf>heqN`SLLv-?0wI2WTDRq1svw zU1JlK`KIwR<IP_=Y;3;NsML&SvaxC638fOHl$Q*zjMrM5q?B~1Qk7u7`Vw>KG%8Cy z5y)3sqS7*?hQ?eNnh0_Oqli={K~nCJUpoox5p#`c^)An}qpFiWi%po-<ZS-BunBkY zA%leQ67wsP->7a9q#$CTDO1{7T3Q3Dv0-{X%96su9q>^LaO0w@0Hn_YK7G{t#H{v9 zQ0v9|g>#^%>Yc}DI)SA6Nr<XNn7Y10!B}L*N)t1;nD944JqVSSPF*7+nciB7?fk~7 za%|_9^zu#8Iw8WV`OUCoF6acihN9q33@K6&{0yw43ZbV5>kpL}cx!=CTvR;JM3!Np zP&gn>kqMDxlw}V}@lK%9sS<v=^kRl33WeWOUgoNLZYmgaB3tvTd=0uN=8ibKBJb{G z_9LAd*5F|og2;X|dr6Vn+}8R%H(EnFHMceEh)>?!D7!hy5E@qYj1$4r#za?ncv^H~ zq^|_?n#!cS-yExG>#^z+v96Ft!bfcB1=xMZA5L}g>}|{igRY$@WpEuhD{RQoU^*L! zKv&tAbT+8ID`*=hDpW<pN`^pYz?|ApGZd*QN!uuT#+odA4=)$L+9a8=^AJ%AWzgLZ z=I6TmVH$R|6`M<{U32b2GKk9k8_Q(ihES(rYN>2N?+eW}Zetp%s6O@itP*zVbY%`Y z24Z=MbDs5GTd}Xa!nG!o>0^;e#(-NXkdh@BHuDQVJ70Ng1b)ILwE(TKJjP%!xS1ed z;UUIqS7K`)4f&nyctH1q_?^7os&>e6U+R+9W_wKKBj!OY0xmx0hN}o<oW=ZKtY&%= zCQCI9Pa$``X=mfT52#A6mByX7^JxW~C@Pb-1c8t!|0bld>7i&-lP@Tjka`W*?`mh5 z36e!g8FB=2L4@M6stm0SC_upE)S@WnCs*8)?+K{XC#3<z?g;6fE*5PSf!Wa7mQE1S z+=W$Z{N9Izk|ZQV44tB4Nr?Q$cN24*%FA=AH5MB8R0=F2d||Zrz?Z^EX1p|1O{*fa zxd1?=v{j%LAk0uO7QKk@-r+J7aP)uQ3v(}1qS5YRXc7b-(QXAq1MmdT6y|NYD|qD* zm$b<K5KF>o*FBgK37kpZ3LXpoDOIJh_*MA@neMR8z&vr;u`G~E$MAvC6=AVB{Bw!1 zv;>}U?RKU`^N`gQagiu`4Pi35S+JUPYL3HBnSK0@mS3`P8@D%dp53$U{;q|JbMU}9 zr4je3j=p>kP&_iv$y|X6#qx$b#HFxgR5OU84qHcN@AiiG-~Oh3^}s3bc$4Q5$zi2E z6AD?|z?~$MP^Q4OmSWYU;JWx%B_@HR4OvIns98LS250f?U2GAFLF5*;m<{{)jTUu< z3VW`^jy+Ro$M9Rr$e&X_K(d_dD<s}zB-&c#Wi&}*3Rw{j9*?fzo9c91P?Gnnf+IoL zM9XJssL345^#Y+bo^xI_=vXe;Ev<BeD#)`0lORKh-c6>nm2uN8lZ#{^xDr9v4pF=e z+7!6V_)UCydMUAtyXFMov=0l1tlI!S!UzRbGy-g#g$Pv0Ley%<Le`GMkQvRO4=VcR zYK2#82ue=>wprpuIGVhK7*8pz@D*6@=u*W`>vWe2H$=38M?@$g;y_myFM!Lyt`@E# zP$2V8;~R#l3|N#&May%97`Co7E%`hmAq4Kpd9wxdCrXtB@M9bSuDs_3fFkcHxFh4z zC#%kMhcSN$+wQH0uI>KXX;|(J4KvPcJ#4!hTluB--^sSS2`hFm)`&;&uE)Ve$V34P zOV&&|_Re30Y#K^R{G7j3N{VQ3+GK~IkhheOAfznOFs6KOx$&{nMTm&96v`K)DOO@X z|Adt+DpyOqgOd89uZC0?$I^{Rbx`pvII)52rvl`r!52q#nrZWz9V0rfm;p!r@hM2{ zg0^YOeFV5$L!zZATa~U0W&MbGZ(J=bR4SmrKcrK}1o_uCkW{qX!n@?e4X*o98X);9 zT|%J+9;`CZ{ef)n2#&#YQP++NcL<i0g%gZ$VRt$X+Th42uz*CUX^0zD%LoR*8i^er zK%m*p)F+XHC(9~MO9fsx?TqiKB-1`F4-&<e0b@;6G9l6+JPCb^a-6Sj)pd;!JNJ{` zPI&JH+ty3ul*@=6H$n1JiYY=I1$4*T7<(IJ>Z$L7aN+|jYigVqI{A=aV6qe4fcz0f zCQ3PduE;}$yC>=BxHh9!quHzwEH?p09aYTG6RWb6<F}DK;Wnn_$(K6I2QraZ*VLLQ zFJP62wSj9ggEXLRZb`AKAn#0-=c$DhJJ=`zBrKO!w8INa^G-?1Hs;<*22wqK&(u2k z!kMv&dJP+e=$2j)vB3FaS;8Kf!6q$WEPx#Z*RyXjOG~~qsnvSiSvR%1jk#IUK7buS zeNb{O-PW$a)nlwmsZ1%7FLznWKS6m30YHst2)<<lKrHyfgf7>Jw?=_`(`-0uvnzT# z!lyCE$>zjzV;Myhaeb+bSrW}H8R;GW&f5{LDXvwLFXt2Scr=%fj(uw_qc$-Sv7Q5o zal!qgUdkB(akY>qI@%vssa=k>rgE&G25Lw#2g;leR|}?z%Tn|lTz*nBK|%@Yrr`Lh z4(mV~AcMgvaKgkpjFPW7XQq0sOa(Wvh)a_$RfvY$)^^ElzA7~{%|w3kXUzpd+gWih z$PUR~K@}deekyBMMxs29@=nMKp-hIe!&wko(7P*Ec{fZ!*QRCaoIC`pi8pS;m`=FJ z)bj91OtM_Vv#HO1cv$SUp3xWwrq=M7OaUS?nMTfr7=PipSgWtR(Pq6k9zjV}+E?&b zL-++fxCfm}Df!a~zQxA|i7-T5J2PAt=C@2<mpYWorngK&!yU_%m*&ZsL2L%|(EN#) z<H=X9v5v<O-GzYHj9zJH!LV7TDKls{+C!f*{kpMrJL!bK5&7T{^Z1{>;OqZy?`mV~ zEX#1WmJJviLZ<EmP*!nZ*0J{OJ~{?;pwl^rIv0Z3nbMuM>ydtO&e__gHjx-Z2ryQT zX&M$8#HkF7hK3(#B2H1JIDRl4K{3vcKWIV(PGaB(;B{U1^E~hKo_1zG{IQIYl(px) z@AE$I^W4w<dENI-F$X|<-oUe5D1yb%Udt~OD6u*_h3C-whE{m|KaMDE8$6~dJ#hu{ zr9FLk($d&=_CO-uq`KxYY}uV?7^;=y<~$p3s5~~+Stwf9Axz=TMbMM{&F%=m$UQLo zyHA14>6q$AdjHYu=+41@g4&9uE-(s$NL;TkVdda}!f0zA+-wdhP6bz$CQCg)A|Vcq zAxJQIFZkB+US<#%)RLj^K>Z63dlZW5dSJhL3;6;NFv`L2qBA*<N*{8D35dnXz!Qek zPlDsnmgIpMgB~sV?GaMQZfLmpEm`Y(trc>CmgfzRP(|Rn8&h$*9k$T1bRsplG?enz zm}1VOKTdZ{<qNpBxW>H?Pv=Da@<q_G<U1>rv1ucE#_>Mj6~-GDzdjZG*enZ}8|tKl ztDp-N3rOz)y)b@3-4ufyYiw~UgrU#ycWu!5?6zE6&R)y)!>4DtZhq~Y<$9)BtbRUO z%azdzV(4(>Q8(d=pPK4Vh#Z-OG!b$W7<MoruKB*~6Bfy(wdleWa2~=FF4%B$v+$>k z63BWyh8!r~a;&`Xu+JccN=79GUNsM66{|_n!+r|B!##p^m_nggxt-BVg6WFOVXCAL zZAl-B6pZ<=e8;Q$ZBS8SEzQZm8Q`02%1OyiXeRnjG`3vtcwCUP33Dy!q;70Z<#@uR zN;Lq_Xe$YGDdo_1QS6yuo(a<_b#KOLo%qzr(TLMho-h5&-|$}8E>thVY*VPvE4dzG zB13&5Lkqc{hQhAvdnfskAjzvI>ev0+braFwZj31(OY%YL%JK5hz<B+ic1{U*331tT z({{>w;?7;|-8@lilxh+x)=r(~?8NL1-{S6DcLhYRnA(RcL+FSXU~4Ia7d8o82RWvs zJQ$;yPDJ|KO+AXBLp9@yAjj;9JGBN-;YdD=hFQv<tE;*O#>GXi@0;4Fs=riv!eIDa z<!E~g*3y^Q`aB04ZB|iPT90GWj`=88LIlUf6%ipVhp~Wx<iS8d7u6@VV3Nhet(rmR z{T7^DhE@}%#>TX&U5WJRWEJ#6DWAUi0!Y<zx0OEaO|yjAuF?m6iP!e65fS4==*v@; zb8OdhL2e5ld`T5&T(YWt?zKnm)kOVWcjpPfK<E`~$ljystm0O03Y+?$o!jZkBEJ|^ zTBm7k+9^U(Jdv@K<9*+T;?mg#??nM5(&=|ry9xaWni~t3g|nS7J2zf0n_#?PAxF2S z9GTuQT@t41YDppoL;G%-Gt&x^B}}Zfi)r-G((D=xtwx(rAGWL0FZ*8QNOunGL6D7( zEnFGJrjn3=o8=r#wLRr*7_S_OX6}uMv<6FNGQ9&snaMQel&sCk$UBgkj;F3DR+lhe zLnP-ZO;rLS_SfufKotN6*0_I~za?RAhIpaN8i$JyHET*a=-7xpqU9r`Pq}7hxgNB^ z=tU}W`m!N+BapwXe*6-l8`l4r4zoG_AJg%sV3>|y>h`UfDPcdggpQ<Y7&&RQABBuN z24&HwtlO7=&D%HW!2{=>_p<wx=Ppxt-D*;iVU6a;MxX9E-f^J*3tI*!-Wywv`qY(y zVJiU!o;xXjGVt+vI9B=W@w#8-pDr953)XJJbcOhYxrfF_ti@A}TLs_lIxr(<EQp-r zLKmYh!CbV`uBXQtK4bcvvuf{;7?HDM^LB$@5Vvv@4gbE@d$X^WO|+x7<OLW}c_%vY zTyW#9tYw816PPV&!HdW_gt8VXzUNquT-HLP=3G&U4CfkNoqA0YHr>jsm(A4r5jQ4S zHwuu0=U;yCo>P{{g`84}+!sT1dZK>Yf+LLJcJvORFfEV>;Jn)wsQfmqcd*VouVXZF z@SzQ;R*!rGMJ$K*Kf6z|2+UM6m(f@_1I7FhTgBJR7_T-rzSzCL?tG~A{5db*S1zpk zvlZCg|G@Xq685tCBNV<?M3-WV1#y*bfn1sp&<H_^4OmzNn*qUqe!wJgv=0=&SE5`; zKVD%(c#84&KKuB}_m^FmoV|A8qSLbrZ~MVHyU^QVXWGA6yU?7GNsF_K$dU<%aWVk8 z5h+(3ZA>8XBG+)jgeD2S$TN(_>yhFR5}Bl%Ib}=gO}0m2!b~QLYeP=ua?mmIbX>Xl zF*ioi91s#XqtK_Vj65{x?!5!$u~EsmG3aN;?Q>?0>HD<11zW<$ZBdfY*^j}B!yaeq z#gECQTJZxTAc!9n;5dcwiR%L-%*)A$3mZ8WuZb70wdE)irn6A4&L~O^*tKJ4X2G4} zA8u$L?gWskxZ6~Q8Kf|5P6Pz7&<=PWZNGnebyr;VHK-H79!ieWX#fa1O)!{9s1u9u zQ=t>q7!nyFsn)*Wtvi_i{njbBV;%&t2@)6avCtLNeeW{Zth5$NUxg{5^{Da%TW%l~ zF+7724a`Hg!(fYwF(gTiwGh1wy#bQWfv7?%4~ZUgl0M=<==o8FI}ueuX(aq!DxqN| z=dq)_GkQFBF%3lAMAK+u&ao$9ogxra$RkRw_5e`c;!`!X;=tU;?>^SpEF2@gvyEgB zOWt0E=M^J%))6jILrEn@6Z$j-!?&wAR4CE7OlwgjY@R1ItfXKp&l`T}K+z^p|N3!& z>&JA6(<ShBj`fR$zgGbs-h^(k^ed-lknn$oW-^0CXT8;%G+9fBXmj4C_2d+=q#7Bk zs$Q)O8~d5+qnMssaWwQsvAq(o=g4H-jdnxmf`T$UIhv+C^!y_;hPPg@i(mn8vAnw` zxL9ZwLNnhE<XOWv>araGYVxrfo>|?88a1+o4QMB2hsX_I02;-4=^p`(0=dR{w9{0+ zEAta-I*ht-o!eme_|=w%q<?zYJJ-L4mO*a;HKPG1V24MCC}ht99G6WiD_hw@p%>YB zlRYSenr+}R>G2#OBG3Nd29PTWBS5S33}B-=da^aBgEHc=1k>Y`@9O9T6q)^fHf?2( zOMx87DTZLpLyNVF#!+>Eq_yUZ+M{BA7#dc|9?jVW&h8=wZGZ*7HN~1H1jma=X1Jai zB{x(uZG+Mi>pS$~bzE(lj>`N2=)u@hb{loQCFHmS--oBN&>vX>#MFzl!9dWabhNt{ z_bP{l?yzvXtrhc0hb$zEvN{0HnA8HWp(mdnve4>DhbWz?1(}Im_I=Ed`+-nr4+2kE zZKQd0GU~)%H7-!*7I}iB1&Jlh#AE?0^a1zL-vr&DZ1xWDfP_W%rXJ0?tjG3zzIShY zj);5K>xRm4u7xmR672J%2Gdvz{vPo~o-IsVpcvl?nZ9URY9gbHkgs1FSnqszYe98x zk_iFT>X25`SU6fRNJw4baTVEC!+vVf4d4d4!C0PMzJYHN^$bnWl*#(45uhn%%GJm& z5Ee{*!`&N$3ze{3X8d(`pW6823#vcLMtI0qErY`p^(YXZ-un=YHPD*bbJi;bAXlqW zhTLliT!>SgYaTDHri%qa;%++OC2shVMx0N3F|&^KE)T%00|`C5k1<lh%mjGHw$P%R zELrTev|<vbCd-7Q&^WsNfX0x^#Fhp48zIdO#9AS%5ej4|o!#n~M)1CZt+t-MM&9Dn zGxEBBe$L1{(~LVmpBarjBzriXX4>dLZ^oKK+K2zzNn9|Hly55igPkTlM-1|U>=8VW z%mn=J(1MHG6|I^26tO45bh6?Q7;P?Mwv;Y;Xzz#T<8o)^F_A>9S;`(6>GUxs&b#rQ z8nIKkp%V47$CyFHF$qNyD;;nf9Q0*tqTzemXYTMa&P56QH97v$1F4o)_f43$qS4*8 zd#Nw`3k^duCDX}}dg9n(%8rFgP^<QyLEo5dR#C}68V}GNS&uJ%8;CkRk77DI6DQMx z?8e@3SJIyKUJi1jD4wk!AN~kmxai~zs}6HItAlY5vN}~}38CMmD!Yw`L?T=Bj4tQL zfif2lKpd~!3eJ$w5T>eG3ZDx|Qv;<E1TkhgdQgJAcr+y_r3B(xHK|jJbLl%XN%Yv| z5dg2@2nAazz+Ky;<CC6-i10)xnK$-yI*pQw0|R|HgIa=!mJA<m@GUFDDWyP_Of2RY z&Oii|9aN)s-s@Xf_@T2$b=roHW5Z49&dl1oE$BcwxOC;KsZj;RnBflBNQahHz_&wp zF~YZZz?MPzxV?@V<E4AH%M;<#<FTLZJ)P}nC+jey(j@<}5Z&WoPqDiWuFx<Fad#un z8C7+GL|@wQrLwOtIlaCvofp)S<h}rK+F>(^mrvsXyP%!Q-hrJywekQekZiVwxG0rW zEYjpNJ<Pp}9QTA%pezzmpa4@(Vzy?`(>qR_R$3G^B1|0W*gX{9S*h4DyCFbX#{#F; z)ysB-5f$rp@K|9LmCvR%qLHk+n1Yl;*+$1e;X*an%$|BjpwIE;%W#=FL`GZ??W_~U z=@g>~9+A#+<$cZ@IkdsFO;|QEA1VE?vh;MFSk@VfO%39pHO6N4`+!|fvoC5;k-64~ z=wcTE+fit-?7Xwc3;1EI;RmcT=AXi2Q+da(6MnfvX`D-&e&H#Uiz2TK-)vu6zk!99 z@Rfb4&)H)HJLSHRaRh?KIQjzLFt;7Icvg%r9lhTSqmd$1dxb0PG*qTSrbm?NZ{!TB zjcN)d>tgDPCoFeh7*SH8fG*0M^;on9Ah|%CxSC&2zq9tH*uLj8vE$Qk;-}G*2nUXz z<kw>QjsBbWS3T91)n~80vE=mZjq;&$_J-H*&$NGQ?G32zfUgnzlKNI($+V7t*~L-z z9j4SbEwQ7Bs_<yv`rIbdf(>8D!hBHh=u;&qP+nDEOGAll(gb{KYE<c)0wn3CMIL8H zEzyQZg}Xr$Gxb80Z6_ZJ3<P4~;nh$b2o}N<Z)H(=mMh~2NR>L|U8XJ}Fq#1QH`GF? zLk?AiZuiKC=EqszGlUe@XVdt*f2}he2$Mx=7(=^FN!z*qDo9D|Sq_K-m?keFB3l!b z+mcPBsnZ}>lIJ(9R0x;QfyIOi5JK)t8@jx}?vWI^4~{=k|J8TWBBnMD@SHA4gH!<` z?O7-S&(y`Zr(#{Gd#!S8FJ-vXrr`d@@{gmyDA&<SJ76)m!GMBMm<0qG$BDYs)erwY z)1_{OF2*aAdYng$<@7$kMVW`ZH!O?;>p}Jvq059&o>wEKW-t(f^%tQr^#~L3owPw! zz_u|b0&-P_I;0+^Ya#-Z*~G;!<32nlj=R)0gb7cqt*4WOjxbh`E)})RIgvWWT%63a zD4YkO1S9IH()7+)X8wt{XnMQgPVRAG6?NzcR!PV}X%{HWf>_8$qJA7b9m<XdQ*I{p zHILYmX^ne{|ED9gl54j}ACxH{Idm~o$okAGvy~;+nR~_OhG-$&?aC2F<iL_&Oc~Wn zLb<VC=jv0}HQbfoV~MFKcgv0uQLU!*JaA=p00sra#o?QF5*5YW8m~LDLwF~rEBlj; z;xZ>L*=SSz-LuNwXXM5OQ((bKFLg7w!jU*r|NIJGhK&T!6|n%77*n&%R=}2#z}4?4 zomx2UUB-uMC?!_Ns5#r3A^H(pnFKUT_e9(eO*^&rxo8ujjr01t>*eA1y_GO#4S@*< z3JUkNhAuJA;`B5&8fn(8gg0vp2I~A~<5Y$5M3L@L#lc$?I~rULCMr%;q1(CQ3pkJ< z_6+KPxmbW08b>l7hK}Pn$l|rT>0vHr7O<6Q>Yyn4S@Uikwe<D9{vT(p32E)`feCEH z7r3gZNY~`U0gQv|t;FtXJ!%#$uGTW@Q{-?A2{$;1YVpp$)k<hD=6<5*{^~WW-+p*m z-38Em_yasvU!m;}*Z&r%hdcH^(?-YJc;oJQCkl`lS6~3LE!A!W<2j3KL997DmE5=L zX5F=L);AwKa@loMb?aZ9{lptbXZ;YrURbweMrdAj#!ki6Yu~tI<7d>r_(I%#e!j0% z+BMv~s@n9+mu`6^?rV%sTdJQp{N(=UV;U=sw9QC()vGlw$IOnq{GGbx>-8BwpF`9j zp7!zQN^8brEMcj%u6osdO>Zp>m(I=i<x6>7`>`c&F1s~+j1e^7#*>F`G0Jz;UoN** zm-RLNY+HP3se}QpJo&E;!||tR*}SUyQN8ej?ry!b4ck(^;`qSPq09@H+NzhAFS=)a z{Nb+Qw(4aAPu+VoeAtlhE4Edap1k?_Qv6!w^1AAhJ0HDjUfmqNJ$`UbOCxKli=Wx@ zn|bk-rIB^j5B+3g$7A724!NfK!LN^gd2YCnpRKDdymHx!hr%9W>LoOFsea(LC%!l@ z>>!>~#0Fk`-b>GYr0$YW|42W)wA8$|y5N()f2|xo)un5z^EIm9K|ku;EpOaD5*AOF fuBy)YW95-;b#w7L{Nbe5zFjx#-nVC;#DD(<bD~%P diff --git a/bin/tex/longtable.sty b/bin/tex/longtable.sty deleted file mode 100644 index 20a257cd..00000000 --- a/bin/tex/longtable.sty +++ /dev/null @@ -1,442 +0,0 @@ -%% -%% This is file `longtable.sty', -%% generated with the docstrip utility. -%% -%% The original source files were: -%% -%% longtable.dtx (with options: `package') -%% -%% This is a generated file. -%% -%% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 -%% The LaTeX3 Project and any individual authors listed elsewhere -%% in this file. -%% -%% This file was generated from file(s) of the Standard LaTeX `Tools Bundle'. -%% -------------------------------------------------------------------------- -%% -%% It may be distributed and/or modified under the -%% conditions of the LaTeX Project Public License, either version 1.3 -%% of this license or (at your option) any later version. -%% The latest version of this license is in -%% http://www.latex-project.org/lppl.txt -%% and version 1.3 or later is part of all distributions of LaTeX -%% version 2003/12/01 or later. -%% -%% This file may only be distributed together with a copy of the LaTeX -%% `Tools Bundle'. You may however distribute the LaTeX `Tools Bundle' -%% without such generated files. -%% -%% The list of all files belonging to the LaTeX `Tools Bundle' is -%% given in the file `manifest.txt'. -%% -%% File: longtable.dtx Copyright (C) 1990-2001 David Carlisle -\NeedsTeXFormat{LaTeX2e}[1995/06/01] -\ProvidesPackage{longtable} - [2004/02/01 v4.11 Multi-page Table package (DPC)] -\def\LT@err{\PackageError{longtable}} -\def\LT@warn{\PackageWarning{longtable}} -\def\LT@final@warn{% - \AtEndDocument{% - \LT@warn{Table \@width s have changed. Rerun LaTeX.\@gobbletwo}}% - \global\let\LT@final@warn\relax} -\DeclareOption{errorshow}{% - \def\LT@warn{\PackageInfo{longtable}}} -\DeclareOption{pausing}{% - \def\LT@warn#1{% - \LT@err{#1}{This is not really an error}}} -\DeclareOption{set}{} -\DeclareOption{final}{} -\ProcessOptions -\newskip\LTleft \LTleft=\fill -\newskip\LTright \LTright=\fill -\newskip\LTpre \LTpre=\bigskipamount -\newskip\LTpost \LTpost=\bigskipamount -\newcount\LTchunksize \LTchunksize=20 -\let\c@LTchunksize\LTchunksize -\newdimen\LTcapwidth \LTcapwidth=4in -\newbox\LT@head -\newbox\LT@firsthead -\newbox\LT@foot -\newbox\LT@lastfoot -\newcount\LT@cols -\newcount\LT@rows -\newcounter{LT@tables} -\newcounter{LT@chunks}[LT@tables] -\ifx\c@table\undefined - \newcounter{table} - \def\fnum@table{\tablename~\thetable} -\fi -\ifx\tablename\undefined - \def\tablename{Table} -\fi -\newtoks\LT@p@ftn -\mathchardef\LT@end@pen=30000 -\def\longtable{% - \par - \ifx\multicols\@undefined - \else - \ifnum\col@number>\@ne - \@twocolumntrue - \fi - \fi - \if@twocolumn - \LT@err{longtable not in 1-column mode}\@ehc - \fi - \begingroup - \@ifnextchar[\LT@array{\LT@array[x]}} -\def\LT@array[#1]#2{% - \refstepcounter{table}\stepcounter{LT@tables}% - \if l#1% - \LTleft\z@ \LTright\fill - \else\if r#1% - \LTleft\fill \LTright\z@ - \else\if c#1% - \LTleft\fill \LTright\fill - \fi\fi\fi - \let\LT@mcol\multicolumn - \let\LT@@tabarray\@tabarray - \let\LT@@hl\hline - \def\@tabarray{% - \let\hline\LT@@hl - \LT@@tabarray}% - \let\\\LT@tabularcr\let\tabularnewline\\% - \def\newpage{\noalign{\break}}% - \def\pagebreak{\noalign{\ifnum`}=0\fi\@testopt{\LT@no@pgbk-}4}% - \def\nopagebreak{\noalign{\ifnum`}=0\fi\@testopt\LT@no@pgbk4}% - \let\hline\LT@hline \let\kill\LT@kill\let\caption\LT@caption - \@tempdima\ht\strutbox - \let\@endpbox\LT@endpbox - \ifx\extrarowheight\@undefined - \let\@acol\@tabacol - \let\@classz\@tabclassz \let\@classiv\@tabclassiv - \def\@startpbox{\vtop\LT@startpbox}% - \let\@@startpbox\@startpbox - \let\@@endpbox\@endpbox - \let\LT@LL@FM@cr\@tabularcr - \else - \advance\@tempdima\extrarowheight - \col@sep\tabcolsep - \let\@startpbox\LT@startpbox\let\LT@LL@FM@cr\@arraycr - \fi - \setbox\@arstrutbox\hbox{\vrule - \@height \arraystretch \@tempdima - \@depth \arraystretch \dp \strutbox - \@width \z@}% - \let\@sharp##\let\protect\relax - \begingroup - \@mkpream{#2}% - \xdef\LT@bchunk{% - \global\advance\c@LT@chunks\@ne - \global\LT@rows\z@\setbox\z@\vbox\bgroup - \LT@setprevdepth - \tabskip\LTleft \noexpand\halign to\hsize\bgroup - \tabskip\z@ \@arstrut \@preamble \tabskip\LTright \cr}% - \endgroup - \expandafter\LT@nofcols\LT@bchunk&\LT@nofcols - \LT@make@row - \m@th\let\par\@empty - \everycr{}\lineskip\z@\baselineskip\z@ - \LT@bchunk} -\def\LT@no@pgbk#1[#2]{\penalty #1\@getpen{#2}\ifnum`{=0\fi}} -\def\LT@start{% - \let\LT@start\endgraf - \endgraf\penalty\z@\vskip\LTpre - \dimen@\pagetotal - \advance\dimen@ \ht\ifvoid\LT@firsthead\LT@head\else\LT@firsthead\fi - \advance\dimen@ \dp\ifvoid\LT@firsthead\LT@head\else\LT@firsthead\fi - \advance\dimen@ \ht\LT@foot - \dimen@ii\vfuzz - \vfuzz\maxdimen - \setbox\tw@\copy\z@ - \setbox\tw@\vsplit\tw@ to \ht\@arstrutbox - \setbox\tw@\vbox{\unvbox\tw@}% - \vfuzz\dimen@ii - \advance\dimen@ \ht - \ifdim\ht\@arstrutbox>\ht\tw@\@arstrutbox\else\tw@\fi - \advance\dimen@\dp - \ifdim\dp\@arstrutbox>\dp\tw@\@arstrutbox\else\tw@\fi - \advance\dimen@ -\pagegoal - \ifdim \dimen@>\z@\vfil\break\fi - \global\@colroom\@colht - \ifvoid\LT@foot\else - \advance\vsize-\ht\LT@foot - \global\advance\@colroom-\ht\LT@foot - \dimen@\pagegoal\advance\dimen@-\ht\LT@foot\pagegoal\dimen@ - \maxdepth\z@ - \fi - \ifvoid\LT@firsthead\copy\LT@head\else\box\LT@firsthead\fi\nobreak - \output{\LT@output}} -\def\endlongtable{% - \crcr - \noalign{% - \let\LT@entry\LT@entry@chop - \xdef\LT@save@row{\LT@save@row}}% - \LT@echunk - \LT@start - \unvbox\z@ - \LT@get@widths - \if@filesw - {\let\LT@entry\LT@entry@write\immediate\write\@auxout{% - \gdef\expandafter\noexpand - \csname LT@\romannumeral\c@LT@tables\endcsname - {\LT@save@row}}}% - \fi - \ifx\LT@save@row\LT@@save@row - \else - \LT@warn{Column \@width s have changed\MessageBreak - in table \thetable}% - \LT@final@warn - \fi - \endgraf\penalty -\LT@end@pen - \endgroup - \global\@mparbottom\z@ - \pagegoal\vsize - \endgraf\penalty\z@\addvspace\LTpost - \ifvoid\footins\else\insert\footins{}\fi} -\def\LT@nofcols#1&{% - \futurelet\@let@token\LT@n@fcols} -\def\LT@n@fcols{% - \advance\LT@cols\@ne - \ifx\@let@token\LT@nofcols - \expandafter\@gobble - \else - \expandafter\LT@nofcols - \fi} -\def\LT@tabularcr{% - \relax\iffalse{\fi\ifnum0=`}\fi - \@ifstar - {\def\crcr{\LT@crcr\noalign{\nobreak}}\let\cr\crcr - \LT@t@bularcr}% - {\LT@t@bularcr}} -\let\LT@crcr\crcr -\let\LT@setprevdepth\relax -\def\LT@t@bularcr{% - \global\advance\LT@rows\@ne - \ifnum\LT@rows=\LTchunksize - \gdef\LT@setprevdepth{% - \prevdepth\z@\global - \global\let\LT@setprevdepth\relax}% - \expandafter\LT@xtabularcr - \else - \ifnum0=`{}\fi - \expandafter\LT@LL@FM@cr - \fi} -\def\LT@xtabularcr{% - \@ifnextchar[\LT@argtabularcr\LT@ntabularcr} -\def\LT@ntabularcr{% - \ifnum0=`{}\fi - \LT@echunk - \LT@start - \unvbox\z@ - \LT@get@widths - \LT@bchunk} -\def\LT@argtabularcr[#1]{% - \ifnum0=`{}\fi - \ifdim #1>\z@ - \unskip\@xargarraycr{#1}% - \else - \@yargarraycr{#1}% - \fi - \LT@echunk - \LT@start - \unvbox\z@ - \LT@get@widths - \LT@bchunk} -\def\LT@echunk{% - \crcr\LT@save@row\cr\egroup - \global\setbox\@ne\lastbox - \unskip - \egroup} -\def\LT@entry#1#2{% - \ifhmode\@firstofone{&}\fi\omit - \ifnum#1=\c@LT@chunks - \else - \kern#2\relax - \fi} -\def\LT@entry@chop#1#2{% - \noexpand\LT@entry - {\ifnum#1>\c@LT@chunks - 1}{0pt% - \else - #1}{#2% - \fi}} -\def\LT@entry@write{% - \noexpand\LT@entry^^J% - \@spaces} -\def\LT@kill{% - \LT@echunk - \LT@get@widths - \expandafter\LT@rebox\LT@bchunk} -\def\LT@rebox#1\bgroup{% - #1\bgroup - \unvbox\z@ - \unskip - \setbox\z@\lastbox} -\def\LT@blank@row{% - \xdef\LT@save@row{\expandafter\LT@build@blank - \romannumeral\number\LT@cols 001 }} -\def\LT@build@blank#1{% - \if#1m% - \noexpand\LT@entry{1}{0pt}% - \expandafter\LT@build@blank - \fi} -\def\LT@make@row{% - \global\expandafter\let\expandafter\LT@save@row - \csname LT@\romannumeral\c@LT@tables\endcsname - \ifx\LT@save@row\relax - \LT@blank@row - \else - {\let\LT@entry\or - \if!% - \ifcase\expandafter\expandafter\expandafter\LT@cols - \expandafter\@gobble\LT@save@row - \or - \else - \relax - \fi - !% - \else - \aftergroup\LT@blank@row - \fi}% - \fi} -\let\setlongtables\relax -\def\LT@get@widths{% - \setbox\tw@\hbox{% - \unhbox\@ne - \let\LT@old@row\LT@save@row - \global\let\LT@save@row\@empty - \count@\LT@cols - \loop - \unskip - \setbox\tw@\lastbox - \ifhbox\tw@ - \LT@def@row - \advance\count@\m@ne - \repeat}% - \ifx\LT@@save@row\@undefined - \let\LT@@save@row\LT@save@row - \fi} -\def\LT@def@row{% - \let\LT@entry\or - \edef\@tempa{% - \ifcase\expandafter\count@\LT@old@row - \else - {1}{0pt}% - \fi}% - \let\LT@entry\relax - \xdef\LT@save@row{% - \LT@entry - \expandafter\LT@max@sel\@tempa - \LT@save@row}} -\def\LT@max@sel#1#2{% - {\ifdim#2=\wd\tw@ - #1% - \else - \number\c@LT@chunks - \fi}% - {\the\wd\tw@}} -\def\LT@hline{% - \noalign{\ifnum0=`}\fi - \penalty\@M - \futurelet\@let@token\LT@@hline} -\def\LT@@hline{% - \ifx\@let@token\hline - \global\let\@gtempa\@gobble - \gdef\LT@sep{\penalty-\@medpenalty\vskip\doublerulesep}% - \else - \global\let\@gtempa\@empty - \gdef\LT@sep{\penalty-\@lowpenalty\vskip-\arrayrulewidth}% - \fi - \ifnum0=`{\fi}% - \multispan\LT@cols - \unskip\leaders\hrule\@height\arrayrulewidth\hfill\cr - \noalign{\LT@sep}% - \multispan\LT@cols - \unskip\leaders\hrule\@height\arrayrulewidth\hfill\cr - \noalign{\penalty\@M}% - \@gtempa} -\def\LT@caption{% - \noalign\bgroup - \@ifnextchar[{\egroup\LT@c@ption\@firstofone}\LT@capti@n} -\def\LT@c@ption#1[#2]#3{% - \LT@makecaption#1\fnum@table{#3}% - \def\@tempa{#2}% - \ifx\@tempa\@empty\else - {\let\\\space - \addcontentsline{lot}{table}{\protect\numberline{\thetable}{#2}}}% - \fi} -\def\LT@capti@n{% - \@ifstar - {\egroup\LT@c@ption\@gobble[]}% - {\egroup\@xdblarg{\LT@c@ption\@firstofone}}} -\def\LT@makecaption#1#2#3{% - \LT@mcol\LT@cols c{\hbox to\z@{\hss\parbox[t]\LTcapwidth{% - \sbox\@tempboxa{#1{#2: }#3}% - \ifdim\wd\@tempboxa>\hsize - #1{#2: }#3% - \else - \hbox to\hsize{\hfil\box\@tempboxa\hfil}% - \fi - \endgraf\vskip\baselineskip}% - \hss}}} -\def\LT@output{% - \ifnum\outputpenalty <-\@Mi - \ifnum\outputpenalty > -\LT@end@pen - \LT@err{floats and marginpars not allowed in a longtable}\@ehc - \else - \setbox\z@\vbox{\unvbox\@cclv}% - \ifdim \ht\LT@lastfoot>\ht\LT@foot - \dimen@\pagegoal - \advance\dimen@-\ht\LT@lastfoot - \ifdim\dimen@<\ht\z@ - \setbox\@cclv\vbox{\unvbox\z@\copy\LT@foot\vss}% - \@makecol - \@outputpage - \setbox\z@\vbox{\box\LT@head}% - \fi - \fi - \global\@colroom\@colht - \global\vsize\@colht - \vbox - {\unvbox\z@\box\ifvoid\LT@lastfoot\LT@foot\else\LT@lastfoot\fi}% - \fi - \else - \setbox\@cclv\vbox{\unvbox\@cclv\copy\LT@foot\vss}% - \@makecol - \@outputpage - \global\vsize\@colroom - \copy\LT@head\nobreak - \fi} -\def\LT@end@hd@ft#1{% - \LT@echunk - \ifx\LT@start\endgraf - \LT@err - {Longtable head or foot not at start of table}% - {Increase LTchunksize}% - \fi - \setbox#1\box\z@ - \LT@get@widths - \LT@bchunk} -\def\endfirsthead{\LT@end@hd@ft\LT@firsthead} -\def\endhead{\LT@end@hd@ft\LT@head} -\def\endfoot{\LT@end@hd@ft\LT@foot} -\def\endlastfoot{\LT@end@hd@ft\LT@lastfoot} -\def\LT@startpbox#1{% - \bgroup - \let\@footnotetext\LT@p@ftntext - \setlength\hsize{#1}% - \@arrayparboxrestore - \vrule \@height \ht\@arstrutbox \@width \z@} -\def\LT@endpbox{% - \@finalstrut\@arstrutbox - \egroup - \the\LT@p@ftn - \global\LT@p@ftn{}% - \hfil} -\def\LT@p@ftntext#1{% - \edef\@tempa{\the\LT@p@ftn\noexpand\footnotetext[\the\c@footnote]}% - \global\LT@p@ftn\expandafter{\@tempa{#1}}}% -\endinput -%% -%% End of file `longtable.sty'. diff --git a/bin/CP b/bin/trick-CP similarity index 95% rename from bin/CP rename to bin/trick-CP index 8082b34d..4ec948df 100755 --- a/bin/CP +++ b/bin/trick-CP @@ -42,6 +42,6 @@ ifndef TRICK_HOME export TRICK_HOME := SUB_TRICK_HOME endif -include ${TRICK_HOME}/makefiles/Makefile.sim +include ${TRICK_HOME}/share/trick/makefiles/Makefile.sim -include S_overrides.mk diff --git a/bin/trick_dp b/bin/trick-dp similarity index 58% rename from bin/trick_dp rename to bin/trick-dp index d5f55907..dec4b6d0 100755 --- a/bin/trick_dp +++ b/bin/trick-dp @@ -3,7 +3,7 @@ # trick_dp that determines trick_home based on execution location of this script. use FindBin qw($RealBin); -use lib "$RealBin/pm" ; +use lib "$RealBin/../libexec/trick/pm" ; use File::Basename ; use Cwd 'abs_path'; use gte ; @@ -20,12 +20,12 @@ chomp($host_cpu) ; $ENV{TRICK_HOST_CPU} = $host_cpu ; if ( $^O eq "darwin" ) { - $command = "java -classpath $ENV{TRICK_HOME}/bin/java/dist/*:$ENV{TRICK_HOME}/bin/java/lib/*:$ENV{TRICK_HOME}/bin/java/lib/ \\ + $command = "java -classpath $ENV{TRICK_HOME}/libexec/trick/java/dist/*:$ENV{TRICK_HOME}/libexec/trick/java/lib/*:$ENV{TRICK_HOME}/libexec/trick/java/lib/ \\ -Xdock:name=\"Trick DP\" \\ - -Xdock:icon=$ENV{TRICK_HOME}/bin/java/resources/trick_icon.png \\ + -Xdock:icon=$ENV{TRICK_HOME}/libexec/trick/java/resources/trick_icon.png \\ trick.dataproducts.trickdp.TrickDPApplication " . join (" " , @ARGV) ; } else { - $command = "java -cp $ENV{TRICK_HOME}/bin/java/dist/*:$ENV{TRICK_HOME}/bin/java/lib/*:$ENV{TRICK_HOME}/bin/java/lib/ trick.dataproducts.trickdp.TrickDPApplication " + $command = "java -cp $ENV{TRICK_HOME}/libexec/trick/java/dist/*:$ENV{TRICK_HOME}/libexec/trick/java/lib/*:$ENV{TRICK_HOME}/libexec/trick/java/lib/ trick.dataproducts.trickdp.TrickDPApplication " . join (" " , @ARGV) ; } diff --git a/bin/trick-dre b/bin/trick-dre new file mode 100755 index 00000000..80b4fa25 --- /dev/null +++ b/bin/trick-dre @@ -0,0 +1,12 @@ +#!/bin/sh + +if [ "${OSTYPE}" = "darwin" ] +then + java -classpath ${TRICK_HOME}/libexec/trick/java/dist/*:${TRICK_HOME}/libexec/trick/java/lib/* \ + -Xdock:name="Data Recording Editor" \ + -Xdock:icon=${TRICK_HOME}/libexec/trick/java/resources/trick_icon.png \ + trick.dre.DreApplication $@ +else + java -classpath ${TRICK_HOME}/libexec/trick/java/dist/*:${TRICK_HOME}/libexec/trick/java/lib/* trick.dre.DreApplication $@ +fi + diff --git a/bin/gte b/bin/trick-gte similarity index 67% rename from bin/gte rename to bin/trick-gte index f8a178cf..1a3a2a07 100755 --- a/bin/gte +++ b/bin/trick-gte @@ -1,7 +1,7 @@ #!/usr/bin/perl use FindBin qw($RealBin); -use lib "$RealBin/pm" ; +use lib "$RealBin/../libexec/trick/pm" ; use gte ; use strict ; diff --git a/bin/jxplot b/bin/trick-jxplot similarity index 53% rename from bin/jxplot rename to bin/trick-jxplot index f16a6996..6d7f063e 100755 --- a/bin/jxplot +++ b/bin/trick-jxplot @@ -13,12 +13,12 @@ if ( ! exists $ENV{TRICK_HOME} ) { } if ( $^O eq "darwin" ) { - $command = "java -classpath $ENV{TRICK_HOME}/bin/java/dist/*:$ENV{TRICK_HOME}/bin/java/lib/*:$ENV{TRICK_HOME}/bin/java/lib/ \\ + $command = "java -classpath $ENV{TRICK_HOME}/libexec/trick/java/dist/*:$ENV{TRICK_HOME}/libexec/trick/java/lib/*:$ENV{TRICK_HOME}/libexec/trick/java/lib/ \\ -Xdock:name=\"Trick Plot\" \\ - -Xdock:icon=$ENV{TRICK_HOME}/bin/java/resources/trick_icon.png \\ + -Xdock:icon=$ENV{TRICK_HOME}/libexec/trick/java/resources/trick_icon.png \\ trick.dataproducts.plot.JXPlotApplication " . join (" " , @ARGV) ; } else { - $command = "java -cp $ENV{TRICK_HOME}/bin/java/dist/*:$ENV{TRICK_HOME}/bin/java/lib/*:$ENV{TRICK_HOME}/bin/java/lib/ trick.dataproducts.plot.JXPlotApplication " . join (" " , @ARGV) ; + $command = "java -cp $ENV{TRICK_HOME}/libexec/trick/java/dist/*:$ENV{TRICK_HOME}/libexec/trick/java/lib/*:$ENV{TRICK_HOME}/libexec/trick/java/lib/ trick.dataproducts.plot.JXPlotApplication " . join (" " , @ARGV) ; } system $command ; exit $? >> 8; diff --git a/bin/kill_sim b/bin/trick-killsim similarity index 100% rename from bin/kill_sim rename to bin/trick-killsim diff --git a/bin/mm b/bin/trick-mm similarity index 58% rename from bin/mm rename to bin/trick-mm index 979f9d00..a3008881 100755 --- a/bin/mm +++ b/bin/trick-mm @@ -14,12 +14,12 @@ if ( ! exists $ENV{TRICK_HOME} ) { } if ( $^O eq "darwin" ) { - $command = "java -classpath $ENV{TRICK_HOME}/bin/java/dist/*:$ENV{TRICK_HOME}/bin/java/lib/* \\ + $command = "java -classpath $ENV{TRICK_HOME}/libexec/trick/java/dist/*:$ENV{TRICK_HOME}/libexec/trick/java/lib/* \\ -Xdock:name=\"Monte Monitor\" \\ - -Xdock:icon=$ENV{TRICK_HOME}/bin/java/resources/trick_icon.png \\ + -Xdock:icon=$ENV{TRICK_HOME}/libexec/trick/java/resources/trick_icon.png \\ trick.montemonitor.MonteMonitorApplication " . join (" " , @ARGV) ; } else { - $command = "java -cp $ENV{TRICK_HOME}/bin/java/dist/*:$ENV{TRICK_HOME}/bin/java/lib/* trick.montemonitor.MonteMonitorApplication " . join (" " , @ARGV) ; + $command = "java -cp $ENV{TRICK_HOME}/libexec/trick/java/dist/*:$ENV{TRICK_HOME}/libexec/trick/java/lib/* trick.montemonitor.MonteMonitorApplication " . join (" " , @ARGV) ; } system $command ; exit $? >> 8; diff --git a/bin/mtv b/bin/trick-mtv similarity index 60% rename from bin/mtv rename to bin/trick-mtv index 65fd0f91..e68b5012 100755 --- a/bin/mtv +++ b/bin/trick-mtv @@ -14,12 +14,12 @@ if ( ! exists $ENV{TRICK_HOME} ) { } if ( $^O eq "darwin" ) { - $command = "java -classpath $ENV{TRICK_HOME}/bin/java/dist/*:$ENV{TRICK_HOME}/bin/java/lib/* \\ + $command = "java -classpath $ENV{TRICK_HOME}/libexec/trick/java/dist/*:$ENV{TRICK_HOME}/libexec/trick/java/lib/* \\ -Xdock:name=\"Event/Malfunction Trick View\" \\ - -Xdock:icon=$ENV{TRICK_HOME}/bin/java/resources/trick_icon.png \\ + -Xdock:icon=$ENV{TRICK_HOME}/libexec/trick/java/resources/trick_icon.png \\ trick.mtv.MtvApp " . join (" " , @ARGV) ; } else { - $command = "java -cp $ENV{TRICK_HOME}/bin/java/dist/*:$ENV{TRICK_HOME}/bin/java/lib/* trick.mtv.MtvApp " . join (" " , @ARGV) ; + $command = "java -cp $ENV{TRICK_HOME}/libexec/trick/java/dist/*:$ENV{TRICK_HOME}/libexec/trick/java/lib/* trick.mtv.MtvApp " . join (" " , @ARGV) ; } print "$command\n" ; system $command ; diff --git a/bin/trick_qp b/bin/trick-qp similarity index 53% rename from bin/trick_qp rename to bin/trick-qp index 375d91c2..a6ca82c2 100755 --- a/bin/trick_qp +++ b/bin/trick-qp @@ -13,12 +13,12 @@ if ( ! exists $ENV{TRICK_HOME} ) { } if ( $^O eq "darwin" ) { - $command = "java -classpath $ENV{TRICK_HOME}/bin/java/dist/*:$ENV{TRICK_HOME}/bin/java/lib/*:$ENV{TRICK_HOME}/bin/java/lib/ \\ + $command = "java -classpath $ENV{TRICK_HOME}/libexec/trick/java/dist/*:$ENV{TRICK_HOME}/libexec/trick/java/lib/*:$ENV{TRICK_HOME}/libexec/trick/java/lib/ \\ -Xdock:name=\"Trick QP\" \\ - -Xdock:icon=$ENV{TRICK_HOME}/bin/java/resources/trick_icon.png \\ + -Xdock:icon=$ENV{TRICK_HOME}/libexec/trick/java/resources/trick_icon.png \\ trick.dataproducts.trickqp.TrickQPApplication " . join (" " , @ARGV) ; } else { - $command = "java -cp $ENV{TRICK_HOME}/bin/java/dist/*:$ENV{TRICK_HOME}/bin/java/lib/*:$ENV{TRICK_HOME}/bin/java/lib/ trick.dataproducts.trickqp.TrickQPApplication " . join (" " , @ARGV) ; + $command = "java -cp $ENV{TRICK_HOME}/libexec/trick/java/dist/*:$ENV{TRICK_HOME}/libexec/trick/java/lib/*:$ENV{TRICK_HOME}/libexec/trick/java/lib/ trick.dataproducts.trickqp.TrickQPApplication " . join (" " , @ARGV) ; } system $command ; exit $? >> 8; diff --git a/bin/sie b/bin/trick-sie similarity index 58% rename from bin/sie rename to bin/trick-sie index 7f76c32e..3cb4b908 100755 --- a/bin/sie +++ b/bin/trick-sie @@ -14,12 +14,12 @@ if ( ! exists $ENV{TRICK_HOME} ) { } if ( $^O eq "darwin" ) { - $command = "java -classpath $ENV{TRICK_HOME}/bin/java/dist/*:$ENV{TRICK_HOME}/bin/java/lib/* \\ + $command = "java -classpath $ENV{TRICK_HOME}/libexec/trick/java/dist/*:$ENV{TRICK_HOME}/libexec/trick/java/lib/* \\ -Xdock:name=\"SIE\" \\ - -Xdock:icon=$ENV{TRICK_HOME}/bin/java/resources/trick_icon.png \\ + -Xdock:icon=$ENV{TRICK_HOME}/libexec/trick/java/resources/trick_icon.png \\ trick.sie.SieApplication " . join (" " , @ARGV) ; } else { - $command = "java -cp $ENV{TRICK_HOME}/bin/java/dist/*:$ENV{TRICK_HOME}/bin/java/lib/* trick.sie.SieApplication " . join (" " , @ARGV) ; + $command = "java -cp $ENV{TRICK_HOME}/libexec/trick/java/dist/*:$ENV{TRICK_HOME}/libexec/trick/java/lib/* trick.sie.SieApplication " . join (" " , @ARGV) ; } system $command ; exit $? >> 8; diff --git a/bin/sim_control b/bin/trick-simcontrol similarity index 65% rename from bin/sim_control rename to bin/trick-simcontrol index b2f4bcbb..d3ccd756 100755 --- a/bin/sim_control +++ b/bin/trick-simcontrol @@ -14,12 +14,12 @@ if ( ! exists $ENV{TRICK_HOME} ) { } if ( $^O eq "darwin" ) { - $command = "java -classpath $ENV{TRICK_HOME}/bin/java/dist/*:$ENV{TRICK_HOME}/bin/java/lib/* \\ + $command = "java -classpath $ENV{TRICK_HOME}/libexec/trick/java/dist/*:$ENV{TRICK_HOME}/libexec/trick/java/lib/* \\ -Xdock:name=\"Sim Control\" \\ - -Xdock:icon=$ENV{TRICK_HOME}/bin/java/resources/trick_icon.png \\ + -Xdock:icon=$ENV{TRICK_HOME}/libexec/trick/java/resources/trick_icon.png \\ trick.simcontrol.SimControlApplication " . join (" " , @ARGV) ; } else { - $command = "java -cp $ENV{TRICK_HOME}/bin/java/dist/*:$ENV{TRICK_HOME}/bin/java/lib/* \\ + $command = "java -cp $ENV{TRICK_HOME}/libexec/trick/java/dist/*:$ENV{TRICK_HOME}/libexec/trick/java/lib/* \\ trick.simcontrol.SimControlApplication " . join (" " , @ARGV) ; } system $command ; diff --git a/bin/sniffer b/bin/trick-sniffer similarity index 61% rename from bin/sniffer rename to bin/trick-sniffer index 684938e0..0494a9f6 100755 --- a/bin/sniffer +++ b/bin/trick-sniffer @@ -14,12 +14,12 @@ if ( ! exists $ENV{TRICK_HOME} ) { } if ( $^O eq "darwin" ) { - $command = "java -classpath $ENV{TRICK_HOME}/bin/java/dist/*:$ENV{TRICK_HOME}/bin/java/lib/* \\ + $command = "java -classpath $ENV{TRICK_HOME}/libexec/trick/java/dist/*:$ENV{TRICK_HOME}/libexec/trick/java/lib/* \\ -Xdock:name=\"Sim Sniffer\" \\ - -Xdock:icon=$ENV{TRICK_HOME}/bin/java/resources/trick_icon.png \\ + -Xdock:icon=$ENV{TRICK_HOME}/libexec/trick/java/resources/trick_icon.png \\ trick.sniffer.SimSnifferApplication " . join (" " , @ARGV) ; } else { - $command = "java -cp $ENV{TRICK_HOME}/bin/java/dist/*:$ENV{TRICK_HOME}/bin/java/lib/* trick.sniffer.SimSnifferApplication " + $command = "java -cp $ENV{TRICK_HOME}/libexec/trick/java/dist/*:$ENV{TRICK_HOME}/libexec/trick/java/lib/* trick.sniffer.SimSnifferApplication " . join (" " , @ARGV) ; } system $command ; diff --git a/bin/trick_stripchart b/bin/trick-stripchart similarity index 63% rename from bin/trick_stripchart rename to bin/trick-stripchart index 49358b86..c52c83a6 100755 --- a/bin/trick_stripchart +++ b/bin/trick-stripchart @@ -14,12 +14,12 @@ if ( ! exists $ENV{TRICK_HOME} ) { } if ( $^O eq "darwin" ) { - $command = "java -classpath $ENV{TRICK_HOME}/bin/java/dist/*:$ENV{TRICK_HOME}/bin/java/lib/*:$ENV{TRICK_HOME}/bin/java/lib/ \\ + $command = "java -classpath $ENV{TRICK_HOME}/libexec/trick/java/dist/*:$ENV{TRICK_HOME}/libexec/trick/java/lib/*:$ENV{TRICK_HOME}/libexec/trick/java/lib/ \\ -Xdock:name=\"Stripchart\" \\ - -Xdock:icon=$ENV{TRICK_HOME}/bin/java/resources/trick_icon.png \\ + -Xdock:icon=$ENV{TRICK_HOME}/libexec/trick/java/resources/trick_icon.png \\ trick.stripchart.StripchartApplication "; } else { - $command = "java -cp $ENV{TRICK_HOME}/bin/java/dist/*:$ENV{TRICK_HOME}/bin/java/lib/* trick.stripchart.StripchartApplication "; + $command = "java -cp $ENV{TRICK_HOME}/libexec/trick/java/dist/*:$ENV{TRICK_HOME}/libexec/trick/java/lib/* trick.stripchart.StripchartApplication "; } # to preserve the quotes if the option value has spaces in it diff --git a/bin/tv b/bin/trick-tv similarity index 58% rename from bin/tv rename to bin/trick-tv index d2f76a77..1848d9d1 100755 --- a/bin/tv +++ b/bin/trick-tv @@ -14,12 +14,12 @@ if ( ! exists $ENV{TRICK_HOME} ) { } if ( $^O eq "darwin" ) { - $command = "java -classpath $ENV{TRICK_HOME}/bin/java/dist/*:$ENV{TRICK_HOME}/bin/java/lib/* \\ + $command = "java -classpath $ENV{TRICK_HOME}/libexec/trick/java/dist/*:$ENV{TRICK_HOME}/libexec/trick/java/lib/* \\ -Xdock:name=\"Trick View\" \\ - -Xdock:icon=$ENV{TRICK_HOME}/bin/java/resources/trick_icon.png \\ + -Xdock:icon=$ENV{TRICK_HOME}/libexec/trick/java/resources/trick_icon.png \\ trick.tv.TVApplication " . join (" " , @ARGV) ; } else { - $command = "java -cp $ENV{TRICK_HOME}/bin/java/dist/*:$ENV{TRICK_HOME}/bin/java/lib/* trick.tv.TVApplication " . join (" " , @ARGV) ; + $command = "java -cp $ENV{TRICK_HOME}/libexec/trick/java/dist/*:$ENV{TRICK_HOME}/libexec/trick/java/lib/* trick.tv.TVApplication " . join (" " , @ARGV) ; } system $command ; exit $? >> 8; diff --git a/bin/trick_version b/bin/trick-version similarity index 94% rename from bin/trick_version rename to bin/trick-version index 1dd9053f..8a251dce 100755 --- a/bin/trick_version +++ b/bin/trick-version @@ -18,7 +18,7 @@ if ( !exists $ENV{"TRICK_HOME"} ) { } -my $trick_ver_txt = "$ENV{\"TRICK_HOME\"}/bin/trick_ver.txt" ; +my $trick_ver_txt = "$ENV{\"TRICK_HOME\"}/share/trick/trick_ver.txt" ; open FILE, "$trick_ver_txt" or die "trick_version: Couldn't find $trick_ver_txt\n" ; @all_lines = <FILE> ; diff --git a/bin/trk2ascii b/bin/trk2ascii deleted file mode 100755 index 6752b758..00000000 --- a/bin/trk2ascii +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/bash - -TRICK_HOST_CPU=`${TRICK_HOME}/bin/gte TRICK_HOST_CPU` -TRK2ASCII="${TRICK_HOME}/trick_source/data_products/Apps/Trk2csv/object_${TRICK_HOST_CPU}/trk2ascii" - -if [ -f ${TRK2ASCII} ] ; then - ${TRK2ASCII} $@ -else - echo "${TRK2ASCII} has not been built" -fi - diff --git a/bin/trk2csv b/bin/trk2csv deleted file mode 100755 index de66e3eb..00000000 --- a/bin/trk2csv +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/bash - -TRICK_HOST_CPU=`${TRICK_HOME}/bin/gte TRICK_HOST_CPU` -TRK2CSV="${TRICK_HOME}/trick_source/data_products/Apps/Trk2csv/object_${TRICK_HOST_CPU}/trk2csv" - -if [ -f ${TRK2CSV} ] ; then - ${TRK2CSV} $@ -else - echo "${TRK2CSV} has not been built" -fi - diff --git a/configure b/configure index ccfd88eb..a723b937 100755 --- a/configure +++ b/configure @@ -775,7 +775,7 @@ if [ -e "$TRICK_HOME/.git" -o $dev == 1 ] ; then fi -echo "# This file was autogenerated on" `date +"%B %d, %G."` > ${TRICK_HOME}/config_${TRICK_HOST_TYPE}.mk #Overwrite file +echo "# This file was autogenerated on" `date +"%B %d, %G."` > ${TRICK_HOME}/share/trick/makefiles/config_${TRICK_HOST_TYPE}.mk #Overwrite file # sed/awk in a different location in Linux and MacOSX. if test $TRICK_HOST_TYPE = "Linux" @@ -791,7 +791,7 @@ sed="/bin/sed" awk="/bin/awk" fi -cat >> ${TRICK_HOME}/config_${TRICK_HOST_TYPE}.mk << EOF +cat >> ${TRICK_HOME}/share/trick/makefiles/config_${TRICK_HOST_TYPE}.mk << EOF SHELL := /bin/sh AWK := $awk @@ -831,6 +831,13 @@ HAVE_ZEROCONF = 0 PREFIX = $prefix CONFIG_MK = 1 +UNAME_M := \$(shell uname -m) +ifeq (\$(UNAME_M),x86_64) +TRICK_LIB_DIR := \${TRICK_HOME}/lib64 +else +TRICK_LIB_DIR := \${TRICK_HOME}/lib +endif + TRICK_RANLIB = PYTHON_VERSION := \$(shell \$(PYTHON) -V 2>&1 | \$(SED) -e 's/Python //' -e 's/\([0-9]\.[0-9]*\).*/\1/') @@ -871,7 +878,7 @@ EOF if test $TRICK_HOST_TYPE = "Linux" then - cat >> ${TRICK_HOME}/config_${TRICK_HOST_TYPE}.mk << EOF + cat >> ${TRICK_HOME}/share/trick/makefiles/config_${TRICK_HOST_TYPE}.mk << EOF BFD_HOME := $bfd SHARED_LIB_OPT := -shared @@ -923,12 +930,13 @@ EOF elif test $TRICK_HOST_TYPE = "Darwin" then - cat >> ${TRICK_HOME}/config_${TRICK_HOST_TYPE}.mk << EOF + cat >> ${TRICK_HOME}/share/trick/makefiles/config_${TRICK_HOST_TYPE}.mk << EOF HAVE_BFD := 0 SHARED_LIB_OPT := -dynamiclib -Wl,-undefined,dynamic_lookup +TRICK_LIB_DIR := \${TRICK_HOME}/lib TRICK_LDFLAGS += LD_WHOLE_ARCHIVE := -Wl,-all_load LD_NO_WHOLE_ARCHIVE := diff --git a/trick_source/sim_services/Integrator/er7_algorithms/ABM_Integrator.hh b/include/trick/ABM_Integrator.hh similarity index 75% rename from trick_source/sim_services/Integrator/er7_algorithms/ABM_Integrator.hh rename to include/trick/ABM_Integrator.hh index a16295c6..bfd29ce5 100644 --- a/trick_source/sim_services/Integrator/er7_algorithms/ABM_Integrator.hh +++ b/include/trick/ABM_Integrator.hh @@ -12,6 +12,7 @@ Programmers: #ifndef ABM_INTEGRATOR_HH #define ABM_INTEGRATOR_HH +#ifdef USE_ER7_UTILS_INTEGRATORS #include "er7_utils/integration/abm4/include/abm4_integrator_constructor.hh" #include "er7_utils/trick/integration/include/first_order_ode_integrator.hh" @@ -81,5 +82,35 @@ public: }; } +#else +#include "trick/Integrator.hh" +/** + PURPOSE: (Integrator using ABM method.) + */ +namespace Trick { + + /** Integrator using ABM method. + */ + class ABM_Integrator : public Integrator { + + public: + /** Default Constructor. This must remain public so the MM can create these. */ + ABM_Integrator() {}; + ABM_Integrator( int State_size, double Dt); + virtual ~ABM_Integrator(); + + void initialize( int State_size, double Dt); + + int integrate(); + + Integrator_type get_Integrator_type() { return(ABM_Method); }; + + int counter; + int primed; + double **stored_data; + + }; +} +#endif #endif diff --git a/trick_source/sim_services/MemoryManager/include/ADefParseContext.hh b/include/trick/ADefParseContext.hh similarity index 96% rename from trick_source/sim_services/MemoryManager/include/ADefParseContext.hh rename to include/trick/ADefParseContext.hh index 328ee71e..5355a1dc 100644 --- a/trick_source/sim_services/MemoryManager/include/ADefParseContext.hh +++ b/include/trick/ADefParseContext.hh @@ -4,7 +4,7 @@ #include <iostream> #include <unistd.h> -#include "sim_services/MemoryManager/include/MemoryManager.hh" +#include "trick/MemoryManager.hh" /** The class represents the context for an allocation-declaration parser. diff --git a/trick_source/sim_services/Sie/include/AttributesMap.hh b/include/trick/AttributesMap.hh similarity index 97% rename from trick_source/sim_services/Sie/include/AttributesMap.hh rename to include/trick/AttributesMap.hh index 882520c0..08676921 100644 --- a/trick_source/sim_services/Sie/include/AttributesMap.hh +++ b/include/trick/AttributesMap.hh @@ -9,7 +9,7 @@ #include <map> #include <string> #include <fstream> -#include "sim_services/MemoryManager/include/attributes.h" +#include "trick/attributes.h" namespace Trick { diff --git a/trick_source/sim_services/MemoryManager/include/AttributesTypeID.hh b/include/trick/AttributesTypeID.hh similarity index 100% rename from trick_source/sim_services/MemoryManager/include/AttributesTypeID.hh rename to include/trick/AttributesTypeID.hh diff --git a/trick_source/sim_services/Clock/include/BC635Clock.hh b/include/trick/BC635Clock.hh similarity index 96% rename from trick_source/sim_services/Clock/include/BC635Clock.hh rename to include/trick/BC635Clock.hh index 3aeeeb4e..a3ccf14a 100644 --- a/trick_source/sim_services/Clock/include/BC635Clock.hh +++ b/include/trick/BC635Clock.hh @@ -9,7 +9,7 @@ PROGRAMMERS: #define BC635CLOCK_HH #include <string> -#include "sim_services/Clock/include/Clock.hh" +#include "trick/Clock.hh" #ifdef _BC635 #ifndef TRICK_ICG diff --git a/trick_source/sim_services/CheckPointAgent/include/CheckPointAgent.hh b/include/trick/CheckPointAgent.hh similarity index 95% rename from trick_source/sim_services/CheckPointAgent/include/CheckPointAgent.hh rename to include/trick/CheckPointAgent.hh index 47336229..fa792d79 100644 --- a/trick_source/sim_services/CheckPointAgent/include/CheckPointAgent.hh +++ b/include/trick/CheckPointAgent.hh @@ -1,8 +1,8 @@ #ifndef CHECKPOINTAGENT_HH #define CHECKPOINTAGENT_HH -#include "sim_services/MemoryManager/include/attributes.h" -#include "sim_services/MemoryManager/include/io_alloc.h" +#include "trick/attributes.h" +#include "trick/io_alloc.h" #include <stdio.h> #include <iostream> #include <vector> diff --git a/trick_source/sim_services/CheckPointRestart/include/CheckPointRestart.hh b/include/trick/CheckPointRestart.hh similarity index 99% rename from trick_source/sim_services/CheckPointRestart/include/CheckPointRestart.hh rename to include/trick/CheckPointRestart.hh index b26facf2..2b496b47 100644 --- a/trick_source/sim_services/CheckPointRestart/include/CheckPointRestart.hh +++ b/include/trick/CheckPointRestart.hh @@ -10,7 +10,7 @@ #include <vector> #include <queue> -#include "sim_services/Scheduler/include/Scheduler.hh" +#include "trick/Scheduler.hh" namespace Trick { diff --git a/trick_source/sim_services/CheckPointRestart/include/CheckPointRestart_c_intf.hh b/include/trick/CheckPointRestart_c_intf.hh similarity index 100% rename from trick_source/sim_services/CheckPointRestart/include/CheckPointRestart_c_intf.hh rename to include/trick/CheckPointRestart_c_intf.hh diff --git a/trick_source/sim_services/CheckPointAgent/include/ChkPtParseContext.hh b/include/trick/ChkPtParseContext.hh similarity index 91% rename from trick_source/sim_services/CheckPointAgent/include/ChkPtParseContext.hh rename to include/trick/ChkPtParseContext.hh index 3b7e0724..37900e6e 100644 --- a/trick_source/sim_services/CheckPointAgent/include/ChkPtParseContext.hh +++ b/include/trick/ChkPtParseContext.hh @@ -4,8 +4,8 @@ #include <iostream> #include <unistd.h> -#include "sim_services/MemoryManager/include/MemoryManager.hh" -#include "sim_services/MemoryManager/include/reference.h" +#include "trick/MemoryManager.hh" +#include "trick/reference.h" /** * This class represents the Check Pointer Parser Context. diff --git a/trick_source/sim_services/CheckPointAgent/include/ClassicCheckPointAgent.hh b/include/trick/ClassicCheckPointAgent.hh similarity index 98% rename from trick_source/sim_services/CheckPointAgent/include/ClassicCheckPointAgent.hh rename to include/trick/ClassicCheckPointAgent.hh index eeac175d..ae2c41c9 100644 --- a/trick_source/sim_services/CheckPointAgent/include/ClassicCheckPointAgent.hh +++ b/include/trick/ClassicCheckPointAgent.hh @@ -4,7 +4,7 @@ #include <stddef.h> // for NULL #include <string> #include <vector> -#include "sim_services/CheckPointAgent/include/CheckPointAgent.hh" +#include "trick/CheckPointAgent.hh" namespace Trick { diff --git a/trick_source/sim_services/Clock/include/Clock.hh b/include/trick/Clock.hh similarity index 100% rename from trick_source/sim_services/Clock/include/Clock.hh rename to include/trick/Clock.hh diff --git a/trick_source/sim_services/CommandLineArguments/include/CommandLineArguments.hh b/include/trick/CommandLineArguments.hh similarity index 100% rename from trick_source/sim_services/CommandLineArguments/include/CommandLineArguments.hh rename to include/trick/CommandLineArguments.hh diff --git a/trick_source/sim_services/DMTCP/include/DMTCP.hh b/include/trick/DMTCP.hh similarity index 94% rename from trick_source/sim_services/DMTCP/include/DMTCP.hh rename to include/trick/DMTCP.hh index 248696a7..79b7ada6 100644 --- a/trick_source/sim_services/DMTCP/include/DMTCP.hh +++ b/include/trick/DMTCP.hh @@ -12,8 +12,8 @@ #include <queue> -#include "sim_services/DMTCP/include/dmtcp_checkpoint_c_intf.hh" -#include "sim_services/Scheduler/include/Scheduler.hh" +#include "trick/dmtcp_checkpoint_c_intf.hh" +#include "trick/Scheduler.hh" namespace Trick { class DMTCP : public Trick::Scheduler { diff --git a/trick_source/sim_services/DataRecord/include/DRAscii.hh b/include/trick/DRAscii.hh similarity index 98% rename from trick_source/sim_services/DataRecord/include/DRAscii.hh rename to include/trick/DRAscii.hh index 2392ccd7..93302092 100644 --- a/trick_source/sim_services/DataRecord/include/DRAscii.hh +++ b/include/trick/DRAscii.hh @@ -10,7 +10,7 @@ PROGRAMMERS: #include <string> -#include "sim_services/DataRecord/include/DataRecordGroup.hh" +#include "trick/DataRecordGroup.hh" #ifdef SWIG %feature("shadow") Trick::DRAscii::DRAscii(std::string in_name) %{ diff --git a/trick_source/sim_services/DataRecord/include/DRBinary.hh b/include/trick/DRBinary.hh similarity index 98% rename from trick_source/sim_services/DataRecord/include/DRBinary.hh rename to include/trick/DRBinary.hh index 22c582d6..3bc5ad5c 100644 --- a/trick_source/sim_services/DataRecord/include/DRBinary.hh +++ b/include/trick/DRBinary.hh @@ -11,7 +11,7 @@ PROGRAMMERS: #include <stdio.h> #include <string> -#include "sim_services/DataRecord/include/DataRecordGroup.hh" +#include "trick/DataRecordGroup.hh" #ifdef SWIG %feature("shadow") Trick::DRBinary::DRBinary(std::string in_name) %{ diff --git a/trick_source/sim_services/DataRecord/include/DRHDF5.hh b/include/trick/DRHDF5.hh similarity index 98% rename from trick_source/sim_services/DataRecord/include/DRHDF5.hh rename to include/trick/DRHDF5.hh index 57b1775d..c444329d 100644 --- a/trick_source/sim_services/DataRecord/include/DRHDF5.hh +++ b/include/trick/DRHDF5.hh @@ -12,7 +12,7 @@ PROGRAMMERS: #include <string> #include <vector> -#include "sim_services/DataRecord/include/DataRecordGroup.hh" +#include "trick/DataRecordGroup.hh" #ifdef HDF5 #ifndef SWIG diff --git a/trick_source/sim_services/DataRecord/include/DataRecordDispatcher.hh b/include/trick/DataRecordDispatcher.hh similarity index 96% rename from trick_source/sim_services/DataRecord/include/DataRecordDispatcher.hh rename to include/trick/DataRecordDispatcher.hh index a35164b4..369403c4 100644 --- a/trick_source/sim_services/DataRecord/include/DataRecordDispatcher.hh +++ b/include/trick/DataRecordDispatcher.hh @@ -11,9 +11,9 @@ PROGRAMMERS: #include <iostream> #include <pthread.h> -#include "sim_services/Scheduler/include/Scheduler.hh" -#include "sim_services/DataRecord/include/DataRecordGroup.hh" -#include "sim_services/ThreadBase/include/ThreadBase.hh" +#include "trick/Scheduler.hh" +#include "trick/DataRecordGroup.hh" +#include "trick/ThreadBase.hh" namespace Trick { diff --git a/trick_source/sim_services/DataRecord/include/DataRecordGroup.hh b/include/trick/DataRecordGroup.hh similarity index 99% rename from trick_source/sim_services/DataRecord/include/DataRecordGroup.hh rename to include/trick/DataRecordGroup.hh index 2da2c306..667b1771 100644 --- a/trick_source/sim_services/DataRecord/include/DataRecordGroup.hh +++ b/include/trick/DataRecordGroup.hh @@ -13,8 +13,8 @@ PROGRAMMERS: #include <fstream> #include <pthread.h> -#include "sim_services/SimObject/include/SimObject.hh" -#include "sim_services/MemoryManager/include/reference.h" +#include "trick/SimObject.hh" +#include "trick/reference.h" namespace Trick { diff --git a/trick_source/sim_services/DebugPause/include/DebugPause.hh b/include/trick/DebugPause.hh similarity index 97% rename from trick_source/sim_services/DebugPause/include/DebugPause.hh rename to include/trick/DebugPause.hh index 23e5d679..9ab94b87 100644 --- a/trick_source/sim_services/DebugPause/include/DebugPause.hh +++ b/include/trick/DebugPause.hh @@ -19,7 +19,7 @@ #include <string> #include <semaphore.h> -#include "sim_services/SimObject/include/JobData.hh" +#include "trick/JobData.hh" namespace Trick { diff --git a/trick_source/sim_services/EchoJobs/include/EchoJobs.hh b/include/trick/EchoJobs.hh similarity index 97% rename from trick_source/sim_services/EchoJobs/include/EchoJobs.hh rename to include/trick/EchoJobs.hh index c25b849d..4c6ba5e4 100644 --- a/trick_source/sim_services/EchoJobs/include/EchoJobs.hh +++ b/include/trick/EchoJobs.hh @@ -16,7 +16,7 @@ #ifndef ECHOJOBS_HH #define ECHOJOBS_HH -#include "sim_services/SimObject/include/JobData.hh" +#include "trick/JobData.hh" namespace Trick { diff --git a/trick_source/sim_services/Sie/include/EnumAttributesMap.hh b/include/trick/EnumAttributesMap.hh similarity index 97% rename from trick_source/sim_services/Sie/include/EnumAttributesMap.hh rename to include/trick/EnumAttributesMap.hh index b4a36513..56675ba0 100644 --- a/trick_source/sim_services/Sie/include/EnumAttributesMap.hh +++ b/include/trick/EnumAttributesMap.hh @@ -9,7 +9,7 @@ #include <map> #include <string> #include <fstream> -#include "sim_services/MemoryManager/include/attributes.h" +#include "trick/attributes.h" namespace Trick { diff --git a/trick_source/sim_services/Environment/include/Environment.hh b/include/trick/Environment.hh similarity index 100% rename from trick_source/sim_services/Environment/include/Environment.hh rename to include/trick/Environment.hh diff --git a/trick_source/sim_services/Integrator/er7_algorithms/Euler_Cromer_Integrator.hh b/include/trick/Euler_Cromer_Integrator.hh similarity index 75% rename from trick_source/sim_services/Integrator/er7_algorithms/Euler_Cromer_Integrator.hh rename to include/trick/Euler_Cromer_Integrator.hh index b3710a19..558c3dd8 100644 --- a/trick_source/sim_services/Integrator/er7_algorithms/Euler_Cromer_Integrator.hh +++ b/include/trick/Euler_Cromer_Integrator.hh @@ -12,6 +12,7 @@ Programmers: #ifndef EULER_CROMER_INTEGRATOR_HH #define EULER_CROMER_INTEGRATOR_HH +#ifdef USE_ER7_UTILS_INTEGRATORS #include <cstring> #include "er7_utils/integration/symplectic_euler/include/symplectic_euler_integrator_constructor.hh" @@ -96,5 +97,38 @@ public: }; } +#else + +#include "trick/Integrator.hh" +/** + PURPOSE: (Integrator using Euler Cromer method.) + */ +namespace Trick { + + /** Integrator using Euler Cromer method. + */ + class Euler_Cromer_Integrator : public Integrator { + + public: + /** Default Constructor. This must remain public so the MM can create these. */ + Euler_Cromer_Integrator() {}; + Euler_Cromer_Integrator( int State_size, double Dt); + virtual ~Euler_Cromer_Integrator(); + + void deriv2_in(double* arg1, ...) +#ifndef SWIGPYTHON + #ifdef __GNUC__ + #if __GNUC__ >= 4 + __attribute__((sentinel)) + #endif + #endif +#endif + ; + void initialize( int State_size, double Dt); + int integrate(); + Integrator_type get_Integrator_type() { return(Euler_Cromer); } ; + }; +} +#endif #endif diff --git a/trick_source/sim_services/Integrator/er7_algorithms/Euler_Integrator.hh b/include/trick/Euler_Integrator.hh similarity index 75% rename from trick_source/sim_services/Integrator/er7_algorithms/Euler_Integrator.hh rename to include/trick/Euler_Integrator.hh index cd7bdbe1..a772f84d 100644 --- a/trick_source/sim_services/Integrator/er7_algorithms/Euler_Integrator.hh +++ b/include/trick/Euler_Integrator.hh @@ -12,6 +12,7 @@ Programmers: #ifndef EULER_INTEGRATOR_HH #define EULER_INTEGRATOR_HH +#ifdef USE_ER7_UTILS_INTEGRATORS #include "er7_utils/integration/euler/include/euler_integrator_constructor.hh" #include "er7_utils/trick/integration/include/first_order_ode_integrator.hh" @@ -81,5 +82,33 @@ public: }; } +#else + +#include "trick/Integrator.hh" +/** + PURPOSE: (Integrator using Euler method.) + */ +namespace Trick { + + /** Integrator using Euler method. + */ + class Euler_Integrator : public Integrator { + + public: + /** Default Constructor. This must remain public so the MM can create these. */ + Euler_Integrator() {}; + Euler_Integrator( int State_size, double Dt); + ~Euler_Integrator(); + + void initialize( int State_size, double Dt); + + int integrate(); + + void set_first_step_deriv(bool first_step); + + Integrator_type get_Integrator_type() { return(Euler); } ; + }; +} +#endif #endif diff --git a/trick_source/sim_services/EventManager/include/Event.hh b/include/trick/Event.hh similarity index 98% rename from trick_source/sim_services/EventManager/include/Event.hh rename to include/trick/Event.hh index 05fe7185..fc23b3cd 100644 --- a/trick_source/sim_services/EventManager/include/Event.hh +++ b/include/trick/Event.hh @@ -2,8 +2,8 @@ #define EVENT_HH #include <string> -#include "sim_services/include/mm_macros.hh" -#include "sim_services/Executive/include/exec_proto.h" +#include "trick/mm_macros.hh" +#include "trick/exec_proto.h" namespace Trick { diff --git a/trick_source/sim_services/EventManager/include/EventInstrument.hh b/include/trick/EventInstrument.hh similarity index 85% rename from trick_source/sim_services/EventManager/include/EventInstrument.hh rename to include/trick/EventInstrument.hh index 8bded859..fe7f056d 100644 --- a/trick_source/sim_services/EventManager/include/EventInstrument.hh +++ b/include/trick/EventInstrument.hh @@ -2,9 +2,9 @@ #define EVENTINSTRUMENT_HH #include <string> -#include "sim_services/EventManager/include/Event.hh" -#include "sim_services/SimObject/include/InstrumentBase.hh" -#include "sim_services/SimObject/include/JobData.hh" +#include "trick/Event.hh" +#include "trick/InstrumentBase.hh" +#include "trick/JobData.hh" namespace Trick { diff --git a/trick_source/sim_services/EventManager/include/EventManager.hh b/include/trick/EventManager.hh similarity index 97% rename from trick_source/sim_services/EventManager/include/EventManager.hh rename to include/trick/EventManager.hh index 6ea5078e..68107a00 100644 --- a/trick_source/sim_services/EventManager/include/EventManager.hh +++ b/include/trick/EventManager.hh @@ -19,9 +19,9 @@ #include <string> #include <vector> -#include "sim_services/EventManager/include/Event.hh" -#include "sim_services/EventManager/include/EventInstrument.hh" -#include "sim_services/EventManager/include/EventProcessor.hh" +#include "trick/Event.hh" +#include "trick/EventInstrument.hh" +#include "trick/EventProcessor.hh" namespace Trick { diff --git a/trick_source/sim_services/EventManager/include/EventManager_c_intf.hh b/include/trick/EventManager_c_intf.hh similarity index 91% rename from trick_source/sim_services/EventManager/include/EventManager_c_intf.hh rename to include/trick/EventManager_c_intf.hh index 0ef4ec0d..0e3ed9f1 100644 --- a/trick_source/sim_services/EventManager/include/EventManager_c_intf.hh +++ b/include/trick/EventManager_c_intf.hh @@ -2,7 +2,7 @@ #ifndef EVENTMANAGER_C_INTF_HH #define EVENTMANAGER_C_INTF_HH -#include "sim_services/EventManager/include/Event.hh" +#include "trick/Event.hh" // Get an event by name Trick::Event * event_manager_get_event( std::string in_name ) ; diff --git a/trick_source/sim_services/EventManager/include/EventProcessor.hh b/include/trick/EventProcessor.hh similarity index 96% rename from trick_source/sim_services/EventManager/include/EventProcessor.hh rename to include/trick/EventProcessor.hh index 8012b9e1..b35f73f5 100644 --- a/trick_source/sim_services/EventManager/include/EventProcessor.hh +++ b/include/trick/EventProcessor.hh @@ -19,8 +19,8 @@ #include <queue> #include <set> -#include "sim_services/EventManager/include/Event.hh" -#include "sim_services/SimObject/include/JobData.hh" +#include "trick/Event.hh" +#include "trick/JobData.hh" namespace Trick { diff --git a/trick_source/sim_services/Executive/include/Exec_exception.hh b/include/trick/Exec_exception.hh similarity index 100% rename from trick_source/sim_services/Executive/include/Exec_exception.hh rename to include/trick/Exec_exception.hh diff --git a/trick_source/sim_services/Executive/include/Executive.hh b/include/trick/Executive.hh similarity index 99% rename from trick_source/sim_services/Executive/include/Executive.hh rename to include/trick/Executive.hh index d7b961de..1f49c140 100644 --- a/trick_source/sim_services/Executive/include/Executive.hh +++ b/include/trick/Executive.hh @@ -15,11 +15,11 @@ #include <semaphore.h> #include <signal.h> -#include "sim_services/Scheduler/include/Scheduler.hh" -#include "sim_services/ScheduledJobQueue/include/ScheduledJobQueue.hh" -#include "sim_services/SimObject/include/SimObject.hh" -#include "sim_services/Executive/include/Threads.hh" -#include "sim_services/Executive/include/sim_mode.h" +#include "Scheduler.hh" +#include "ScheduledJobQueue.hh" +#include "SimObject.hh" +#include "Threads.hh" +#include "sim_mode.h" namespace Trick { diff --git a/trick_source/sim_services/ExternalApplications/include/ExternalApplication.hh b/include/trick/ExternalApplication.hh similarity index 100% rename from trick_source/sim_services/ExternalApplications/include/ExternalApplication.hh rename to include/trick/ExternalApplication.hh diff --git a/trick_source/sim_services/ExternalApplications/include/ExternalApplicationManager.hh b/include/trick/ExternalApplicationManager.hh similarity index 97% rename from trick_source/sim_services/ExternalApplications/include/ExternalApplicationManager.hh rename to include/trick/ExternalApplicationManager.hh index 561cb27f..b76c8be0 100644 --- a/trick_source/sim_services/ExternalApplications/include/ExternalApplicationManager.hh +++ b/include/trick/ExternalApplicationManager.hh @@ -7,7 +7,7 @@ #include <vector> -#include "ExternalApplication.hh" +#include "trick/ExternalApplication.hh" namespace Trick { diff --git a/trick_source/sim_services/include/Flag.h b/include/trick/Flag.h similarity index 100% rename from trick_source/sim_services/include/Flag.h rename to include/trick/Flag.h diff --git a/trick_source/sim_services/FrameLog/include/FrameDataRecordGroup.hh b/include/trick/FrameDataRecordGroup.hh similarity index 95% rename from trick_source/sim_services/FrameLog/include/FrameDataRecordGroup.hh rename to include/trick/FrameDataRecordGroup.hh index 3b691c2a..6495394f 100644 --- a/trick_source/sim_services/FrameLog/include/FrameDataRecordGroup.hh +++ b/include/trick/FrameDataRecordGroup.hh @@ -10,8 +10,8 @@ PROGRAMMERS: #include <vector> #include <string> -#include "sim_services/DataRecord/include/DRBinary.hh" -#include "sim_services/include/mm_macros.hh" +#include "trick/DRBinary.hh" +#include "trick/mm_macros.hh" namespace Trick { diff --git a/trick_source/sim_services/FrameLog/include/FrameLog.hh b/include/trick/FrameLog.hh similarity index 97% rename from trick_source/sim_services/FrameLog/include/FrameLog.hh rename to include/trick/FrameLog.hh index 8377347b..c4de9de6 100644 --- a/trick_source/sim_services/FrameLog/include/FrameLog.hh +++ b/include/trick/FrameLog.hh @@ -10,9 +10,9 @@ PROGRAMMERS: #define FRAMELOG_HH #include <vector> -#include "sim_services/FrameLog/include/FrameDataRecordGroup.hh" -#include "sim_services/MemoryManager/include/attributes.h" -#include "sim_services/SimObject/include/JobData.hh" +#include "trick/FrameDataRecordGroup.hh" +#include "trick/attributes.h" +#include "trick/JobData.hh" namespace Trick { diff --git a/trick_source/sim_services/Clock/include/GetTimeOfDayClock.hh b/include/trick/GetTimeOfDayClock.hh similarity index 97% rename from trick_source/sim_services/Clock/include/GetTimeOfDayClock.hh rename to include/trick/GetTimeOfDayClock.hh index 8ec98df6..4712639a 100644 --- a/trick_source/sim_services/Clock/include/GetTimeOfDayClock.hh +++ b/include/trick/GetTimeOfDayClock.hh @@ -16,7 +16,7 @@ PROGRAMMERS: #include <time.h> #endif -#include "sim_services/Clock/include/Clock.hh" +#include "trick/Clock.hh" namespace Trick { diff --git a/trick_source/sim_services/InputProcessor/include/IPPython.hh b/include/trick/IPPython.hh similarity index 97% rename from trick_source/sim_services/InputProcessor/include/IPPython.hh rename to include/trick/IPPython.hh index 0bfab5fb..821d3c5b 100644 --- a/trick_source/sim_services/InputProcessor/include/IPPython.hh +++ b/include/trick/IPPython.hh @@ -18,7 +18,7 @@ #include <string> #include <pthread.h> -#include "sim_services/InputProcessor/include/InputProcessor.hh" +#include "trick/InputProcessor.hh" namespace Trick { diff --git a/trick_source/sim_services/InputProcessor/include/IPPythonEvent.hh b/include/trick/IPPythonEvent.hh similarity index 99% rename from trick_source/sim_services/InputProcessor/include/IPPythonEvent.hh rename to include/trick/IPPythonEvent.hh index fc164f62..ed04d798 100644 --- a/trick_source/sim_services/InputProcessor/include/IPPythonEvent.hh +++ b/include/trick/IPPythonEvent.hh @@ -3,9 +3,9 @@ #define IPPYTHONEVENT_HH #include <string> -#include "sim_services/EventManager/include/Event.hh" -#include "sim_services/MemoryManager/include/reference.h" -#include "sim_services/SimObject/include/JobData.hh" +#include "trick/Event.hh" +#include "trick/reference.h" +#include "trick/JobData.hh" #ifdef SWIG // SWIG macros are not normally run on classes in sim_services. We can add the the processed code manually diff --git a/trick_source/sim_services/Timer/include/ITimer.hh b/include/trick/ITimer.hh similarity index 98% rename from trick_source/sim_services/Timer/include/ITimer.hh rename to include/trick/ITimer.hh index cb23d040..a585e83d 100644 --- a/trick_source/sim_services/Timer/include/ITimer.hh +++ b/include/trick/ITimer.hh @@ -17,7 +17,7 @@ PROGRAMMERS: #include <semaphore.h> #include <string> -#include "Timer.hh" +#include "trick/Timer.hh" namespace Trick { diff --git a/trick_source/sim_services/InputProcessor/include/InputProcessor.hh b/include/trick/InputProcessor.hh similarity index 100% rename from trick_source/sim_services/InputProcessor/include/InputProcessor.hh rename to include/trick/InputProcessor.hh diff --git a/trick_source/sim_services/SimObject/include/InstrumentBase.hh b/include/trick/InstrumentBase.hh similarity index 95% rename from trick_source/sim_services/SimObject/include/InstrumentBase.hh rename to include/trick/InstrumentBase.hh index 6a476718..7f75a183 100644 --- a/trick_source/sim_services/SimObject/include/InstrumentBase.hh +++ b/include/trick/InstrumentBase.hh @@ -10,7 +10,7 @@ PROGRAMMERS: #define INSTRUMENTBASE_HH #include <string> -#include "sim_services/SimObject/include/JobData.hh" +#include "trick/JobData.hh" namespace Trick { diff --git a/include/trick/IntegAlgorithms.hh b/include/trick/IntegAlgorithms.hh new file mode 100644 index 00000000..ec60e52e --- /dev/null +++ b/include/trick/IntegAlgorithms.hh @@ -0,0 +1,23 @@ +/* + * PURPOSE: + * ( ) +*/ +#ifndef INTEG_ALGORITHMS_HH +#define INTEG_ALGORITHMS_HH + +#ifndef SWIG + +#include "trick/ABM_Integrator.hh" +#include "trick/Euler_Cromer_Integrator.hh" +#include "trick/Euler_Integrator.hh" +#include "trick/MM4_Integrator.hh" +#include "trick/NL2_Integrator.hh" +#include "trick/RK2_Integrator.hh" +#include "trick/RK4_Integrator.hh" +#include "trick/RKF45_Integrator.hh" +#include "trick/RKF78_Integrator.hh" +#include "trick/RKG4_Integrator.hh" + +#endif + +#endif diff --git a/trick_source/sim_services/Integrator/include/IntegJobClassId.hh b/include/trick/IntegJobClassId.hh similarity index 100% rename from trick_source/sim_services/Integrator/include/IntegJobClassId.hh rename to include/trick/IntegJobClassId.hh diff --git a/trick_source/sim_services/Integrator/include/IntegLoopManager.hh b/include/trick/IntegLoopManager.hh similarity index 99% rename from trick_source/sim_services/Integrator/include/IntegLoopManager.hh rename to include/trick/IntegLoopManager.hh index 706c4111..4555cdc8 100644 --- a/trick_source/sim_services/Integrator/include/IntegLoopManager.hh +++ b/include/trick/IntegLoopManager.hh @@ -11,8 +11,8 @@ PROGRAMMERS: #define INTEGLOOPMANAGER_HH // Trick includes -#include "sim_services/SimObject/include/SimObject.hh" -#include "sim_services/Scheduler/include/Scheduler.hh" +#include "trick/SimObject.hh" +#include "trick/Scheduler.hh" // System includes #include <algorithm> diff --git a/trick_source/sim_services/Integrator/include/IntegLoopScheduler.hh b/include/trick/IntegLoopScheduler.hh similarity index 98% rename from trick_source/sim_services/Integrator/include/IntegLoopScheduler.hh rename to include/trick/IntegLoopScheduler.hh index b38ce95e..92df8c82 100644 --- a/trick_source/sim_services/Integrator/include/IntegLoopScheduler.hh +++ b/include/trick/IntegLoopScheduler.hh @@ -13,13 +13,13 @@ PROGRAMMERS: // Local includes -#include "IntegLoopManager.hh" -#include "Integrator.hh" -#include "IntegAlgorithms.hh" +#include "trick/IntegLoopManager.hh" +#include "trick/Integrator.hh" +#include "trick/IntegAlgorithms.hh" // Trick includes -#include "sim_services/SimObject/include/SimObject.hh" -#include "sim_services/Scheduler/include/Scheduler.hh" +#include "trick/SimObject.hh" +#include "trick/Scheduler.hh" // System includes #include <vector> diff --git a/trick_source/sim_services/Integrator/include/IntegLoopSimObject.hh b/include/trick/IntegLoopSimObject.hh similarity index 88% rename from trick_source/sim_services/Integrator/include/IntegLoopSimObject.hh rename to include/trick/IntegLoopSimObject.hh index 145d09a1..eb7d6c1c 100644 --- a/trick_source/sim_services/Integrator/include/IntegLoopSimObject.hh +++ b/include/trick/IntegLoopSimObject.hh @@ -2,10 +2,10 @@ #ifndef INTEG_LOOP_SIMOBJECT_HH #define INTEG_LOOP_SIMOBJECT_HH -#include "sim_services/Integrator/include/IntegLoopScheduler.hh" -#include "sim_services/Integrator/include/Integrator.hh" -#include "sim_services/SimObject/include/SimObject.hh" -#include "sim_services/SimObject/include/JobData.hh" +#include "trick/IntegLoopScheduler.hh" +#include "trick/Integrator.hh" +#include "trick/SimObject.hh" +#include "trick/JobData.hh" #ifdef SWIG // SWIG macros are not normally run on classes in sim_services. We can add the the processed code manually diff --git a/trick_source/sim_services/Integrator/include/Integrator.hh b/include/trick/Integrator.hh similarity index 98% rename from trick_source/sim_services/Integrator/include/Integrator.hh rename to include/trick/Integrator.hh index c091950e..f36cc71a 100644 --- a/trick_source/sim_services/Integrator/include/Integrator.hh +++ b/include/trick/Integrator.hh @@ -4,7 +4,7 @@ PURPOSE: (Integrator Base Class) */ #if defined(TRICK_VER) - #include "sim_services/MemoryManager/include/memorymanager_c_intf.h" + #include "trick/memorymanager_c_intf.h" #define INTEG_NEW(class) (class*)TMM_declare_var_1d(#class,1) #define INTEG_ALLOC(typespec, num) (typespec*)TMM_declare_var_1d(#typespec,(num)) #define INTEG_FREE(p) TMM_delete_var_a(p) @@ -15,9 +15,11 @@ #define INTEG_FREE(p) free(p) #endif +/* #ifdef USE_ER7_UTILS_INTEGRATORS #include "er7_utils/integration/core/include/integration_technique.hh" #endif +*/ /** * Below are the supported types of integration schemes. diff --git a/trick_source/trick_utils/interpolator/include/Interpolator.hh b/include/trick/Interpolator.hh similarity index 100% rename from trick_source/trick_utils/interpolator/include/Interpolator.hh rename to include/trick/Interpolator.hh diff --git a/trick_source/sim_services/JITInputFile/include/JITEvent.hh b/include/trick/JITEvent.hh similarity index 91% rename from trick_source/sim_services/JITInputFile/include/JITEvent.hh rename to include/trick/JITEvent.hh index ca896e03..adb59b36 100644 --- a/trick_source/sim_services/JITInputFile/include/JITEvent.hh +++ b/include/trick/JITEvent.hh @@ -12,8 +12,8 @@ LIBRARY DEPENDENCY: #include <iostream> #include <string> -#include "sim_services/include/mm_macros.hh" -#include "sim_services/EventManager/include/Event.hh" +#include "trick/mm_macros.hh" +#include "trick/Event.hh" namespace Trick { diff --git a/trick_source/sim_services/JITInputFile/include/JITInputFile.hh b/include/trick/JITInputFile.hh similarity index 96% rename from trick_source/sim_services/JITInputFile/include/JITInputFile.hh rename to include/trick/JITInputFile.hh index 0393e9f4..7595d931 100644 --- a/trick_source/sim_services/JITInputFile/include/JITInputFile.hh +++ b/include/trick/JITInputFile.hh @@ -13,8 +13,8 @@ LIBRARY DEPENDENCY: #include <queue> #include <map> -#include "sim_services/JITInputFile/include/JITEvent.hh" -#include "sim_services/SimObject/include/JobData.hh" +#include "trick/JITEvent.hh" +#include "trick/JobData.hh" namespace Trick { diff --git a/trick_source/sim_services/JSONVariableServer/include/JSONVariableServer.hh b/include/trick/JSONVariableServer.hh similarity index 96% rename from trick_source/sim_services/JSONVariableServer/include/JSONVariableServer.hh rename to include/trick/JSONVariableServer.hh index ae7011ee..4db14096 100644 --- a/trick_source/sim_services/JSONVariableServer/include/JSONVariableServer.hh +++ b/include/trick/JSONVariableServer.hh @@ -8,8 +8,8 @@ #include <string> #include <iostream> -#include "trick_utils/comm/include/tc.h" -#include "sim_services/ThreadBase/include/ThreadBase.hh" +#include "trick/tc.h" +#include "trick/ThreadBase.hh" namespace Trick { diff --git a/trick_source/sim_services/JSONVariableServer/include/JSONVariableServerThread.hh b/include/trick/JSONVariableServerThread.hh similarity index 95% rename from trick_source/sim_services/JSONVariableServer/include/JSONVariableServerThread.hh rename to include/trick/JSONVariableServerThread.hh index 7f94d2ca..5a8648ac 100644 --- a/trick_source/sim_services/JSONVariableServer/include/JSONVariableServerThread.hh +++ b/include/trick/JSONVariableServerThread.hh @@ -7,8 +7,8 @@ #define JSONVARIABLESERVERTHREAD_HH #include <pthread.h> -#include "trick_utils/comm/include/tc.h" -#include "sim_services/ThreadBase/include/ThreadBase.hh" +#include "trick/tc.h" +#include "trick/ThreadBase.hh" namespace Trick { diff --git a/trick_source/sim_services/SimObject/include/JobData.hh b/include/trick/JobData.hh similarity index 99% rename from trick_source/sim_services/SimObject/include/JobData.hh rename to include/trick/JobData.hh index e67e2f48..d16670a6 100644 --- a/trick_source/sim_services/SimObject/include/JobData.hh +++ b/include/trick/JobData.hh @@ -13,7 +13,7 @@ PROGRAMMERS: #include <vector> #include <set> -#include "sim_services/SimObject/include/InstrumentBase.hh" +#include "trick/InstrumentBase.hh" namespace Trick { diff --git a/trick_source/sim_services/Integrator/er7_algorithms/MM4_Integrator.hh b/include/trick/MM4_Integrator.hh similarity index 77% rename from trick_source/sim_services/Integrator/er7_algorithms/MM4_Integrator.hh rename to include/trick/MM4_Integrator.hh index 645d25a3..86891c07 100644 --- a/trick_source/sim_services/Integrator/er7_algorithms/MM4_Integrator.hh +++ b/include/trick/MM4_Integrator.hh @@ -12,6 +12,7 @@ Programmers: #ifndef MM4_INTEGRATOR_HH #define MM4_INTEGRATOR_HH +#ifdef USE_ER7_UTILS_INTEGRATORS #include "er7_utils/integration/mm4/include/mm4_integrator_constructor.hh" #include "er7_utils/trick/integration/include/second_order_ode_integrator.hh" @@ -81,5 +82,30 @@ public: }; } +#else + +#include "trick/Integrator.hh" +/** + PURPOSE: (Integrator using Modified Midpoint method.) + */ + +namespace Trick { + + class MM4_Integrator : public Integrator { + + public: + /** Default Constructor. This must remain public so the MM can create these. */ + MM4_Integrator() {}; + MM4_Integrator( int State_size, double Dt); + virtual ~MM4_Integrator(); + + void initialize( int State_size, double Dt); + + int integrate(); + + Integrator_type get_Integrator_type() { return(Modified_Midpoint_4); } ; + }; +} +#endif #endif diff --git a/trick_source/sim_services/MasterSlave/include/MSConnect.hh b/include/trick/MSConnect.hh similarity index 98% rename from trick_source/sim_services/MasterSlave/include/MSConnect.hh rename to include/trick/MSConnect.hh index 02f44bab..96f1cbef 100644 --- a/trick_source/sim_services/MasterSlave/include/MSConnect.hh +++ b/include/trick/MSConnect.hh @@ -8,7 +8,7 @@ PURPOSE: #include <string> -#include "sim_services/MasterSlave/include/ms_sim_mode.h" +#include "trick/ms_sim_mode.h" namespace Trick { diff --git a/trick_source/sim_services/MasterSlave/include/MSSharedMem.hh b/include/trick/MSSharedMem.hh similarity index 97% rename from trick_source/sim_services/MasterSlave/include/MSSharedMem.hh rename to include/trick/MSSharedMem.hh index 91cd5ff5..bfbec820 100644 --- a/trick_source/sim_services/MasterSlave/include/MSSharedMem.hh +++ b/include/trick/MSSharedMem.hh @@ -9,12 +9,12 @@ PROGRAMMERS: #ifndef MSSHAREDMEM_HH #define MSSHAREDMEM_HH -#include "trick_utils/shm/include/tsm.h" -#include "sim_services/MasterSlave/include/MSConnect.hh" +#include "trick/tsm.h" +#include "trick/MSConnect.hh" //----------------------------------------------------------------------------- // MACROS USED FOR IMPLEMENTING sync_wait_limit -#include "sim_services/include/release.h" // for RELEASE() +#include "trick/release.h" // for RELEASE() // Mac Os X does not have clock_gettime !! #if __APPLE__ #include <mach/clock.h> diff --git a/trick_source/sim_services/MasterSlave/include/MSSocket.hh b/include/trick/MSSocket.hh similarity index 98% rename from trick_source/sim_services/MasterSlave/include/MSSocket.hh rename to include/trick/MSSocket.hh index a85563c8..fdd38d65 100644 --- a/trick_source/sim_services/MasterSlave/include/MSSocket.hh +++ b/include/trick/MSSocket.hh @@ -9,8 +9,8 @@ PROGRAMMERS: #ifndef MSSOCKET_HH #define MSSOCKET_HH -#include "trick_utils/comm/include/tc.h" -#include "sim_services/MasterSlave/include/MSConnect.hh" +#include "trick/tc.h" +#include "trick/MSConnect.hh" namespace Trick { diff --git a/trick_source/sim_services/InputProcessor/include/MTV.hh b/include/trick/MTV.hh similarity index 94% rename from trick_source/sim_services/InputProcessor/include/MTV.hh rename to include/trick/MTV.hh index 474e6622..60652138 100644 --- a/trick_source/sim_services/InputProcessor/include/MTV.hh +++ b/include/trick/MTV.hh @@ -3,7 +3,7 @@ #define MTV_HH #include <string> -#include "sim_services/InputProcessor/include/IPPythonEvent.hh" +#include "trick/IPPythonEvent.hh" namespace Trick { diff --git a/include/trick/Makefile b/include/trick/Makefile new file mode 100644 index 00000000..26b6f5b8 --- /dev/null +++ b/include/trick/Makefile @@ -0,0 +1,13 @@ + +include ${TRICK_HOME}/share/trick/makefiles/Makefile.common +include ${TRICK_HOME}/share/trick/makefiles/Makefile.tricklib +-include Makefile_deps + +ifeq ($(USE_ER7_UTILS_INTEGRATORS), 1) +trick: + $(MAKE) -C er7_algorithms +else +trick: + $(MAKE) -C trick_algorithms +endif + diff --git a/trick_source/sim_services/ExternalApplications/include/MalfunctionsTrickView.hh b/include/trick/MalfunctionsTrickView.hh similarity index 90% rename from trick_source/sim_services/ExternalApplications/include/MalfunctionsTrickView.hh rename to include/trick/MalfunctionsTrickView.hh index 61364b30..377adf5a 100644 --- a/trick_source/sim_services/ExternalApplications/include/MalfunctionsTrickView.hh +++ b/include/trick/MalfunctionsTrickView.hh @@ -5,7 +5,7 @@ #ifndef MALFUNCTIONSTRICKVIEW_HH #define MALFUNCTIONSTRICKVIEW_HH -#include "sim_services/ExternalApplications/include/ExternalApplication.hh" +#include "trick/ExternalApplication.hh" namespace Trick { diff --git a/trick_source/trick_utils/trick_adt/include/MapStrToPtr.h b/include/trick/MapStrToPtr.h similarity index 99% rename from trick_source/trick_utils/trick_adt/include/MapStrToPtr.h rename to include/trick/MapStrToPtr.h index ec05de16..81187abf 100644 --- a/trick_source/trick_utils/trick_adt/include/MapStrToPtr.h +++ b/include/trick/MapStrToPtr.h @@ -18,7 +18,7 @@ PURPOSE: This data structure uses a hash table to map strings to pointers. Com **************************************************/ #include <stdlib.h> -#include "dllist.h" +#include "trick/dllist.h" #ifdef __cplusplus extern "C" { diff --git a/trick_source/sim_services/MasterSlave/include/Master.hh b/include/trick/Master.hh similarity index 98% rename from trick_source/sim_services/MasterSlave/include/Master.hh rename to include/trick/Master.hh index 15d50080..7b43526f 100644 --- a/trick_source/sim_services/MasterSlave/include/Master.hh +++ b/include/trick/Master.hh @@ -17,9 +17,9 @@ #include <vector> #include <queue> #include <set> -#include "sim_services/MasterSlave/include/MSConnect.hh" -#include "sim_services/include/RemoteShell.hh" -#include "sim_services/MasterSlave/include/ms_sim_mode.h" +#include "trick/MSConnect.hh" +#include "trick/RemoteShell.hh" +#include "trick/ms_sim_mode.h" #ifdef SWIG // This allows SWIG access to the inside of the slave vector diff --git a/trick_source/sim_services/MemoryManager/include/MemoryManager.hh b/include/trick/MemoryManager.hh similarity index 98% rename from trick_source/sim_services/MemoryManager/include/MemoryManager.hh rename to include/trick/MemoryManager.hh index 10de4479..350df233 100644 --- a/trick_source/sim_services/MemoryManager/include/MemoryManager.hh +++ b/include/trick/MemoryManager.hh @@ -10,15 +10,15 @@ #include <pthread.h> #include <functional> -#include "sim_services/MemoryManager/include/attributes.h" -#include "sim_services/MemoryManager/include/reference.h" -#include "sim_services/MemoryManager/include/parameter_types.h" -#include "sim_services/MemoryManager/include/io_alloc.h" -#include "sim_services/MemoryManager/include/mm_error.h" -#include "sim_services/MemoryManager/include/var.h" +#include "trick/attributes.h" +#include "trick/reference.h" +#include "trick/parameter_types.h" +#include "trick/io_alloc.h" +#include "trick/mm_error.h" +#include "trick/var.h" -#include "sim_services/CheckPointAgent/include/CheckPointAgent.hh" -#include "trick_utils/units/include/UCFn.hh" +#include "trick/CheckPointAgent.hh" +#include "trick/UCFn.hh" namespace Trick { diff --git a/trick_source/sim_services/Message/include/MessageCout.hh b/include/trick/MessageCout.hh similarity index 95% rename from trick_source/sim_services/Message/include/MessageCout.hh rename to include/trick/MessageCout.hh index fe2ca98e..99a9f832 100644 --- a/trick_source/sim_services/Message/include/MessageCout.hh +++ b/include/trick/MessageCout.hh @@ -17,7 +17,7 @@ #define MESSAGECOUT_HH #include <iostream> -#include "sim_services/Message/include/MessageSubscriber.hh" +#include "trick/MessageSubscriber.hh" namespace Trick { diff --git a/trick_source/sim_services/Message/include/MessageFile.hh b/include/trick/MessageFile.hh similarity index 97% rename from trick_source/sim_services/Message/include/MessageFile.hh rename to include/trick/MessageFile.hh index edc3fbad..00f84eeb 100644 --- a/trick_source/sim_services/Message/include/MessageFile.hh +++ b/include/trick/MessageFile.hh @@ -19,7 +19,7 @@ #include <string> #include <iostream> #include <fstream> -#include "sim_services/Message/include/MessageSubscriber.hh" +#include "trick/MessageSubscriber.hh" namespace Trick { diff --git a/trick_source/sim_services/Message/include/MessageLCout.hh b/include/trick/MessageLCout.hh similarity index 93% rename from trick_source/sim_services/Message/include/MessageLCout.hh rename to include/trick/MessageLCout.hh index fadd88b0..b3dc1378 100644 --- a/trick_source/sim_services/Message/include/MessageLCout.hh +++ b/include/trick/MessageLCout.hh @@ -5,7 +5,7 @@ #include <iostream> #include <map> #include <stdlib.h> -#include "sim_services/Message/include/MessageSubscriber.hh" +#include "trick/MessageSubscriber.hh" namespace Trick { diff --git a/trick_source/sim_services/Message/include/MessagePublisher.hh b/include/trick/MessagePublisher.hh similarity index 97% rename from trick_source/sim_services/Message/include/MessagePublisher.hh rename to include/trick/MessagePublisher.hh index f94b0a73..f73d29a4 100644 --- a/trick_source/sim_services/Message/include/MessagePublisher.hh +++ b/include/trick/MessagePublisher.hh @@ -4,7 +4,7 @@ #include <string> #include <list> -#include "sim_services/Message/include/MessageSubscriber.hh" +#include "trick/MessageSubscriber.hh" namespace Trick { diff --git a/trick_source/sim_services/Message/include/MessageSubscriber.hh b/include/trick/MessageSubscriber.hh similarity index 100% rename from trick_source/sim_services/Message/include/MessageSubscriber.hh rename to include/trick/MessageSubscriber.hh diff --git a/trick_source/sim_services/Message/include/MessageTCDevice.hh b/include/trick/MessageTCDevice.hh similarity index 95% rename from trick_source/sim_services/Message/include/MessageTCDevice.hh rename to include/trick/MessageTCDevice.hh index 09d618e6..f8853959 100644 --- a/trick_source/sim_services/Message/include/MessageTCDevice.hh +++ b/include/trick/MessageTCDevice.hh @@ -4,9 +4,9 @@ #include <pthread.h> #include <vector> -#include "sim_services/Message/include/MessageSubscriber.hh" -#include "sim_services/ThreadBase/include/ThreadBase.hh" -#include "trick_utils/comm/include/tc.h" +#include "trick/MessageSubscriber.hh" +#include "trick/ThreadBase.hh" +#include "trick/tc.h" namespace Trick { diff --git a/trick_source/sim_services/Message/include/Message_proto.hh b/include/trick/Message_proto.hh similarity index 92% rename from trick_source/sim_services/Message/include/Message_proto.hh rename to include/trick/Message_proto.hh index 488775e9..95b57a7c 100644 --- a/trick_source/sim_services/Message/include/Message_proto.hh +++ b/include/trick/Message_proto.hh @@ -17,7 +17,7 @@ #ifndef MESSAGE_PROTO_HH #define MESSAGE_PROTO_HH -#include "sim_services/Message/include/MessageSubscriber.hh" +#include "trick/MessageSubscriber.hh" int message_subscribe( Trick::MessageSubscriber * in_ms ) ; int message_unsubscribe( Trick::MessageSubscriber * in_ms ) ; diff --git a/trick_source/sim_services/MonteCarlo/include/MonteCarlo.hh b/include/trick/MonteCarlo.hh similarity index 99% rename from trick_source/sim_services/MonteCarlo/include/MonteCarlo.hh rename to include/trick/MonteCarlo.hh index 29ddff56..bd87593f 100644 --- a/trick_source/sim_services/MonteCarlo/include/MonteCarlo.hh +++ b/include/trick/MonteCarlo.hh @@ -8,10 +8,10 @@ #include <deque> #include <vector> -#include "MonteVar.hh" -#include "sim_services/Executive/include/Executive.hh" -#include "sim_services/include/RemoteShell.hh" -#include "trick_utils/comm/include/tc.h" +#include "trick/MonteVar.hh" +#include "trick/Executive.hh" +#include "trick/RemoteShell.hh" +#include "trick/tc.h" #ifndef HOST_NAME_MAX #define HOST_NAME_MAX 128 diff --git a/trick_source/sim_services/ExternalApplications/include/MonteMonitor.hh b/include/trick/MonteMonitor.hh similarity index 87% rename from trick_source/sim_services/ExternalApplications/include/MonteMonitor.hh rename to include/trick/MonteMonitor.hh index 981cc1bb..71847796 100644 --- a/trick_source/sim_services/ExternalApplications/include/MonteMonitor.hh +++ b/include/trick/MonteMonitor.hh @@ -5,7 +5,7 @@ #ifndef MONTEMONITOR_HH #define MONTEMONITOR_HH -#include "sim_services/ExternalApplications/include/ExternalApplication.hh" +#include "trick/ExternalApplication.hh" namespace Trick { diff --git a/trick_source/sim_services/MonteCarlo/include/MonteVar.hh b/include/trick/MonteVar.hh similarity index 100% rename from trick_source/sim_services/MonteCarlo/include/MonteVar.hh rename to include/trick/MonteVar.hh diff --git a/trick_source/sim_services/MonteCarlo/include/MonteVarCalculated.hh b/include/trick/MonteVarCalculated.hh similarity index 94% rename from trick_source/sim_services/MonteCarlo/include/MonteVarCalculated.hh rename to include/trick/MonteVarCalculated.hh index 3069b151..fb7ceb90 100644 --- a/trick_source/sim_services/MonteCarlo/include/MonteVarCalculated.hh +++ b/include/trick/MonteVarCalculated.hh @@ -10,8 +10,8 @@ #include <string> -#include "MonteVar.hh" -#include "sim_services/MemoryManager/include/reference.h" +#include "trick/MonteVar.hh" +#include "trick/reference.h" namespace Trick { diff --git a/trick_source/sim_services/MonteCarlo/include/MonteVarFile.hh b/include/trick/MonteVarFile.hh similarity index 98% rename from trick_source/sim_services/MonteCarlo/include/MonteVarFile.hh rename to include/trick/MonteVarFile.hh index f225643d..db07638c 100644 --- a/trick_source/sim_services/MonteCarlo/include/MonteVarFile.hh +++ b/include/trick/MonteVarFile.hh @@ -12,7 +12,7 @@ #include <fstream> #include <string> -#include "MonteVar.hh" +#include "trick/MonteVar.hh" namespace Trick { diff --git a/trick_source/sim_services/MonteCarlo/include/MonteVarFixed.hh b/include/trick/MonteVarFixed.hh similarity index 97% rename from trick_source/sim_services/MonteCarlo/include/MonteVarFixed.hh rename to include/trick/MonteVarFixed.hh index e5ad12db..d9a1f089 100644 --- a/trick_source/sim_services/MonteCarlo/include/MonteVarFixed.hh +++ b/include/trick/MonteVarFixed.hh @@ -10,7 +10,7 @@ #include <string> -#include "MonteVar.hh" +#include "trick/MonteVar.hh" namespace Trick { diff --git a/trick_source/sim_services/MonteCarlo/include/MonteVarRandom.hh b/include/trick/MonteVarRandom.hh similarity index 97% rename from trick_source/sim_services/MonteCarlo/include/MonteVarRandom.hh rename to include/trick/MonteVarRandom.hh index 7cd74ed0..42844a75 100644 --- a/trick_source/sim_services/MonteCarlo/include/MonteVarRandom.hh +++ b/include/trick/MonteVarRandom.hh @@ -10,9 +10,9 @@ #include <string> -#include "MonteVar.hh" -#include "trick_utils/math/include/rand_generator.h" -#include "sim_services/MonteCarlo/include/StlRandomGenerator.hh" +#include "trick/MonteVar.hh" +#include "trick/rand_generator.h" +#include "trick/StlRandomGenerator.hh" namespace Trick { diff --git a/trick_source/sim_services/Integrator/er7_algorithms/NL2_Integrator.hh b/include/trick/NL2_Integrator.hh similarity index 75% rename from trick_source/sim_services/Integrator/er7_algorithms/NL2_Integrator.hh rename to include/trick/NL2_Integrator.hh index 1f673434..e52e05d9 100644 --- a/trick_source/sim_services/Integrator/er7_algorithms/NL2_Integrator.hh +++ b/include/trick/NL2_Integrator.hh @@ -12,6 +12,7 @@ Programmers: #ifndef NL2_INTEGRATOR_HH #define NL2_INTEGRATOR_HH +#ifdef USE_ER7_UTILS_INTEGRATORS #include "er7_utils/integration/nl2/include/nl2_integrator_constructor.hh" #include "er7_utils/trick/integration/include/second_order_ode_integrator.hh" @@ -81,5 +82,34 @@ public: }; } +#else + +#include "trick/Integrator.hh" +/** + PURPOSE: (Integrator using Nystrom Lear 2 method.) + */ + +namespace Trick { + + /** Integrator using Nystrom Lear 2 method. + */ + class NL2_Integrator : public Integrator { + + public: + /** Default Constructor. This must remain public so the MM can create these. */ + NL2_Integrator() {}; + NL2_Integrator( int State_size, double Dt); + virtual ~NL2_Integrator(); + + void initialize( int State_size, double Dt); + + int integrate(); + + void set_first_step_deriv(bool first_step); + + Integrator_type get_Integrator_type() { return(Nystrom_Lear_2); } ; + }; +} +#endif #endif diff --git a/trick_source/sim_services/Message/include/PlaybackFile.hh b/include/trick/PlaybackFile.hh similarity index 92% rename from trick_source/sim_services/Message/include/PlaybackFile.hh rename to include/trick/PlaybackFile.hh index 34964281..1d55dd76 100644 --- a/trick_source/sim_services/Message/include/PlaybackFile.hh +++ b/include/trick/PlaybackFile.hh @@ -9,7 +9,7 @@ #include <string> #include <iostream> #include <fstream> -#include "sim_services/Message/include/MessageFile.hh" +#include "trick/MessageFile.hh" namespace Trick { diff --git a/trick_source/sim_services/CheckPointAgent/include/PythonPrint.hh b/include/trick/PythonPrint.hh similarity index 97% rename from trick_source/sim_services/CheckPointAgent/include/PythonPrint.hh rename to include/trick/PythonPrint.hh index ae1f245b..dd30d7e8 100644 --- a/trick_source/sim_services/CheckPointAgent/include/PythonPrint.hh +++ b/include/trick/PythonPrint.hh @@ -5,7 +5,7 @@ #include <string> #include <iostream> #include <vector> -#include "sim_services/CheckPointAgent/include/CheckPointAgent.hh" +#include "trick/CheckPointAgent.hh" namespace Trick { diff --git a/trick_source/sim_services/Integrator/er7_algorithms/RK2_Integrator.hh b/include/trick/RK2_Integrator.hh similarity index 78% rename from trick_source/sim_services/Integrator/er7_algorithms/RK2_Integrator.hh rename to include/trick/RK2_Integrator.hh index 606c4bb7..ae3e2742 100644 --- a/trick_source/sim_services/Integrator/er7_algorithms/RK2_Integrator.hh +++ b/include/trick/RK2_Integrator.hh @@ -12,6 +12,7 @@ Programmers: #ifndef RK2_INTEGRATOR_HH #define RK2_INTEGRATOR_HH +#ifdef USE_ER7_UTILS_INTEGRATORS #include "er7_utils/integration/rk2_heun/include/rk2_heun_integrator_constructor.hh" #include "er7_utils/trick/integration/include/first_order_ode_integrator.hh" @@ -81,5 +82,29 @@ public: }; } +#else + +#include "trick/Integrator.hh" +namespace Trick { + + /** Integrator using Runga Kutta 2 method. + */ + class RK2_Integrator : public Integrator { + + public: + /** Default Constructor. This must remain public so the MM can create these. */ + RK2_Integrator() {}; + RK2_Integrator( int State_size, double Dt); + virtual ~RK2_Integrator(); + + void initialize( int State_size, double Dt); + + int integrate(); + + Integrator_type get_Integrator_type() { return(Runge_Kutta_2); } ; + }; +} + +#endif #endif diff --git a/trick_source/sim_services/Integrator/er7_algorithms/RK4_Integrator.hh b/include/trick/RK4_Integrator.hh similarity index 76% rename from trick_source/sim_services/Integrator/er7_algorithms/RK4_Integrator.hh rename to include/trick/RK4_Integrator.hh index 36a0fd5c..672a7023 100644 --- a/trick_source/sim_services/Integrator/er7_algorithms/RK4_Integrator.hh +++ b/include/trick/RK4_Integrator.hh @@ -12,6 +12,7 @@ Programmers: #ifndef RK4_INTEGRATOR_HH #define RK4_INTEGRATOR_HH +#ifdef USE_ER7_UTILS_INTEGRATORS #include "er7_utils/integration/rk4/include/rk4_integrator_constructor.hh" #include "er7_utils/trick/integration/include/first_order_ode_integrator.hh" @@ -81,5 +82,32 @@ public: }; } +#else + +#include "trick/Integrator.hh" +/** + PURPOSE: (Integrator using Runga Kutta 4 method.) + */ + +namespace Trick { + + /** Integrator using Runge Kutta 4 method. + */ + class RK4_Integrator : public Integrator { + + public: + /** Default Constructor. This must remain public so the MM can create these. */ + RK4_Integrator() {}; + RK4_Integrator( int State_size, double Dt); + ~RK4_Integrator(); + + void initialize( int State_size, double Dt); + + int integrate(); + + Integrator_type get_Integrator_type() { return(Runge_Kutta_4); } ; + }; +} +#endif #endif diff --git a/trick_source/sim_services/Integrator/er7_algorithms/RKF45_Integrator.hh b/include/trick/RKF45_Integrator.hh similarity index 74% rename from trick_source/sim_services/Integrator/er7_algorithms/RKF45_Integrator.hh rename to include/trick/RKF45_Integrator.hh index 0166c4db..33d97a77 100644 --- a/trick_source/sim_services/Integrator/er7_algorithms/RKF45_Integrator.hh +++ b/include/trick/RKF45_Integrator.hh @@ -12,6 +12,7 @@ Programmers: #ifndef RKF45_INTEGRATOR_HH #define RKF45_INTEGRATOR_HH +#ifdef USE_ER7_UTILS_INTEGRATORS #include "er7_utils/integration/rkf45/include/rkf45_integrator_constructor.hh" #include "er7_utils/trick/integration/include/first_order_ode_integrator.hh" @@ -81,5 +82,34 @@ public: }; } +#else + +#include "trick/Integrator.hh" +/** + PURPOSE: (Integrator using Runge Kutta Fehlberg 45 method.) + */ + +namespace Trick { + + /** Integrator using Runge Kutta Fehlberg 45 method. + */ + class RKF45_Integrator : public Integrator { + + public: + /** Default Constructor. This must remain public so the MM can create these. */ + RKF45_Integrator() {}; + RKF45_Integrator( int State_size, double Dt); + virtual ~RKF45_Integrator(); + + void initialize( int State_size, double Dt); + + int integrate(); + + void set_first_step_deriv(bool first_step); + + Integrator_type get_Integrator_type() { return(Runge_Kutta_Fehlberg_45); } ; + }; +} +#endif #endif diff --git a/trick_source/sim_services/Integrator/er7_algorithms/RKF78_Integrator.hh b/include/trick/RKF78_Integrator.hh similarity index 75% rename from trick_source/sim_services/Integrator/er7_algorithms/RKF78_Integrator.hh rename to include/trick/RKF78_Integrator.hh index e11ed9d4..8abfce77 100644 --- a/trick_source/sim_services/Integrator/er7_algorithms/RKF78_Integrator.hh +++ b/include/trick/RKF78_Integrator.hh @@ -12,6 +12,7 @@ Programmers: #ifndef RKF78_INTEGRATOR_HH #define RKF78_INTEGRATOR_HH +#ifdef USE_ER7_UTILS_INTEGRATORS #include "er7_utils/integration/rkf78/include/rkf78_integrator_constructor.hh" #include "er7_utils/trick/integration/include/first_order_ode_integrator.hh" @@ -81,5 +82,33 @@ public: }; } +#else + +#include "trick/Integrator.hh" +/** + PURPOSE: (Integrator using Runga Kutta Fehlberg 78 method.) + */ + +namespace Trick { + + /** Integrator using Runge Kutta Fehlberg 78 method. + */ + class RKF78_Integrator : public Integrator { + + public: + /** Default Constructor. This must remain public so the MM can create these. */ + RKF78_Integrator() {}; + RKF78_Integrator( int State_size, double Dt); + virtual ~RKF78_Integrator(); + + void initialize( int State_size, double Dt); + + int integrate(); + + Integrator_type get_Integrator_type() { return(Runge_Kutta_Fehlberg_78); } ; + + }; +} +#endif #endif diff --git a/trick_source/sim_services/Integrator/er7_algorithms/RKG4_Integrator.hh b/include/trick/RKG4_Integrator.hh similarity index 75% rename from trick_source/sim_services/Integrator/er7_algorithms/RKG4_Integrator.hh rename to include/trick/RKG4_Integrator.hh index 53aad8dc..3d14abb3 100644 --- a/trick_source/sim_services/Integrator/er7_algorithms/RKG4_Integrator.hh +++ b/include/trick/RKG4_Integrator.hh @@ -12,6 +12,7 @@ Programmers: #ifndef RKG4_INTEGRATOR_HH #define RKG4_INTEGRATOR_HH +#ifdef USE_ER7_UTILS_INTEGRATORS #include "er7_utils/integration/rkg4/include/rkg4_integrator_constructor.hh" #include "er7_utils/trick/integration/include/first_order_ode_integrator.hh" @@ -81,5 +82,31 @@ public: }; } +#else + +#include "trick/Integrator.hh" +/** + PURPOSE: (Integrator using Runga Kutta Gill 4 method.) + */ +namespace Trick { + + /** Integrator using Runge Kutta Gill 4th Order method. + */ + class RKG4_Integrator : public Integrator { + + public: + /** Default Constructor. This must remain public so the MM can create these. */ + RKG4_Integrator() {}; + RKG4_Integrator( int State_size, double Dt); + virtual ~RKG4_Integrator(); + + void initialize( int State_size, double Dt); + + int integrate(); + + Integrator_type get_Integrator_type() { return(Runge_Kutta_Gill_4); } ; + }; +} +#endif #endif diff --git a/trick_source/sim_services/RealtimeSync/include/RealtimeSync.hh b/include/trick/RealtimeSync.hh similarity index 99% rename from trick_source/sim_services/RealtimeSync/include/RealtimeSync.hh rename to include/trick/RealtimeSync.hh index 6ba07363..9fd18460 100644 --- a/trick_source/sim_services/RealtimeSync/include/RealtimeSync.hh +++ b/include/trick/RealtimeSync.hh @@ -8,8 +8,8 @@ PROGRAMMERS: #ifndef REALTIMESYNC_HH #define REALTIMESYNC_HH -#include "sim_services/Clock/include/Clock.hh" -#include "sim_services/Timer/include/Timer.hh" +#include "trick/Clock.hh" +#include "trick/Timer.hh" namespace Trick { diff --git a/trick_source/sim_services/MemoryManager/include/RefParseContext.hh b/include/trick/RefParseContext.hh similarity index 93% rename from trick_source/sim_services/MemoryManager/include/RefParseContext.hh rename to include/trick/RefParseContext.hh index dd1bc177..34838923 100644 --- a/trick_source/sim_services/MemoryManager/include/RefParseContext.hh +++ b/include/trick/RefParseContext.hh @@ -5,8 +5,8 @@ #include <iostream> #include <unistd.h> -#include "sim_services/MemoryManager/include/MemoryManager.hh" -#include "sim_services/MemoryManager/include/reference.h" +#include "trick/MemoryManager.hh" +#include "trick/reference.h" /** The class represents the context for a variable-reference parser. diff --git a/trick_source/sim_services/include/RemoteShell.hh b/include/trick/RemoteShell.hh similarity index 100% rename from trick_source/sim_services/include/RemoteShell.hh rename to include/trick/RemoteShell.hh diff --git a/trick_source/sim_services/RealtimeInjector/include/RtiEvent.hh b/include/trick/RtiEvent.hh similarity index 95% rename from trick_source/sim_services/RealtimeInjector/include/RtiEvent.hh rename to include/trick/RtiEvent.hh index 1cc09e94..2d547983 100644 --- a/trick_source/sim_services/RealtimeInjector/include/RtiEvent.hh +++ b/include/trick/RtiEvent.hh @@ -5,11 +5,11 @@ #include <sstream> #include <stdlib.h> -#include "sim_services/MemoryManager/include/reference.h" -#include "sim_services/MemoryManager/include/bitfield_proto.h" -#include "sim_services/MemoryManager/include/memorymanager_c_intf.h" -#include "sim_services/Message/include/message_proto.h" -#include "sim_services/Message/include/message_type.h" +#include "trick/reference.h" +#include "trick/bitfield_proto.h" +#include "trick/memorymanager_c_intf.h" +#include "trick/message_proto.h" +#include "trick/message_type.h" namespace Trick { diff --git a/trick_source/sim_services/RealtimeInjector/include/RtiExec.hh b/include/trick/RtiExec.hh similarity index 98% rename from trick_source/sim_services/RealtimeInjector/include/RtiExec.hh rename to include/trick/RtiExec.hh index adbb2417..7934fb60 100644 --- a/trick_source/sim_services/RealtimeInjector/include/RtiExec.hh +++ b/include/trick/RtiExec.hh @@ -8,7 +8,7 @@ #include <vector> -#include "RtiList.hh" +#include "trick/RtiList.hh" namespace Trick { diff --git a/trick_source/sim_services/RealtimeInjector/include/RtiList.hh b/include/trick/RtiList.hh similarity index 90% rename from trick_source/sim_services/RealtimeInjector/include/RtiList.hh rename to include/trick/RtiList.hh index 881133b9..53af6487 100644 --- a/trick_source/sim_services/RealtimeInjector/include/RtiList.hh +++ b/include/trick/RtiList.hh @@ -7,7 +7,7 @@ #define RTILIST_HH #include <vector> -#include "RtiEvent.hh" +#include "trick/RtiEvent.hh" namespace Trick { diff --git a/trick_source/sim_services/RealtimeInjector/include/RtiStager.hh b/include/trick/RtiStager.hh similarity index 97% rename from trick_source/sim_services/RealtimeInjector/include/RtiStager.hh rename to include/trick/RtiStager.hh index 70a8c6a8..b3cd97a2 100644 --- a/trick_source/sim_services/RealtimeInjector/include/RtiStager.hh +++ b/include/trick/RtiStager.hh @@ -9,9 +9,9 @@ #include <map> #include <vector> -#include "RtiEvent.hh" -#include "RtiList.hh" -#include "RtiExec.hh" +#include "trick/RtiEvent.hh" +#include "trick/RtiList.hh" +#include "trick/RtiExec.hh" namespace Trick { diff --git a/trick_source/sim_services/STL/include/STLInterface.hh b/include/trick/STLInterface.hh similarity index 100% rename from trick_source/sim_services/STL/include/STLInterface.hh rename to include/trick/STLInterface.hh diff --git a/trick_source/sim_services/STL/include/STLManager.hh b/include/trick/STLManager.hh similarity index 91% rename from trick_source/sim_services/STL/include/STLManager.hh rename to include/trick/STLManager.hh index 3ecb5a50..058eb4ee 100644 --- a/trick_source/sim_services/STL/include/STLManager.hh +++ b/include/trick/STLManager.hh @@ -3,7 +3,7 @@ #define STL_MANAGER_HH #include <vector> -#include "sim_services/STL/include/STLInterface.hh" +#include "trick/STLInterface.hh" namespace Trick { diff --git a/trick_source/sim_services/STL/include/STLUtilities.hh b/include/trick/STLUtilities.hh similarity index 100% rename from trick_source/sim_services/STL/include/STLUtilities.hh rename to include/trick/STLUtilities.hh diff --git a/trick_source/sim_services/ScheduledJobQueue/include/ScheduledJobQueue.hh b/include/trick/ScheduledJobQueue.hh similarity index 99% rename from trick_source/sim_services/ScheduledJobQueue/include/ScheduledJobQueue.hh rename to include/trick/ScheduledJobQueue.hh index 9e6ab393..487bf5e7 100644 --- a/trick_source/sim_services/ScheduledJobQueue/include/ScheduledJobQueue.hh +++ b/include/trick/ScheduledJobQueue.hh @@ -8,7 +8,7 @@ #include <string> -#include "sim_services/SimObject/include/JobData.hh" +#include "trick/JobData.hh" namespace Trick { diff --git a/trick_source/sim_services/ScheduledJobQueue/include/ScheduledJobQueueInstrument.hh b/include/trick/ScheduledJobQueueInstrument.hh similarity index 93% rename from trick_source/sim_services/ScheduledJobQueue/include/ScheduledJobQueueInstrument.hh rename to include/trick/ScheduledJobQueueInstrument.hh index 34b31536..f8e5ee06 100644 --- a/trick_source/sim_services/ScheduledJobQueue/include/ScheduledJobQueueInstrument.hh +++ b/include/trick/ScheduledJobQueueInstrument.hh @@ -11,8 +11,8 @@ PROGRAMMERS: #include <string> -#include "sim_services/SimObject/include/InstrumentBase.hh" -#include "sim_services/SimObject/include/JobData.hh" +#include "trick/InstrumentBase.hh" +#include "trick/JobData.hh" namespace Trick { diff --git a/trick_source/sim_services/Scheduler/include/Scheduler.hh b/include/trick/Scheduler.hh similarity index 97% rename from trick_source/sim_services/Scheduler/include/Scheduler.hh rename to include/trick/Scheduler.hh index b4062c7d..bbe392dc 100644 --- a/trick_source/sim_services/Scheduler/include/Scheduler.hh +++ b/include/trick/Scheduler.hh @@ -10,8 +10,8 @@ #include <map> #include <stdio.h> -#include "sim_services/ScheduledJobQueue/include/ScheduledJobQueue.hh" -#include "sim_services/SimObject/include/SimObject.hh" +#include "trick/ScheduledJobQueue.hh" +#include "trick/SimObject.hh" namespace Trick { diff --git a/trick_source/sim_services/Sie/include/Sie.hh b/include/trick/Sie.hh similarity index 91% rename from trick_source/sim_services/Sie/include/Sie.hh rename to include/trick/Sie.hh index e8e32c62..277d1e92 100644 --- a/trick_source/sim_services/Sie/include/Sie.hh +++ b/include/trick/Sie.hh @@ -9,8 +9,8 @@ #include <string> #include <fstream> -#include "sim_services/Sie/include/AttributesMap.hh" -#include "sim_services/Sie/include/EnumAttributesMap.hh" +#include "trick/AttributesMap.hh" +#include "trick/EnumAttributesMap.hh" namespace Trick { diff --git a/trick_source/sim_services/ExternalApplications/include/SimControlPanel.hh b/include/trick/SimControlPanel.hh similarity index 91% rename from trick_source/sim_services/ExternalApplications/include/SimControlPanel.hh rename to include/trick/SimControlPanel.hh index 6a14e8f6..fb8fa6c7 100644 --- a/trick_source/sim_services/ExternalApplications/include/SimControlPanel.hh +++ b/include/trick/SimControlPanel.hh @@ -5,7 +5,7 @@ #ifndef SIMCONTROLPANEL_HH #define SIMCONTROLPANEL_HH -#include "sim_services/ExternalApplications/include/ExternalApplication.hh" +#include "trick/ExternalApplication.hh" namespace Trick { diff --git a/trick_source/sim_services/SimObject/include/SimObject.hh b/include/trick/SimObject.hh similarity index 98% rename from trick_source/sim_services/SimObject/include/SimObject.hh rename to include/trick/SimObject.hh index 98910ce3..cb453170 100644 --- a/trick_source/sim_services/SimObject/include/SimObject.hh +++ b/include/trick/SimObject.hh @@ -12,7 +12,7 @@ PROGRAMMERS: #include <string> #include <vector> -#include "sim_services/SimObject/include/JobData.hh" +#include "trick/JobData.hh" namespace Trick { diff --git a/trick_source/sim_services/SimTime/include/SimTime.hh b/include/trick/SimTime.hh similarity index 96% rename from trick_source/sim_services/SimTime/include/SimTime.hh rename to include/trick/SimTime.hh index 6305b974..aa7fb2dd 100644 --- a/trick_source/sim_services/SimTime/include/SimTime.hh +++ b/include/trick/SimTime.hh @@ -2,7 +2,7 @@ #ifndef SIMTIME_HH #define SIMTIME_HH -#include "time_offset.h" +#include "trick/time_offset.h" namespace Trick { diff --git a/trick_source/sim_services/MasterSlave/include/Slave.hh b/include/trick/Slave.hh similarity index 98% rename from trick_source/sim_services/MasterSlave/include/Slave.hh rename to include/trick/Slave.hh index c9f3b819..7ae7058d 100644 --- a/trick_source/sim_services/MasterSlave/include/Slave.hh +++ b/include/trick/Slave.hh @@ -6,7 +6,7 @@ #ifndef SLAVE_HH #define SLAVE_HH -#include "sim_services/MasterSlave/include/MSConnect.hh" +#include "trick/MSConnect.hh" namespace Trick { diff --git a/trick_source/sim_services/MonteCarlo/include/StlRandomGenerator.hh b/include/trick/StlRandomGenerator.hh similarity index 98% rename from trick_source/sim_services/MonteCarlo/include/StlRandomGenerator.hh rename to include/trick/StlRandomGenerator.hh index fdba33eb..19598b5c 100644 --- a/trick_source/sim_services/MonteCarlo/include/StlRandomGenerator.hh +++ b/include/trick/StlRandomGenerator.hh @@ -33,7 +33,7 @@ // //////////////////////////////////// -#include "trick_utils/math/include/rand_generator.h" +#include "trick/rand_generator.h" #if (defined(_HAVE_TR1_RANDOM) || defined(_HAVE_STL_RANDOM)) #include <random> @@ -173,7 +173,7 @@ protected: #if (defined(_HAVE_TR1_RANDOM) || defined(_HAVE_STL_RANDOM)) // include StlRandomGenerator subclass -#include "sim_services/MonteCarlo/include/StlRandomGeneratorSub.hh" +#include "trick/StlRandomGeneratorSub.hh" #else diff --git a/trick_source/sim_services/MonteCarlo/include/StlRandomGeneratorSub.hh b/include/trick/StlRandomGeneratorSub.hh similarity index 100% rename from trick_source/sim_services/MonteCarlo/include/StlRandomGeneratorSub.hh rename to include/trick/StlRandomGeneratorSub.hh diff --git a/trick_source/sim_services/ExternalApplications/include/StripChart.hh b/include/trick/StripChart.hh similarity index 95% rename from trick_source/sim_services/ExternalApplications/include/StripChart.hh rename to include/trick/StripChart.hh index 977ee625..fa5b4641 100644 --- a/trick_source/sim_services/ExternalApplications/include/StripChart.hh +++ b/include/trick/StripChart.hh @@ -5,7 +5,7 @@ #ifndef STRIPCHART_HH #define STRIPCHART_HH -#include "sim_services/ExternalApplications/include/ExternalApplication.hh" +#include "trick/ExternalApplication.hh" namespace Trick { diff --git a/trick_source/sim_services/Clock/include/TPROCTEClock.hh b/include/trick/TPROCTEClock.hh similarity index 95% rename from trick_source/sim_services/Clock/include/TPROCTEClock.hh rename to include/trick/TPROCTEClock.hh index 59511f2b..0d5e8209 100644 --- a/trick_source/sim_services/Clock/include/TPROCTEClock.hh +++ b/include/trick/TPROCTEClock.hh @@ -10,7 +10,7 @@ PROGRAMMERS: #define TPROCTECLOCK_HH #include <string> -#include "sim_services/Clock/include/Clock.hh" +#include "trick/Clock.hh" #ifdef _TPRO_CTE extern "C" { diff --git a/trick_source/sim_services/ThreadBase/include/ThreadBase.hh b/include/trick/ThreadBase.hh similarity index 100% rename from trick_source/sim_services/ThreadBase/include/ThreadBase.hh rename to include/trick/ThreadBase.hh diff --git a/trick_source/sim_services/Executive/include/Threads.hh b/include/trick/Threads.hh similarity index 97% rename from trick_source/sim_services/Executive/include/Threads.hh rename to include/trick/Threads.hh index 9c7f7690..a1d2d19f 100644 --- a/trick_source/sim_services/Executive/include/Threads.hh +++ b/include/trick/Threads.hh @@ -15,9 +15,9 @@ #include <semaphore.h> #include <iostream> -#include "sim_services/ThreadBase/include/ThreadBase.hh" -#include "sim_services/SimObject/include/SimObject.hh" -#include "sim_services/ScheduledJobQueue/include/ScheduledJobQueue.hh" +#include "trick/ThreadBase.hh" +#include "trick/SimObject.hh" +#include "trick/ScheduledJobQueue.hh" namespace Trick { diff --git a/trick_source/sim_services/Timer/include/Timer.hh b/include/trick/Timer.hh similarity index 100% rename from trick_source/sim_services/Timer/include/Timer.hh rename to include/trick/Timer.hh diff --git a/trick_source/sim_services/include/TrickConstant.hh b/include/trick/TrickConstant.hh similarity index 100% rename from trick_source/sim_services/include/TrickConstant.hh rename to include/trick/TrickConstant.hh diff --git a/trick_source/sim_services/ExternalApplications/include/TrickView.hh b/include/trick/TrickView.hh similarity index 97% rename from trick_source/sim_services/ExternalApplications/include/TrickView.hh rename to include/trick/TrickView.hh index b07bcf0a..e6b10728 100644 --- a/trick_source/sim_services/ExternalApplications/include/TrickView.hh +++ b/include/trick/TrickView.hh @@ -6,7 +6,7 @@ #define TRICKVIEW_HH #include <string> -#include "sim_services/ExternalApplications/include/ExternalApplication.hh" +#include "trick/ExternalApplication.hh" namespace Trick { diff --git a/trick_source/trick_utils/units/include/UCFn.hh b/include/trick/UCFn.hh similarity index 100% rename from trick_source/trick_utils/units/include/UCFn.hh rename to include/trick/UCFn.hh diff --git a/trick_source/trick_utils/units/include/Unit.hh b/include/trick/Unit.hh similarity index 97% rename from trick_source/trick_utils/units/include/Unit.hh rename to include/trick/Unit.hh index 19b07f4d..b9bd48e7 100644 --- a/trick_source/trick_utils/units/include/Unit.hh +++ b/include/trick/Unit.hh @@ -8,8 +8,8 @@ PROGRAMMERS: #ifndef UNIT_HH #define UNIT_HH -#include "units_conv.h" -#include "UCFn.hh" +#include "trick/units_conv.h" +#include "trick/UCFn.hh" /** * Unit (of measurement) class. diff --git a/trick_source/sim_services/UnitTest/include/UnitTest.hh b/include/trick/UnitTest.hh similarity index 100% rename from trick_source/sim_services/UnitTest/include/UnitTest.hh rename to include/trick/UnitTest.hh diff --git a/trick_source/sim_services/Units/include/UnitsMap.hh b/include/trick/UnitsMap.hh similarity index 100% rename from trick_source/sim_services/Units/include/UnitsMap.hh rename to include/trick/UnitsMap.hh diff --git a/trick_source/sim_services/VariableServer/include/VariableServer.hh b/include/trick/VariableServer.hh similarity index 96% rename from trick_source/sim_services/VariableServer/include/VariableServer.hh rename to include/trick/VariableServer.hh index d01f03ce..deb2599a 100644 --- a/trick_source/sim_services/VariableServer/include/VariableServer.hh +++ b/include/trick/VariableServer.hh @@ -11,13 +11,13 @@ #include <vector> #include <string> #include <pthread.h> -#include "trick_utils/comm/include/tc.h" -#include "sim_services/MemoryManager/include/reference.h" -#include "sim_services/SimObject/include/JobData.hh" -#include "sim_services/VariableServer/include/variable_server_sync_types.h" -#include "sim_services/VariableServer/include/VariableServerThread.hh" -#include "sim_services/VariableServer/include/VariableServerListenThread.hh" -#include "sim_services/ThreadBase/include/ThreadBase.hh" +#include "trick/tc.h" +#include "trick/reference.h" +#include "trick/JobData.hh" +#include "trick/variable_server_sync_types.h" +#include "trick/VariableServerThread.hh" +#include "trick/VariableServerListenThread.hh" +#include "trick/ThreadBase.hh" namespace Trick { diff --git a/trick_source/sim_services/VariableServer/include/VariableServerListenThread.hh b/include/trick/VariableServerListenThread.hh similarity index 95% rename from trick_source/sim_services/VariableServer/include/VariableServerListenThread.hh rename to include/trick/VariableServerListenThread.hh index 60a36b6e..0023bdd0 100644 --- a/trick_source/sim_services/VariableServer/include/VariableServerListenThread.hh +++ b/include/trick/VariableServerListenThread.hh @@ -8,8 +8,8 @@ #include <string> #include <iostream> -#include "trick_utils/comm/include/tc.h" -#include "sim_services/ThreadBase/include/ThreadBase.hh" +#include "trick/tc.h" +#include "trick/ThreadBase.hh" namespace Trick { diff --git a/trick_source/sim_services/VariableServer/include/VariableServerReference.hh b/include/trick/VariableServerReference.hh similarity index 90% rename from trick_source/sim_services/VariableServer/include/VariableServerReference.hh rename to include/trick/VariableServerReference.hh index 6c7f8fd9..30b1cbf9 100644 --- a/trick_source/sim_services/VariableServer/include/VariableServerReference.hh +++ b/include/trick/VariableServerReference.hh @@ -6,8 +6,8 @@ #ifndef VARIABLESERVERREFERENCE_HH #define VARIABLESERVERREFERENCE_HH -#include "sim_services/MemoryManager/include/reference.h" -#include "trick_utils/units/include/UCFn.hh" +#include "trick/reference.h" +#include "trick/UCFn.hh" #define MAX_ARRAY_LENGTH 4096 diff --git a/trick_source/sim_services/VariableServer/include/VariableServerThread.hh b/include/trick/VariableServerThread.hh similarity index 98% rename from trick_source/sim_services/VariableServer/include/VariableServerThread.hh rename to include/trick/VariableServerThread.hh index 2ea2567a..908ff710 100644 --- a/trick_source/sim_services/VariableServer/include/VariableServerThread.hh +++ b/include/trick/VariableServerThread.hh @@ -9,10 +9,10 @@ #include <vector> #include <string> #include <pthread.h> -#include "trick_utils/comm/include/tc.h" -#include "sim_services/ThreadBase/include/ThreadBase.hh" -#include "sim_services/VariableServer/include/VariableServerReference.hh" -#include "sim_services/VariableServer/include/variable_server_sync_types.h" +#include "trick/tc.h" +#include "trick/ThreadBase.hh" +#include "trick/VariableServerReference.hh" +#include "trick/variable_server_sync_types.h" namespace Trick { diff --git a/trick_source/sim_services/Zeroconf/include/Zeroconf.hh b/include/trick/Zeroconf.hh similarity index 100% rename from trick_source/sim_services/Zeroconf/include/Zeroconf.hh rename to include/trick/Zeroconf.hh diff --git a/trick_source/sim_services/MemoryManager/include/attributes.h b/include/trick/attributes.h similarity index 98% rename from trick_source/sim_services/MemoryManager/include/attributes.h rename to include/trick/attributes.h index 589074d0..3d6ead19 100644 --- a/trick_source/sim_services/MemoryManager/include/attributes.h +++ b/include/trick/attributes.h @@ -2,7 +2,7 @@ #define ATTRIBUTES_H #include <stddef.h> -#include "sim_services/MemoryManager/include/parameter_types.h" +#include "trick/parameter_types.h" #define TRICK_VAR_OUTPUT 0x01 #define TRICK_VAR_INPUT 0x02 diff --git a/trick_source/sim_services/MemoryManager/include/bitfield_proto.h b/include/trick/bitfield_proto.h similarity index 97% rename from trick_source/sim_services/MemoryManager/include/bitfield_proto.h rename to include/trick/bitfield_proto.h index ca6c1cda..e76b6c58 100644 --- a/trick_source/sim_services/MemoryManager/include/bitfield_proto.h +++ b/include/trick/bitfield_proto.h @@ -1,7 +1,7 @@ #ifndef BITFIELD_PROTO_H #define BITFIELD_PROTO_H -#include "sim_services/MemoryManager/include/attributes.h" +#include "trick/attributes.h" #ifdef __cplusplus extern "C" diff --git a/trick_source/trick_utils/trick_adt/include/bst.h b/include/trick/bst.h similarity index 100% rename from trick_source/trick_utils/trick_adt/include/bst.h rename to include/trick/bst.h diff --git a/trick_source/sim_services/CheckPointRestart/include/checkpoint_map.hh b/include/trick/checkpoint_map.hh similarity index 99% rename from trick_source/sim_services/CheckPointRestart/include/checkpoint_map.hh rename to include/trick/checkpoint_map.hh index 8467cbe6..2d2691a2 100644 --- a/trick_source/sim_services/CheckPointRestart/include/checkpoint_map.hh +++ b/include/trick/checkpoint_map.hh @@ -16,8 +16,8 @@ #include <cxxabi.h> #endif -#include "sim_services/MemoryManager/include/memorymanager_c_intf.h" -#include "sim_services/Message/include/message_proto.h" +#include "trick/memorymanager_c_intf.h" +#include "trick/message_proto.h" #ifndef TRICK_ICG diff --git a/trick_source/sim_services/CheckPointRestart/include/checkpoint_pair.hh b/include/trick/checkpoint_pair.hh similarity index 98% rename from trick_source/sim_services/CheckPointRestart/include/checkpoint_pair.hh rename to include/trick/checkpoint_pair.hh index 9ae48414..0f7b6156 100644 --- a/trick_source/sim_services/CheckPointRestart/include/checkpoint_pair.hh +++ b/include/trick/checkpoint_pair.hh @@ -14,8 +14,8 @@ #include <cxxabi.h> #endif -#include "sim_services/MemoryManager/include/memorymanager_c_intf.h" -#include "sim_services/Message/include/message_proto.h" +#include "trick/memorymanager_c_intf.h" +#include "trick/message_proto.h" #ifndef TRICK_ICG template <class FIRST_TYPE, class SECOND_TYPE> diff --git a/trick_source/sim_services/CheckPointRestart/include/checkpoint_queue.hh b/include/trick/checkpoint_queue.hh similarity index 97% rename from trick_source/sim_services/CheckPointRestart/include/checkpoint_queue.hh rename to include/trick/checkpoint_queue.hh index 85727732..e892bdc5 100644 --- a/trick_source/sim_services/CheckPointRestart/include/checkpoint_queue.hh +++ b/include/trick/checkpoint_queue.hh @@ -13,9 +13,9 @@ #include <cxxabi.h> #endif -#include "sim_services/CheckPointRestart/include/checkpoint_sequence_stl.hh" -#include "sim_services/MemoryManager/include/memorymanager_c_intf.h" -#include "sim_services/Message/include/message_proto.h" +#include "trick/checkpoint_sequence_stl.hh" +#include "trick/memorymanager_c_intf.h" +#include "trick/message_proto.h" #ifndef TRICK_ICG template <class ITEM_TYPE> diff --git a/trick_source/sim_services/CheckPointRestart/include/checkpoint_sequence_stl.hh b/include/trick/checkpoint_sequence_stl.hh similarity index 98% rename from trick_source/sim_services/CheckPointRestart/include/checkpoint_sequence_stl.hh rename to include/trick/checkpoint_sequence_stl.hh index 0af7410d..f6baedf0 100644 --- a/trick_source/sim_services/CheckPointRestart/include/checkpoint_sequence_stl.hh +++ b/include/trick/checkpoint_sequence_stl.hh @@ -18,8 +18,8 @@ #include <cxxabi.h> #endif -#include "sim_services/MemoryManager/include/memorymanager_c_intf.h" -#include "sim_services/Message/include/message_proto.h" +#include "trick/memorymanager_c_intf.h" +#include "trick/message_proto.h" #ifndef TRICK_ICG diff --git a/trick_source/sim_services/CheckPointRestart/include/checkpoint_stack.hh b/include/trick/checkpoint_stack.hh similarity index 93% rename from trick_source/sim_services/CheckPointRestart/include/checkpoint_stack.hh rename to include/trick/checkpoint_stack.hh index 28fbc511..5a7c28bb 100644 --- a/trick_source/sim_services/CheckPointRestart/include/checkpoint_stack.hh +++ b/include/trick/checkpoint_stack.hh @@ -13,9 +13,9 @@ #include <cxxabi.h> #endif -#include "sim_services/CheckPointRestart/include/checkpoint_sequence_stl.hh" -#include "sim_services/MemoryManager/include/memorymanager_c_intf.h" -#include "sim_services/Message/include/message_proto.h" +#include "trick/checkpoint_sequence_stl.hh" +#include "trick/memorymanager_c_intf.h" +#include "trick/message_proto.h" #ifndef TRICK_ICG template <class ITEM_TYPE> diff --git a/trick_source/sim_services/CheckPointRestart/include/checkpoint_stl.hh b/include/trick/checkpoint_stl.hh similarity index 53% rename from trick_source/sim_services/CheckPointRestart/include/checkpoint_stl.hh rename to include/trick/checkpoint_stl.hh index 838dfea4..b1fcd6d2 100644 --- a/trick_source/sim_services/CheckPointRestart/include/checkpoint_stl.hh +++ b/include/trick/checkpoint_stl.hh @@ -7,18 +7,18 @@ #define CHECKPOINT_STL_HH // vector, list, deque, set , multiset -#include "checkpoint_sequence_stl.hh" +#include "trick/checkpoint_sequence_stl.hh" // map, multimap -#include "checkpoint_map.hh" +#include "trick/checkpoint_map.hh" // stack -#include "checkpoint_stack.hh" +#include "trick/checkpoint_stack.hh" // queue , priority_queue -#include "checkpoint_queue.hh" +#include "trick/checkpoint_queue.hh" // pair -#include "checkpoint_pair.hh" +#include "trick/checkpoint_pair.hh" #endif diff --git a/trick_source/sim_services/STL/include/checkpoint_trick_map_stl.hh b/include/trick/checkpoint_trick_map_stl.hh similarity index 99% rename from trick_source/sim_services/STL/include/checkpoint_trick_map_stl.hh rename to include/trick/checkpoint_trick_map_stl.hh index 83400753..5cf8003b 100644 --- a/trick_source/sim_services/STL/include/checkpoint_trick_map_stl.hh +++ b/include/trick/checkpoint_trick_map_stl.hh @@ -12,9 +12,9 @@ #include <cxxabi.h> #endif -#include "sim_services/STL/include/STLInterface.hh" -#include "sim_services/MemoryManager/include/memorymanager_c_intf.h" -#include "sim_services/Message/include/message_proto.h" +#include "trick/STLInterface.hh" +#include "trick/memorymanager_c_intf.h" +#include "trick/message_proto.h" /* For all of the checkpoint_map_stl variations. Declare 2 memory manager arrays to hold the contents of the map. No simulation variable actually points to these arrays. Only the diff --git a/trick_source/sim_services/STL/include/checkpoint_trick_pair_stl.hh b/include/trick/checkpoint_trick_pair_stl.hh similarity index 98% rename from trick_source/sim_services/STL/include/checkpoint_trick_pair_stl.hh rename to include/trick/checkpoint_trick_pair_stl.hh index 4b8ded5a..9cf0ba04 100644 --- a/trick_source/sim_services/STL/include/checkpoint_trick_pair_stl.hh +++ b/include/trick/checkpoint_trick_pair_stl.hh @@ -12,9 +12,9 @@ #include <cxxabi.h> #endif -#include "sim_services/STL/include/STLInterface.hh" -#include "sim_services/MemoryManager/include/memorymanager_c_intf.h" -#include "sim_services/Message/include/message_proto.h" +#include "trick/STLInterface.hh" +#include "trick/memorymanager_c_intf.h" +#include "trick/message_proto.h" template <class STL> int checkpoint_trick_pair_nkey_ndata(STL & in_pair , std::string object_name , unsigned int id ) { diff --git a/trick_source/sim_services/STL/include/checkpoint_trick_sequence_stl.hh b/include/trick/checkpoint_trick_sequence_stl.hh similarity index 96% rename from trick_source/sim_services/STL/include/checkpoint_trick_sequence_stl.hh rename to include/trick/checkpoint_trick_sequence_stl.hh index f0e2012f..5d4a1fde 100644 --- a/trick_source/sim_services/STL/include/checkpoint_trick_sequence_stl.hh +++ b/include/trick/checkpoint_trick_sequence_stl.hh @@ -15,9 +15,9 @@ #include <cxxabi.h> #endif -#include "sim_services/STL/include/STLInterface.hh" -#include "sim_services/MemoryManager/include/memorymanager_c_intf.h" -#include "sim_services/Message/include/message_proto.h" +#include "trick/STLInterface.hh" +#include "trick/memorymanager_c_intf.h" +#include "trick/message_proto.h" /* These template routines perform the checkpoint and restore work for sequence STL types. diff --git a/trick_source/sim_services/Clock/include/clock_proto.h b/include/trick/clock_proto.h similarity index 100% rename from trick_source/sim_services/Clock/include/clock_proto.h rename to include/trick/clock_proto.h diff --git a/trick_source/sim_services/include/collect_macros.h b/include/trick/collect_macros.h similarity index 89% rename from trick_source/sim_services/include/collect_macros.h rename to include/trick/collect_macros.h index e40af89f..f6e80f7f 100644 --- a/trick_source/sim_services/include/collect_macros.h +++ b/include/trick/collect_macros.h @@ -5,7 +5,7 @@ PROGRAMMER: (((Robert W. Bailey) (LinCom) (7/95) (--) (Realtime))) */ -#include "exec_proto.h" +#include "trick/exec_proto.h" #ifndef COLLECT_MACROS_H #define COLLECT_MACROS_H diff --git a/trick_source/sim_services/Collect/include/collect_proto.hh b/include/trick/collect_proto.hh similarity index 100% rename from trick_source/sim_services/Collect/include/collect_proto.hh rename to include/trick/collect_proto.hh diff --git a/trick_source/sim_services/CommandLineArguments/include/command_line_protos.h b/include/trick/command_line_protos.h similarity index 100% rename from trick_source/sim_services/CommandLineArguments/include/command_line_protos.h rename to include/trick/command_line_protos.h diff --git a/include/trick/compat/sim_services/Executive/include/exec_proto.h b/include/trick/compat/sim_services/Executive/include/exec_proto.h new file mode 120000 index 00000000..5045d6b5 --- /dev/null +++ b/include/trick/compat/sim_services/Executive/include/exec_proto.h @@ -0,0 +1 @@ +../../../../exec_proto.h \ No newline at end of file diff --git a/include/trick/compat/sim_services/Executive/include/exec_proto.hh b/include/trick/compat/sim_services/Executive/include/exec_proto.hh new file mode 120000 index 00000000..14a5c783 --- /dev/null +++ b/include/trick/compat/sim_services/Executive/include/exec_proto.hh @@ -0,0 +1 @@ +../../../../exec_proto.hh \ No newline at end of file diff --git a/include/trick/compat/sim_services/Integrator/include/Integrator.hh b/include/trick/compat/sim_services/Integrator/include/Integrator.hh new file mode 100644 index 00000000..9f76a3ba --- /dev/null +++ b/include/trick/compat/sim_services/Integrator/include/Integrator.hh @@ -0,0 +1 @@ +#include "trick/Integrator.hh" diff --git a/include/trick/compat/sim_services/Integrator/include/integrator_c_intf.h b/include/trick/compat/sim_services/Integrator/include/integrator_c_intf.h new file mode 120000 index 00000000..b46256f4 --- /dev/null +++ b/include/trick/compat/sim_services/Integrator/include/integrator_c_intf.h @@ -0,0 +1 @@ +../../../../integrator_c_intf.h \ No newline at end of file diff --git a/include/trick/compat/sim_services/MemoryManager/include/MemoryManager.hh b/include/trick/compat/sim_services/MemoryManager/include/MemoryManager.hh new file mode 120000 index 00000000..321854ee --- /dev/null +++ b/include/trick/compat/sim_services/MemoryManager/include/MemoryManager.hh @@ -0,0 +1 @@ +../../../../MemoryManager.hh \ No newline at end of file diff --git a/include/trick/compat/sim_services/MemoryManager/include/attributes.h b/include/trick/compat/sim_services/MemoryManager/include/attributes.h new file mode 120000 index 00000000..0dc443bd --- /dev/null +++ b/include/trick/compat/sim_services/MemoryManager/include/attributes.h @@ -0,0 +1 @@ +../../../../attributes.h \ No newline at end of file diff --git a/include/trick/compat/sim_services/MemoryManager/include/memorymanager_c_intf.h b/include/trick/compat/sim_services/MemoryManager/include/memorymanager_c_intf.h new file mode 120000 index 00000000..6fe78f36 --- /dev/null +++ b/include/trick/compat/sim_services/MemoryManager/include/memorymanager_c_intf.h @@ -0,0 +1 @@ +../../../../memorymanager_c_intf.h \ No newline at end of file diff --git a/include/trick/compat/sim_services/MemoryManager/include/parameter_types.h b/include/trick/compat/sim_services/MemoryManager/include/parameter_types.h new file mode 120000 index 00000000..60ae4c1c --- /dev/null +++ b/include/trick/compat/sim_services/MemoryManager/include/parameter_types.h @@ -0,0 +1 @@ +../../../../parameter_types.h \ No newline at end of file diff --git a/include/trick/compat/sim_services/MemoryManagerWrapper/MemoryManagerWrapper_c_intf.hh b/include/trick/compat/sim_services/MemoryManagerWrapper/MemoryManagerWrapper_c_intf.hh new file mode 100644 index 00000000..455161cd --- /dev/null +++ b/include/trick/compat/sim_services/MemoryManagerWrapper/MemoryManagerWrapper_c_intf.hh @@ -0,0 +1,2 @@ +#pragma message ( "MemoryManagerWrapper_c_intf.hh has moved to trick/CheckPointRestart_c_intf.hh" ) +#include "trick/CheckPointRestart_c_intf.hh" diff --git a/include/trick/compat/sim_services/MemoryManagerWrapper/checkpoint_map.hh b/include/trick/compat/sim_services/MemoryManagerWrapper/checkpoint_map.hh new file mode 100644 index 00000000..413d9333 --- /dev/null +++ b/include/trick/compat/sim_services/MemoryManagerWrapper/checkpoint_map.hh @@ -0,0 +1,2 @@ +#pragma message ( "checkpoint_map.hh has moved to trick/checkpoint_map.hh" ) +#include "trick/checkpoint_map.hh" diff --git a/include/trick/compat/sim_services/MemoryManagerWrapper/checkpoint_pair.hh b/include/trick/compat/sim_services/MemoryManagerWrapper/checkpoint_pair.hh new file mode 100644 index 00000000..2a798e5d --- /dev/null +++ b/include/trick/compat/sim_services/MemoryManagerWrapper/checkpoint_pair.hh @@ -0,0 +1,3 @@ +#pragma message ( "checkpoint_pair.hh has moved to trick/checkpoint_pair.hh" ) +#include "trick/checkpoint_pair.hh" + diff --git a/include/trick/compat/sim_services/MemoryManagerWrapper/checkpoint_queue.hh b/include/trick/compat/sim_services/MemoryManagerWrapper/checkpoint_queue.hh new file mode 100644 index 00000000..661d30c8 --- /dev/null +++ b/include/trick/compat/sim_services/MemoryManagerWrapper/checkpoint_queue.hh @@ -0,0 +1,2 @@ +#pragma message ( "checkpoint_queue.hh has moved to trick/checkpoint_queue.hh" ) +#include "trick/checkpoint_queue.hh" diff --git a/include/trick/compat/sim_services/MemoryManagerWrapper/checkpoint_sequence_stl.hh b/include/trick/compat/sim_services/MemoryManagerWrapper/checkpoint_sequence_stl.hh new file mode 100644 index 00000000..b96551d1 --- /dev/null +++ b/include/trick/compat/sim_services/MemoryManagerWrapper/checkpoint_sequence_stl.hh @@ -0,0 +1,3 @@ +#pragma message ( "checkpoint_sequence_stl.hh has moved to trick/checkpoint_sequence_stl.hh" ) +#include "trick/checkpoint_sequence_stl.hh" + diff --git a/include/trick/compat/sim_services/MemoryManagerWrapper/checkpoint_stack.hh b/include/trick/compat/sim_services/MemoryManagerWrapper/checkpoint_stack.hh new file mode 100644 index 00000000..a58304ef --- /dev/null +++ b/include/trick/compat/sim_services/MemoryManagerWrapper/checkpoint_stack.hh @@ -0,0 +1,2 @@ +#pragma message ( "checkpoint_stack.hh has moved to trick/checkpoint_stack.hh" ) +#include "trick/checkpoint_stack.hh" diff --git a/include/trick/compat/sim_services/MemoryManagerWrapper/checkpoint_stl.hh b/include/trick/compat/sim_services/MemoryManagerWrapper/checkpoint_stl.hh new file mode 100644 index 00000000..ff2e961e --- /dev/null +++ b/include/trick/compat/sim_services/MemoryManagerWrapper/checkpoint_stl.hh @@ -0,0 +1,3 @@ +#pragma message ( "checkpoint_stl.hh has moved to trick/checkpoint_stl.hh" ) +#include "trick/checkpoint_stl.hh" + diff --git a/include/trick/compat/sim_services/Message/include/message_proto.h b/include/trick/compat/sim_services/Message/include/message_proto.h new file mode 120000 index 00000000..1d15cd2f --- /dev/null +++ b/include/trick/compat/sim_services/Message/include/message_proto.h @@ -0,0 +1 @@ +../../../../message_proto.h \ No newline at end of file diff --git a/include/trick/compat/sim_services/Message/include/message_type.h b/include/trick/compat/sim_services/Message/include/message_type.h new file mode 120000 index 00000000..48eff914 --- /dev/null +++ b/include/trick/compat/sim_services/Message/include/message_type.h @@ -0,0 +1 @@ +../../../../message_type.h \ No newline at end of file diff --git a/include/trick/compat/sim_services/UnitTest/include/trick_tests.h b/include/trick/compat/sim_services/UnitTest/include/trick_tests.h new file mode 120000 index 00000000..2e56a3d8 --- /dev/null +++ b/include/trick/compat/sim_services/UnitTest/include/trick_tests.h @@ -0,0 +1 @@ +../../../../trick_tests.h \ No newline at end of file diff --git a/include/trick/compat/sim_services/include/collect_macros.h b/include/trick/compat/sim_services/include/collect_macros.h new file mode 120000 index 00000000..7022de89 --- /dev/null +++ b/include/trick/compat/sim_services/include/collect_macros.h @@ -0,0 +1 @@ +../../../collect_macros.h \ No newline at end of file diff --git a/include/trick/compat/sim_services/include/constant.h b/include/trick/compat/sim_services/include/constant.h new file mode 120000 index 00000000..d65954cd --- /dev/null +++ b/include/trick/compat/sim_services/include/constant.h @@ -0,0 +1 @@ +../../../constant.h \ No newline at end of file diff --git a/include/trick/compat/sim_services/include/mm_macros.hh b/include/trick/compat/sim_services/include/mm_macros.hh new file mode 120000 index 00000000..8c3e3649 --- /dev/null +++ b/include/trick/compat/sim_services/include/mm_macros.hh @@ -0,0 +1 @@ +../../../mm_macros.hh \ No newline at end of file diff --git a/include/trick/compat/trick_utils/units/include/constant.h b/include/trick/compat/trick_utils/units/include/constant.h new file mode 120000 index 00000000..24cf06c7 --- /dev/null +++ b/include/trick/compat/trick_utils/units/include/constant.h @@ -0,0 +1 @@ +../../../../constant.h \ No newline at end of file diff --git a/trick_source/trick_utils/math/include/complex.h b/include/trick/complex.h similarity index 100% rename from trick_source/trick_utils/math/include/complex.h rename to include/trick/complex.h diff --git a/trick_source/trick_utils/units/include/constant.h b/include/trick/constant.h similarity index 100% rename from trick_source/trick_utils/units/include/constant.h rename to include/trick/constant.h diff --git a/trick_source/sim_services/DataRecord/include/data_record_proto.h b/include/trick/data_record_proto.h similarity index 90% rename from trick_source/sim_services/DataRecord/include/data_record_proto.h rename to include/trick/data_record_proto.h index 9132c48c..e2312820 100644 --- a/trick_source/sim_services/DataRecord/include/data_record_proto.h +++ b/include/trick/data_record_proto.h @@ -3,7 +3,7 @@ #define DATA_RECORD_PROTO_H #ifdef __cplusplus -#include "sim_services/DataRecord/include/DataRecordGroup.hh" +#include "trick/DataRecordGroup.hh" extern "C" { #endif diff --git a/trick_source/sim_services/DebugPause/include/debug_pause_proto.h b/include/trick/debug_pause_proto.h similarity index 100% rename from trick_source/sim_services/DebugPause/include/debug_pause_proto.h rename to include/trick/debug_pause_proto.h diff --git a/trick_source/trick_utils/trick_adt/include/dllist.h b/include/trick/dllist.h similarity index 100% rename from trick_source/trick_utils/trick_adt/include/dllist.h rename to include/trick/dllist.h diff --git a/trick_source/sim_services/DMTCP/include/dmtcp_checkpoint_c_intf.hh b/include/trick/dmtcp_checkpoint_c_intf.hh similarity index 100% rename from trick_source/sim_services/DMTCP/include/dmtcp_checkpoint_c_intf.hh rename to include/trick/dmtcp_checkpoint_c_intf.hh diff --git a/trick_source/sim_services/EchoJobs/include/echojobs_proto.h b/include/trick/echojobs_proto.h similarity index 100% rename from trick_source/sim_services/EchoJobs/include/echojobs_proto.h rename to include/trick/echojobs_proto.h diff --git a/trick_source/sim_services/Environment/include/env_proto.h b/include/trick/env_proto.h similarity index 100% rename from trick_source/sim_services/Environment/include/env_proto.h rename to include/trick/env_proto.h diff --git a/include/trick/er7_algorithms/Makefile b/include/trick/er7_algorithms/Makefile new file mode 100644 index 00000000..7783604f --- /dev/null +++ b/include/trick/er7_algorithms/Makefile @@ -0,0 +1,4 @@ +include ${TRICK_HOME}/share/trick/makefiles/Makefile.common +include ${TRICK_HOME}/share/trick/makefiles/Makefile.tricklib +-include Makefile_deps + diff --git a/trick_source/sim_services/Executive/include/exec_proto.h b/include/trick/exec_proto.h similarity index 98% rename from trick_source/sim_services/Executive/include/exec_proto.h rename to include/trick/exec_proto.h index 3ca73fb5..4bf12b60 100644 --- a/trick_source/sim_services/Executive/include/exec_proto.h +++ b/include/trick/exec_proto.h @@ -2,7 +2,7 @@ #ifndef EXEC_PROTO_H #define EXEC_PROTO_H -#include "sim_services/Executive/include/sim_mode.h" +#include "trick/sim_mode.h" #ifdef __cplusplus extern "C" { diff --git a/trick_source/sim_services/Executive/include/exec_proto.hh b/include/trick/exec_proto.hh similarity index 85% rename from trick_source/sim_services/Executive/include/exec_proto.hh rename to include/trick/exec_proto.hh index 2a32c939..17f3d797 100644 --- a/trick_source/sim_services/Executive/include/exec_proto.hh +++ b/include/trick/exec_proto.hh @@ -2,8 +2,8 @@ #ifndef EXEC_PROTO_HH #define EXEC_PROTO_HH -#include "sim_services/Executive/include/Executive.hh" -#include "sim_services/SimObject/include/SimObject.hh" +#include "trick/Executive.hh" +#include "trick/SimObject.hh" Trick::Executive * exec_get_exec_cpp() ; diff --git a/trick_source/sim_services/ExternalApplications/include/external_application_c_intf.h b/include/trick/external_application_c_intf.h similarity index 100% rename from trick_source/sim_services/ExternalApplications/include/external_application_c_intf.h rename to include/trick/external_application_c_intf.h diff --git a/include/trick/files_to_ICG.hh b/include/trick/files_to_ICG.hh new file mode 100644 index 00000000..64e0312c --- /dev/null +++ b/include/trick/files_to_ICG.hh @@ -0,0 +1,84 @@ +#ifndef FILES_TO_ICG_HH +#define FILES_TO_ICG_HH + +#include "trick/reference_frame.h" +#include "trick/GetTimeOfDayClock.hh" +#include "trick/BC635Clock.hh" +#include "trick/TPROCTEClock.hh" +#include "trick/CommandLineArguments.hh" +#include "trick/DMTCP.hh" +#include "trick/Executive.hh" +#include "trick/Environment.hh" +#include "trick/Event.hh" +#include "trick/EventProcessor.hh" +#include "trick/EventManager.hh" +#include "trick/IPPython.hh" +#include "trick/IPPythonEvent.hh" +#include "trick/MTV.hh" +#include "trick/JITEvent.hh" +#include "trick/JITInputFile.hh" +#include "trick/JSONVariableServer.hh" +#include "trick/JSONVariableServerThread.hh" +#include "trick/Master.hh" +#include "trick/Slave.hh" +#include "trick/MSSocket.hh" +#include "trick/MSSharedMem.hh" +#include "trick/MemoryManager.hh" +#include "trick/MessageCout.hh" +#include "trick/MessageFile.hh" +#include "trick/MessageLCout.hh" +#include "trick/MessagePublisher.hh" +#include "trick/MessageTCDevice.hh" +#include "trick/PlaybackFile.hh" +#include "trick/MonteCarlo.hh" +#include "trick/RealtimeSync.hh" +#include "trick/ITimer.hh" +#include "trick/VariableServer.hh" +#include "trick/regula_falsi.h" +#include "trick/Integrator.hh" +#include "trick/IntegAlgorithms.hh" +#include "trick/IntegLoopScheduler.hh" +#include "trick/IntegLoopManager.hh" +#include "trick/IntegLoopSimObject.hh" + +#include "trick/ABM_Integrator.hh" +#include "trick/Euler_Cromer_Integrator.hh" +#include "trick/Euler_Integrator.hh" +#include "trick/MM4_Integrator.hh" +#include "trick/NL2_Integrator.hh" +#include "trick/RK2_Integrator.hh" +#include "trick/RK4_Integrator.hh" +#include "trick/RKF45_Integrator.hh" +#include "trick/RKF78_Integrator.hh" +#include "trick/RKG4_Integrator.hh" + +/* from the er7_utils directory */ +#ifdef USE_ER7_UTILS_INTEGRATORS +#include "er7_utils/trick/include/files_to_ICG.hh" +#endif + +#include "trick/DataRecordDispatcher.hh" +#include "trick/DRAscii.hh" +#include "trick/DRBinary.hh" +#include "trick/DRHDF5.hh" +#include "trick/DebugPause.hh" +#include "trick/EchoJobs.hh" +#include "trick/FrameLog.hh" +#include "trick/UnitTest.hh" +#include "trick/CheckPointRestart.hh" +#include "trick/Sie.hh" +#include "trick/STLInterface.hh" +#include "trick/SimControlPanel.hh" +#include "trick/TrickView.hh" +#include "trick/MalfunctionsTrickView.hh" +#include "trick/MonteMonitor.hh" +#include "trick/StripChart.hh" +#include "trick/RtiStager.hh" +#include "trick/RtiExec.hh" +#include "trick/UnitsMap.hh" +#include "trick/Zeroconf.hh" +#include "trick/Flag.h" +#include "trick/wave_form.h" +#include "trick/rand_generator.h" + +#endif diff --git a/trick_source/sim_services/FrameLog/include/framelog_proto.h b/include/trick/framelog_proto.h similarity index 100% rename from trick_source/sim_services/FrameLog/include/framelog_proto.h rename to include/trick/framelog_proto.h diff --git a/trick_source/trick_utils/comm/include/hs_msg.h b/include/trick/hs_msg.h similarity index 100% rename from trick_source/trick_utils/comm/include/hs_msg.h rename to include/trick/hs_msg.h diff --git a/trick_source/sim_services/InputProcessor/include/input_processor_proto.h b/include/trick/input_processor_proto.h similarity index 100% rename from trick_source/sim_services/InputProcessor/include/input_processor_proto.h rename to include/trick/input_processor_proto.h diff --git a/trick_source/sim_services/Integrator/include/integrator_c_intf.h b/include/trick/integrator_c_intf.h similarity index 100% rename from trick_source/sim_services/Integrator/include/integrator_c_intf.h rename to include/trick/integrator_c_intf.h diff --git a/trick_source/sim_services/MemoryManager/include/io_alloc.h b/include/trick/io_alloc.h similarity index 93% rename from trick_source/sim_services/MemoryManager/include/io_alloc.h rename to include/trick/io_alloc.h index 91580143..02a89da3 100644 --- a/trick_source/sim_services/MemoryManager/include/io_alloc.h +++ b/include/trick/io_alloc.h @@ -1,7 +1,7 @@ #ifndef IO_ALLOC_H #define IO_ALLOC_H -#include "sim_services/MemoryManager/include/attributes.h" -#include "sim_services/MemoryManager/include/parameter_types.h" +#include "trick/attributes.h" +#include "trick/parameter_types.h" typedef enum { TRICK_LOCAL = 0, diff --git a/trick_source/sim_services/JITInputFile/include/jit_input_file_proto.hh b/include/trick/jit_input_file_proto.hh similarity index 100% rename from trick_source/sim_services/JITInputFile/include/jit_input_file_proto.hh rename to include/trick/jit_input_file_proto.hh diff --git a/trick_source/trick_utils/trick_adt/include/lqueue.h b/include/trick/lqueue.h similarity index 96% rename from trick_source/trick_utils/trick_adt/include/lqueue.h rename to include/trick/lqueue.h index fb961abf..1b8666dd 100644 --- a/trick_source/trick_utils/trick_adt/include/lqueue.h +++ b/include/trick/lqueue.h @@ -4,7 +4,7 @@ #define LQUEUE_H -#include "dllist.h" +#include "trick/dllist.h" #ifdef __cplusplus diff --git a/trick_source/trick_utils/trick_adt/include/lstack.h b/include/trick/lstack.h similarity index 96% rename from trick_source/trick_utils/trick_adt/include/lstack.h rename to include/trick/lstack.h index 9ecc883e..da76e75c 100644 --- a/trick_source/trick_utils/trick_adt/include/lstack.h +++ b/include/trick/lstack.h @@ -4,7 +4,7 @@ #define LSTACK_H -#include "dllist.h" +#include "trick/dllist.h" #ifdef __cplusplus extern "C" { diff --git a/trick_source/sim_services/MasterSlave/include/master_proto.h b/include/trick/master_proto.h similarity index 100% rename from trick_source/sim_services/MasterSlave/include/master_proto.h rename to include/trick/master_proto.h diff --git a/trick_source/trick_utils/math/include/matrix_macros.h b/include/trick/matrix_macros.h similarity index 100% rename from trick_source/trick_utils/math/include/matrix_macros.h rename to include/trick/matrix_macros.h diff --git a/trick_source/sim_services/MemoryManager/include/memorymanager_c_intf.h b/include/trick/memorymanager_c_intf.h similarity index 91% rename from trick_source/sim_services/MemoryManager/include/memorymanager_c_intf.h rename to include/trick/memorymanager_c_intf.h index 1a566c00..2d5ac9c3 100644 --- a/trick_source/sim_services/MemoryManager/include/memorymanager_c_intf.h +++ b/include/trick/memorymanager_c_intf.h @@ -3,11 +3,11 @@ #include <stdio.h> -#include "sim_services/MemoryManager/include/parameter_types.h" -#include "sim_services/MemoryManager/include/attributes.h" -#include "sim_services/MemoryManager/include/reference.h" -#include "sim_services/MemoryManager/include/var.h" -#include "sim_services/MemoryManager/include/io_alloc.h" +#include "trick/parameter_types.h" +#include "trick/attributes.h" +#include "trick/reference.h" +#include "trick/var.h" +#include "trick/io_alloc.h" #ifdef __cplusplus extern "C" { diff --git a/trick_source/sim_services/Message/include/message_proto.h b/include/trick/message_proto.h similarity index 94% rename from trick_source/sim_services/Message/include/message_proto.h rename to include/trick/message_proto.h index 5d7ddfc4..d1458855 100644 --- a/trick_source/sim_services/Message/include/message_proto.h +++ b/include/trick/message_proto.h @@ -3,7 +3,7 @@ #include <stdio.h> #include <stdarg.h> -#include "message_type.h" +#include "trick/message_type.h" #ifdef __cplusplus extern "C" { diff --git a/trick_source/sim_services/Message/include/message_type.h b/include/trick/message_type.h similarity index 100% rename from trick_source/sim_services/Message/include/message_type.h rename to include/trick/message_type.h diff --git a/trick_source/sim_services/MemoryManager/include/mm_error.h b/include/trick/mm_error.h similarity index 100% rename from trick_source/sim_services/MemoryManager/include/mm_error.h rename to include/trick/mm_error.h diff --git a/trick_source/sim_services/include/mm_macros.hh b/include/trick/mm_macros.hh similarity index 93% rename from trick_source/sim_services/include/mm_macros.hh rename to include/trick/mm_macros.hh index f6c258fb..c872b6eb 100644 --- a/trick_source/sim_services/include/mm_macros.hh +++ b/include/trick/mm_macros.hh @@ -4,8 +4,8 @@ #include <stdlib.h> #include <new> -#include "sim_services/MemoryManager/include/memorymanager_c_intf.h" -#include "sim_services/MemoryManager/include/MemoryManager.hh" +#include "trick/memorymanager_c_intf.h" +#include "trick/MemoryManager.hh" #ifdef SWIG #define TRICK_MM_FRIENDS(class_name_with_underscores) diff --git a/trick_source/sim_services/MonteCarlo/include/montecarlo_c_intf.h b/include/trick/montecarlo_c_intf.h similarity index 99% rename from trick_source/sim_services/MonteCarlo/include/montecarlo_c_intf.h rename to include/trick/montecarlo_c_intf.h index 19a383a8..1fc18ab6 100644 --- a/trick_source/sim_services/MonteCarlo/include/montecarlo_c_intf.h +++ b/include/trick/montecarlo_c_intf.h @@ -5,7 +5,7 @@ #ifndef MONTECARLO_C_INTF_H #define MONTECARLO_C_INTF_H -#include "trick_utils/comm/include/tc_proto.h" +#include "trick/tc_proto.h" #ifdef __cplusplus extern "C" { diff --git a/trick_source/sim_services/MasterSlave/include/ms_sim_mode.h b/include/trick/ms_sim_mode.h similarity index 100% rename from trick_source/sim_services/MasterSlave/include/ms_sim_mode.h rename to include/trick/ms_sim_mode.h diff --git a/trick_source/trick_utils/trick_adt/include/outdllist.h b/include/trick/outdllist.h similarity index 100% rename from trick_source/trick_utils/trick_adt/include/outdllist.h rename to include/trick/outdllist.h diff --git a/trick_source/sim_services/MemoryManager/include/parameter_types.h b/include/trick/parameter_types.h similarity index 100% rename from trick_source/sim_services/MemoryManager/include/parameter_types.h rename to include/trick/parameter_types.h diff --git a/trick_source/sim_services/include/populate_attribute_maps.hh b/include/trick/populate_attribute_maps.hh similarity index 100% rename from trick_source/sim_services/include/populate_attribute_maps.hh rename to include/trick/populate_attribute_maps.hh diff --git a/trick_source/trick_utils/math/include/quat_macros.h b/include/trick/quat_macros.h similarity index 98% rename from trick_source/trick_utils/math/include/quat_macros.h rename to include/trick/quat_macros.h index 1ee860c0..72d46a3d 100644 --- a/trick_source/trick_utils/math/include/quat_macros.h +++ b/include/trick/quat_macros.h @@ -25,7 +25,7 @@ as an array of four floating point types (i,e., double quat[4] or float quat[4]) #ifndef _QUAT_MACROS_H_ #define _QUAT_MACROS_H_ -#include "vector_macros.h" +#include "trick/vector_macros.h" /** @page QUATERNIAN_MACROS diff --git a/trick_source/trick_utils/math/include/rand_generator.h b/include/trick/rand_generator.h similarity index 100% rename from trick_source/trick_utils/math/include/rand_generator.h rename to include/trick/rand_generator.h diff --git a/trick_source/sim_services/RealtimeSync/include/realtimesync_proto.h b/include/trick/realtimesync_proto.h similarity index 84% rename from trick_source/sim_services/RealtimeSync/include/realtimesync_proto.h rename to include/trick/realtimesync_proto.h index 040237d9..4ef3fed4 100644 --- a/trick_source/sim_services/RealtimeSync/include/realtimesync_proto.h +++ b/include/trick/realtimesync_proto.h @@ -3,8 +3,8 @@ #define REALTIMESYNC_PROTO_H #ifdef __cplusplus -#include "sim_services/Clock/include/Clock.hh" -#include "sim_services/Timer/include/Timer.hh" +#include "trick/Clock.hh" +#include "trick/Timer.hh" int real_time_change_clock(Trick::Clock * in_clock ) ; int real_time_change_timer(Trick::Timer * in_sleep_timer ) ; #endif diff --git a/trick_source/trick_utils/trick_adt/include/record_array.h b/include/trick/record_array.h similarity index 98% rename from trick_source/trick_utils/trick_adt/include/record_array.h rename to include/trick/record_array.h index 622c7b7d..1cd0ef50 100644 --- a/trick_source/trick_utils/trick_adt/include/record_array.h +++ b/include/trick/record_array.h @@ -2,7 +2,7 @@ #ifndef RECORD_ARRAY_H #define RECORD_ARRAY_H -#include "sizedata.h" +#include "trick/sizedata.h" #ifdef __cplusplus diff --git a/trick_source/sim_services/MemoryManager/include/reference.h b/include/trick/reference.h similarity index 92% rename from trick_source/sim_services/MemoryManager/include/reference.h rename to include/trick/reference.h index 2b7b9219..09c817cc 100644 --- a/trick_source/sim_services/MemoryManager/include/reference.h +++ b/include/trick/reference.h @@ -10,9 +10,9 @@ PROGRAMMERS: #ifndef REFERENCE_H #define REFERENCE_H -#include "sim_services/MemoryManager/include/attributes.h" -#include "sim_services/MemoryManager/include/value.h" -#include "trick_utils/trick_adt/include/dllist.h" +#include "trick/attributes.h" +#include "trick/value.h" +#include "trick/dllist.h" // FIXME These ERROR CODES #define TRICK_NO_ERROR 0 diff --git a/trick_source/trick_utils/math/include/reference_frame.h b/include/trick/reference_frame.h similarity index 100% rename from trick_source/trick_utils/math/include/reference_frame.h rename to include/trick/reference_frame.h diff --git a/trick_source/sim_services/Integrator/include/regula_falsi.h b/include/trick/regula_falsi.h similarity index 100% rename from trick_source/sim_services/Integrator/include/regula_falsi.h rename to include/trick/regula_falsi.h diff --git a/trick_source/sim_services/include/release.h b/include/trick/release.h similarity index 100% rename from trick_source/sim_services/include/release.h rename to include/trick/release.h diff --git a/trick_source/sim_services/include/roundoff.h b/include/trick/roundoff.h similarity index 100% rename from trick_source/sim_services/include/roundoff.h rename to include/trick/roundoff.h diff --git a/trick_source/sim_services/Sie/include/sie_c_intf.h b/include/trick/sie_c_intf.h similarity index 100% rename from trick_source/sim_services/Sie/include/sie_c_intf.h rename to include/trick/sie_c_intf.h diff --git a/trick_source/sim_services/Executive/include/sim_mode.h b/include/trick/sim_mode.h similarity index 100% rename from trick_source/sim_services/Executive/include/sim_mode.h rename to include/trick/sim_mode.h diff --git a/include/trick/simtime.h b/include/trick/simtime.h new file mode 100644 index 00000000..b1a42f47 --- /dev/null +++ b/include/trick/simtime.h @@ -0,0 +1,4 @@ + +#include "trick/time_offset.h" +#include "trick/simtime_proto.h" + diff --git a/trick_source/sim_services/SimTime/include/simtime_proto.h b/include/trick/simtime_proto.h similarity index 90% rename from trick_source/sim_services/SimTime/include/simtime_proto.h rename to include/trick/simtime_proto.h index a059ef17..f615d7be 100644 --- a/trick_source/sim_services/SimTime/include/simtime_proto.h +++ b/include/trick/simtime_proto.h @@ -2,7 +2,7 @@ #ifndef SIMTIME_PROTO_H #define SIMTIME_PROTO_H -#include "time_offset.h" +#include "trick/time_offset.h" #ifdef __cplusplus extern "C" { diff --git a/trick_source/trick_utils/trick_adt/include/sizedata.h b/include/trick/sizedata.h similarity index 100% rename from trick_source/trick_utils/trick_adt/include/sizedata.h rename to include/trick/sizedata.h diff --git a/trick_source/sim_services/CheckPointRestart/include/stl_s_define_macro.hh b/include/trick/stl_s_define_macro.hh similarity index 100% rename from trick_source/sim_services/CheckPointRestart/include/stl_s_define_macro.hh rename to include/trick/stl_s_define_macro.hh diff --git a/trick_source/trick_utils/comm/include/tc.h b/include/trick/tc.h similarity index 100% rename from trick_source/trick_utils/comm/include/tc.h rename to include/trick/tc.h diff --git a/trick_source/trick_utils/comm/include/tc_proto.h b/include/trick/tc_proto.h similarity index 98% rename from trick_source/trick_utils/comm/include/tc_proto.h rename to include/trick/tc_proto.h index 15b76841..d86ff15e 100644 --- a/trick_source/trick_utils/comm/include/tc_proto.h +++ b/include/trick/tc_proto.h @@ -22,7 +22,7 @@ ICG: #ifdef STAND_ALONE #include "attributes.h" #else -#include "sim_services/MemoryManager/include/attributes.h" +#include "trick/attributes.h" #endif #ifdef __cplusplus diff --git a/trick_source/sim_services/SimTime/include/time_offset.h b/include/trick/time_offset.h similarity index 100% rename from trick_source/sim_services/SimTime/include/time_offset.h rename to include/trick/time_offset.h diff --git a/trick_source/sim_services/Integrator/trick_algorithms/ABM_Integrator.hh b/include/trick/trick_algorithms/ABM_Integrator.hh similarity index 94% rename from trick_source/sim_services/Integrator/trick_algorithms/ABM_Integrator.hh rename to include/trick/trick_algorithms/ABM_Integrator.hh index 0df4b08e..978b1066 100644 --- a/trick_source/sim_services/Integrator/trick_algorithms/ABM_Integrator.hh +++ b/include/trick/trick_algorithms/ABM_Integrator.hh @@ -1,6 +1,6 @@ #ifndef ABM_INTEGRATOR_HH #define ABM_INTEGRATOR_HH -#include "../include/Integrator.hh" +#include "trick/Integrator.hh" /** PURPOSE: (Integrator using ABM method.) */ diff --git a/trick_source/sim_services/Integrator/trick_algorithms/Euler_Cromer_Integrator.hh b/include/trick/trick_algorithms/Euler_Cromer_Integrator.hh similarity index 96% rename from trick_source/sim_services/Integrator/trick_algorithms/Euler_Cromer_Integrator.hh rename to include/trick/trick_algorithms/Euler_Cromer_Integrator.hh index d75aeb6f..469cef5a 100644 --- a/trick_source/sim_services/Integrator/trick_algorithms/Euler_Cromer_Integrator.hh +++ b/include/trick/trick_algorithms/Euler_Cromer_Integrator.hh @@ -1,6 +1,6 @@ #ifndef EULER_CROMER_INTEGRATOR_HH #define EULER_CROMER_INTEGRATOR_HH -#include "../include/Integrator.hh" +#include "trick/Integrator.hh" /** PURPOSE: (Integrator using Euler Cromer method.) */ diff --git a/trick_source/sim_services/Integrator/trick_algorithms/Euler_Integrator.hh b/include/trick/trick_algorithms/Euler_Integrator.hh similarity index 94% rename from trick_source/sim_services/Integrator/trick_algorithms/Euler_Integrator.hh rename to include/trick/trick_algorithms/Euler_Integrator.hh index 9890c240..36b8c921 100644 --- a/trick_source/sim_services/Integrator/trick_algorithms/Euler_Integrator.hh +++ b/include/trick/trick_algorithms/Euler_Integrator.hh @@ -1,6 +1,6 @@ #ifndef EULER_INTEGRATOR_HH #define EULER_INTEGRATOR_HH -#include "../include/Integrator.hh" +#include "trick/Integrator.hh" /** PURPOSE: (Integrator using Euler method.) */ diff --git a/trick_source/sim_services/Integrator/trick_algorithms/MM4_Integrator.hh b/include/trick/trick_algorithms/MM4_Integrator.hh similarity index 94% rename from trick_source/sim_services/Integrator/trick_algorithms/MM4_Integrator.hh rename to include/trick/trick_algorithms/MM4_Integrator.hh index f97021ff..d57a2090 100644 --- a/trick_source/sim_services/Integrator/trick_algorithms/MM4_Integrator.hh +++ b/include/trick/trick_algorithms/MM4_Integrator.hh @@ -1,6 +1,6 @@ #ifndef MM4_INTEGRATOR_HH #define MM4_INTEGRATOR_HH -#include "../include/Integrator.hh" +#include "trick/Integrator.hh" /** PURPOSE: (Integrator using Modified Midpoint method.) */ diff --git a/trick_source/sim_services/Integrator/trick_algorithms/NL2_Integrator.hh b/include/trick/trick_algorithms/NL2_Integrator.hh similarity index 94% rename from trick_source/sim_services/Integrator/trick_algorithms/NL2_Integrator.hh rename to include/trick/trick_algorithms/NL2_Integrator.hh index 6e6b2c31..df46bdd8 100644 --- a/trick_source/sim_services/Integrator/trick_algorithms/NL2_Integrator.hh +++ b/include/trick/trick_algorithms/NL2_Integrator.hh @@ -1,6 +1,6 @@ #ifndef NL2_INTEGRATOR_HH #define NL2_INTEGRATOR_HH -#include "../include/Integrator.hh" +#include "trick/Integrator.hh" /** PURPOSE: (Integrator using Nystrom Lear 2 method.) */ diff --git a/trick_source/sim_services/Integrator/trick_algorithms/RK2_Integrator.hh b/include/trick/trick_algorithms/RK2_Integrator.hh similarity index 94% rename from trick_source/sim_services/Integrator/trick_algorithms/RK2_Integrator.hh rename to include/trick/trick_algorithms/RK2_Integrator.hh index 94a32dfd..2eb76af6 100644 --- a/trick_source/sim_services/Integrator/trick_algorithms/RK2_Integrator.hh +++ b/include/trick/trick_algorithms/RK2_Integrator.hh @@ -4,7 +4,7 @@ PURPOSE: */ #ifndef RK2_INTEGRATOR_HH #define RK2_INTEGRATOR_HH -#include "../include/Integrator.hh" +#include "trick/Integrator.hh" namespace Trick { /** Integrator using Runga Kutta 2 method. diff --git a/trick_source/sim_services/Integrator/trick_algorithms/RK4_Integrator.hh b/include/trick/trick_algorithms/RK4_Integrator.hh similarity index 94% rename from trick_source/sim_services/Integrator/trick_algorithms/RK4_Integrator.hh rename to include/trick/trick_algorithms/RK4_Integrator.hh index ab5e4ac9..3d83d19a 100644 --- a/trick_source/sim_services/Integrator/trick_algorithms/RK4_Integrator.hh +++ b/include/trick/trick_algorithms/RK4_Integrator.hh @@ -1,6 +1,6 @@ #ifndef RK4_INTEGRATOR_HH #define RK4_INTEGRATOR_HH -#include "../include/Integrator.hh" +#include "trick/Integrator.hh" /** PURPOSE: (Integrator using Runga Kutta 4 method.) */ diff --git a/trick_source/sim_services/Integrator/trick_algorithms/RKF45_Integrator.hh b/include/trick/trick_algorithms/RKF45_Integrator.hh similarity index 95% rename from trick_source/sim_services/Integrator/trick_algorithms/RKF45_Integrator.hh rename to include/trick/trick_algorithms/RKF45_Integrator.hh index 9b90ce4e..3814aec0 100644 --- a/trick_source/sim_services/Integrator/trick_algorithms/RKF45_Integrator.hh +++ b/include/trick/trick_algorithms/RKF45_Integrator.hh @@ -1,6 +1,6 @@ #ifndef RKF45_INTEGRATOR_HH #define RKF45_INTEGRATOR_HH -#include "../include/Integrator.hh" +#include "trick/Integrator.hh" /** PURPOSE: (Integrator using Runge Kutta Fehlberg 45 method.) */ diff --git a/trick_source/sim_services/Integrator/trick_algorithms/RKF78_Integrator.hh b/include/trick/trick_algorithms/RKF78_Integrator.hh similarity index 94% rename from trick_source/sim_services/Integrator/trick_algorithms/RKF78_Integrator.hh rename to include/trick/trick_algorithms/RKF78_Integrator.hh index 835d8b6b..1ccda096 100644 --- a/trick_source/sim_services/Integrator/trick_algorithms/RKF78_Integrator.hh +++ b/include/trick/trick_algorithms/RKF78_Integrator.hh @@ -1,6 +1,6 @@ #ifndef RKF78_INTEGRATOR_HH #define RKF78_INTEGRATOR_HH -#include "../include/Integrator.hh" +#include "trick/Integrator.hh" /** PURPOSE: (Integrator using Runga Kutta Fehlberg 78 method.) */ diff --git a/trick_source/sim_services/Integrator/trick_algorithms/RKG4_Integrator.hh b/include/trick/trick_algorithms/RKG4_Integrator.hh similarity index 94% rename from trick_source/sim_services/Integrator/trick_algorithms/RKG4_Integrator.hh rename to include/trick/trick_algorithms/RKG4_Integrator.hh index 51c1a0cc..1d2146af 100644 --- a/trick_source/sim_services/Integrator/trick_algorithms/RKG4_Integrator.hh +++ b/include/trick/trick_algorithms/RKG4_Integrator.hh @@ -1,6 +1,6 @@ #ifndef RKG4_INTEGRATOR_HH #define RKG4_INTEGRATOR_HH -#include "../include/Integrator.hh" +#include "trick/Integrator.hh" /** PURPOSE: (Integrator using Runga Kutta Gill 4 method.) */ diff --git a/trick_source/trick_utils/comm/include/trick_byteswap.h b/include/trick/trick_byteswap.h similarity index 100% rename from trick_source/trick_utils/comm/include/trick_byteswap.h rename to include/trick/trick_byteswap.h diff --git a/trick_source/sim_services/STL/include/trick_deque.hh b/include/trick/trick_deque.hh similarity index 98% rename from trick_source/sim_services/STL/include/trick_deque.hh rename to include/trick/trick_deque.hh index 1d2cf68b..b2a90661 100644 --- a/trick_source/sim_services/STL/include/trick_deque.hh +++ b/include/trick/trick_deque.hh @@ -7,7 +7,7 @@ #ifndef SWIG #include <type_traits> #endif -#include "sim_services/STL/include/checkpoint_trick_sequence_stl.hh" +#include "trick/checkpoint_trick_sequence_stl.hh" namespace Trick { diff --git a/trick_source/trick_utils/comm/include/trick_error_hndlr.h b/include/trick/trick_error_hndlr.h similarity index 100% rename from trick_source/trick_utils/comm/include/trick_error_hndlr.h rename to include/trick/trick_error_hndlr.h diff --git a/trick_source/sim_services/STL/include/trick_list.hh b/include/trick/trick_list.hh similarity index 98% rename from trick_source/sim_services/STL/include/trick_list.hh rename to include/trick/trick_list.hh index 82884568..b5e33c4c 100644 --- a/trick_source/sim_services/STL/include/trick_list.hh +++ b/include/trick/trick_list.hh @@ -7,7 +7,7 @@ #ifndef SWIG #include <type_traits> #endif -#include "sim_services/STL/include/checkpoint_trick_sequence_stl.hh" +#include "trick/checkpoint_trick_sequence_stl.hh" namespace Trick { diff --git a/trick_source/sim_services/STL/include/trick_map.hh b/include/trick/trick_map.hh similarity index 99% rename from trick_source/sim_services/STL/include/trick_map.hh rename to include/trick/trick_map.hh index 35ba82f6..2c5c1586 100644 --- a/trick_source/sim_services/STL/include/trick_map.hh +++ b/include/trick/trick_map.hh @@ -7,8 +7,8 @@ #ifndef SWIG #include <type_traits> #endif -#include "sim_services/STL/include/checkpoint_trick_map_stl.hh" -#include "sim_services/STL/include/STLUtilities.hh" +#include "trick/checkpoint_trick_map_stl.hh" +#include "trick/STLUtilities.hh" namespace Trick { diff --git a/trick_source/trick_utils/math/include/trick_math.h b/include/trick/trick_math.h similarity index 100% rename from trick_source/trick_utils/math/include/trick_math.h rename to include/trick/trick_math.h diff --git a/trick_source/trick_utils/math/include/trick_math_error.h b/include/trick/trick_math_error.h similarity index 100% rename from trick_source/trick_utils/math/include/trick_math_error.h rename to include/trick/trick_math_error.h diff --git a/trick_source/trick_utils/math/include/trick_math_proto.h b/include/trick/trick_math_proto.h similarity index 99% rename from trick_source/trick_utils/math/include/trick_math_proto.h rename to include/trick/trick_math_proto.h index 2d351d40..65208b12 100644 --- a/trick_source/trick_utils/math/include/trick_math_proto.h +++ b/include/trick/trick_math_proto.h @@ -6,9 +6,9 @@ * Function prototypes for all functions in ${TRICK_HOME}/sim_services/math */ -#include "wave_form.h" -#include "reference_frame.h" -#include "rand_generator.h" +#include "trick/wave_form.h" +#include "trick/reference_frame.h" +#include "trick/rand_generator.h" #ifdef __cplusplus extern "C" { diff --git a/trick_source/sim_services/STL/include/trick_pair.hh b/include/trick/trick_pair.hh similarity index 99% rename from trick_source/sim_services/STL/include/trick_pair.hh rename to include/trick/trick_pair.hh index e21916d3..49393d82 100644 --- a/trick_source/sim_services/STL/include/trick_pair.hh +++ b/include/trick/trick_pair.hh @@ -7,8 +7,8 @@ #ifndef SWIG #include <type_traits> #endif -#include "sim_services/STL/include/checkpoint_trick_pair_stl.hh" -#include "sim_services/STL/include/STLUtilities.hh" +#include "trick/checkpoint_trick_pair_stl.hh" +#include "trick/STLUtilities.hh" namespace Trick { diff --git a/trick_source/sim_services/STL/include/trick_queue.hh b/include/trick/trick_queue.hh similarity index 99% rename from trick_source/sim_services/STL/include/trick_queue.hh rename to include/trick/trick_queue.hh index d689dcf3..2ec05981 100644 --- a/trick_source/sim_services/STL/include/trick_queue.hh +++ b/include/trick/trick_queue.hh @@ -7,7 +7,7 @@ #ifndef SWIG #include <type_traits> #endif -#include "sim_services/STL/include/checkpoint_trick_sequence_stl.hh" +#include "trick/checkpoint_trick_sequence_stl.hh" /* This algorithm depends on the queue container type is called "c" and is diff --git a/trick_source/sim_services/STL/include/trick_set.hh b/include/trick/trick_set.hh similarity index 99% rename from trick_source/sim_services/STL/include/trick_set.hh rename to include/trick/trick_set.hh index 5c70693a..0e86c07e 100644 --- a/trick_source/sim_services/STL/include/trick_set.hh +++ b/include/trick/trick_set.hh @@ -7,7 +7,7 @@ #ifndef SWIG #include <type_traits> #endif -#include "sim_services/STL/include/checkpoint_trick_sequence_stl.hh" +#include "trick/checkpoint_trick_sequence_stl.hh" namespace Trick { diff --git a/trick_source/sim_services/STL/include/trick_stack.hh b/include/trick/trick_stack.hh similarity index 97% rename from trick_source/sim_services/STL/include/trick_stack.hh rename to include/trick/trick_stack.hh index ef2de7fb..a5c844c2 100644 --- a/trick_source/sim_services/STL/include/trick_stack.hh +++ b/include/trick/trick_stack.hh @@ -7,7 +7,7 @@ #ifndef SWIG #include <type_traits> #endif -#include "sim_services/STL/include/checkpoint_trick_sequence_stl.hh" +#include "trick/checkpoint_trick_sequence_stl.hh" /* This algorithm depends on the stack container type is called "c" and is diff --git a/trick_source/sim_services/UnitTest/include/trick_tests.h b/include/trick/trick_tests.h similarity index 100% rename from trick_source/sim_services/UnitTest/include/trick_tests.h rename to include/trick/trick_tests.h diff --git a/trick_source/sim_services/STL/include/trick_vector.hh b/include/trick/trick_vector.hh similarity index 98% rename from trick_source/sim_services/STL/include/trick_vector.hh rename to include/trick/trick_vector.hh index 2d23e451..9d1d886d 100644 --- a/trick_source/sim_services/STL/include/trick_vector.hh +++ b/include/trick/trick_vector.hh @@ -7,7 +7,7 @@ #ifndef SWIG #include <type_traits> #endif -#include "sim_services/STL/include/checkpoint_trick_sequence_stl.hh" +#include "trick/checkpoint_trick_sequence_stl.hh" namespace Trick { diff --git a/trick_source/trick_utils/shm/include/tsm.h b/include/trick/tsm.h similarity index 100% rename from trick_source/trick_utils/shm/include/tsm.h rename to include/trick/tsm.h diff --git a/trick_source/trick_utils/shm/include/tsm_proto.h b/include/trick/tsm_proto.h similarity index 96% rename from trick_source/trick_utils/shm/include/tsm_proto.h rename to include/trick/tsm_proto.h index 7741d737..135af8e8 100644 --- a/trick_source/trick_utils/shm/include/tsm_proto.h +++ b/include/trick/tsm_proto.h @@ -10,7 +10,7 @@ ICG: #ifndef TSM_PROTO_H #define TSM_PROTO_H -#include "tsm.h" +#include "trick/tsm.h" #ifdef __cplusplus extern "C" { diff --git a/trick_source/trick_utils/units/include/units_conv.h b/include/trick/units_conv.h similarity index 100% rename from trick_source/trick_utils/units/include/units_conv.h rename to include/trick/units_conv.h diff --git a/trick_source/sim_services/include/unix_commands.h b/include/trick/unix_commands.h similarity index 100% rename from trick_source/sim_services/include/unix_commands.h rename to include/trick/unix_commands.h diff --git a/trick_source/sim_services/MemoryManager/include/value.h b/include/trick/value.h similarity index 97% rename from trick_source/sim_services/MemoryManager/include/value.h rename to include/trick/value.h index 3dadfa8e..da654dfa 100644 --- a/trick_source/sim_services/MemoryManager/include/value.h +++ b/include/trick/value.h @@ -17,7 +17,7 @@ PROGRAMMERS: #include <wchar.h> #endif -#include "sim_services/MemoryManager/include/parameter_types.h" +#include "trick/parameter_types.h" #define MAX_VALUE 512 diff --git a/trick_source/sim_services/MemoryManager/include/var.h b/include/trick/var.h similarity index 91% rename from trick_source/sim_services/MemoryManager/include/var.h rename to include/trick/var.h index 93d69df0..1906295b 100644 --- a/trick_source/sim_services/MemoryManager/include/var.h +++ b/include/trick/var.h @@ -1,5 +1,5 @@ -#include "sim_services/MemoryManager/include/value.h" +#include "trick/value.h" #ifndef VAR_H #define VAR_H diff --git a/trick_source/sim_services/VariableServer/include/variable_server.h b/include/trick/variable_server.h similarity index 94% rename from trick_source/sim_services/VariableServer/include/variable_server.h rename to include/trick/variable_server.h index d3a45734..813c2477 100644 --- a/trick_source/sim_services/VariableServer/include/variable_server.h +++ b/include/trick/variable_server.h @@ -10,8 +10,8 @@ PROGRAMMERS: #include <pthread.h> -#include "sim_services/MemoryManager/include/reference.h" -#include "trick_utils/comm/include/tc.h" +#include "trick/reference.h" +#include "trick/tc.h" #ifdef __cplusplus extern "C" { diff --git a/trick_source/sim_services/VariableServer/include/variable_server_message_types.h b/include/trick/variable_server_message_types.h similarity index 100% rename from trick_source/sim_services/VariableServer/include/variable_server_message_types.h rename to include/trick/variable_server_message_types.h diff --git a/trick_source/sim_services/VariableServer/include/variable_server_proto.h b/include/trick/variable_server_proto.h similarity index 100% rename from trick_source/sim_services/VariableServer/include/variable_server_proto.h rename to include/trick/variable_server_proto.h diff --git a/trick_source/sim_services/VariableServer/include/variable_server_sync_types.h b/include/trick/variable_server_sync_types.h similarity index 100% rename from trick_source/sim_services/VariableServer/include/variable_server_sync_types.h rename to include/trick/variable_server_sync_types.h diff --git a/trick_source/trick_utils/math/include/vector_macros.h b/include/trick/vector_macros.h similarity index 100% rename from trick_source/trick_utils/math/include/vector_macros.h rename to include/trick/vector_macros.h diff --git a/trick_source/sim_services/MemoryManager/include/vval.h b/include/trick/vval.h similarity index 93% rename from trick_source/sim_services/MemoryManager/include/vval.h rename to include/trick/vval.h index 82dcc6be..1b82bf14 100644 --- a/trick_source/sim_services/MemoryManager/include/vval.h +++ b/include/trick/vval.h @@ -2,7 +2,7 @@ #ifndef VVAL_H #define VVAL_H -#include "sim_services/MemoryManager/include/var.h" +#include "trick/var.h" #ifdef __cplusplus extern "C" { diff --git a/trick_source/trick_utils/math/include/wave_form.h b/include/trick/wave_form.h similarity index 100% rename from trick_source/trick_utils/math/include/wave_form.h rename to include/trick/wave_form.h diff --git a/trick_source/sim_services/MemoryManager/include/wcs_ext.h b/include/trick/wcs_ext.h similarity index 100% rename from trick_source/sim_services/MemoryManager/include/wcs_ext.h rename to include/trick/wcs_ext.h diff --git a/bin/ICG_10 b/libexec/trick/ICG_10 similarity index 100% rename from bin/ICG_10 rename to libexec/trick/ICG_10 diff --git a/bin/MIS b/libexec/trick/MIS similarity index 100% rename from bin/MIS rename to libexec/trick/MIS diff --git a/bin/condense_list.pl b/libexec/trick/condense_list.pl similarity index 100% rename from bin/condense_list.pl rename to libexec/trick/condense_list.pl diff --git a/bin/C3PO b/libexec/trick/configuration_processor similarity index 100% rename from bin/C3PO rename to libexec/trick/configuration_processor diff --git a/bin/convert_swig b/libexec/trick/convert_swig similarity index 99% rename from bin/convert_swig rename to libexec/trick/convert_swig index 13c75bd3..5ac849a8 100755 --- a/bin/convert_swig +++ b/libexec/trick/convert_swig @@ -360,7 +360,7 @@ sub process_file($$) { my ( $include ) = $1 ; my ( $file_name ) = $2 ; if ( $file_name !~ /\</ ) { - if ( $file_name !~ /\"sim_services/ and $file_name !~ /\"trick_utils/ ) { + if ( $file_name !~ /\"sim_services/ and $file_name !~ /\"trick_utils/ and $file_name !~ /\"trick\//) { my $exclude = 0 ; my $temp_file_name ; diff --git a/bin/convert_tv_file b/libexec/trick/convert_tv_file similarity index 100% rename from bin/convert_tv_file rename to libexec/trick/convert_tv_file diff --git a/bin/dd_convert b/libexec/trick/dd_convert similarity index 100% rename from bin/dd_convert rename to libexec/trick/dd_convert diff --git a/bin/default_data_convert b/libexec/trick/default_data_convert similarity index 100% rename from bin/default_data_convert rename to libexec/trick/default_data_convert diff --git a/bin/depend_cp b/libexec/trick/depend_cp similarity index 100% rename from bin/depend_cp rename to libexec/trick/depend_cp diff --git a/bin/depend_objs b/libexec/trick/depend_objs similarity index 100% rename from bin/depend_objs rename to libexec/trick/depend_objs diff --git a/bin/java/.gitignore b/libexec/trick/java/.gitignore similarity index 100% rename from bin/java/.gitignore rename to libexec/trick/java/.gitignore diff --git a/bin/java/bin/README b/libexec/trick/java/bin/README similarity index 100% rename from bin/java/bin/README rename to libexec/trick/java/bin/README diff --git a/bin/java/bin/sim_control.bat b/libexec/trick/java/bin/sim_control.bat similarity index 100% rename from bin/java/bin/sim_control.bat rename to libexec/trick/java/bin/sim_control.bat diff --git a/bin/java/bin/sniffer.bat b/libexec/trick/java/bin/sniffer.bat similarity index 100% rename from bin/java/bin/sniffer.bat rename to libexec/trick/java/bin/sniffer.bat diff --git a/bin/java/bin/tv.bat b/libexec/trick/java/bin/tv.bat similarity index 100% rename from bin/java/bin/tv.bat rename to libexec/trick/java/bin/tv.bat diff --git a/bin/java/lib/.gitignore b/libexec/trick/java/lib/.gitignore similarity index 100% rename from bin/java/lib/.gitignore rename to libexec/trick/java/lib/.gitignore diff --git a/bin/java/lib/CatalogManager.properties b/libexec/trick/java/lib/CatalogManager.properties similarity index 100% rename from bin/java/lib/CatalogManager.properties rename to libexec/trick/java/lib/CatalogManager.properties diff --git a/bin/java/lib/Makefile b/libexec/trick/java/lib/Makefile similarity index 100% rename from bin/java/lib/Makefile rename to libexec/trick/java/lib/Makefile diff --git a/bin/make_build b/libexec/trick/make_build similarity index 100% rename from bin/make_build rename to libexec/trick/make_build diff --git a/bin/make_changelog b/libexec/trick/make_changelog similarity index 100% rename from bin/make_changelog rename to libexec/trick/make_changelog diff --git a/bin/mis_dep b/libexec/trick/mis_dep similarity index 100% rename from bin/mis_dep rename to libexec/trick/mis_dep diff --git a/bin/pm/ICG.pm b/libexec/trick/pm/ICG.pm similarity index 100% rename from bin/pm/ICG.pm rename to libexec/trick/pm/ICG.pm diff --git a/bin/pm/MIS.pm b/libexec/trick/pm/MIS.pm similarity index 100% rename from bin/pm/MIS.pm rename to libexec/trick/pm/MIS.pm diff --git a/bin/pm/auto_doc.pm b/libexec/trick/pm/auto_doc.pm similarity index 100% rename from bin/pm/auto_doc.pm rename to libexec/trick/pm/auto_doc.pm diff --git a/bin/pm/default_data.pm b/libexec/trick/pm/default_data.pm similarity index 100% rename from bin/pm/default_data.pm rename to libexec/trick/pm/default_data.pm diff --git a/bin/pm/edit.pm b/libexec/trick/pm/edit.pm similarity index 100% rename from bin/pm/edit.pm rename to libexec/trick/pm/edit.pm diff --git a/bin/pm/find_module.pm b/libexec/trick/pm/find_module.pm similarity index 100% rename from bin/pm/find_module.pm rename to libexec/trick/pm/find_module.pm diff --git a/bin/pm/get_headers.pm b/libexec/trick/pm/get_headers.pm similarity index 100% rename from bin/pm/get_headers.pm rename to libexec/trick/pm/get_headers.pm diff --git a/bin/pm/gte.pm b/libexec/trick/pm/gte.pm similarity index 100% rename from bin/pm/gte.pm rename to libexec/trick/pm/gte.pm diff --git a/bin/pm/html.pm b/libexec/trick/pm/html.pm similarity index 100% rename from bin/pm/html.pm rename to libexec/trick/pm/html.pm diff --git a/bin/pm/make_makefile.pm b/libexec/trick/pm/make_makefile.pm similarity index 97% rename from bin/pm/make_makefile.pm rename to libexec/trick/pm/make_makefile.pm index a3deb7a1..3425d0df 100644 --- a/bin/pm/make_makefile.pm +++ b/libexec/trick/pm/make_makefile.pm @@ -115,7 +115,9 @@ sub make_makefile($$$) { # remove duplicate elements undef %temp_hash ; @all_h_files = grep ++$temp_hash{$_} < 2, @all_h_files ; + # remove headers found in trick_source and ${TRICK_HOME}/include/trick @all_h_files = sort (grep !/trick_source/ , @all_h_files) ; + @all_h_files = sort (grep !/$ENV{"TRICK_HOME"}\/include\/trick\// , @all_h_files) ; my @exclude_dirs ; my @icg_exclude_dirs ; @@ -352,12 +354,12 @@ sub make_makefile($$$) { # ############################################################################# -include \${TRICK_HOME}/makefiles/Makefile.common" ; +include \${TRICK_HOME}/share/trick/makefiles/Makefile.common" ; print MAKEFILE " S_MAIN = \$(CURDIR)/S_main_\${TRICK_HOST_CPU}.exe ifeq (\$(MAKECMDGOALS), test_all) -TRICK_HOST_CPU := \$(shell \$(TRICK_HOME)/bin/gte TRICK_HOST_CPU)_test +TRICK_HOST_CPU := \$(shell \$(TRICK_HOME)/bin/trick-gte TRICK_HOST_CPU)_test S_MAIN = \$(CURDIR)/T_main_\${TRICK_HOST_CPU}.exe endif" ; @@ -553,9 +555,9 @@ test_all: TRICK_CFLAGS += -DTRICK_UNIT_TEST print MAKEFILE "test_all: all\n\n" ; print MAKEFILE "ICG:\n" ; - print MAKEFILE "\t\${TRICK_HOME}/bin/ICG \${TRICK_CXXFLAGS} S_source.hh\n" ; + print MAKEFILE "\t\${TRICK_HOME}/bin/trick-ICG \${TRICK_CXXFLAGS} S_source.hh\n" ; print MAKEFILE "force_ICG:\n" ; - print MAKEFILE "\t\${TRICK_HOME}/bin/ICG -f \${TRICK_CXXFLAGS} S_source.hh\n" ; + print MAKEFILE "\t\${TRICK_HOME}/bin/trick-ICG -f \${TRICK_CXXFLAGS} S_source.hh\n" ; print MAKEFILE " S_main : objects \$(LIB_DIR) \$(S_MAIN) \$(OBJECT_DIR)/S_define.deps S_sie.resource @@ -570,18 +572,18 @@ build_user_lib : \$(BUILD_USER_OBJ_DIRS) \$(BUILD_USER_LIBS) if ( $num_src_files + $num_icg_files > 1 ) { print MAKEFILE "\ -\$(S_MAIN): \$(BUILD_USER_LIBS) \${MASTER} \${TRICK_LIBS} \$(LIB_DIR)/lib_${sim_dir_name}.a \$(S_OBJECT_FILES) \$(SIM_LIBS) +\$(S_MAIN): \$(BUILD_USER_LIBS) \${TRICK_STATIC_LIB} \$(LIB_DIR)/lib_${sim_dir_name}.a \$(S_OBJECT_FILES) \$(SIM_LIBS) \t\$(TRICK_LD) \$(TRICK_LDFLAGS) -o \$@ \\ -\t\t\${MASTER} \$(S_OBJECT_FILES)\\ +\t\t\$(S_OBJECT_FILES)\\ \t\t\$(LD_WHOLE_ARCHIVE) \$(LIB_DIR)/lib_${sim_dir_name}.a \$(LD_NO_WHOLE_ARCHIVE)\\ \t\t\${BUILD_USER_LIBS} \${TRICK_USER_LINK_LIBS} \${READ_ONLY_LIBS} \\ \t\t\$(LD_WHOLE_ARCHIVE) \$(SIM_LIBS) \${TRICK_LIBS} \$(LD_NO_WHOLE_ARCHIVE)\\ \t\t\$(HDF5_LIB) \${TRICK_EXEC_LINK_LIBS}" ; } else { print MAKEFILE "\ -\$(S_MAIN): \$(BUILD_USER_LIBS) \${MASTER} \${TRICK_LIBS} \$(S_OBJECT_FILES) \$(SIM_LIBS) +\$(S_MAIN): \$(BUILD_USER_LIBS) \${TRICK_STATIC_LIB} \$(S_OBJECT_FILES) \$(SIM_LIBS) \t\$(TRICK_LD) \$(TRICK_LDFLAGS) -o \$@ \\ -\t\t\${MASTER} \$(OBJECT_DIR)/*.o\\ +\t\t\$(OBJECT_DIR)/*.o\\ \t\t\${BUILD_USER_LIBS} \${TRICK_USER_LINK_LIBS} \${READ_ONLY_LIBS} \\ \t\t\$(LD_WHOLE_ARCHIVE) \$(SIM_LIBS) \${TRICK_LIBS} \$(LD_NO_WHOLE_ARCHIVE)\\ \t\t\$(HDF5_LIB) \${TRICK_EXEC_LINK_LIBS}" ; @@ -597,15 +599,15 @@ build_user_lib : \$(BUILD_USER_OBJ_DIRS) \$(BUILD_USER_LIBS) print MAKEFILE " \$(OBJECT_DIR)/S_source.o: S_source.cpp | \$(OBJECT_DIR) \t\$(TRICK_CPPC) \$(TRICK_CXXFLAGS) -MMD -MP -c S_source.cpp -o \$(OBJECT_DIR)/S_source.o -\t\@\${TRICK_HOME}/bin/depend_objs S_source.cpp +\t\@\${TRICK_HOME}/libexec/trick/depend_objs S_source.cpp \$(OBJECT_DIR)/class_map.o: \$(CURDIR)/io_src/class_map.cpp | \$(OBJECT_DIR) \t\$(TRICK_CPPC) \$(TRICK_CXXFLAGS) -MMD -MP -c \$(CURDIR)/io_src/class_map.cpp -o \$(OBJECT_DIR)/class_map.o -\t\@\${TRICK_HOME}/bin/depend_objs class_map.cpp +\t\@\${TRICK_HOME}/libexec/trick/depend_objs class_map.cpp \$(OBJECT_DIR)/enum_map.o: \$(CURDIR)/io_src/enum_map.cpp | \$(OBJECT_DIR) \t\$(TRICK_CPPC) \$(TRICK_CXXFLAGS) -MMD -MP -c \$(CURDIR)/io_src/enum_map.cpp -o \$(OBJECT_DIR)/enum_map.o -\t\@\${TRICK_HOME}/bin/depend_objs enum_map.cpp +\t\@\${TRICK_HOME}/libexec/trick/depend_objs enum_map.cpp -include \$(OBJECT_DIR)/S_source.dep -include \$(OBJECT_DIR)/class_map.dep @@ -959,7 +961,7 @@ sub write_rules ($$$$) { print MAKEFILE "$k/object_\${TRICK_HOST_CPU}/$n" . "o : $k/$dir_info{src_dir}$n" . "c\n" ; if ( $dir_info{writable} ) { print MAKEFILE "\tcd $k/$dir_info{src_dir} ; \$(TRICK_CC) \$(TRICK_CFLAGS) -MMD -MP -c \${\@F:.o=.c} -o \$\@\n" ; - print MAKEFILE "\t\@cd $k/$dir_info{src_dir} ; \${TRICK_HOME}/bin/depend_objs ${n}c\n" ; + print MAKEFILE "\t\@cd $k/$dir_info{src_dir} ; \${TRICK_HOME}/libexec/trick/depend_objs ${n}c\n" ; print MAKEFILE "-include $k/object_\${TRICK_HOST_CPU}/${n}dep\n" ; } @@ -975,7 +977,7 @@ sub write_rules ($$$$) { if ( $dir_info{writable} ) { #print MAKEFILE "\t\@echo \"Compiling $k/$dir_info{src_dir}[33m\${\@F:.o=.$ext}[00m\"\n" ; print MAKEFILE "\tcd $k/$dir_info{src_dir} ; \$(TRICK_CPPC) \$(TRICK_CXXFLAGS) -MMD -MP -c \${\@F:.o=.$ext} -o \$\@\n" ; - print MAKEFILE "\t\@cd $k/$dir_info{src_dir} ; \${TRICK_HOME}/bin/depend_objs $n$ext\n" ; + print MAKEFILE "\t\@cd $k/$dir_info{src_dir} ; \${TRICK_HOME}/libexec/trick/depend_objs $n$ext\n" ; print MAKEFILE "\n-include $k/object_\${TRICK_HOST_CPU}/${n}dep\n\n" ; } diff --git a/bin/pm/make_no_swig_makefile.pm b/libexec/trick/pm/make_no_swig_makefile.pm similarity index 100% rename from bin/pm/make_no_swig_makefile.pm rename to libexec/trick/pm/make_no_swig_makefile.pm diff --git a/bin/pm/make_swig_makefile.pm b/libexec/trick/pm/make_swig_makefile.pm similarity index 98% rename from bin/pm/make_swig_makefile.pm rename to libexec/trick/pm/make_swig_makefile.pm index ab674418..d95a75e6 100644 --- a/bin/pm/make_swig_makefile.pm +++ b/libexec/trick/pm/make_swig_makefile.pm @@ -213,6 +213,9 @@ sub make_swig_makefile($$$) { @temp_array2 = sort keys %temp_hash ; #print map { "$_\n" } @temp_array2 ; + # remove headers found in trick_source and ${TRICK_HOME}/include/trick + @temp_array2 = sort (grep !/$ENV{"TRICK_HOME"}\/include\/trick\// , @temp_array2) ; + open MAKEFILE , ">Makefile_swig" or return ; print MAKEFILE "# SWIG rules\n" ; @@ -277,7 +280,7 @@ sub make_swig_makefile($$$) { print MAKEFILE"\n\n" ; print MAKEFILE "convert_swig:\n" ; - print MAKEFILE "\t\${TRICK_HOME}/bin/convert_swig \${TRICK_CONVERT_SWIG_FLAGS} S_source.hh\n" ; + print MAKEFILE "\t\${TRICK_HOME}/libexec/trick/convert_swig \${TRICK_CONVERT_SWIG_FLAGS} S_source.hh\n" ; print MAKEFILE "\n\n" ; my %swig_dirs ; diff --git a/bin/pm/mis_dep.pm b/libexec/trick/pm/mis_dep.pm similarity index 100% rename from bin/pm/mis_dep.pm rename to libexec/trick/pm/mis_dep.pm diff --git a/bin/pm/parse_s_define.pm b/libexec/trick/pm/parse_s_define.pm similarity index 100% rename from bin/pm/parse_s_define.pm rename to libexec/trick/pm/parse_s_define.pm diff --git a/bin/pm/s_source.pm b/libexec/trick/pm/s_source.pm similarity index 97% rename from bin/pm/s_source.pm rename to libexec/trick/pm/s_source.pm index ad7037c0..d44d70bd 100644 --- a/bin/pm/s_source.pm +++ b/libexec/trick/pm/s_source.pm @@ -50,12 +50,12 @@ PURPOSE: #include <iostream> #include <stdlib.h> -#include \"sim_services/MemoryManager/include/attributes.h\" -#include \"sim_services/include/populate_attribute_maps.hh\" +#include \"trick/attributes.h\" +#include \"trick/populate_attribute_maps.hh\" -#include \"sim_services/SimObject/include/SimObject.hh\" -#include \"sim_services/SimObject/include/JobData.hh\" -#include \"sim_services/Units/include/UnitsMap.hh\"\n\n" ; +#include \"trick/SimObject.hh\" +#include \"trick/JobData.hh\" +#include \"trick/UnitsMap.hh\"\n\n" ; # TODO get rid of this statement! This is still here because of the collect print S_SOURCE_H "#define ip_alloc calloc\n" ; diff --git a/bin/pm/trick_print.pm b/libexec/trick/pm/trick_print.pm similarity index 100% rename from bin/pm/trick_print.pm rename to libexec/trick/pm/trick_print.pm diff --git a/bin/pm/trick_units.pm b/libexec/trick/pm/trick_units.pm similarity index 100% rename from bin/pm/trick_units.pm rename to libexec/trick/pm/trick_units.pm diff --git a/bin/pm/trick_version.pm b/libexec/trick/pm/trick_version.pm similarity index 88% rename from bin/pm/trick_version.pm rename to libexec/trick/pm/trick_version.pm index 42bad703..66c52725 100644 --- a/bin/pm/trick_version.pm +++ b/libexec/trick/pm/trick_version.pm @@ -16,8 +16,8 @@ sub get_trick_version() { die "TRICK_HOME is not set\n" ; } - open FILE, "$ENV{\"TRICK_HOME\"}/bin/trick_ver.txt" or - die "trick_version: Couldn't find $ENV{\"TRICK_HOME\"}/bin/trick_ver.txt\n" ; + open FILE, "$ENV{\"TRICK_HOME\"}/share/trick/trick_ver.txt" or + die "trick_version: Couldn't find $ENV{\"TRICK_HOME\"}/share/trick/trick_ver.txt\n" ; @all_lines = <FILE> ; close FILE ; $file_contents = join "" , @all_lines ; diff --git a/bin/run_java_test b/libexec/trick/run_java_test similarity index 100% rename from bin/run_java_test rename to libexec/trick/run_java_test diff --git a/bin/s_main_dmtcp.py b/libexec/trick/s_main_dmtcp.py similarity index 100% rename from bin/s_main_dmtcp.py rename to libexec/trick/s_main_dmtcp.py diff --git a/bin/start_sim b/libexec/trick/start_sim similarity index 100% rename from bin/start_sim rename to libexec/trick/start_sim diff --git a/bin/trick_make_checksums b/libexec/trick/trick_make_checksums similarity index 100% rename from bin/trick_make_checksums rename to libexec/trick/trick_make_checksums diff --git a/bin/trick_verify_checksums b/libexec/trick/trick_verify_checksums similarity index 100% rename from bin/trick_verify_checksums rename to libexec/trick/trick_verify_checksums diff --git a/bin/vc b/libexec/trick/vc similarity index 100% rename from bin/vc rename to libexec/trick/vc diff --git a/docs/.gitignore b/share/doc/trick/.gitignore similarity index 100% rename from docs/.gitignore rename to share/doc/trick/.gitignore diff --git a/docs/Basics_of_Program_Memory_and_Variables.pdf b/share/doc/trick/Basics_of_Program_Memory_and_Variables.pdf similarity index 100% rename from docs/Basics_of_Program_Memory_and_Variables.pdf rename to share/doc/trick/Basics_of_Program_Memory_and_Variables.pdf diff --git a/docs/Basics_of_Program_Memory_and_Variables.ppt b/share/doc/trick/Basics_of_Program_Memory_and_Variables.ppt similarity index 100% rename from docs/Basics_of_Program_Memory_and_Variables.ppt rename to share/doc/trick/Basics_of_Program_Memory_and_Variables.ppt diff --git a/docs/CP.txt b/share/doc/trick/CP.txt similarity index 100% rename from docs/CP.txt rename to share/doc/trick/CP.txt diff --git a/docs/Compiling_and_Linking_Overview.pdf b/share/doc/trick/Compiling_and_Linking_Overview.pdf similarity index 100% rename from docs/Compiling_and_Linking_Overview.pdf rename to share/doc/trick/Compiling_and_Linking_Overview.pdf diff --git a/docs/Compiling_and_Linking_Overview.ppt b/share/doc/trick/Compiling_and_Linking_Overview.ppt similarity index 100% rename from docs/Compiling_and_Linking_Overview.ppt rename to share/doc/trick/Compiling_and_Linking_Overview.ppt diff --git a/docs/Trick_Advanced_Topics.pdf b/share/doc/trick/Trick_Advanced_Topics.pdf similarity index 100% rename from docs/Trick_Advanced_Topics.pdf rename to share/doc/trick/Trick_Advanced_Topics.pdf diff --git a/docs/Trick_Advanced_Topics.pptx b/share/doc/trick/Trick_Advanced_Topics.pptx similarity index 100% rename from docs/Trick_Advanced_Topics.pptx rename to share/doc/trick/Trick_Advanced_Topics.pptx diff --git a/docs/Trick_Software_Design_Document.doc b/share/doc/trick/Trick_Software_Design_Document.doc similarity index 100% rename from docs/Trick_Software_Design_Document.doc rename to share/doc/trick/Trick_Software_Design_Document.doc diff --git a/docs/Trick_Software_Development_Plan.doc b/share/doc/trick/Trick_Software_Development_Plan.doc similarity index 100% rename from docs/Trick_Software_Development_Plan.doc rename to share/doc/trick/Trick_Software_Development_Plan.doc diff --git a/docs/Trick_Software_Quality_Assurance_Plan.doc b/share/doc/trick/Trick_Software_Quality_Assurance_Plan.doc similarity index 100% rename from docs/Trick_Software_Quality_Assurance_Plan.doc rename to share/doc/trick/Trick_Software_Quality_Assurance_Plan.doc diff --git a/docs/Trick_Software_Requirement_Specification.doc b/share/doc/trick/Trick_Software_Requirement_Specification.doc similarity index 100% rename from docs/Trick_Software_Requirement_Specification.doc rename to share/doc/trick/Trick_Software_Requirement_Specification.doc diff --git a/docs/Trick_Tutorial_Review.pdf b/share/doc/trick/Trick_Tutorial_Review.pdf similarity index 100% rename from docs/Trick_Tutorial_Review.pdf rename to share/doc/trick/Trick_Tutorial_Review.pdf diff --git a/docs/Trick_Tutorial_Review.pptx b/share/doc/trick/Trick_Tutorial_Review.pptx similarity index 100% rename from docs/Trick_Tutorial_Review.pptx rename to share/doc/trick/Trick_Tutorial_Review.pptx diff --git a/docs/advanced/Cplusplus.ppt b/share/doc/trick/advanced/Cplusplus.ppt similarity index 100% rename from docs/advanced/Cplusplus.ppt rename to share/doc/trick/advanced/Cplusplus.ppt diff --git a/docs/advanced/Distributed_Sims.ppt b/share/doc/trick/advanced/Distributed_Sims.ppt similarity index 100% rename from docs/advanced/Distributed_Sims.ppt rename to share/doc/trick/advanced/Distributed_Sims.ppt diff --git a/docs/advanced/Events_and_Malfunctions.ppt b/share/doc/trick/advanced/Events_and_Malfunctions.ppt similarity index 100% rename from docs/advanced/Events_and_Malfunctions.ppt rename to share/doc/trick/advanced/Events_and_Malfunctions.ppt diff --git a/docs/advanced/MonteCarlo_Presentation.pdf b/share/doc/trick/advanced/MonteCarlo_Presentation.pdf similarity index 100% rename from docs/advanced/MonteCarlo_Presentation.pdf rename to share/doc/trick/advanced/MonteCarlo_Presentation.pdf diff --git a/docs/advanced/MonteCarlo_Presentation.pptx b/share/doc/trick/advanced/MonteCarlo_Presentation.pptx similarity index 100% rename from docs/advanced/MonteCarlo_Presentation.pptx rename to share/doc/trick/advanced/MonteCarlo_Presentation.pptx diff --git a/docs/advanced/Multithreads.pptx b/share/doc/trick/advanced/Multithreads.pptx similarity index 100% rename from docs/advanced/Multithreads.pptx rename to share/doc/trick/advanced/Multithreads.pptx diff --git a/docs/advanced/Realtime.pptx b/share/doc/trick/advanced/Realtime.pptx similarity index 100% rename from docs/advanced/Realtime.pptx rename to share/doc/trick/advanced/Realtime.pptx diff --git a/docs/advanced/Trick_07_to_10.pptx b/share/doc/trick/advanced/Trick_07_to_10.pptx similarity index 100% rename from docs/advanced/Trick_07_to_10.pptx rename to share/doc/trick/advanced/Trick_07_to_10.pptx diff --git a/docs/advanced/Trick_Checkpointing.pptx b/share/doc/trick/advanced/Trick_Checkpointing.pptx similarity index 100% rename from docs/advanced/Trick_Checkpointing.pptx rename to share/doc/trick/advanced/Trick_Checkpointing.pptx diff --git a/docs/advanced/Trick_Checkpointing_DMTCP.pdf b/share/doc/trick/advanced/Trick_Checkpointing_DMTCP.pdf similarity index 100% rename from docs/advanced/Trick_Checkpointing_DMTCP.pdf rename to share/doc/trick/advanced/Trick_Checkpointing_DMTCP.pdf diff --git a/docs/advanced/Trick_Checkpointing_DMTCP.pptx b/share/doc/trick/advanced/Trick_Checkpointing_DMTCP.pptx similarity index 100% rename from docs/advanced/Trick_Checkpointing_DMTCP.pptx rename to share/doc/trick/advanced/Trick_Checkpointing_DMTCP.pptx diff --git a/docs/advanced/Trick_Memory_Manager_Overview.ppt b/share/doc/trick/advanced/Trick_Memory_Manager_Overview.ppt similarity index 100% rename from docs/advanced/Trick_Memory_Manager_Overview.ppt rename to share/doc/trick/advanced/Trick_Memory_Manager_Overview.ppt diff --git a/docs/advanced/VariableServer.pptx b/share/doc/trick/advanced/VariableServer.pptx similarity index 100% rename from docs/advanced/VariableServer.pptx rename to share/doc/trick/advanced/VariableServer.pptx diff --git a/docs/design.doc b/share/doc/trick/design.doc similarity index 100% rename from docs/design.doc rename to share/doc/trick/design.doc diff --git a/docs/design.pdf b/share/doc/trick/design.pdf similarity index 100% rename from docs/design.pdf rename to share/doc/trick/design.pdf diff --git a/docs/trick_module.xsl b/share/doc/trick/trick_module.xsl similarity index 100% rename from docs/trick_module.xsl rename to share/doc/trick/trick_module.xsl diff --git a/docs/trick_module_tex.xsl b/share/doc/trick/trick_module_tex.xsl similarity index 100% rename from docs/trick_module_tex.xsl rename to share/doc/trick/trick_module_tex.xsl diff --git a/docs/trick_s_define.xsl b/share/doc/trick/trick_s_define.xsl similarity index 100% rename from docs/trick_s_define.xsl rename to share/doc/trick/trick_s_define.xsl diff --git a/docs/trick_struct.xsl b/share/doc/trick/trick_struct.xsl similarity index 100% rename from docs/trick_struct.xsl rename to share/doc/trick/trick_struct.xsl diff --git a/docs/trick_struct_tex.xsl b/share/doc/trick/trick_struct_tex.xsl similarity index 100% rename from docs/trick_struct_tex.xsl rename to share/doc/trick/trick_struct_tex.xsl diff --git a/docs/tutorial.doc b/share/doc/trick/tutorial.doc similarity index 100% rename from docs/tutorial.doc rename to share/doc/trick/tutorial.doc diff --git a/docs/tutorial.pdf b/share/doc/trick/tutorial.pdf similarity index 100% rename from docs/tutorial.pdf rename to share/doc/trick/tutorial.pdf diff --git a/docs/users_guide.html b/share/doc/trick/users_guide.html similarity index 100% rename from docs/users_guide.html rename to share/doc/trick/users_guide.html diff --git a/man/man1/CP.1 b/share/man/man1/CP.1 similarity index 100% rename from man/man1/CP.1 rename to share/man/man1/CP.1 diff --git a/man/man1/Create_Token.1 b/share/man/man1/Create_Token.1 similarity index 100% rename from man/man1/Create_Token.1 rename to share/man/man1/Create_Token.1 diff --git a/man/man1/ICG.1 b/share/man/man1/ICG.1 similarity index 100% rename from man/man1/ICG.1 rename to share/man/man1/ICG.1 diff --git a/man/man1/MIS.1 b/share/man/man1/MIS.1 similarity index 100% rename from man/man1/MIS.1 rename to share/man/man1/MIS.1 diff --git a/man/man1/Replace_Token.1 b/share/man/man1/Replace_Token.1 similarity index 100% rename from man/man1/Replace_Token.1 rename to share/man/man1/Replace_Token.1 diff --git a/man/man1/catalog.1 b/share/man/man1/catalog.1 similarity index 100% rename from man/man1/catalog.1 rename to share/man/man1/catalog.1 diff --git a/man/man1/kill_sim.1 b/share/man/man1/kill_sim.1 similarity index 100% rename from man/man1/kill_sim.1 rename to share/man/man1/kill_sim.1 diff --git a/man/man1/make_build.1 b/share/man/man1/make_build.1 similarity index 100% rename from man/man1/make_build.1 rename to share/man/man1/make_build.1 diff --git a/bin/MAKE_out_header.txt b/share/trick/MAKE_out_header.txt similarity index 100% rename from bin/MAKE_out_header.txt rename to share/trick/MAKE_out_header.txt diff --git a/bin/Trick.cshrc b/share/trick/env/Trick.cshrc similarity index 100% rename from bin/Trick.cshrc rename to share/trick/env/Trick.cshrc diff --git a/bin/Trick.profile b/share/trick/env/Trick.profile similarity index 100% rename from bin/Trick.profile rename to share/trick/env/Trick.profile diff --git a/bin/gdb_commands b/share/trick/gdb_commands similarity index 100% rename from bin/gdb_commands rename to share/trick/gdb_commands diff --git a/makefiles/Makefile.common b/share/trick/makefiles/Makefile.common similarity index 74% rename from makefiles/Makefile.common rename to share/trick/makefiles/Makefile.common index a0cd5c81..711145dd 100644 --- a/makefiles/Makefile.common +++ b/share/trick/makefiles/Makefile.common @@ -3,12 +3,12 @@ ifeq ( $(shell test -e ${TRICK_HOME}/trick_source/er7_utils),0) $(info ER7 Utils Exists#########) endif -export TRICK_HOST_TYPE := $(shell export TRICK_HOME=$(TRICK_HOME) && $(TRICK_HOME)/bin/gte TRICK_HOST_TYPE) -export TRICK_VERSION := $(shell export TRICK_HOME=$(TRICK_HOME) && $(TRICK_HOME)/bin/trick_version -v) -export TRICK_MAJOR := $(shell export TRICK_HOME=$(TRICK_HOME) && $(TRICK_HOME)/bin/trick_version -y) -export TRICK_MINOR := $(shell export TRICK_HOME=$(TRICK_HOME) && $(TRICK_HOME)/bin/trick_version -m) +export TRICK_HOST_TYPE := $(shell export TRICK_HOME=$(TRICK_HOME) && $(TRICK_HOME)/bin/trick-gte TRICK_HOST_TYPE) +export TRICK_VERSION := $(shell export TRICK_HOME=$(TRICK_HOME) && $(TRICK_HOME)/bin/trick-version -v) +export TRICK_MAJOR := $(shell export TRICK_HOME=$(TRICK_HOME) && $(TRICK_HOME)/bin/trick-version -y) +export TRICK_MINOR := $(shell export TRICK_HOME=$(TRICK_HOME) && $(TRICK_HOME)/bin/trick-version -m) --include $(TRICK_HOME)/config_${TRICK_HOST_TYPE}.mk +-include $(TRICK_HOME)/share/trick/makefiles/config_${TRICK_HOST_TYPE}.mk ifndef TRICK_CC export TRICK_CC := $(CC) @@ -32,7 +32,7 @@ export TRICK_ICG_EXCLUDE export TRICK_ICG_NOCOMMENT export TRICK_SWIG_EXCLUDE export TRICK_GTE_EXT -export TRICK_HOST_CPU := $(shell export TRICK_CC=$(TRICK_CC) && $(TRICK_HOME)/bin/gte TRICK_HOST_CPU) +export TRICK_HOST_CPU := $(shell export TRICK_CC=$(TRICK_CC) && $(TRICK_HOME)/bin/trick-gte TRICK_HOST_CPU) ifndef CONFIG_MK ifneq ($(MAKECMDGOALS), clean) @@ -41,22 +41,22 @@ endif endif # Check if configure script has modifications -ifeq ($(shell test ${TRICK_HOME}/configure -nt \ -${TRICK_HOME}/config_${TRICK_HOST_TYPE}.mk && echo "NEW_CONFIG"), NEW_CONFIG) - # Ignore check if using installation path of /usr/local/trick (i.e. SLAX CD) - # Timestamps during ISO creation may be misleading due to file copy prodecures - TEMP = $(shell echo "${TRICK_HOME}" | sed -e 's/\/usr\/local\/trick.*/LINUXLIVE/') - ifneq ($(TEMP), LINUXLIVE) - # Force running of the configure script if it is newer than config_*.mk) - $(warning [31mPlease rerun "${TRICK_HOME}/[1m[7mconfigure[0m" to get the newest configuration changes. Then follow by running "[2m[3m[4mmake -C $$TRICK_HOME clean all[0m") - endif -endif +#ifeq ($(shell test ${TRICK_HOME}/configure -nt \ +#${TRICK_HOME}/config_${TRICK_HOST_TYPE}.mk && echo "NEW_CONFIG"), NEW_CONFIG) +# # Ignore check if using installation path of /usr/local/trick (i.e. SLAX CD) +# # Timestamps during ISO creation may be misleading due to file copy prodecures +# TEMP = $(shell echo "${TRICK_HOME}" | sed -e 's/\/usr\/local\/trick.*/LINUXLIVE/') +# ifneq ($(TEMP), LINUXLIVE) +# # Force running of the configure script if it is newer than config_*.mk) +# $(warning [31mPlease rerun "${TRICK_HOME}/[1m[7mconfigure[0m" to get the newest configuration changes. Then follow by running "[2m[3m[4mmake -C $$TRICK_HOME clean all[0m") +# endif +#endif # Do this section only once ifndef TRICK_MAKE_COMMON export TRICK_MAKE_COMMON := 1 -export TRICK_INCLUDES := -I${TRICK_HOME}/trick_source -I../include +export TRICK_INCLUDES := -I${TRICK_HOME}/trick_source -I../include -I${TRICK_HOME}/include -I${TRICK_HOME}/include/trick/compat export TRICK_VERSIONS := -DTRICK_VER=$(TRICK_MAJOR) -DTRICK_MINOR=$(TRICK_MINOR) TRICK_CFLAGS += $(TRICK_INCLUDES) $(TRICK_VERSIONS) -fpic ifdef TRICK_CXXFLAGS @@ -64,7 +64,7 @@ ifdef TRICK_CXXFLAGS else TRICK_CXXFLAGS := ${TRICK_CFLAGS} endif -TRICK_SFLAGS += $(TRICK_INCLUDES) $(TRICK_VERSIONS) +TRICK_SFLAGS += -I${TRICK_HOME}/share/trick $(TRICK_INCLUDES) $(TRICK_VERSIONS) # append additional c and cxx flags defined in config_*.mk files. TRICK_CFLAGS += $(TRICK_ADDITIONAL_CFLAGS) @@ -132,10 +132,8 @@ TRICK_DEFINES = $(shell $(PERL) -e '@defines = "${TRICK_CFLAGS}" =~ /-D\s*(\S+)/ IO_SRC_DIR := io_src/ OBJ_DIR := object_${TRICK_HOST_CPU} -TRICK_LIB_DIR := ${TRICK_HOME}/lib_${TRICK_HOST_CPU} -TRICK_BIN_DIR := ${TRICK_HOME}/bin_${TRICK_HOST_CPU} -MASTER := ${TRICK_LIB_DIR}/master.o -TRICK_LIBS := ${TRICK_LIB_DIR}/libtrick.a ${TRICK_LIB_DIR}/libtrick_pyip.a +TRICK_LIBS := -Wl,-rpath=${TRICK_HOME}/lib:${TRICK_HOME}/lib64 -L${TRICK_LIB_DIR} -ltrick -ltrick_pyip +TRICK_STATIC_LIB := ${TRICK_LIB_DIR}/libtrick.a DEPFILE = $(PWD)/Makefile_deps DEPTEMPFILE = $(PWD)/Makefile_temp_depends diff --git a/makefiles/Makefile.sim b/share/trick/makefiles/Makefile.sim similarity index 74% rename from makefiles/Makefile.sim rename to share/trick/makefiles/Makefile.sim index c1038135..b5a19696 100644 --- a/makefiles/Makefile.sim +++ b/share/trick/makefiles/Makefile.sim @@ -1,5 +1,5 @@ -include ${TRICK_HOME}/makefiles/Makefile.common +include ${TRICK_HOME}/share/trick/makefiles/Makefile.common .NOTPARALLEL: all test @@ -12,32 +12,30 @@ ifeq ($(MAKECMDGOALS), debug) TRICK_CPFLAGS += --debug endif -all : ${TRICK_HOME}/lib_${TRICK_HOST_CPU}/libtrick.a Makefile_sim - @/bin/cp ${TRICK_HOME}/bin/MAKE_out_header.txt MAKE_out +all : ${TRICK_LIB_DIR}/libtrick.a Makefile_sim + @/bin/cp ${TRICK_HOME}/share/trick/MAKE_out_header.txt MAKE_out @$(MAKE) --no-print-directory -f Makefile_sim ICG 2>&1 | tee -a MAKE_out ; exit $${PIPESTATUS[0]} @$(MAKE) --no-print-directory -f Makefile_sim convert_swig 2>&1 | tee -a MAKE_out ; exit $${PIPESTATUS[0]} @$(MAKE) --no-print-directory -f Makefile_sim all 2>&1 | tee -a MAKE_out ; exit $${PIPESTATUS[0]} -test : ${TRICK_HOME}/lib_${TRICK_HOST_CPU}/libtrick.a Makefile_sim - @/bin/cp ${TRICK_HOME}/bin/MAKE_out_header.txt MAKE_out +test : ${TRICK_LIB_DIR}/libtrick.a Makefile_sim + @/bin/cp ${TRICK_HOME}/share/trick/MAKE_out_header.txt MAKE_out @$(MAKE) --no-print-directory -f Makefile_sim ICG 2>&1 | tee -a MAKE_out ; exit $${PIPESTATUS[0]} @$(MAKE) --no-print-directory -f Makefile_sim convert_swig 2>&1 | tee -a MAKE_out ; exit $${PIPESTATUS[0]} @$(MAKE) --no-print-directory -f Makefile_sim test_all 2>&1 | tee -a MAKE_out ; exit $${PIPESTATUS[0]} debug : all -${TRICK_HOME}/lib_${TRICK_HOST_CPU}/libtrick.a: +${TRICK_LIB_DIR}/libtrick.a: @echo "Cannot find $@. Please build Trick for this platfrom" @exit -1 Makefile_sim: S_define @/bin/rm -rf lib_${TRICK_HOST_CPU} object_${TRICK_HOST_CPU} - @${TRICK_HOME}/bin/C3PO $(TRICK_CPFLAGS) - -S_define: + @${TRICK_HOME}/libexec/trick/configuration_processor $(TRICK_CPFLAGS) model_dirs: - @${TRICK_HOME}/bin/C3PO -z + @${TRICK_HOME}/libexec/trick/configuration_processor -z tidy clean real_clean spotless apocalypse sie ICG force_ICG help convert_swig S_define_exp: @if [ -f Makefile_sim ] ; then $(MAKE) --no-print-directory -f Makefile_sim $@ ; else echo "No Makefile_sim found" ; fi diff --git a/makefiles/Makefile.tricklib b/share/trick/makefiles/Makefile.tricklib similarity index 97% rename from makefiles/Makefile.tricklib rename to share/trick/makefiles/Makefile.tricklib index 12d8f829..eb60dbd1 100644 --- a/makefiles/Makefile.tricklib +++ b/share/trick/makefiles/Makefile.tricklib @@ -154,10 +154,10 @@ $(Y_C) : $(SRC_DIR)%.tab.c : $(SRC_DIR)%.y $(Y_C_PREMADE) : $(SRC_DIR)%.tab.c_premade : $(SRC_DIR)%.y $(YACC) -d -o $@ $< -$(L_OBJS) : $(OBJ_DIR)/%.lex.o : $(SRC_DIR)%.lex.c $(SRC_DIR)%.tab.h +$(L_OBJS) : $(OBJ_DIR)/%.lex.o : $(SRC_DIR)%.lex.c $(SRC_DIR)%.tab.h | $(OBJ_DIR) $(CD_CMD) $(TRICK_CPPC) $(TRICK_CXXFLAGS) -c ${<F} -o $(UP_DIR)$@ -$(Y_OBJS) : $(OBJ_DIR)/%.tab.o : $(SRC_DIR)%.tab.c +$(Y_OBJS) : $(OBJ_DIR)/%.tab.o : $(SRC_DIR)%.tab.c | $(OBJ_DIR) $(CD_CMD) $(TRICK_CPPC) $(TRICK_CXXFLAGS) -c ${<F} -o $(UP_DIR)$@ @@ -167,7 +167,7 @@ $(Y_OBJS) : $(OBJ_DIR)/%.tab.o : $(SRC_DIR)%.tab.c depend: @ $(TRICK_CPPC) -MM $(TRICK_CXXFLAGS) $(C_SRC) $(CPP_SRC) >> $(DEPTEMPFILE) - @ $(PERL) ${TRICK_HOME}/bin/depend_cp $(DEPTEMPFILE) > $(DEPFILE) + @ $(PERL) ${TRICK_HOME}/libexec/trick/depend_cp $(DEPTEMPFILE) > $(DEPFILE) @ $(RM) $(DEPTEMPFILE) @ echo "Created dependency file $(DEPFILE)" diff --git a/trick_source/sim_objects/BC635Clock.sm b/share/trick/sim_objects/BC635Clock.sm similarity index 80% rename from trick_source/sim_objects/BC635Clock.sm rename to share/trick/sim_objects/BC635Clock.sm index c4568cab..c4819d5b 100644 --- a/trick_source/sim_objects/BC635Clock.sm +++ b/share/trick/sim_objects/BC635Clock.sm @@ -2,7 +2,7 @@ #ifndef BC635CLOCK_SM #define BC635CLOCK_SM -##include "sim_services/Clock/include/BC635Clock.hh" +##include "trick/BC635Clock.hh" class BC635SimObject : public Trick::SimObject { public: diff --git a/trick_source/sim_objects/EmptyInputProcessor.sm b/share/trick/sim_objects/EmptyInputProcessor.sm similarity index 100% rename from trick_source/sim_objects/EmptyInputProcessor.sm rename to share/trick/sim_objects/EmptyInputProcessor.sm diff --git a/trick_source/sim_objects/STL.sm b/share/trick/sim_objects/STL.sm similarity index 93% rename from trick_source/sim_objects/STL.sm rename to share/trick/sim_objects/STL.sm index 6969a202..b01c1119 100644 --- a/trick_source/sim_objects/STL.sm +++ b/share/trick/sim_objects/STL.sm @@ -11,7 +11,7 @@ #ifndef STL_SM #define STL_SM -##include "sim_services/STL/include/STLManager.hh" +##include "trick/STLManager.hh" class STLManagerSimObject : public Trick::SimObject { public: diff --git a/trick_source/sim_objects/SegmentedExecutive.sm b/share/trick/sim_objects/SegmentedExecutive.sm similarity index 100% rename from trick_source/sim_objects/SegmentedExecutive.sm rename to share/trick/sim_objects/SegmentedExecutive.sm diff --git a/trick_source/sim_objects/TPROClock.sm b/share/trick/sim_objects/TPROClock.sm similarity index 79% rename from trick_source/sim_objects/TPROClock.sm rename to share/trick/sim_objects/TPROClock.sm index 5ca968fd..3e479598 100644 --- a/trick_source/sim_objects/TPROClock.sm +++ b/share/trick/sim_objects/TPROClock.sm @@ -2,7 +2,7 @@ #ifndef TPROCLOCK_SM #define TPROCLOCK_SM -##include "sim_services/Clock/include/TPROCTEClock.hh" +##include "trick/TPROCTEClock.hh" class TPROSimObject : public Trick::SimObject { public: diff --git a/trick_source/sim_objects/default_trick_sys.sm b/share/trick/sim_objects/default_trick_sys.sm similarity index 85% rename from trick_source/sim_objects/default_trick_sys.sm rename to share/trick/sim_objects/default_trick_sys.sm index 8290b8a6..a4f8a55e 100644 --- a/trick_source/sim_objects/default_trick_sys.sm +++ b/share/trick/sim_objects/default_trick_sys.sm @@ -32,72 +32,72 @@ a replacement SimObject will create an uncompilable sim. ##include <sstream> ##include <cstdarg> -##include "sim_services/SimObject/include/SimObject.hh" -##include "sim_services/DMTCP/include/DMTCP.hh" -##include "sim_services/Executive/include/exec_proto.h" -##include "sim_services/Executive/include/exec_proto.hh" -##include "sim_services/Executive/include/Executive.hh" -##include "sim_services/Environment/include/Environment.hh" -##include "sim_services/Environment/include/env_proto.h" -##include "sim_services/CommandLineArguments/include/CommandLineArguments.hh" -##include "sim_services/MasterSlave/include/Master.hh" -##include "sim_services/MasterSlave/include/Slave.hh" -##include "sim_services/MasterSlave/include/MSSocket.hh" -##include "sim_services/MasterSlave/include/MSSharedMem.hh" -##include "sim_services/Message/include/MessagePublisher.hh" -##include "sim_services/Message/include/MessageSubscriber.hh" -##include "sim_services/Message/include/MessageCout.hh" -##include "sim_services/Message/include/MessageLCout.hh" -##include "sim_services/Message/include/MessageFile.hh" -##include "sim_services/Message/include/MessageTCDevice.hh" -##include "sim_services/Message/include/PlaybackFile.hh" -##include "sim_services/MemoryManager/include/MemoryManager.hh" -##include "sim_services/MemoryManager/include/memorymanager_c_intf.h" -##include "sim_services/RealtimeSync/include/RealtimeSync.hh" -##include "sim_services/Clock/include/GetTimeOfDayClock.hh" -##include "sim_services/Clock/include/BC635Clock.hh" -##include "sim_services/Clock/include/clock_proto.h" -##include "sim_services/Timer/include/ITimer.hh" -##include "sim_services/Integrator/include/Integrator.hh" -##include "sim_services/Integrator/include/IntegLoopScheduler.hh" -##include "sim_services/Integrator/include/IntegLoopManager.hh" -##include "sim_services/Integrator/include/IntegLoopSimObject.hh" -##include "sim_services/EventManager/include/EventManager.hh" -##include "sim_services/EventManager/include/EventManager_c_intf.hh" -##include "sim_services/EventManager/include/EventProcessor.hh" -##include "sim_services/JITInputFile/include/JITInputFile.hh" -##include "sim_services/JITInputFile/include/JITEvent.hh" -##include "sim_services/JITInputFile/include/jit_input_file_proto.hh" -##include "sim_services/JSONVariableServer/include/JSONVariableServer.hh" -##include "sim_services/DataRecord/include/data_record_proto.h" -##include "sim_services/DataRecord/include/DataRecordDispatcher.hh" -##include "sim_services/DebugPause/include/DebugPause.hh" -##include "sim_services/EchoJobs/include/EchoJobs.hh" -##include "sim_services/FrameLog/include/FrameLog.hh" -##include "sim_services/UnitTest/include/UnitTest.hh" -##include "sim_services/UnitTest/include/trick_tests.h" -##include "sim_services/VariableServer/include/VariableServer.hh" -##include "sim_services/ExternalApplications/include/SimControlPanel.hh" -##include "sim_services/ExternalApplications/include/TrickView.hh" -##include "sim_services/ExternalApplications/include/MalfunctionsTrickView.hh" -##include "sim_services/ExternalApplications/include/MonteMonitor.hh" -##include "sim_services/ExternalApplications/include/StripChart.hh" -##include "sim_services/ExternalApplications/include/ExternalApplicationManager.hh" -##include "sim_services/CheckPointRestart/include/CheckPointRestart.hh" -##include "sim_services/Collect/include/collect_proto.hh" -##include "sim_services/Sie/include/Sie.hh" -##include "sim_services/Sie/include/AttributesMap.hh" -##include "sim_services/MonteCarlo/include/MonteCarlo.hh" -##include "sim_services/MonteCarlo/include/montecarlo_c_intf.h" -##include "sim_services/Zeroconf/include/Zeroconf.hh" -##include "sim_services/RealtimeInjector/include/RtiStager.hh" -##include "sim_services/RealtimeInjector/include/RtiExec.hh" +##include "trick/SimObject.hh" +##include "trick/DMTCP.hh" +##include "trick/exec_proto.h" +##include "trick/exec_proto.hh" +##include "trick/Executive.hh" +##include "trick/Environment.hh" +##include "trick/env_proto.h" +##include "trick/CommandLineArguments.hh" +##include "trick/Master.hh" +##include "trick/Slave.hh" +##include "trick/MSSocket.hh" +##include "trick/MSSharedMem.hh" +##include "trick/MessagePublisher.hh" +##include "trick/MessageSubscriber.hh" +##include "trick/MessageCout.hh" +##include "trick/MessageLCout.hh" +##include "trick/MessageFile.hh" +##include "trick/MessageTCDevice.hh" +##include "trick/PlaybackFile.hh" +##include "trick/MemoryManager.hh" +##include "trick/memorymanager_c_intf.h" +##include "trick/RealtimeSync.hh" +##include "trick/GetTimeOfDayClock.hh" +##include "trick/BC635Clock.hh" +##include "trick/clock_proto.h" +##include "trick/ITimer.hh" +##include "trick/Integrator.hh" +##include "trick/IntegLoopScheduler.hh" +##include "trick/IntegLoopManager.hh" +##include "trick/IntegLoopSimObject.hh" +##include "trick/EventManager.hh" +##include "trick/EventManager_c_intf.hh" +##include "trick/EventProcessor.hh" +##include "trick/JITInputFile.hh" +##include "trick/JITEvent.hh" +##include "trick/jit_input_file_proto.hh" +##include "trick/JSONVariableServer.hh" +##include "trick/data_record_proto.h" +##include "trick/DataRecordDispatcher.hh" +##include "trick/DebugPause.hh" +##include "trick/EchoJobs.hh" +##include "trick/FrameLog.hh" +##include "trick/UnitTest.hh" +##include "trick/trick_tests.h" +##include "trick/VariableServer.hh" +##include "trick/SimControlPanel.hh" +##include "trick/TrickView.hh" +##include "trick/MalfunctionsTrickView.hh" +##include "trick/MonteMonitor.hh" +##include "trick/StripChart.hh" +##include "trick/ExternalApplicationManager.hh" +##include "trick/CheckPointRestart.hh" +##include "trick/collect_proto.hh" +##include "trick/Sie.hh" +##include "trick/AttributesMap.hh" +##include "trick/MonteCarlo.hh" +##include "trick/montecarlo_c_intf.h" +##include "trick/Zeroconf.hh" +##include "trick/RtiStager.hh" +##include "trick/RtiExec.hh" // TODO: move users away from this STL checkpoint method -##include "sim_services/CheckPointRestart/include/checkpoint_stl.hh" +##include "trick/checkpoint_stl.hh" // TODO: move users away from this STL checkpoint method -#include "sim_services/CheckPointRestart/include/stl_s_define_macro.hh" +#include "trick/stl_s_define_macro.hh" // This is a user header block. Code here is copied without processing to S_source.hh %header{ @@ -326,9 +326,9 @@ JITSimObject trick_jit ; Enclose the input processor headers here so they are not included at all if input processor is not included at all. */ -##include "sim_services/InputProcessor/include/IPPython.hh" -##include "sim_services/InputProcessor/include/IPPythonEvent.hh" -##include "sim_services/InputProcessor/include/MTV.hh" +##include "trick/IPPython.hh" +##include "trick/IPPythonEvent.hh" +##include "trick/MTV.hh" class InputProcessorSimObject : public Trick::SimObject { @@ -673,7 +673,7 @@ InstrumentationSimObject trick_instruments ; #endif #ifndef TRICK_NO_INTEGRATE -// The IntegLoopSimObject is now manually built in sim_services/Integrator/include/IntegLoopSimObject.hh +// The IntegLoopSimObject is now manually built in trick/IntegLoopSimObject.hh // I left this sim object here to see the jobs in their original form #if 0 class IntegLoopSimObject : public Trick::SimObject { diff --git a/bin/trick_ver.txt b/share/trick/trick_ver.txt similarity index 100% rename from bin/trick_ver.txt rename to share/trick/trick_ver.txt diff --git a/bin/valgrind_supressions.txt b/share/trick/valgrind_supressions.txt similarity index 100% rename from bin/valgrind_supressions.txt rename to share/trick/valgrind_supressions.txt diff --git a/trick_source/codegen/Interface_Code_Gen/FieldDescription.cpp b/trick_source/codegen/Interface_Code_Gen/FieldDescription.cpp index f9a598c8..5809dfe0 100644 --- a/trick_source/codegen/Interface_Code_Gen/FieldDescription.cpp +++ b/trick_source/codegen/Interface_Code_Gen/FieldDescription.cpp @@ -12,8 +12,7 @@ #include "Utilities.hh" // Provides units check capability. -// Found in "${TRICK_HOME}/trick_source/trick_utils/units/include" -#include "units_conv.h" +#include "trick/units_conv.h" FieldDescription::FieldDescription( std::string in_container_class , diff --git a/trick_source/codegen/Interface_Code_Gen/HeaderSearchDirs.cpp b/trick_source/codegen/Interface_Code_Gen/HeaderSearchDirs.cpp index f58f6dc7..32cb3284 100644 --- a/trick_source/codegen/Interface_Code_Gen/HeaderSearchDirs.cpp +++ b/trick_source/codegen/Interface_Code_Gen/HeaderSearchDirs.cpp @@ -50,7 +50,7 @@ void HeaderSearchDirs::AddCompilerBuiltInSearchDirs () { #endif #endif - fp = popen("${TRICK_HOME}/bin/gte TRICK_CPPC" , "r") ; + fp = popen("${TRICK_HOME}/bin/trick-gte TRICK_CPPC" , "r") ; fgets(line , sizeof(line) , fp) ; pclose(fp) ; std::string trick_cppc = std::string(line) ; @@ -118,7 +118,7 @@ void HeaderSearchDirs::AddTrickSearchDirs () { char * trick_home = getenv("TRICK_HOME") ; if ( trick_home != NULL ) { - std::string temp_dir = std::string(trick_home) + "/trick_source" ; + std::string temp_dir = std::string(trick_home) + "/include/trick" ; char * resolved_path = almostRealPath(temp_dir.c_str() ) ; #if (__clang_major__ == 3) && (__clang_minor__ >= 3) hso.AddPath(resolved_path , clang::frontend::Quoted, false, true); diff --git a/trick_source/codegen/Interface_Code_Gen/PrintAttributes.cpp b/trick_source/codegen/Interface_Code_Gen/PrintAttributes.cpp index a348011d..4a3ddd4d 100644 --- a/trick_source/codegen/Interface_Code_Gen/PrintAttributes.cpp +++ b/trick_source/codegen/Interface_Code_Gen/PrintAttributes.cpp @@ -189,7 +189,7 @@ std::string PrintAttributes::createIOFileName(std::string header_file_name) { if ( hsd.isPathInUserDir( dir_name ) ) { if ( dir_name.length() >= 8 and ! dir_name.compare(dir_name.size() - 8 , dir_name.size() , "/include" )) { - if ( dir_name.length() < 20 or dir_name.compare(dir_name.size() - 20 , dir_name.size() , "sim_services/include" )) { + if ( dir_name.length() < 13 or dir_name.compare(dir_name.size() - 13 , dir_name.size() , "trick/include" )) { dir_name.replace(dir_name.size() - 8 , dir_name.size() , "") ; } } diff --git a/trick_source/codegen/Interface_Code_Gen/PrintFileContents10.cpp b/trick_source/codegen/Interface_Code_Gen/PrintFileContents10.cpp index e3de33a4..1a5da7e2 100644 --- a/trick_source/codegen/Interface_Code_Gen/PrintFileContents10.cpp +++ b/trick_source/codegen/Interface_Code_Gen/PrintFileContents10.cpp @@ -6,6 +6,7 @@ #include "FieldDescription.hh" #include "ClassValues.hh" #include "EnumValues.hh" +#include "Utilities.hh" PrintFileContents10::PrintFileContents10() {} @@ -14,6 +15,8 @@ void PrintFileContents10::printIOHeader(std::ofstream & outfile , std::string he if ( ! header_file_name.compare("S_source.hh") ) { header_file_name = "../S_source.hh" ; + } else { + header_file_name = almostRealPath(header_file_name.c_str()) ; } outfile << "\n" "/*\n" @@ -38,10 +41,10 @@ void PrintFileContents10::printIOHeader(std::ofstream & outfile , std::string he " keywords are immune to this attack. Yes, it's evil! */\n" "//#define private public\n" "//#define protected public\n\n" -"#include \"sim_services/MemoryManager/include/MemoryManager.hh\"\n" -"#include \"sim_services/MemoryManager/include/attributes.h\"\n" -"#include \"sim_services/MemoryManager/include/parameter_types.h\"\n" -"#include \"sim_services/Units/include/UnitsMap.hh\"\n\n" +"#include \"trick/MemoryManager.hh\"\n" +"#include \"trick/attributes.h\"\n" +"#include \"trick/parameter_types.h\"\n" +"#include \"trick/UnitsMap.hh\"\n\n" "#include \"" << header_file_name << "\"\n\n" ; @@ -448,8 +451,8 @@ void PrintFileContents10::printClassMapHeader( std::ofstream & outfile , std::st " */\n\n" "#include <map>\n" "#include <string>\n\n" -"#include \"sim_services/Sie/include/AttributesMap.hh\"\n" -"#include \"sim_services/MemoryManager/include/attributes.h\"\n\n" +"#include \"trick/AttributesMap.hh\"\n" +"#include \"trick/attributes.h\"\n\n" "void " << function_name << "() {\n\n" " Trick::AttributesMap * class_attribute_map = Trick::AttributesMap::attributes_map();\n\n" ; } @@ -482,8 +485,8 @@ void PrintFileContents10::printEnumMapHeader( std::ofstream & outfile , std::str " */\n\n" "#include <map>\n" "#include <string>\n\n" -"#include \"sim_services/Sie/include/EnumAttributesMap.hh\"\n" -"#include \"sim_services/MemoryManager/include/attributes.h\"\n\n" +"#include \"trick/EnumAttributesMap.hh\"\n" +"#include \"trick/attributes.h\"\n\n" "void " << function_name << "() {\n" " Trick::EnumAttributesMap * enum_attribute_map __attribute__((unused)) = Trick::EnumAttributesMap::attributes_map();\n\n" ; } diff --git a/trick_source/codegen/Interface_Code_Gen/main.cpp b/trick_source/codegen/Interface_Code_Gen/main.cpp index f509ee98..5cfe2925 100644 --- a/trick_source/codegen/Interface_Code_Gen/main.cpp +++ b/trick_source/codegen/Interface_Code_Gen/main.cpp @@ -24,7 +24,7 @@ #include "PrintAttributesFactory.hh" #include "Utilities.hh" -#include "units_conv.h" +#include "trick/units_conv.h" /* Command line arguments. These work better as globals, as suggested in llvm/CommandLine documentation */ llvm::cl::list< std::string > include_dirs("I", llvm::cl::Prefix, llvm::cl::desc("Include directory"), diff --git a/trick_source/codegen/Interface_Code_Gen/makefile b/trick_source/codegen/Interface_Code_Gen/makefile index 1780bb58..115a31cb 100644 --- a/trick_source/codegen/Interface_Code_Gen/makefile +++ b/trick_source/codegen/Interface_Code_Gen/makefile @@ -1,6 +1,6 @@ # The config_${HOST_TYPE}.mk file provides LLVM_HOME -include ${TRICK_HOME}/makefiles/Makefile.common +include ${TRICK_HOME}/share/trick/makefiles/Makefile.common RTTIFLAG := -fno-rtti LLVM_VERSION := $(shell $(LLVM_HOME)/bin/$(LLVM_CONFIG) --version) @@ -21,14 +21,14 @@ ifeq ($(IS_CC_CLANG), 0) CXXFLAGS += -DGCC_MAJOR=$(GCC_MAJOR) -DGCC_MINOR=$(GCC_MINOR) endif -ICG := ICG_$(shell uname -s)_$(shell uname -m) +ICG := ${TRICK_HOME}/bin/trick-ICG SOURCES = $(wildcard *.cpp) OBJECTS = $(addprefix $(OBJ_DIR)/, $(subst .cpp,.o,$(SOURCES))) # Include the units conversion source from trick_utils. UNITS_CONV_SRC = ${TRICK_HOME}/trick_source/trick_utils/units/src/units_conv.c -UNITS_CONV_INCLUDE = -I${TRICK_HOME}/trick_source/trick_utils/units/include +UNITS_CONV_INCLUDE = -I${TRICK_HOME}/include UNITS_CONV_OBJ = $(OBJ_DIR)/units_conv.o ifeq ($(CLANG_MINOR_GTEQ5),1) diff --git a/trick_source/data_products/Apps/ExternalPrograms/makefile b/trick_source/data_products/Apps/ExternalPrograms/makefile index f2eb6485..a56fabd4 100644 --- a/trick_source/data_products/Apps/ExternalPrograms/makefile +++ b/trick_source/data_products/Apps/ExternalPrograms/makefile @@ -1,11 +1,11 @@ CC = gcc ifndef TRICK_HOST_CPU -TRICK_HOST_CPU := $(shell gte TRICK_HOST_CPU) +TRICK_HOST_CPU := $(shell trick-gte TRICK_HOST_CPU) endif ifndef TRICK_HOST_TYPE -TRICK_HOST_TYPE := $(shell gte TRICK_HOST_TYPE) +TRICK_HOST_TYPE := $(shell trick-gte TRICK_HOST_TYPE) endif OBJDIR = object_${TRICK_HOST_CPU} @@ -119,7 +119,7 @@ $(OBJDIR)/dp_vector_magnitude.so: dp_vector_magnitude.c $(TRICK_HOME)/lib_$(TRICK_HOST_CPU)/libtrick_math.a -lc -lm install: objects - @ /bin/cp $(OBJDIR)/*.so ${TRICK_HOME}/lib_${TRICK_HOST_CPU} + #@ /bin/cp $(OBJDIR)/*.so ${TRICK_HOME}/lib_${TRICK_HOST_CPU} real_clean: @ if [ "${TRICK_HOME}" != "" ] ; then \ diff --git a/trick_source/data_products/Apps/Trk2csv/makefile b/trick_source/data_products/Apps/Trk2csv/makefile index 660b6f9b..a58248f7 100644 --- a/trick_source/data_products/Apps/Trk2csv/makefile +++ b/trick_source/data_products/Apps/Trk2csv/makefile @@ -1,13 +1,13 @@ -include ${TRICK_HOME}/makefiles/Makefile.common +include ${TRICK_HOME}/share/trick/makefiles/Makefile.common CC = c++ DP_CFLAGS = -g -I../.. OBJDIR = object_${TRICK_HOST_CPU} LIBDIR = ../../lib_${TRICK_HOST_CPU} -DP_LIBS = -L$(LIBDIR) -llog -lvar -L$(TRICK_HOME)/lib_${TRICK_HOST_CPU} -ltrick_units -JZ_MAIN = $(OBJDIR)/trk2csv -ASCII_MAIN = $(OBJDIR)/trk2ascii +DP_LIBS = -L$(LIBDIR) -llog -lvar -L$(TRICK_LIB_DIR) -ltrick_units +JZ_MAIN = ${TRICK_HOME}/bin/trick-trk2csv +ASCII_MAIN = ${TRICK_HOME}/bin/trick-trk2ascii ifeq ($(TRICK_HOST_TYPE), Linux) DP_CFLAGS += -Wall diff --git a/trick_source/data_products/DPX/APPS/FXPLOT/makefile b/trick_source/data_products/DPX/APPS/FXPLOT/makefile index 1302dfc9..5e182fd1 100644 --- a/trick_source/data_products/DPX/APPS/FXPLOT/makefile +++ b/trick_source/data_products/DPX/APPS/FXPLOT/makefile @@ -1,5 +1,5 @@ -include ${TRICK_HOME}/makefiles/Makefile.common +include ${TRICK_HOME}/share/trick/makefiles/Makefile.common RM = rm -rf CC = cc @@ -9,7 +9,7 @@ DPX_DIR = ../.. CFLAGS = -g -Wall -INCDIRS = -I${DPX_DIR} -I../../.. -I/usr/include/libxml2 -I$(MOTIF_HOME)/include -I$(TRICK_HOME)/trick_source/data_products/fermi-ware +INCDIRS = -I${DPX_DIR} -I../../.. -I${TRICK_HOME}/include -I/usr/include/libxml2 -I$(MOTIF_HOME)/include -I$(TRICK_HOME)/trick_source/data_products/fermi-ware OBJDIR = object_${TRICK_HOST_CPU} LIBDIR = ${DPX_DIR}/lib_${TRICK_HOST_CPU} @@ -30,7 +30,7 @@ else XLIBS += -lXm -lXt -lX11 endif -DP_LIBS = -L../../../lib_${TRICK_HOST_CPU} -llog -lvar -leqparse -L${TRICK_HOME}/lib_${TRICK_HOST_CPU} -ltrick_units +DP_LIBS = -L../../../lib_${TRICK_HOST_CPU} -llog -lvar -leqparse -L${TRICK_LIB_DIR} -ltrick_units DPX_LIBS = -L${DPX_DIR}/lib_${TRICK_HOST_CPU} -lDPC -lDPM FERMI_WARE_LIB = $(TRICK_HOME)/trick_source/data_products/fermi-ware/object_${TRICK_HOST_CPU}/libfermi.a @@ -55,10 +55,10 @@ CXX_OBJECT_FILES = $(OBJDIR)/fermi_view.o \ OBJECT_FILES = $(C_OBJECT_FILES) $(CXX_OBJECT_FILES) -all: $(OBJDIR)/fxplot +all: ${TRICK_HOME}/bin/trick-fxplot -$(OBJDIR)/fxplot: ${LIBDIR}/libDPM.a ${LIBDIR}/libDPC.a $(OBJECT_FILES) - @echo "===== Making fxplot =====" +${TRICK_HOME}/bin/trick-fxplot: ${LIBDIR}/libDPM.a ${LIBDIR}/libDPC.a $(OBJECT_FILES) + @echo "===== Making trick-fxplot =====" ${CPP} ${CFLAGS} ${INCDIRS} -o $@ $(OBJECT_FILES) ${ALL_LIBS} ${XLIBS} ${LIBRTDEF} $(C_OBJECT_FILES) : $(OBJDIR)/%.o : %.c diff --git a/trick_source/data_products/DPX/APPS/GXPLOT/makefile b/trick_source/data_products/DPX/APPS/GXPLOT/makefile index 8686c825..dd6a538b 100644 --- a/trick_source/data_products/DPX/APPS/GXPLOT/makefile +++ b/trick_source/data_products/DPX/APPS/GXPLOT/makefile @@ -1,5 +1,5 @@ -include ${TRICK_HOME}/makefiles/Makefile.common +include ${TRICK_HOME}/share/trick/makefiles/Makefile.common RM = rm -rf CC = cc @@ -7,7 +7,7 @@ CPP = c++ DPX_DIR = ../.. -INCDIRS = -I${DPX_DIR} -I../../.. -I/usr/include/libxml2 $(MOTIF_INCDIR) +INCDIRS = -I${DPX_DIR} -I../../.. -I${TRICK_HOME}/include -I/usr/include/libxml2 $(MOTIF_INCDIR) CFLAGS = -g -Wall @@ -36,7 +36,7 @@ else endif endif -DP_LIBS = -L../../../lib_${TRICK_HOST_CPU} -llog -lvar -leqparse -L${TRICK_HOME}/lib_${TRICK_HOST_CPU} -ltrick_units +DP_LIBS = -L../../../lib_${TRICK_HOST_CPU} -llog -lvar -leqparse -L${TRICK_LIB_DIR} -ltrick_units MODEL_LIBS = -L${DPX_DIR}/lib_${TRICK_HOST_CPU} -lDPM CONTROLLER_LIBS = -L${DPX_DIR}/lib_${TRICK_HOST_CPU} -lDPC @@ -62,9 +62,9 @@ CXX_OBJECT_FILES = $(OBJDIR)/gp_view.o \ OBJECT_FILES = $(C_OBJECT_FILES) $(CXX_OBJECT_FILES) -all: $(OBJDIR)/gxplot +all: ${TRICK_HOME}/bin/trick-gxplot -$(OBJDIR)/gxplot: ${LIBDIR}/libDPM.a ${LIBDIR}/libDPC.a ${LIBDIR}/libDPV.a $(OBJECT_FILES) +${TRICK_HOME}/bin/trick-gxplot: ${LIBDIR}/libDPM.a ${LIBDIR}/libDPC.a ${LIBDIR}/libDPV.a $(OBJECT_FILES) @echo "===== Making gxplot =====" ${CPP} ${CFLAGS} ${INCDIRS} -o $@ $(OBJECT_FILES) $(ALL_LIBS) ${XLIBS} ${LIBRTDEF} ${CONTROLLER_LIBS} -lDPV diff --git a/trick_source/data_products/DPX/DPC/DPC_UnitConvDataStream.hh b/trick_source/data_products/DPX/DPC/DPC_UnitConvDataStream.hh index 26d0884f..b0a209f7 100644 --- a/trick_source/data_products/DPX/DPC/DPC_UnitConvDataStream.hh +++ b/trick_source/data_products/DPX/DPC/DPC_UnitConvDataStream.hh @@ -3,7 +3,7 @@ #define DPC_UNITCONVDATASTREAM_HH #include <string> -#include "../../units/include/Unit.hh" +#include "trick/Unit.hh" #include "../../Log/DataStream.hh" /** diff --git a/trick_source/data_products/DPX/DPC/DPC_column_info.hh b/trick_source/data_products/DPX/DPC/DPC_column_info.hh index 76890d45..0cfb77d9 100644 --- a/trick_source/data_products/DPX/DPC/DPC_column_info.hh +++ b/trick_source/data_products/DPX/DPC/DPC_column_info.hh @@ -3,7 +3,7 @@ #define DPC_COLUMN_INFO_HH #include <string.h> #include <iostream> -#include "../../units/include/Unit.hh" +#include "trick/Unit.hh" class DPC_column_info { public: diff --git a/trick_source/data_products/DPX/DPC/DPC_datastream_supplier.hh b/trick_source/data_products/DPX/DPC/DPC_datastream_supplier.hh index d62fc2d1..e60dd711 100644 --- a/trick_source/data_products/DPX/DPC/DPC_datastream_supplier.hh +++ b/trick_source/data_products/DPX/DPC/DPC_datastream_supplier.hh @@ -2,7 +2,7 @@ #ifndef DPC_DATASTREAM_SUPPLIER_HH #define DPC_DATASTREAM_SUPPLIER_HH -#include "../../units/include/Unit.hh" +#include "trick/Unit.hh" #include "../../Log/DataStream.hh" #include "../../Log/DataStreamFactory.hh" diff --git a/trick_source/data_products/DPX/DPC/DPC_delta_curve.cpp b/trick_source/data_products/DPX/DPC/DPC_delta_curve.cpp index d00cabe7..73de7ade 100644 --- a/trick_source/data_products/DPX/DPC/DPC_delta_curve.cpp +++ b/trick_source/data_products/DPX/DPC/DPC_delta_curve.cpp @@ -2,7 +2,7 @@ #include "DPC/DPC_delta_curve.hh" #include "math.h" #include "string.h" -#include "../../units/include/Unit.hh" +#include "trick/Unit.hh" #include <sstream> // CONSTRUCTOR diff --git a/trick_source/data_products/DPX/DPC/DPC_std_curve.cpp b/trick_source/data_products/DPX/DPC/DPC_std_curve.cpp index d6411305..817530d8 100644 --- a/trick_source/data_products/DPX/DPC/DPC_std_curve.cpp +++ b/trick_source/data_products/DPX/DPC/DPC_std_curve.cpp @@ -1,7 +1,7 @@ #include "DPC/DPC_std_curve.hh" #include "math.h" -#include "../../units/include/Unit.hh" +#include "trick/Unit.hh" // CONSTRUCTOR DPC_std_curve::DPC_std_curve( diff --git a/trick_source/data_products/DPX/DPC/makefile b/trick_source/data_products/DPX/DPC/makefile index c9c8c035..49603c5a 100644 --- a/trick_source/data_products/DPX/DPC/makefile +++ b/trick_source/data_products/DPX/DPC/makefile @@ -1,5 +1,5 @@ -include ${TRICK_HOME}/makefiles/Makefile.common +include ${TRICK_HOME}/share/trick/makefiles/Makefile.common RM = rm -rf CC = cc @@ -7,7 +7,7 @@ CPP = c++ DPX_DIR = .. -INCLUDE_DIRS = -I${DPX_DIR} -I../.. -I/usr/include/libxml2 +INCLUDE_DIRS = -I${DPX_DIR} -I../.. -I${TRICK_HOME}/include -I/usr/include/libxml2 CFLAGS = -g -Wall diff --git a/trick_source/data_products/DPX/DPM/DPM_axis.cpp b/trick_source/data_products/DPX/DPM/DPM_axis.cpp index 57262dbb..f990b36c 100644 --- a/trick_source/data_products/DPX/DPM/DPM_axis.cpp +++ b/trick_source/data_products/DPX/DPM/DPM_axis.cpp @@ -1,6 +1,6 @@ #include "DPM_axis.hh" -#include "../../trick_utils/units/include/Unit.hh" +#include "trick/Unit.hh" int DPM_axis::Initialize(xmlNode *base_node) { diff --git a/trick_source/data_products/DPX/DPM/DPM_column.cpp b/trick_source/data_products/DPX/DPM/DPM_column.cpp index 8da6561f..067a9598 100644 --- a/trick_source/data_products/DPX/DPM/DPM_column.cpp +++ b/trick_source/data_products/DPX/DPM/DPM_column.cpp @@ -1,6 +1,6 @@ #include "DPM_column.hh" -#include "../../trick_utils/units/include/Unit.hh" +#include "trick/Unit.hh" int DPM_column::Initialize(xmlNode *base_node) { diff --git a/trick_source/data_products/DPX/DPM/DPM_measurement.cpp b/trick_source/data_products/DPX/DPM/DPM_measurement.cpp index cb6e3151..0be03229 100644 --- a/trick_source/data_products/DPX/DPM/DPM_measurement.cpp +++ b/trick_source/data_products/DPX/DPM/DPM_measurement.cpp @@ -1,6 +1,6 @@ #include "DPM_measurement.hh" -#include "../../trick_utils/units/include/Unit.hh" +#include "trick/Unit.hh" // MEMEBR FUNCTION int DPM_measurement::Initialize( xmlNode *base_node) { diff --git a/trick_source/data_products/DPX/DPM/makefile b/trick_source/data_products/DPX/DPM/makefile index 0b086f50..162607d9 100644 --- a/trick_source/data_products/DPX/DPM/makefile +++ b/trick_source/data_products/DPX/DPM/makefile @@ -1,5 +1,5 @@ -include ${TRICK_HOME}/makefiles/Makefile.common +include ${TRICK_HOME}/share/trick/makefiles/Makefile.common RM = rm -rf CC = cc @@ -7,7 +7,7 @@ CPP = c++ DPX_DIR = .. -INCLUDE_DIRS = -I${DPX_DIR} -I../.. -I/usr/include/libxml2 +INCLUDE_DIRS = -I${DPX_DIR} -I../.. -I${TRICK_HOME}/include -I/usr/include/libxml2 CFLAGS = -g -Wall diff --git a/trick_source/data_products/DPX/DPV/UTILS/makefile b/trick_source/data_products/DPX/DPV/UTILS/makefile index f9aa6201..58ff0734 100644 --- a/trick_source/data_products/DPX/DPV/UTILS/makefile +++ b/trick_source/data_products/DPX/DPV/UTILS/makefile @@ -1,5 +1,5 @@ -include ${TRICK_HOME}/makefiles/Makefile.common +include ${TRICK_HOME}/share/trick/makefiles/Makefile.common RM = rm -rf CC = gcc diff --git a/trick_source/data_products/DPX/makefile b/trick_source/data_products/DPX/makefile index d0fa4dc8..de3e248b 100644 --- a/trick_source/data_products/DPX/makefile +++ b/trick_source/data_products/DPX/makefile @@ -1,5 +1,5 @@ -include ${TRICK_HOME}/makefiles/Makefile.common +include ${TRICK_HOME}/share/trick/makefiles/Makefile.common RM = rm -rf diff --git a/trick_source/data_products/EQParse/makefile b/trick_source/data_products/EQParse/makefile index fcaca6ba..6a5cc3bd 100644 --- a/trick_source/data_products/EQParse/makefile +++ b/trick_source/data_products/EQParse/makefile @@ -1,5 +1,5 @@ -include ${TRICK_HOME}/makefiles/Makefile.common +include ${TRICK_HOME}/share/trick/makefiles/Makefile.common CC = cc diff --git a/trick_source/data_products/Log/MatLab.cpp b/trick_source/data_products/Log/MatLab.cpp index d6579925..15d93a80 100644 --- a/trick_source/data_products/Log/MatLab.cpp +++ b/trick_source/data_products/Log/MatLab.cpp @@ -8,7 +8,7 @@ #include "MatLab.hh" #include "trick_byteswap.h" -#include "parameter_types.h" +#include "trick/parameter_types.h" // Add to the parameter types #define MATLAB_ARRAY 21 diff --git a/trick_source/data_products/Log/MatLab4.cpp b/trick_source/data_products/Log/MatLab4.cpp index 73b3488d..73700510 100644 --- a/trick_source/data_products/Log/MatLab4.cpp +++ b/trick_source/data_products/Log/MatLab4.cpp @@ -7,7 +7,7 @@ #include <math.h> #include "MatLab4.hh" -#include "parameter_types.h" +#include "trick/parameter_types.h" #include "trick_byteswap.h" #include "trick_byte_order.h" diff --git a/trick_source/data_products/Log/TrickBinary.cpp b/trick_source/data_products/Log/TrickBinary.cpp index c4f25ead..448be756 100644 --- a/trick_source/data_products/Log/TrickBinary.cpp +++ b/trick_source/data_products/Log/TrickBinary.cpp @@ -4,10 +4,10 @@ #include <math.h> #include <map> #include "TrickBinary.hh" -#include "parameter_types.h" +#include "trick/parameter_types.h" #include "trick_byte_order.h" #include "trick_byteswap.h" -#include "units/include/units_conv.h" +#include "trick/units_conv.h" TrickBinary::TrickBinary(char * file_name , char * param_name ) { diff --git a/trick_source/data_products/Log/makefile b/trick_source/data_products/Log/makefile index 74b6af31..51e44b67 100644 --- a/trick_source/data_products/Log/makefile +++ b/trick_source/data_products/Log/makefile @@ -1,5 +1,5 @@ -include ${TRICK_HOME}/makefiles/Makefile.common +include ${TRICK_HOME}/share/trick/makefiles/Makefile.common CC = c++ @@ -14,7 +14,7 @@ endif OBJ_DIR = object_${TRICK_HOST_CPU} LIBDIR = ../lib_${TRICK_HOST_CPU} LIBNAME = liblog.a -INCLUDE_DIRS = -I.. +INCLUDE_DIRS = -I.. -I${TRICK_HOME}/include DP_CFLAGS = -g ${INCLUDE_DIRS} -fPIC CPP_OBJECTS = $(OBJ_DIR)/log.o \ $(OBJ_DIR)/multiLog.o \ diff --git a/trick_source/data_products/Log/parameter_types.h b/trick_source/data_products/Log/parameter_types.h deleted file mode 120000 index ecc245f7..00000000 --- a/trick_source/data_products/Log/parameter_types.h +++ /dev/null @@ -1 +0,0 @@ -../../sim_services/MemoryManager/include/parameter_types.h \ No newline at end of file diff --git a/trick_source/data_products/Var/makefile b/trick_source/data_products/Var/makefile index 92269859..44eb5a0e 100644 --- a/trick_source/data_products/Var/makefile +++ b/trick_source/data_products/Var/makefile @@ -1,5 +1,5 @@ -include ${TRICK_HOME}/makefiles/Makefile.common +include ${TRICK_HOME}/share/trick/makefiles/Makefile.common CC = c++ @@ -14,7 +14,7 @@ endif OBJ_DIR = object_${TRICK_HOST_CPU} LIBDIR = ../lib_${TRICK_HOST_CPU} LIBNAME = libvar.a -INCLUDE_DIRS = -I.. +INCLUDE_DIRS = -I${TRICK_HOME}/include DP_CFLAGS = -g ${INCLUDE_DIRS} -fPIC OBJECTS0 = $(OBJ_DIR)/var.o @@ -78,8 +78,3 @@ $(OBJ_DIR)/var.o: var.cpp | $(OBJ_DIR) # - Save changes (if any) # - run "make depend" ####################################################################### -# DO NOT DELETE -object_${TRICK_HOST_CPU}/var.o: var.cpp var.h \ - ../units/include/Unit.hh \ - ../units/include/units_conv.h \ - ../units/include/UCFn.hh diff --git a/trick_source/data_products/Var/var.h b/trick_source/data_products/Var/var.h index 019fef5e..f689b3dc 100644 --- a/trick_source/data_products/Var/var.h +++ b/trick_source/data_products/Var/var.h @@ -14,7 +14,7 @@ #include <string> using namespace std ; -#include "units/include/Unit.hh" +#include "trick/Unit.hh" /* * Variable Class diff --git a/trick_source/data_products/makefile b/trick_source/data_products/makefile index 469b921b..ccaa420d 100644 --- a/trick_source/data_products/makefile +++ b/trick_source/data_products/makefile @@ -2,7 +2,7 @@ # Makefile for Data Products Libs And Apps # -include ${TRICK_HOME}/makefiles/Makefile.common +include ${TRICK_HOME}/share/trick/makefiles/Makefile.common LIB_DIR = lib_${TRICK_HOST_CPU} diff --git a/trick_source/java/makefile b/trick_source/java/makefile index c99c9622..5123f60a 100644 --- a/trick_source/java/makefile +++ b/trick_source/java/makefile @@ -1,6 +1,6 @@ # Get JAVAC definition -include ${TRICK_HOME}/makefiles/Makefile.common +include ${TRICK_HOME}/share/trick/makefiles/Makefile.common JAVAC ?= javac JAVAC_FLAGS = -g -Xlint:unchecked -Xlint:deprecation @@ -9,9 +9,9 @@ SRC_DIR = src SRC_FILES = $(shell find ${SRC_DIR} -type f -name \*.java) BUILD_DIR = build DEST_DIR = ${BUILD_DIR}/classes -LIB_DIR = ${TRICK_HOME}/bin/java/lib -DIST_DIR = ${TRICK_HOME}/bin/java/dist -RESOURCES_DIR = ${TRICK_HOME}/bin/java/resources +LIB_DIR = ${TRICK_HOME}/libexec/trick/java/lib +DIST_DIR = ${TRICK_HOME}/libexec/trick/java/dist +RESOURCES_DIR = ${TRICK_HOME}/libexec/trick/java/resources DOCS_API_DIR = docs/api TEST_REPORTS_DIR = test/reports diff --git a/trick_source/java/src/trick/dataproducts/DataProductsApplication.java b/trick_source/java/src/trick/dataproducts/DataProductsApplication.java index 35e7234e..7dfc1119 100644 --- a/trick_source/java/src/trick/dataproducts/DataProductsApplication.java +++ b/trick_source/java/src/trick/dataproducts/DataProductsApplication.java @@ -365,7 +365,7 @@ public abstract class DataProductsApplication extends TrickApplication { javaRadioButton = new JRadioButtonMenuItem(getAction("selectJavaPlot")); - String fermi_exe = UIUtils.getTrickHome() + "/trick_source/data_products/DPX/APPS/FXPLOT/object_" + UIUtils.getTrickHostCPU() + "/fxplot" ; + String fermi_exe = UIUtils.getTrickHome() + "/bin/trick-fxplot" ; File f = new File(fermi_exe) ; fermiExists = f.exists() ; diff --git a/trick_source/java/src/trick/dataproducts/resources/DataProductsApplication.properties b/trick_source/java/src/trick/dataproducts/resources/DataProductsApplication.properties index a4694495..417e5d15 100644 --- a/trick_source/java/src/trick/dataproducts/resources/DataProductsApplication.properties +++ b/trick_source/java/src/trick/dataproducts/resources/DataProductsApplication.properties @@ -62,8 +62,8 @@ selectAQUA.Action.text = AQUA gnuplot.on.icon = gnuplot_on.gif gnuplot.off.icon = gnuplot_off.gif -fxplot.command = fxplot -gxplot.command = gxplot -jxplot.command = jxplot +fxplot.command = trick-fxplot +gxplot.command = trick-gxplot +jxplot.command = trick-jxplot #default.timename = sys.exec.out.time diff --git a/trick_source/java/src/trick/simcontrol/SimControlApplication.java b/trick_source/java/src/trick/simcontrol/SimControlApplication.java index 806f3981..65745198 100644 --- a/trick_source/java/src/trick/simcontrol/SimControlApplication.java +++ b/trick_source/java/src/trick/simcontrol/SimControlApplication.java @@ -225,12 +225,12 @@ public class SimControlApplication extends TrickApplication implements PropertyC @Action public void startTV() { - launchTrickApplication("tv", "--host " + host + " --port " + port); + launchTrickApplication("trick-tv", "--host " + host + " --port " + port); } @Action public void startMTV() { - launchTrickApplication("mtv", host + " " + port); + launchTrickApplication("trick-mtv", host + " " + port); } @Action diff --git a/trick_source/sim_services/CheckPointAgent/src/CheckPointAgent.cpp b/trick_source/sim_services/CheckPointAgent/CheckPointAgent.cpp similarity index 94% rename from trick_source/sim_services/CheckPointAgent/src/CheckPointAgent.cpp rename to trick_source/sim_services/CheckPointAgent/CheckPointAgent.cpp index ab2ae8ac..e9250dc8 100644 --- a/trick_source/sim_services/CheckPointAgent/src/CheckPointAgent.cpp +++ b/trick_source/sim_services/CheckPointAgent/CheckPointAgent.cpp @@ -1,4 +1,4 @@ -#include "sim_services/CheckPointAgent/include/CheckPointAgent.hh" +#include "trick/CheckPointAgent.hh" // MEMBER FUNCTION void Trick::CheckPointAgent::push_basename( const char* name) { diff --git a/trick_source/sim_services/CheckPointAgent/src/ChkPtParseContext.cpp b/trick_source/sim_services/CheckPointAgent/ChkPtParseContext.cpp similarity index 89% rename from trick_source/sim_services/CheckPointAgent/src/ChkPtParseContext.cpp rename to trick_source/sim_services/CheckPointAgent/ChkPtParseContext.cpp index 9045b510..59a5e0cc 100644 --- a/trick_source/sim_services/CheckPointAgent/src/ChkPtParseContext.cpp +++ b/trick_source/sim_services/CheckPointAgent/ChkPtParseContext.cpp @@ -1,6 +1,6 @@ #include <stdio.h> #include <stdlib.h> -#include "sim_services/CheckPointAgent/include/ChkPtParseContext.hh" +#include "trick/ChkPtParseContext.hh" /** Constructor diff --git a/trick_source/sim_services/CheckPointAgent/src/ClassicCheckPointerAgent.cpp b/trick_source/sim_services/CheckPointAgent/ClassicCheckPointerAgent.cpp similarity index 98% rename from trick_source/sim_services/CheckPointAgent/src/ClassicCheckPointerAgent.cpp rename to trick_source/sim_services/CheckPointAgent/ClassicCheckPointerAgent.cpp index fef15cfc..cdb9e718 100644 --- a/trick_source/sim_services/CheckPointAgent/src/ClassicCheckPointerAgent.cpp +++ b/trick_source/sim_services/CheckPointAgent/ClassicCheckPointerAgent.cpp @@ -1,13 +1,13 @@ -#include "sim_services/MemoryManager/include/MemoryManager.hh" -#include "sim_services/MemoryManager/include/parameter_types.h" -#include "sim_services/MemoryManager/include/io_alloc.h" -#include "sim_services/MemoryManager/include/wcs_ext.h" -#include "sim_services/MemoryManager/include/bitfield_proto.h" -#include "sim_services/Message/include/message_proto.h" -#include "sim_services/Message/include/message_type.h" +#include "trick/MemoryManager.hh" +#include "trick/parameter_types.h" +#include "trick/io_alloc.h" +#include "trick/wcs_ext.h" +#include "trick/bitfield_proto.h" +#include "trick/message_proto.h" +#include "trick/message_type.h" -#include "sim_services/CheckPointAgent/include/ClassicCheckPointAgent.hh" -#include "sim_services/CheckPointAgent/include/ChkPtParseContext.hh" +#include "trick/ClassicCheckPointAgent.hh" +#include "trick/ChkPtParseContext.hh" #include <string> #include <iostream> diff --git a/trick_source/sim_services/CheckPointAgent/Makefile b/trick_source/sim_services/CheckPointAgent/Makefile index b1799c58..1b64f623 100644 --- a/trick_source/sim_services/CheckPointAgent/Makefile +++ b/trick_source/sim_services/CheckPointAgent/Makefile @@ -1,6 +1,6 @@ -include ${TRICK_HOME}/makefiles/Makefile.common -include ${TRICK_HOME}/makefiles/Makefile.tricklib +include ${TRICK_HOME}/share/trick/makefiles/Makefile.common +include ${TRICK_HOME}/share/trick/makefiles/Makefile.tricklib -include Makefile_deps # suppress warnings in lex and yacc files. diff --git a/trick_source/sim_services/CheckPointAgent/Makefile_deps b/trick_source/sim_services/CheckPointAgent/Makefile_deps new file mode 100644 index 00000000..3aae3762 --- /dev/null +++ b/trick_source/sim_services/CheckPointAgent/Makefile_deps @@ -0,0 +1,50 @@ +object_${TRICK_HOST_CPU}/PythonPrint.o: PythonPrint.cpp \ + ${TRICK_HOME}/include/trick/PythonPrint.hh \ + ${TRICK_HOME}/include/trick/CheckPointAgent.hh \ + ${TRICK_HOME}/include/trick/attributes.h \ + ${TRICK_HOME}/include/trick/parameter_types.h \ + ${TRICK_HOME}/include/trick/io_alloc.h \ + ${TRICK_HOME}/include/trick/memorymanager_c_intf.h \ + ${TRICK_HOME}/include/trick/reference.h \ + ${TRICK_HOME}/include/trick/value.h \ + ${TRICK_HOME}/include/trick/dllist.h \ + ${TRICK_HOME}/include/trick/var.h \ + ${TRICK_HOME}/include/trick/bitfield_proto.h \ + ${TRICK_HOME}/include/trick/message_proto.h \ + ${TRICK_HOME}/include/trick/message_type.h +object_${TRICK_HOST_CPU}/CheckPointAgent.o: CheckPointAgent.cpp \ + ${TRICK_HOME}/include/trick/CheckPointAgent.hh \ + ${TRICK_HOME}/include/trick/attributes.h \ + ${TRICK_HOME}/include/trick/parameter_types.h \ + ${TRICK_HOME}/include/trick/io_alloc.h +object_${TRICK_HOST_CPU}/ClassicCheckPointerAgent.o: ClassicCheckPointerAgent.cpp \ + ${TRICK_HOME}/include/trick/MemoryManager.hh \ + ${TRICK_HOME}/include/trick/attributes.h \ + ${TRICK_HOME}/include/trick/parameter_types.h \ + ${TRICK_HOME}/include/trick/reference.h \ + ${TRICK_HOME}/include/trick/value.h \ + ${TRICK_HOME}/include/trick/dllist.h \ + ${TRICK_HOME}/include/trick/io_alloc.h \ + ${TRICK_HOME}/include/trick/mm_error.h \ + ${TRICK_HOME}/include/trick/var.h \ + ${TRICK_HOME}/include/trick/CheckPointAgent.hh \ + ${TRICK_HOME}/include/trick/UCFn.hh \ + ${TRICK_HOME}/include/trick/wcs_ext.h \ + ${TRICK_HOME}/include/trick/bitfield_proto.h \ + ${TRICK_HOME}/include/trick/message_proto.h \ + ${TRICK_HOME}/include/trick/message_type.h \ + ${TRICK_HOME}/include/trick/ClassicCheckPointAgent.hh \ + ${TRICK_HOME}/include/trick/ChkPtParseContext.hh +object_${TRICK_HOST_CPU}/ChkPtParseContext.o: ChkPtParseContext.cpp \ + ${TRICK_HOME}/include/trick/ChkPtParseContext.hh \ + ${TRICK_HOME}/include/trick/MemoryManager.hh \ + ${TRICK_HOME}/include/trick/attributes.h \ + ${TRICK_HOME}/include/trick/parameter_types.h \ + ${TRICK_HOME}/include/trick/reference.h \ + ${TRICK_HOME}/include/trick/value.h \ + ${TRICK_HOME}/include/trick/dllist.h \ + ${TRICK_HOME}/include/trick/io_alloc.h \ + ${TRICK_HOME}/include/trick/mm_error.h \ + ${TRICK_HOME}/include/trick/var.h \ + ${TRICK_HOME}/include/trick/CheckPointAgent.hh \ + ${TRICK_HOME}/include/trick/UCFn.hh diff --git a/trick_source/sim_services/CheckPointAgent/src/PythonPrint.cpp b/trick_source/sim_services/CheckPointAgent/PythonPrint.cpp similarity index 97% rename from trick_source/sim_services/CheckPointAgent/src/PythonPrint.cpp rename to trick_source/sim_services/CheckPointAgent/PythonPrint.cpp index ffb3c6d8..7af032ff 100644 --- a/trick_source/sim_services/CheckPointAgent/src/PythonPrint.cpp +++ b/trick_source/sim_services/CheckPointAgent/PythonPrint.cpp @@ -6,12 +6,12 @@ #include <stdlib.h> #include <math.h> -#include "sim_services/CheckPointAgent/include/PythonPrint.hh" -#include "sim_services/MemoryManager/include/memorymanager_c_intf.h" -#include "sim_services/MemoryManager/include/parameter_types.h" -#include "sim_services/MemoryManager/include/bitfield_proto.h" -#include "sim_services/Message/include/message_proto.h" -#include "sim_services/Message/include/message_type.h" +#include "trick/PythonPrint.hh" +#include "trick/memorymanager_c_intf.h" +#include "trick/parameter_types.h" +#include "trick/bitfield_proto.h" +#include "trick/message_proto.h" +#include "trick/message_type.h" // MEMBER FUNCTION bool Trick::PythonPrint::input_perm_check(ATTRIBUTES * attr __attribute__((unused))) { diff --git a/trick_source/sim_services/CheckPointAgent/main_page.dox_in b/trick_source/sim_services/CheckPointAgent/docs/main_page.dox_in similarity index 100% rename from trick_source/sim_services/CheckPointAgent/main_page.dox_in rename to trick_source/sim_services/CheckPointAgent/docs/main_page.dox_in diff --git a/trick_source/sim_services/CheckPointAgent/src/input_parser.l b/trick_source/sim_services/CheckPointAgent/input_parser.l similarity index 98% rename from trick_source/sim_services/CheckPointAgent/src/input_parser.l rename to trick_source/sim_services/CheckPointAgent/input_parser.l index 52e229cc..76fbbc40 100644 --- a/trick_source/sim_services/CheckPointAgent/src/input_parser.l +++ b/trick_source/sim_services/CheckPointAgent/input_parser.l @@ -23,10 +23,10 @@ #include <stdio.h> #include <stdlib.h> #include <ctype.h> -#include "sim_services/MemoryManager/include/mm_error.h" -#include "sim_services/CheckPointAgent/include/ChkPtParseContext.hh" -#include "sim_services/CheckPointAgent/src/input_parser.tab.h" -#include "sim_services/include/TrickConstant.hh" +#include "trick/mm_error.h" +#include "trick/ChkPtParseContext.hh" +#include "input_parser.tab.h" +#include "trick/TrickConstant.hh" #define YY_EXTRA_TYPE ChkPtParseContext* diff --git a/trick_source/sim_services/CheckPointAgent/src/input_parser.y b/trick_source/sim_services/CheckPointAgent/input_parser.y similarity index 98% rename from trick_source/sim_services/CheckPointAgent/src/input_parser.y rename to trick_source/sim_services/CheckPointAgent/input_parser.y index 7159dc77..531908e0 100644 --- a/trick_source/sim_services/CheckPointAgent/src/input_parser.y +++ b/trick_source/sim_services/CheckPointAgent/input_parser.y @@ -15,12 +15,12 @@ #include <sstream> #include <stdlib.h> -#include "sim_services/CheckPointAgent/include/ChkPtParseContext.hh" -#include "sim_services/MemoryManager/include/vval.h" -#include "sim_services/MemoryManager/include/value.h" -#include "sim_services/MemoryManager/include/var.h" -#include "sim_services/Message/include/message_proto.h" -#include "sim_services/Message/include/message_type.h" +#include "trick/ChkPtParseContext.hh" +#include "trick/vval.h" +#include "trick/value.h" +#include "trick/var.h" +#include "trick/message_proto.h" +#include "trick/message_type.h" #include "input_parser.tab.h" using namespace std; diff --git a/trick_source/sim_services/CheckPointRestart/src/CheckPointRestart.cpp b/trick_source/sim_services/CheckPointRestart/CheckPointRestart.cpp similarity index 95% rename from trick_source/sim_services/CheckPointRestart/src/CheckPointRestart.cpp rename to trick_source/sim_services/CheckPointRestart/CheckPointRestart.cpp index 834d0b6f..9784bc95 100644 --- a/trick_source/sim_services/CheckPointRestart/src/CheckPointRestart.cpp +++ b/trick_source/sim_services/CheckPointRestart/CheckPointRestart.cpp @@ -12,18 +12,18 @@ #include "dmtcpaware.h" #endif -#include "sim_services/DMTCP/include/DMTCP.hh" -#include "sim_services/CheckPointRestart/include/CheckPointRestart.hh" -#include "sim_services/MemoryManager/include/MemoryManager.hh" -#include "sim_services/SimObject/include/SimObject.hh" -#include "sim_services/Executive/include/Executive.hh" -#include "sim_services/Executive/include/exec_proto.hh" -#include "sim_services/Executive/include/exec_proto.h" -#include "sim_services/CommandLineArguments/include/command_line_protos.h" -#include "sim_services/Message/include/message_proto.h" -#include "sim_services/Message/include/message_type.h" -#include "sim_services/include/TrickConstant.hh" -#include "sim_services/CheckPointRestart/include/checkpoint_stl.hh" +#include "trick/DMTCP.hh" +#include "trick/CheckPointRestart.hh" +#include "trick/MemoryManager.hh" +#include "trick/SimObject.hh" +#include "trick/Executive.hh" +#include "trick/exec_proto.hh" +#include "trick/exec_proto.h" +#include "trick/command_line_protos.h" +#include "trick/message_proto.h" +#include "trick/message_type.h" +#include "trick/TrickConstant.hh" +#include "trick/checkpoint_stl.hh" Trick::CheckPointRestart * the_cpr ; diff --git a/trick_source/sim_services/CheckPointRestart/src/CheckPointRestart_c_intf.cpp b/trick_source/sim_services/CheckPointRestart/CheckPointRestart_c_intf.cpp similarity index 94% rename from trick_source/sim_services/CheckPointRestart/src/CheckPointRestart_c_intf.cpp rename to trick_source/sim_services/CheckPointRestart/CheckPointRestart_c_intf.cpp index dfac92a4..b6b04a12 100644 --- a/trick_source/sim_services/CheckPointRestart/src/CheckPointRestart_c_intf.cpp +++ b/trick_source/sim_services/CheckPointRestart/CheckPointRestart_c_intf.cpp @@ -1,11 +1,11 @@ #include <stdlib.h> -#include "sim_services/CheckPointRestart/include/CheckPointRestart.hh" -#include "sim_services/CheckPointRestart/include/CheckPointRestart_c_intf.hh" -#include "sim_services/MemoryManager/include/memorymanager_c_intf.h" -#include "sim_services/Message/include/message_proto.h" -#include "sim_services/Message/include/message_type.h" +#include "trick/CheckPointRestart.hh" +#include "trick/CheckPointRestart_c_intf.hh" +#include "trick/memorymanager_c_intf.h" +#include "trick/message_proto.h" +#include "trick/message_type.h" /** Global singleton pointer to the CheckPointRestart. */ extern Trick::CheckPointRestart * the_cpr ; diff --git a/trick_source/sim_services/CheckPointRestart/Makefile b/trick_source/sim_services/CheckPointRestart/Makefile index 11e3de21..7261c8c1 100644 --- a/trick_source/sim_services/CheckPointRestart/Makefile +++ b/trick_source/sim_services/CheckPointRestart/Makefile @@ -1,6 +1,6 @@ -include ${TRICK_HOME}/makefiles/Makefile.common -include ${TRICK_HOME}/makefiles/Makefile.tricklib +include ${TRICK_HOME}/share/trick/makefiles/Makefile.common +include ${TRICK_HOME}/share/trick/makefiles/Makefile.tricklib -include Makefile_deps ifneq ($(DMTCP),) diff --git a/trick_source/sim_services/CheckPointRestart/Makefile_deps b/trick_source/sim_services/CheckPointRestart/Makefile_deps index 9613b4ae..5128017f 100644 --- a/trick_source/sim_services/CheckPointRestart/Makefile_deps +++ b/trick_source/sim_services/CheckPointRestart/Makefile_deps @@ -1,123 +1,123 @@ -object_${TRICK_HOST_CPU}/CheckPointRestart.o: src/CheckPointRestart.cpp \ - ${TRICK_HOME}/trick_source/sim_services/DMTCP/include/DMTCP.hh \ - ${TRICK_HOME}/trick_source/sim_services/DMTCP/include/dmtcp_checkpoint_c_intf.hh \ - ${TRICK_HOME}/trick_source/sim_services/Scheduler/include/Scheduler.hh \ - ${TRICK_HOME}/trick_source/sim_services/ScheduledJobQueue/include/ScheduledJobQueue.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/JobData.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/InstrumentBase.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/SimObject.hh \ - ${TRICK_HOME}/trick_source/sim_services/CheckPointRestart/include/CheckPointRestart.hh \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/MemoryManager.hh \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/attributes.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/parameter_types.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/reference.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/value.h \ - ${TRICK_HOME}/trick_source/trick_utils/trick_adt/include/dllist.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/io_alloc.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/mm_error.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/var.h \ - ${TRICK_HOME}/trick_source/sim_services/CheckPointAgent/include/CheckPointAgent.hh \ - ${TRICK_HOME}/trick_source/trick_utils/units/include/UCFn.hh \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/Executive.hh \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/Threads.hh \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/sim_mode.h \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/exec_proto.hh \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/exec_proto.h \ - ${TRICK_HOME}/trick_source/sim_services/CommandLineArguments/include/command_line_protos.h \ - ${TRICK_HOME}/trick_source/sim_services/Message/include/message_proto.h \ - ${TRICK_HOME}/trick_source/sim_services/Message/include/message_type.h \ - ${TRICK_HOME}/trick_source/sim_services/include/TrickConstant.hh \ - ${TRICK_HOME}/trick_source/sim_services/CheckPointRestart/include/checkpoint_stl.hh \ - ${TRICK_HOME}/trick_source/sim_services/CheckPointRestart/include/checkpoint_sequence_stl.hh \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/memorymanager_c_intf.h \ - ${TRICK_HOME}/trick_source/sim_services/CheckPointRestart/include/checkpoint_map.hh \ - ${TRICK_HOME}/trick_source/sim_services/CheckPointRestart/include/checkpoint_stack.hh \ - ${TRICK_HOME}/trick_source/sim_services/CheckPointRestart/include/checkpoint_sequence_stl.hh \ - ${TRICK_HOME}/trick_source/sim_services/CheckPointRestart/include/checkpoint_queue.hh \ - ${TRICK_HOME}/trick_source/sim_services/CheckPointRestart/include/checkpoint_pair.hh -object_${TRICK_HOST_CPU}/CheckPointRestart_c_intf.o: src/CheckPointRestart_c_intf.cpp \ - ${TRICK_HOME}/trick_source/sim_services/CheckPointRestart/include/CheckPointRestart.hh \ - ${TRICK_HOME}/trick_source/sim_services/Scheduler/include/Scheduler.hh \ - ${TRICK_HOME}/trick_source/sim_services/ScheduledJobQueue/include/ScheduledJobQueue.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/JobData.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/InstrumentBase.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/SimObject.hh \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/MemoryManager.hh \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/attributes.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/parameter_types.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/reference.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/value.h \ - ${TRICK_HOME}/trick_source/trick_utils/trick_adt/include/dllist.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/io_alloc.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/mm_error.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/var.h \ - ${TRICK_HOME}/trick_source/sim_services/CheckPointAgent/include/CheckPointAgent.hh \ - ${TRICK_HOME}/trick_source/trick_utils/units/include/UCFn.hh \ - ${TRICK_HOME}/trick_source/sim_services/CheckPointRestart/include/CheckPointRestart_c_intf.hh \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/memorymanager_c_intf.h \ - ${TRICK_HOME}/trick_source/sim_services/Message/include/message_proto.h \ - ${TRICK_HOME}/trick_source/sim_services/Message/include/message_type.h -object_${TRICK_HOST_CPU}/checkpoint_map.o: src/checkpoint_map.cpp \ - ${TRICK_HOME}/trick_source/sim_services/CheckPointRestart/include/checkpoint_map.hh \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/memorymanager_c_intf.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/parameter_types.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/attributes.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/reference.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/value.h \ - ${TRICK_HOME}/trick_source/trick_utils/trick_adt/include/dllist.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/var.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/io_alloc.h \ - ${TRICK_HOME}/trick_source/sim_services/Message/include/message_proto.h \ - ${TRICK_HOME}/trick_source/sim_services/Message/include/message_type.h -object_${TRICK_HOST_CPU}/checkpoint_pair.o: src/checkpoint_pair.cpp \ - ${TRICK_HOME}/trick_source/sim_services/CheckPointRestart/include/checkpoint_pair.hh \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/memorymanager_c_intf.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/parameter_types.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/attributes.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/reference.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/value.h \ - ${TRICK_HOME}/trick_source/trick_utils/trick_adt/include/dllist.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/var.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/io_alloc.h \ - ${TRICK_HOME}/trick_source/sim_services/Message/include/message_proto.h \ - ${TRICK_HOME}/trick_source/sim_services/Message/include/message_type.h -object_${TRICK_HOST_CPU}/checkpoint_queue.o: src/checkpoint_queue.cpp \ - ${TRICK_HOME}/trick_source/sim_services/CheckPointRestart/include/checkpoint_queue.hh \ - ${TRICK_HOME}/trick_source/sim_services/CheckPointRestart/include/checkpoint_sequence_stl.hh \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/memorymanager_c_intf.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/parameter_types.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/attributes.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/reference.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/value.h \ - ${TRICK_HOME}/trick_source/trick_utils/trick_adt/include/dllist.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/var.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/io_alloc.h \ - ${TRICK_HOME}/trick_source/sim_services/Message/include/message_proto.h \ - ${TRICK_HOME}/trick_source/sim_services/Message/include/message_type.h -object_${TRICK_HOST_CPU}/checkpoint_sequence_stl.o: src/checkpoint_sequence_stl.cpp \ - ${TRICK_HOME}/trick_source/sim_services/CheckPointRestart/include/checkpoint_sequence_stl.hh \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/memorymanager_c_intf.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/parameter_types.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/attributes.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/reference.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/value.h \ - ${TRICK_HOME}/trick_source/trick_utils/trick_adt/include/dllist.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/var.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/io_alloc.h \ - ${TRICK_HOME}/trick_source/sim_services/Message/include/message_proto.h \ - ${TRICK_HOME}/trick_source/sim_services/Message/include/message_type.h -object_${TRICK_HOST_CPU}/checkpoint_stack.o: src/checkpoint_stack.cpp \ - ${TRICK_HOME}/trick_source/sim_services/CheckPointRestart/include/checkpoint_stack.hh \ - ${TRICK_HOME}/trick_source/sim_services/CheckPointRestart/include/checkpoint_sequence_stl.hh \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/memorymanager_c_intf.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/parameter_types.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/attributes.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/reference.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/value.h \ - ${TRICK_HOME}/trick_source/trick_utils/trick_adt/include/dllist.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/var.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/io_alloc.h \ - ${TRICK_HOME}/trick_source/sim_services/Message/include/message_proto.h \ - ${TRICK_HOME}/trick_source/sim_services/Message/include/message_type.h -object_${TRICK_HOST_CPU}/next_attr_name.o: src/next_attr_name.cpp \ - ${TRICK_HOME}/trick_source/sim_services/CheckPointRestart/include/CheckPointRestart_c_intf.hh +object_${TRICK_HOST_CPU}/CheckPointRestart_c_intf.o: CheckPointRestart_c_intf.cpp \ + ${TRICK_HOME}/include/trick/CheckPointRestart.hh \ + ${TRICK_HOME}/include/trick/Scheduler.hh \ + ${TRICK_HOME}/include/trick/ScheduledJobQueue.hh \ + ${TRICK_HOME}/include/trick/JobData.hh \ + ${TRICK_HOME}/include/trick/InstrumentBase.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/CheckPointRestart_c_intf.hh \ + ${TRICK_HOME}/include/trick/memorymanager_c_intf.h \ + ${TRICK_HOME}/include/trick/parameter_types.h \ + ${TRICK_HOME}/include/trick/attributes.h \ + ${TRICK_HOME}/include/trick/reference.h \ + ${TRICK_HOME}/include/trick/value.h \ + ${TRICK_HOME}/include/trick/dllist.h \ + ${TRICK_HOME}/include/trick/var.h \ + ${TRICK_HOME}/include/trick/io_alloc.h \ + ${TRICK_HOME}/include/trick/message_proto.h \ + ${TRICK_HOME}/include/trick/message_type.h +object_${TRICK_HOST_CPU}/checkpoint_queue.o: checkpoint_queue.cpp \ + ${TRICK_HOME}/include/trick/checkpoint_queue.hh \ + ${TRICK_HOME}/include/trick/checkpoint_sequence_stl.hh \ + ${TRICK_HOME}/include/trick/memorymanager_c_intf.h \ + ${TRICK_HOME}/include/trick/parameter_types.h \ + ${TRICK_HOME}/include/trick/attributes.h \ + ${TRICK_HOME}/include/trick/reference.h \ + ${TRICK_HOME}/include/trick/value.h \ + ${TRICK_HOME}/include/trick/dllist.h \ + ${TRICK_HOME}/include/trick/var.h \ + ${TRICK_HOME}/include/trick/io_alloc.h \ + ${TRICK_HOME}/include/trick/message_proto.h \ + ${TRICK_HOME}/include/trick/message_type.h +object_${TRICK_HOST_CPU}/checkpoint_map.o: checkpoint_map.cpp \ + ${TRICK_HOME}/include/trick/checkpoint_map.hh \ + ${TRICK_HOME}/include/trick/memorymanager_c_intf.h \ + ${TRICK_HOME}/include/trick/parameter_types.h \ + ${TRICK_HOME}/include/trick/attributes.h \ + ${TRICK_HOME}/include/trick/reference.h \ + ${TRICK_HOME}/include/trick/value.h \ + ${TRICK_HOME}/include/trick/dllist.h \ + ${TRICK_HOME}/include/trick/var.h \ + ${TRICK_HOME}/include/trick/io_alloc.h \ + ${TRICK_HOME}/include/trick/message_proto.h \ + ${TRICK_HOME}/include/trick/message_type.h +object_${TRICK_HOST_CPU}/next_attr_name.o: next_attr_name.cpp \ + ${TRICK_HOME}/include/trick/CheckPointRestart_c_intf.hh +object_${TRICK_HOST_CPU}/checkpoint_stack.o: checkpoint_stack.cpp \ + ${TRICK_HOME}/include/trick/checkpoint_stack.hh \ + ${TRICK_HOME}/include/trick/checkpoint_sequence_stl.hh \ + ${TRICK_HOME}/include/trick/memorymanager_c_intf.h \ + ${TRICK_HOME}/include/trick/parameter_types.h \ + ${TRICK_HOME}/include/trick/attributes.h \ + ${TRICK_HOME}/include/trick/reference.h \ + ${TRICK_HOME}/include/trick/value.h \ + ${TRICK_HOME}/include/trick/dllist.h \ + ${TRICK_HOME}/include/trick/var.h \ + ${TRICK_HOME}/include/trick/io_alloc.h \ + ${TRICK_HOME}/include/trick/message_proto.h \ + ${TRICK_HOME}/include/trick/message_type.h +object_${TRICK_HOST_CPU}/CheckPointRestart.o: CheckPointRestart.cpp \ + ${TRICK_HOME}/include/trick/DMTCP.hh \ + ${TRICK_HOME}/include/trick/dmtcp_checkpoint_c_intf.hh \ + ${TRICK_HOME}/include/trick/Scheduler.hh \ + ${TRICK_HOME}/include/trick/ScheduledJobQueue.hh \ + ${TRICK_HOME}/include/trick/JobData.hh \ + ${TRICK_HOME}/include/trick/InstrumentBase.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/CheckPointRestart.hh \ + ${TRICK_HOME}/include/trick/MemoryManager.hh \ + ${TRICK_HOME}/include/trick/attributes.h \ + ${TRICK_HOME}/include/trick/parameter_types.h \ + ${TRICK_HOME}/include/trick/reference.h \ + ${TRICK_HOME}/include/trick/value.h \ + ${TRICK_HOME}/include/trick/dllist.h \ + ${TRICK_HOME}/include/trick/io_alloc.h \ + ${TRICK_HOME}/include/trick/mm_error.h \ + ${TRICK_HOME}/include/trick/var.h \ + ${TRICK_HOME}/include/trick/CheckPointAgent.hh \ + ${TRICK_HOME}/include/trick/UCFn.hh \ + ${TRICK_HOME}/include/trick/Executive.hh \ + ${TRICK_HOME}/include/trick/Scheduler.hh \ + ${TRICK_HOME}/include/trick/ScheduledJobQueue.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/Threads.hh \ + ${TRICK_HOME}/include/trick/ThreadBase.hh \ + ${TRICK_HOME}/include/trick/sim_mode.h \ + ${TRICK_HOME}/include/trick/exec_proto.hh \ + ${TRICK_HOME}/include/trick/exec_proto.h \ + ${TRICK_HOME}/include/trick/sim_mode.h \ + ${TRICK_HOME}/include/trick/command_line_protos.h \ + ${TRICK_HOME}/include/trick/message_proto.h \ + ${TRICK_HOME}/include/trick/message_type.h \ + ${TRICK_HOME}/include/trick/TrickConstant.hh \ + ${TRICK_HOME}/include/trick/checkpoint_stl.hh \ + ${TRICK_HOME}/include/trick/checkpoint_sequence_stl.hh \ + ${TRICK_HOME}/include/trick/memorymanager_c_intf.h \ + ${TRICK_HOME}/include/trick/checkpoint_map.hh \ + ${TRICK_HOME}/include/trick/checkpoint_stack.hh \ + ${TRICK_HOME}/include/trick/checkpoint_queue.hh \ + ${TRICK_HOME}/include/trick/checkpoint_pair.hh +object_${TRICK_HOST_CPU}/checkpoint_pair.o: checkpoint_pair.cpp \ + ${TRICK_HOME}/include/trick/checkpoint_pair.hh \ + ${TRICK_HOME}/include/trick/memorymanager_c_intf.h \ + ${TRICK_HOME}/include/trick/parameter_types.h \ + ${TRICK_HOME}/include/trick/attributes.h \ + ${TRICK_HOME}/include/trick/reference.h \ + ${TRICK_HOME}/include/trick/value.h \ + ${TRICK_HOME}/include/trick/dllist.h \ + ${TRICK_HOME}/include/trick/var.h \ + ${TRICK_HOME}/include/trick/io_alloc.h \ + ${TRICK_HOME}/include/trick/message_proto.h \ + ${TRICK_HOME}/include/trick/message_type.h +object_${TRICK_HOST_CPU}/checkpoint_sequence_stl.o: checkpoint_sequence_stl.cpp \ + ${TRICK_HOME}/include/trick/checkpoint_sequence_stl.hh \ + ${TRICK_HOME}/include/trick/memorymanager_c_intf.h \ + ${TRICK_HOME}/include/trick/parameter_types.h \ + ${TRICK_HOME}/include/trick/attributes.h \ + ${TRICK_HOME}/include/trick/reference.h \ + ${TRICK_HOME}/include/trick/value.h \ + ${TRICK_HOME}/include/trick/dllist.h \ + ${TRICK_HOME}/include/trick/var.h \ + ${TRICK_HOME}/include/trick/io_alloc.h \ + ${TRICK_HOME}/include/trick/message_proto.h \ + ${TRICK_HOME}/include/trick/message_type.h diff --git a/trick_source/sim_services/CheckPointRestart/src/checkpoint_map.cpp b/trick_source/sim_services/CheckPointRestart/checkpoint_map.cpp similarity index 92% rename from trick_source/sim_services/CheckPointRestart/src/checkpoint_map.cpp rename to trick_source/sim_services/CheckPointRestart/checkpoint_map.cpp index 24b22559..6a3a4eb7 100644 --- a/trick_source/sim_services/CheckPointRestart/src/checkpoint_map.cpp +++ b/trick_source/sim_services/CheckPointRestart/checkpoint_map.cpp @@ -2,7 +2,7 @@ #include <string> #include <map> -#include "sim_services/CheckPointRestart/include/checkpoint_map.hh" +#include "trick/checkpoint_map.hh" int checkpoint_stl(std::map<std::string , std::string> & in_map , std::string object_name , std::string var_name ) { return checkpoint_map_stl_strings( in_map , object_name , var_name ) ; diff --git a/trick_source/sim_services/CheckPointRestart/src/checkpoint_pair.cpp b/trick_source/sim_services/CheckPointRestart/checkpoint_pair.cpp similarity index 96% rename from trick_source/sim_services/CheckPointRestart/src/checkpoint_pair.cpp rename to trick_source/sim_services/CheckPointRestart/checkpoint_pair.cpp index 232e2953..31ba0c1b 100644 --- a/trick_source/sim_services/CheckPointRestart/src/checkpoint_pair.cpp +++ b/trick_source/sim_services/CheckPointRestart/checkpoint_pair.cpp @@ -2,7 +2,7 @@ #include <string> #include <utility> -#include "sim_services/CheckPointRestart/include/checkpoint_pair.hh" +#include "trick/checkpoint_pair.hh" int checkpoint_stl(std::pair<std::string, std::string> & in_stl , std::string object_name , std::string var_name ) { diff --git a/trick_source/sim_services/CheckPointRestart/src/checkpoint_queue.cpp b/trick_source/sim_services/CheckPointRestart/checkpoint_queue.cpp similarity index 97% rename from trick_source/sim_services/CheckPointRestart/src/checkpoint_queue.cpp rename to trick_source/sim_services/CheckPointRestart/checkpoint_queue.cpp index 3a6cb61b..9b528b47 100644 --- a/trick_source/sim_services/CheckPointRestart/src/checkpoint_queue.cpp +++ b/trick_source/sim_services/CheckPointRestart/checkpoint_queue.cpp @@ -1,5 +1,5 @@ -#include "sim_services/CheckPointRestart/include/checkpoint_queue.hh" +#include "trick/checkpoint_queue.hh" int checkpoint_stl(std::queue<std::string> & in_stl , std::string object_name , std::string var_name ) { diff --git a/trick_source/sim_services/CheckPointRestart/src/checkpoint_sequence_stl.cpp b/trick_source/sim_services/CheckPointRestart/checkpoint_sequence_stl.cpp similarity index 95% rename from trick_source/sim_services/CheckPointRestart/src/checkpoint_sequence_stl.cpp rename to trick_source/sim_services/CheckPointRestart/checkpoint_sequence_stl.cpp index a6803497..9f94c80e 100644 --- a/trick_source/sim_services/CheckPointRestart/src/checkpoint_sequence_stl.cpp +++ b/trick_source/sim_services/CheckPointRestart/checkpoint_sequence_stl.cpp @@ -1,5 +1,5 @@ -#include "sim_services/CheckPointRestart/include/checkpoint_sequence_stl.hh" +#include "trick/checkpoint_sequence_stl.hh" int checkpoint_stl(std::vector<std::string> & in_stl , std::string object_name , std::string var_name ) { return checkpoint_sequence_stl_string( in_stl , object_name , var_name ) ; diff --git a/trick_source/sim_services/CheckPointRestart/src/checkpoint_stack.cpp b/trick_source/sim_services/CheckPointRestart/checkpoint_stack.cpp similarity index 96% rename from trick_source/sim_services/CheckPointRestart/src/checkpoint_stack.cpp rename to trick_source/sim_services/CheckPointRestart/checkpoint_stack.cpp index 5acd1ede..42d0ff8b 100644 --- a/trick_source/sim_services/CheckPointRestart/src/checkpoint_stack.cpp +++ b/trick_source/sim_services/CheckPointRestart/checkpoint_stack.cpp @@ -1,5 +1,5 @@ -#include "sim_services/CheckPointRestart/include/checkpoint_stack.hh" +#include "trick/checkpoint_stack.hh" int checkpoint_stl(std::stack<std::string> & in_stl , std::string object_name , std::string var_name ) { diff --git a/trick_source/sim_services/CheckPointRestart/src/next_attr_name.cpp b/trick_source/sim_services/CheckPointRestart/next_attr_name.cpp similarity index 80% rename from trick_source/sim_services/CheckPointRestart/src/next_attr_name.cpp rename to trick_source/sim_services/CheckPointRestart/next_attr_name.cpp index 21033e8d..4c69fc0a 100644 --- a/trick_source/sim_services/CheckPointRestart/src/next_attr_name.cpp +++ b/trick_source/sim_services/CheckPointRestart/next_attr_name.cpp @@ -1,6 +1,6 @@ #include <string> -#include "sim_services/CheckPointRestart/include/CheckPointRestart_c_intf.hh" +#include "trick/CheckPointRestart_c_intf.hh" /** This function strips off any dimensions from the type_id call in the io_src. diff --git a/trick_source/sim_services/CheckPointRestart/src/makefile b/trick_source/sim_services/CheckPointRestart/src/makefile deleted file mode 100644 index 753bd7f7..00000000 --- a/trick_source/sim_services/CheckPointRestart/src/makefile +++ /dev/null @@ -1,6 +0,0 @@ - -all: - ${MAKE} -C .. - -clean: - ${MAKE} -C .. clean diff --git a/trick_source/sim_services/Clock/src/BC635Clock.cpp b/trick_source/sim_services/Clock/BC635Clock.cpp similarity index 95% rename from trick_source/sim_services/Clock/src/BC635Clock.cpp rename to trick_source/sim_services/Clock/BC635Clock.cpp index 3711a34f..3eca45c6 100644 --- a/trick_source/sim_services/Clock/src/BC635Clock.cpp +++ b/trick_source/sim_services/Clock/BC635Clock.cpp @@ -7,10 +7,10 @@ PROGRAMMERS: #include <stdio.h> -#include "sim_services/Clock/include/BC635Clock.hh" -#include "sim_services/Message/include/message_proto.h" -#include "sim_services/Message/include/message_type.h" -#include "sim_services/include/release.h" +#include "trick/BC635Clock.hh" +#include "trick/message_proto.h" +#include "trick/message_type.h" +#include "trick/release.h" /** @details diff --git a/trick_source/sim_services/Clock/src/Clock.cpp b/trick_source/sim_services/Clock/Clock.cpp similarity index 95% rename from trick_source/sim_services/Clock/src/Clock.cpp rename to trick_source/sim_services/Clock/Clock.cpp index c89f1860..420ded5a 100644 --- a/trick_source/sim_services/Clock/src/Clock.cpp +++ b/trick_source/sim_services/Clock/Clock.cpp @@ -8,9 +8,9 @@ PROGRAMMERS: #include <stdlib.h> -#include "sim_services/Clock/include/Clock.hh" -#include "sim_services/Executive/include/exec_proto.h" -#include "sim_services/include/release.h" +#include "trick/Clock.hh" +#include "trick/exec_proto.h" +#include "trick/release.h" Trick::Clock * the_clock = NULL ; diff --git a/trick_source/sim_services/Clock/Clock.doxygen b/trick_source/sim_services/Clock/Clock.doxygen deleted file mode 100644 index 73b62112..00000000 --- a/trick_source/sim_services/Clock/Clock.doxygen +++ /dev/null @@ -1,1417 +0,0 @@ -# Doxyfile 1.5.6 - -# This file describes the settings to be used by the documentation system -# doxygen (www.doxygen.org) for a project -# -# All text after a hash (#) is considered a comment and will be ignored -# The format is: -# TAG = value [value, ...] -# For lists items can also be appended using: -# TAG += value [value, ...] -# Values that contain spaces should be placed between quotes (" ") - -#--------------------------------------------------------------------------- -# Project related configuration options -#--------------------------------------------------------------------------- - -# This tag specifies the encoding used for all characters in the config file -# that follow. The default is UTF-8 which is also the encoding used for all -# text before the first occurrence of this tag. Doxygen uses libiconv (or the -# iconv built into libc) for the transcoding. See -# http://www.gnu.org/software/libiconv for the list of possible encodings. - -DOXYFILE_ENCODING = UTF-8 - -# The PROJECT_NAME tag is a single word (or a sequence of words surrounded -# by quotes) that should identify the project. - -PROJECT_NAME = "Trick::Clock" - -# The PROJECT_NUMBER tag can be used to enter a project or revision number. -# This could be handy for archiving the generated documentation or -# if some version control system is used. - -PROJECT_NUMBER = - -# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) -# base path where the generated documentation will be put. -# If a relative path is entered, it will be relative to the location -# where doxygen was started. If left blank the current directory will be used. - -OUTPUT_DIRECTORY = ./docs - -# If the CREATE_SUBDIRS tag is set to YES, then doxygen will create -# 4096 sub-directories (in 2 levels) under the output directory of each output -# format and will distribute the generated files over these directories. -# Enabling this option can be useful when feeding doxygen a huge amount of -# source files, where putting all generated files in the same directory would -# otherwise cause performance problems for the file system. - -CREATE_SUBDIRS = NO - -# The OUTPUT_LANGUAGE tag is used to specify the language in which all -# documentation generated by doxygen is written. Doxygen will use this -# information to generate all constant output in the proper language. -# The default language is English, other supported languages are: -# Afrikaans, Arabic, Brazilian, Catalan, Chinese, Chinese-Traditional, -# Croatian, Czech, Danish, Dutch, Farsi, Finnish, French, German, Greek, -# Hungarian, Italian, Japanese, Japanese-en (Japanese with English messages), -# Korean, Korean-en, Lithuanian, Norwegian, Macedonian, Persian, Polish, -# Portuguese, Romanian, Russian, Serbian, Slovak, Slovene, Spanish, Swedish, -# and Ukrainian. - -OUTPUT_LANGUAGE = English - -# If the BRIEF_MEMBER_DESC tag is set to YES (the default) Doxygen will -# include brief member descriptions after the members that are listed in -# the file and class documentation (similar to JavaDoc). -# Set to NO to disable this. - -BRIEF_MEMBER_DESC = YES - -# If the REPEAT_BRIEF tag is set to YES (the default) Doxygen will prepend -# the brief description of a member or function before the detailed description. -# Note: if both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the -# brief descriptions will be completely suppressed. - -REPEAT_BRIEF = YES - -# This tag implements a quasi-intelligent brief description abbreviator -# that is used to form the text in various listings. Each string -# in this list, if found as the leading text of the brief description, will be -# stripped from the text and the result after processing the whole list, is -# used as the annotated text. Otherwise, the brief description is used as-is. -# If left blank, the following values are used ("$name" is automatically -# replaced with the name of the entity): "The $name class" "The $name widget" -# "The $name file" "is" "provides" "specifies" "contains" -# "represents" "a" "an" "the" - -ABBREVIATE_BRIEF = - -# If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then -# Doxygen will generate a detailed section even if there is only a brief -# description. - -ALWAYS_DETAILED_SEC = NO - -# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all -# inherited members of a class in the documentation of that class as if those -# members were ordinary class members. Constructors, destructors and assignment -# operators of the base classes will not be shown. - -INLINE_INHERITED_MEMB = NO - -# If the FULL_PATH_NAMES tag is set to YES then Doxygen will prepend the full -# path before files name in the file list and in the header files. If set -# to NO the shortest path that makes the file name unique will be used. - -FULL_PATH_NAMES = YES - -# If the FULL_PATH_NAMES tag is set to YES then the STRIP_FROM_PATH tag -# can be used to strip a user-defined part of the path. Stripping is -# only done if one of the specified strings matches the left-hand part of -# the path. The tag can be used to show relative paths in the file list. -# If left blank the directory from which doxygen is run is used as the -# path to strip. - -STRIP_FROM_PATH = - -# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of -# the path mentioned in the documentation of a class, which tells -# the reader which header file to include in order to use a class. -# If left blank only the name of the header file containing the class -# definition is used. Otherwise one should specify the include paths that -# are normally passed to the compiler using the -I flag. - -STRIP_FROM_INC_PATH = - -# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter -# (but less readable) file names. This can be useful is your file systems -# doesn't support long names like on DOS, Mac, or CD-ROM. - -SHORT_NAMES = NO - -# If the JAVADOC_AUTOBRIEF tag is set to YES then Doxygen -# will interpret the first line (until the first dot) of a JavaDoc-style -# comment as the brief description. If set to NO, the JavaDoc -# comments will behave just like regular Qt-style comments -# (thus requiring an explicit @brief command for a brief description.) - -JAVADOC_AUTOBRIEF = NO - -# If the QT_AUTOBRIEF tag is set to YES then Doxygen will -# interpret the first line (until the first dot) of a Qt-style -# comment as the brief description. If set to NO, the comments -# will behave just like regular Qt-style comments (thus requiring -# an explicit \brief command for a brief description.) - -QT_AUTOBRIEF = NO - -# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make Doxygen -# treat a multi-line C++ special comment block (i.e. a block of //! or /// -# comments) as a brief description. This used to be the default behaviour. -# The new default is to treat a multi-line C++ comment block as a detailed -# description. Set this tag to YES if you prefer the old behaviour instead. - -MULTILINE_CPP_IS_BRIEF = NO - -# If the DETAILS_AT_TOP tag is set to YES then Doxygen -# will output the detailed description near the top, like JavaDoc. -# If set to NO, the detailed description appears after the member -# documentation. - -DETAILS_AT_TOP = NO - -# If the INHERIT_DOCS tag is set to YES (the default) then an undocumented -# member inherits the documentation from any documented member that it -# re-implements. - -INHERIT_DOCS = YES - -# If the SEPARATE_MEMBER_PAGES tag is set to YES, then doxygen will produce -# a new page for each member. If set to NO, the documentation of a member will -# be part of the file/class/namespace that contains it. - -SEPARATE_MEMBER_PAGES = NO - -# The TAB_SIZE tag can be used to set the number of spaces in a tab. -# Doxygen uses this value to replace tabs by spaces in code fragments. - -TAB_SIZE = 8 - -# This tag can be used to specify a number of aliases that acts -# as commands in the documentation. An alias has the form "name=value". -# For example adding "sideeffect=\par Side Effects:\n" will allow you to -# put the command \sideeffect (or @sideeffect) in the documentation, which -# will result in a user-defined paragraph with heading "Side Effects:". -# You can put \n's in the value part of an alias to insert newlines. - -ALIASES = - -# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C -# sources only. Doxygen will then generate output that is more tailored for C. -# For instance, some of the names that are used will be different. The list -# of all members will be omitted, etc. - -OPTIMIZE_OUTPUT_FOR_C = NO - -# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java -# sources only. Doxygen will then generate output that is more tailored for -# Java. For instance, namespaces will be presented as packages, qualified -# scopes will look different, etc. - -OPTIMIZE_OUTPUT_JAVA = NO - -# Set the OPTIMIZE_FOR_FORTRAN tag to YES if your project consists of Fortran -# sources only. Doxygen will then generate output that is more tailored for -# Fortran. - -OPTIMIZE_FOR_FORTRAN = NO - -# Set the OPTIMIZE_OUTPUT_VHDL tag to YES if your project consists of VHDL -# sources. Doxygen will then generate output that is tailored for -# VHDL. - -OPTIMIZE_OUTPUT_VHDL = NO - -# If you use STL classes (i.e. std::string, std::vector, etc.) but do not want -# to include (a tag file for) the STL sources as input, then you should -# set this tag to YES in order to let doxygen match functions declarations and -# definitions whose arguments contain STL classes (e.g. func(std::string); v.s. -# func(std::string) {}). This also make the inheritance and collaboration -# diagrams that involve STL classes more complete and accurate. - -BUILTIN_STL_SUPPORT = NO - -# If you use Microsoft's C++/CLI language, you should set this option to YES to -# enable parsing support. - -CPP_CLI_SUPPORT = NO - -# Set the SIP_SUPPORT tag to YES if your project consists of sip sources only. -# Doxygen will parse them like normal C++ but will assume all classes use public -# instead of private inheritance when no explicit protection keyword is present. - -SIP_SUPPORT = NO - -# For Microsoft's IDL there are propget and propput attributes to indicate getter -# and setter methods for a property. Setting this option to YES (the default) -# will make doxygen to replace the get and set methods by a property in the -# documentation. This will only work if the methods are indeed getting or -# setting a simple type. If this is not the case, or you want to show the -# methods anyway, you should set this option to NO. - -IDL_PROPERTY_SUPPORT = YES - -# If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC -# tag is set to YES, then doxygen will reuse the documentation of the first -# member in the group (if any) for the other members of the group. By default -# all members of a group must be documented explicitly. - -DISTRIBUTE_GROUP_DOC = NO - -# Set the SUBGROUPING tag to YES (the default) to allow class member groups of -# the same type (for instance a group of public functions) to be put as a -# subgroup of that type (e.g. under the Public Functions section). Set it to -# NO to prevent subgrouping. Alternatively, this can be done per class using -# the \nosubgrouping command. - -SUBGROUPING = YES - -# When TYPEDEF_HIDES_STRUCT is enabled, a typedef of a struct, union, or enum -# is documented as struct, union, or enum with the name of the typedef. So -# typedef struct TypeS {} TypeT, will appear in the documentation as a struct -# with name TypeT. When disabled the typedef will appear as a member of a file, -# namespace, or class. And the struct will be named TypeS. This can typically -# be useful for C code in case the coding convention dictates that all compound -# types are typedef'ed and only the typedef is referenced, never the tag name. - -TYPEDEF_HIDES_STRUCT = NO - -#--------------------------------------------------------------------------- -# Build related configuration options -#--------------------------------------------------------------------------- - -# If the EXTRACT_ALL tag is set to YES doxygen will assume all entities in -# documentation are documented, even if no documentation was available. -# Private class members and static file members will be hidden unless -# the EXTRACT_PRIVATE and EXTRACT_STATIC tags are set to YES - -EXTRACT_ALL = YES - -# If the EXTRACT_PRIVATE tag is set to YES all private members of a class -# will be included in the documentation. - -EXTRACT_PRIVATE = YES - -# If the EXTRACT_STATIC tag is set to YES all static members of a file -# will be included in the documentation. - -EXTRACT_STATIC = NO - -# If the EXTRACT_LOCAL_CLASSES tag is set to YES classes (and structs) -# defined locally in source files will be included in the documentation. -# If set to NO only classes defined in header files are included. - -EXTRACT_LOCAL_CLASSES = YES - -# This flag is only useful for Objective-C code. When set to YES local -# methods, which are defined in the implementation section but not in -# the interface are included in the documentation. -# If set to NO (the default) only methods in the interface are included. - -EXTRACT_LOCAL_METHODS = NO - -# If this flag is set to YES, the members of anonymous namespaces will be -# extracted and appear in the documentation as a namespace called -# 'anonymous_namespace{file}', where file will be replaced with the base -# name of the file that contains the anonymous namespace. By default -# anonymous namespace are hidden. - -EXTRACT_ANON_NSPACES = NO - -# If the HIDE_UNDOC_MEMBERS tag is set to YES, Doxygen will hide all -# undocumented members of documented classes, files or namespaces. -# If set to NO (the default) these members will be included in the -# various overviews, but no documentation section is generated. -# This option has no effect if EXTRACT_ALL is enabled. - -HIDE_UNDOC_MEMBERS = NO - -# If the HIDE_UNDOC_CLASSES tag is set to YES, Doxygen will hide all -# undocumented classes that are normally visible in the class hierarchy. -# If set to NO (the default) these classes will be included in the various -# overviews. This option has no effect if EXTRACT_ALL is enabled. - -HIDE_UNDOC_CLASSES = NO - -# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, Doxygen will hide all -# friend (class|struct|union) declarations. -# If set to NO (the default) these declarations will be included in the -# documentation. - -HIDE_FRIEND_COMPOUNDS = NO - -# If the HIDE_IN_BODY_DOCS tag is set to YES, Doxygen will hide any -# documentation blocks found inside the body of a function. -# If set to NO (the default) these blocks will be appended to the -# function's detailed documentation block. - -HIDE_IN_BODY_DOCS = NO - -# The INTERNAL_DOCS tag determines if documentation -# that is typed after a \internal command is included. If the tag is set -# to NO (the default) then the documentation will be excluded. -# Set it to YES to include the internal documentation. - -INTERNAL_DOCS = NO - -# If the CASE_SENSE_NAMES tag is set to NO then Doxygen will only generate -# file names in lower-case letters. If set to YES upper-case letters are also -# allowed. This is useful if you have classes or files whose names only differ -# in case and if your file system supports case sensitive file names. Windows -# and Mac users are advised to set this option to NO. - -CASE_SENSE_NAMES = NO - -# If the HIDE_SCOPE_NAMES tag is set to NO (the default) then Doxygen -# will show members with their full class and namespace scopes in the -# documentation. If set to YES the scope will be hidden. - -HIDE_SCOPE_NAMES = NO - -# If the SHOW_INCLUDE_FILES tag is set to YES (the default) then Doxygen -# will put a list of the files that are included by a file in the documentation -# of that file. - -SHOW_INCLUDE_FILES = YES - -# If the INLINE_INFO tag is set to YES (the default) then a tag [inline] -# is inserted in the documentation for inline members. - -INLINE_INFO = YES - -# If the SORT_MEMBER_DOCS tag is set to YES (the default) then doxygen -# will sort the (detailed) documentation of file and class members -# alphabetically by member name. If set to NO the members will appear in -# declaration order. - -SORT_MEMBER_DOCS = YES - -# If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the -# brief documentation of file, namespace and class members alphabetically -# by member name. If set to NO (the default) the members will appear in -# declaration order. - -SORT_BRIEF_DOCS = NO - -# If the SORT_GROUP_NAMES tag is set to YES then doxygen will sort the -# hierarchy of group names into alphabetical order. If set to NO (the default) -# the group names will appear in their defined order. - -SORT_GROUP_NAMES = NO - -# If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be -# sorted by fully-qualified names, including namespaces. If set to -# NO (the default), the class list will be sorted only by class name, -# not including the namespace part. -# Note: This option is not very useful if HIDE_SCOPE_NAMES is set to YES. -# Note: This option applies only to the class list, not to the -# alphabetical list. - -SORT_BY_SCOPE_NAME = NO - -# The GENERATE_TODOLIST tag can be used to enable (YES) or -# disable (NO) the todo list. This list is created by putting \todo -# commands in the documentation. - -GENERATE_TODOLIST = YES - -# The GENERATE_TESTLIST tag can be used to enable (YES) or -# disable (NO) the test list. This list is created by putting \test -# commands in the documentation. - -GENERATE_TESTLIST = YES - -# The GENERATE_BUGLIST tag can be used to enable (YES) or -# disable (NO) the bug list. This list is created by putting \bug -# commands in the documentation. - -GENERATE_BUGLIST = YES - -# The GENERATE_DEPRECATEDLIST tag can be used to enable (YES) or -# disable (NO) the deprecated list. This list is created by putting -# \deprecated commands in the documentation. - -GENERATE_DEPRECATEDLIST= YES - -# The ENABLED_SECTIONS tag can be used to enable conditional -# documentation sections, marked by \if sectionname ... \endif. - -ENABLED_SECTIONS = - -# The MAX_INITIALIZER_LINES tag determines the maximum number of lines -# the initial value of a variable or define consists of for it to appear in -# the documentation. If the initializer consists of more lines than specified -# here it will be hidden. Use a value of 0 to hide initializers completely. -# The appearance of the initializer of individual variables and defines in the -# documentation can be controlled using \showinitializer or \hideinitializer -# command in the documentation regardless of this setting. - -MAX_INITIALIZER_LINES = 30 - -# Set the SHOW_USED_FILES tag to NO to disable the list of files generated -# at the bottom of the documentation of classes and structs. If set to YES the -# list will mention the files that were used to generate the documentation. - -SHOW_USED_FILES = YES - -# If the sources in your project are distributed over multiple directories -# then setting the SHOW_DIRECTORIES tag to YES will show the directory hierarchy -# in the documentation. The default is NO. - -SHOW_DIRECTORIES = NO - -# Set the SHOW_FILES tag to NO to disable the generation of the Files page. -# This will remove the Files entry from the Quick Index and from the -# Folder Tree View (if specified). The default is YES. - -SHOW_FILES = YES - -# Set the SHOW_NAMESPACES tag to NO to disable the generation of the -# Namespaces page. This will remove the Namespaces entry from the Quick Index -# and from the Folder Tree View (if specified). The default is YES. - -SHOW_NAMESPACES = YES - -# The FILE_VERSION_FILTER tag can be used to specify a program or script that -# doxygen should invoke to get the current version for each file (typically from -# the version control system). Doxygen will invoke the program by executing (via -# popen()) the command <command> <input-file>, where <command> is the value of -# the FILE_VERSION_FILTER tag, and <input-file> is the name of an input file -# provided by doxygen. Whatever the program writes to standard output -# is used as the file version. See the manual for examples. - -FILE_VERSION_FILTER = - -#--------------------------------------------------------------------------- -# configuration options related to warning and progress messages -#--------------------------------------------------------------------------- - -# The QUIET tag can be used to turn on/off the messages that are generated -# by doxygen. Possible values are YES and NO. If left blank NO is used. - -QUIET = NO - -# The WARNINGS tag can be used to turn on/off the warning messages that are -# generated by doxygen. Possible values are YES and NO. If left blank -# NO is used. - -WARNINGS = YES - -# If WARN_IF_UNDOCUMENTED is set to YES, then doxygen will generate warnings -# for undocumented members. If EXTRACT_ALL is set to YES then this flag will -# automatically be disabled. - -WARN_IF_UNDOCUMENTED = YES - -# If WARN_IF_DOC_ERROR is set to YES, doxygen will generate warnings for -# potential errors in the documentation, such as not documenting some -# parameters in a documented function, or documenting parameters that -# don't exist or using markup commands wrongly. - -WARN_IF_DOC_ERROR = YES - -# This WARN_NO_PARAMDOC option can be abled to get warnings for -# functions that are documented, but have no documentation for their parameters -# or return value. If set to NO (the default) doxygen will only warn about -# wrong or incomplete parameter documentation, but not about the absence of -# documentation. - -WARN_NO_PARAMDOC = NO - -# The WARN_FORMAT tag determines the format of the warning messages that -# doxygen can produce. The string should contain the $file, $line, and $text -# tags, which will be replaced by the file and line number from which the -# warning originated and the warning text. Optionally the format may contain -# $version, which will be replaced by the version of the file (if it could -# be obtained via FILE_VERSION_FILTER) - -WARN_FORMAT = "$file:$line: $text" - -# The WARN_LOGFILE tag can be used to specify a file to which warning -# and error messages should be written. If left blank the output is written -# to stderr. - -WARN_LOGFILE = - -#--------------------------------------------------------------------------- -# configuration options related to the input files -#--------------------------------------------------------------------------- - -# The INPUT tag can be used to specify the files and/or directories that contain -# documented source files. You may enter file names like "myfile.cpp" or -# directories like "/usr/src/myproject". Separate the files or directories -# with spaces. - -INPUT = - -# This tag can be used to specify the character encoding of the source files -# that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is -# also the default input encoding. Doxygen uses libiconv (or the iconv built -# into libc) for the transcoding. See http://www.gnu.org/software/libiconv for -# the list of possible encodings. - -INPUT_ENCODING = UTF-8 - -# If the value of the INPUT tag contains directories, you can use the -# FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp -# and *.h) to filter out the source-files in the directories. If left -# blank the following patterns are tested: -# *.c *.cc *.cxx *.cpp *.c++ *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh *.hxx -# *.hpp *.h++ *.idl *.odl *.cs *.php *.php3 *.inc *.m *.mm *.py *.f90 - -FILE_PATTERNS = mainpage.txt *.c *.cc *.cxx *.cpp *.c++ *.h *.hh *.hxx *.hpp *.h++ - -# The RECURSIVE tag can be used to turn specify whether or not subdirectories -# should be searched for input files as well. Possible values are YES and NO. -# If left blank NO is used. - -RECURSIVE = YES - -# The EXCLUDE tag can be used to specify files and/or directories that should -# excluded from the INPUT source files. This way you can easily exclude a -# subdirectory from a directory tree whose root is specified with the INPUT tag. - -EXCLUDE = - -# The EXCLUDE_SYMLINKS tag can be used select whether or not files or -# directories that are symbolic links (a Unix filesystem feature) are excluded -# from the input. - -EXCLUDE_SYMLINKS = NO - -# If the value of the INPUT tag contains directories, you can use the -# EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude -# certain files from those directories. Note that the wildcards are matched -# against the file with absolute path, so to exclude all test directories -# for example use the pattern */test/* - -EXCLUDE_PATTERNS = */io_src/* - -# The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names -# (namespaces, classes, functions, etc.) that should be excluded from the -# output. The symbol name can be a fully qualified name, a word, or if the -# wildcard * is used, a substring. Examples: ANamespace, AClass, -# AClass::ANamespace, ANamespace::*Test - -EXCLUDE_SYMBOLS = - -# The EXAMPLE_PATH tag can be used to specify one or more files or -# directories that contain example code fragments that are included (see -# the \include command). - -EXAMPLE_PATH = - -# If the value of the EXAMPLE_PATH tag contains directories, you can use the -# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp -# and *.h) to filter out the source-files in the directories. If left -# blank all files are included. - -EXAMPLE_PATTERNS = - -# If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be -# searched for input files to be used with the \include or \dontinclude -# commands irrespective of the value of the RECURSIVE tag. -# Possible values are YES and NO. If left blank NO is used. - -EXAMPLE_RECURSIVE = NO - -# The IMAGE_PATH tag can be used to specify one or more files or -# directories that contain image that are included in the documentation (see -# the \image command). - -IMAGE_PATH = - -# The INPUT_FILTER tag can be used to specify a program that doxygen should -# invoke to filter for each input file. Doxygen will invoke the filter program -# by executing (via popen()) the command <filter> <input-file>, where <filter> -# is the value of the INPUT_FILTER tag, and <input-file> is the name of an -# input file. Doxygen will then use the output that the filter program writes -# to standard output. If FILTER_PATTERNS is specified, this tag will be -# ignored. - -INPUT_FILTER = - -# The FILTER_PATTERNS tag can be used to specify filters on a per file pattern -# basis. Doxygen will compare the file name with each pattern and apply the -# filter if there is a match. The filters are a list of the form: -# pattern=filter (like *.cpp=my_cpp_filter). See INPUT_FILTER for further -# info on how filters are used. If FILTER_PATTERNS is empty, INPUT_FILTER -# is applied to all files. - -FILTER_PATTERNS = - -# If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using -# INPUT_FILTER) will be used to filter the input files when producing source -# files to browse (i.e. when SOURCE_BROWSER is set to YES). - -FILTER_SOURCE_FILES = NO - -#--------------------------------------------------------------------------- -# configuration options related to source browsing -#--------------------------------------------------------------------------- - -# If the SOURCE_BROWSER tag is set to YES then a list of source files will -# be generated. Documented entities will be cross-referenced with these sources. -# Note: To get rid of all source code in the generated output, make sure also -# VERBATIM_HEADERS is set to NO. - -SOURCE_BROWSER = YES - -# Setting the INLINE_SOURCES tag to YES will include the body -# of functions and classes directly in the documentation. - -INLINE_SOURCES = NO - -# Setting the STRIP_CODE_COMMENTS tag to YES (the default) will instruct -# doxygen to hide any special comment blocks from generated source code -# fragments. Normal C and C++ comments will always remain visible. - -STRIP_CODE_COMMENTS = YES - -# If the REFERENCED_BY_RELATION tag is set to YES -# then for each documented function all documented -# functions referencing it will be listed. - -REFERENCED_BY_RELATION = YES - -# If the REFERENCES_RELATION tag is set to YES -# then for each documented function all documented entities -# called/used by that function will be listed. - -REFERENCES_RELATION = YES - -# If the REFERENCES_LINK_SOURCE tag is set to YES (the default) -# and SOURCE_BROWSER tag is set to YES, then the hyperlinks from -# functions in REFERENCES_RELATION and REFERENCED_BY_RELATION lists will -# link to the source code. Otherwise they will link to the documentstion. - -REFERENCES_LINK_SOURCE = YES - -# If the USE_HTAGS tag is set to YES then the references to source code -# will point to the HTML generated by the htags(1) tool instead of doxygen -# built-in source browser. The htags tool is part of GNU's global source -# tagging system (see http://www.gnu.org/software/global/global.html). You -# will need version 4.8.6 or higher. - -USE_HTAGS = NO - -# If the VERBATIM_HEADERS tag is set to YES (the default) then Doxygen -# will generate a verbatim copy of the header file for each class for -# which an include is specified. Set to NO to disable this. - -VERBATIM_HEADERS = YES - -#--------------------------------------------------------------------------- -# configuration options related to the alphabetical class index -#--------------------------------------------------------------------------- - -# If the ALPHABETICAL_INDEX tag is set to YES, an alphabetical index -# of all compounds will be generated. Enable this if the project -# contains a lot of classes, structs, unions or interfaces. - -ALPHABETICAL_INDEX = YES - -# If the alphabetical index is enabled (see ALPHABETICAL_INDEX) then -# the COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns -# in which this list will be split (can be a number in the range [1..20]) - -COLS_IN_ALPHA_INDEX = 5 - -# In case all classes in a project start with a common prefix, all -# classes will be put under the same header in the alphabetical index. -# The IGNORE_PREFIX tag can be used to specify one or more prefixes that -# should be ignored while generating the index headers. - -IGNORE_PREFIX = - -#--------------------------------------------------------------------------- -# configuration options related to the HTML output -#--------------------------------------------------------------------------- - -# If the GENERATE_HTML tag is set to YES (the default) Doxygen will -# generate HTML output. - -GENERATE_HTML = YES - -# The HTML_OUTPUT tag is used to specify where the HTML docs will be put. -# If a relative path is entered the value of OUTPUT_DIRECTORY will be -# put in front of it. If left blank `html' will be used as the default path. - -HTML_OUTPUT = html - -# The HTML_FILE_EXTENSION tag can be used to specify the file extension for -# each generated HTML page (for example: .htm,.php,.asp). If it is left blank -# doxygen will generate files with .html extension. - -HTML_FILE_EXTENSION = .html - -# The HTML_HEADER tag can be used to specify a personal HTML header for -# each generated HTML page. If it is left blank doxygen will generate a -# standard header. - -HTML_HEADER = - -# The HTML_FOOTER tag can be used to specify a personal HTML footer for -# each generated HTML page. If it is left blank doxygen will generate a -# standard footer. - -HTML_FOOTER = - -# The HTML_STYLESHEET tag can be used to specify a user-defined cascading -# style sheet that is used by each HTML page. It can be used to -# fine-tune the look of the HTML output. If the tag is left blank doxygen -# will generate a default style sheet. Note that doxygen will try to copy -# the style sheet file to the HTML output directory, so don't put your own -# stylesheet in the HTML output directory as well, or it will be erased! - -HTML_STYLESHEET = - -# If the HTML_ALIGN_MEMBERS tag is set to YES, the members of classes, -# files or namespaces will be aligned in HTML using tables. If set to -# NO a bullet list will be used. - -HTML_ALIGN_MEMBERS = YES - -# If the GENERATE_HTMLHELP tag is set to YES, additional index files -# will be generated that can be used as input for tools like the -# Microsoft HTML help workshop to generate a compiled HTML help file (.chm) -# of the generated HTML documentation. - -GENERATE_HTMLHELP = NO - -# If the GENERATE_DOCSET tag is set to YES, additional index files -# will be generated that can be used as input for Apple's Xcode 3 -# integrated development environment, introduced with OSX 10.5 (Leopard). -# To create a documentation set, doxygen will generate a Makefile in the -# HTML output directory. Running make will produce the docset in that -# directory and running "make install" will install the docset in -# ~/Library/Developer/Shared/Documentation/DocSets so that Xcode will find -# it at startup. - -GENERATE_DOCSET = NO - -# When GENERATE_DOCSET tag is set to YES, this tag determines the name of the -# feed. A documentation feed provides an umbrella under which multiple -# documentation sets from a single provider (such as a company or product suite) -# can be grouped. - -DOCSET_FEEDNAME = "Doxygen generated docs" - -# When GENERATE_DOCSET tag is set to YES, this tag specifies a string that -# should uniquely identify the documentation set bundle. This should be a -# reverse domain-name style string, e.g. com.mycompany.MyDocSet. Doxygen -# will append .docset to the name. - -DOCSET_BUNDLE_ID = org.doxygen.Project - -# If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML -# documentation will contain sections that can be hidden and shown after the -# page has loaded. For this to work a browser that supports -# JavaScript and DHTML is required (for instance Mozilla 1.0+, Firefox -# Netscape 6.0+, Internet explorer 5.0+, Konqueror, or Safari). - -HTML_DYNAMIC_SECTIONS = NO - -# If the GENERATE_HTMLHELP tag is set to YES, the CHM_FILE tag can -# be used to specify the file name of the resulting .chm file. You -# can add a path in front of the file if the result should not be -# written to the html output directory. - -CHM_FILE = - -# If the GENERATE_HTMLHELP tag is set to YES, the HHC_LOCATION tag can -# be used to specify the location (absolute path including file name) of -# the HTML help compiler (hhc.exe). If non-empty doxygen will try to run -# the HTML help compiler on the generated index.hhp. - -HHC_LOCATION = - -# If the GENERATE_HTMLHELP tag is set to YES, the GENERATE_CHI flag -# controls if a separate .chi index file is generated (YES) or that -# it should be included in the master .chm file (NO). - -GENERATE_CHI = NO - -# If the GENERATE_HTMLHELP tag is set to YES, the CHM_INDEX_ENCODING -# is used to encode HtmlHelp index (hhk), content (hhc) and project file -# content. - -CHM_INDEX_ENCODING = - -# If the GENERATE_HTMLHELP tag is set to YES, the BINARY_TOC flag -# controls whether a binary table of contents is generated (YES) or a -# normal table of contents (NO) in the .chm file. - -BINARY_TOC = NO - -# The TOC_EXPAND flag can be set to YES to add extra items for group members -# to the contents of the HTML help documentation and to the tree view. - -TOC_EXPAND = NO - -# The DISABLE_INDEX tag can be used to turn on/off the condensed index at -# top of each HTML page. The value NO (the default) enables the index and -# the value YES disables it. - -DISABLE_INDEX = NO - -# This tag can be used to set the number of enum values (range [1..20]) -# that doxygen will group on one line in the generated HTML documentation. - -ENUM_VALUES_PER_LINE = 4 - -# The GENERATE_TREEVIEW tag is used to specify whether a tree-like index -# structure should be generated to display hierarchical information. -# If the tag value is set to FRAME, a side panel will be generated -# containing a tree-like index structure (just like the one that -# is generated for HTML Help). For this to work a browser that supports -# JavaScript, DHTML, CSS and frames is required (for instance Mozilla 1.0+, -# Netscape 6.0+, Internet explorer 5.0+, or Konqueror). Windows users are -# probably better off using the HTML help feature. Other possible values -# for this tag are: HIERARCHIES, which will generate the Groups, Directories, -# and Class Hiererachy pages using a tree view instead of an ordered list; -# ALL, which combines the behavior of FRAME and HIERARCHIES; and NONE, which -# disables this behavior completely. For backwards compatibility with previous -# releases of Doxygen, the values YES and NO are equivalent to FRAME and NONE -# respectively. - -GENERATE_TREEVIEW = YES - -# If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be -# used to set the initial width (in pixels) of the frame in which the tree -# is shown. - -TREEVIEW_WIDTH = 250 - -# Use this tag to change the font size of Latex formulas included -# as images in the HTML documentation. The default is 10. Note that -# when you change the font size after a successful doxygen run you need -# to manually remove any form_*.png images from the HTML output directory -# to force them to be regenerated. - -FORMULA_FONTSIZE = 10 - -#--------------------------------------------------------------------------- -# configuration options related to the LaTeX output -#--------------------------------------------------------------------------- - -# If the GENERATE_LATEX tag is set to YES (the default) Doxygen will -# generate Latex output. - -GENERATE_LATEX = NO - -# The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put. -# If a relative path is entered the value of OUTPUT_DIRECTORY will be -# put in front of it. If left blank `latex' will be used as the default path. - -LATEX_OUTPUT = latex - -# The LATEX_CMD_NAME tag can be used to specify the LaTeX command name to be -# invoked. If left blank `latex' will be used as the default command name. - -LATEX_CMD_NAME = latex - -# The MAKEINDEX_CMD_NAME tag can be used to specify the command name to -# generate index for LaTeX. If left blank `makeindex' will be used as the -# default command name. - -MAKEINDEX_CMD_NAME = makeindex - -# If the COMPACT_LATEX tag is set to YES Doxygen generates more compact -# LaTeX documents. This may be useful for small projects and may help to -# save some trees in general. - -COMPACT_LATEX = NO - -# The PAPER_TYPE tag can be used to set the paper type that is used -# by the printer. Possible values are: a4, a4wide, letter, legal and -# executive. If left blank a4wide will be used. - -PAPER_TYPE = a4wide - -# The EXTRA_PACKAGES tag can be to specify one or more names of LaTeX -# packages that should be included in the LaTeX output. - -EXTRA_PACKAGES = - -# The LATEX_HEADER tag can be used to specify a personal LaTeX header for -# the generated latex document. The header should contain everything until -# the first chapter. If it is left blank doxygen will generate a -# standard header. Notice: only use this tag if you know what you are doing! - -LATEX_HEADER = - -# If the PDF_HYPERLINKS tag is set to YES, the LaTeX that is generated -# is prepared for conversion to pdf (using ps2pdf). The pdf file will -# contain links (just like the HTML output) instead of page references -# This makes the output suitable for online browsing using a pdf viewer. - -PDF_HYPERLINKS = YES - -# If the USE_PDFLATEX tag is set to YES, pdflatex will be used instead of -# plain latex in the generated Makefile. Set this option to YES to get a -# higher quality PDF documentation. - -USE_PDFLATEX = YES - -# If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \\batchmode. -# command to the generated LaTeX files. This will instruct LaTeX to keep -# running if errors occur, instead of asking the user for help. -# This option is also used when generating formulas in HTML. - -LATEX_BATCHMODE = NO - -# If LATEX_HIDE_INDICES is set to YES then doxygen will not -# include the index chapters (such as File Index, Compound Index, etc.) -# in the output. - -LATEX_HIDE_INDICES = NO - -#--------------------------------------------------------------------------- -# configuration options related to the RTF output -#--------------------------------------------------------------------------- - -# If the GENERATE_RTF tag is set to YES Doxygen will generate RTF output -# The RTF output is optimized for Word 97 and may not look very pretty with -# other RTF readers or editors. - -GENERATE_RTF = YES - -# The RTF_OUTPUT tag is used to specify where the RTF docs will be put. -# If a relative path is entered the value of OUTPUT_DIRECTORY will be -# put in front of it. If left blank `rtf' will be used as the default path. - -RTF_OUTPUT = rtf - -# If the COMPACT_RTF tag is set to YES Doxygen generates more compact -# RTF documents. This may be useful for small projects and may help to -# save some trees in general. - -COMPACT_RTF = NO - -# If the RTF_HYPERLINKS tag is set to YES, the RTF that is generated -# will contain hyperlink fields. The RTF file will -# contain links (just like the HTML output) instead of page references. -# This makes the output suitable for online browsing using WORD or other -# programs which support those fields. -# Note: wordpad (write) and others do not support links. - -RTF_HYPERLINKS = NO - -# Load stylesheet definitions from file. Syntax is similar to doxygen's -# config file, i.e. a series of assignments. You only have to provide -# replacements, missing definitions are set to their default value. - -RTF_STYLESHEET_FILE = - -# Set optional variables used in the generation of an rtf document. -# Syntax is similar to doxygen's config file. - -RTF_EXTENSIONS_FILE = - -#--------------------------------------------------------------------------- -# configuration options related to the man page output -#--------------------------------------------------------------------------- - -# If the GENERATE_MAN tag is set to YES (the default) Doxygen will -# generate man pages - -GENERATE_MAN = NO - -# The MAN_OUTPUT tag is used to specify where the man pages will be put. -# If a relative path is entered the value of OUTPUT_DIRECTORY will be -# put in front of it. If left blank `man' will be used as the default path. - -MAN_OUTPUT = man - -# The MAN_EXTENSION tag determines the extension that is added to -# the generated man pages (default is the subroutine's section .3) - -MAN_EXTENSION = .3 - -# If the MAN_LINKS tag is set to YES and Doxygen generates man output, -# then it will generate one additional man file for each entity -# documented in the real man page(s). These additional files -# only source the real man page, but without them the man command -# would be unable to find the correct page. The default is NO. - -MAN_LINKS = NO - -#--------------------------------------------------------------------------- -# configuration options related to the XML output -#--------------------------------------------------------------------------- - -# If the GENERATE_XML tag is set to YES Doxygen will -# generate an XML file that captures the structure of -# the code including all documentation. - -GENERATE_XML = NO - -# The XML_OUTPUT tag is used to specify where the XML pages will be put. -# If a relative path is entered the value of OUTPUT_DIRECTORY will be -# put in front of it. If left blank `xml' will be used as the default path. - -XML_OUTPUT = xml - -# The XML_SCHEMA tag can be used to specify an XML schema, -# which can be used by a validating XML parser to check the -# syntax of the XML files. - -XML_SCHEMA = - -# The XML_DTD tag can be used to specify an XML DTD, -# which can be used by a validating XML parser to check the -# syntax of the XML files. - -XML_DTD = - -# If the XML_PROGRAMLISTING tag is set to YES Doxygen will -# dump the program listings (including syntax highlighting -# and cross-referencing information) to the XML output. Note that -# enabling this will significantly increase the size of the XML output. - -XML_PROGRAMLISTING = YES - -#--------------------------------------------------------------------------- -# configuration options for the AutoGen Definitions output -#--------------------------------------------------------------------------- - -# If the GENERATE_AUTOGEN_DEF tag is set to YES Doxygen will -# generate an AutoGen Definitions (see autogen.sf.net) file -# that captures the structure of the code including all -# documentation. Note that this feature is still experimental -# and incomplete at the moment. - -GENERATE_AUTOGEN_DEF = NO - -#--------------------------------------------------------------------------- -# configuration options related to the Perl module output -#--------------------------------------------------------------------------- - -# If the GENERATE_PERLMOD tag is set to YES Doxygen will -# generate a Perl module file that captures the structure of -# the code including all documentation. Note that this -# feature is still experimental and incomplete at the -# moment. - -GENERATE_PERLMOD = NO - -# If the PERLMOD_LATEX tag is set to YES Doxygen will generate -# the necessary Makefile rules, Perl scripts and LaTeX code to be able -# to generate PDF and DVI output from the Perl module output. - -PERLMOD_LATEX = NO - -# If the PERLMOD_PRETTY tag is set to YES the Perl module output will be -# nicely formatted so it can be parsed by a human reader. This is useful -# if you want to understand what is going on. On the other hand, if this -# tag is set to NO the size of the Perl module output will be much smaller -# and Perl will parse it just the same. - -PERLMOD_PRETTY = YES - -# The names of the make variables in the generated doxyrules.make file -# are prefixed with the string contained in PERLMOD_MAKEVAR_PREFIX. -# This is useful so different doxyrules.make files included by the same -# Makefile don't overwrite each other's variables. - -PERLMOD_MAKEVAR_PREFIX = - -#--------------------------------------------------------------------------- -# Configuration options related to the preprocessor -#--------------------------------------------------------------------------- - -# If the ENABLE_PREPROCESSING tag is set to YES (the default) Doxygen will -# evaluate all C-preprocessor directives found in the sources and include -# files. - -ENABLE_PREPROCESSING = YES - -# If the MACRO_EXPANSION tag is set to YES Doxygen will expand all macro -# names in the source code. If set to NO (the default) only conditional -# compilation will be performed. Macro expansion can be done in a controlled -# way by setting EXPAND_ONLY_PREDEF to YES. - -MACRO_EXPANSION = NO - -# If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES -# then the macro expansion is limited to the macros specified with the -# PREDEFINED and EXPAND_AS_DEFINED tags. - -EXPAND_ONLY_PREDEF = NO - -# If the SEARCH_INCLUDES tag is set to YES (the default) the includes files -# in the INCLUDE_PATH (see below) will be search if a #include is found. - -SEARCH_INCLUDES = YES - -# The INCLUDE_PATH tag can be used to specify one or more directories that -# contain include files that are not input files but should be processed by -# the preprocessor. - -INCLUDE_PATH = - -# You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard -# patterns (like *.h and *.hpp) to filter out the header-files in the -# directories. If left blank, the patterns specified with FILE_PATTERNS will -# be used. - -INCLUDE_FILE_PATTERNS = - -# The PREDEFINED tag can be used to specify one or more macro names that -# are defined before the preprocessor is started (similar to the -D option of -# gcc). The argument of the tag is a list of macros of the form: name -# or name=definition (no spaces). If the definition and the = are -# omitted =1 is assumed. To prevent a macro definition from being -# undefined via #undef or recursively expanded use the := operator -# instead of the = operator. - -PREDEFINED = - -# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then -# this tag can be used to specify a list of macro names that should be expanded. -# The macro definition that is found in the sources will be used. -# Use the PREDEFINED tag if you want to use a different macro definition. - -EXPAND_AS_DEFINED = - -# If the SKIP_FUNCTION_MACROS tag is set to YES (the default) then -# doxygen's preprocessor will remove all function-like macros that are alone -# on a line, have an all uppercase name, and do not end with a semicolon. Such -# function macros are typically used for boiler-plate code, and will confuse -# the parser if not removed. - -SKIP_FUNCTION_MACROS = YES - -#--------------------------------------------------------------------------- -# Configuration::additions related to external references -#--------------------------------------------------------------------------- - -# The TAGFILES option can be used to specify one or more tagfiles. -# Optionally an initial location of the external documentation -# can be added for each tagfile. The format of a tag file without -# this location is as follows: -# TAGFILES = file1 file2 ... -# Adding location for the tag files is done as follows: -# TAGFILES = file1=loc1 "file2 = loc2" ... -# where "loc1" and "loc2" can be relative or absolute paths or -# URLs. If a location is present for each tag, the installdox tool -# does not have to be run to correct the links. -# Note that each tag file must have a unique name -# (where the name does NOT include the path) -# If a tag file is not located in the directory in which doxygen -# is run, you must also specify the path to the tagfile here. - -TAGFILES = - -# When a file name is specified after GENERATE_TAGFILE, doxygen will create -# a tag file that is based on the input files it reads. - -GENERATE_TAGFILE = - -# If the ALLEXTERNALS tag is set to YES all external classes will be listed -# in the class index. If set to NO only the inherited external classes -# will be listed. - -ALLEXTERNALS = NO - -# If the EXTERNAL_GROUPS tag is set to YES all external groups will be listed -# in the modules index. If set to NO, only the current project's groups will -# be listed. - -EXTERNAL_GROUPS = YES - -# The PERL_PATH should be the absolute path and name of the perl script -# interpreter (i.e. the result of `which perl'). - -PERL_PATH = /usr/bin/perl - -#--------------------------------------------------------------------------- -# Configuration options related to the dot tool -#--------------------------------------------------------------------------- - -# If the CLASS_DIAGRAMS tag is set to YES (the default) Doxygen will -# generate a inheritance diagram (in HTML, RTF and LaTeX) for classes with base -# or super classes. Setting the tag to NO turns the diagrams off. Note that -# this option is superseded by the HAVE_DOT option below. This is only a -# fallback. It is recommended to install and use dot, since it yields more -# powerful graphs. - -CLASS_DIAGRAMS = YES - -# You can define message sequence charts within doxygen comments using the \msc -# command. Doxygen will then run the mscgen tool (see -# http://www.mcternan.me.uk/mscgen/) to produce the chart and insert it in the -# documentation. The MSCGEN_PATH tag allows you to specify the directory where -# the mscgen tool resides. If left empty the tool is assumed to be found in the -# default search path. - -MSCGEN_PATH = - -# If set to YES, the inheritance and collaboration graphs will hide -# inheritance and usage relations if the target is undocumented -# or is not a class. - -HIDE_UNDOC_RELATIONS = YES - -# If you set the HAVE_DOT tag to YES then doxygen will assume the dot tool is -# available from the path. This tool is part of Graphviz, a graph visualization -# toolkit from AT&T and Lucent Bell Labs. The other options in this section -# have no effect if this option is set to NO (the default) - -HAVE_DOT = YES - -# By default doxygen will write a font called FreeSans.ttf to the output -# directory and reference it in all dot files that doxygen generates. This -# font does not include all possible unicode characters however, so when you need -# these (or just want a differently looking font) you can specify the font name -# using DOT_FONTNAME. You need need to make sure dot is able to find the font, -# which can be done by putting it in a standard location or by setting the -# DOTFONTPATH environment variable or by setting DOT_FONTPATH to the directory -# containing the font. - -DOT_FONTNAME = FreeSans - -# By default doxygen will tell dot to use the output directory to look for the -# FreeSans.ttf font (which doxygen will put there itself). If you specify a -# different font using DOT_FONTNAME you can set the path where dot -# can find it using this tag. - -DOT_FONTPATH = - -# If the CLASS_GRAPH and HAVE_DOT tags are set to YES then doxygen -# will generate a graph for each documented class showing the direct and -# indirect inheritance relations. Setting this tag to YES will force the -# the CLASS_DIAGRAMS tag to NO. - -CLASS_GRAPH = YES - -# If the COLLABORATION_GRAPH and HAVE_DOT tags are set to YES then doxygen -# will generate a graph for each documented class showing the direct and -# indirect implementation dependencies (inheritance, containment, and -# class references variables) of the class with other documented classes. - -COLLABORATION_GRAPH = YES - -# If the GROUP_GRAPHS and HAVE_DOT tags are set to YES then doxygen -# will generate a graph for groups, showing the direct groups dependencies - -GROUP_GRAPHS = YES - -# If the UML_LOOK tag is set to YES doxygen will generate inheritance and -# collaboration diagrams in a style similar to the OMG's Unified Modeling -# Language. - -UML_LOOK = NO - -# If set to YES, the inheritance and collaboration graphs will show the -# relations between templates and their instances. - -TEMPLATE_RELATIONS = NO - -# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDE_GRAPH, and HAVE_DOT -# tags are set to YES then doxygen will generate a graph for each documented -# file showing the direct and indirect include dependencies of the file with -# other documented files. - -INCLUDE_GRAPH = YES - -# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDED_BY_GRAPH, and -# HAVE_DOT tags are set to YES then doxygen will generate a graph for each -# documented header file showing the documented files that directly or -# indirectly include this file. - -INCLUDED_BY_GRAPH = YES - -# If the CALL_GRAPH and HAVE_DOT options are set to YES then -# doxygen will generate a call dependency graph for every global function -# or class method. Note that enabling this option will significantly increase -# the time of a run. So in most cases it will be better to enable call graphs -# for selected functions only using the \callgraph command. - -CALL_GRAPH = NO - -# If the CALLER_GRAPH and HAVE_DOT tags are set to YES then -# doxygen will generate a caller dependency graph for every global function -# or class method. Note that enabling this option will significantly increase -# the time of a run. So in most cases it will be better to enable caller -# graphs for selected functions only using the \callergraph command. - -CALLER_GRAPH = NO - -# If the GRAPHICAL_HIERARCHY and HAVE_DOT tags are set to YES then doxygen -# will graphical hierarchy of all classes instead of a textual one. - -GRAPHICAL_HIERARCHY = YES - -# If the DIRECTORY_GRAPH, SHOW_DIRECTORIES and HAVE_DOT tags are set to YES -# then doxygen will show the dependencies a directory has on other directories -# in a graphical way. The dependency relations are determined by the #include -# relations between the files in the directories. - -DIRECTORY_GRAPH = YES - -# The DOT_IMAGE_FORMAT tag can be used to set the image format of the images -# generated by dot. Possible values are png, jpg, or gif -# If left blank png will be used. - -DOT_IMAGE_FORMAT = png - -# The tag DOT_PATH can be used to specify the path where the dot tool can be -# found. If left blank, it is assumed the dot tool can be found in the path. - -DOT_PATH = - -# The DOTFILE_DIRS tag can be used to specify one or more directories that -# contain dot files that are included in the documentation (see the -# \dotfile command). - -DOTFILE_DIRS = - -# The DOT_GRAPH_MAX_NODES tag can be used to set the maximum number of -# nodes that will be shown in the graph. If the number of nodes in a graph -# becomes larger than this value, doxygen will truncate the graph, which is -# visualized by representing a node as a red box. Note that doxygen if the -# number of direct children of the root node in a graph is already larger than -# DOT_GRAPH_MAX_NODES then the graph will not be shown at all. Also note -# that the size of a graph can be further restricted by MAX_DOT_GRAPH_DEPTH. - -DOT_GRAPH_MAX_NODES = 50 - -# The MAX_DOT_GRAPH_DEPTH tag can be used to set the maximum depth of the -# graphs generated by dot. A depth value of 3 means that only nodes reachable -# from the root by following a path via at most 3 edges will be shown. Nodes -# that lay further from the root node will be omitted. Note that setting this -# option to 1 or 2 may greatly reduce the computation time needed for large -# code bases. Also note that the size of a graph can be further restricted by -# DOT_GRAPH_MAX_NODES. Using a depth of 0 means no depth restriction. - -MAX_DOT_GRAPH_DEPTH = 0 - -# Set the DOT_TRANSPARENT tag to YES to generate images with a transparent -# background. This is enabled by default, which results in a transparent -# background. Warning: Depending on the platform used, enabling this option -# may lead to badly anti-aliased labels on the edges of a graph (i.e. they -# become hard to read). - -DOT_TRANSPARENT = YES - -# Set the DOT_MULTI_TARGETS tag to YES allow dot to generate multiple output -# files in one run (i.e. multiple -o and -T options on the command line). This -# makes dot run faster, but since only newer versions of dot (>1.8.10) -# support this, this feature is disabled by default. - -DOT_MULTI_TARGETS = NO - -# If the GENERATE_LEGEND tag is set to YES (the default) Doxygen will -# generate a legend page explaining the meaning of the various boxes and -# arrows in the dot generated graphs. - -GENERATE_LEGEND = YES - -# If the DOT_CLEANUP tag is set to YES (the default) Doxygen will -# remove the intermediate dot files that are used to generate -# the various graphs. - -DOT_CLEANUP = YES - -#--------------------------------------------------------------------------- -# Configuration::additions related to the search engine -#--------------------------------------------------------------------------- - -# The SEARCHENGINE tag specifies whether or not a search engine should be -# used. If set to NO the values of all tags below this one will be ignored. - -SEARCHENGINE = NO diff --git a/trick_source/sim_services/Clock/src/GetTimeOfDayClock.cpp b/trick_source/sim_services/Clock/GetTimeOfDayClock.cpp similarity index 92% rename from trick_source/sim_services/Clock/src/GetTimeOfDayClock.cpp rename to trick_source/sim_services/Clock/GetTimeOfDayClock.cpp index 0afb190b..6761ace4 100644 --- a/trick_source/sim_services/Clock/src/GetTimeOfDayClock.cpp +++ b/trick_source/sim_services/Clock/GetTimeOfDayClock.cpp @@ -14,9 +14,9 @@ PROGRAMMERS: #include <time.h> #endif -#include "sim_services/Clock/include/GetTimeOfDayClock.hh" -#include "sim_services/Message/include/message_proto.h" -#include "sim_services/Message/include/message_type.h" +#include "trick/GetTimeOfDayClock.hh" +#include "trick/message_proto.h" +#include "trick/message_type.h" /** @details diff --git a/trick_source/sim_services/Clock/Makefile b/trick_source/sim_services/Clock/Makefile index 3029433b..a181cedf 100644 --- a/trick_source/sim_services/Clock/Makefile +++ b/trick_source/sim_services/Clock/Makefile @@ -1,5 +1,5 @@ -include ${TRICK_HOME}/makefiles/Makefile.common -include ${TRICK_HOME}/makefiles/Makefile.tricklib +include ${TRICK_HOME}/share/trick/makefiles/Makefile.common +include ${TRICK_HOME}/share/trick/makefiles/Makefile.tricklib -include Makefile_deps diff --git a/trick_source/sim_services/Clock/Makefile_deps b/trick_source/sim_services/Clock/Makefile_deps index 8b44855e..19cea23e 100644 --- a/trick_source/sim_services/Clock/Makefile_deps +++ b/trick_source/sim_services/Clock/Makefile_deps @@ -1,9 +1,23 @@ -object_${TRICK_HOST_CPU}/Clock.o: src/Clock.cpp \ - ${TRICK_HOME}/trick_source/sim_services/Clock/include/Clock.hh -object_${TRICK_HOST_CPU}/GetTimeOfDayClock.o: src/GetTimeOfDayClock.cpp \ - ${TRICK_HOME}/trick_source/sim_services/Clock/include/GetTimeOfDayClock.hh \ - ${TRICK_HOME}/trick_source/sim_services/Clock/include/Clock.hh \ - ${TRICK_HOME}/trick_source/sim_services/include/release.h -object_${TRICK_HOST_CPU}/clock_c_intf.o: src/clock_c_intf.cpp \ - ${TRICK_HOME}/trick_source/sim_services/Clock/include/Clock.hh \ - ${TRICK_HOME}/trick_source/sim_services/Clock/include/clock_proto.h +object_${TRICK_HOST_CPU}/GetTimeOfDayClock.o: GetTimeOfDayClock.cpp \ + ${TRICK_HOME}/include/trick/GetTimeOfDayClock.hh \ + ${TRICK_HOME}/include/trick/Clock.hh \ + ${TRICK_HOME}/include/trick/message_proto.h \ + ${TRICK_HOME}/include/trick/message_type.h +object_${TRICK_HOST_CPU}/BC635Clock.o: BC635Clock.cpp \ + ${TRICK_HOME}/include/trick/BC635Clock.hh \ + ${TRICK_HOME}/include/trick/Clock.hh \ + ${TRICK_HOME}/include/trick/message_proto.h \ + ${TRICK_HOME}/include/trick/message_type.h \ + ${TRICK_HOME}/include/trick/release.h +object_${TRICK_HOST_CPU}/Clock.o: Clock.cpp ${TRICK_HOME}/include/trick/Clock.hh \ + ${TRICK_HOME}/include/trick/exec_proto.h \ + ${TRICK_HOME}/include/trick/sim_mode.h \ + ${TRICK_HOME}/include/trick/release.h +object_${TRICK_HOST_CPU}/TPROCTEClock.o: TPROCTEClock.cpp \ + ${TRICK_HOME}/include/trick/TPROCTEClock.hh \ + ${TRICK_HOME}/include/trick/Clock.hh \ + ${TRICK_HOME}/include/trick/message_proto.h \ + ${TRICK_HOME}/include/trick/message_type.h \ + ${TRICK_HOME}/include/trick/release.h +object_${TRICK_HOST_CPU}/clock_c_intf.o: clock_c_intf.cpp ${TRICK_HOME}/include/trick/Clock.hh \ + ${TRICK_HOME}/include/trick/clock_proto.h diff --git a/trick_source/sim_services/Clock/src/TPROCTEClock.cpp b/trick_source/sim_services/Clock/TPROCTEClock.cpp similarity index 93% rename from trick_source/sim_services/Clock/src/TPROCTEClock.cpp rename to trick_source/sim_services/Clock/TPROCTEClock.cpp index e62403a4..f5f799a1 100644 --- a/trick_source/sim_services/Clock/src/TPROCTEClock.cpp +++ b/trick_source/sim_services/Clock/TPROCTEClock.cpp @@ -7,10 +7,10 @@ PROGRAMMERS: #include <stdio.h> -#include "sim_services/Clock/include/TPROCTEClock.hh" -#include "sim_services/Message/include/message_proto.h" -#include "sim_services/Message/include/message_type.h" -#include "sim_services/include/release.h" +#include "trick/TPROCTEClock.hh" +#include "trick/message_proto.h" +#include "trick/message_type.h" +#include "trick/release.h" /** @details diff --git a/trick_source/sim_services/Clock/src/clock_c_intf.cpp b/trick_source/sim_services/Clock/clock_c_intf.cpp similarity index 87% rename from trick_source/sim_services/Clock/src/clock_c_intf.cpp rename to trick_source/sim_services/Clock/clock_c_intf.cpp index a606fe50..3a1fae9e 100644 --- a/trick_source/sim_services/Clock/src/clock_c_intf.cpp +++ b/trick_source/sim_services/Clock/clock_c_intf.cpp @@ -1,6 +1,6 @@ -#include "sim_services/Clock/include/Clock.hh" -#include "sim_services/Clock/include/clock_proto.h" +#include "trick/Clock.hh" +#include "trick/clock_proto.h" extern Trick::Clock * the_clock ; diff --git a/trick_source/sim_services/Clock/design.dox_in b/trick_source/sim_services/Clock/docs/design.dox_in similarity index 100% rename from trick_source/sim_services/Clock/design.dox_in rename to trick_source/sim_services/Clock/docs/design.dox_in diff --git a/trick_source/sim_services/Clock/main_page.dox_in b/trick_source/sim_services/Clock/docs/main_page.dox_in similarity index 100% rename from trick_source/sim_services/Clock/main_page.dox_in rename to trick_source/sim_services/Clock/docs/main_page.dox_in diff --git a/trick_source/sim_services/Clock/requirements.dox_in b/trick_source/sim_services/Clock/docs/requirements.dox_in similarity index 100% rename from trick_source/sim_services/Clock/requirements.dox_in rename to trick_source/sim_services/Clock/docs/requirements.dox_in diff --git a/trick_source/sim_services/Clock/src/makefile b/trick_source/sim_services/Clock/src/makefile deleted file mode 100644 index 753bd7f7..00000000 --- a/trick_source/sim_services/Clock/src/makefile +++ /dev/null @@ -1,6 +0,0 @@ - -all: - ${MAKE} -C .. - -clean: - ${MAKE} -C .. clean diff --git a/trick_source/sim_services/Collect/Makefile b/trick_source/sim_services/Collect/Makefile index 11e3de21..7261c8c1 100644 --- a/trick_source/sim_services/Collect/Makefile +++ b/trick_source/sim_services/Collect/Makefile @@ -1,6 +1,6 @@ -include ${TRICK_HOME}/makefiles/Makefile.common -include ${TRICK_HOME}/makefiles/Makefile.tricklib +include ${TRICK_HOME}/share/trick/makefiles/Makefile.common +include ${TRICK_HOME}/share/trick/makefiles/Makefile.tricklib -include Makefile_deps ifneq ($(DMTCP),) diff --git a/trick_source/sim_services/Collect/Makefile_deps b/trick_source/sim_services/Collect/Makefile_deps index 33a0aed2..456abd3c 100644 --- a/trick_source/sim_services/Collect/Makefile_deps +++ b/trick_source/sim_services/Collect/Makefile_deps @@ -1,5 +1,3 @@ -object_${TRICK_HOST_CPU}/collect.o: src/collect.cpp \ - ${TRICK_HOME}/trick_source/sim_services/include/collect_macros.h \ - ${TRICK_HOME}/trick_source/sim_services/include/exec_proto.h \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/exec_proto.h \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/sim_mode.h +object_${TRICK_HOST_CPU}/collect.o: collect.cpp ${TRICK_HOME}/include/trick/collect_macros.h \ + ${TRICK_HOME}/include/trick/exec_proto.h \ + ${TRICK_HOME}/include/trick/sim_mode.h diff --git a/trick_source/sim_services/Collect/src/collect.cpp b/trick_source/sim_services/Collect/collect.cpp similarity index 98% rename from trick_source/sim_services/Collect/src/collect.cpp rename to trick_source/sim_services/Collect/collect.cpp index 9c550d0a..b22a726e 100644 --- a/trick_source/sim_services/Collect/src/collect.cpp +++ b/trick_source/sim_services/Collect/collect.cpp @@ -1,7 +1,7 @@ #include <stdlib.h> #include <string.h> -#include "sim_services/include/collect_macros.h" +#include "trick/collect_macros.h" /** @brief diff --git a/trick_source/sim_services/Collect/src/makefile b/trick_source/sim_services/Collect/src/makefile deleted file mode 100644 index 753bd7f7..00000000 --- a/trick_source/sim_services/Collect/src/makefile +++ /dev/null @@ -1,6 +0,0 @@ - -all: - ${MAKE} -C .. - -clean: - ${MAKE} -C .. clean diff --git a/trick_source/sim_services/CommandLineArguments/src/CommandLineArguments.cpp b/trick_source/sim_services/CommandLineArguments/CommandLineArguments.cpp similarity index 98% rename from trick_source/sim_services/CommandLineArguments/src/CommandLineArguments.cpp rename to trick_source/sim_services/CommandLineArguments/CommandLineArguments.cpp index 56c58df8..5a5c6fbd 100644 --- a/trick_source/sim_services/CommandLineArguments/src/CommandLineArguments.cpp +++ b/trick_source/sim_services/CommandLineArguments/CommandLineArguments.cpp @@ -19,8 +19,8 @@ #include <string.h> #include <unistd.h> -#include "sim_services/CommandLineArguments/include/CommandLineArguments.hh" -#include "sim_services/MemoryManager/include/memorymanager_c_intf.h" +#include "trick/CommandLineArguments.hh" +#include "trick/memorymanager_c_intf.h" Trick::CommandLineArguments * the_cmd_args ; diff --git a/trick_source/sim_services/CommandLineArguments/Makefile b/trick_source/sim_services/CommandLineArguments/Makefile index 3029433b..a181cedf 100644 --- a/trick_source/sim_services/CommandLineArguments/Makefile +++ b/trick_source/sim_services/CommandLineArguments/Makefile @@ -1,5 +1,5 @@ -include ${TRICK_HOME}/makefiles/Makefile.common -include ${TRICK_HOME}/makefiles/Makefile.tricklib +include ${TRICK_HOME}/share/trick/makefiles/Makefile.common +include ${TRICK_HOME}/share/trick/makefiles/Makefile.tricklib -include Makefile_deps diff --git a/trick_source/sim_services/CommandLineArguments/Makefile_deps b/trick_source/sim_services/CommandLineArguments/Makefile_deps index a0df6b57..8a70d995 100644 --- a/trick_source/sim_services/CommandLineArguments/Makefile_deps +++ b/trick_source/sim_services/CommandLineArguments/Makefile_deps @@ -1,4 +1,12 @@ -object_${TRICK_HOST_CPU}/CommandLineArguments.o: src/CommandLineArguments.cpp \ - ${TRICK_HOME}/trick_source/sim_services/CommandLineArguments/include/CommandLineArguments.hh -object_${TRICK_HOST_CPU}/command_line_c_intf.o: src/command_line_c_intf.cpp \ - ${TRICK_HOME}/trick_source/sim_services/CommandLineArguments/include/CommandLineArguments.hh +object_${TRICK_HOST_CPU}/CommandLineArguments.o: CommandLineArguments.cpp \ + ${TRICK_HOME}/include/trick/CommandLineArguments.hh \ + ${TRICK_HOME}/include/trick/memorymanager_c_intf.h \ + ${TRICK_HOME}/include/trick/parameter_types.h \ + ${TRICK_HOME}/include/trick/attributes.h \ + ${TRICK_HOME}/include/trick/reference.h \ + ${TRICK_HOME}/include/trick/value.h \ + ${TRICK_HOME}/include/trick/dllist.h \ + ${TRICK_HOME}/include/trick/var.h \ + ${TRICK_HOME}/include/trick/io_alloc.h +object_${TRICK_HOST_CPU}/command_line_c_intf.o: command_line_c_intf.cpp \ + ${TRICK_HOME}/include/trick/CommandLineArguments.hh diff --git a/trick_source/sim_services/CommandLineArguments/src/command_line_c_intf.cpp b/trick_source/sim_services/CommandLineArguments/command_line_c_intf.cpp similarity index 97% rename from trick_source/sim_services/CommandLineArguments/src/command_line_c_intf.cpp rename to trick_source/sim_services/CommandLineArguments/command_line_c_intf.cpp index dcabc31e..0d7aeb67 100644 --- a/trick_source/sim_services/CommandLineArguments/src/command_line_c_intf.cpp +++ b/trick_source/sim_services/CommandLineArguments/command_line_c_intf.cpp @@ -12,7 +12,7 @@ PROGRAMMERS: ( Keith Vetter LinCom 6/2003 ) */ #include <iostream> -#include "sim_services/CommandLineArguments/include/CommandLineArguments.hh" +#include "trick/CommandLineArguments.hh" extern Trick::CommandLineArguments * the_cmd_args ; diff --git a/trick_source/sim_services/CommandLineArguments/design.dox_in b/trick_source/sim_services/CommandLineArguments/docs/design.dox_in similarity index 100% rename from trick_source/sim_services/CommandLineArguments/design.dox_in rename to trick_source/sim_services/CommandLineArguments/docs/design.dox_in diff --git a/trick_source/sim_services/CommandLineArguments/main_page.dox_in b/trick_source/sim_services/CommandLineArguments/docs/main_page.dox_in similarity index 100% rename from trick_source/sim_services/CommandLineArguments/main_page.dox_in rename to trick_source/sim_services/CommandLineArguments/docs/main_page.dox_in diff --git a/trick_source/sim_services/CommandLineArguments/requirements.dox_in b/trick_source/sim_services/CommandLineArguments/docs/requirements.dox_in similarity index 100% rename from trick_source/sim_services/CommandLineArguments/requirements.dox_in rename to trick_source/sim_services/CommandLineArguments/docs/requirements.dox_in diff --git a/trick_source/sim_services/CommandLineArguments/src/makefile b/trick_source/sim_services/CommandLineArguments/src/makefile deleted file mode 100644 index 753bd7f7..00000000 --- a/trick_source/sim_services/CommandLineArguments/src/makefile +++ /dev/null @@ -1,6 +0,0 @@ - -all: - ${MAKE} -C .. - -clean: - ${MAKE} -C .. clean diff --git a/trick_source/sim_services/DMTCP/src/DMTCP.cpp b/trick_source/sim_services/DMTCP/DMTCP.cpp similarity index 96% rename from trick_source/sim_services/DMTCP/src/DMTCP.cpp rename to trick_source/sim_services/DMTCP/DMTCP.cpp index bdebb624..9765c53c 100644 --- a/trick_source/sim_services/DMTCP/src/DMTCP.cpp +++ b/trick_source/sim_services/DMTCP/DMTCP.cpp @@ -15,12 +15,12 @@ #include "dmtcpaware.h" #endif -#include "sim_services/DMTCP/include/DMTCP.hh" -#include "sim_services/SimObject/include/SimObject.hh" -#include "sim_services/Executive/include/exec_proto.h" -#include "sim_services/Message/include/message_proto.h" -#include "sim_services/Executive/include/Executive.hh" -#include "sim_services/CheckPointRestart/include/CheckPointRestart.hh" +#include "trick/DMTCP.hh" +#include "trick/SimObject.hh" +#include "trick/exec_proto.h" +#include "trick/message_proto.h" +#include "trick/Executive.hh" +#include "trick/CheckPointRestart.hh" using namespace std; diff --git a/trick_source/sim_services/DMTCP/Makefile b/trick_source/sim_services/DMTCP/Makefile index 11e3de21..7261c8c1 100644 --- a/trick_source/sim_services/DMTCP/Makefile +++ b/trick_source/sim_services/DMTCP/Makefile @@ -1,6 +1,6 @@ -include ${TRICK_HOME}/makefiles/Makefile.common -include ${TRICK_HOME}/makefiles/Makefile.tricklib +include ${TRICK_HOME}/share/trick/makefiles/Makefile.common +include ${TRICK_HOME}/share/trick/makefiles/Makefile.tricklib -include Makefile_deps ifneq ($(DMTCP),) diff --git a/trick_source/sim_services/DMTCP/Makefile_deps b/trick_source/sim_services/DMTCP/Makefile_deps index 01c00cb2..cd35370b 100644 --- a/trick_source/sim_services/DMTCP/Makefile_deps +++ b/trick_source/sim_services/DMTCP/Makefile_deps @@ -1,20 +1,27 @@ -object_${TRICK_HOST_CPU}/DMTCP.o: src/DMTCP.cpp \ - ${TRICK_HOME}/trick_source/sim_services/DMTCP/include/DMTCP.hh \ - ${TRICK_HOME}/trick_source/sim_services/Scheduler/include/Scheduler.hh \ - ${TRICK_HOME}/trick_source/sim_services/ScheduledJobQueue/include/ScheduledJobQueue.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/JobData.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/InstrumentBase.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/SimObject.hh \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/exec_proto.h \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/sim_mode.h \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/exec_proto.hh \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/Executive.hh \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/Threads.hh \ - ${TRICK_HOME}/trick_source/sim_services/Message/include/message_proto.h \ - ${TRICK_HOME}/trick_source/sim_services/Message/include/message_type.h -object_${TRICK_HOST_CPU}/dmtcp_checkpoint.o: src/dmtcp_checkpoint.cpp \ - ${TRICK_HOME}/trick_source/sim_services/DMTCP/include/DMTCP.hh \ - ${TRICK_HOME}/trick_source/sim_services/Scheduler/include/Scheduler.hh \ - ${TRICK_HOME}/trick_source/sim_services/ScheduledJobQueue/include/ScheduledJobQueue.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/JobData.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/InstrumentBase.hh +object_${TRICK_HOST_CPU}/DMTCP.o: DMTCP.cpp ${TRICK_HOME}/include/trick/DMTCP.hh \ + ${TRICK_HOME}/include/trick/dmtcp_checkpoint_c_intf.hh \ + ${TRICK_HOME}/include/trick/Scheduler.hh \ + ${TRICK_HOME}/include/trick/ScheduledJobQueue.hh \ + ${TRICK_HOME}/include/trick/JobData.hh \ + ${TRICK_HOME}/include/trick/InstrumentBase.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/exec_proto.h \ + ${TRICK_HOME}/include/trick/sim_mode.h \ + ${TRICK_HOME}/include/trick/message_proto.h \ + ${TRICK_HOME}/include/trick/message_type.h \ + ${TRICK_HOME}/include/trick/Executive.hh \ + ${TRICK_HOME}/include/trick/Scheduler.hh \ + ${TRICK_HOME}/include/trick/ScheduledJobQueue.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/Threads.hh \ + ${TRICK_HOME}/include/trick/ThreadBase.hh \ + ${TRICK_HOME}/include/trick/sim_mode.h \ + ${TRICK_HOME}/include/trick/CheckPointRestart.hh +object_${TRICK_HOST_CPU}/dmtcp_checkpoint_c_intf.o: dmtcp_checkpoint_c_intf.cpp \ + ${TRICK_HOME}/include/trick/DMTCP.hh \ + ${TRICK_HOME}/include/trick/dmtcp_checkpoint_c_intf.hh \ + ${TRICK_HOME}/include/trick/Scheduler.hh \ + ${TRICK_HOME}/include/trick/ScheduledJobQueue.hh \ + ${TRICK_HOME}/include/trick/JobData.hh \ + ${TRICK_HOME}/include/trick/InstrumentBase.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh diff --git a/trick_source/sim_services/DMTCP/src/dmtcp_checkpoint_c_intf.cpp b/trick_source/sim_services/DMTCP/dmtcp_checkpoint_c_intf.cpp similarity index 96% rename from trick_source/sim_services/DMTCP/src/dmtcp_checkpoint_c_intf.cpp rename to trick_source/sim_services/DMTCP/dmtcp_checkpoint_c_intf.cpp index b90972f9..598c6043 100644 --- a/trick_source/sim_services/DMTCP/src/dmtcp_checkpoint_c_intf.cpp +++ b/trick_source/sim_services/DMTCP/dmtcp_checkpoint_c_intf.cpp @@ -5,7 +5,7 @@ #include "dmtcpaware.h" #endif -#include "sim_services/DMTCP/include/DMTCP.hh" +#include "trick/DMTCP.hh" /** Global singleton pointer to DMTCP */ extern Trick::DMTCP * the_dmtcp ; diff --git a/trick_source/sim_services/DMTCP/src/makefile b/trick_source/sim_services/DMTCP/src/makefile deleted file mode 100644 index 753bd7f7..00000000 --- a/trick_source/sim_services/DMTCP/src/makefile +++ /dev/null @@ -1,6 +0,0 @@ - -all: - ${MAKE} -C .. - -clean: - ${MAKE} -C .. clean diff --git a/trick_source/sim_services/DataRecord/src/DRAscii.cpp b/trick_source/sim_services/DataRecord/DRAscii.cpp similarity index 94% rename from trick_source/sim_services/DataRecord/src/DRAscii.cpp rename to trick_source/sim_services/DataRecord/DRAscii.cpp index 0e88257e..d02bfa68 100644 --- a/trick_source/sim_services/DataRecord/src/DRAscii.cpp +++ b/trick_source/sim_services/DataRecord/DRAscii.cpp @@ -11,12 +11,12 @@ PROGRAMMERS: #include <stdlib.h> #include <string.h> -#include "sim_services/DataRecord/include/DRAscii.hh" -#include "sim_services/CommandLineArguments/include/command_line_protos.h" -#include "sim_services/MemoryManager/include/memorymanager_c_intf.h" -#include "sim_services/Message/include/message_proto.h" -#include "sim_services/Message/include/message_type.h" -#include "sim_services/MemoryManager/include/bitfield_proto.h" +#include "trick/DRAscii.hh" +#include "trick/command_line_protos.h" +#include "trick/memorymanager_c_intf.h" +#include "trick/message_proto.h" +#include "trick/message_type.h" +#include "trick/bitfield_proto.h" Trick::DRAscii::DRAscii( std::string in_name ) : Trick::DataRecordGroup( in_name ) { diff --git a/trick_source/sim_services/DataRecord/src/DRBinary.cpp b/trick_source/sim_services/DataRecord/DRBinary.cpp similarity index 95% rename from trick_source/sim_services/DataRecord/src/DRBinary.cpp rename to trick_source/sim_services/DataRecord/DRBinary.cpp index a268a6d8..d060d7b2 100644 --- a/trick_source/sim_services/DataRecord/src/DRBinary.cpp +++ b/trick_source/sim_services/DataRecord/DRBinary.cpp @@ -13,10 +13,10 @@ PROGRAMMERS: #include <sys/stat.h> #include <unistd.h> -#include "sim_services/DataRecord/include/DRBinary.hh" -#include "sim_services/CommandLineArguments/include/command_line_protos.h" -#include "sim_services/MemoryManager/include/memorymanager_c_intf.h" -#include "sim_services/MemoryManager/include/bitfield_proto.h" +#include "trick/DRBinary.hh" +#include "trick/command_line_protos.h" +#include "trick/memorymanager_c_intf.h" +#include "trick/bitfield_proto.h" /* Other classes inherit from DRBinary. In these cases, we don't want to register the memory as DRBinary, diff --git a/trick_source/sim_services/DataRecord/src/DRHDF5.cpp b/trick_source/sim_services/DataRecord/DRHDF5.cpp similarity index 96% rename from trick_source/sim_services/DataRecord/src/DRHDF5.cpp rename to trick_source/sim_services/DataRecord/DRHDF5.cpp index 8598d9b5..3cca19f9 100644 --- a/trick_source/sim_services/DataRecord/src/DRHDF5.cpp +++ b/trick_source/sim_services/DataRecord/DRHDF5.cpp @@ -8,11 +8,11 @@ PROGRAMMERS: #include <iostream> #include <stdlib.h> -#include "sim_services/DataRecord/include/DRHDF5.hh" -#include "sim_services/MemoryManager/include/parameter_types.h" -#include "sim_services/CommandLineArguments/include/command_line_protos.h" -#include "sim_services/MemoryManager/include/memorymanager_c_intf.h" -#include "sim_services/Message/include/message_proto.h" +#include "trick/DRHDF5.hh" +#include "trick/parameter_types.h" +#include "trick/command_line_protos.h" +#include "trick/memorymanager_c_intf.h" +#include "trick/message_proto.h" Trick::DRHDF5::DRHDF5( std::string in_name ) : Trick::DataRecordGroup(in_name) { register_group_with_mm(this, "Trick::DRHDF5") ; diff --git a/trick_source/sim_services/DataRecord/src/DataRecordDispatcher.cpp b/trick_source/sim_services/DataRecord/DataRecordDispatcher.cpp similarity index 96% rename from trick_source/sim_services/DataRecord/src/DataRecordDispatcher.cpp rename to trick_source/sim_services/DataRecord/DataRecordDispatcher.cpp index 04f7bcd0..56e85f31 100644 --- a/trick_source/sim_services/DataRecord/src/DataRecordDispatcher.cpp +++ b/trick_source/sim_services/DataRecord/DataRecordDispatcher.cpp @@ -20,12 +20,12 @@ #include "dmtcpaware.h" #endif -#include "sim_services/DataRecord/include/DataRecordDispatcher.hh" -#include "sim_services/Executive/include/exec_proto.h" -#include "sim_services/Executive/include/exec_proto.hh" -#include "sim_services/Message/include/message_proto.h" -#include "sim_services/Message/include/message_type.h" -#include "sim_services/CommandLineArguments/include/command_line_protos.h" +#include "trick/DataRecordDispatcher.hh" +#include "trick/exec_proto.h" +#include "trick/exec_proto.hh" +#include "trick/message_proto.h" +#include "trick/message_type.h" +#include "trick/command_line_protos.h" Trick::DataRecordDispatcher * the_drd = NULL ; diff --git a/trick_source/sim_services/DataRecord/src/DataRecordGroup.cpp b/trick_source/sim_services/DataRecord/DataRecordGroup.cpp similarity index 98% rename from trick_source/sim_services/DataRecord/src/DataRecordGroup.cpp rename to trick_source/sim_services/DataRecord/DataRecordGroup.cpp index 566122a0..00dfcade 100644 --- a/trick_source/sim_services/DataRecord/src/DataRecordGroup.cpp +++ b/trick_source/sim_services/DataRecord/DataRecordGroup.cpp @@ -10,13 +10,13 @@ #include <cxxabi.h> #endif -#include "sim_services/DataRecord/include/DataRecordGroup.hh" -#include "sim_services/CommandLineArguments/include/command_line_protos.h" -#include "sim_services/Executive/include/exec_proto.h" -#include "sim_services/MemoryManager/include/reference.h" -#include "sim_services/MemoryManager/include/memorymanager_c_intf.h" -#include "sim_services/Message/include/message_proto.h" -#include "sim_services/Message/include/message_type.h" +#include "trick/DataRecordGroup.hh" +#include "trick/command_line_protos.h" +#include "trick/exec_proto.h" +#include "trick/reference.h" +#include "trick/memorymanager_c_intf.h" +#include "trick/message_proto.h" +#include "trick/message_type.h" /** @details diff --git a/trick_source/sim_services/DataRecord/Makefile b/trick_source/sim_services/DataRecord/Makefile index dad080e0..8bfae91a 100644 --- a/trick_source/sim_services/DataRecord/Makefile +++ b/trick_source/sim_services/DataRecord/Makefile @@ -1,6 +1,6 @@ -include ${TRICK_HOME}/makefiles/Makefile.common -include ${TRICK_HOME}/makefiles/Makefile.tricklib +include ${TRICK_HOME}/share/trick/makefiles/Makefile.common +include ${TRICK_HOME}/share/trick/makefiles/Makefile.tricklib -include Makefile_deps ifneq ($(HDF5),) diff --git a/trick_source/sim_services/DataRecord/Makefile_deps b/trick_source/sim_services/DataRecord/Makefile_deps index f0a7c0f9..b695a015 100644 --- a/trick_source/sim_services/DataRecord/Makefile_deps +++ b/trick_source/sim_services/DataRecord/Makefile_deps @@ -1,85 +1,107 @@ -object_${TRICK_HOST_CPU}/DRAscii.o: src/DRAscii.cpp \ - ${TRICK_HOME}/trick_source/sim_services/DataRecord/include/DRAscii.hh \ - ${TRICK_HOME}/trick_source/sim_services/DataRecord/include/DataRecordGroup.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/SimObject.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/JobData.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/InstrumentBase.hh \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/reference.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/attributes.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/parameter_types.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/value.h \ - ${TRICK_HOME}/trick_source/trick_utils/trick_adt/include/dllist.h \ - ${TRICK_HOME}/trick_source/sim_services/CommandLineArguments/include/command_line_protos.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/memorymanager_c_intf.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/var.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/io_alloc.h \ - ${TRICK_HOME}/trick_source/sim_services/Message/include/message_proto.h \ - ${TRICK_HOME}/trick_source/sim_services/Message/include/message_type.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/bitfield_proto.h -object_${TRICK_HOST_CPU}/DRBinary.o: src/DRBinary.cpp \ - ${TRICK_HOME}/trick_source/sim_services/DataRecord/include/DRBinary.hh \ - ${TRICK_HOME}/trick_source/sim_services/DataRecord/include/DataRecordGroup.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/SimObject.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/JobData.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/InstrumentBase.hh \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/reference.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/attributes.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/parameter_types.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/value.h \ - ${TRICK_HOME}/trick_source/trick_utils/trick_adt/include/dllist.h \ - ${TRICK_HOME}/trick_source/sim_services/CommandLineArguments/include/command_line_protos.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/memorymanager_c_intf.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/var.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/io_alloc.h -object_${TRICK_HOST_CPU}/DRHDF5.o: src/DRHDF5.cpp -object_${TRICK_HOST_CPU}/DataRecordDispatcher.o: src/DataRecordDispatcher.cpp \ - ${TRICK_HOME}/trick_source/sim_services/DataRecord/include/DataRecordDispatcher.hh \ - ${TRICK_HOME}/trick_source/sim_services/DataRecord/include/DataRecordGroup.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/SimObject.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/JobData.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/InstrumentBase.hh \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/reference.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/attributes.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/parameter_types.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/value.h \ - ${TRICK_HOME}/trick_source/trick_utils/trick_adt/include/dllist.h \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/exec_proto.h \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/sim_mode.h \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/exec_proto.hh \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/Executive.hh \ - ${TRICK_HOME}/trick_source/sim_services/Scheduler/include/Scheduler.hh \ - ${TRICK_HOME}/trick_source/sim_services/ScheduledJobQueue/include/ScheduledJobQueue.hh \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/Threads.hh \ - ${TRICK_HOME}/trick_source/sim_services/Message/include/message_proto.h \ - ${TRICK_HOME}/trick_source/sim_services/Message/include/message_type.h \ - ${TRICK_HOME}/trick_source/sim_services/CommandLineArguments/include/command_line_protos.h -object_${TRICK_HOST_CPU}/DataRecordGroup.o: src/DataRecordGroup.cpp \ - ${TRICK_HOME}/trick_source/sim_services/DataRecord/include/DataRecordGroup.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/SimObject.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/JobData.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/InstrumentBase.hh \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/reference.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/attributes.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/parameter_types.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/value.h \ - ${TRICK_HOME}/trick_source/trick_utils/trick_adt/include/dllist.h \ - ${TRICK_HOME}/trick_source/sim_services/CommandLineArguments/include/command_line_protos.h \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/exec_proto.h \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/sim_mode.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/memorymanager_c_intf.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/var.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/io_alloc.h \ - ${TRICK_HOME}/trick_source/sim_services/Message/include/message_proto.h \ - ${TRICK_HOME}/trick_source/sim_services/Message/include/message_type.h -object_${TRICK_HOST_CPU}/data_record_utilities.o: src/data_record_utilities.cpp \ - ${TRICK_HOME}/trick_source/sim_services/DataRecord/include/data_record_proto.h \ - ${TRICK_HOME}/trick_source/sim_services/DataRecord/include/DataRecordGroup.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/SimObject.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/JobData.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/InstrumentBase.hh \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/reference.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/attributes.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/parameter_types.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/value.h \ - ${TRICK_HOME}/trick_source/trick_utils/trick_adt/include/dllist.h \ - ${TRICK_HOME}/trick_source/sim_services/DataRecord/include/DataRecordDispatcher.hh +object_${TRICK_HOST_CPU}/DataRecordGroup.o: DataRecordGroup.cpp \ + ${TRICK_HOME}/include/trick/DataRecordGroup.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/JobData.hh \ + ${TRICK_HOME}/include/trick/InstrumentBase.hh \ + ${TRICK_HOME}/include/trick/reference.h \ + ${TRICK_HOME}/include/trick/attributes.h \ + ${TRICK_HOME}/include/trick/parameter_types.h \ + ${TRICK_HOME}/include/trick/value.h \ + ${TRICK_HOME}/include/trick/dllist.h \ + ${TRICK_HOME}/include/trick/command_line_protos.h \ + ${TRICK_HOME}/include/trick/exec_proto.h \ + ${TRICK_HOME}/include/trick/sim_mode.h \ + ${TRICK_HOME}/include/trick/memorymanager_c_intf.h \ + ${TRICK_HOME}/include/trick/var.h \ + ${TRICK_HOME}/include/trick/io_alloc.h \ + ${TRICK_HOME}/include/trick/message_proto.h \ + ${TRICK_HOME}/include/trick/message_type.h +object_${TRICK_HOST_CPU}/DRBinary.o: DRBinary.cpp ${TRICK_HOME}/include/trick/DRBinary.hh \ + ${TRICK_HOME}/include/trick/DataRecordGroup.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/JobData.hh \ + ${TRICK_HOME}/include/trick/InstrumentBase.hh \ + ${TRICK_HOME}/include/trick/reference.h \ + ${TRICK_HOME}/include/trick/attributes.h \ + ${TRICK_HOME}/include/trick/parameter_types.h \ + ${TRICK_HOME}/include/trick/value.h \ + ${TRICK_HOME}/include/trick/dllist.h \ + ${TRICK_HOME}/include/trick/command_line_protos.h \ + ${TRICK_HOME}/include/trick/memorymanager_c_intf.h \ + ${TRICK_HOME}/include/trick/var.h \ + ${TRICK_HOME}/include/trick/io_alloc.h \ + ${TRICK_HOME}/include/trick/bitfield_proto.h +object_${TRICK_HOST_CPU}/data_record_utilities.o: data_record_utilities.cpp \ + ${TRICK_HOME}/include/trick/data_record_proto.h \ + ${TRICK_HOME}/include/trick/DataRecordGroup.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/JobData.hh \ + ${TRICK_HOME}/include/trick/InstrumentBase.hh \ + ${TRICK_HOME}/include/trick/reference.h \ + ${TRICK_HOME}/include/trick/attributes.h \ + ${TRICK_HOME}/include/trick/parameter_types.h \ + ${TRICK_HOME}/include/trick/value.h \ + ${TRICK_HOME}/include/trick/dllist.h \ + ${TRICK_HOME}/include/trick/DataRecordDispatcher.hh \ + ${TRICK_HOME}/include/trick/Scheduler.hh \ + ${TRICK_HOME}/include/trick/ScheduledJobQueue.hh \ + ${TRICK_HOME}/include/trick/ThreadBase.hh +object_${TRICK_HOST_CPU}/DataRecordDispatcher.o: DataRecordDispatcher.cpp \ + ${TRICK_HOME}/include/trick/DataRecordDispatcher.hh \ + ${TRICK_HOME}/include/trick/Scheduler.hh \ + ${TRICK_HOME}/include/trick/ScheduledJobQueue.hh \ + ${TRICK_HOME}/include/trick/JobData.hh \ + ${TRICK_HOME}/include/trick/InstrumentBase.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/DataRecordGroup.hh \ + ${TRICK_HOME}/include/trick/reference.h \ + ${TRICK_HOME}/include/trick/attributes.h \ + ${TRICK_HOME}/include/trick/parameter_types.h \ + ${TRICK_HOME}/include/trick/value.h \ + ${TRICK_HOME}/include/trick/dllist.h \ + ${TRICK_HOME}/include/trick/ThreadBase.hh \ + ${TRICK_HOME}/include/trick/exec_proto.h \ + ${TRICK_HOME}/include/trick/sim_mode.h \ + ${TRICK_HOME}/include/trick/exec_proto.hh \ + ${TRICK_HOME}/include/trick/Executive.hh \ + ${TRICK_HOME}/include/trick/Scheduler.hh \ + ${TRICK_HOME}/include/trick/ScheduledJobQueue.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/Threads.hh \ + ${TRICK_HOME}/include/trick/sim_mode.h \ + ${TRICK_HOME}/include/trick/message_proto.h \ + ${TRICK_HOME}/include/trick/message_type.h \ + ${TRICK_HOME}/include/trick/command_line_protos.h +object_${TRICK_HOST_CPU}/DRAscii.o: DRAscii.cpp ${TRICK_HOME}/include/trick/DRAscii.hh \ + ${TRICK_HOME}/include/trick/DataRecordGroup.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/JobData.hh \ + ${TRICK_HOME}/include/trick/InstrumentBase.hh \ + ${TRICK_HOME}/include/trick/reference.h \ + ${TRICK_HOME}/include/trick/attributes.h \ + ${TRICK_HOME}/include/trick/parameter_types.h \ + ${TRICK_HOME}/include/trick/value.h \ + ${TRICK_HOME}/include/trick/dllist.h \ + ${TRICK_HOME}/include/trick/command_line_protos.h \ + ${TRICK_HOME}/include/trick/memorymanager_c_intf.h \ + ${TRICK_HOME}/include/trick/var.h \ + ${TRICK_HOME}/include/trick/io_alloc.h \ + ${TRICK_HOME}/include/trick/message_proto.h \ + ${TRICK_HOME}/include/trick/message_type.h \ + ${TRICK_HOME}/include/trick/bitfield_proto.h +object_${TRICK_HOST_CPU}/DRHDF5.o: DRHDF5.cpp ${TRICK_HOME}/include/trick/DRHDF5.hh \ + ${TRICK_HOME}/include/trick/DataRecordGroup.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/JobData.hh \ + ${TRICK_HOME}/include/trick/InstrumentBase.hh \ + ${TRICK_HOME}/include/trick/reference.h \ + ${TRICK_HOME}/include/trick/attributes.h \ + ${TRICK_HOME}/include/trick/parameter_types.h \ + ${TRICK_HOME}/include/trick/value.h \ + ${TRICK_HOME}/include/trick/dllist.h \ + ${TRICK_HOME}/include/trick/command_line_protos.h \ + ${TRICK_HOME}/include/trick/memorymanager_c_intf.h \ + ${TRICK_HOME}/include/trick/var.h \ + ${TRICK_HOME}/include/trick/io_alloc.h \ + ${TRICK_HOME}/include/trick/message_proto.h \ + ${TRICK_HOME}/include/trick/message_type.h diff --git a/trick_source/sim_services/DataRecord/src/data_record_utilities.cpp b/trick_source/sim_services/DataRecord/data_record_utilities.cpp similarity index 89% rename from trick_source/sim_services/DataRecord/src/data_record_utilities.cpp rename to trick_source/sim_services/DataRecord/data_record_utilities.cpp index 257afbb3..5b4bbfc9 100644 --- a/trick_source/sim_services/DataRecord/src/data_record_utilities.cpp +++ b/trick_source/sim_services/DataRecord/data_record_utilities.cpp @@ -6,9 +6,9 @@ PROGRAMMERS: ((Alex Lin) (NASA) (April 2009) (--) (c++ port))) */ -#include "sim_services/DataRecord/include/data_record_proto.h" -#include "sim_services/DataRecord/include/DataRecordDispatcher.hh" -#include "sim_services/DataRecord/include/DataRecordGroup.hh" +#include "trick/data_record_proto.h" +#include "trick/DataRecordDispatcher.hh" +#include "trick/DataRecordGroup.hh" extern Trick::DataRecordDispatcher * the_drd ; diff --git a/trick_source/sim_services/DataRecord/design.dox_in b/trick_source/sim_services/DataRecord/docs/design.dox_in similarity index 100% rename from trick_source/sim_services/DataRecord/design.dox_in rename to trick_source/sim_services/DataRecord/docs/design.dox_in diff --git a/trick_source/sim_services/DataRecord/main_page.dox_in b/trick_source/sim_services/DataRecord/docs/main_page.dox_in similarity index 100% rename from trick_source/sim_services/DataRecord/main_page.dox_in rename to trick_source/sim_services/DataRecord/docs/main_page.dox_in diff --git a/trick_source/sim_services/DataRecord/requirements.dox_in b/trick_source/sim_services/DataRecord/docs/requirements.dox_in similarity index 100% rename from trick_source/sim_services/DataRecord/requirements.dox_in rename to trick_source/sim_services/DataRecord/docs/requirements.dox_in diff --git a/trick_source/sim_services/DataRecord/src/makefile b/trick_source/sim_services/DataRecord/src/makefile deleted file mode 100644 index 753bd7f7..00000000 --- a/trick_source/sim_services/DataRecord/src/makefile +++ /dev/null @@ -1,6 +0,0 @@ - -all: - ${MAKE} -C .. - -clean: - ${MAKE} -C .. clean diff --git a/trick_source/sim_services/DebugPause/src/DebugPause.cpp b/trick_source/sim_services/DebugPause/DebugPause.cpp similarity index 88% rename from trick_source/sim_services/DebugPause/src/DebugPause.cpp rename to trick_source/sim_services/DebugPause/DebugPause.cpp index d48223f8..4b5e19a2 100644 --- a/trick_source/sim_services/DebugPause/src/DebugPause.cpp +++ b/trick_source/sim_services/DebugPause/DebugPause.cpp @@ -7,11 +7,11 @@ #include <errno.h> #include <unistd.h> -#include "sim_services/DebugPause/include/DebugPause.hh" -#include "sim_services/Message/include/message_proto.h" -#include "sim_services/Message/include/message_type.h" -#include "sim_services/Executive/include/exec_proto.h" -#include "sim_services/Executive/include/exec_proto.hh" +#include "trick/DebugPause.hh" +#include "trick/message_proto.h" +#include "trick/message_type.h" +#include "trick/exec_proto.h" +#include "trick/exec_proto.hh" Trick::DebugPause * the_debug_pause = NULL ; diff --git a/trick_source/sim_services/DebugPause/src/DebugPause_c_intf.cpp b/trick_source/sim_services/DebugPause/DebugPause_c_intf.cpp similarity index 94% rename from trick_source/sim_services/DebugPause/src/DebugPause_c_intf.cpp rename to trick_source/sim_services/DebugPause/DebugPause_c_intf.cpp index e589a40f..67bc2c25 100644 --- a/trick_source/sim_services/DebugPause/src/DebugPause_c_intf.cpp +++ b/trick_source/sim_services/DebugPause/DebugPause_c_intf.cpp @@ -1,5 +1,5 @@ #include <stdio.h> -#include "sim_services/DebugPause/include/DebugPause.hh" +#include "trick/DebugPause.hh" /* Global singleton pointer to the echo jobs class */ extern Trick::DebugPause * the_debug_pause ; diff --git a/trick_source/sim_services/DebugPause/Makefile b/trick_source/sim_services/DebugPause/Makefile index 3029433b..a181cedf 100644 --- a/trick_source/sim_services/DebugPause/Makefile +++ b/trick_source/sim_services/DebugPause/Makefile @@ -1,5 +1,5 @@ -include ${TRICK_HOME}/makefiles/Makefile.common -include ${TRICK_HOME}/makefiles/Makefile.tricklib +include ${TRICK_HOME}/share/trick/makefiles/Makefile.common +include ${TRICK_HOME}/share/trick/makefiles/Makefile.tricklib -include Makefile_deps diff --git a/trick_source/sim_services/DebugPause/Makefile_deps b/trick_source/sim_services/DebugPause/Makefile_deps index e6415024..58670972 100644 --- a/trick_source/sim_services/DebugPause/Makefile_deps +++ b/trick_source/sim_services/DebugPause/Makefile_deps @@ -1,18 +1,22 @@ -object_${TRICK_HOST_CPU}/DebugPause.o: src/DebugPause.cpp \ - ${TRICK_HOME}/trick_source/sim_services/DebugPause/include/DebugPause.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/JobData.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/InstrumentBase.hh \ - ${TRICK_HOME}/trick_source/sim_services/Message/include/message_proto.h \ - ${TRICK_HOME}/trick_source/sim_services/Message/include/message_type.h \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/exec_proto.h \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/sim_mode.h \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/exec_proto.hh \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/Executive.hh \ - ${TRICK_HOME}/trick_source/sim_services/Scheduler/include/Scheduler.hh \ - ${TRICK_HOME}/trick_source/sim_services/ScheduledJobQueue/include/ScheduledJobQueue.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/SimObject.hh \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/Threads.hh -object_${TRICK_HOST_CPU}/DebugPause_c_intf.o: src/DebugPause_c_intf.cpp \ - ${TRICK_HOME}/trick_source/sim_services/DebugPause/include/DebugPause.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/JobData.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/InstrumentBase.hh +object_${TRICK_HOST_CPU}/DebugPause.o: DebugPause.cpp \ + ${TRICK_HOME}/include/trick/DebugPause.hh \ + ${TRICK_HOME}/include/trick/JobData.hh \ + ${TRICK_HOME}/include/trick/InstrumentBase.hh \ + ${TRICK_HOME}/include/trick/message_proto.h \ + ${TRICK_HOME}/include/trick/message_type.h \ + ${TRICK_HOME}/include/trick/exec_proto.h \ + ${TRICK_HOME}/include/trick/sim_mode.h \ + ${TRICK_HOME}/include/trick/exec_proto.hh \ + ${TRICK_HOME}/include/trick/Executive.hh \ + ${TRICK_HOME}/include/trick/Scheduler.hh \ + ${TRICK_HOME}/include/trick/ScheduledJobQueue.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/ScheduledJobQueue.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/Threads.hh \ + ${TRICK_HOME}/include/trick/ThreadBase.hh \ + ${TRICK_HOME}/include/trick/sim_mode.h +object_${TRICK_HOST_CPU}/DebugPause_c_intf.o: DebugPause_c_intf.cpp \ + ${TRICK_HOME}/include/trick/DebugPause.hh \ + ${TRICK_HOME}/include/trick/JobData.hh \ + ${TRICK_HOME}/include/trick/InstrumentBase.hh diff --git a/trick_source/sim_services/DebugPause/src/makefile b/trick_source/sim_services/DebugPause/src/makefile deleted file mode 100644 index 753bd7f7..00000000 --- a/trick_source/sim_services/DebugPause/src/makefile +++ /dev/null @@ -1,6 +0,0 @@ - -all: - ${MAKE} -C .. - -clean: - ${MAKE} -C .. clean diff --git a/trick_source/sim_services/EchoJobs/src/EchoJobs.cpp b/trick_source/sim_services/EchoJobs/EchoJobs.cpp similarity index 87% rename from trick_source/sim_services/EchoJobs/src/EchoJobs.cpp rename to trick_source/sim_services/EchoJobs/EchoJobs.cpp index 7baa6801..7b116647 100644 --- a/trick_source/sim_services/EchoJobs/src/EchoJobs.cpp +++ b/trick_source/sim_services/EchoJobs/EchoJobs.cpp @@ -2,10 +2,10 @@ #include <iostream> #include <iomanip> -#include "sim_services/EchoJobs/include/EchoJobs.hh" -#include "sim_services/Executive/include/exec_proto.h" -#include "sim_services/Message/include/message_proto.h" -#include "sim_services/Message/include/message_type.h" +#include "trick/EchoJobs.hh" +#include "trick/exec_proto.h" +#include "trick/message_proto.h" +#include "trick/message_type.h" Trick::EchoJobs * the_ej = NULL ; diff --git a/trick_source/sim_services/EchoJobs/src/EchoJobs_c_intf.cpp b/trick_source/sim_services/EchoJobs/EchoJobs_c_intf.cpp similarity index 94% rename from trick_source/sim_services/EchoJobs/src/EchoJobs_c_intf.cpp rename to trick_source/sim_services/EchoJobs/EchoJobs_c_intf.cpp index c04a5626..f16b5e24 100644 --- a/trick_source/sim_services/EchoJobs/src/EchoJobs_c_intf.cpp +++ b/trick_source/sim_services/EchoJobs/EchoJobs_c_intf.cpp @@ -1,5 +1,5 @@ #include <stdio.h> -#include "sim_services/EchoJobs/include/EchoJobs.hh" +#include "trick/EchoJobs.hh" /* Global singleton pointer to the echo jobs class */ extern Trick::EchoJobs * the_ej ; diff --git a/trick_source/sim_services/EchoJobs/Makefile b/trick_source/sim_services/EchoJobs/Makefile index 3029433b..a181cedf 100644 --- a/trick_source/sim_services/EchoJobs/Makefile +++ b/trick_source/sim_services/EchoJobs/Makefile @@ -1,5 +1,5 @@ -include ${TRICK_HOME}/makefiles/Makefile.common -include ${TRICK_HOME}/makefiles/Makefile.tricklib +include ${TRICK_HOME}/share/trick/makefiles/Makefile.common +include ${TRICK_HOME}/share/trick/makefiles/Makefile.tricklib -include Makefile_deps diff --git a/trick_source/sim_services/EchoJobs/Makefile_deps b/trick_source/sim_services/EchoJobs/Makefile_deps index a0e0a09c..cd70d205 100644 --- a/trick_source/sim_services/EchoJobs/Makefile_deps +++ b/trick_source/sim_services/EchoJobs/Makefile_deps @@ -1,12 +1,11 @@ -object_${TRICK_HOST_CPU}/EchoJobs.o: src/EchoJobs.cpp \ - ${TRICK_HOME}/trick_source/sim_services/EchoJobs/include/EchoJobs.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/JobData.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/InstrumentBase.hh \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/exec_proto.h \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/sim_mode.h \ - ${TRICK_HOME}/trick_source/sim_services/Message/include/message_proto.h \ - ${TRICK_HOME}/trick_source/sim_services/Message/include/message_type.h -object_${TRICK_HOST_CPU}/EchoJobs_c_intf.o: src/EchoJobs_c_intf.cpp \ - ${TRICK_HOME}/trick_source/sim_services/EchoJobs/include/EchoJobs.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/JobData.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/InstrumentBase.hh +object_${TRICK_HOST_CPU}/EchoJobs_c_intf.o: EchoJobs_c_intf.cpp \ + ${TRICK_HOME}/include/trick/EchoJobs.hh \ + ${TRICK_HOME}/include/trick/JobData.hh \ + ${TRICK_HOME}/include/trick/InstrumentBase.hh +object_${TRICK_HOST_CPU}/EchoJobs.o: EchoJobs.cpp ${TRICK_HOME}/include/trick/EchoJobs.hh \ + ${TRICK_HOME}/include/trick/JobData.hh \ + ${TRICK_HOME}/include/trick/InstrumentBase.hh \ + ${TRICK_HOME}/include/trick/exec_proto.h \ + ${TRICK_HOME}/include/trick/sim_mode.h \ + ${TRICK_HOME}/include/trick/message_proto.h \ + ${TRICK_HOME}/include/trick/message_type.h diff --git a/trick_source/sim_services/EchoJobs/main_page.dox_in b/trick_source/sim_services/EchoJobs/docs/main_page.dox_in similarity index 100% rename from trick_source/sim_services/EchoJobs/main_page.dox_in rename to trick_source/sim_services/EchoJobs/docs/main_page.dox_in diff --git a/trick_source/sim_services/EchoJobs/src/makefile b/trick_source/sim_services/EchoJobs/src/makefile deleted file mode 100644 index 753bd7f7..00000000 --- a/trick_source/sim_services/EchoJobs/src/makefile +++ /dev/null @@ -1,6 +0,0 @@ - -all: - ${MAKE} -C .. - -clean: - ${MAKE} -C .. clean diff --git a/trick_source/sim_services/Environment/src/Environment.cpp b/trick_source/sim_services/Environment/Environment.cpp similarity index 94% rename from trick_source/sim_services/Environment/src/Environment.cpp rename to trick_source/sim_services/Environment/Environment.cpp index 129ba349..a7de3366 100644 --- a/trick_source/sim_services/Environment/src/Environment.cpp +++ b/trick_source/sim_services/Environment/Environment.cpp @@ -3,7 +3,7 @@ #include <sstream> #include <stdlib.h> -#include "sim_services/Environment/include/Environment.hh" +#include "trick/Environment.hh" Trick::Environment * the_env ; diff --git a/trick_source/sim_services/Environment/src/Environment_c_intf.cpp b/trick_source/sim_services/Environment/Environment_c_intf.cpp similarity index 92% rename from trick_source/sim_services/Environment/src/Environment_c_intf.cpp rename to trick_source/sim_services/Environment/Environment_c_intf.cpp index f4078ade..9c517d30 100644 --- a/trick_source/sim_services/Environment/src/Environment_c_intf.cpp +++ b/trick_source/sim_services/Environment/Environment_c_intf.cpp @@ -2,8 +2,8 @@ #include <iostream> #include <stdio.h> -#include "sim_services/Environment/include/Environment.hh" -#include "sim_services/Environment/include/env_proto.h" +#include "trick/Environment.hh" +#include "trick/env_proto.h" extern Trick::Environment * the_env ; diff --git a/trick_source/sim_services/Environment/Makefile b/trick_source/sim_services/Environment/Makefile index a0c567aa..f485f9d1 100644 --- a/trick_source/sim_services/Environment/Makefile +++ b/trick_source/sim_services/Environment/Makefile @@ -1,6 +1,6 @@ -include ${TRICK_HOME}/makefiles/Makefile.common -include ${TRICK_HOME}/makefiles/Makefile.tricklib +include ${TRICK_HOME}/share/trick/makefiles/Makefile.common +include ${TRICK_HOME}/share/trick/makefiles/Makefile.tricklib -include Makefile_deps diff --git a/trick_source/sim_services/Environment/Makefile_deps b/trick_source/sim_services/Environment/Makefile_deps index 42b67c96..95ff0372 100644 --- a/trick_source/sim_services/Environment/Makefile_deps +++ b/trick_source/sim_services/Environment/Makefile_deps @@ -1,5 +1,5 @@ -object_${TRICK_HOST_CPU}/Environment.o: src/Environment.cpp \ - ${TRICK_HOME}/trick_source/sim_services/Environment/include/Environment.hh -object_${TRICK_HOST_CPU}/Environment_c_intf.o: src/Environment_c_intf.cpp \ - ${TRICK_HOME}/trick_source/sim_services/Environment/include/Environment.hh \ - ${TRICK_HOME}/trick_source/sim_services/Environment/include/env_proto.h +object_${TRICK_HOST_CPU}/Environment.o: Environment.cpp \ + ${TRICK_HOME}/include/trick/Environment.hh +object_${TRICK_HOST_CPU}/Environment_c_intf.o: Environment_c_intf.cpp \ + ${TRICK_HOME}/include/trick/Environment.hh \ + ${TRICK_HOME}/include/trick/env_proto.h diff --git a/trick_source/sim_services/Environment/main_page.dox_in b/trick_source/sim_services/Environment/docs/main_page.dox_in similarity index 100% rename from trick_source/sim_services/Environment/main_page.dox_in rename to trick_source/sim_services/Environment/docs/main_page.dox_in diff --git a/trick_source/sim_services/Environment/src/makefile b/trick_source/sim_services/Environment/src/makefile deleted file mode 100644 index 753bd7f7..00000000 --- a/trick_source/sim_services/Environment/src/makefile +++ /dev/null @@ -1,6 +0,0 @@ - -all: - ${MAKE} -C .. - -clean: - ${MAKE} -C .. clean diff --git a/trick_source/sim_services/EventManager/src/EventInstrument.cpp b/trick_source/sim_services/EventManager/EventInstrument.cpp similarity index 71% rename from trick_source/sim_services/EventManager/src/EventInstrument.cpp rename to trick_source/sim_services/EventManager/EventInstrument.cpp index a90080b9..cc780869 100644 --- a/trick_source/sim_services/EventManager/src/EventInstrument.cpp +++ b/trick_source/sim_services/EventManager/EventInstrument.cpp @@ -1,6 +1,6 @@ -#include "sim_services/EventManager/include/EventInstrument.hh" -#include "sim_services/Executive/include/exec_proto.hh" +#include "trick/EventInstrument.hh" +#include "trick/exec_proto.hh" Trick::EventInstrument::EventInstrument(Trick::Event * in_event, Trick::JobData * in_target_job) : InstrumentBase(in_target_job), diff --git a/trick_source/sim_services/EventManager/src/EventManager.cpp b/trick_source/sim_services/EventManager/EventManager.cpp similarity index 95% rename from trick_source/sim_services/EventManager/src/EventManager.cpp rename to trick_source/sim_services/EventManager/EventManager.cpp index 901afb99..082b0cf9 100644 --- a/trick_source/sim_services/EventManager/src/EventManager.cpp +++ b/trick_source/sim_services/EventManager/EventManager.cpp @@ -13,13 +13,13 @@ #include <string> #include <cmath> -#include "sim_services/EventManager/include/EventManager.hh" -#include "sim_services/EventManager/include/EventInstrument.hh" -#include "sim_services/MemoryManager/include/memorymanager_c_intf.h" -#include "sim_services/Executive/include/exec_proto.h" -#include "sim_services/Executive/include/exec_proto.hh" -#include "sim_services/Message/include/message_proto.h" -#include "sim_services/Message/include/message_type.h" +#include "trick/EventManager.hh" +#include "trick/EventInstrument.hh" +#include "trick/memorymanager_c_intf.h" +#include "trick/exec_proto.h" +#include "trick/exec_proto.hh" +#include "trick/message_proto.h" +#include "trick/message_type.h" Trick::EventManager * the_em ; diff --git a/trick_source/sim_services/EventManager/src/EventManager_c_intf.cpp b/trick_source/sim_services/EventManager/EventManager_c_intf.cpp similarity index 86% rename from trick_source/sim_services/EventManager/src/EventManager_c_intf.cpp rename to trick_source/sim_services/EventManager/EventManager_c_intf.cpp index b403ba8e..67cf9a62 100644 --- a/trick_source/sim_services/EventManager/src/EventManager_c_intf.cpp +++ b/trick_source/sim_services/EventManager/EventManager_c_intf.cpp @@ -1,9 +1,9 @@ #include <string> -#include "sim_services/EventManager/include/Event.hh" -#include "sim_services/EventManager/include/EventManager.hh" -#include "sim_services/EventManager/include/EventManager_c_intf.hh" +#include "trick/Event.hh" +#include "trick/EventManager.hh" +#include "trick/EventManager_c_intf.hh" extern Trick::EventManager * the_em ; diff --git a/trick_source/sim_services/EventManager/src/EventProcessor.cpp b/trick_source/sim_services/EventManager/EventProcessor.cpp similarity index 94% rename from trick_source/sim_services/EventManager/src/EventProcessor.cpp rename to trick_source/sim_services/EventManager/EventProcessor.cpp index 551a7845..76032584 100644 --- a/trick_source/sim_services/EventManager/src/EventProcessor.cpp +++ b/trick_source/sim_services/EventManager/EventProcessor.cpp @@ -9,10 +9,10 @@ #include <iostream> -#include "sim_services/EventManager/include/EventProcessor.hh" -#include "sim_services/include/TrickConstant.hh" -#include "sim_services/Message/include/message_proto.h" -#include "sim_services/Message/include/message_type.h" +#include "trick/EventProcessor.hh" +#include "trick/TrickConstant.hh" +#include "trick/message_proto.h" +#include "trick/message_type.h" /** @details diff --git a/trick_source/sim_services/EventManager/Makefile b/trick_source/sim_services/EventManager/Makefile index 1d4a4328..22bcd7e3 100644 --- a/trick_source/sim_services/EventManager/Makefile +++ b/trick_source/sim_services/EventManager/Makefile @@ -1,6 +1,6 @@ -include ${TRICK_HOME}/makefiles/Makefile.common -include ${TRICK_HOME}/makefiles/Makefile.tricklib +include ${TRICK_HOME}/share/trick/makefiles/Makefile.common +include ${TRICK_HOME}/share/trick/makefiles/Makefile.tricklib TRICK_CFLAGS += $(PYTHON_INCLUDES) TRICK_CXXFLAGS += $(PYTHON_INCLUDES) diff --git a/trick_source/sim_services/EventManager/Makefile_deps b/trick_source/sim_services/EventManager/Makefile_deps index 507dc15a..fd31ccd0 100644 --- a/trick_source/sim_services/EventManager/Makefile_deps +++ b/trick_source/sim_services/EventManager/Makefile_deps @@ -1,126 +1,110 @@ -object_${TRICK_HOST_CPU}/EventInstrument.o: src/EventInstrument.cpp \ - ${TRICK_HOME}/trick_source/sim_services/EventManager/include/EventInstrument.hh \ - ${TRICK_HOME}/trick_source/sim_services/EventManager/include/Event.hh \ - ${TRICK_HOME}/trick_source/sim_services/include/mm_macros.hh \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/memorymanager_c_intf.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/parameter_types.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/attributes.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/reference.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/value.h \ - ${TRICK_HOME}/trick_source/trick_utils/trick_adt/include/dllist.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/var.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/io_alloc.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/MemoryManager.hh \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/mm_error.h \ - ${TRICK_HOME}/trick_source/sim_services/CheckPointAgent/include/CheckPointAgent.hh \ - ${TRICK_HOME}/trick_source/trick_utils/units/include/UCFn.hh \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/exec_proto.h \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/sim_mode.h \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/InstrumentBase.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/JobData.hh \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/exec_proto.hh \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/Executive.hh \ - ${TRICK_HOME}/trick_source/sim_services/Scheduler/include/Scheduler.hh \ - ${TRICK_HOME}/trick_source/sim_services/ScheduledJobQueue/include/ScheduledJobQueue.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/SimObject.hh \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/Threads.hh -object_${TRICK_HOST_CPU}/EventInstrument.o: src/EventInstrument.cpp \ - ${TRICK_HOME}/trick_source/sim_services/EventManager/include/EventInstrument.hh \ - ${TRICK_HOME}/trick_source/sim_services/EventManager/include/Event.hh \ - ${TRICK_HOME}/trick_source/sim_services/include/mm_macros.hh \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/memorymanager_c_intf.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/parameter_types.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/attributes.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/reference.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/value.h \ - ${TRICK_HOME}/trick_source/trick_utils/trick_adt/include/dllist.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/var.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/io_alloc.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/MemoryManager.hh \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/mm_error.h \ - ${TRICK_HOME}/trick_source/sim_services/CheckPointAgent/include/CheckPointAgent.hh \ - ${TRICK_HOME}/trick_source/trick_utils/units/include/UCFn.hh \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/exec_proto.h \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/sim_mode.h \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/InstrumentBase.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/JobData.hh \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/exec_proto.hh \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/Executive.hh \ - ${TRICK_HOME}/trick_source/sim_services/Scheduler/include/Scheduler.hh \ - ${TRICK_HOME}/trick_source/sim_services/ScheduledJobQueue/include/ScheduledJobQueue.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/SimObject.hh \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/Threads.hh -object_${TRICK_HOST_CPU}/EventManager.o: src/EventManager.cpp \ - ${TRICK_HOME}/trick_source/sim_services/EventManager/include/EventManager.hh \ - ${TRICK_HOME}/trick_source/sim_services/EventManager/include/Event.hh \ - ${TRICK_HOME}/trick_source/sim_services/include/mm_macros.hh \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/memorymanager_c_intf.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/parameter_types.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/attributes.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/reference.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/value.h \ - ${TRICK_HOME}/trick_source/trick_utils/trick_adt/include/dllist.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/var.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/io_alloc.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/MemoryManager.hh \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/mm_error.h \ - ${TRICK_HOME}/trick_source/sim_services/CheckPointAgent/include/CheckPointAgent.hh \ - ${TRICK_HOME}/trick_source/trick_utils/units/include/UCFn.hh \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/exec_proto.h \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/sim_mode.h \ - ${TRICK_HOME}/trick_source/sim_services/EventManager/include/EventInstrument.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/InstrumentBase.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/JobData.hh \ - ${TRICK_HOME}/trick_source/sim_services/EventManager/include/EventProcessor.hh \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/exec_proto.hh \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/Executive.hh \ - ${TRICK_HOME}/trick_source/sim_services/Scheduler/include/Scheduler.hh \ - ${TRICK_HOME}/trick_source/sim_services/ScheduledJobQueue/include/ScheduledJobQueue.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/SimObject.hh \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/Threads.hh \ - ${TRICK_HOME}/trick_source/sim_services/Message/include/message_proto.h \ - ${TRICK_HOME}/trick_source/sim_services/Message/include/message_type.h -object_${TRICK_HOST_CPU}/EventManager_c_intf.o: src/EventManager_c_intf.cpp \ - ${TRICK_HOME}/trick_source/sim_services/EventManager/include/Event.hh \ - ${TRICK_HOME}/trick_source/sim_services/include/mm_macros.hh \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/memorymanager_c_intf.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/parameter_types.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/attributes.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/reference.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/value.h \ - ${TRICK_HOME}/trick_source/trick_utils/trick_adt/include/dllist.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/var.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/io_alloc.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/MemoryManager.hh \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/mm_error.h \ - ${TRICK_HOME}/trick_source/sim_services/CheckPointAgent/include/CheckPointAgent.hh \ - ${TRICK_HOME}/trick_source/trick_utils/units/include/UCFn.hh \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/exec_proto.h \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/sim_mode.h \ - ${TRICK_HOME}/trick_source/sim_services/EventManager/include/EventManager.hh \ - ${TRICK_HOME}/trick_source/sim_services/EventManager/include/EventInstrument.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/InstrumentBase.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/JobData.hh \ - ${TRICK_HOME}/trick_source/sim_services/EventManager/include/EventProcessor.hh \ - ${TRICK_HOME}/trick_source/sim_services/EventManager/include/EventManager_c_intf.hh -object_${TRICK_HOST_CPU}/EventProcessor.o: src/EventProcessor.cpp \ - ${TRICK_HOME}/trick_source/sim_services/EventManager/include/EventProcessor.hh \ - ${TRICK_HOME}/trick_source/sim_services/EventManager/include/Event.hh \ - ${TRICK_HOME}/trick_source/sim_services/include/mm_macros.hh \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/memorymanager_c_intf.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/parameter_types.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/attributes.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/reference.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/value.h \ - ${TRICK_HOME}/trick_source/trick_utils/trick_adt/include/dllist.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/var.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/io_alloc.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/MemoryManager.hh \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/mm_error.h \ - ${TRICK_HOME}/trick_source/sim_services/CheckPointAgent/include/CheckPointAgent.hh \ - ${TRICK_HOME}/trick_source/trick_utils/units/include/UCFn.hh \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/exec_proto.h \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/sim_mode.h \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/JobData.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/InstrumentBase.hh \ - ${TRICK_HOME}/trick_source/sim_services/include/TrickConstant.hh +object_${TRICK_HOST_CPU}/EventManager.o: EventManager.cpp \ + ${TRICK_HOME}/include/trick/EventManager.hh \ + ${TRICK_HOME}/include/trick/Event.hh \ + ${TRICK_HOME}/include/trick/mm_macros.hh \ + ${TRICK_HOME}/include/trick/memorymanager_c_intf.h \ + ${TRICK_HOME}/include/trick/parameter_types.h \ + ${TRICK_HOME}/include/trick/attributes.h \ + ${TRICK_HOME}/include/trick/reference.h \ + ${TRICK_HOME}/include/trick/value.h \ + ${TRICK_HOME}/include/trick/dllist.h \ + ${TRICK_HOME}/include/trick/var.h \ + ${TRICK_HOME}/include/trick/io_alloc.h \ + ${TRICK_HOME}/include/trick/MemoryManager.hh \ + ${TRICK_HOME}/include/trick/mm_error.h \ + ${TRICK_HOME}/include/trick/CheckPointAgent.hh \ + ${TRICK_HOME}/include/trick/UCFn.hh \ + ${TRICK_HOME}/include/trick/exec_proto.h \ + ${TRICK_HOME}/include/trick/sim_mode.h \ + ${TRICK_HOME}/include/trick/EventInstrument.hh \ + ${TRICK_HOME}/include/trick/InstrumentBase.hh \ + ${TRICK_HOME}/include/trick/JobData.hh \ + ${TRICK_HOME}/include/trick/EventProcessor.hh \ + ${TRICK_HOME}/include/trick/exec_proto.hh \ + ${TRICK_HOME}/include/trick/Executive.hh \ + ${TRICK_HOME}/include/trick/Scheduler.hh \ + ${TRICK_HOME}/include/trick/ScheduledJobQueue.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/ScheduledJobQueue.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/Threads.hh \ + ${TRICK_HOME}/include/trick/ThreadBase.hh \ + ${TRICK_HOME}/include/trick/sim_mode.h \ + ${TRICK_HOME}/include/trick/message_proto.h \ + ${TRICK_HOME}/include/trick/message_type.h +object_${TRICK_HOST_CPU}/EventManager_c_intf.o: EventManager_c_intf.cpp \ + ${TRICK_HOME}/include/trick/Event.hh \ + ${TRICK_HOME}/include/trick/mm_macros.hh \ + ${TRICK_HOME}/include/trick/memorymanager_c_intf.h \ + ${TRICK_HOME}/include/trick/parameter_types.h \ + ${TRICK_HOME}/include/trick/attributes.h \ + ${TRICK_HOME}/include/trick/reference.h \ + ${TRICK_HOME}/include/trick/value.h \ + ${TRICK_HOME}/include/trick/dllist.h \ + ${TRICK_HOME}/include/trick/var.h \ + ${TRICK_HOME}/include/trick/io_alloc.h \ + ${TRICK_HOME}/include/trick/MemoryManager.hh \ + ${TRICK_HOME}/include/trick/mm_error.h \ + ${TRICK_HOME}/include/trick/CheckPointAgent.hh \ + ${TRICK_HOME}/include/trick/UCFn.hh \ + ${TRICK_HOME}/include/trick/exec_proto.h \ + ${TRICK_HOME}/include/trick/sim_mode.h \ + ${TRICK_HOME}/include/trick/EventManager.hh \ + ${TRICK_HOME}/include/trick/EventInstrument.hh \ + ${TRICK_HOME}/include/trick/InstrumentBase.hh \ + ${TRICK_HOME}/include/trick/JobData.hh \ + ${TRICK_HOME}/include/trick/EventProcessor.hh \ + ${TRICK_HOME}/include/trick/EventManager_c_intf.hh +object_${TRICK_HOST_CPU}/EventInstrument.o: EventInstrument.cpp \ + ${TRICK_HOME}/include/trick/EventInstrument.hh \ + ${TRICK_HOME}/include/trick/Event.hh \ + ${TRICK_HOME}/include/trick/mm_macros.hh \ + ${TRICK_HOME}/include/trick/memorymanager_c_intf.h \ + ${TRICK_HOME}/include/trick/parameter_types.h \ + ${TRICK_HOME}/include/trick/attributes.h \ + ${TRICK_HOME}/include/trick/reference.h \ + ${TRICK_HOME}/include/trick/value.h \ + ${TRICK_HOME}/include/trick/dllist.h \ + ${TRICK_HOME}/include/trick/var.h \ + ${TRICK_HOME}/include/trick/io_alloc.h \ + ${TRICK_HOME}/include/trick/MemoryManager.hh \ + ${TRICK_HOME}/include/trick/mm_error.h \ + ${TRICK_HOME}/include/trick/CheckPointAgent.hh \ + ${TRICK_HOME}/include/trick/UCFn.hh \ + ${TRICK_HOME}/include/trick/exec_proto.h \ + ${TRICK_HOME}/include/trick/sim_mode.h \ + ${TRICK_HOME}/include/trick/InstrumentBase.hh \ + ${TRICK_HOME}/include/trick/JobData.hh \ + ${TRICK_HOME}/include/trick/exec_proto.hh \ + ${TRICK_HOME}/include/trick/Executive.hh \ + ${TRICK_HOME}/include/trick/Scheduler.hh \ + ${TRICK_HOME}/include/trick/ScheduledJobQueue.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/ScheduledJobQueue.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/Threads.hh \ + ${TRICK_HOME}/include/trick/ThreadBase.hh \ + ${TRICK_HOME}/include/trick/sim_mode.h +object_${TRICK_HOST_CPU}/EventProcessor.o: EventProcessor.cpp \ + ${TRICK_HOME}/include/trick/EventProcessor.hh \ + ${TRICK_HOME}/include/trick/Event.hh \ + ${TRICK_HOME}/include/trick/mm_macros.hh \ + ${TRICK_HOME}/include/trick/memorymanager_c_intf.h \ + ${TRICK_HOME}/include/trick/parameter_types.h \ + ${TRICK_HOME}/include/trick/attributes.h \ + ${TRICK_HOME}/include/trick/reference.h \ + ${TRICK_HOME}/include/trick/value.h \ + ${TRICK_HOME}/include/trick/dllist.h \ + ${TRICK_HOME}/include/trick/var.h \ + ${TRICK_HOME}/include/trick/io_alloc.h \ + ${TRICK_HOME}/include/trick/MemoryManager.hh \ + ${TRICK_HOME}/include/trick/mm_error.h \ + ${TRICK_HOME}/include/trick/CheckPointAgent.hh \ + ${TRICK_HOME}/include/trick/UCFn.hh \ + ${TRICK_HOME}/include/trick/exec_proto.h \ + ${TRICK_HOME}/include/trick/sim_mode.h \ + ${TRICK_HOME}/include/trick/JobData.hh \ + ${TRICK_HOME}/include/trick/InstrumentBase.hh \ + ${TRICK_HOME}/include/trick/TrickConstant.hh \ + ${TRICK_HOME}/include/trick/message_proto.h \ + ${TRICK_HOME}/include/trick/message_type.h diff --git a/trick_source/sim_services/EventManager/main_page.dox_in b/trick_source/sim_services/EventManager/docs/main_page.dox_in similarity index 100% rename from trick_source/sim_services/EventManager/main_page.dox_in rename to trick_source/sim_services/EventManager/docs/main_page.dox_in diff --git a/trick_source/sim_services/EventManager/src/makefile b/trick_source/sim_services/EventManager/src/makefile deleted file mode 100644 index 753bd7f7..00000000 --- a/trick_source/sim_services/EventManager/src/makefile +++ /dev/null @@ -1,6 +0,0 @@ - -all: - ${MAKE} -C .. - -clean: - ${MAKE} -C .. clean diff --git a/trick_source/sim_services/Executive/src/Exec_exception.cpp b/trick_source/sim_services/Executive/Exec_exception.cpp similarity index 87% rename from trick_source/sim_services/Executive/src/Exec_exception.cpp rename to trick_source/sim_services/Executive/Exec_exception.cpp index 747271c5..330f4d66 100644 --- a/trick_source/sim_services/Executive/src/Exec_exception.cpp +++ b/trick_source/sim_services/Executive/Exec_exception.cpp @@ -2,7 +2,7 @@ #include <iostream> #include <sstream> -#include "sim_services/Executive/include/Exec_exception.hh" +#include "trick/Exec_exception.hh" Trick::Exec_exception::Exec_exception(int in_ret , std::string in_file , int line , std::string in_message ) { diff --git a/trick_source/sim_services/Executive/src/Executive.cpp b/trick_source/sim_services/Executive/Executive.cpp similarity index 98% rename from trick_source/sim_services/Executive/src/Executive.cpp rename to trick_source/sim_services/Executive/Executive.cpp index c78ee031..790aa81b 100644 --- a/trick_source/sim_services/Executive/src/Executive.cpp +++ b/trick_source/sim_services/Executive/Executive.cpp @@ -2,9 +2,9 @@ #include <iostream> #include <math.h> -#include "sim_services/Executive/include/Executive.hh" -#include "sim_services/Executive/include/Exec_exception.hh" -#include "sim_services/include/TrickConstant.hh" +#include "trick/Executive.hh" +#include "trick/Exec_exception.hh" +#include "trick/TrickConstant.hh" Trick::Executive * the_exec ; diff --git a/trick_source/sim_services/Executive/src/Executive_add_depends_on_job.cpp b/trick_source/sim_services/Executive/Executive_add_depends_on_job.cpp similarity index 91% rename from trick_source/sim_services/Executive/src/Executive_add_depends_on_job.cpp rename to trick_source/sim_services/Executive/Executive_add_depends_on_job.cpp index 0342afa5..8348d5e2 100644 --- a/trick_source/sim_services/Executive/src/Executive_add_depends_on_job.cpp +++ b/trick_source/sim_services/Executive/Executive_add_depends_on_job.cpp @@ -2,9 +2,9 @@ #include <iostream> #include <sstream> -#include "sim_services/Executive/include/Executive.hh" -#include "sim_services/Message/include/message_proto.h" -#include "sim_services/Message/include/message_type.h" +#include "trick/Executive.hh" +#include "trick/message_proto.h" +#include "trick/message_type.h" /** @details diff --git a/trick_source/sim_services/Executive/src/Executive_add_jobs_to_queue.cpp b/trick_source/sim_services/Executive/Executive_add_jobs_to_queue.cpp similarity index 97% rename from trick_source/sim_services/Executive/src/Executive_add_jobs_to_queue.cpp rename to trick_source/sim_services/Executive/Executive_add_jobs_to_queue.cpp index eba02143..db712c34 100644 --- a/trick_source/sim_services/Executive/src/Executive_add_jobs_to_queue.cpp +++ b/trick_source/sim_services/Executive/Executive_add_jobs_to_queue.cpp @@ -2,10 +2,10 @@ #include <iostream> #include <math.h> -#include "sim_services/Executive/include/Executive.hh" -#include "sim_services/Executive/include/exec_proto.hh" -#include "sim_services/MemoryManager/include/memorymanager_c_intf.h" -#include "sim_services/include/TrickConstant.hh" +#include "trick/Executive.hh" +#include "trick/exec_proto.hh" +#include "trick/memorymanager_c_intf.h" +#include "trick/TrickConstant.hh" /** @details diff --git a/trick_source/sim_services/Executive/src/Executive_add_scheduled_job_class.cpp b/trick_source/sim_services/Executive/Executive_add_scheduled_job_class.cpp similarity index 91% rename from trick_source/sim_services/Executive/src/Executive_add_scheduled_job_class.cpp rename to trick_source/sim_services/Executive/Executive_add_scheduled_job_class.cpp index 4ab3998d..fe7cb6ea 100644 --- a/trick_source/sim_services/Executive/src/Executive_add_scheduled_job_class.cpp +++ b/trick_source/sim_services/Executive/Executive_add_scheduled_job_class.cpp @@ -1,7 +1,7 @@ #include <iostream> -#include "sim_services/Executive/include/Executive.hh" +#include "trick/Executive.hh" /** @details diff --git a/trick_source/sim_services/Executive/src/Executive_add_sim_object.cpp b/trick_source/sim_services/Executive/Executive_add_sim_object.cpp similarity index 96% rename from trick_source/sim_services/Executive/src/Executive_add_sim_object.cpp rename to trick_source/sim_services/Executive/Executive_add_sim_object.cpp index 75f69fcc..837855a0 100644 --- a/trick_source/sim_services/Executive/src/Executive_add_sim_object.cpp +++ b/trick_source/sim_services/Executive/Executive_add_sim_object.cpp @@ -1,7 +1,7 @@ #include <iostream> -#include "sim_services/Executive/include/Executive.hh" +#include "trick/Executive.hh" /** @details diff --git a/trick_source/sim_services/Executive/src/Executive_advance_sim_time.cpp b/trick_source/sim_services/Executive/Executive_advance_sim_time.cpp similarity index 97% rename from trick_source/sim_services/Executive/src/Executive_advance_sim_time.cpp rename to trick_source/sim_services/Executive/Executive_advance_sim_time.cpp index bf84daa9..cc0fbeeb 100644 --- a/trick_source/sim_services/Executive/src/Executive_advance_sim_time.cpp +++ b/trick_source/sim_services/Executive/Executive_advance_sim_time.cpp @@ -1,8 +1,8 @@ #include <iostream> -#include "sim_services/Executive/include/Executive.hh" -#include "sim_services/include/release.h" +#include "trick/Executive.hh" +#include "trick/release.h" /** @design diff --git a/trick_source/sim_services/Executive/src/Executive_c_intf.cpp b/trick_source/sim_services/Executive/Executive_c_intf.cpp similarity index 99% rename from trick_source/sim_services/Executive/src/Executive_c_intf.cpp rename to trick_source/sim_services/Executive/Executive_c_intf.cpp index 89cf319f..7b9e2916 100644 --- a/trick_source/sim_services/Executive/src/Executive_c_intf.cpp +++ b/trick_source/sim_services/Executive/Executive_c_intf.cpp @@ -3,10 +3,10 @@ #include <vector> #include <string> -#include "sim_services/Executive/include/Executive.hh" -#include "sim_services/Executive/include/Exec_exception.hh" -#include "sim_services/Executive/include/exec_proto.h" -#include "sim_services/Executive/include/exec_proto.hh" +#include "trick/Executive.hh" +#include "trick/Exec_exception.hh" +#include "trick/exec_proto.h" +#include "trick/exec_proto.hh" /* Global singleton pointer to the executive */ extern Trick::Executive * the_exec ; diff --git a/trick_source/sim_services/Executive/src/Executive_call_default_data.cpp b/trick_source/sim_services/Executive/Executive_call_default_data.cpp similarity index 89% rename from trick_source/sim_services/Executive/src/Executive_call_default_data.cpp rename to trick_source/sim_services/Executive/Executive_call_default_data.cpp index 2ea78c81..f6ab1b6b 100644 --- a/trick_source/sim_services/Executive/src/Executive_call_default_data.cpp +++ b/trick_source/sim_services/Executive/Executive_call_default_data.cpp @@ -2,8 +2,8 @@ #include <iostream> #include <sys/resource.h> -#include "sim_services/Executive/include/Executive.hh" -#include "sim_services/Executive/include/Exec_exception.hh" +#include "trick/Executive.hh" +#include "trick/Exec_exception.hh" /** @details diff --git a/trick_source/sim_services/Executive/src/Executive_call_initialization.cpp b/trick_source/sim_services/Executive/Executive_call_initialization.cpp similarity index 88% rename from trick_source/sim_services/Executive/src/Executive_call_initialization.cpp rename to trick_source/sim_services/Executive/Executive_call_initialization.cpp index 9c9a466c..2bf250a2 100644 --- a/trick_source/sim_services/Executive/src/Executive_call_initialization.cpp +++ b/trick_source/sim_services/Executive/Executive_call_initialization.cpp @@ -2,8 +2,8 @@ #include <iostream> #include <sys/resource.h> -#include "sim_services/Executive/include/Executive.hh" -#include "sim_services/Executive/include/Exec_exception.hh" +#include "trick/Executive.hh" +#include "trick/Exec_exception.hh" /** @details diff --git a/trick_source/sim_services/Executive/src/Executive_call_input_processor.cpp b/trick_source/sim_services/Executive/Executive_call_input_processor.cpp similarity index 91% rename from trick_source/sim_services/Executive/src/Executive_call_input_processor.cpp rename to trick_source/sim_services/Executive/Executive_call_input_processor.cpp index f7fbb387..f630f2a1 100644 --- a/trick_source/sim_services/Executive/src/Executive_call_input_processor.cpp +++ b/trick_source/sim_services/Executive/Executive_call_input_processor.cpp @@ -2,8 +2,8 @@ #include <iostream> #include <sys/resource.h> -#include "sim_services/Executive/include/Executive.hh" -#include "sim_services/Executive/include/Exec_exception.hh" +#include "trick/Executive.hh" +#include "trick/Exec_exception.hh" /** @details diff --git a/trick_source/sim_services/Executive/src/Executive_check_all_job_cycle_times.cpp b/trick_source/sim_services/Executive/Executive_check_all_job_cycle_times.cpp similarity index 92% rename from trick_source/sim_services/Executive/src/Executive_check_all_job_cycle_times.cpp rename to trick_source/sim_services/Executive/Executive_check_all_job_cycle_times.cpp index 1ffda261..6f3b2384 100644 --- a/trick_source/sim_services/Executive/src/Executive_check_all_job_cycle_times.cpp +++ b/trick_source/sim_services/Executive/Executive_check_all_job_cycle_times.cpp @@ -1,9 +1,9 @@ #include <math.h> -#include "sim_services/Executive/include/Executive.hh" -#include "sim_services/Message/include/message_proto.h" -#include "sim_services/Message/include/message_type.h" -#include "sim_services/include/TrickConstant.hh" +#include "trick/Executive.hh" +#include "trick/message_proto.h" +#include "trick/message_type.h" +#include "trick/TrickConstant.hh" /** @details diff --git a/trick_source/sim_services/Executive/src/Executive_check_all_jobs_handled.cpp b/trick_source/sim_services/Executive/Executive_check_all_jobs_handled.cpp similarity index 85% rename from trick_source/sim_services/Executive/src/Executive_check_all_jobs_handled.cpp rename to trick_source/sim_services/Executive/Executive_check_all_jobs_handled.cpp index a644d2a9..688adec0 100644 --- a/trick_source/sim_services/Executive/src/Executive_check_all_jobs_handled.cpp +++ b/trick_source/sim_services/Executive/Executive_check_all_jobs_handled.cpp @@ -3,9 +3,9 @@ #include <sstream> #include <cstring> -#include "sim_services/Executive/include/Executive.hh" -#include "sim_services/Message/include/message_proto.h" -#include "sim_services/Message/include/message_type.h" +#include "trick/Executive.hh" +#include "trick/message_proto.h" +#include "trick/message_type.h" /** @details diff --git a/trick_source/sim_services/Executive/src/Executive_checkpoint.cpp b/trick_source/sim_services/Executive/Executive_checkpoint.cpp similarity index 80% rename from trick_source/sim_services/Executive/src/Executive_checkpoint.cpp rename to trick_source/sim_services/Executive/Executive_checkpoint.cpp index 382e70c2..7a335f55 100644 --- a/trick_source/sim_services/Executive/src/Executive_checkpoint.cpp +++ b/trick_source/sim_services/Executive/Executive_checkpoint.cpp @@ -1,10 +1,10 @@ #include <iostream> -#include "sim_services/Executive/include/Executive.hh" -#include "sim_services/Executive/include/exec_proto.h" -#include "sim_services/MemoryManager/include/memorymanager_c_intf.h" -#include "sim_services/CheckPointRestart/include/checkpoint_stl.hh" +#include "trick/Executive.hh" +#include "trick/exec_proto.h" +#include "trick/memorymanager_c_intf.h" +#include "trick/checkpoint_stl.hh" /** @details diff --git a/trick_source/sim_services/Executive/src/Executive_clear_scheduled_queues.cpp b/trick_source/sim_services/Executive/Executive_clear_scheduled_queues.cpp similarity index 93% rename from trick_source/sim_services/Executive/src/Executive_clear_scheduled_queues.cpp rename to trick_source/sim_services/Executive/Executive_clear_scheduled_queues.cpp index 389eb6be..fb14cc7e 100644 --- a/trick_source/sim_services/Executive/src/Executive_clear_scheduled_queues.cpp +++ b/trick_source/sim_services/Executive/Executive_clear_scheduled_queues.cpp @@ -2,7 +2,7 @@ #include <iostream> #include <sstream> -#include "sim_services/Executive/include/Executive.hh" +#include "trick/Executive.hh" int Trick::Executive::clear_scheduled_queues() { diff --git a/trick_source/sim_services/Executive/src/Executive_create_threads.cpp b/trick_source/sim_services/Executive/Executive_create_threads.cpp similarity index 93% rename from trick_source/sim_services/Executive/src/Executive_create_threads.cpp rename to trick_source/sim_services/Executive/Executive_create_threads.cpp index d124cbe0..bf776cd5 100644 --- a/trick_source/sim_services/Executive/src/Executive_create_threads.cpp +++ b/trick_source/sim_services/Executive/Executive_create_threads.cpp @@ -3,7 +3,7 @@ #include <sstream> #include <sys/syscall.h> -#include "sim_services/Executive/include/Executive.hh" +#include "trick/Executive.hh" int Trick::Executive::create_threads() { diff --git a/trick_source/sim_services/Executive/src/Executive_fpe_handler.cpp b/trick_source/sim_services/Executive/Executive_fpe_handler.cpp similarity index 95% rename from trick_source/sim_services/Executive/src/Executive_fpe_handler.cpp rename to trick_source/sim_services/Executive/Executive_fpe_handler.cpp index 9e906215..3d3a0948 100644 --- a/trick_source/sim_services/Executive/src/Executive_fpe_handler.cpp +++ b/trick_source/sim_services/Executive/Executive_fpe_handler.cpp @@ -20,9 +20,9 @@ #include <fenv.h> #endif -#include "sim_services/Executive/include/Executive.hh" -#include "sim_services/Executive/include/exec_proto.h" -#include "sim_services/Message/include/message_proto.h" +#include "trick/Executive.hh" +#include "trick/exec_proto.h" +#include "trick/message_proto.h" /** @design diff --git a/trick_source/sim_services/Executive/src/Executive_freeze.cpp b/trick_source/sim_services/Executive/Executive_freeze.cpp similarity index 88% rename from trick_source/sim_services/Executive/src/Executive_freeze.cpp rename to trick_source/sim_services/Executive/Executive_freeze.cpp index a08a96dd..736b543f 100644 --- a/trick_source/sim_services/Executive/src/Executive_freeze.cpp +++ b/trick_source/sim_services/Executive/Executive_freeze.cpp @@ -2,11 +2,11 @@ #include <iostream> #include <sstream> -#include "sim_services/include/TrickConstant.hh" -#include "sim_services/Executive/include/Executive.hh" -#include "sim_services/Executive/include/exec_proto.h" -#include "sim_services/Message/include/message_proto.h" -#include "sim_services/Message/include/message_type.h" +#include "trick/TrickConstant.hh" +#include "trick/Executive.hh" +#include "trick/exec_proto.h" +#include "trick/message_proto.h" +#include "trick/message_type.h" int Trick::Executive::get_freeze_job(std::string sim_object_name) { freeze_job = get_job(sim_object_name + ".sched_freeze_to_exec_command") ; diff --git a/trick_source/sim_services/Executive/src/Executive_freeze_loop.cpp b/trick_source/sim_services/Executive/Executive_freeze_loop.cpp similarity index 92% rename from trick_source/sim_services/Executive/src/Executive_freeze_loop.cpp rename to trick_source/sim_services/Executive/Executive_freeze_loop.cpp index e7d99491..e5d53e24 100644 --- a/trick_source/sim_services/Executive/src/Executive_freeze_loop.cpp +++ b/trick_source/sim_services/Executive/Executive_freeze_loop.cpp @@ -2,11 +2,11 @@ #include <iostream> #include <sstream> -#include "sim_services/Executive/include/Executive.hh" -#include "sim_services/Executive/include/Exec_exception.hh" -#include "sim_services/Executive/include/exec_proto.h" -#include "sim_services/Message/include/message_proto.h" -#include "sim_services/Message/include/message_type.h" +#include "trick/Executive.hh" +#include "trick/Exec_exception.hh" +#include "trick/exec_proto.h" +#include "trick/message_proto.h" +#include "trick/message_type.h" /** @details diff --git a/trick_source/sim_services/Executive/src/Executive_get_curr_job.cpp b/trick_source/sim_services/Executive/Executive_get_curr_job.cpp similarity index 81% rename from trick_source/sim_services/Executive/src/Executive_get_curr_job.cpp rename to trick_source/sim_services/Executive/Executive_get_curr_job.cpp index e5502c76..ec7882c5 100644 --- a/trick_source/sim_services/Executive/src/Executive_get_curr_job.cpp +++ b/trick_source/sim_services/Executive/Executive_get_curr_job.cpp @@ -1,7 +1,7 @@ #include <iostream> -#include "sim_services/Executive/include/Executive.hh" +#include "trick/Executive.hh" Trick::JobData * Trick::Executive::get_curr_job() { diff --git a/trick_source/sim_services/Executive/src/Executive_get_job.cpp b/trick_source/sim_services/Executive/Executive_get_job.cpp similarity index 93% rename from trick_source/sim_services/Executive/src/Executive_get_job.cpp rename to trick_source/sim_services/Executive/Executive_get_job.cpp index 6c151648..65eabce5 100644 --- a/trick_source/sim_services/Executive/src/Executive_get_job.cpp +++ b/trick_source/sim_services/Executive/Executive_get_job.cpp @@ -1,7 +1,7 @@ #include <iostream> -#include "sim_services/Executive/include/Executive.hh" +#include "trick/Executive.hh" Trick::JobData * Trick::Executive::get_job(std::string job_name, unsigned int j_instance) { diff --git a/trick_source/sim_services/Executive/src/Executive_get_job_cycle.cpp b/trick_source/sim_services/Executive/Executive_get_job_cycle.cpp similarity index 85% rename from trick_source/sim_services/Executive/src/Executive_get_job_cycle.cpp rename to trick_source/sim_services/Executive/Executive_get_job_cycle.cpp index eb983275..8421b292 100644 --- a/trick_source/sim_services/Executive/src/Executive_get_job_cycle.cpp +++ b/trick_source/sim_services/Executive/Executive_get_job_cycle.cpp @@ -1,7 +1,7 @@ #include <iostream> -#include "sim_services/Executive/include/Executive.hh" +#include "trick/Executive.hh" double Trick::Executive::get_job_cycle(std::string job_name) { diff --git a/trick_source/sim_services/Executive/src/Executive_get_process_id.cpp b/trick_source/sim_services/Executive/Executive_get_process_id.cpp similarity index 88% rename from trick_source/sim_services/Executive/src/Executive_get_process_id.cpp rename to trick_source/sim_services/Executive/Executive_get_process_id.cpp index a34a8f95..e97ca984 100644 --- a/trick_source/sim_services/Executive/src/Executive_get_process_id.cpp +++ b/trick_source/sim_services/Executive/Executive_get_process_id.cpp @@ -1,7 +1,7 @@ #include <iostream> -#include "sim_services/Executive/include/Executive.hh" +#include "trick/Executive.hh" unsigned int Trick::Executive::get_process_id() { diff --git a/trick_source/sim_services/Executive/src/Executive_get_sim_time.cpp b/trick_source/sim_services/Executive/Executive_get_sim_time.cpp similarity index 95% rename from trick_source/sim_services/Executive/src/Executive_get_sim_time.cpp rename to trick_source/sim_services/Executive/Executive_get_sim_time.cpp index 08f5887c..93e79256 100644 --- a/trick_source/sim_services/Executive/src/Executive_get_sim_time.cpp +++ b/trick_source/sim_services/Executive/Executive_get_sim_time.cpp @@ -1,7 +1,7 @@ #include <iostream> -#include "sim_services/Executive/include/Executive.hh" +#include "trick/Executive.hh" double Trick::Executive::get_sim_time() { diff --git a/trick_source/sim_services/Executive/src/Executive_init.cpp b/trick_source/sim_services/Executive/Executive_init.cpp similarity index 94% rename from trick_source/sim_services/Executive/src/Executive_init.cpp rename to trick_source/sim_services/Executive/Executive_init.cpp index edb8d377..01efa865 100644 --- a/trick_source/sim_services/Executive/src/Executive_init.cpp +++ b/trick_source/sim_services/Executive/Executive_init.cpp @@ -3,9 +3,9 @@ #include <stdlib.h> #include <sys/resource.h> -#include "sim_services/Executive/include/Executive.hh" -#include "sim_services/Executive/include/Exec_exception.hh" -#include "sim_services/Executive/include/exec_proto.h" +#include "trick/Executive.hh" +#include "trick/Exec_exception.hh" +#include "trick/exec_proto.h" /** @details diff --git a/trick_source/sim_services/Executive/src/Executive_init_freeze_scheduled.cpp b/trick_source/sim_services/Executive/Executive_init_freeze_scheduled.cpp similarity index 88% rename from trick_source/sim_services/Executive/src/Executive_init_freeze_scheduled.cpp rename to trick_source/sim_services/Executive/Executive_init_freeze_scheduled.cpp index b4df59b6..9a9b9b1f 100644 --- a/trick_source/sim_services/Executive/src/Executive_init_freeze_scheduled.cpp +++ b/trick_source/sim_services/Executive/Executive_init_freeze_scheduled.cpp @@ -1,5 +1,5 @@ -#include "sim_services/Executive/include/Executive.hh" +#include "trick/Executive.hh" int Trick::Executive::init_freeze_scheduled() { diff --git a/trick_source/sim_services/Executive/src/Executive_init_signal_handlers.cpp b/trick_source/sim_services/Executive/Executive_init_signal_handlers.cpp similarity index 98% rename from trick_source/sim_services/Executive/src/Executive_init_signal_handlers.cpp rename to trick_source/sim_services/Executive/Executive_init_signal_handlers.cpp index 86a1fe05..29a771da 100644 --- a/trick_source/sim_services/Executive/src/Executive_init_signal_handlers.cpp +++ b/trick_source/sim_services/Executive/Executive_init_signal_handlers.cpp @@ -7,7 +7,7 @@ #include <fenv.h> #endif -#include "sim_services/Executive/include/Executive.hh" +#include "trick/Executive.hh" void sig_hand(int sig) ; void ctrl_c_hand(int sig) ; diff --git a/trick_source/sim_services/Executive/src/Executive_instrument_job.cpp b/trick_source/sim_services/Executive/Executive_instrument_job.cpp similarity index 98% rename from trick_source/sim_services/Executive/src/Executive_instrument_job.cpp rename to trick_source/sim_services/Executive/Executive_instrument_job.cpp index d053a34a..91f7d03c 100644 --- a/trick_source/sim_services/Executive/src/Executive_instrument_job.cpp +++ b/trick_source/sim_services/Executive/Executive_instrument_job.cpp @@ -2,7 +2,7 @@ #include <iostream> #include <iomanip> -#include "sim_services/Executive/include/Executive.hh" +#include "trick/Executive.hh" int Trick::Executive::instrument_job_before( std::string in_job , unsigned int instance ) { diff --git a/trick_source/sim_services/Executive/src/Executive_loop.cpp b/trick_source/sim_services/Executive/Executive_loop.cpp similarity index 96% rename from trick_source/sim_services/Executive/src/Executive_loop.cpp rename to trick_source/sim_services/Executive/Executive_loop.cpp index bafcacea..1ef951ff 100644 --- a/trick_source/sim_services/Executive/src/Executive_loop.cpp +++ b/trick_source/sim_services/Executive/Executive_loop.cpp @@ -1,8 +1,8 @@ #include <stdlib.h> -#include "sim_services/Executive/include/Executive.hh" -#include "sim_services/Executive/include/Exec_exception.hh" +#include "trick/Executive.hh" +#include "trick/Exec_exception.hh" /** @details diff --git a/trick_source/sim_services/Executive/src/Executive_loop_multi_thread.cpp b/trick_source/sim_services/Executive/Executive_loop_multi_thread.cpp similarity index 98% rename from trick_source/sim_services/Executive/src/Executive_loop_multi_thread.cpp rename to trick_source/sim_services/Executive/Executive_loop_multi_thread.cpp index 808bf6e6..a3c8e64b 100644 --- a/trick_source/sim_services/Executive/src/Executive_loop_multi_thread.cpp +++ b/trick_source/sim_services/Executive/Executive_loop_multi_thread.cpp @@ -3,10 +3,10 @@ #include <fstream> #include <sstream> -#include "sim_services/Executive/include/Executive.hh" -#include "sim_services/Executive/include/Exec_exception.hh" -#include "sim_services/Executive/include/exec_proto.h" -#include "sim_services/include/release.h" +#include "trick/Executive.hh" +#include "trick/Exec_exception.hh" +#include "trick/exec_proto.h" +#include "trick/release.h" static bool isThreadReadyToRun( Trick::Threads * curr_thread , long long time_tics) { bool ret = false ; diff --git a/trick_source/sim_services/Executive/src/Executive_loop_single_thread.cpp b/trick_source/sim_services/Executive/Executive_loop_single_thread.cpp similarity index 96% rename from trick_source/sim_services/Executive/src/Executive_loop_single_thread.cpp rename to trick_source/sim_services/Executive/Executive_loop_single_thread.cpp index 19458ba8..933d73c4 100644 --- a/trick_source/sim_services/Executive/src/Executive_loop_single_thread.cpp +++ b/trick_source/sim_services/Executive/Executive_loop_single_thread.cpp @@ -3,9 +3,9 @@ #include <fstream> #include <sstream> -#include "sim_services/Executive/include/Executive.hh" -#include "sim_services/Executive/include/Exec_exception.hh" -#include "sim_services/Executive/include/exec_proto.h" +#include "trick/Executive.hh" +#include "trick/Exec_exception.hh" +#include "trick/exec_proto.h" /** @details diff --git a/trick_source/sim_services/Executive/src/Executive_post_checkpoint.cpp b/trick_source/sim_services/Executive/Executive_post_checkpoint.cpp similarity index 61% rename from trick_source/sim_services/Executive/src/Executive_post_checkpoint.cpp rename to trick_source/sim_services/Executive/Executive_post_checkpoint.cpp index c6563f8f..4b6e6054 100644 --- a/trick_source/sim_services/Executive/src/Executive_post_checkpoint.cpp +++ b/trick_source/sim_services/Executive/Executive_post_checkpoint.cpp @@ -1,10 +1,10 @@ #include <iostream> -#include "sim_services/Executive/include/Executive.hh" -#include "sim_services/Executive/include/exec_proto.h" -#include "sim_services/MemoryManager/include/memorymanager_c_intf.h" -#include "sim_services/CheckPointRestart/include/checkpoint_stl.hh" +#include "trick/Executive.hh" +#include "trick/exec_proto.h" +#include "trick/memorymanager_c_intf.h" +#include "trick/checkpoint_stl.hh" int Trick::Executive::post_checkpoint() { diff --git a/trick_source/sim_services/Executive/src/Executive_process_sim_args.cpp b/trick_source/sim_services/Executive/Executive_process_sim_args.cpp similarity index 95% rename from trick_source/sim_services/Executive/src/Executive_process_sim_args.cpp rename to trick_source/sim_services/Executive/Executive_process_sim_args.cpp index 4520e153..e84d614f 100644 --- a/trick_source/sim_services/Executive/src/Executive_process_sim_args.cpp +++ b/trick_source/sim_services/Executive/Executive_process_sim_args.cpp @@ -15,8 +15,8 @@ #include <stdlib.h> #include <string.h> -#include "sim_services/Executive/include/Executive.hh" -#include "sim_services/CommandLineArguments/include/command_line_protos.h" +#include "trick/Executive.hh" +#include "trick/command_line_protos.h" /** @details diff --git a/trick_source/sim_services/Executive/src/Executive_register_scheduler.cpp b/trick_source/sim_services/Executive/Executive_register_scheduler.cpp similarity index 76% rename from trick_source/sim_services/Executive/src/Executive_register_scheduler.cpp rename to trick_source/sim_services/Executive/Executive_register_scheduler.cpp index 859b6597..776b02d7 100644 --- a/trick_source/sim_services/Executive/src/Executive_register_scheduler.cpp +++ b/trick_source/sim_services/Executive/Executive_register_scheduler.cpp @@ -2,7 +2,7 @@ #include <iostream> #include <sstream> -#include "sim_services/Executive/include/Executive.hh" +#include "trick/Executive.hh" int Trick::Executive::register_scheduler( Trick::Scheduler * scheduler ) { other_schedulers.push_back(scheduler) ; diff --git a/trick_source/sim_services/Executive/src/Executive_remove_jobs.cpp b/trick_source/sim_services/Executive/Executive_remove_jobs.cpp similarity index 94% rename from trick_source/sim_services/Executive/src/Executive_remove_jobs.cpp rename to trick_source/sim_services/Executive/Executive_remove_jobs.cpp index a32f4bac..1cfcb8c6 100644 --- a/trick_source/sim_services/Executive/src/Executive_remove_jobs.cpp +++ b/trick_source/sim_services/Executive/Executive_remove_jobs.cpp @@ -2,10 +2,10 @@ #include <iostream> #include <math.h> -#include "sim_services/Executive/include/Executive.hh" -#include "sim_services/Executive/include/exec_proto.hh" -#include "sim_services/MemoryManager/include/memorymanager_c_intf.h" -#include "sim_services/include/TrickConstant.hh" +#include "trick/Executive.hh" +#include "trick/exec_proto.hh" +#include "trick/memorymanager_c_intf.h" +#include "trick/TrickConstant.hh" /** @details diff --git a/trick_source/sim_services/Executive/src/Executive_remove_sim_object.cpp b/trick_source/sim_services/Executive/Executive_remove_sim_object.cpp similarity index 96% rename from trick_source/sim_services/Executive/src/Executive_remove_sim_object.cpp rename to trick_source/sim_services/Executive/Executive_remove_sim_object.cpp index 6b035d5f..665e7fab 100644 --- a/trick_source/sim_services/Executive/src/Executive_remove_sim_object.cpp +++ b/trick_source/sim_services/Executive/Executive_remove_sim_object.cpp @@ -1,7 +1,7 @@ #include <iostream> -#include "sim_services/Executive/include/Executive.hh" +#include "trick/Executive.hh" /** @details diff --git a/trick_source/sim_services/Executive/src/Executive_restart.cpp b/trick_source/sim_services/Executive/Executive_restart.cpp similarity index 92% rename from trick_source/sim_services/Executive/src/Executive_restart.cpp rename to trick_source/sim_services/Executive/Executive_restart.cpp index 696a328d..1572f436 100644 --- a/trick_source/sim_services/Executive/src/Executive_restart.cpp +++ b/trick_source/sim_services/Executive/Executive_restart.cpp @@ -2,14 +2,14 @@ #include <iostream> #include <string.h> -#include "sim_services/Executive/include/Executive.hh" -#include "sim_services/Executive/include/exec_proto.h" -#include "sim_services/Message/include/message_proto.h" -#include "sim_services/Message/include/message_type.h" -#include "sim_services/MemoryManager/include/memorymanager_c_intf.h" -#include "sim_services/CheckPointRestart/include/checkpoint_stl.hh" -#include "sim_services/ScheduledJobQueue/include/ScheduledJobQueue.hh" -#include "sim_services/Executive/include/Threads.hh" +#include "trick/Executive.hh" +#include "trick/exec_proto.h" +#include "trick/message_proto.h" +#include "trick/message_type.h" +#include "trick/memorymanager_c_intf.h" +#include "trick/checkpoint_stl.hh" +#include "trick/ScheduledJobQueue.hh" +#include "trick/Threads.hh" /** @details diff --git a/trick_source/sim_services/Executive/src/Executive_run.cpp b/trick_source/sim_services/Executive/Executive_run.cpp similarity index 67% rename from trick_source/sim_services/Executive/src/Executive_run.cpp rename to trick_source/sim_services/Executive/Executive_run.cpp index 88f67620..7896c0f8 100644 --- a/trick_source/sim_services/Executive/src/Executive_run.cpp +++ b/trick_source/sim_services/Executive/Executive_run.cpp @@ -2,8 +2,8 @@ #include <iostream> #include <sstream> -#include "sim_services/Executive/include/Executive.hh" -#include "sim_services/Message/include/Message_proto.hh" +#include "trick/Executive.hh" +#include "trick/Message_proto.hh" int Trick::Executive::run() { diff --git a/trick_source/sim_services/Executive/src/Executive_set_job_cycle.cpp b/trick_source/sim_services/Executive/Executive_set_job_cycle.cpp similarity index 89% rename from trick_source/sim_services/Executive/src/Executive_set_job_cycle.cpp rename to trick_source/sim_services/Executive/Executive_set_job_cycle.cpp index 55736126..4ecb2d1d 100644 --- a/trick_source/sim_services/Executive/src/Executive_set_job_cycle.cpp +++ b/trick_source/sim_services/Executive/Executive_set_job_cycle.cpp @@ -1,9 +1,9 @@ #include <iostream> -#include "sim_services/Executive/include/Executive.hh" -#include "sim_services/Message/include/message_proto.h" -#include "sim_services/Message/include/message_type.h" +#include "trick/Executive.hh" +#include "trick/message_proto.h" +#include "trick/message_type.h" int Trick::Executive::set_job_cycle(std::string job_name, int instance_num, double in_cycle) { diff --git a/trick_source/sim_services/Executive/src/Executive_set_job_onoff.cpp b/trick_source/sim_services/Executive/Executive_set_job_onoff.cpp similarity index 87% rename from trick_source/sim_services/Executive/src/Executive_set_job_onoff.cpp rename to trick_source/sim_services/Executive/Executive_set_job_onoff.cpp index 7c01e924..0a94105a 100644 --- a/trick_source/sim_services/Executive/src/Executive_set_job_onoff.cpp +++ b/trick_source/sim_services/Executive/Executive_set_job_onoff.cpp @@ -1,9 +1,9 @@ #include <iostream> -#include "sim_services/Executive/include/Executive.hh" -#include "sim_services/Message/include/message_proto.h" -#include "sim_services/Message/include/message_type.h" +#include "trick/Executive.hh" +#include "trick/message_proto.h" +#include "trick/message_type.h" int Trick::Executive::set_job_onoff(std::string job_name, int instance_num , int on) { diff --git a/trick_source/sim_services/Executive/src/Executive_set_lock_memory.cpp b/trick_source/sim_services/Executive/Executive_set_lock_memory.cpp similarity index 87% rename from trick_source/sim_services/Executive/src/Executive_set_lock_memory.cpp rename to trick_source/sim_services/Executive/Executive_set_lock_memory.cpp index 55ee6072..3206223e 100644 --- a/trick_source/sim_services/Executive/src/Executive_set_lock_memory.cpp +++ b/trick_source/sim_services/Executive/Executive_set_lock_memory.cpp @@ -1,7 +1,7 @@ -#include "sim_services/Executive/include/Executive.hh" -#include "sim_services/Message/include/message_proto.h" -#include "sim_services/Message/include/message_type.h" +#include "trick/Executive.hh" +#include "trick/message_proto.h" +#include "trick/message_type.h" #if __linux diff --git a/trick_source/sim_services/Executive/src/Executive_set_simobject_onoff.cpp b/trick_source/sim_services/Executive/Executive_set_simobject_onoff.cpp similarity index 89% rename from trick_source/sim_services/Executive/src/Executive_set_simobject_onoff.cpp rename to trick_source/sim_services/Executive/Executive_set_simobject_onoff.cpp index 95d82a70..22c1bb8b 100644 --- a/trick_source/sim_services/Executive/src/Executive_set_simobject_onoff.cpp +++ b/trick_source/sim_services/Executive/Executive_set_simobject_onoff.cpp @@ -1,7 +1,7 @@ #include <iostream> -#include "sim_services/Executive/include/Executive.hh" +#include "trick/Executive.hh" int Trick::Executive::set_sim_object_onoff(std::string sim_object_name, int on) { diff --git a/trick_source/sim_services/Executive/src/Executive_set_thread_amf_cycle_time.cpp b/trick_source/sim_services/Executive/Executive_set_thread_amf_cycle_time.cpp similarity index 92% rename from trick_source/sim_services/Executive/src/Executive_set_thread_amf_cycle_time.cpp rename to trick_source/sim_services/Executive/Executive_set_thread_amf_cycle_time.cpp index 0b208dfa..d98b8f6a 100644 --- a/trick_source/sim_services/Executive/src/Executive_set_thread_amf_cycle_time.cpp +++ b/trick_source/sim_services/Executive/Executive_set_thread_amf_cycle_time.cpp @@ -2,7 +2,7 @@ #include <iostream> #include <sstream> -#include "sim_services/Executive/include/Executive.hh" +#include "trick/Executive.hh" int Trick::Executive::set_thread_amf_cycle_time(unsigned int thread_id , double cycle_time) { diff --git a/trick_source/sim_services/Executive/src/Executive_set_thread_async_wait.cpp b/trick_source/sim_services/Executive/Executive_set_thread_async_wait.cpp similarity index 92% rename from trick_source/sim_services/Executive/src/Executive_set_thread_async_wait.cpp rename to trick_source/sim_services/Executive/Executive_set_thread_async_wait.cpp index afd2ac12..5e0e42d2 100644 --- a/trick_source/sim_services/Executive/src/Executive_set_thread_async_wait.cpp +++ b/trick_source/sim_services/Executive/Executive_set_thread_async_wait.cpp @@ -2,7 +2,7 @@ #include <iostream> #include <sstream> -#include "sim_services/Executive/include/Executive.hh" +#include "trick/Executive.hh" int Trick::Executive::set_thread_async_wait(unsigned int thread_id , bool yes_no) { diff --git a/trick_source/sim_services/Executive/src/Executive_set_thread_cpu_affinity.cpp b/trick_source/sim_services/Executive/Executive_set_thread_cpu_affinity.cpp similarity index 86% rename from trick_source/sim_services/Executive/src/Executive_set_thread_cpu_affinity.cpp rename to trick_source/sim_services/Executive/Executive_set_thread_cpu_affinity.cpp index 4b546803..03533ea7 100644 --- a/trick_source/sim_services/Executive/src/Executive_set_thread_cpu_affinity.cpp +++ b/trick_source/sim_services/Executive/Executive_set_thread_cpu_affinity.cpp @@ -1,5 +1,5 @@ -#include "sim_services/Executive/include/Executive.hh" +#include "trick/Executive.hh" int Trick::Executive::set_thread_cpu_affinity(unsigned int thread_id , int cpu_num) { diff --git a/trick_source/sim_services/Executive/src/Executive_set_thread_enabled.cpp b/trick_source/sim_services/Executive/Executive_set_thread_enabled.cpp similarity index 90% rename from trick_source/sim_services/Executive/src/Executive_set_thread_enabled.cpp rename to trick_source/sim_services/Executive/Executive_set_thread_enabled.cpp index b76b5459..28eac953 100644 --- a/trick_source/sim_services/Executive/src/Executive_set_thread_enabled.cpp +++ b/trick_source/sim_services/Executive/Executive_set_thread_enabled.cpp @@ -2,7 +2,7 @@ #include <iostream> #include <sstream> -#include "sim_services/Executive/include/Executive.hh" +#include "trick/Executive.hh" /** @design diff --git a/trick_source/sim_services/Executive/src/Executive_set_thread_priority.cpp b/trick_source/sim_services/Executive/Executive_set_thread_priority.cpp similarity index 89% rename from trick_source/sim_services/Executive/src/Executive_set_thread_priority.cpp rename to trick_source/sim_services/Executive/Executive_set_thread_priority.cpp index d219a914..f5a0583f 100644 --- a/trick_source/sim_services/Executive/src/Executive_set_thread_priority.cpp +++ b/trick_source/sim_services/Executive/Executive_set_thread_priority.cpp @@ -1,5 +1,5 @@ -#include "sim_services/Executive/include/Executive.hh" +#include "trick/Executive.hh" int Trick::Executive::set_thread_priority(unsigned int thread_id , unsigned int req_priority) { diff --git a/trick_source/sim_services/Executive/src/Executive_set_thread_process_type.cpp b/trick_source/sim_services/Executive/Executive_set_thread_process_type.cpp similarity index 92% rename from trick_source/sim_services/Executive/src/Executive_set_thread_process_type.cpp rename to trick_source/sim_services/Executive/Executive_set_thread_process_type.cpp index b67df077..7271ff03 100644 --- a/trick_source/sim_services/Executive/src/Executive_set_thread_process_type.cpp +++ b/trick_source/sim_services/Executive/Executive_set_thread_process_type.cpp @@ -2,7 +2,7 @@ #include <iostream> #include <sstream> -#include "sim_services/Executive/include/Executive.hh" +#include "trick/Executive.hh" int Trick::Executive::set_thread_process_type(unsigned int thread_id , int process_type) { diff --git a/trick_source/sim_services/Executive/src/Executive_set_thread_rt_semaphore.cpp b/trick_source/sim_services/Executive/Executive_set_thread_rt_semaphore.cpp similarity index 86% rename from trick_source/sim_services/Executive/src/Executive_set_thread_rt_semaphore.cpp rename to trick_source/sim_services/Executive/Executive_set_thread_rt_semaphore.cpp index 5d854782..85ab4c88 100644 --- a/trick_source/sim_services/Executive/src/Executive_set_thread_rt_semaphore.cpp +++ b/trick_source/sim_services/Executive/Executive_set_thread_rt_semaphore.cpp @@ -1,5 +1,5 @@ -#include "sim_services/Executive/include/Executive.hh" +#include "trick/Executive.hh" int Trick::Executive::set_thread_rt_semaphores(unsigned int thread_id , bool yes_no) { diff --git a/trick_source/sim_services/Executive/src/Executive_set_time_tic_value.cpp b/trick_source/sim_services/Executive/Executive_set_time_tic_value.cpp similarity index 90% rename from trick_source/sim_services/Executive/src/Executive_set_time_tic_value.cpp rename to trick_source/sim_services/Executive/Executive_set_time_tic_value.cpp index 44d1e023..d90b5c51 100644 --- a/trick_source/sim_services/Executive/src/Executive_set_time_tic_value.cpp +++ b/trick_source/sim_services/Executive/Executive_set_time_tic_value.cpp @@ -2,10 +2,10 @@ #include <iostream> #include <math.h> -#include "sim_services/Executive/include/Executive.hh" -#include "sim_services/include/TrickConstant.hh" -#include "sim_services/Message/include/message_proto.h" -#include "sim_services/Message/include/message_type.h" +#include "trick/Executive.hh" +#include "trick/TrickConstant.hh" +#include "trick/message_proto.h" +#include "trick/message_type.h" int Trick::Executive::set_time_tic_value(int in_tics) { diff --git a/trick_source/sim_services/Executive/src/Executive_shutdown.cpp b/trick_source/sim_services/Executive/Executive_shutdown.cpp similarity index 94% rename from trick_source/sim_services/Executive/src/Executive_shutdown.cpp rename to trick_source/sim_services/Executive/Executive_shutdown.cpp index 348a44c8..ca49a065 100644 --- a/trick_source/sim_services/Executive/src/Executive_shutdown.cpp +++ b/trick_source/sim_services/Executive/Executive_shutdown.cpp @@ -12,11 +12,11 @@ #include <iomanip> #include <sys/resource.h> -#include "sim_services/Executive/include/Executive.hh" -#include "sim_services/Executive/include/Exec_exception.hh" -#include "sim_services/Message/include/message_proto.h" -#include "sim_services/Message/include/message_type.h" -#include "sim_services/include/release.h" +#include "trick/Executive.hh" +#include "trick/Exec_exception.hh" +#include "trick/message_proto.h" +#include "trick/message_type.h" +#include "trick/release.h" /** @design diff --git a/trick_source/sim_services/Executive/src/Executive_signal_handler.cpp b/trick_source/sim_services/Executive/Executive_signal_handler.cpp similarity index 98% rename from trick_source/sim_services/Executive/src/Executive_signal_handler.cpp rename to trick_source/sim_services/Executive/Executive_signal_handler.cpp index 9575b43f..89c33baf 100644 --- a/trick_source/sim_services/Executive/src/Executive_signal_handler.cpp +++ b/trick_source/sim_services/Executive/Executive_signal_handler.cpp @@ -23,7 +23,7 @@ #include <mach-o/dyld.h> #endif -#include "sim_services/Executive/include/Executive.hh" +#include "trick/Executive.hh" /** @design diff --git a/trick_source/sim_services/Executive/src/Executive_stop.cpp b/trick_source/sim_services/Executive/Executive_stop.cpp similarity index 82% rename from trick_source/sim_services/Executive/src/Executive_stop.cpp rename to trick_source/sim_services/Executive/Executive_stop.cpp index dc528021..c625e6ac 100644 --- a/trick_source/sim_services/Executive/src/Executive_stop.cpp +++ b/trick_source/sim_services/Executive/Executive_stop.cpp @@ -2,8 +2,8 @@ #include <iostream> #include <sstream> -#include "sim_services/Executive/include/Executive.hh" -#include "sim_services/Executive/include/Exec_exception.hh" +#include "trick/Executive.hh" +#include "trick/Exec_exception.hh" int Trick::Executive::stop() { diff --git a/trick_source/sim_services/Executive/src/Executive_terminate.cpp b/trick_source/sim_services/Executive/Executive_terminate.cpp similarity index 57% rename from trick_source/sim_services/Executive/src/Executive_terminate.cpp rename to trick_source/sim_services/Executive/Executive_terminate.cpp index 3c8e1bae..90520717 100644 --- a/trick_source/sim_services/Executive/src/Executive_terminate.cpp +++ b/trick_source/sim_services/Executive/Executive_terminate.cpp @@ -2,9 +2,9 @@ #include <iostream> #include <sstream> -#include "sim_services/Executive/include/Executive.hh" -#include "sim_services/Executive/include/Exec_exception.hh" -#include "sim_services/Executive/include/exec_proto.h" +#include "trick/Executive.hh" +#include "trick/Exec_exception.hh" +#include "trick/exec_proto.h" int Trick::Executive::exec_terminate(const char *file_name, const char *error) { exec_command = ExitCmd ; diff --git a/trick_source/sim_services/Executive/src/Executive_write_s_job_execution.cpp b/trick_source/sim_services/Executive/Executive_write_s_job_execution.cpp similarity index 95% rename from trick_source/sim_services/Executive/src/Executive_write_s_job_execution.cpp rename to trick_source/sim_services/Executive/Executive_write_s_job_execution.cpp index 9379af4c..720d09e1 100644 --- a/trick_source/sim_services/Executive/src/Executive_write_s_job_execution.cpp +++ b/trick_source/sim_services/Executive/Executive_write_s_job_execution.cpp @@ -6,10 +6,10 @@ #include <sys/stat.h> #include <sstream> -#include "sim_services/Executive/include/Executive.hh" -#include "sim_services/CommandLineArguments/include/command_line_protos.h" -#include "sim_services/Message/include/message_proto.h" -#include "sim_services/Message/include/message_type.h" +#include "trick/Executive.hh" +#include "trick/command_line_protos.h" +#include "trick/message_proto.h" +#include "trick/message_type.h" /** @details diff --git a/trick_source/sim_services/Executive/src/Executive_write_s_run_summary.cpp b/trick_source/sim_services/Executive/Executive_write_s_run_summary.cpp similarity index 86% rename from trick_source/sim_services/Executive/src/Executive_write_s_run_summary.cpp rename to trick_source/sim_services/Executive/Executive_write_s_run_summary.cpp index e0b29a77..3530057c 100644 --- a/trick_source/sim_services/Executive/src/Executive_write_s_run_summary.cpp +++ b/trick_source/sim_services/Executive/Executive_write_s_run_summary.cpp @@ -6,11 +6,11 @@ #include <string.h> #include <unistd.h> -#include "sim_services/Executive/include/Executive.hh" -#include "sim_services/CommandLineArguments/include/command_line_protos.h" -#include "sim_services/Environment/include/env_proto.h" -#include "sim_services/Message/include/message_proto.h" -#include "sim_services/Message/include/message_type.h" +#include "trick/Executive.hh" +#include "trick/command_line_protos.h" +#include "trick/env_proto.h" +#include "trick/message_proto.h" +#include "trick/message_type.h" /** @details diff --git a/trick_source/sim_services/Executive/Makefile b/trick_source/sim_services/Executive/Makefile index 3029433b..a181cedf 100644 --- a/trick_source/sim_services/Executive/Makefile +++ b/trick_source/sim_services/Executive/Makefile @@ -1,5 +1,5 @@ -include ${TRICK_HOME}/makefiles/Makefile.common -include ${TRICK_HOME}/makefiles/Makefile.tricklib +include ${TRICK_HOME}/share/trick/makefiles/Makefile.common +include ${TRICK_HOME}/share/trick/makefiles/Makefile.tricklib -include Makefile_deps diff --git a/trick_source/sim_services/Executive/Makefile_deps b/trick_source/sim_services/Executive/Makefile_deps index 3e32f981..f46d5b08 100644 --- a/trick_source/sim_services/Executive/Makefile_deps +++ b/trick_source/sim_services/Executive/Makefile_deps @@ -1,686 +1,1760 @@ -object_${TRICK_HOST_CPU}/Exec_exception.o: src/Exec_exception.cpp \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/Exec_exception.hh -object_${TRICK_HOST_CPU}/Executive.o: src/Executive.cpp \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/Executive.hh \ - ${TRICK_HOME}/trick_source/sim_services/Scheduler/include/Scheduler.hh \ - ${TRICK_HOME}/trick_source/sim_services/ScheduledJobQueue/include/ScheduledJobQueue.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/JobData.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/InstrumentBase.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/SimObject.hh \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/Threads.hh \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/sim_mode.h \ - ${TRICK_HOME}/trick_source/sim_services/include/TrickConstant.hh -object_${TRICK_HOST_CPU}/Executive_add_depends_on_job.o: src/Executive_add_depends_on_job.cpp \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/Executive.hh \ - ${TRICK_HOME}/trick_source/sim_services/Scheduler/include/Scheduler.hh \ - ${TRICK_HOME}/trick_source/sim_services/ScheduledJobQueue/include/ScheduledJobQueue.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/JobData.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/InstrumentBase.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/SimObject.hh \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/Threads.hh \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/sim_mode.h \ - ${TRICK_HOME}/trick_source/sim_services/Message/include/message_proto.h \ - ${TRICK_HOME}/trick_source/sim_services/Message/include/message_type.h -object_${TRICK_HOST_CPU}/Executive_add_jobs_to_queue.o: src/Executive_add_jobs_to_queue.cpp \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/Executive.hh \ - ${TRICK_HOME}/trick_source/sim_services/Scheduler/include/Scheduler.hh \ - ${TRICK_HOME}/trick_source/sim_services/ScheduledJobQueue/include/ScheduledJobQueue.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/JobData.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/InstrumentBase.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/SimObject.hh \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/Threads.hh \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/sim_mode.h \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/exec_proto.hh \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/memorymanager_c_intf.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/parameter_types.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/attributes.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/reference.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/value.h \ - ${TRICK_HOME}/trick_source/trick_utils/trick_adt/include/dllist.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/var.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/io_alloc.h \ - ${TRICK_HOME}/trick_source/sim_services/include/TrickConstant.hh -object_${TRICK_HOST_CPU}/Executive_add_scheduled_job_class.o: \ - src/Executive_add_scheduled_job_class.cpp \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/Executive.hh \ - ${TRICK_HOME}/trick_source/sim_services/Scheduler/include/Scheduler.hh \ - ${TRICK_HOME}/trick_source/sim_services/ScheduledJobQueue/include/ScheduledJobQueue.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/JobData.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/InstrumentBase.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/SimObject.hh \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/Threads.hh \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/sim_mode.h -object_${TRICK_HOST_CPU}/Executive_add_sim_object.o: src/Executive_add_sim_object.cpp \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/Executive.hh \ - ${TRICK_HOME}/trick_source/sim_services/Scheduler/include/Scheduler.hh \ - ${TRICK_HOME}/trick_source/sim_services/ScheduledJobQueue/include/ScheduledJobQueue.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/JobData.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/InstrumentBase.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/SimObject.hh \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/Threads.hh \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/sim_mode.h -object_${TRICK_HOST_CPU}/Executive_advance_sim_time.o: src/Executive_advance_sim_time.cpp \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/Executive.hh \ - ${TRICK_HOME}/trick_source/sim_services/Scheduler/include/Scheduler.hh \ - ${TRICK_HOME}/trick_source/sim_services/ScheduledJobQueue/include/ScheduledJobQueue.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/JobData.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/InstrumentBase.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/SimObject.hh \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/Threads.hh \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/sim_mode.h \ - ${TRICK_HOME}/trick_source/sim_services/include/release.h -object_${TRICK_HOST_CPU}/Executive_c_intf.o: src/Executive_c_intf.cpp \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/Executive.hh \ - ${TRICK_HOME}/trick_source/sim_services/Scheduler/include/Scheduler.hh \ - ${TRICK_HOME}/trick_source/sim_services/ScheduledJobQueue/include/ScheduledJobQueue.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/JobData.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/InstrumentBase.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/SimObject.hh \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/Threads.hh \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/sim_mode.h \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/Exec_exception.hh \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/exec_proto.h \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/exec_proto.hh -object_${TRICK_HOST_CPU}/Executive_call_default_data.o: src/Executive_call_default_data.cpp \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/Executive.hh \ - ${TRICK_HOME}/trick_source/sim_services/Scheduler/include/Scheduler.hh \ - ${TRICK_HOME}/trick_source/sim_services/ScheduledJobQueue/include/ScheduledJobQueue.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/JobData.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/InstrumentBase.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/SimObject.hh \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/Threads.hh \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/sim_mode.h \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/Exec_exception.hh -object_${TRICK_HOST_CPU}/Executive_call_initialization.o: src/Executive_call_initialization.cpp \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/Executive.hh \ - ${TRICK_HOME}/trick_source/sim_services/Scheduler/include/Scheduler.hh \ - ${TRICK_HOME}/trick_source/sim_services/ScheduledJobQueue/include/ScheduledJobQueue.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/JobData.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/InstrumentBase.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/SimObject.hh \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/Threads.hh \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/sim_mode.h \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/Exec_exception.hh -object_${TRICK_HOST_CPU}/Executive_call_input_processor.o: src/Executive_call_input_processor.cpp \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/Executive.hh \ - ${TRICK_HOME}/trick_source/sim_services/Scheduler/include/Scheduler.hh \ - ${TRICK_HOME}/trick_source/sim_services/ScheduledJobQueue/include/ScheduledJobQueue.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/JobData.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/InstrumentBase.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/SimObject.hh \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/Threads.hh \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/sim_mode.h \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/Exec_exception.hh -object_${TRICK_HOST_CPU}/Executive_check_all_job_cycle_times.o: \ - src/Executive_check_all_job_cycle_times.cpp \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/Executive.hh \ - ${TRICK_HOME}/trick_source/sim_services/Scheduler/include/Scheduler.hh \ - ${TRICK_HOME}/trick_source/sim_services/ScheduledJobQueue/include/ScheduledJobQueue.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/JobData.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/InstrumentBase.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/SimObject.hh \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/Threads.hh \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/sim_mode.h \ - ${TRICK_HOME}/trick_source/sim_services/Message/include/message_proto.h \ - ${TRICK_HOME}/trick_source/sim_services/Message/include/message_type.h \ - ${TRICK_HOME}/trick_source/sim_services/include/TrickConstant.hh -object_${TRICK_HOST_CPU}/Executive_check_all_jobs_handled.o: \ - src/Executive_check_all_jobs_handled.cpp \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/Executive.hh \ - ${TRICK_HOME}/trick_source/sim_services/Scheduler/include/Scheduler.hh \ - ${TRICK_HOME}/trick_source/sim_services/ScheduledJobQueue/include/ScheduledJobQueue.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/JobData.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/InstrumentBase.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/SimObject.hh \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/Threads.hh \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/sim_mode.h \ - ${TRICK_HOME}/trick_source/sim_services/Message/include/message_proto.h \ - ${TRICK_HOME}/trick_source/sim_services/Message/include/message_type.h -object_${TRICK_HOST_CPU}/Executive_checkpoint.o: src/Executive_checkpoint.cpp \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/Executive.hh \ - ${TRICK_HOME}/trick_source/sim_services/Scheduler/include/Scheduler.hh \ - ${TRICK_HOME}/trick_source/sim_services/ScheduledJobQueue/include/ScheduledJobQueue.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/JobData.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/InstrumentBase.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/SimObject.hh \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/Threads.hh \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/sim_mode.h \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/exec_proto.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/memorymanager_c_intf.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/parameter_types.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/attributes.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/reference.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/value.h \ - ${TRICK_HOME}/trick_source/trick_utils/trick_adt/include/dllist.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/var.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/io_alloc.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManagerWrapper/include/checkpoint_stl.hh \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManagerWrapper/include/checkpoint_sequence_stl.hh \ - ${TRICK_HOME}/trick_source/sim_services/Message/include/message_proto.h \ - ${TRICK_HOME}/trick_source/sim_services/Message/include/message_type.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManagerWrapper/include/checkpoint_map.hh \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManagerWrapper/include/checkpoint_stack.hh \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManagerWrapper/include/checkpoint_sequence_stl.hh \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManagerWrapper/include/checkpoint_queue.hh \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManagerWrapper/include/checkpoint_pair.hh -object_${TRICK_HOST_CPU}/Executive_clear_scheduled_queues.o: \ - src/Executive_clear_scheduled_queues.cpp \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/Executive.hh \ - ${TRICK_HOME}/trick_source/sim_services/Scheduler/include/Scheduler.hh \ - ${TRICK_HOME}/trick_source/sim_services/ScheduledJobQueue/include/ScheduledJobQueue.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/JobData.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/InstrumentBase.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/SimObject.hh \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/Threads.hh \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/sim_mode.h -object_${TRICK_HOST_CPU}/Executive_create_threads.o: src/Executive_create_threads.cpp \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/Executive.hh \ - ${TRICK_HOME}/trick_source/sim_services/Scheduler/include/Scheduler.hh \ - ${TRICK_HOME}/trick_source/sim_services/ScheduledJobQueue/include/ScheduledJobQueue.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/JobData.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/InstrumentBase.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/SimObject.hh \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/Threads.hh \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/sim_mode.h -object_${TRICK_HOST_CPU}/Executive_fpe_handler.o: src/Executive_fpe_handler.cpp \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/Executive.hh \ - ${TRICK_HOME}/trick_source/sim_services/Scheduler/include/Scheduler.hh \ - ${TRICK_HOME}/trick_source/sim_services/ScheduledJobQueue/include/ScheduledJobQueue.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/JobData.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/InstrumentBase.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/SimObject.hh \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/Threads.hh \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/sim_mode.h \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/exec_proto.h \ - ${TRICK_HOME}/trick_source/sim_services/Message/include/message_proto.h \ - ${TRICK_HOME}/trick_source/sim_services/Message/include/message_type.h -object_${TRICK_HOST_CPU}/Executive_freeze.o: src/Executive_freeze.cpp \ - ${TRICK_HOME}/trick_source/sim_services/include/TrickConstant.hh \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/Executive.hh \ - ${TRICK_HOME}/trick_source/sim_services/Scheduler/include/Scheduler.hh \ - ${TRICK_HOME}/trick_source/sim_services/ScheduledJobQueue/include/ScheduledJobQueue.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/JobData.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/InstrumentBase.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/SimObject.hh \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/Threads.hh \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/sim_mode.h \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/exec_proto.h \ - ${TRICK_HOME}/trick_source/sim_services/Message/include/message_proto.h \ - ${TRICK_HOME}/trick_source/sim_services/Message/include/message_type.h -object_${TRICK_HOST_CPU}/Executive_freeze_loop.o: src/Executive_freeze_loop.cpp \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/Executive.hh \ - ${TRICK_HOME}/trick_source/sim_services/Scheduler/include/Scheduler.hh \ - ${TRICK_HOME}/trick_source/sim_services/ScheduledJobQueue/include/ScheduledJobQueue.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/JobData.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/InstrumentBase.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/SimObject.hh \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/Threads.hh \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/sim_mode.h \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/Exec_exception.hh \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/exec_proto.h \ - ${TRICK_HOME}/trick_source/sim_services/Message/include/message_proto.h \ - ${TRICK_HOME}/trick_source/sim_services/Message/include/message_type.h -object_${TRICK_HOST_CPU}/Executive_get_curr_job.o: src/Executive_get_curr_job.cpp \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/Executive.hh \ - ${TRICK_HOME}/trick_source/sim_services/Scheduler/include/Scheduler.hh \ - ${TRICK_HOME}/trick_source/sim_services/ScheduledJobQueue/include/ScheduledJobQueue.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/JobData.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/InstrumentBase.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/SimObject.hh \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/Threads.hh \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/sim_mode.h -object_${TRICK_HOST_CPU}/Executive_get_job.o: src/Executive_get_job.cpp \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/Executive.hh \ - ${TRICK_HOME}/trick_source/sim_services/Scheduler/include/Scheduler.hh \ - ${TRICK_HOME}/trick_source/sim_services/ScheduledJobQueue/include/ScheduledJobQueue.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/JobData.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/InstrumentBase.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/SimObject.hh \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/Threads.hh \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/sim_mode.h -object_${TRICK_HOST_CPU}/Executive_get_job_cycle.o: src/Executive_get_job_cycle.cpp \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/Executive.hh \ - ${TRICK_HOME}/trick_source/sim_services/Scheduler/include/Scheduler.hh \ - ${TRICK_HOME}/trick_source/sim_services/ScheduledJobQueue/include/ScheduledJobQueue.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/JobData.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/InstrumentBase.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/SimObject.hh \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/Threads.hh \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/sim_mode.h -object_${TRICK_HOST_CPU}/Executive_get_process_id.o: src/Executive_get_process_id.cpp \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/Executive.hh \ - ${TRICK_HOME}/trick_source/sim_services/Scheduler/include/Scheduler.hh \ - ${TRICK_HOME}/trick_source/sim_services/ScheduledJobQueue/include/ScheduledJobQueue.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/JobData.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/InstrumentBase.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/SimObject.hh \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/Threads.hh \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/sim_mode.h -object_${TRICK_HOST_CPU}/Executive_get_sim_time.o: src/Executive_get_sim_time.cpp \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/Executive.hh \ - ${TRICK_HOME}/trick_source/sim_services/Scheduler/include/Scheduler.hh \ - ${TRICK_HOME}/trick_source/sim_services/ScheduledJobQueue/include/ScheduledJobQueue.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/JobData.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/InstrumentBase.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/SimObject.hh \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/Threads.hh \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/sim_mode.h -object_${TRICK_HOST_CPU}/Executive_init.o: src/Executive_init.cpp \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/Executive.hh \ - ${TRICK_HOME}/trick_source/sim_services/Scheduler/include/Scheduler.hh \ - ${TRICK_HOME}/trick_source/sim_services/ScheduledJobQueue/include/ScheduledJobQueue.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/JobData.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/InstrumentBase.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/SimObject.hh \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/Threads.hh \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/sim_mode.h \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/Exec_exception.hh \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/exec_proto.h -object_${TRICK_HOST_CPU}/Executive_init_freeze_scheduled.o: \ - src/Executive_init_freeze_scheduled.cpp \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/Executive.hh \ - ${TRICK_HOME}/trick_source/sim_services/Scheduler/include/Scheduler.hh \ - ${TRICK_HOME}/trick_source/sim_services/ScheduledJobQueue/include/ScheduledJobQueue.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/JobData.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/InstrumentBase.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/SimObject.hh \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/Threads.hh \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/sim_mode.h -object_${TRICK_HOST_CPU}/Executive_init_signal_handlers.o: src/Executive_init_signal_handlers.cpp \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/Executive.hh \ - ${TRICK_HOME}/trick_source/sim_services/Scheduler/include/Scheduler.hh \ - ${TRICK_HOME}/trick_source/sim_services/ScheduledJobQueue/include/ScheduledJobQueue.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/JobData.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/InstrumentBase.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/SimObject.hh \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/Threads.hh \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/sim_mode.h -object_${TRICK_HOST_CPU}/Executive_instrument_job.o: src/Executive_instrument_job.cpp \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/Executive.hh \ - ${TRICK_HOME}/trick_source/sim_services/Scheduler/include/Scheduler.hh \ - ${TRICK_HOME}/trick_source/sim_services/ScheduledJobQueue/include/ScheduledJobQueue.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/JobData.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/InstrumentBase.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/SimObject.hh \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/Threads.hh \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/sim_mode.h -object_${TRICK_HOST_CPU}/Executive_loop.o: src/Executive_loop.cpp \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/Executive.hh \ - ${TRICK_HOME}/trick_source/sim_services/Scheduler/include/Scheduler.hh \ - ${TRICK_HOME}/trick_source/sim_services/ScheduledJobQueue/include/ScheduledJobQueue.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/JobData.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/InstrumentBase.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/SimObject.hh \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/Threads.hh \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/sim_mode.h \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/Exec_exception.hh -object_${TRICK_HOST_CPU}/Executive_loop_multi_thread.o: src/Executive_loop_multi_thread.cpp \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/Executive.hh \ - ${TRICK_HOME}/trick_source/sim_services/Scheduler/include/Scheduler.hh \ - ${TRICK_HOME}/trick_source/sim_services/ScheduledJobQueue/include/ScheduledJobQueue.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/JobData.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/InstrumentBase.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/SimObject.hh \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/Threads.hh \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/sim_mode.h \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/Exec_exception.hh \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/exec_proto.h \ - ${TRICK_HOME}/trick_source/sim_services/include/release.h -object_${TRICK_HOST_CPU}/Executive_loop_single_thread.o: src/Executive_loop_single_thread.cpp \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/Executive.hh \ - ${TRICK_HOME}/trick_source/sim_services/Scheduler/include/Scheduler.hh \ - ${TRICK_HOME}/trick_source/sim_services/ScheduledJobQueue/include/ScheduledJobQueue.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/JobData.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/InstrumentBase.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/SimObject.hh \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/Threads.hh \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/sim_mode.h \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/Exec_exception.hh \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/exec_proto.h -object_${TRICK_HOST_CPU}/Executive_post_checkpoint.o: src/Executive_post_checkpoint.cpp \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/Executive.hh \ - ${TRICK_HOME}/trick_source/sim_services/Scheduler/include/Scheduler.hh \ - ${TRICK_HOME}/trick_source/sim_services/ScheduledJobQueue/include/ScheduledJobQueue.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/JobData.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/InstrumentBase.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/SimObject.hh \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/Threads.hh \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/sim_mode.h \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/exec_proto.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/memorymanager_c_intf.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/parameter_types.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/attributes.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/reference.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/value.h \ - ${TRICK_HOME}/trick_source/trick_utils/trick_adt/include/dllist.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/var.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/io_alloc.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManagerWrapper/include/checkpoint_stl.hh \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManagerWrapper/include/checkpoint_sequence_stl.hh \ - ${TRICK_HOME}/trick_source/sim_services/Message/include/message_proto.h \ - ${TRICK_HOME}/trick_source/sim_services/Message/include/message_type.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManagerWrapper/include/checkpoint_map.hh \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManagerWrapper/include/checkpoint_stack.hh \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManagerWrapper/include/checkpoint_sequence_stl.hh \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManagerWrapper/include/checkpoint_queue.hh \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManagerWrapper/include/checkpoint_pair.hh -object_${TRICK_HOST_CPU}/Executive_process_sim_args.o: src/Executive_process_sim_args.cpp \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/Executive.hh \ - ${TRICK_HOME}/trick_source/sim_services/Scheduler/include/Scheduler.hh \ - ${TRICK_HOME}/trick_source/sim_services/ScheduledJobQueue/include/ScheduledJobQueue.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/JobData.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/InstrumentBase.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/SimObject.hh \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/Threads.hh \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/sim_mode.h \ - ${TRICK_HOME}/trick_source/sim_services/CommandLineArguments/include/command_line_protos.h -object_${TRICK_HOST_CPU}/Executive_register_scheduler.o: src/Executive_register_scheduler.cpp \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/Executive.hh \ - ${TRICK_HOME}/trick_source/sim_services/Scheduler/include/Scheduler.hh \ - ${TRICK_HOME}/trick_source/sim_services/ScheduledJobQueue/include/ScheduledJobQueue.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/JobData.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/InstrumentBase.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/SimObject.hh \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/Threads.hh \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/sim_mode.h -object_${TRICK_HOST_CPU}/Executive_restart.o: src/Executive_restart.cpp \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/Executive.hh \ - ${TRICK_HOME}/trick_source/sim_services/Scheduler/include/Scheduler.hh \ - ${TRICK_HOME}/trick_source/sim_services/ScheduledJobQueue/include/ScheduledJobQueue.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/JobData.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/InstrumentBase.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/SimObject.hh \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/Threads.hh \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/sim_mode.h \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/exec_proto.h \ - ${TRICK_HOME}/trick_source/sim_services/Message/include/message_proto.h \ - ${TRICK_HOME}/trick_source/sim_services/Message/include/message_type.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/memorymanager_c_intf.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/parameter_types.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/attributes.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/reference.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/value.h \ - ${TRICK_HOME}/trick_source/trick_utils/trick_adt/include/dllist.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/var.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/io_alloc.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManagerWrapper/include/checkpoint_stl.hh \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManagerWrapper/include/checkpoint_sequence_stl.hh \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManagerWrapper/include/checkpoint_map.hh \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManagerWrapper/include/checkpoint_stack.hh \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManagerWrapper/include/checkpoint_sequence_stl.hh \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManagerWrapper/include/checkpoint_queue.hh \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManagerWrapper/include/checkpoint_pair.hh -object_${TRICK_HOST_CPU}/Executive_run.o: src/Executive_run.cpp \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/Executive.hh \ - ${TRICK_HOME}/trick_source/sim_services/Scheduler/include/Scheduler.hh \ - ${TRICK_HOME}/trick_source/sim_services/ScheduledJobQueue/include/ScheduledJobQueue.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/JobData.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/InstrumentBase.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/SimObject.hh \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/Threads.hh \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/sim_mode.h \ - ${TRICK_HOME}/trick_source/sim_services/Message/include/Message_proto.hh \ - ${TRICK_HOME}/trick_source/sim_services/Message/include/MessageSubscriber.hh -object_${TRICK_HOST_CPU}/Executive_set_job_cycle.o: src/Executive_set_job_cycle.cpp \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/Executive.hh \ - ${TRICK_HOME}/trick_source/sim_services/Scheduler/include/Scheduler.hh \ - ${TRICK_HOME}/trick_source/sim_services/ScheduledJobQueue/include/ScheduledJobQueue.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/JobData.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/InstrumentBase.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/SimObject.hh \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/Threads.hh \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/sim_mode.h -object_${TRICK_HOST_CPU}/Executive_set_job_onoff.o: src/Executive_set_job_onoff.cpp \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/Executive.hh \ - ${TRICK_HOME}/trick_source/sim_services/Scheduler/include/Scheduler.hh \ - ${TRICK_HOME}/trick_source/sim_services/ScheduledJobQueue/include/ScheduledJobQueue.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/JobData.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/InstrumentBase.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/SimObject.hh \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/Threads.hh \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/sim_mode.h \ - ${TRICK_HOME}/trick_source/sim_services/Message/include/message_proto.h \ - ${TRICK_HOME}/trick_source/sim_services/Message/include/message_type.h -object_${TRICK_HOST_CPU}/Executive_set_lock_memory.o: src/Executive_set_lock_memory.cpp \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/Executive.hh \ - ${TRICK_HOME}/trick_source/sim_services/Scheduler/include/Scheduler.hh \ - ${TRICK_HOME}/trick_source/sim_services/ScheduledJobQueue/include/ScheduledJobQueue.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/JobData.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/InstrumentBase.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/SimObject.hh \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/Threads.hh \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/sim_mode.h \ - ${TRICK_HOME}/trick_source/sim_services/Message/include/message_proto.h \ - ${TRICK_HOME}/trick_source/sim_services/Message/include/message_type.h -object_${TRICK_HOST_CPU}/Executive_set_simobject_onoff.o: src/Executive_set_simobject_onoff.cpp \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/Executive.hh \ - ${TRICK_HOME}/trick_source/sim_services/Scheduler/include/Scheduler.hh \ - ${TRICK_HOME}/trick_source/sim_services/ScheduledJobQueue/include/ScheduledJobQueue.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/JobData.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/InstrumentBase.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/SimObject.hh \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/Threads.hh \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/sim_mode.h -object_${TRICK_HOST_CPU}/Executive_set_thread_amf_cycle_time.o: \ - src/Executive_set_thread_amf_cycle_time.cpp \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/Executive.hh \ - ${TRICK_HOME}/trick_source/sim_services/Scheduler/include/Scheduler.hh \ - ${TRICK_HOME}/trick_source/sim_services/ScheduledJobQueue/include/ScheduledJobQueue.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/JobData.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/InstrumentBase.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/SimObject.hh \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/Threads.hh \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/sim_mode.h -object_${TRICK_HOST_CPU}/Executive_set_thread_async_wait.o: \ - src/Executive_set_thread_async_wait.cpp \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/Executive.hh \ - ${TRICK_HOME}/trick_source/sim_services/Scheduler/include/Scheduler.hh \ - ${TRICK_HOME}/trick_source/sim_services/ScheduledJobQueue/include/ScheduledJobQueue.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/JobData.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/InstrumentBase.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/SimObject.hh \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/Threads.hh \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/sim_mode.h -object_${TRICK_HOST_CPU}/Executive_set_thread_cpu_affinity.o: \ - src/Executive_set_thread_cpu_affinity.cpp \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/Executive.hh \ - ${TRICK_HOME}/trick_source/sim_services/Scheduler/include/Scheduler.hh \ - ${TRICK_HOME}/trick_source/sim_services/ScheduledJobQueue/include/ScheduledJobQueue.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/JobData.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/InstrumentBase.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/SimObject.hh \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/Threads.hh \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/sim_mode.h -object_${TRICK_HOST_CPU}/Executive_set_thread_priority.o: src/Executive_set_thread_priority.cpp \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/Executive.hh \ - ${TRICK_HOME}/trick_source/sim_services/Scheduler/include/Scheduler.hh \ - ${TRICK_HOME}/trick_source/sim_services/ScheduledJobQueue/include/ScheduledJobQueue.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/JobData.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/InstrumentBase.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/SimObject.hh \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/Threads.hh \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/sim_mode.h object_${TRICK_HOST_CPU}/Executive_set_thread_process_type.o: \ - src/Executive_set_thread_process_type.cpp \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/Executive.hh \ - ${TRICK_HOME}/trick_source/sim_services/Scheduler/include/Scheduler.hh \ - ${TRICK_HOME}/trick_source/sim_services/ScheduledJobQueue/include/ScheduledJobQueue.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/JobData.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/InstrumentBase.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/SimObject.hh \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/Threads.hh \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/sim_mode.h -object_${TRICK_HOST_CPU}/Executive_set_time_tic_value.o: src/Executive_set_time_tic_value.cpp \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/Executive.hh \ - ${TRICK_HOME}/trick_source/sim_services/Scheduler/include/Scheduler.hh \ - ${TRICK_HOME}/trick_source/sim_services/ScheduledJobQueue/include/ScheduledJobQueue.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/JobData.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/InstrumentBase.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/SimObject.hh \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/Threads.hh \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/sim_mode.h \ - ${TRICK_HOME}/trick_source/sim_services/include/TrickConstant.hh \ - ${TRICK_HOME}/trick_source/sim_services/Message/include/message_proto.h \ - ${TRICK_HOME}/trick_source/sim_services/Message/include/message_type.h -object_${TRICK_HOST_CPU}/Executive_shutdown.o: src/Executive_shutdown.cpp \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/Executive.hh \ - ${TRICK_HOME}/trick_source/sim_services/Scheduler/include/Scheduler.hh \ - ${TRICK_HOME}/trick_source/sim_services/ScheduledJobQueue/include/ScheduledJobQueue.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/JobData.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/InstrumentBase.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/SimObject.hh \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/Threads.hh \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/sim_mode.h \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/Exec_exception.hh \ - ${TRICK_HOME}/trick_source/sim_services/Message/include/message_proto.h \ - ${TRICK_HOME}/trick_source/sim_services/Message/include/message_type.h \ - ${TRICK_HOME}/trick_source/sim_services/include/release.h -object_${TRICK_HOST_CPU}/Executive_signal_handler.o: src/Executive_signal_handler.cpp \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/Executive.hh \ - ${TRICK_HOME}/trick_source/sim_services/Scheduler/include/Scheduler.hh \ - ${TRICK_HOME}/trick_source/sim_services/ScheduledJobQueue/include/ScheduledJobQueue.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/JobData.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/InstrumentBase.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/SimObject.hh \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/Threads.hh \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/sim_mode.h \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/exec_proto.h \ - ${TRICK_HOME}/trick_source/sim_services/Message/include/message_proto.h \ - ${TRICK_HOME}/trick_source/sim_services/Message/include/message_type.h -object_${TRICK_HOST_CPU}/Executive_stop.o: src/Executive_stop.cpp \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/Executive.hh \ - ${TRICK_HOME}/trick_source/sim_services/Scheduler/include/Scheduler.hh \ - ${TRICK_HOME}/trick_source/sim_services/ScheduledJobQueue/include/ScheduledJobQueue.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/JobData.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/InstrumentBase.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/SimObject.hh \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/Threads.hh \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/sim_mode.h \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/Exec_exception.hh -object_${TRICK_HOST_CPU}/Executive_terminate.o: src/Executive_terminate.cpp \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/Executive.hh \ - ${TRICK_HOME}/trick_source/sim_services/Scheduler/include/Scheduler.hh \ - ${TRICK_HOME}/trick_source/sim_services/ScheduledJobQueue/include/ScheduledJobQueue.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/JobData.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/InstrumentBase.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/SimObject.hh \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/Threads.hh \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/sim_mode.h \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/exec_proto.h -object_${TRICK_HOST_CPU}/Executive_write_s_job_execution.o: \ - src/Executive_write_s_job_execution.cpp \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/Executive.hh \ - ${TRICK_HOME}/trick_source/sim_services/Scheduler/include/Scheduler.hh \ - ${TRICK_HOME}/trick_source/sim_services/ScheduledJobQueue/include/ScheduledJobQueue.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/JobData.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/InstrumentBase.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/SimObject.hh \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/Threads.hh \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/sim_mode.h \ - ${TRICK_HOME}/trick_source/sim_services/CommandLineArguments/include/command_line_protos.h \ - ${TRICK_HOME}/trick_source/sim_services/Message/include/message_proto.h \ - ${TRICK_HOME}/trick_source/sim_services/Message/include/message_type.h -object_${TRICK_HOST_CPU}/Executive_write_s_run_summary.o: src/Executive_write_s_run_summary.cpp \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/Executive.hh \ - ${TRICK_HOME}/trick_source/sim_services/Scheduler/include/Scheduler.hh \ - ${TRICK_HOME}/trick_source/sim_services/ScheduledJobQueue/include/ScheduledJobQueue.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/JobData.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/InstrumentBase.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/SimObject.hh \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/Threads.hh \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/sim_mode.h \ - ${TRICK_HOME}/trick_source/sim_services/CommandLineArguments/include/command_line_protos.h \ - ${TRICK_HOME}/trick_source/sim_services/Environment/include/env_proto.h \ - ${TRICK_HOME}/trick_source/sim_services/Message/include/message_proto.h \ - ${TRICK_HOME}/trick_source/sim_services/Message/include/message_type.h -object_${TRICK_HOST_CPU}/Threads.o: src/Threads.cpp \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/Threads.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/SimObject.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/JobData.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/InstrumentBase.hh \ - ${TRICK_HOME}/trick_source/sim_services/ScheduledJobQueue/include/ScheduledJobQueue.hh -object_${TRICK_HOST_CPU}/Threads_child.o: src/Threads_child.cpp \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/Threads.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/SimObject.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/JobData.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/InstrumentBase.hh \ - ${TRICK_HOME}/trick_source/sim_services/ScheduledJobQueue/include/ScheduledJobQueue.hh \ - ${TRICK_HOME}/trick_source/sim_services/Message/include/Message_proto.hh \ - ${TRICK_HOME}/trick_source/sim_services/Message/include/MessageSubscriber.hh \ - ${TRICK_HOME}/trick_source/sim_services/include/release.h \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/exec_proto.h \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/sim_mode.h \ - ${TRICK_HOME}/trick_source/sim_services/include/TrickConstant.hh -object_${TRICK_HOST_CPU}/Threads_create_new_thread.o: src/Threads_create_new_thread.cpp \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/Threads.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/SimObject.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/JobData.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/InstrumentBase.hh \ - ${TRICK_HOME}/trick_source/sim_services/ScheduledJobQueue/include/ScheduledJobQueue.hh -object_${TRICK_HOST_CPU}/Threads_set_amf_cycle_tics.o: src/Threads_set_amf_cycle_tics.cpp \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/Threads.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/SimObject.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/JobData.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/InstrumentBase.hh \ - ${TRICK_HOME}/trick_source/sim_services/ScheduledJobQueue/include/ScheduledJobQueue.hh -object_${TRICK_HOST_CPU}/Threads_set_async_wait.o: src/Threads_set_async_wait.cpp \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/Threads.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/SimObject.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/JobData.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/InstrumentBase.hh \ - ${TRICK_HOME}/trick_source/sim_services/ScheduledJobQueue/include/ScheduledJobQueue.hh -object_${TRICK_HOST_CPU}/Threads_set_cpu_affinity.o: src/Threads_set_cpu_affinity.cpp \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/Executive.hh \ - ${TRICK_HOME}/trick_source/sim_services/Scheduler/include/Scheduler.hh \ - ${TRICK_HOME}/trick_source/sim_services/ScheduledJobQueue/include/ScheduledJobQueue.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/JobData.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/InstrumentBase.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/SimObject.hh \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/Threads.hh \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/sim_mode.h \ - ${TRICK_HOME}/trick_source/sim_services/Message/include/message_proto.h \ - ${TRICK_HOME}/trick_source/sim_services/Message/include/message_type.h -object_${TRICK_HOST_CPU}/Threads_set_priority.o: src/Threads_set_priority.cpp \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/Executive.hh \ - ${TRICK_HOME}/trick_source/sim_services/Scheduler/include/Scheduler.hh \ - ${TRICK_HOME}/trick_source/sim_services/ScheduledJobQueue/include/ScheduledJobQueue.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/JobData.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/InstrumentBase.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/SimObject.hh \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/Threads.hh \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/sim_mode.h \ - ${TRICK_HOME}/trick_source/sim_services/Message/include/message_proto.h \ - ${TRICK_HOME}/trick_source/sim_services/Message/include/message_type.h -object_${TRICK_HOST_CPU}/Threads_set_process_type.o: src/Threads_set_process_type.cpp \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/Threads.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/SimObject.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/JobData.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/InstrumentBase.hh \ - ${TRICK_HOME}/trick_source/sim_services/ScheduledJobQueue/include/ScheduledJobQueue.hh -object_${TRICK_HOST_CPU}/child_handler.o: src/child_handler.cpp -object_${TRICK_HOST_CPU}/child_stub.o: src/child_stub.cpp \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/Threads.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/SimObject.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/JobData.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/InstrumentBase.hh \ - ${TRICK_HOME}/trick_source/sim_services/ScheduledJobQueue/include/ScheduledJobQueue.hh -object_${TRICK_HOST_CPU}/fpe_handler.o: src/fpe_handler.cpp \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/Executive.hh \ - ${TRICK_HOME}/trick_source/sim_services/Scheduler/include/Scheduler.hh \ - ${TRICK_HOME}/trick_source/sim_services/ScheduledJobQueue/include/ScheduledJobQueue.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/JobData.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/InstrumentBase.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/SimObject.hh \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/Threads.hh \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/sim_mode.h \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/exec_proto.hh -object_${TRICK_HOST_CPU}/sig_hand.o: src/sig_hand.cpp \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/Executive.hh \ - ${TRICK_HOME}/trick_source/sim_services/Scheduler/include/Scheduler.hh \ - ${TRICK_HOME}/trick_source/sim_services/ScheduledJobQueue/include/ScheduledJobQueue.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/JobData.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/InstrumentBase.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/SimObject.hh \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/Threads.hh \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/sim_mode.h \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/exec_proto.hh + Executive_set_thread_process_type.cpp \ + ${TRICK_HOME}/include/trick/Executive.hh \ + ${TRICK_HOME}/include/trick/Scheduler.hh \ + ${TRICK_HOME}/include/trick/ScheduledJobQueue.hh \ + ${TRICK_HOME}/include/trick/JobData.hh \ + ${TRICK_HOME}/include/trick/InstrumentBase.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/ScheduledJobQueue.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/Threads.hh \ + ${TRICK_HOME}/include/trick/ThreadBase.hh \ + ${TRICK_HOME}/include/trick/sim_mode.h +object_${TRICK_HOST_CPU}/Executive_set_time_tic_value.o: Executive_set_time_tic_value.cpp \ + ${TRICK_HOME}/include/trick/Executive.hh \ + ${TRICK_HOME}/include/trick/Scheduler.hh \ + ${TRICK_HOME}/include/trick/ScheduledJobQueue.hh \ + ${TRICK_HOME}/include/trick/JobData.hh \ + ${TRICK_HOME}/include/trick/InstrumentBase.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/ScheduledJobQueue.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/Threads.hh \ + ${TRICK_HOME}/include/trick/ThreadBase.hh \ + ${TRICK_HOME}/include/trick/sim_mode.h \ + ${TRICK_HOME}/include/trick/TrickConstant.hh \ + ${TRICK_HOME}/include/trick/message_proto.h \ + ${TRICK_HOME}/include/trick/message_type.h +object_${TRICK_HOST_CPU}/Executive_terminate.o: Executive_terminate.cpp \ + ${TRICK_HOME}/include/trick/Executive.hh \ + ${TRICK_HOME}/include/trick/Scheduler.hh \ + ${TRICK_HOME}/include/trick/ScheduledJobQueue.hh \ + ${TRICK_HOME}/include/trick/JobData.hh \ + ${TRICK_HOME}/include/trick/InstrumentBase.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/ScheduledJobQueue.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/Threads.hh \ + ${TRICK_HOME}/include/trick/ThreadBase.hh \ + ${TRICK_HOME}/include/trick/sim_mode.h \ + ${TRICK_HOME}/include/trick/Exec_exception.hh \ + ${TRICK_HOME}/include/trick/exec_proto.h \ + ${TRICK_HOME}/include/trick/sim_mode.h +object_${TRICK_HOST_CPU}/Executive_call_input_processor.o: Executive_call_input_processor.cpp \ + ${TRICK_HOME}/include/trick/Executive.hh \ + ${TRICK_HOME}/include/trick/Scheduler.hh \ + ${TRICK_HOME}/include/trick/ScheduledJobQueue.hh \ + ${TRICK_HOME}/include/trick/JobData.hh \ + ${TRICK_HOME}/include/trick/InstrumentBase.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/ScheduledJobQueue.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/Threads.hh \ + ${TRICK_HOME}/include/trick/ThreadBase.hh \ + ${TRICK_HOME}/include/trick/sim_mode.h \ + ${TRICK_HOME}/include/trick/Exec_exception.hh +object_${TRICK_HOST_CPU}/Executive_instrument_job.o: Executive_instrument_job.cpp \ + ${TRICK_HOME}/include/trick/Executive.hh \ + ${TRICK_HOME}/include/trick/Scheduler.hh \ + ${TRICK_HOME}/include/trick/ScheduledJobQueue.hh \ + ${TRICK_HOME}/include/trick/JobData.hh \ + ${TRICK_HOME}/include/trick/InstrumentBase.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/ScheduledJobQueue.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/Threads.hh \ + ${TRICK_HOME}/include/trick/ThreadBase.hh \ + ${TRICK_HOME}/include/trick/sim_mode.h +object_${TRICK_HOST_CPU}/Executive_checkpoint.o: Executive_checkpoint.cpp \ + ${TRICK_HOME}/include/trick/Executive.hh \ + ${TRICK_HOME}/include/trick/Scheduler.hh \ + ${TRICK_HOME}/include/trick/ScheduledJobQueue.hh \ + ${TRICK_HOME}/include/trick/JobData.hh \ + ${TRICK_HOME}/include/trick/InstrumentBase.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/ScheduledJobQueue.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/Threads.hh \ + ${TRICK_HOME}/include/trick/ThreadBase.hh \ + ${TRICK_HOME}/include/trick/sim_mode.h \ + ${TRICK_HOME}/include/trick/exec_proto.h \ + ${TRICK_HOME}/include/trick/sim_mode.h \ + ${TRICK_HOME}/include/trick/memorymanager_c_intf.h \ + ${TRICK_HOME}/include/trick/parameter_types.h \ + ${TRICK_HOME}/include/trick/attributes.h \ + ${TRICK_HOME}/include/trick/reference.h \ + ${TRICK_HOME}/include/trick/value.h \ + ${TRICK_HOME}/include/trick/dllist.h \ + ${TRICK_HOME}/include/trick/var.h \ + ${TRICK_HOME}/include/trick/io_alloc.h \ + ${TRICK_HOME}/include/trick/checkpoint_stl.hh \ + ${TRICK_HOME}/include/trick/checkpoint_sequence_stl.hh \ + ${TRICK_HOME}/include/trick/message_proto.h \ + ${TRICK_HOME}/include/trick/message_type.h \ + ${TRICK_HOME}/include/trick/checkpoint_map.hh \ + ${TRICK_HOME}/include/trick/checkpoint_stack.hh \ + ${TRICK_HOME}/include/trick/checkpoint_queue.hh \ + ${TRICK_HOME}/include/trick/checkpoint_pair.hh +object_${TRICK_HOST_CPU}/Executive_fpe_handler.o: Executive_fpe_handler.cpp \ + ${TRICK_HOME}/include/trick/Executive.hh \ + ${TRICK_HOME}/include/trick/Scheduler.hh \ + ${TRICK_HOME}/include/trick/ScheduledJobQueue.hh \ + ${TRICK_HOME}/include/trick/JobData.hh \ + ${TRICK_HOME}/include/trick/InstrumentBase.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/ScheduledJobQueue.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/Threads.hh \ + ${TRICK_HOME}/include/trick/ThreadBase.hh \ + ${TRICK_HOME}/include/trick/sim_mode.h \ + ${TRICK_HOME}/include/trick/exec_proto.h \ + ${TRICK_HOME}/include/trick/sim_mode.h \ + ${TRICK_HOME}/include/trick/message_proto.h \ + ${TRICK_HOME}/include/trick/message_type.h +object_${TRICK_HOST_CPU}/Executive_create_threads.o: Executive_create_threads.cpp \ + ${TRICK_HOME}/include/trick/Executive.hh \ + ${TRICK_HOME}/include/trick/Scheduler.hh \ + ${TRICK_HOME}/include/trick/ScheduledJobQueue.hh \ + ${TRICK_HOME}/include/trick/JobData.hh \ + ${TRICK_HOME}/include/trick/InstrumentBase.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/ScheduledJobQueue.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/Threads.hh \ + ${TRICK_HOME}/include/trick/ThreadBase.hh \ + ${TRICK_HOME}/include/trick/sim_mode.h +object_${TRICK_HOST_CPU}/Executive_freeze_loop.o: Executive_freeze_loop.cpp \ + ${TRICK_HOME}/include/trick/Executive.hh \ + ${TRICK_HOME}/include/trick/Scheduler.hh \ + ${TRICK_HOME}/include/trick/ScheduledJobQueue.hh \ + ${TRICK_HOME}/include/trick/JobData.hh \ + ${TRICK_HOME}/include/trick/InstrumentBase.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/ScheduledJobQueue.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/Threads.hh \ + ${TRICK_HOME}/include/trick/ThreadBase.hh \ + ${TRICK_HOME}/include/trick/sim_mode.h \ + ${TRICK_HOME}/include/trick/Exec_exception.hh \ + ${TRICK_HOME}/include/trick/exec_proto.h \ + ${TRICK_HOME}/include/trick/sim_mode.h \ + ${TRICK_HOME}/include/trick/message_proto.h \ + ${TRICK_HOME}/include/trick/message_type.h +object_${TRICK_HOST_CPU}/Executive_remove_sim_object.o: Executive_remove_sim_object.cpp \ + ${TRICK_HOME}/include/trick/Executive.hh \ + ${TRICK_HOME}/include/trick/Scheduler.hh \ + ${TRICK_HOME}/include/trick/ScheduledJobQueue.hh \ + ${TRICK_HOME}/include/trick/JobData.hh \ + ${TRICK_HOME}/include/trick/InstrumentBase.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/ScheduledJobQueue.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/Threads.hh \ + ${TRICK_HOME}/include/trick/ThreadBase.hh \ + ${TRICK_HOME}/include/trick/sim_mode.h +object_${TRICK_HOST_CPU}/Executive_set_thread_enabled.o: Executive_set_thread_enabled.cpp \ + ${TRICK_HOME}/include/trick/Executive.hh \ + ${TRICK_HOME}/include/trick/Scheduler.hh \ + ${TRICK_HOME}/include/trick/ScheduledJobQueue.hh \ + ${TRICK_HOME}/include/trick/JobData.hh \ + ${TRICK_HOME}/include/trick/InstrumentBase.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/ScheduledJobQueue.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/Threads.hh \ + ${TRICK_HOME}/include/trick/ThreadBase.hh \ + ${TRICK_HOME}/include/trick/sim_mode.h +object_${TRICK_HOST_CPU}/Executive_get_curr_job.o: Executive_get_curr_job.cpp \ + ${TRICK_HOME}/include/trick/Executive.hh \ + ${TRICK_HOME}/include/trick/Scheduler.hh \ + ${TRICK_HOME}/include/trick/ScheduledJobQueue.hh \ + ${TRICK_HOME}/include/trick/JobData.hh \ + ${TRICK_HOME}/include/trick/InstrumentBase.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/ScheduledJobQueue.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/Threads.hh \ + ${TRICK_HOME}/include/trick/ThreadBase.hh \ + ${TRICK_HOME}/include/trick/sim_mode.h +object_${TRICK_HOST_CPU}/Threads_set_async_wait.o: Threads_set_async_wait.cpp \ + ${TRICK_HOME}/include/trick/Threads.hh \ + ${TRICK_HOME}/include/trick/ThreadBase.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/JobData.hh \ + ${TRICK_HOME}/include/trick/InstrumentBase.hh \ + ${TRICK_HOME}/include/trick/ScheduledJobQueue.hh +object_${TRICK_HOST_CPU}/Executive_clear_scheduled_queues.o: Executive_clear_scheduled_queues.cpp \ + ${TRICK_HOME}/include/trick/Executive.hh \ + ${TRICK_HOME}/include/trick/Scheduler.hh \ + ${TRICK_HOME}/include/trick/ScheduledJobQueue.hh \ + ${TRICK_HOME}/include/trick/JobData.hh \ + ${TRICK_HOME}/include/trick/InstrumentBase.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/ScheduledJobQueue.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/Threads.hh \ + ${TRICK_HOME}/include/trick/ThreadBase.hh \ + ${TRICK_HOME}/include/trick/sim_mode.h +object_${TRICK_HOST_CPU}/Executive_add_sim_object.o: Executive_add_sim_object.cpp \ + ${TRICK_HOME}/include/trick/Executive.hh \ + ${TRICK_HOME}/include/trick/Scheduler.hh \ + ${TRICK_HOME}/include/trick/ScheduledJobQueue.hh \ + ${TRICK_HOME}/include/trick/JobData.hh \ + ${TRICK_HOME}/include/trick/InstrumentBase.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/ScheduledJobQueue.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/Threads.hh \ + ${TRICK_HOME}/include/trick/ThreadBase.hh \ + ${TRICK_HOME}/include/trick/sim_mode.h +object_${TRICK_HOST_CPU}/Executive_write_s_job_execution.o: Executive_write_s_job_execution.cpp \ + ${TRICK_HOME}/include/trick/Executive.hh \ + ${TRICK_HOME}/include/trick/Scheduler.hh \ + ${TRICK_HOME}/include/trick/ScheduledJobQueue.hh \ + ${TRICK_HOME}/include/trick/JobData.hh \ + ${TRICK_HOME}/include/trick/InstrumentBase.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/ScheduledJobQueue.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/Threads.hh \ + ${TRICK_HOME}/include/trick/ThreadBase.hh \ + ${TRICK_HOME}/include/trick/sim_mode.h \ + ${TRICK_HOME}/include/trick/command_line_protos.h \ + ${TRICK_HOME}/include/trick/message_proto.h \ + ${TRICK_HOME}/include/trick/message_type.h +object_${TRICK_HOST_CPU}/Executive_init_signal_handlers.o: Executive_init_signal_handlers.cpp \ + ${TRICK_HOME}/include/trick/Executive.hh \ + ${TRICK_HOME}/include/trick/Scheduler.hh \ + ${TRICK_HOME}/include/trick/ScheduledJobQueue.hh \ + ${TRICK_HOME}/include/trick/JobData.hh \ + ${TRICK_HOME}/include/trick/InstrumentBase.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/ScheduledJobQueue.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/Threads.hh \ + ${TRICK_HOME}/include/trick/ThreadBase.hh \ + ${TRICK_HOME}/include/trick/sim_mode.h +object_${TRICK_HOST_CPU}/Executive_write_s_run_summary.o: Executive_write_s_run_summary.cpp \ + ${TRICK_HOME}/include/trick/Executive.hh \ + ${TRICK_HOME}/include/trick/Scheduler.hh \ + ${TRICK_HOME}/include/trick/ScheduledJobQueue.hh \ + ${TRICK_HOME}/include/trick/JobData.hh \ + ${TRICK_HOME}/include/trick/InstrumentBase.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/ScheduledJobQueue.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/Threads.hh \ + ${TRICK_HOME}/include/trick/ThreadBase.hh \ + ${TRICK_HOME}/include/trick/sim_mode.h \ + ${TRICK_HOME}/include/trick/command_line_protos.h \ + ${TRICK_HOME}/include/trick/env_proto.h \ + ${TRICK_HOME}/include/trick/message_proto.h \ + ${TRICK_HOME}/include/trick/message_type.h +object_${TRICK_HOST_CPU}/fpe_handler.o: fpe_handler.cpp \ + ${TRICK_HOME}/include/trick/Executive.hh \ + ${TRICK_HOME}/include/trick/Scheduler.hh \ + ${TRICK_HOME}/include/trick/ScheduledJobQueue.hh \ + ${TRICK_HOME}/include/trick/JobData.hh \ + ${TRICK_HOME}/include/trick/InstrumentBase.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/ScheduledJobQueue.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/Threads.hh \ + ${TRICK_HOME}/include/trick/ThreadBase.hh \ + ${TRICK_HOME}/include/trick/sim_mode.h \ + ${TRICK_HOME}/include/trick/exec_proto.hh +object_${TRICK_HOST_CPU}/Executive_set_thread_amf_cycle_time.o: \ + Executive_set_thread_amf_cycle_time.cpp \ + ${TRICK_HOME}/include/trick/Executive.hh \ + ${TRICK_HOME}/include/trick/Scheduler.hh \ + ${TRICK_HOME}/include/trick/ScheduledJobQueue.hh \ + ${TRICK_HOME}/include/trick/JobData.hh \ + ${TRICK_HOME}/include/trick/InstrumentBase.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/ScheduledJobQueue.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/Threads.hh \ + ${TRICK_HOME}/include/trick/ThreadBase.hh \ + ${TRICK_HOME}/include/trick/sim_mode.h +object_${TRICK_HOST_CPU}/Threads_set_process_type.o: Threads_set_process_type.cpp \ + ${TRICK_HOME}/include/trick/Threads.hh \ + ${TRICK_HOME}/include/trick/ThreadBase.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/JobData.hh \ + ${TRICK_HOME}/include/trick/InstrumentBase.hh \ + ${TRICK_HOME}/include/trick/ScheduledJobQueue.hh +object_${TRICK_HOST_CPU}/Executive_advance_sim_time.o: Executive_advance_sim_time.cpp \ + ${TRICK_HOME}/include/trick/Executive.hh \ + ${TRICK_HOME}/include/trick/Scheduler.hh \ + ${TRICK_HOME}/include/trick/ScheduledJobQueue.hh \ + ${TRICK_HOME}/include/trick/JobData.hh \ + ${TRICK_HOME}/include/trick/InstrumentBase.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/ScheduledJobQueue.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/Threads.hh \ + ${TRICK_HOME}/include/trick/ThreadBase.hh \ + ${TRICK_HOME}/include/trick/sim_mode.h \ + ${TRICK_HOME}/include/trick/release.h +object_${TRICK_HOST_CPU}/Executive_get_job_cycle.o: Executive_get_job_cycle.cpp \ + ${TRICK_HOME}/include/trick/Executive.hh \ + ${TRICK_HOME}/include/trick/Scheduler.hh \ + ${TRICK_HOME}/include/trick/ScheduledJobQueue.hh \ + ${TRICK_HOME}/include/trick/JobData.hh \ + ${TRICK_HOME}/include/trick/InstrumentBase.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/ScheduledJobQueue.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/Threads.hh \ + ${TRICK_HOME}/include/trick/ThreadBase.hh \ + ${TRICK_HOME}/include/trick/sim_mode.h +object_${TRICK_HOST_CPU}/Executive_set_thread_priority.o: Executive_set_thread_priority.cpp \ + ${TRICK_HOME}/include/trick/Executive.hh \ + ${TRICK_HOME}/include/trick/Scheduler.hh \ + ${TRICK_HOME}/include/trick/ScheduledJobQueue.hh \ + ${TRICK_HOME}/include/trick/JobData.hh \ + ${TRICK_HOME}/include/trick/InstrumentBase.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/ScheduledJobQueue.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/Threads.hh \ + ${TRICK_HOME}/include/trick/ThreadBase.hh \ + ${TRICK_HOME}/include/trick/sim_mode.h +object_${TRICK_HOST_CPU}/Executive_register_scheduler.o: Executive_register_scheduler.cpp \ + ${TRICK_HOME}/include/trick/Executive.hh \ + ${TRICK_HOME}/include/trick/Scheduler.hh \ + ${TRICK_HOME}/include/trick/ScheduledJobQueue.hh \ + ${TRICK_HOME}/include/trick/JobData.hh \ + ${TRICK_HOME}/include/trick/InstrumentBase.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/ScheduledJobQueue.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/Threads.hh \ + ${TRICK_HOME}/include/trick/ThreadBase.hh \ + ${TRICK_HOME}/include/trick/sim_mode.h +object_${TRICK_HOST_CPU}/Executive_set_thread_cpu_affinity.o: \ + Executive_set_thread_cpu_affinity.cpp \ + ${TRICK_HOME}/include/trick/Executive.hh \ + ${TRICK_HOME}/include/trick/Scheduler.hh \ + ${TRICK_HOME}/include/trick/ScheduledJobQueue.hh \ + ${TRICK_HOME}/include/trick/JobData.hh \ + ${TRICK_HOME}/include/trick/InstrumentBase.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/ScheduledJobQueue.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/Threads.hh \ + ${TRICK_HOME}/include/trick/ThreadBase.hh \ + ${TRICK_HOME}/include/trick/sim_mode.h +object_${TRICK_HOST_CPU}/Threads_child.o: Threads_child.cpp \ + ${TRICK_HOME}/include/trick/Threads.hh \ + ${TRICK_HOME}/include/trick/ThreadBase.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/JobData.hh \ + ${TRICK_HOME}/include/trick/InstrumentBase.hh \ + ${TRICK_HOME}/include/trick/ScheduledJobQueue.hh \ + ${TRICK_HOME}/include/trick/release.h \ + ${TRICK_HOME}/include/trick/Exec_exception.hh \ + ${TRICK_HOME}/include/trick/exec_proto.h \ + ${TRICK_HOME}/include/trick/sim_mode.h \ + ${TRICK_HOME}/include/trick/TrickConstant.hh \ + ${TRICK_HOME}/include/trick/message_proto.h \ + ${TRICK_HOME}/include/trick/message_type.h +object_${TRICK_HOST_CPU}/Executive_init_freeze_scheduled.o: Executive_init_freeze_scheduled.cpp \ + ${TRICK_HOME}/include/trick/Executive.hh \ + ${TRICK_HOME}/include/trick/Scheduler.hh \ + ${TRICK_HOME}/include/trick/ScheduledJobQueue.hh \ + ${TRICK_HOME}/include/trick/JobData.hh \ + ${TRICK_HOME}/include/trick/InstrumentBase.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/ScheduledJobQueue.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/Threads.hh \ + ${TRICK_HOME}/include/trick/ThreadBase.hh \ + ${TRICK_HOME}/include/trick/sim_mode.h +object_${TRICK_HOST_CPU}/Executive_get_sim_time.o: Executive_get_sim_time.cpp \ + ${TRICK_HOME}/include/trick/Executive.hh \ + ${TRICK_HOME}/include/trick/Scheduler.hh \ + ${TRICK_HOME}/include/trick/ScheduledJobQueue.hh \ + ${TRICK_HOME}/include/trick/JobData.hh \ + ${TRICK_HOME}/include/trick/InstrumentBase.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/ScheduledJobQueue.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/Threads.hh \ + ${TRICK_HOME}/include/trick/ThreadBase.hh \ + ${TRICK_HOME}/include/trick/sim_mode.h +object_${TRICK_HOST_CPU}/Exec_exception.o: Exec_exception.cpp \ + ${TRICK_HOME}/include/trick/Exec_exception.hh +object_${TRICK_HOST_CPU}/Executive_set_simobject_onoff.o: Executive_set_simobject_onoff.cpp \ + ${TRICK_HOME}/include/trick/Executive.hh \ + ${TRICK_HOME}/include/trick/Scheduler.hh \ + ${TRICK_HOME}/include/trick/ScheduledJobQueue.hh \ + ${TRICK_HOME}/include/trick/JobData.hh \ + ${TRICK_HOME}/include/trick/InstrumentBase.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/ScheduledJobQueue.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/Threads.hh \ + ${TRICK_HOME}/include/trick/ThreadBase.hh \ + ${TRICK_HOME}/include/trick/sim_mode.h +object_${TRICK_HOST_CPU}/Executive_set_job_cycle.o: Executive_set_job_cycle.cpp \ + ${TRICK_HOME}/include/trick/Executive.hh \ + ${TRICK_HOME}/include/trick/Scheduler.hh \ + ${TRICK_HOME}/include/trick/ScheduledJobQueue.hh \ + ${TRICK_HOME}/include/trick/JobData.hh \ + ${TRICK_HOME}/include/trick/InstrumentBase.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/ScheduledJobQueue.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/Threads.hh \ + ${TRICK_HOME}/include/trick/ThreadBase.hh \ + ${TRICK_HOME}/include/trick/sim_mode.h \ + ${TRICK_HOME}/include/trick/message_proto.h \ + ${TRICK_HOME}/include/trick/message_type.h +object_${TRICK_HOST_CPU}/Executive_get_job.o: Executive_get_job.cpp \ + ${TRICK_HOME}/include/trick/Executive.hh \ + ${TRICK_HOME}/include/trick/Scheduler.hh \ + ${TRICK_HOME}/include/trick/ScheduledJobQueue.hh \ + ${TRICK_HOME}/include/trick/JobData.hh \ + ${TRICK_HOME}/include/trick/InstrumentBase.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/ScheduledJobQueue.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/Threads.hh \ + ${TRICK_HOME}/include/trick/ThreadBase.hh \ + ${TRICK_HOME}/include/trick/sim_mode.h +object_${TRICK_HOST_CPU}/Executive_call_default_data.o: Executive_call_default_data.cpp \ + ${TRICK_HOME}/include/trick/Executive.hh \ + ${TRICK_HOME}/include/trick/Scheduler.hh \ + ${TRICK_HOME}/include/trick/ScheduledJobQueue.hh \ + ${TRICK_HOME}/include/trick/JobData.hh \ + ${TRICK_HOME}/include/trick/InstrumentBase.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/ScheduledJobQueue.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/Threads.hh \ + ${TRICK_HOME}/include/trick/ThreadBase.hh \ + ${TRICK_HOME}/include/trick/sim_mode.h \ + ${TRICK_HOME}/include/trick/Exec_exception.hh +object_${TRICK_HOST_CPU}/child_handler.o: child_handler.cpp +object_${TRICK_HOST_CPU}/Executive_add_scheduled_job_class.o: \ + Executive_add_scheduled_job_class.cpp \ + ${TRICK_HOME}/include/trick/Executive.hh \ + ${TRICK_HOME}/include/trick/Scheduler.hh \ + ${TRICK_HOME}/include/trick/ScheduledJobQueue.hh \ + ${TRICK_HOME}/include/trick/JobData.hh \ + ${TRICK_HOME}/include/trick/InstrumentBase.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/ScheduledJobQueue.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/Threads.hh \ + ${TRICK_HOME}/include/trick/ThreadBase.hh \ + ${TRICK_HOME}/include/trick/sim_mode.h +object_${TRICK_HOST_CPU}/Executive_check_all_jobs_handled.o: Executive_check_all_jobs_handled.cpp \ + ${TRICK_HOME}/include/trick/Executive.hh \ + ${TRICK_HOME}/include/trick/Scheduler.hh \ + ${TRICK_HOME}/include/trick/ScheduledJobQueue.hh \ + ${TRICK_HOME}/include/trick/JobData.hh \ + ${TRICK_HOME}/include/trick/InstrumentBase.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/ScheduledJobQueue.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/Threads.hh \ + ${TRICK_HOME}/include/trick/ThreadBase.hh \ + ${TRICK_HOME}/include/trick/sim_mode.h \ + ${TRICK_HOME}/include/trick/message_proto.h \ + ${TRICK_HOME}/include/trick/message_type.h +object_${TRICK_HOST_CPU}/Executive_process_sim_args.o: Executive_process_sim_args.cpp \ + ${TRICK_HOME}/include/trick/Executive.hh \ + ${TRICK_HOME}/include/trick/Scheduler.hh \ + ${TRICK_HOME}/include/trick/ScheduledJobQueue.hh \ + ${TRICK_HOME}/include/trick/JobData.hh \ + ${TRICK_HOME}/include/trick/InstrumentBase.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/ScheduledJobQueue.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/Threads.hh \ + ${TRICK_HOME}/include/trick/ThreadBase.hh \ + ${TRICK_HOME}/include/trick/sim_mode.h \ + ${TRICK_HOME}/include/trick/command_line_protos.h +object_${TRICK_HOST_CPU}/Executive_run.o: Executive_run.cpp \ + ${TRICK_HOME}/include/trick/Executive.hh \ + ${TRICK_HOME}/include/trick/Scheduler.hh \ + ${TRICK_HOME}/include/trick/ScheduledJobQueue.hh \ + ${TRICK_HOME}/include/trick/JobData.hh \ + ${TRICK_HOME}/include/trick/InstrumentBase.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/ScheduledJobQueue.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/Threads.hh \ + ${TRICK_HOME}/include/trick/ThreadBase.hh \ + ${TRICK_HOME}/include/trick/sim_mode.h \ + ${TRICK_HOME}/include/trick/Message_proto.hh \ + ${TRICK_HOME}/include/trick/MessageSubscriber.hh +object_${TRICK_HOST_CPU}/Executive_remove_jobs.o: Executive_remove_jobs.cpp \ + ${TRICK_HOME}/include/trick/Executive.hh \ + ${TRICK_HOME}/include/trick/Scheduler.hh \ + ${TRICK_HOME}/include/trick/ScheduledJobQueue.hh \ + ${TRICK_HOME}/include/trick/JobData.hh \ + ${TRICK_HOME}/include/trick/InstrumentBase.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/ScheduledJobQueue.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/Threads.hh \ + ${TRICK_HOME}/include/trick/ThreadBase.hh \ + ${TRICK_HOME}/include/trick/sim_mode.h \ + ${TRICK_HOME}/include/trick/exec_proto.hh \ + ${TRICK_HOME}/include/trick/memorymanager_c_intf.h \ + ${TRICK_HOME}/include/trick/parameter_types.h \ + ${TRICK_HOME}/include/trick/attributes.h \ + ${TRICK_HOME}/include/trick/reference.h \ + ${TRICK_HOME}/include/trick/value.h \ + ${TRICK_HOME}/include/trick/dllist.h \ + ${TRICK_HOME}/include/trick/var.h \ + ${TRICK_HOME}/include/trick/io_alloc.h \ + ${TRICK_HOME}/include/trick/TrickConstant.hh +object_${TRICK_HOST_CPU}/Executive_call_initialization.o: Executive_call_initialization.cpp \ + ${TRICK_HOME}/include/trick/Executive.hh \ + ${TRICK_HOME}/include/trick/Scheduler.hh \ + ${TRICK_HOME}/include/trick/ScheduledJobQueue.hh \ + ${TRICK_HOME}/include/trick/JobData.hh \ + ${TRICK_HOME}/include/trick/InstrumentBase.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/ScheduledJobQueue.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/Threads.hh \ + ${TRICK_HOME}/include/trick/ThreadBase.hh \ + ${TRICK_HOME}/include/trick/sim_mode.h \ + ${TRICK_HOME}/include/trick/Exec_exception.hh +object_${TRICK_HOST_CPU}/Executive_set_job_onoff.o: Executive_set_job_onoff.cpp \ + ${TRICK_HOME}/include/trick/Executive.hh \ + ${TRICK_HOME}/include/trick/Scheduler.hh \ + ${TRICK_HOME}/include/trick/ScheduledJobQueue.hh \ + ${TRICK_HOME}/include/trick/JobData.hh \ + ${TRICK_HOME}/include/trick/InstrumentBase.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/ScheduledJobQueue.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/Threads.hh \ + ${TRICK_HOME}/include/trick/ThreadBase.hh \ + ${TRICK_HOME}/include/trick/sim_mode.h \ + ${TRICK_HOME}/include/trick/message_proto.h \ + ${TRICK_HOME}/include/trick/message_type.h +object_${TRICK_HOST_CPU}/Executive_restart.o: Executive_restart.cpp \ + ${TRICK_HOME}/include/trick/Executive.hh \ + ${TRICK_HOME}/include/trick/Scheduler.hh \ + ${TRICK_HOME}/include/trick/ScheduledJobQueue.hh \ + ${TRICK_HOME}/include/trick/JobData.hh \ + ${TRICK_HOME}/include/trick/InstrumentBase.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/ScheduledJobQueue.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/Threads.hh \ + ${TRICK_HOME}/include/trick/ThreadBase.hh \ + ${TRICK_HOME}/include/trick/sim_mode.h \ + ${TRICK_HOME}/include/trick/exec_proto.h \ + ${TRICK_HOME}/include/trick/sim_mode.h \ + ${TRICK_HOME}/include/trick/message_proto.h \ + ${TRICK_HOME}/include/trick/message_type.h \ + ${TRICK_HOME}/include/trick/memorymanager_c_intf.h \ + ${TRICK_HOME}/include/trick/parameter_types.h \ + ${TRICK_HOME}/include/trick/attributes.h \ + ${TRICK_HOME}/include/trick/reference.h \ + ${TRICK_HOME}/include/trick/value.h \ + ${TRICK_HOME}/include/trick/dllist.h \ + ${TRICK_HOME}/include/trick/var.h \ + ${TRICK_HOME}/include/trick/io_alloc.h \ + ${TRICK_HOME}/include/trick/checkpoint_stl.hh \ + ${TRICK_HOME}/include/trick/checkpoint_sequence_stl.hh \ + ${TRICK_HOME}/include/trick/checkpoint_map.hh \ + ${TRICK_HOME}/include/trick/checkpoint_stack.hh \ + ${TRICK_HOME}/include/trick/checkpoint_queue.hh \ + ${TRICK_HOME}/include/trick/checkpoint_pair.hh \ + ${TRICK_HOME}/include/trick/Threads.hh +object_${TRICK_HOST_CPU}/Executive_add_depends_on_job.o: Executive_add_depends_on_job.cpp \ + ${TRICK_HOME}/include/trick/Executive.hh \ + ${TRICK_HOME}/include/trick/Scheduler.hh \ + ${TRICK_HOME}/include/trick/ScheduledJobQueue.hh \ + ${TRICK_HOME}/include/trick/JobData.hh \ + ${TRICK_HOME}/include/trick/InstrumentBase.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/ScheduledJobQueue.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/Threads.hh \ + ${TRICK_HOME}/include/trick/ThreadBase.hh \ + ${TRICK_HOME}/include/trick/sim_mode.h \ + ${TRICK_HOME}/include/trick/message_proto.h \ + ${TRICK_HOME}/include/trick/message_type.h +object_${TRICK_HOST_CPU}/Executive_loop.o: Executive_loop.cpp \ + ${TRICK_HOME}/include/trick/Executive.hh \ + ${TRICK_HOME}/include/trick/Scheduler.hh \ + ${TRICK_HOME}/include/trick/ScheduledJobQueue.hh \ + ${TRICK_HOME}/include/trick/JobData.hh \ + ${TRICK_HOME}/include/trick/InstrumentBase.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/ScheduledJobQueue.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/Threads.hh \ + ${TRICK_HOME}/include/trick/ThreadBase.hh \ + ${TRICK_HOME}/include/trick/sim_mode.h \ + ${TRICK_HOME}/include/trick/Exec_exception.hh +object_${TRICK_HOST_CPU}/Executive_signal_handler.o: Executive_signal_handler.cpp \ + ${TRICK_HOME}/include/trick/Executive.hh \ + ${TRICK_HOME}/include/trick/Scheduler.hh \ + ${TRICK_HOME}/include/trick/ScheduledJobQueue.hh \ + ${TRICK_HOME}/include/trick/JobData.hh \ + ${TRICK_HOME}/include/trick/InstrumentBase.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/ScheduledJobQueue.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/Threads.hh \ + ${TRICK_HOME}/include/trick/ThreadBase.hh \ + ${TRICK_HOME}/include/trick/sim_mode.h +object_${TRICK_HOST_CPU}/Executive_stop.o: Executive_stop.cpp \ + ${TRICK_HOME}/include/trick/Executive.hh \ + ${TRICK_HOME}/include/trick/Scheduler.hh \ + ${TRICK_HOME}/include/trick/ScheduledJobQueue.hh \ + ${TRICK_HOME}/include/trick/JobData.hh \ + ${TRICK_HOME}/include/trick/InstrumentBase.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/ScheduledJobQueue.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/Threads.hh \ + ${TRICK_HOME}/include/trick/ThreadBase.hh \ + ${TRICK_HOME}/include/trick/sim_mode.h \ + ${TRICK_HOME}/include/trick/Exec_exception.hh +object_${TRICK_HOST_CPU}/sig_hand.o: sig_hand.cpp ${TRICK_HOME}/include/trick/Executive.hh \ + ${TRICK_HOME}/include/trick/Scheduler.hh \ + ${TRICK_HOME}/include/trick/ScheduledJobQueue.hh \ + ${TRICK_HOME}/include/trick/JobData.hh \ + ${TRICK_HOME}/include/trick/InstrumentBase.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/ScheduledJobQueue.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/Threads.hh \ + ${TRICK_HOME}/include/trick/ThreadBase.hh \ + ${TRICK_HOME}/include/trick/sim_mode.h \ + ${TRICK_HOME}/include/trick/exec_proto.hh +object_${TRICK_HOST_CPU}/Executive_check_all_job_cycle_times.o: \ + Executive_check_all_job_cycle_times.cpp \ + ${TRICK_HOME}/include/trick/Executive.hh \ + ${TRICK_HOME}/include/trick/Scheduler.hh \ + ${TRICK_HOME}/include/trick/ScheduledJobQueue.hh \ + ${TRICK_HOME}/include/trick/JobData.hh \ + ${TRICK_HOME}/include/trick/InstrumentBase.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/ScheduledJobQueue.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/Threads.hh \ + ${TRICK_HOME}/include/trick/ThreadBase.hh \ + ${TRICK_HOME}/include/trick/sim_mode.h \ + ${TRICK_HOME}/include/trick/message_proto.h \ + ${TRICK_HOME}/include/trick/message_type.h \ + ${TRICK_HOME}/include/trick/TrickConstant.hh +object_${TRICK_HOST_CPU}/Executive_loop_single_thread.o: Executive_loop_single_thread.cpp \ + ${TRICK_HOME}/include/trick/Executive.hh \ + ${TRICK_HOME}/include/trick/Scheduler.hh \ + ${TRICK_HOME}/include/trick/ScheduledJobQueue.hh \ + ${TRICK_HOME}/include/trick/JobData.hh \ + ${TRICK_HOME}/include/trick/InstrumentBase.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/ScheduledJobQueue.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/Threads.hh \ + ${TRICK_HOME}/include/trick/ThreadBase.hh \ + ${TRICK_HOME}/include/trick/sim_mode.h \ + ${TRICK_HOME}/include/trick/Exec_exception.hh \ + ${TRICK_HOME}/include/trick/exec_proto.h \ + ${TRICK_HOME}/include/trick/sim_mode.h +object_${TRICK_HOST_CPU}/Executive_init.o: Executive_init.cpp \ + ${TRICK_HOME}/include/trick/Executive.hh \ + ${TRICK_HOME}/include/trick/Scheduler.hh \ + ${TRICK_HOME}/include/trick/ScheduledJobQueue.hh \ + ${TRICK_HOME}/include/trick/JobData.hh \ + ${TRICK_HOME}/include/trick/InstrumentBase.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/ScheduledJobQueue.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/Threads.hh \ + ${TRICK_HOME}/include/trick/ThreadBase.hh \ + ${TRICK_HOME}/include/trick/sim_mode.h \ + ${TRICK_HOME}/include/trick/Exec_exception.hh \ + ${TRICK_HOME}/include/trick/exec_proto.h \ + ${TRICK_HOME}/include/trick/sim_mode.h +object_${TRICK_HOST_CPU}/Threads_set_amf_cycle_tics.o: Threads_set_amf_cycle_tics.cpp \ + ${TRICK_HOME}/include/trick/Threads.hh \ + ${TRICK_HOME}/include/trick/ThreadBase.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/JobData.hh \ + ${TRICK_HOME}/include/trick/InstrumentBase.hh \ + ${TRICK_HOME}/include/trick/ScheduledJobQueue.hh +object_${TRICK_HOST_CPU}/Executive_add_jobs_to_queue.o: Executive_add_jobs_to_queue.cpp \ + ${TRICK_HOME}/include/trick/Executive.hh \ + ${TRICK_HOME}/include/trick/Scheduler.hh \ + ${TRICK_HOME}/include/trick/ScheduledJobQueue.hh \ + ${TRICK_HOME}/include/trick/JobData.hh \ + ${TRICK_HOME}/include/trick/InstrumentBase.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/ScheduledJobQueue.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/Threads.hh \ + ${TRICK_HOME}/include/trick/ThreadBase.hh \ + ${TRICK_HOME}/include/trick/sim_mode.h \ + ${TRICK_HOME}/include/trick/exec_proto.hh \ + ${TRICK_HOME}/include/trick/memorymanager_c_intf.h \ + ${TRICK_HOME}/include/trick/parameter_types.h \ + ${TRICK_HOME}/include/trick/attributes.h \ + ${TRICK_HOME}/include/trick/reference.h \ + ${TRICK_HOME}/include/trick/value.h \ + ${TRICK_HOME}/include/trick/dllist.h \ + ${TRICK_HOME}/include/trick/var.h \ + ${TRICK_HOME}/include/trick/io_alloc.h \ + ${TRICK_HOME}/include/trick/TrickConstant.hh +object_${TRICK_HOST_CPU}/Executive_set_thread_async_wait.o: Executive_set_thread_async_wait.cpp \ + ${TRICK_HOME}/include/trick/Executive.hh \ + ${TRICK_HOME}/include/trick/Scheduler.hh \ + ${TRICK_HOME}/include/trick/ScheduledJobQueue.hh \ + ${TRICK_HOME}/include/trick/JobData.hh \ + ${TRICK_HOME}/include/trick/InstrumentBase.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/ScheduledJobQueue.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/Threads.hh \ + ${TRICK_HOME}/include/trick/ThreadBase.hh \ + ${TRICK_HOME}/include/trick/sim_mode.h +object_${TRICK_HOST_CPU}/Threads.o: Threads.cpp ${TRICK_HOME}/include/trick/Threads.hh \ + ${TRICK_HOME}/include/trick/ThreadBase.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/JobData.hh \ + ${TRICK_HOME}/include/trick/InstrumentBase.hh \ + ${TRICK_HOME}/include/trick/ScheduledJobQueue.hh \ + ${TRICK_HOME}/include/trick/message_proto.h \ + ${TRICK_HOME}/include/trick/message_type.h +object_${TRICK_HOST_CPU}/Executive.o: Executive.cpp ${TRICK_HOME}/include/trick/Executive.hh \ + ${TRICK_HOME}/include/trick/Scheduler.hh \ + ${TRICK_HOME}/include/trick/ScheduledJobQueue.hh \ + ${TRICK_HOME}/include/trick/JobData.hh \ + ${TRICK_HOME}/include/trick/InstrumentBase.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/ScheduledJobQueue.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/Threads.hh \ + ${TRICK_HOME}/include/trick/ThreadBase.hh \ + ${TRICK_HOME}/include/trick/sim_mode.h \ + ${TRICK_HOME}/include/trick/Exec_exception.hh \ + ${TRICK_HOME}/include/trick/TrickConstant.hh +object_${TRICK_HOST_CPU}/Executive_post_checkpoint.o: Executive_post_checkpoint.cpp \ + ${TRICK_HOME}/include/trick/Executive.hh \ + ${TRICK_HOME}/include/trick/Scheduler.hh \ + ${TRICK_HOME}/include/trick/ScheduledJobQueue.hh \ + ${TRICK_HOME}/include/trick/JobData.hh \ + ${TRICK_HOME}/include/trick/InstrumentBase.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/ScheduledJobQueue.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/Threads.hh \ + ${TRICK_HOME}/include/trick/ThreadBase.hh \ + ${TRICK_HOME}/include/trick/sim_mode.h \ + ${TRICK_HOME}/include/trick/exec_proto.h \ + ${TRICK_HOME}/include/trick/sim_mode.h \ + ${TRICK_HOME}/include/trick/memorymanager_c_intf.h \ + ${TRICK_HOME}/include/trick/parameter_types.h \ + ${TRICK_HOME}/include/trick/attributes.h \ + ${TRICK_HOME}/include/trick/reference.h \ + ${TRICK_HOME}/include/trick/value.h \ + ${TRICK_HOME}/include/trick/dllist.h \ + ${TRICK_HOME}/include/trick/var.h \ + ${TRICK_HOME}/include/trick/io_alloc.h \ + ${TRICK_HOME}/include/trick/checkpoint_stl.hh \ + ${TRICK_HOME}/include/trick/checkpoint_sequence_stl.hh \ + ${TRICK_HOME}/include/trick/message_proto.h \ + ${TRICK_HOME}/include/trick/message_type.h \ + ${TRICK_HOME}/include/trick/checkpoint_map.hh \ + ${TRICK_HOME}/include/trick/checkpoint_stack.hh \ + ${TRICK_HOME}/include/trick/checkpoint_queue.hh \ + ${TRICK_HOME}/include/trick/checkpoint_pair.hh +object_${TRICK_HOST_CPU}/Executive_set_thread_rt_semaphore.o: \ + Executive_set_thread_rt_semaphore.cpp \ + ${TRICK_HOME}/include/trick/Executive.hh \ + ${TRICK_HOME}/include/trick/Scheduler.hh \ + ${TRICK_HOME}/include/trick/ScheduledJobQueue.hh \ + ${TRICK_HOME}/include/trick/JobData.hh \ + ${TRICK_HOME}/include/trick/InstrumentBase.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/ScheduledJobQueue.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/Threads.hh \ + ${TRICK_HOME}/include/trick/ThreadBase.hh \ + ${TRICK_HOME}/include/trick/sim_mode.h +object_${TRICK_HOST_CPU}/Executive_set_lock_memory.o: Executive_set_lock_memory.cpp \ + ${TRICK_HOME}/include/trick/Executive.hh \ + ${TRICK_HOME}/include/trick/Scheduler.hh \ + ${TRICK_HOME}/include/trick/ScheduledJobQueue.hh \ + ${TRICK_HOME}/include/trick/JobData.hh \ + ${TRICK_HOME}/include/trick/InstrumentBase.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/ScheduledJobQueue.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/Threads.hh \ + ${TRICK_HOME}/include/trick/ThreadBase.hh \ + ${TRICK_HOME}/include/trick/sim_mode.h \ + ${TRICK_HOME}/include/trick/message_proto.h \ + ${TRICK_HOME}/include/trick/message_type.h +object_${TRICK_HOST_CPU}/Executive_shutdown.o: Executive_shutdown.cpp \ + ${TRICK_HOME}/include/trick/Executive.hh \ + ${TRICK_HOME}/include/trick/Scheduler.hh \ + ${TRICK_HOME}/include/trick/ScheduledJobQueue.hh \ + ${TRICK_HOME}/include/trick/JobData.hh \ + ${TRICK_HOME}/include/trick/InstrumentBase.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/ScheduledJobQueue.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/Threads.hh \ + ${TRICK_HOME}/include/trick/ThreadBase.hh \ + ${TRICK_HOME}/include/trick/sim_mode.h \ + ${TRICK_HOME}/include/trick/Exec_exception.hh \ + ${TRICK_HOME}/include/trick/message_proto.h \ + ${TRICK_HOME}/include/trick/message_type.h \ + ${TRICK_HOME}/include/trick/release.h +object_${TRICK_HOST_CPU}/Executive_loop_multi_thread.o: Executive_loop_multi_thread.cpp \ + ${TRICK_HOME}/include/trick/Executive.hh \ + ${TRICK_HOME}/include/trick/Scheduler.hh \ + ${TRICK_HOME}/include/trick/ScheduledJobQueue.hh \ + ${TRICK_HOME}/include/trick/JobData.hh \ + ${TRICK_HOME}/include/trick/InstrumentBase.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/ScheduledJobQueue.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/Threads.hh \ + ${TRICK_HOME}/include/trick/ThreadBase.hh \ + ${TRICK_HOME}/include/trick/sim_mode.h \ + ${TRICK_HOME}/include/trick/Exec_exception.hh \ + ${TRICK_HOME}/include/trick/exec_proto.h \ + ${TRICK_HOME}/include/trick/sim_mode.h \ + ${TRICK_HOME}/include/trick/release.h +object_${TRICK_HOST_CPU}/Executive_freeze.o: Executive_freeze.cpp \ + ${TRICK_HOME}/include/trick/TrickConstant.hh \ + ${TRICK_HOME}/include/trick/Executive.hh \ + ${TRICK_HOME}/include/trick/Scheduler.hh \ + ${TRICK_HOME}/include/trick/ScheduledJobQueue.hh \ + ${TRICK_HOME}/include/trick/JobData.hh \ + ${TRICK_HOME}/include/trick/InstrumentBase.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/ScheduledJobQueue.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/Threads.hh \ + ${TRICK_HOME}/include/trick/ThreadBase.hh \ + ${TRICK_HOME}/include/trick/sim_mode.h \ + ${TRICK_HOME}/include/trick/exec_proto.h \ + ${TRICK_HOME}/include/trick/sim_mode.h \ + ${TRICK_HOME}/include/trick/message_proto.h \ + ${TRICK_HOME}/include/trick/message_type.h +object_${TRICK_HOST_CPU}/Executive_get_process_id.o: Executive_get_process_id.cpp \ + ${TRICK_HOME}/include/trick/Executive.hh \ + ${TRICK_HOME}/include/trick/Scheduler.hh \ + ${TRICK_HOME}/include/trick/ScheduledJobQueue.hh \ + ${TRICK_HOME}/include/trick/JobData.hh \ + ${TRICK_HOME}/include/trick/InstrumentBase.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/ScheduledJobQueue.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/Threads.hh \ + ${TRICK_HOME}/include/trick/ThreadBase.hh \ + ${TRICK_HOME}/include/trick/sim_mode.h +object_${TRICK_HOST_CPU}/Executive_c_intf.o: Executive_c_intf.cpp \ + ${TRICK_HOME}/include/trick/Executive.hh \ + ${TRICK_HOME}/include/trick/Scheduler.hh \ + ${TRICK_HOME}/include/trick/ScheduledJobQueue.hh \ + ${TRICK_HOME}/include/trick/JobData.hh \ + ${TRICK_HOME}/include/trick/InstrumentBase.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/ScheduledJobQueue.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/Threads.hh \ + ${TRICK_HOME}/include/trick/ThreadBase.hh \ + ${TRICK_HOME}/include/trick/sim_mode.h \ + ${TRICK_HOME}/include/trick/Exec_exception.hh \ + ${TRICK_HOME}/include/trick/exec_proto.h \ + ${TRICK_HOME}/include/trick/sim_mode.h \ + ${TRICK_HOME}/include/trick/exec_proto.hh +object_${TRICK_HOST_CPU}/Executive_set_thread_process_type.o: \ + Executive_set_thread_process_type.cpp \ + ${TRICK_HOME}/include/trick/Executive.hh \ + ${TRICK_HOME}/include/trick/Scheduler.hh \ + ${TRICK_HOME}/include/trick/ScheduledJobQueue.hh \ + ${TRICK_HOME}/include/trick/JobData.hh \ + ${TRICK_HOME}/include/trick/InstrumentBase.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/ScheduledJobQueue.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/Threads.hh \ + ${TRICK_HOME}/include/trick/ThreadBase.hh \ + ${TRICK_HOME}/include/trick/sim_mode.h +object_${TRICK_HOST_CPU}/Executive_set_time_tic_value.o: Executive_set_time_tic_value.cpp \ + ${TRICK_HOME}/include/trick/Executive.hh \ + ${TRICK_HOME}/include/trick/Scheduler.hh \ + ${TRICK_HOME}/include/trick/ScheduledJobQueue.hh \ + ${TRICK_HOME}/include/trick/JobData.hh \ + ${TRICK_HOME}/include/trick/InstrumentBase.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/ScheduledJobQueue.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/Threads.hh \ + ${TRICK_HOME}/include/trick/ThreadBase.hh \ + ${TRICK_HOME}/include/trick/sim_mode.h \ + ${TRICK_HOME}/include/trick/TrickConstant.hh \ + ${TRICK_HOME}/include/trick/message_proto.h \ + ${TRICK_HOME}/include/trick/message_type.h +object_${TRICK_HOST_CPU}/Executive_terminate.o: Executive_terminate.cpp \ + ${TRICK_HOME}/include/trick/Executive.hh \ + ${TRICK_HOME}/include/trick/Scheduler.hh \ + ${TRICK_HOME}/include/trick/ScheduledJobQueue.hh \ + ${TRICK_HOME}/include/trick/JobData.hh \ + ${TRICK_HOME}/include/trick/InstrumentBase.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/ScheduledJobQueue.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/Threads.hh \ + ${TRICK_HOME}/include/trick/ThreadBase.hh \ + ${TRICK_HOME}/include/trick/sim_mode.h \ + ${TRICK_HOME}/include/trick/Exec_exception.hh \ + ${TRICK_HOME}/include/trick/exec_proto.h \ + ${TRICK_HOME}/include/trick/sim_mode.h +object_${TRICK_HOST_CPU}/Executive_call_input_processor.o: Executive_call_input_processor.cpp \ + ${TRICK_HOME}/include/trick/Executive.hh \ + ${TRICK_HOME}/include/trick/Scheduler.hh \ + ${TRICK_HOME}/include/trick/ScheduledJobQueue.hh \ + ${TRICK_HOME}/include/trick/JobData.hh \ + ${TRICK_HOME}/include/trick/InstrumentBase.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/ScheduledJobQueue.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/Threads.hh \ + ${TRICK_HOME}/include/trick/ThreadBase.hh \ + ${TRICK_HOME}/include/trick/sim_mode.h \ + ${TRICK_HOME}/include/trick/Exec_exception.hh +object_${TRICK_HOST_CPU}/Executive_instrument_job.o: Executive_instrument_job.cpp \ + ${TRICK_HOME}/include/trick/Executive.hh \ + ${TRICK_HOME}/include/trick/Scheduler.hh \ + ${TRICK_HOME}/include/trick/ScheduledJobQueue.hh \ + ${TRICK_HOME}/include/trick/JobData.hh \ + ${TRICK_HOME}/include/trick/InstrumentBase.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/ScheduledJobQueue.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/Threads.hh \ + ${TRICK_HOME}/include/trick/ThreadBase.hh \ + ${TRICK_HOME}/include/trick/sim_mode.h +object_${TRICK_HOST_CPU}/Executive_checkpoint.o: Executive_checkpoint.cpp \ + ${TRICK_HOME}/include/trick/Executive.hh \ + ${TRICK_HOME}/include/trick/Scheduler.hh \ + ${TRICK_HOME}/include/trick/ScheduledJobQueue.hh \ + ${TRICK_HOME}/include/trick/JobData.hh \ + ${TRICK_HOME}/include/trick/InstrumentBase.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/ScheduledJobQueue.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/Threads.hh \ + ${TRICK_HOME}/include/trick/ThreadBase.hh \ + ${TRICK_HOME}/include/trick/sim_mode.h \ + ${TRICK_HOME}/include/trick/exec_proto.h \ + ${TRICK_HOME}/include/trick/sim_mode.h \ + ${TRICK_HOME}/include/trick/memorymanager_c_intf.h \ + ${TRICK_HOME}/include/trick/parameter_types.h \ + ${TRICK_HOME}/include/trick/attributes.h \ + ${TRICK_HOME}/include/trick/reference.h \ + ${TRICK_HOME}/include/trick/value.h \ + ${TRICK_HOME}/include/trick/dllist.h \ + ${TRICK_HOME}/include/trick/var.h \ + ${TRICK_HOME}/include/trick/io_alloc.h \ + ${TRICK_HOME}/include/trick/checkpoint_stl.hh \ + ${TRICK_HOME}/include/trick/checkpoint_sequence_stl.hh \ + ${TRICK_HOME}/include/trick/message_proto.h \ + ${TRICK_HOME}/include/trick/message_type.h \ + ${TRICK_HOME}/include/trick/checkpoint_map.hh \ + ${TRICK_HOME}/include/trick/checkpoint_stack.hh \ + ${TRICK_HOME}/include/trick/checkpoint_queue.hh \ + ${TRICK_HOME}/include/trick/checkpoint_pair.hh +object_${TRICK_HOST_CPU}/Executive_fpe_handler.o: Executive_fpe_handler.cpp \ + ${TRICK_HOME}/include/trick/Executive.hh \ + ${TRICK_HOME}/include/trick/Scheduler.hh \ + ${TRICK_HOME}/include/trick/ScheduledJobQueue.hh \ + ${TRICK_HOME}/include/trick/JobData.hh \ + ${TRICK_HOME}/include/trick/InstrumentBase.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/ScheduledJobQueue.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/Threads.hh \ + ${TRICK_HOME}/include/trick/ThreadBase.hh \ + ${TRICK_HOME}/include/trick/sim_mode.h \ + ${TRICK_HOME}/include/trick/exec_proto.h \ + ${TRICK_HOME}/include/trick/sim_mode.h \ + ${TRICK_HOME}/include/trick/message_proto.h \ + ${TRICK_HOME}/include/trick/message_type.h +object_${TRICK_HOST_CPU}/Executive_create_threads.o: Executive_create_threads.cpp \ + ${TRICK_HOME}/include/trick/Executive.hh \ + ${TRICK_HOME}/include/trick/Scheduler.hh \ + ${TRICK_HOME}/include/trick/ScheduledJobQueue.hh \ + ${TRICK_HOME}/include/trick/JobData.hh \ + ${TRICK_HOME}/include/trick/InstrumentBase.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/ScheduledJobQueue.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/Threads.hh \ + ${TRICK_HOME}/include/trick/ThreadBase.hh \ + ${TRICK_HOME}/include/trick/sim_mode.h +object_${TRICK_HOST_CPU}/Executive_freeze_loop.o: Executive_freeze_loop.cpp \ + ${TRICK_HOME}/include/trick/Executive.hh \ + ${TRICK_HOME}/include/trick/Scheduler.hh \ + ${TRICK_HOME}/include/trick/ScheduledJobQueue.hh \ + ${TRICK_HOME}/include/trick/JobData.hh \ + ${TRICK_HOME}/include/trick/InstrumentBase.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/ScheduledJobQueue.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/Threads.hh \ + ${TRICK_HOME}/include/trick/ThreadBase.hh \ + ${TRICK_HOME}/include/trick/sim_mode.h \ + ${TRICK_HOME}/include/trick/Exec_exception.hh \ + ${TRICK_HOME}/include/trick/exec_proto.h \ + ${TRICK_HOME}/include/trick/sim_mode.h \ + ${TRICK_HOME}/include/trick/message_proto.h \ + ${TRICK_HOME}/include/trick/message_type.h +object_${TRICK_HOST_CPU}/Executive_remove_sim_object.o: Executive_remove_sim_object.cpp \ + ${TRICK_HOME}/include/trick/Executive.hh \ + ${TRICK_HOME}/include/trick/Scheduler.hh \ + ${TRICK_HOME}/include/trick/ScheduledJobQueue.hh \ + ${TRICK_HOME}/include/trick/JobData.hh \ + ${TRICK_HOME}/include/trick/InstrumentBase.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/ScheduledJobQueue.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/Threads.hh \ + ${TRICK_HOME}/include/trick/ThreadBase.hh \ + ${TRICK_HOME}/include/trick/sim_mode.h +object_${TRICK_HOST_CPU}/Executive_set_thread_enabled.o: Executive_set_thread_enabled.cpp \ + ${TRICK_HOME}/include/trick/Executive.hh \ + ${TRICK_HOME}/include/trick/Scheduler.hh \ + ${TRICK_HOME}/include/trick/ScheduledJobQueue.hh \ + ${TRICK_HOME}/include/trick/JobData.hh \ + ${TRICK_HOME}/include/trick/InstrumentBase.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/ScheduledJobQueue.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/Threads.hh \ + ${TRICK_HOME}/include/trick/ThreadBase.hh \ + ${TRICK_HOME}/include/trick/sim_mode.h +object_${TRICK_HOST_CPU}/Executive_get_curr_job.o: Executive_get_curr_job.cpp \ + ${TRICK_HOME}/include/trick/Executive.hh \ + ${TRICK_HOME}/include/trick/Scheduler.hh \ + ${TRICK_HOME}/include/trick/ScheduledJobQueue.hh \ + ${TRICK_HOME}/include/trick/JobData.hh \ + ${TRICK_HOME}/include/trick/InstrumentBase.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/ScheduledJobQueue.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/Threads.hh \ + ${TRICK_HOME}/include/trick/ThreadBase.hh \ + ${TRICK_HOME}/include/trick/sim_mode.h +object_${TRICK_HOST_CPU}/Threads_set_async_wait.o: Threads_set_async_wait.cpp \ + ${TRICK_HOME}/include/trick/Threads.hh \ + ${TRICK_HOME}/include/trick/ThreadBase.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/JobData.hh \ + ${TRICK_HOME}/include/trick/InstrumentBase.hh \ + ${TRICK_HOME}/include/trick/ScheduledJobQueue.hh +object_${TRICK_HOST_CPU}/Executive_clear_scheduled_queues.o: Executive_clear_scheduled_queues.cpp \ + ${TRICK_HOME}/include/trick/Executive.hh \ + ${TRICK_HOME}/include/trick/Scheduler.hh \ + ${TRICK_HOME}/include/trick/ScheduledJobQueue.hh \ + ${TRICK_HOME}/include/trick/JobData.hh \ + ${TRICK_HOME}/include/trick/InstrumentBase.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/ScheduledJobQueue.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/Threads.hh \ + ${TRICK_HOME}/include/trick/ThreadBase.hh \ + ${TRICK_HOME}/include/trick/sim_mode.h +object_${TRICK_HOST_CPU}/Executive_add_sim_object.o: Executive_add_sim_object.cpp \ + ${TRICK_HOME}/include/trick/Executive.hh \ + ${TRICK_HOME}/include/trick/Scheduler.hh \ + ${TRICK_HOME}/include/trick/ScheduledJobQueue.hh \ + ${TRICK_HOME}/include/trick/JobData.hh \ + ${TRICK_HOME}/include/trick/InstrumentBase.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/ScheduledJobQueue.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/Threads.hh \ + ${TRICK_HOME}/include/trick/ThreadBase.hh \ + ${TRICK_HOME}/include/trick/sim_mode.h +object_${TRICK_HOST_CPU}/Executive_write_s_job_execution.o: Executive_write_s_job_execution.cpp \ + ${TRICK_HOME}/include/trick/Executive.hh \ + ${TRICK_HOME}/include/trick/Scheduler.hh \ + ${TRICK_HOME}/include/trick/ScheduledJobQueue.hh \ + ${TRICK_HOME}/include/trick/JobData.hh \ + ${TRICK_HOME}/include/trick/InstrumentBase.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/ScheduledJobQueue.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/Threads.hh \ + ${TRICK_HOME}/include/trick/ThreadBase.hh \ + ${TRICK_HOME}/include/trick/sim_mode.h \ + ${TRICK_HOME}/include/trick/command_line_protos.h \ + ${TRICK_HOME}/include/trick/message_proto.h \ + ${TRICK_HOME}/include/trick/message_type.h +object_${TRICK_HOST_CPU}/Executive_init_signal_handlers.o: Executive_init_signal_handlers.cpp \ + ${TRICK_HOME}/include/trick/Executive.hh \ + ${TRICK_HOME}/include/trick/Scheduler.hh \ + ${TRICK_HOME}/include/trick/ScheduledJobQueue.hh \ + ${TRICK_HOME}/include/trick/JobData.hh \ + ${TRICK_HOME}/include/trick/InstrumentBase.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/ScheduledJobQueue.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/Threads.hh \ + ${TRICK_HOME}/include/trick/ThreadBase.hh \ + ${TRICK_HOME}/include/trick/sim_mode.h +object_${TRICK_HOST_CPU}/Executive_write_s_run_summary.o: Executive_write_s_run_summary.cpp \ + ${TRICK_HOME}/include/trick/Executive.hh \ + ${TRICK_HOME}/include/trick/Scheduler.hh \ + ${TRICK_HOME}/include/trick/ScheduledJobQueue.hh \ + ${TRICK_HOME}/include/trick/JobData.hh \ + ${TRICK_HOME}/include/trick/InstrumentBase.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/ScheduledJobQueue.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/Threads.hh \ + ${TRICK_HOME}/include/trick/ThreadBase.hh \ + ${TRICK_HOME}/include/trick/sim_mode.h \ + ${TRICK_HOME}/include/trick/command_line_protos.h \ + ${TRICK_HOME}/include/trick/env_proto.h \ + ${TRICK_HOME}/include/trick/message_proto.h \ + ${TRICK_HOME}/include/trick/message_type.h +object_${TRICK_HOST_CPU}/fpe_handler.o: fpe_handler.cpp \ + ${TRICK_HOME}/include/trick/Executive.hh \ + ${TRICK_HOME}/include/trick/Scheduler.hh \ + ${TRICK_HOME}/include/trick/ScheduledJobQueue.hh \ + ${TRICK_HOME}/include/trick/JobData.hh \ + ${TRICK_HOME}/include/trick/InstrumentBase.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/ScheduledJobQueue.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/Threads.hh \ + ${TRICK_HOME}/include/trick/ThreadBase.hh \ + ${TRICK_HOME}/include/trick/sim_mode.h \ + ${TRICK_HOME}/include/trick/exec_proto.hh +object_${TRICK_HOST_CPU}/Executive_set_thread_amf_cycle_time.o: \ + Executive_set_thread_amf_cycle_time.cpp \ + ${TRICK_HOME}/include/trick/Executive.hh \ + ${TRICK_HOME}/include/trick/Scheduler.hh \ + ${TRICK_HOME}/include/trick/ScheduledJobQueue.hh \ + ${TRICK_HOME}/include/trick/JobData.hh \ + ${TRICK_HOME}/include/trick/InstrumentBase.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/ScheduledJobQueue.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/Threads.hh \ + ${TRICK_HOME}/include/trick/ThreadBase.hh \ + ${TRICK_HOME}/include/trick/sim_mode.h +object_${TRICK_HOST_CPU}/Threads_set_process_type.o: Threads_set_process_type.cpp \ + ${TRICK_HOME}/include/trick/Threads.hh \ + ${TRICK_HOME}/include/trick/ThreadBase.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/JobData.hh \ + ${TRICK_HOME}/include/trick/InstrumentBase.hh \ + ${TRICK_HOME}/include/trick/ScheduledJobQueue.hh +object_${TRICK_HOST_CPU}/Executive_advance_sim_time.o: Executive_advance_sim_time.cpp \ + ${TRICK_HOME}/include/trick/Executive.hh \ + ${TRICK_HOME}/include/trick/Scheduler.hh \ + ${TRICK_HOME}/include/trick/ScheduledJobQueue.hh \ + ${TRICK_HOME}/include/trick/JobData.hh \ + ${TRICK_HOME}/include/trick/InstrumentBase.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/ScheduledJobQueue.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/Threads.hh \ + ${TRICK_HOME}/include/trick/ThreadBase.hh \ + ${TRICK_HOME}/include/trick/sim_mode.h \ + ${TRICK_HOME}/include/trick/release.h +object_${TRICK_HOST_CPU}/Executive_get_job_cycle.o: Executive_get_job_cycle.cpp \ + ${TRICK_HOME}/include/trick/Executive.hh \ + ${TRICK_HOME}/include/trick/Scheduler.hh \ + ${TRICK_HOME}/include/trick/ScheduledJobQueue.hh \ + ${TRICK_HOME}/include/trick/JobData.hh \ + ${TRICK_HOME}/include/trick/InstrumentBase.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/ScheduledJobQueue.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/Threads.hh \ + ${TRICK_HOME}/include/trick/ThreadBase.hh \ + ${TRICK_HOME}/include/trick/sim_mode.h +object_${TRICK_HOST_CPU}/Executive_set_thread_priority.o: Executive_set_thread_priority.cpp \ + ${TRICK_HOME}/include/trick/Executive.hh \ + ${TRICK_HOME}/include/trick/Scheduler.hh \ + ${TRICK_HOME}/include/trick/ScheduledJobQueue.hh \ + ${TRICK_HOME}/include/trick/JobData.hh \ + ${TRICK_HOME}/include/trick/InstrumentBase.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/ScheduledJobQueue.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/Threads.hh \ + ${TRICK_HOME}/include/trick/ThreadBase.hh \ + ${TRICK_HOME}/include/trick/sim_mode.h +object_${TRICK_HOST_CPU}/Executive_register_scheduler.o: Executive_register_scheduler.cpp \ + ${TRICK_HOME}/include/trick/Executive.hh \ + ${TRICK_HOME}/include/trick/Scheduler.hh \ + ${TRICK_HOME}/include/trick/ScheduledJobQueue.hh \ + ${TRICK_HOME}/include/trick/JobData.hh \ + ${TRICK_HOME}/include/trick/InstrumentBase.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/ScheduledJobQueue.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/Threads.hh \ + ${TRICK_HOME}/include/trick/ThreadBase.hh \ + ${TRICK_HOME}/include/trick/sim_mode.h +object_${TRICK_HOST_CPU}/Executive_set_thread_cpu_affinity.o: \ + Executive_set_thread_cpu_affinity.cpp \ + ${TRICK_HOME}/include/trick/Executive.hh \ + ${TRICK_HOME}/include/trick/Scheduler.hh \ + ${TRICK_HOME}/include/trick/ScheduledJobQueue.hh \ + ${TRICK_HOME}/include/trick/JobData.hh \ + ${TRICK_HOME}/include/trick/InstrumentBase.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/ScheduledJobQueue.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/Threads.hh \ + ${TRICK_HOME}/include/trick/ThreadBase.hh \ + ${TRICK_HOME}/include/trick/sim_mode.h +object_${TRICK_HOST_CPU}/Threads_child.o: Threads_child.cpp \ + ${TRICK_HOME}/include/trick/Threads.hh \ + ${TRICK_HOME}/include/trick/ThreadBase.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/JobData.hh \ + ${TRICK_HOME}/include/trick/InstrumentBase.hh \ + ${TRICK_HOME}/include/trick/ScheduledJobQueue.hh \ + ${TRICK_HOME}/include/trick/release.h \ + ${TRICK_HOME}/include/trick/Exec_exception.hh \ + ${TRICK_HOME}/include/trick/exec_proto.h \ + ${TRICK_HOME}/include/trick/sim_mode.h \ + ${TRICK_HOME}/include/trick/TrickConstant.hh \ + ${TRICK_HOME}/include/trick/message_proto.h \ + ${TRICK_HOME}/include/trick/message_type.h +object_${TRICK_HOST_CPU}/Executive_init_freeze_scheduled.o: Executive_init_freeze_scheduled.cpp \ + ${TRICK_HOME}/include/trick/Executive.hh \ + ${TRICK_HOME}/include/trick/Scheduler.hh \ + ${TRICK_HOME}/include/trick/ScheduledJobQueue.hh \ + ${TRICK_HOME}/include/trick/JobData.hh \ + ${TRICK_HOME}/include/trick/InstrumentBase.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/ScheduledJobQueue.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/Threads.hh \ + ${TRICK_HOME}/include/trick/ThreadBase.hh \ + ${TRICK_HOME}/include/trick/sim_mode.h +object_${TRICK_HOST_CPU}/Executive_get_sim_time.o: Executive_get_sim_time.cpp \ + ${TRICK_HOME}/include/trick/Executive.hh \ + ${TRICK_HOME}/include/trick/Scheduler.hh \ + ${TRICK_HOME}/include/trick/ScheduledJobQueue.hh \ + ${TRICK_HOME}/include/trick/JobData.hh \ + ${TRICK_HOME}/include/trick/InstrumentBase.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/ScheduledJobQueue.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/Threads.hh \ + ${TRICK_HOME}/include/trick/ThreadBase.hh \ + ${TRICK_HOME}/include/trick/sim_mode.h +object_${TRICK_HOST_CPU}/Exec_exception.o: Exec_exception.cpp \ + ${TRICK_HOME}/include/trick/Exec_exception.hh +object_${TRICK_HOST_CPU}/Executive_set_simobject_onoff.o: Executive_set_simobject_onoff.cpp \ + ${TRICK_HOME}/include/trick/Executive.hh \ + ${TRICK_HOME}/include/trick/Scheduler.hh \ + ${TRICK_HOME}/include/trick/ScheduledJobQueue.hh \ + ${TRICK_HOME}/include/trick/JobData.hh \ + ${TRICK_HOME}/include/trick/InstrumentBase.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/ScheduledJobQueue.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/Threads.hh \ + ${TRICK_HOME}/include/trick/ThreadBase.hh \ + ${TRICK_HOME}/include/trick/sim_mode.h +object_${TRICK_HOST_CPU}/Executive_set_job_cycle.o: Executive_set_job_cycle.cpp \ + ${TRICK_HOME}/include/trick/Executive.hh \ + ${TRICK_HOME}/include/trick/Scheduler.hh \ + ${TRICK_HOME}/include/trick/ScheduledJobQueue.hh \ + ${TRICK_HOME}/include/trick/JobData.hh \ + ${TRICK_HOME}/include/trick/InstrumentBase.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/ScheduledJobQueue.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/Threads.hh \ + ${TRICK_HOME}/include/trick/ThreadBase.hh \ + ${TRICK_HOME}/include/trick/sim_mode.h \ + ${TRICK_HOME}/include/trick/message_proto.h \ + ${TRICK_HOME}/include/trick/message_type.h +object_${TRICK_HOST_CPU}/Executive_get_job.o: Executive_get_job.cpp \ + ${TRICK_HOME}/include/trick/Executive.hh \ + ${TRICK_HOME}/include/trick/Scheduler.hh \ + ${TRICK_HOME}/include/trick/ScheduledJobQueue.hh \ + ${TRICK_HOME}/include/trick/JobData.hh \ + ${TRICK_HOME}/include/trick/InstrumentBase.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/ScheduledJobQueue.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/Threads.hh \ + ${TRICK_HOME}/include/trick/ThreadBase.hh \ + ${TRICK_HOME}/include/trick/sim_mode.h +object_${TRICK_HOST_CPU}/Executive_call_default_data.o: Executive_call_default_data.cpp \ + ${TRICK_HOME}/include/trick/Executive.hh \ + ${TRICK_HOME}/include/trick/Scheduler.hh \ + ${TRICK_HOME}/include/trick/ScheduledJobQueue.hh \ + ${TRICK_HOME}/include/trick/JobData.hh \ + ${TRICK_HOME}/include/trick/InstrumentBase.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/ScheduledJobQueue.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/Threads.hh \ + ${TRICK_HOME}/include/trick/ThreadBase.hh \ + ${TRICK_HOME}/include/trick/sim_mode.h \ + ${TRICK_HOME}/include/trick/Exec_exception.hh +object_${TRICK_HOST_CPU}/child_handler.o: child_handler.cpp +object_${TRICK_HOST_CPU}/Executive_add_scheduled_job_class.o: \ + Executive_add_scheduled_job_class.cpp \ + ${TRICK_HOME}/include/trick/Executive.hh \ + ${TRICK_HOME}/include/trick/Scheduler.hh \ + ${TRICK_HOME}/include/trick/ScheduledJobQueue.hh \ + ${TRICK_HOME}/include/trick/JobData.hh \ + ${TRICK_HOME}/include/trick/InstrumentBase.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/ScheduledJobQueue.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/Threads.hh \ + ${TRICK_HOME}/include/trick/ThreadBase.hh \ + ${TRICK_HOME}/include/trick/sim_mode.h +object_${TRICK_HOST_CPU}/Executive_check_all_jobs_handled.o: Executive_check_all_jobs_handled.cpp \ + ${TRICK_HOME}/include/trick/Executive.hh \ + ${TRICK_HOME}/include/trick/Scheduler.hh \ + ${TRICK_HOME}/include/trick/ScheduledJobQueue.hh \ + ${TRICK_HOME}/include/trick/JobData.hh \ + ${TRICK_HOME}/include/trick/InstrumentBase.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/ScheduledJobQueue.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/Threads.hh \ + ${TRICK_HOME}/include/trick/ThreadBase.hh \ + ${TRICK_HOME}/include/trick/sim_mode.h \ + ${TRICK_HOME}/include/trick/message_proto.h \ + ${TRICK_HOME}/include/trick/message_type.h +object_${TRICK_HOST_CPU}/Executive_process_sim_args.o: Executive_process_sim_args.cpp \ + ${TRICK_HOME}/include/trick/Executive.hh \ + ${TRICK_HOME}/include/trick/Scheduler.hh \ + ${TRICK_HOME}/include/trick/ScheduledJobQueue.hh \ + ${TRICK_HOME}/include/trick/JobData.hh \ + ${TRICK_HOME}/include/trick/InstrumentBase.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/ScheduledJobQueue.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/Threads.hh \ + ${TRICK_HOME}/include/trick/ThreadBase.hh \ + ${TRICK_HOME}/include/trick/sim_mode.h \ + ${TRICK_HOME}/include/trick/command_line_protos.h +object_${TRICK_HOST_CPU}/Executive_run.o: Executive_run.cpp \ + ${TRICK_HOME}/include/trick/Executive.hh \ + ${TRICK_HOME}/include/trick/Scheduler.hh \ + ${TRICK_HOME}/include/trick/ScheduledJobQueue.hh \ + ${TRICK_HOME}/include/trick/JobData.hh \ + ${TRICK_HOME}/include/trick/InstrumentBase.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/ScheduledJobQueue.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/Threads.hh \ + ${TRICK_HOME}/include/trick/ThreadBase.hh \ + ${TRICK_HOME}/include/trick/sim_mode.h \ + ${TRICK_HOME}/include/trick/Message_proto.hh \ + ${TRICK_HOME}/include/trick/MessageSubscriber.hh +object_${TRICK_HOST_CPU}/Executive_remove_jobs.o: Executive_remove_jobs.cpp \ + ${TRICK_HOME}/include/trick/Executive.hh \ + ${TRICK_HOME}/include/trick/Scheduler.hh \ + ${TRICK_HOME}/include/trick/ScheduledJobQueue.hh \ + ${TRICK_HOME}/include/trick/JobData.hh \ + ${TRICK_HOME}/include/trick/InstrumentBase.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/ScheduledJobQueue.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/Threads.hh \ + ${TRICK_HOME}/include/trick/ThreadBase.hh \ + ${TRICK_HOME}/include/trick/sim_mode.h \ + ${TRICK_HOME}/include/trick/exec_proto.hh \ + ${TRICK_HOME}/include/trick/memorymanager_c_intf.h \ + ${TRICK_HOME}/include/trick/parameter_types.h \ + ${TRICK_HOME}/include/trick/attributes.h \ + ${TRICK_HOME}/include/trick/reference.h \ + ${TRICK_HOME}/include/trick/value.h \ + ${TRICK_HOME}/include/trick/dllist.h \ + ${TRICK_HOME}/include/trick/var.h \ + ${TRICK_HOME}/include/trick/io_alloc.h \ + ${TRICK_HOME}/include/trick/TrickConstant.hh +object_${TRICK_HOST_CPU}/Executive_call_initialization.o: Executive_call_initialization.cpp \ + ${TRICK_HOME}/include/trick/Executive.hh \ + ${TRICK_HOME}/include/trick/Scheduler.hh \ + ${TRICK_HOME}/include/trick/ScheduledJobQueue.hh \ + ${TRICK_HOME}/include/trick/JobData.hh \ + ${TRICK_HOME}/include/trick/InstrumentBase.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/ScheduledJobQueue.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/Threads.hh \ + ${TRICK_HOME}/include/trick/ThreadBase.hh \ + ${TRICK_HOME}/include/trick/sim_mode.h \ + ${TRICK_HOME}/include/trick/Exec_exception.hh +object_${TRICK_HOST_CPU}/Executive_set_job_onoff.o: Executive_set_job_onoff.cpp \ + ${TRICK_HOME}/include/trick/Executive.hh \ + ${TRICK_HOME}/include/trick/Scheduler.hh \ + ${TRICK_HOME}/include/trick/ScheduledJobQueue.hh \ + ${TRICK_HOME}/include/trick/JobData.hh \ + ${TRICK_HOME}/include/trick/InstrumentBase.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/ScheduledJobQueue.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/Threads.hh \ + ${TRICK_HOME}/include/trick/ThreadBase.hh \ + ${TRICK_HOME}/include/trick/sim_mode.h \ + ${TRICK_HOME}/include/trick/message_proto.h \ + ${TRICK_HOME}/include/trick/message_type.h +object_${TRICK_HOST_CPU}/Executive_restart.o: Executive_restart.cpp \ + ${TRICK_HOME}/include/trick/Executive.hh \ + ${TRICK_HOME}/include/trick/Scheduler.hh \ + ${TRICK_HOME}/include/trick/ScheduledJobQueue.hh \ + ${TRICK_HOME}/include/trick/JobData.hh \ + ${TRICK_HOME}/include/trick/InstrumentBase.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/ScheduledJobQueue.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/Threads.hh \ + ${TRICK_HOME}/include/trick/ThreadBase.hh \ + ${TRICK_HOME}/include/trick/sim_mode.h \ + ${TRICK_HOME}/include/trick/exec_proto.h \ + ${TRICK_HOME}/include/trick/sim_mode.h \ + ${TRICK_HOME}/include/trick/message_proto.h \ + ${TRICK_HOME}/include/trick/message_type.h \ + ${TRICK_HOME}/include/trick/memorymanager_c_intf.h \ + ${TRICK_HOME}/include/trick/parameter_types.h \ + ${TRICK_HOME}/include/trick/attributes.h \ + ${TRICK_HOME}/include/trick/reference.h \ + ${TRICK_HOME}/include/trick/value.h \ + ${TRICK_HOME}/include/trick/dllist.h \ + ${TRICK_HOME}/include/trick/var.h \ + ${TRICK_HOME}/include/trick/io_alloc.h \ + ${TRICK_HOME}/include/trick/checkpoint_stl.hh \ + ${TRICK_HOME}/include/trick/checkpoint_sequence_stl.hh \ + ${TRICK_HOME}/include/trick/checkpoint_map.hh \ + ${TRICK_HOME}/include/trick/checkpoint_stack.hh \ + ${TRICK_HOME}/include/trick/checkpoint_queue.hh \ + ${TRICK_HOME}/include/trick/checkpoint_pair.hh \ + ${TRICK_HOME}/include/trick/Threads.hh +object_${TRICK_HOST_CPU}/Executive_add_depends_on_job.o: Executive_add_depends_on_job.cpp \ + ${TRICK_HOME}/include/trick/Executive.hh \ + ${TRICK_HOME}/include/trick/Scheduler.hh \ + ${TRICK_HOME}/include/trick/ScheduledJobQueue.hh \ + ${TRICK_HOME}/include/trick/JobData.hh \ + ${TRICK_HOME}/include/trick/InstrumentBase.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/ScheduledJobQueue.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/Threads.hh \ + ${TRICK_HOME}/include/trick/ThreadBase.hh \ + ${TRICK_HOME}/include/trick/sim_mode.h \ + ${TRICK_HOME}/include/trick/message_proto.h \ + ${TRICK_HOME}/include/trick/message_type.h +object_${TRICK_HOST_CPU}/Executive_loop.o: Executive_loop.cpp \ + ${TRICK_HOME}/include/trick/Executive.hh \ + ${TRICK_HOME}/include/trick/Scheduler.hh \ + ${TRICK_HOME}/include/trick/ScheduledJobQueue.hh \ + ${TRICK_HOME}/include/trick/JobData.hh \ + ${TRICK_HOME}/include/trick/InstrumentBase.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/ScheduledJobQueue.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/Threads.hh \ + ${TRICK_HOME}/include/trick/ThreadBase.hh \ + ${TRICK_HOME}/include/trick/sim_mode.h \ + ${TRICK_HOME}/include/trick/Exec_exception.hh +object_${TRICK_HOST_CPU}/Executive_signal_handler.o: Executive_signal_handler.cpp \ + ${TRICK_HOME}/include/trick/Executive.hh \ + ${TRICK_HOME}/include/trick/Scheduler.hh \ + ${TRICK_HOME}/include/trick/ScheduledJobQueue.hh \ + ${TRICK_HOME}/include/trick/JobData.hh \ + ${TRICK_HOME}/include/trick/InstrumentBase.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/ScheduledJobQueue.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/Threads.hh \ + ${TRICK_HOME}/include/trick/ThreadBase.hh \ + ${TRICK_HOME}/include/trick/sim_mode.h +object_${TRICK_HOST_CPU}/Executive_stop.o: Executive_stop.cpp \ + ${TRICK_HOME}/include/trick/Executive.hh \ + ${TRICK_HOME}/include/trick/Scheduler.hh \ + ${TRICK_HOME}/include/trick/ScheduledJobQueue.hh \ + ${TRICK_HOME}/include/trick/JobData.hh \ + ${TRICK_HOME}/include/trick/InstrumentBase.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/ScheduledJobQueue.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/Threads.hh \ + ${TRICK_HOME}/include/trick/ThreadBase.hh \ + ${TRICK_HOME}/include/trick/sim_mode.h \ + ${TRICK_HOME}/include/trick/Exec_exception.hh +object_${TRICK_HOST_CPU}/sig_hand.o: sig_hand.cpp ${TRICK_HOME}/include/trick/Executive.hh \ + ${TRICK_HOME}/include/trick/Scheduler.hh \ + ${TRICK_HOME}/include/trick/ScheduledJobQueue.hh \ + ${TRICK_HOME}/include/trick/JobData.hh \ + ${TRICK_HOME}/include/trick/InstrumentBase.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/ScheduledJobQueue.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/Threads.hh \ + ${TRICK_HOME}/include/trick/ThreadBase.hh \ + ${TRICK_HOME}/include/trick/sim_mode.h \ + ${TRICK_HOME}/include/trick/exec_proto.hh +object_${TRICK_HOST_CPU}/Executive_check_all_job_cycle_times.o: \ + Executive_check_all_job_cycle_times.cpp \ + ${TRICK_HOME}/include/trick/Executive.hh \ + ${TRICK_HOME}/include/trick/Scheduler.hh \ + ${TRICK_HOME}/include/trick/ScheduledJobQueue.hh \ + ${TRICK_HOME}/include/trick/JobData.hh \ + ${TRICK_HOME}/include/trick/InstrumentBase.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/ScheduledJobQueue.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/Threads.hh \ + ${TRICK_HOME}/include/trick/ThreadBase.hh \ + ${TRICK_HOME}/include/trick/sim_mode.h \ + ${TRICK_HOME}/include/trick/message_proto.h \ + ${TRICK_HOME}/include/trick/message_type.h \ + ${TRICK_HOME}/include/trick/TrickConstant.hh +object_${TRICK_HOST_CPU}/Executive_loop_single_thread.o: Executive_loop_single_thread.cpp \ + ${TRICK_HOME}/include/trick/Executive.hh \ + ${TRICK_HOME}/include/trick/Scheduler.hh \ + ${TRICK_HOME}/include/trick/ScheduledJobQueue.hh \ + ${TRICK_HOME}/include/trick/JobData.hh \ + ${TRICK_HOME}/include/trick/InstrumentBase.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/ScheduledJobQueue.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/Threads.hh \ + ${TRICK_HOME}/include/trick/ThreadBase.hh \ + ${TRICK_HOME}/include/trick/sim_mode.h \ + ${TRICK_HOME}/include/trick/Exec_exception.hh \ + ${TRICK_HOME}/include/trick/exec_proto.h \ + ${TRICK_HOME}/include/trick/sim_mode.h +object_${TRICK_HOST_CPU}/Executive_init.o: Executive_init.cpp \ + ${TRICK_HOME}/include/trick/Executive.hh \ + ${TRICK_HOME}/include/trick/Scheduler.hh \ + ${TRICK_HOME}/include/trick/ScheduledJobQueue.hh \ + ${TRICK_HOME}/include/trick/JobData.hh \ + ${TRICK_HOME}/include/trick/InstrumentBase.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/ScheduledJobQueue.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/Threads.hh \ + ${TRICK_HOME}/include/trick/ThreadBase.hh \ + ${TRICK_HOME}/include/trick/sim_mode.h \ + ${TRICK_HOME}/include/trick/Exec_exception.hh \ + ${TRICK_HOME}/include/trick/exec_proto.h \ + ${TRICK_HOME}/include/trick/sim_mode.h +object_${TRICK_HOST_CPU}/Threads_set_amf_cycle_tics.o: Threads_set_amf_cycle_tics.cpp \ + ${TRICK_HOME}/include/trick/Threads.hh \ + ${TRICK_HOME}/include/trick/ThreadBase.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/JobData.hh \ + ${TRICK_HOME}/include/trick/InstrumentBase.hh \ + ${TRICK_HOME}/include/trick/ScheduledJobQueue.hh +object_${TRICK_HOST_CPU}/Executive_add_jobs_to_queue.o: Executive_add_jobs_to_queue.cpp \ + ${TRICK_HOME}/include/trick/Executive.hh \ + ${TRICK_HOME}/include/trick/Scheduler.hh \ + ${TRICK_HOME}/include/trick/ScheduledJobQueue.hh \ + ${TRICK_HOME}/include/trick/JobData.hh \ + ${TRICK_HOME}/include/trick/InstrumentBase.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/ScheduledJobQueue.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/Threads.hh \ + ${TRICK_HOME}/include/trick/ThreadBase.hh \ + ${TRICK_HOME}/include/trick/sim_mode.h \ + ${TRICK_HOME}/include/trick/exec_proto.hh \ + ${TRICK_HOME}/include/trick/memorymanager_c_intf.h \ + ${TRICK_HOME}/include/trick/parameter_types.h \ + ${TRICK_HOME}/include/trick/attributes.h \ + ${TRICK_HOME}/include/trick/reference.h \ + ${TRICK_HOME}/include/trick/value.h \ + ${TRICK_HOME}/include/trick/dllist.h \ + ${TRICK_HOME}/include/trick/var.h \ + ${TRICK_HOME}/include/trick/io_alloc.h \ + ${TRICK_HOME}/include/trick/TrickConstant.hh +object_${TRICK_HOST_CPU}/Executive_set_thread_async_wait.o: Executive_set_thread_async_wait.cpp \ + ${TRICK_HOME}/include/trick/Executive.hh \ + ${TRICK_HOME}/include/trick/Scheduler.hh \ + ${TRICK_HOME}/include/trick/ScheduledJobQueue.hh \ + ${TRICK_HOME}/include/trick/JobData.hh \ + ${TRICK_HOME}/include/trick/InstrumentBase.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/ScheduledJobQueue.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/Threads.hh \ + ${TRICK_HOME}/include/trick/ThreadBase.hh \ + ${TRICK_HOME}/include/trick/sim_mode.h +object_${TRICK_HOST_CPU}/Threads.o: Threads.cpp ${TRICK_HOME}/include/trick/Threads.hh \ + ${TRICK_HOME}/include/trick/ThreadBase.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/JobData.hh \ + ${TRICK_HOME}/include/trick/InstrumentBase.hh \ + ${TRICK_HOME}/include/trick/ScheduledJobQueue.hh \ + ${TRICK_HOME}/include/trick/message_proto.h \ + ${TRICK_HOME}/include/trick/message_type.h +object_${TRICK_HOST_CPU}/Executive.o: Executive.cpp ${TRICK_HOME}/include/trick/Executive.hh \ + ${TRICK_HOME}/include/trick/Scheduler.hh \ + ${TRICK_HOME}/include/trick/ScheduledJobQueue.hh \ + ${TRICK_HOME}/include/trick/JobData.hh \ + ${TRICK_HOME}/include/trick/InstrumentBase.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/ScheduledJobQueue.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/Threads.hh \ + ${TRICK_HOME}/include/trick/ThreadBase.hh \ + ${TRICK_HOME}/include/trick/sim_mode.h \ + ${TRICK_HOME}/include/trick/Exec_exception.hh \ + ${TRICK_HOME}/include/trick/TrickConstant.hh +object_${TRICK_HOST_CPU}/Executive_post_checkpoint.o: Executive_post_checkpoint.cpp \ + ${TRICK_HOME}/include/trick/Executive.hh \ + ${TRICK_HOME}/include/trick/Scheduler.hh \ + ${TRICK_HOME}/include/trick/ScheduledJobQueue.hh \ + ${TRICK_HOME}/include/trick/JobData.hh \ + ${TRICK_HOME}/include/trick/InstrumentBase.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/ScheduledJobQueue.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/Threads.hh \ + ${TRICK_HOME}/include/trick/ThreadBase.hh \ + ${TRICK_HOME}/include/trick/sim_mode.h \ + ${TRICK_HOME}/include/trick/exec_proto.h \ + ${TRICK_HOME}/include/trick/sim_mode.h \ + ${TRICK_HOME}/include/trick/memorymanager_c_intf.h \ + ${TRICK_HOME}/include/trick/parameter_types.h \ + ${TRICK_HOME}/include/trick/attributes.h \ + ${TRICK_HOME}/include/trick/reference.h \ + ${TRICK_HOME}/include/trick/value.h \ + ${TRICK_HOME}/include/trick/dllist.h \ + ${TRICK_HOME}/include/trick/var.h \ + ${TRICK_HOME}/include/trick/io_alloc.h \ + ${TRICK_HOME}/include/trick/checkpoint_stl.hh \ + ${TRICK_HOME}/include/trick/checkpoint_sequence_stl.hh \ + ${TRICK_HOME}/include/trick/message_proto.h \ + ${TRICK_HOME}/include/trick/message_type.h \ + ${TRICK_HOME}/include/trick/checkpoint_map.hh \ + ${TRICK_HOME}/include/trick/checkpoint_stack.hh \ + ${TRICK_HOME}/include/trick/checkpoint_queue.hh \ + ${TRICK_HOME}/include/trick/checkpoint_pair.hh +object_${TRICK_HOST_CPU}/Executive_set_thread_rt_semaphore.o: \ + Executive_set_thread_rt_semaphore.cpp \ + ${TRICK_HOME}/include/trick/Executive.hh \ + ${TRICK_HOME}/include/trick/Scheduler.hh \ + ${TRICK_HOME}/include/trick/ScheduledJobQueue.hh \ + ${TRICK_HOME}/include/trick/JobData.hh \ + ${TRICK_HOME}/include/trick/InstrumentBase.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/ScheduledJobQueue.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/Threads.hh \ + ${TRICK_HOME}/include/trick/ThreadBase.hh \ + ${TRICK_HOME}/include/trick/sim_mode.h +object_${TRICK_HOST_CPU}/Executive_set_lock_memory.o: Executive_set_lock_memory.cpp \ + ${TRICK_HOME}/include/trick/Executive.hh \ + ${TRICK_HOME}/include/trick/Scheduler.hh \ + ${TRICK_HOME}/include/trick/ScheduledJobQueue.hh \ + ${TRICK_HOME}/include/trick/JobData.hh \ + ${TRICK_HOME}/include/trick/InstrumentBase.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/ScheduledJobQueue.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/Threads.hh \ + ${TRICK_HOME}/include/trick/ThreadBase.hh \ + ${TRICK_HOME}/include/trick/sim_mode.h \ + ${TRICK_HOME}/include/trick/message_proto.h \ + ${TRICK_HOME}/include/trick/message_type.h +object_${TRICK_HOST_CPU}/Executive_shutdown.o: Executive_shutdown.cpp \ + ${TRICK_HOME}/include/trick/Executive.hh \ + ${TRICK_HOME}/include/trick/Scheduler.hh \ + ${TRICK_HOME}/include/trick/ScheduledJobQueue.hh \ + ${TRICK_HOME}/include/trick/JobData.hh \ + ${TRICK_HOME}/include/trick/InstrumentBase.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/ScheduledJobQueue.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/Threads.hh \ + ${TRICK_HOME}/include/trick/ThreadBase.hh \ + ${TRICK_HOME}/include/trick/sim_mode.h \ + ${TRICK_HOME}/include/trick/Exec_exception.hh \ + ${TRICK_HOME}/include/trick/message_proto.h \ + ${TRICK_HOME}/include/trick/message_type.h \ + ${TRICK_HOME}/include/trick/release.h +object_${TRICK_HOST_CPU}/Executive_loop_multi_thread.o: Executive_loop_multi_thread.cpp \ + ${TRICK_HOME}/include/trick/Executive.hh \ + ${TRICK_HOME}/include/trick/Scheduler.hh \ + ${TRICK_HOME}/include/trick/ScheduledJobQueue.hh \ + ${TRICK_HOME}/include/trick/JobData.hh \ + ${TRICK_HOME}/include/trick/InstrumentBase.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/ScheduledJobQueue.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/Threads.hh \ + ${TRICK_HOME}/include/trick/ThreadBase.hh \ + ${TRICK_HOME}/include/trick/sim_mode.h \ + ${TRICK_HOME}/include/trick/Exec_exception.hh \ + ${TRICK_HOME}/include/trick/exec_proto.h \ + ${TRICK_HOME}/include/trick/sim_mode.h \ + ${TRICK_HOME}/include/trick/release.h +object_${TRICK_HOST_CPU}/Executive_freeze.o: Executive_freeze.cpp \ + ${TRICK_HOME}/include/trick/TrickConstant.hh \ + ${TRICK_HOME}/include/trick/Executive.hh \ + ${TRICK_HOME}/include/trick/Scheduler.hh \ + ${TRICK_HOME}/include/trick/ScheduledJobQueue.hh \ + ${TRICK_HOME}/include/trick/JobData.hh \ + ${TRICK_HOME}/include/trick/InstrumentBase.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/ScheduledJobQueue.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/Threads.hh \ + ${TRICK_HOME}/include/trick/ThreadBase.hh \ + ${TRICK_HOME}/include/trick/sim_mode.h \ + ${TRICK_HOME}/include/trick/exec_proto.h \ + ${TRICK_HOME}/include/trick/sim_mode.h \ + ${TRICK_HOME}/include/trick/message_proto.h \ + ${TRICK_HOME}/include/trick/message_type.h +object_${TRICK_HOST_CPU}/Executive_get_process_id.o: Executive_get_process_id.cpp \ + ${TRICK_HOME}/include/trick/Executive.hh \ + ${TRICK_HOME}/include/trick/Scheduler.hh \ + ${TRICK_HOME}/include/trick/ScheduledJobQueue.hh \ + ${TRICK_HOME}/include/trick/JobData.hh \ + ${TRICK_HOME}/include/trick/InstrumentBase.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/ScheduledJobQueue.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/Threads.hh \ + ${TRICK_HOME}/include/trick/ThreadBase.hh \ + ${TRICK_HOME}/include/trick/sim_mode.h +object_${TRICK_HOST_CPU}/Executive_c_intf.o: Executive_c_intf.cpp \ + ${TRICK_HOME}/include/trick/Executive.hh \ + ${TRICK_HOME}/include/trick/Scheduler.hh \ + ${TRICK_HOME}/include/trick/ScheduledJobQueue.hh \ + ${TRICK_HOME}/include/trick/JobData.hh \ + ${TRICK_HOME}/include/trick/InstrumentBase.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/ScheduledJobQueue.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/Threads.hh \ + ${TRICK_HOME}/include/trick/ThreadBase.hh \ + ${TRICK_HOME}/include/trick/sim_mode.h \ + ${TRICK_HOME}/include/trick/Exec_exception.hh \ + ${TRICK_HOME}/include/trick/exec_proto.h \ + ${TRICK_HOME}/include/trick/sim_mode.h \ + ${TRICK_HOME}/include/trick/exec_proto.hh diff --git a/trick_source/sim_services/Executive/src/Threads.cpp b/trick_source/sim_services/Executive/Threads.cpp similarity index 93% rename from trick_source/sim_services/Executive/src/Threads.cpp rename to trick_source/sim_services/Executive/Threads.cpp index b9da21b5..be6bad58 100644 --- a/trick_source/sim_services/Executive/src/Threads.cpp +++ b/trick_source/sim_services/Executive/Threads.cpp @@ -3,8 +3,8 @@ #include <sstream> #include <stdio.h> -#include "sim_services/Executive/include/Threads.hh" -#include "sim_services/Message/include/message_proto.h" +#include "trick/Threads.hh" +#include "trick/message_proto.h" Trick::Threads::Threads(int in_id , bool in_rt_nap) : enabled(true) , diff --git a/trick_source/sim_services/Executive/src/Threads_child.cpp b/trick_source/sim_services/Executive/Threads_child.cpp similarity index 97% rename from trick_source/sim_services/Executive/src/Threads_child.cpp rename to trick_source/sim_services/Executive/Threads_child.cpp index 50b737d2..9212dce2 100644 --- a/trick_source/sim_services/Executive/src/Threads_child.cpp +++ b/trick_source/sim_services/Executive/Threads_child.cpp @@ -20,12 +20,12 @@ #include <cxxabi.h> #endif -#include "sim_services/Executive/include/Threads.hh" -#include "sim_services/include/release.h" -#include "sim_services/Executive/include/Exec_exception.hh" -#include "sim_services/Executive/include/exec_proto.h" -#include "sim_services/include/TrickConstant.hh" -#include "sim_services/Message/include/message_proto.h" +#include "trick/Threads.hh" +#include "trick/release.h" +#include "trick/Exec_exception.hh" +#include "trick/exec_proto.h" +#include "trick/TrickConstant.hh" +#include "trick/message_proto.h" /** diff --git a/trick_source/sim_services/Executive/src/Threads_set_amf_cycle_tics.cpp b/trick_source/sim_services/Executive/Threads_set_amf_cycle_tics.cpp similarity index 93% rename from trick_source/sim_services/Executive/src/Threads_set_amf_cycle_tics.cpp rename to trick_source/sim_services/Executive/Threads_set_amf_cycle_tics.cpp index d63f68de..cfa29220 100644 --- a/trick_source/sim_services/Executive/src/Threads_set_amf_cycle_tics.cpp +++ b/trick_source/sim_services/Executive/Threads_set_amf_cycle_tics.cpp @@ -1,6 +1,6 @@ #include <math.h> -#include "sim_services/Executive/include/Threads.hh" +#include "trick/Threads.hh" /* @design diff --git a/trick_source/sim_services/Executive/src/Threads_set_async_wait.cpp b/trick_source/sim_services/Executive/Threads_set_async_wait.cpp similarity index 67% rename from trick_source/sim_services/Executive/src/Threads_set_async_wait.cpp rename to trick_source/sim_services/Executive/Threads_set_async_wait.cpp index 58e60eac..e60eef9e 100644 --- a/trick_source/sim_services/Executive/src/Threads_set_async_wait.cpp +++ b/trick_source/sim_services/Executive/Threads_set_async_wait.cpp @@ -1,5 +1,5 @@ -#include "sim_services/Executive/include/Threads.hh" +#include "trick/Threads.hh" int Trick::Threads::set_async_wait(int yes_no) { diff --git a/trick_source/sim_services/Executive/src/Threads_set_process_type.cpp b/trick_source/sim_services/Executive/Threads_set_process_type.cpp similarity index 88% rename from trick_source/sim_services/Executive/src/Threads_set_process_type.cpp rename to trick_source/sim_services/Executive/Threads_set_process_type.cpp index 0b130d42..1589ae88 100644 --- a/trick_source/sim_services/Executive/src/Threads_set_process_type.cpp +++ b/trick_source/sim_services/Executive/Threads_set_process_type.cpp @@ -1,5 +1,5 @@ -#include "sim_services/Executive/include/Threads.hh" +#include "trick/Threads.hh" int Trick::Threads::set_process_type(int in_process_type) { diff --git a/trick_source/sim_services/Executive/src/child_handler.cpp b/trick_source/sim_services/Executive/child_handler.cpp similarity index 100% rename from trick_source/sim_services/Executive/src/child_handler.cpp rename to trick_source/sim_services/Executive/child_handler.cpp diff --git a/trick_source/sim_services/Executive/design.dox_in b/trick_source/sim_services/Executive/docs/design.dox_in similarity index 100% rename from trick_source/sim_services/Executive/design.dox_in rename to trick_source/sim_services/Executive/docs/design.dox_in diff --git a/trick_source/sim_services/Executive/main_page.dox_in b/trick_source/sim_services/Executive/docs/main_page.dox_in similarity index 100% rename from trick_source/sim_services/Executive/main_page.dox_in rename to trick_source/sim_services/Executive/docs/main_page.dox_in diff --git a/trick_source/sim_services/Executive/requirements.dox_in b/trick_source/sim_services/Executive/docs/requirements.dox_in similarity index 100% rename from trick_source/sim_services/Executive/requirements.dox_in rename to trick_source/sim_services/Executive/docs/requirements.dox_in diff --git a/trick_source/sim_services/Executive/src/fpe_handler.cpp b/trick_source/sim_services/Executive/fpe_handler.cpp similarity index 88% rename from trick_source/sim_services/Executive/src/fpe_handler.cpp rename to trick_source/sim_services/Executive/fpe_handler.cpp index ea5f626d..96311c29 100644 --- a/trick_source/sim_services/Executive/src/fpe_handler.cpp +++ b/trick_source/sim_services/Executive/fpe_handler.cpp @@ -15,8 +15,8 @@ #include <fenv.h> #endif -#include "sim_services/Executive/include/Executive.hh" -#include "sim_services/Executive/include/exec_proto.hh" +#include "trick/Executive.hh" +#include "trick/exec_proto.hh" /** * @relates Trick::Executive diff --git a/trick_source/sim_services/Executive/src/sig_hand.cpp b/trick_source/sim_services/Executive/sig_hand.cpp similarity index 92% rename from trick_source/sim_services/Executive/src/sig_hand.cpp rename to trick_source/sim_services/Executive/sig_hand.cpp index d2aca374..496cd024 100644 --- a/trick_source/sim_services/Executive/src/sig_hand.cpp +++ b/trick_source/sim_services/Executive/sig_hand.cpp @@ -21,8 +21,8 @@ #include <string.h> #include <signal.h> -#include "sim_services/Executive/include/Executive.hh" -#include "sim_services/Executive/include/exec_proto.hh" +#include "trick/Executive.hh" +#include "trick/exec_proto.hh" /** * @relates Trick::Executive diff --git a/trick_source/sim_services/Executive/src/makefile b/trick_source/sim_services/Executive/src/makefile deleted file mode 100644 index 753bd7f7..00000000 --- a/trick_source/sim_services/Executive/src/makefile +++ /dev/null @@ -1,6 +0,0 @@ - -all: - ${MAKE} -C .. - -clean: - ${MAKE} -C .. clean diff --git a/trick_source/sim_services/ExternalApplications/src/ExternalApplication.cpp b/trick_source/sim_services/ExternalApplications/ExternalApplication.cpp similarity index 94% rename from trick_source/sim_services/ExternalApplications/src/ExternalApplication.cpp rename to trick_source/sim_services/ExternalApplications/ExternalApplication.cpp index a4251254..73f19d60 100644 --- a/trick_source/sim_services/ExternalApplications/src/ExternalApplication.cpp +++ b/trick_source/sim_services/ExternalApplications/ExternalApplication.cpp @@ -10,11 +10,11 @@ #include "dmtcpaware.h" #endif -#include "sim_services/ExternalApplications/include/ExternalApplication.hh" -#include "sim_services/ExternalApplications/include/ExternalApplicationManager.hh" -#include "sim_services/VariableServer/include/variable_server_proto.h" -#include "sim_services/Environment/include/env_proto.h" -#include "sim_services/CommandLineArguments/include/command_line_protos.h" +#include "trick/ExternalApplication.hh" +#include "trick/ExternalApplicationManager.hh" +#include "trick/variable_server_proto.h" +#include "trick/env_proto.h" +#include "trick/command_line_protos.h" Trick::ExternalApplication::ExternalApplication() : command(std::string(env_get_var("TRICK_HOME") + std::string("/bin/"))) { diff --git a/trick_source/sim_services/ExternalApplications/src/ExternalApplicationManager.cpp b/trick_source/sim_services/ExternalApplications/ExternalApplicationManager.cpp similarity index 89% rename from trick_source/sim_services/ExternalApplications/src/ExternalApplicationManager.cpp rename to trick_source/sim_services/ExternalApplications/ExternalApplicationManager.cpp index 28631d6a..e636ca68 100644 --- a/trick_source/sim_services/ExternalApplications/src/ExternalApplicationManager.cpp +++ b/trick_source/sim_services/ExternalApplications/ExternalApplicationManager.cpp @@ -1,5 +1,5 @@ -#include "sim_services/ExternalApplications/include/ExternalApplicationManager.hh" -#include "sim_services/ExternalApplications/include/ExternalApplication.hh" +#include "trick/ExternalApplicationManager.hh" +#include "trick/ExternalApplication.hh" #include <vector> diff --git a/trick_source/sim_services/ExternalApplications/src/ExternalApplication_c_intf.cpp b/trick_source/sim_services/ExternalApplications/ExternalApplication_c_intf.cpp similarity index 96% rename from trick_source/sim_services/ExternalApplications/src/ExternalApplication_c_intf.cpp rename to trick_source/sim_services/ExternalApplications/ExternalApplication_c_intf.cpp index 14736da7..3e3651d3 100644 --- a/trick_source/sim_services/ExternalApplications/src/ExternalApplication_c_intf.cpp +++ b/trick_source/sim_services/ExternalApplications/ExternalApplication_c_intf.cpp @@ -3,12 +3,12 @@ #include <string> #include <typeinfo> -#include "sim_services/ExternalApplications/include/ExternalApplicationManager.hh" -#include "sim_services/ExternalApplications/include/SimControlPanel.hh" -#include "sim_services/ExternalApplications/include/TrickView.hh" -#include "sim_services/ExternalApplications/include/MalfunctionsTrickView.hh" -#include "sim_services/ExternalApplications/include/MonteMonitor.hh" -#include "sim_services/ExternalApplications/include/StripChart.hh" +#include "trick/ExternalApplicationManager.hh" +#include "trick/SimControlPanel.hh" +#include "trick/TrickView.hh" +#include "trick/MalfunctionsTrickView.hh" +#include "trick/MonteMonitor.hh" +#include "trick/StripChart.hh" static void *getFirstInstanceOfType(const std::type_info &type) { std::vector<Trick::ExternalApplication *> &externalApplications = diff --git a/trick_source/sim_services/ExternalApplications/Makefile b/trick_source/sim_services/ExternalApplications/Makefile index 7661be0e..7522d204 100644 --- a/trick_source/sim_services/ExternalApplications/Makefile +++ b/trick_source/sim_services/ExternalApplications/Makefile @@ -1,5 +1,5 @@ -include ${TRICK_HOME}/makefiles/Makefile.common -include ${TRICK_HOME}/makefiles/Makefile.tricklib +include ${TRICK_HOME}/share/trick/makefiles/Makefile.common +include ${TRICK_HOME}/share/trick/makefiles/Makefile.tricklib -include Makefile_deps ifneq ($(DMTCP),) diff --git a/trick_source/sim_services/ExternalApplications/Makefile_deps b/trick_source/sim_services/ExternalApplications/Makefile_deps new file mode 100644 index 00000000..15288673 --- /dev/null +++ b/trick_source/sim_services/ExternalApplications/Makefile_deps @@ -0,0 +1,33 @@ +object_${TRICK_HOST_CPU}/MonteMonitor.o: MonteMonitor.cpp \ + ${TRICK_HOME}/include/trick/MonteMonitor.hh \ + ${TRICK_HOME}/include/trick/ExternalApplication.hh +object_${TRICK_HOST_CPU}/ExternalApplication.o: ExternalApplication.cpp \ + ${TRICK_HOME}/include/trick/ExternalApplication.hh \ + ${TRICK_HOME}/include/trick/ExternalApplicationManager.hh \ + ${TRICK_HOME}/include/trick/variable_server_proto.h \ + ${TRICK_HOME}/include/trick/env_proto.h \ + ${TRICK_HOME}/include/trick/command_line_protos.h +object_${TRICK_HOST_CPU}/MalfunctionsTrickView.o: MalfunctionsTrickView.cpp \ + ${TRICK_HOME}/include/trick/MalfunctionsTrickView.hh \ + ${TRICK_HOME}/include/trick/ExternalApplication.hh +object_${TRICK_HOST_CPU}/ExternalApplicationManager.o: ExternalApplicationManager.cpp \ + ${TRICK_HOME}/include/trick/ExternalApplicationManager.hh \ + ${TRICK_HOME}/include/trick/ExternalApplication.hh +object_${TRICK_HOST_CPU}/TrickView.o: TrickView.cpp ${TRICK_HOME}/include/trick/TrickView.hh \ + ${TRICK_HOME}/include/trick/ExternalApplication.hh \ + ${TRICK_HOME}/include/trick/variable_server_proto.h +object_${TRICK_HOST_CPU}/ExternalApplication_c_intf.o: ExternalApplication_c_intf.cpp \ + ${TRICK_HOME}/include/trick/ExternalApplicationManager.hh \ + ${TRICK_HOME}/include/trick/ExternalApplication.hh \ + ${TRICK_HOME}/include/trick/SimControlPanel.hh \ + ${TRICK_HOME}/include/trick/TrickView.hh \ + ${TRICK_HOME}/include/trick/MalfunctionsTrickView.hh \ + ${TRICK_HOME}/include/trick/MonteMonitor.hh \ + ${TRICK_HOME}/include/trick/StripChart.hh +object_${TRICK_HOST_CPU}/SimControlPanel.o: SimControlPanel.cpp \ + ${TRICK_HOME}/include/trick/SimControlPanel.hh \ + ${TRICK_HOME}/include/trick/ExternalApplication.hh +object_${TRICK_HOST_CPU}/StripChart.o: StripChart.cpp \ + ${TRICK_HOME}/include/trick/StripChart.hh \ + ${TRICK_HOME}/include/trick/ExternalApplication.hh \ + ${TRICK_HOME}/include/trick/ExternalApplicationManager.hh diff --git a/trick_source/sim_services/ExternalApplications/src/MalfunctionsTrickView.cpp b/trick_source/sim_services/ExternalApplications/MalfunctionsTrickView.cpp similarity index 77% rename from trick_source/sim_services/ExternalApplications/src/MalfunctionsTrickView.cpp rename to trick_source/sim_services/ExternalApplications/MalfunctionsTrickView.cpp index f716ccf7..2b4799c4 100644 --- a/trick_source/sim_services/ExternalApplications/src/MalfunctionsTrickView.cpp +++ b/trick_source/sim_services/ExternalApplications/MalfunctionsTrickView.cpp @@ -1,10 +1,10 @@ #include <string> -#include "sim_services/ExternalApplications/include/MalfunctionsTrickView.hh" +#include "trick/MalfunctionsTrickView.hh" Trick::MalfunctionsTrickView::MalfunctionsTrickView() { - command += std::string("mtv"); + command += std::string("trick-mtv"); } std::string Trick::MalfunctionsTrickView::create_arguments_string() { diff --git a/trick_source/sim_services/ExternalApplications/MonteMonitor.cpp b/trick_source/sim_services/ExternalApplications/MonteMonitor.cpp new file mode 100644 index 00000000..a83f791a --- /dev/null +++ b/trick_source/sim_services/ExternalApplications/MonteMonitor.cpp @@ -0,0 +1,8 @@ + +#include <string> + +#include "trick/MonteMonitor.hh" + +Trick::MonteMonitor::MonteMonitor() { + command += std::string("trick-mm"); +} diff --git a/trick_source/sim_services/ExternalApplications/src/SimControlPanel.cpp b/trick_source/sim_services/ExternalApplications/SimControlPanel.cpp similarity index 79% rename from trick_source/sim_services/ExternalApplications/src/SimControlPanel.cpp rename to trick_source/sim_services/ExternalApplications/SimControlPanel.cpp index 7c2befd0..3327396b 100644 --- a/trick_source/sim_services/ExternalApplications/src/SimControlPanel.cpp +++ b/trick_source/sim_services/ExternalApplications/SimControlPanel.cpp @@ -1,10 +1,10 @@ #include <string> -#include "sim_services/ExternalApplications/include/SimControlPanel.hh" +#include "trick/SimControlPanel.hh" Trick::SimControlPanel::SimControlPanel() { - command += std::string("sim_control"); + command += std::string("trick-simcontrol"); auto_exit = false; } diff --git a/trick_source/sim_services/ExternalApplications/src/StripChart.cpp b/trick_source/sim_services/ExternalApplications/StripChart.cpp similarity index 82% rename from trick_source/sim_services/ExternalApplications/src/StripChart.cpp rename to trick_source/sim_services/ExternalApplications/StripChart.cpp index e31478dc..5a101f9c 100644 --- a/trick_source/sim_services/ExternalApplications/src/StripChart.cpp +++ b/trick_source/sim_services/ExternalApplications/StripChart.cpp @@ -1,11 +1,11 @@ #include <string> -#include "sim_services/ExternalApplications/include/StripChart.hh" -#include "sim_services/ExternalApplications/include/ExternalApplicationManager.hh" +#include "trick/StripChart.hh" +#include "trick/ExternalApplicationManager.hh" Trick::StripChart::StripChart() { - command += std::string("trick_stripchart"); + command += std::string("trick-stripchart"); file_set = false; } diff --git a/trick_source/sim_services/ExternalApplications/src/TrickView.cpp b/trick_source/sim_services/ExternalApplications/TrickView.cpp similarity index 90% rename from trick_source/sim_services/ExternalApplications/src/TrickView.cpp rename to trick_source/sim_services/ExternalApplications/TrickView.cpp index 4315f54e..94dbe347 100644 --- a/trick_source/sim_services/ExternalApplications/src/TrickView.cpp +++ b/trick_source/sim_services/ExternalApplications/TrickView.cpp @@ -2,11 +2,11 @@ #include <string> #include <iostream> -#include "sim_services/ExternalApplications/include/TrickView.hh" -#include "sim_services/VariableServer/include/variable_server_proto.h" +#include "trick/TrickView.hh" +#include "trick/variable_server_proto.h" Trick::TrickView::TrickView() { - command += std::string("tv"); + command += std::string("trick-tv"); strip_charts_only_set = open_file_set = open_set_file_set = set_file_set = false; } diff --git a/trick_source/sim_services/ExternalApplications/main_page.dox_in b/trick_source/sim_services/ExternalApplications/docs/main_page.dox_in similarity index 100% rename from trick_source/sim_services/ExternalApplications/main_page.dox_in rename to trick_source/sim_services/ExternalApplications/docs/main_page.dox_in diff --git a/trick_source/sim_services/ExternalApplications/mm.dox_in b/trick_source/sim_services/ExternalApplications/docs/mm.dox_in similarity index 100% rename from trick_source/sim_services/ExternalApplications/mm.dox_in rename to trick_source/sim_services/ExternalApplications/docs/mm.dox_in diff --git a/trick_source/sim_services/ExternalApplications/mtv.dox_in b/trick_source/sim_services/ExternalApplications/docs/mtv.dox_in similarity index 100% rename from trick_source/sim_services/ExternalApplications/mtv.dox_in rename to trick_source/sim_services/ExternalApplications/docs/mtv.dox_in diff --git a/trick_source/sim_services/ExternalApplications/scp.dox_in b/trick_source/sim_services/ExternalApplications/docs/scp.dox_in similarity index 100% rename from trick_source/sim_services/ExternalApplications/scp.dox_in rename to trick_source/sim_services/ExternalApplications/docs/scp.dox_in diff --git a/trick_source/sim_services/ExternalApplications/tv.dox_in b/trick_source/sim_services/ExternalApplications/docs/tv.dox_in similarity index 100% rename from trick_source/sim_services/ExternalApplications/tv.dox_in rename to trick_source/sim_services/ExternalApplications/docs/tv.dox_in diff --git a/trick_source/sim_services/ExternalApplications/src/MonteMonitor.cpp b/trick_source/sim_services/ExternalApplications/src/MonteMonitor.cpp deleted file mode 100644 index a8e5cffe..00000000 --- a/trick_source/sim_services/ExternalApplications/src/MonteMonitor.cpp +++ /dev/null @@ -1,8 +0,0 @@ - -#include <string> - -#include "sim_services/ExternalApplications/include/MonteMonitor.hh" - -Trick::MonteMonitor::MonteMonitor() { - command += std::string("mm"); -} diff --git a/trick_source/sim_services/FrameLog/src/FrameDataRecordGroup.cpp b/trick_source/sim_services/FrameLog/FrameDataRecordGroup.cpp similarity index 95% rename from trick_source/sim_services/FrameLog/src/FrameDataRecordGroup.cpp rename to trick_source/sim_services/FrameLog/FrameDataRecordGroup.cpp index 058d7e1d..ebcde4e1 100644 --- a/trick_source/sim_services/FrameLog/src/FrameDataRecordGroup.cpp +++ b/trick_source/sim_services/FrameLog/FrameDataRecordGroup.cpp @@ -1,8 +1,8 @@ #include <iostream> -#include "sim_services/FrameLog/include/FrameDataRecordGroup.hh" -#include "sim_services/Clock/include/clock_proto.h" -#include "sim_services/Executive/include/exec_proto.h" +#include "trick/FrameDataRecordGroup.hh" +#include "trick/clock_proto.h" +#include "trick/exec_proto.h" /** -# Creates frame timing jobs if this is not the main thread. diff --git a/trick_source/sim_services/FrameLog/src/FrameLog.cpp b/trick_source/sim_services/FrameLog/FrameLog.cpp similarity index 98% rename from trick_source/sim_services/FrameLog/src/FrameLog.cpp rename to trick_source/sim_services/FrameLog/FrameLog.cpp index ba165c86..dfa4e166 100644 --- a/trick_source/sim_services/FrameLog/src/FrameLog.cpp +++ b/trick_source/sim_services/FrameLog/FrameLog.cpp @@ -7,15 +7,15 @@ #include <sys/types.h> #include <errno.h> -#include "sim_services/FrameLog/include/FrameLog.hh" -#include "sim_services/FrameLog/include/FrameDataRecordGroup.hh" -#include "sim_services/Executive/include/exec_proto.hh" -#include "sim_services/Executive/include/exec_proto.h" -#include "sim_services/Clock/include/clock_proto.h" -#include "sim_services/DataRecord/include/data_record_proto.h" -#include "sim_services/CommandLineArguments/include/command_line_protos.h" -#include "sim_services/Message/include/message_proto.h" -#include "sim_services/Message/include/message_type.h" +#include "trick/FrameLog.hh" +#include "trick/FrameDataRecordGroup.hh" +#include "trick/exec_proto.hh" +#include "trick/exec_proto.h" +#include "trick/clock_proto.h" +#include "trick/data_record_proto.h" +#include "trick/command_line_protos.h" +#include "trick/message_proto.h" +#include "trick/message_type.h" Trick::FrameLog * the_fl = NULL ; diff --git a/trick_source/sim_services/FrameLog/src/FrameLog_c_intf.cpp b/trick_source/sim_services/FrameLog/FrameLog_c_intf.cpp similarity index 95% rename from trick_source/sim_services/FrameLog/src/FrameLog_c_intf.cpp rename to trick_source/sim_services/FrameLog/FrameLog_c_intf.cpp index aabaa3c9..a13deb8f 100644 --- a/trick_source/sim_services/FrameLog/src/FrameLog_c_intf.cpp +++ b/trick_source/sim_services/FrameLog/FrameLog_c_intf.cpp @@ -1,5 +1,5 @@ #include <stdio.h> -#include "sim_services/FrameLog/include/FrameLog.hh" +#include "trick/FrameLog.hh" /* Global singleton pointer to the framelog class */ extern Trick::FrameLog * the_fl ; diff --git a/trick_source/sim_services/FrameLog/Makefile b/trick_source/sim_services/FrameLog/Makefile index 3029433b..a181cedf 100644 --- a/trick_source/sim_services/FrameLog/Makefile +++ b/trick_source/sim_services/FrameLog/Makefile @@ -1,5 +1,5 @@ -include ${TRICK_HOME}/makefiles/Makefile.common -include ${TRICK_HOME}/makefiles/Makefile.tricklib +include ${TRICK_HOME}/share/trick/makefiles/Makefile.common +include ${TRICK_HOME}/share/trick/makefiles/Makefile.tricklib -include Makefile_deps diff --git a/trick_source/sim_services/FrameLog/Makefile_deps b/trick_source/sim_services/FrameLog/Makefile_deps index 2a6427e9..07488081 100644 --- a/trick_source/sim_services/FrameLog/Makefile_deps +++ b/trick_source/sim_services/FrameLog/Makefile_deps @@ -1,35 +1,80 @@ -object_${TRICK_HOST_CPU}/FrameLog.o: src/FrameLog.cpp \ - ${TRICK_HOME}/trick_source/sim_services/FrameLog/include/FrameLog.hh \ - ${TRICK_HOME}/trick_source/sim_services/DataRecord/include/DataRecordGroup.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/SimObject.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/JobData.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/InstrumentBase.hh \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/reference.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/attributes.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/parameter_types.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/value.h \ - ${TRICK_HOME}/trick_source/trick_utils/trick_adt/include/dllist.h \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/exec_proto.hh \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/Executive.hh \ - ${TRICK_HOME}/trick_source/sim_services/Scheduler/include/Scheduler.hh \ - ${TRICK_HOME}/trick_source/sim_services/ScheduledJobQueue/include/ScheduledJobQueue.hh \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/Threads.hh \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/sim_mode.h \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/exec_proto.h \ - ${TRICK_HOME}/trick_source/sim_services/Clock/include/clock_proto.h \ - ${TRICK_HOME}/trick_source/sim_services/DataRecord/include/data_record_proto.h \ - ${TRICK_HOME}/trick_source/sim_services/CommandLineArguments/include/command_line_protos.h \ - ${TRICK_HOME}/trick_source/sim_services/DataRecord/include/DRBinary.hh \ - ${TRICK_HOME}/trick_source/sim_services/Message/include/message_proto.h \ - ${TRICK_HOME}/trick_source/sim_services/Message/include/message_type.h -object_${TRICK_HOST_CPU}/FrameLog_c_intf.o: src/FrameLog_c_intf.cpp \ - ${TRICK_HOME}/trick_source/sim_services/FrameLog/include/FrameLog.hh \ - ${TRICK_HOME}/trick_source/sim_services/DataRecord/include/DataRecordGroup.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/SimObject.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/JobData.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/InstrumentBase.hh \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/reference.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/attributes.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/parameter_types.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/value.h \ - ${TRICK_HOME}/trick_source/trick_utils/trick_adt/include/dllist.h +object_${TRICK_HOST_CPU}/FrameDataRecordGroup.o: FrameDataRecordGroup.cpp \ + ${TRICK_HOME}/include/trick/FrameDataRecordGroup.hh \ + ${TRICK_HOME}/include/trick/DRBinary.hh \ + ${TRICK_HOME}/include/trick/DataRecordGroup.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/JobData.hh \ + ${TRICK_HOME}/include/trick/InstrumentBase.hh \ + ${TRICK_HOME}/include/trick/reference.h \ + ${TRICK_HOME}/include/trick/attributes.h \ + ${TRICK_HOME}/include/trick/parameter_types.h \ + ${TRICK_HOME}/include/trick/value.h \ + ${TRICK_HOME}/include/trick/dllist.h \ + ${TRICK_HOME}/include/trick/mm_macros.hh \ + ${TRICK_HOME}/include/trick/memorymanager_c_intf.h \ + ${TRICK_HOME}/include/trick/var.h \ + ${TRICK_HOME}/include/trick/io_alloc.h \ + ${TRICK_HOME}/include/trick/MemoryManager.hh \ + ${TRICK_HOME}/include/trick/mm_error.h \ + ${TRICK_HOME}/include/trick/CheckPointAgent.hh \ + ${TRICK_HOME}/include/trick/UCFn.hh \ + ${TRICK_HOME}/include/trick/clock_proto.h \ + ${TRICK_HOME}/include/trick/exec_proto.h \ + ${TRICK_HOME}/include/trick/sim_mode.h +object_${TRICK_HOST_CPU}/FrameLog.o: FrameLog.cpp ${TRICK_HOME}/include/trick/FrameLog.hh \ + ${TRICK_HOME}/include/trick/FrameDataRecordGroup.hh \ + ${TRICK_HOME}/include/trick/DRBinary.hh \ + ${TRICK_HOME}/include/trick/DataRecordGroup.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/JobData.hh \ + ${TRICK_HOME}/include/trick/InstrumentBase.hh \ + ${TRICK_HOME}/include/trick/reference.h \ + ${TRICK_HOME}/include/trick/attributes.h \ + ${TRICK_HOME}/include/trick/parameter_types.h \ + ${TRICK_HOME}/include/trick/value.h \ + ${TRICK_HOME}/include/trick/dllist.h \ + ${TRICK_HOME}/include/trick/mm_macros.hh \ + ${TRICK_HOME}/include/trick/memorymanager_c_intf.h \ + ${TRICK_HOME}/include/trick/var.h \ + ${TRICK_HOME}/include/trick/io_alloc.h \ + ${TRICK_HOME}/include/trick/MemoryManager.hh \ + ${TRICK_HOME}/include/trick/mm_error.h \ + ${TRICK_HOME}/include/trick/CheckPointAgent.hh \ + ${TRICK_HOME}/include/trick/UCFn.hh \ + ${TRICK_HOME}/include/trick/exec_proto.hh \ + ${TRICK_HOME}/include/trick/Executive.hh \ + ${TRICK_HOME}/include/trick/Scheduler.hh \ + ${TRICK_HOME}/include/trick/ScheduledJobQueue.hh \ + ${TRICK_HOME}/include/trick/ScheduledJobQueue.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/Threads.hh \ + ${TRICK_HOME}/include/trick/ThreadBase.hh \ + ${TRICK_HOME}/include/trick/sim_mode.h \ + ${TRICK_HOME}/include/trick/exec_proto.h \ + ${TRICK_HOME}/include/trick/sim_mode.h \ + ${TRICK_HOME}/include/trick/clock_proto.h \ + ${TRICK_HOME}/include/trick/data_record_proto.h \ + ${TRICK_HOME}/include/trick/command_line_protos.h \ + ${TRICK_HOME}/include/trick/message_proto.h \ + ${TRICK_HOME}/include/trick/message_type.h +object_${TRICK_HOST_CPU}/FrameLog_c_intf.o: FrameLog_c_intf.cpp \ + ${TRICK_HOME}/include/trick/FrameLog.hh \ + ${TRICK_HOME}/include/trick/FrameDataRecordGroup.hh \ + ${TRICK_HOME}/include/trick/DRBinary.hh \ + ${TRICK_HOME}/include/trick/DataRecordGroup.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/JobData.hh \ + ${TRICK_HOME}/include/trick/InstrumentBase.hh \ + ${TRICK_HOME}/include/trick/reference.h \ + ${TRICK_HOME}/include/trick/attributes.h \ + ${TRICK_HOME}/include/trick/parameter_types.h \ + ${TRICK_HOME}/include/trick/value.h \ + ${TRICK_HOME}/include/trick/dllist.h \ + ${TRICK_HOME}/include/trick/mm_macros.hh \ + ${TRICK_HOME}/include/trick/memorymanager_c_intf.h \ + ${TRICK_HOME}/include/trick/var.h \ + ${TRICK_HOME}/include/trick/io_alloc.h \ + ${TRICK_HOME}/include/trick/MemoryManager.hh \ + ${TRICK_HOME}/include/trick/mm_error.h \ + ${TRICK_HOME}/include/trick/CheckPointAgent.hh \ + ${TRICK_HOME}/include/trick/UCFn.hh diff --git a/trick_source/sim_services/FrameLog/main_page.dox_in b/trick_source/sim_services/FrameLog/docs/main_page.dox_in similarity index 100% rename from trick_source/sim_services/FrameLog/main_page.dox_in rename to trick_source/sim_services/FrameLog/docs/main_page.dox_in diff --git a/trick_source/sim_services/FrameLog/src/makefile b/trick_source/sim_services/FrameLog/src/makefile deleted file mode 100644 index 753bd7f7..00000000 --- a/trick_source/sim_services/FrameLog/src/makefile +++ /dev/null @@ -1,6 +0,0 @@ - -all: - ${MAKE} -C .. - -clean: - ${MAKE} -C .. clean diff --git a/trick_source/sim_services/InputProcessor/src/IPPython.cpp b/trick_source/sim_services/InputProcessor/IPPython.cpp similarity index 96% rename from trick_source/sim_services/InputProcessor/src/IPPython.cpp rename to trick_source/sim_services/InputProcessor/IPPython.cpp index 5e2b53bb..24414b92 100644 --- a/trick_source/sim_services/InputProcessor/src/IPPython.cpp +++ b/trick_source/sim_services/InputProcessor/IPPython.cpp @@ -17,10 +17,10 @@ #include <unistd.h> #include <string.h> -#include "sim_services/InputProcessor/include/IPPython.hh" -#include "sim_services/MemoryManager/include/MemoryManager.hh" -#include "sim_services/Executive/include/exec_proto.hh" -#include "sim_services/Executive/include/exec_proto.h" +#include "trick/IPPython.hh" +#include "trick/MemoryManager.hh" +#include "trick/exec_proto.hh" +#include "trick/exec_proto.h" Trick::IPPython * the_pip ; diff --git a/trick_source/sim_services/InputProcessor/src/IPPythonEvent.cpp b/trick_source/sim_services/InputProcessor/IPPythonEvent.cpp similarity index 97% rename from trick_source/sim_services/InputProcessor/src/IPPythonEvent.cpp rename to trick_source/sim_services/InputProcessor/IPPythonEvent.cpp index cf304dff..14604ad1 100644 --- a/trick_source/sim_services/InputProcessor/src/IPPythonEvent.cpp +++ b/trick_source/sim_services/InputProcessor/IPPythonEvent.cpp @@ -12,14 +12,14 @@ #include <stdlib.h> #include <string.h> -#include "sim_services/InputProcessor/include/IPPythonEvent.hh" -#include "sim_services/InputProcessor/include/IPPython.hh" -#include "sim_services/MemoryManager/include/MemoryManager.hh" -#include "sim_services/Executive/include/exec_proto.h" -#include "sim_services/Message/include/message_proto.h" -#include "sim_services/Message/include/message_type.h" -#include "sim_services/MemoryManager/include/memorymanager_c_intf.h" -#include "sim_services/Executive/include/exec_proto.hh" +#include "trick/IPPythonEvent.hh" +#include "trick/IPPython.hh" +#include "trick/MemoryManager.hh" +#include "trick/exec_proto.h" +#include "trick/message_proto.h" +#include "trick/message_type.h" +#include "trick/memorymanager_c_intf.h" +#include "trick/exec_proto.hh" /* Global singleton pointer to the memory manager */ //TODO Use external MM interface diff --git a/trick_source/sim_services/InputProcessor/src/InputProcessor.cpp b/trick_source/sim_services/InputProcessor/InputProcessor.cpp similarity index 88% rename from trick_source/sim_services/InputProcessor/src/InputProcessor.cpp rename to trick_source/sim_services/InputProcessor/InputProcessor.cpp index 859f05ad..a81b6eb4 100644 --- a/trick_source/sim_services/InputProcessor/src/InputProcessor.cpp +++ b/trick_source/sim_services/InputProcessor/InputProcessor.cpp @@ -14,8 +14,8 @@ #include <iostream> #include <string.h> -#include "sim_services/InputProcessor/include/InputProcessor.hh" -#include "sim_services/CommandLineArguments/include/command_line_protos.h" +#include "trick/InputProcessor.hh" +#include "trick/command_line_protos.h" Trick::InputProcessor * the_ip ; diff --git a/trick_source/sim_services/InputProcessor/src/MTV.cpp b/trick_source/sim_services/InputProcessor/MTV.cpp similarity index 94% rename from trick_source/sim_services/InputProcessor/src/MTV.cpp rename to trick_source/sim_services/InputProcessor/MTV.cpp index 6629aee9..560ecfb0 100644 --- a/trick_source/sim_services/InputProcessor/src/MTV.cpp +++ b/trick_source/sim_services/InputProcessor/MTV.cpp @@ -1,9 +1,9 @@ #include <iostream> -#include "sim_services/InputProcessor/include/MTV.hh" -#include "sim_services/VariableServer/include/VariableServer.hh" -#include "sim_services/EventManager/include/EventManager_c_intf.hh" +#include "trick/MTV.hh" +#include "trick/VariableServer.hh" +#include "trick/EventManager_c_intf.hh" Trick::MTV * the_mtv ; diff --git a/trick_source/sim_services/InputProcessor/src/MTV_c_intf.cpp b/trick_source/sim_services/InputProcessor/MTV_c_intf.cpp similarity index 94% rename from trick_source/sim_services/InputProcessor/src/MTV_c_intf.cpp rename to trick_source/sim_services/InputProcessor/MTV_c_intf.cpp index 1a1c43ce..c785a6a3 100644 --- a/trick_source/sim_services/InputProcessor/src/MTV_c_intf.cpp +++ b/trick_source/sim_services/InputProcessor/MTV_c_intf.cpp @@ -1,5 +1,5 @@ -#include "sim_services/InputProcessor/include/MTV.hh" +#include "trick/MTV.hh" extern Trick::MTV * the_mtv ; diff --git a/trick_source/sim_services/InputProcessor/Makefile b/trick_source/sim_services/InputProcessor/Makefile index 2280089b..daf1f688 100644 --- a/trick_source/sim_services/InputProcessor/Makefile +++ b/trick_source/sim_services/InputProcessor/Makefile @@ -1,9 +1,9 @@ -include ${TRICK_HOME}/makefiles/Makefile.common +include ${TRICK_HOME}/share/trick/makefiles/Makefile.common # override the trick lib file for this directory. TRICK_LIB := $(TRICK_LIB_DIR)/libtrick_pyip.a -include ${TRICK_HOME}/makefiles/Makefile.tricklib +include ${TRICK_HOME}/share/trick/makefiles/Makefile.tricklib TRICK_CFLAGS += $(PYTHON_INCLUDES) TRICK_CXXFLAGS += $(PYTHON_INCLUDES) diff --git a/trick_source/sim_services/InputProcessor/Makefile_deps b/trick_source/sim_services/InputProcessor/Makefile_deps index f2607db7..59421bf3 100644 --- a/trick_source/sim_services/InputProcessor/Makefile_deps +++ b/trick_source/sim_services/InputProcessor/Makefile_deps @@ -1,130 +1,175 @@ -object_${TRICK_HOST_CPU}/IPPython.o: src/IPPython.cpp \ - ${TRICK_HOME}/trick_source/sim_services/InputProcessor/include/IPPython.hh \ - ${TRICK_HOME}/trick_source/sim_services/InputProcessor/include/InputProcessor.hh \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/MemoryManager.hh \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/attributes.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/parameter_types.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/reference.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/value.h \ - ${TRICK_HOME}/trick_source/trick_utils/trick_adt/include/dllist.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/io_alloc.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/mm_error.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/var.h \ - ${TRICK_HOME}/trick_source/sim_services/CheckPointAgent/include/CheckPointAgent.hh \ - ${TRICK_HOME}/trick_source/trick_utils/units/include/UCFn.hh \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/exec_proto.hh \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/Executive.hh \ - ${TRICK_HOME}/trick_source/sim_services/Scheduler/include/Scheduler.hh \ - ${TRICK_HOME}/trick_source/sim_services/ScheduledJobQueue/include/ScheduledJobQueue.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/JobData.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/InstrumentBase.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/SimObject.hh \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/Threads.hh \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/sim_mode.h \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/exec_proto.h -object_${TRICK_HOST_CPU}/IPPythonEvent.o: src/IPPythonEvent.cpp \ - ${TRICK_HOME}/trick_source/sim_services/InputProcessor/include/IPPythonEvent.hh \ - ${TRICK_HOME}/trick_source/sim_services/EventManager/include/Event.hh \ - ${TRICK_HOME}/trick_source/sim_services/include/mm_macros.hh \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/memorymanager_c_intf.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/parameter_types.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/attributes.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/reference.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/value.h \ - ${TRICK_HOME}/trick_source/trick_utils/trick_adt/include/dllist.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/var.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/io_alloc.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/MemoryManager.hh \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/mm_error.h \ - ${TRICK_HOME}/trick_source/sim_services/CheckPointAgent/include/CheckPointAgent.hh \ - ${TRICK_HOME}/trick_source/trick_utils/units/include/UCFn.hh \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/exec_proto.h \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/sim_mode.h \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/JobData.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/InstrumentBase.hh \ - ${TRICK_HOME}/trick_source/sim_services/InputProcessor/include/IPPython.hh \ - ${TRICK_HOME}/trick_source/sim_services/InputProcessor/include/InputProcessor.hh \ - ${TRICK_HOME}/trick_source/sim_services/Message/include/message_proto.h \ - ${TRICK_HOME}/trick_source/sim_services/Message/include/message_type.h \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/exec_proto.hh \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/Executive.hh \ - ${TRICK_HOME}/trick_source/sim_services/Scheduler/include/Scheduler.hh \ - ${TRICK_HOME}/trick_source/sim_services/ScheduledJobQueue/include/ScheduledJobQueue.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/SimObject.hh \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/Threads.hh -object_${TRICK_HOST_CPU}/InputProcessor.o: src/InputProcessor.cpp \ - ${TRICK_HOME}/trick_source/sim_services/InputProcessor/include/InputProcessor.hh \ - ${TRICK_HOME}/trick_source/sim_services/CommandLineArguments/include/command_line_protos.h -object_${TRICK_HOST_CPU}/MTV.o: src/MTV.cpp \ - ${TRICK_HOME}/trick_source/sim_services/InputProcessor/include/MTV.hh \ - ${TRICK_HOME}/trick_source/sim_services/InputProcessor/include/IPPythonEvent.hh \ - ${TRICK_HOME}/trick_source/sim_services/EventManager/include/Event.hh \ - ${TRICK_HOME}/trick_source/sim_services/include/mm_macros.hh \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/memorymanager_c_intf.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/parameter_types.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/attributes.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/reference.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/value.h \ - ${TRICK_HOME}/trick_source/trick_utils/trick_adt/include/dllist.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/var.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/io_alloc.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/MemoryManager.hh \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/mm_error.h \ - ${TRICK_HOME}/trick_source/sim_services/CheckPointAgent/include/CheckPointAgent.hh \ - ${TRICK_HOME}/trick_source/trick_utils/units/include/UCFn.hh \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/exec_proto.h \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/sim_mode.h \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/JobData.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/InstrumentBase.hh \ - ${TRICK_HOME}/trick_source/sim_services/VariableServer/include/VariableServer.hh \ - ${TRICK_HOME}/trick_source/trick_utils/comm/include/tc.h \ - ${TRICK_HOME}/trick_source/trick_utils/comm/include/trick_byteswap.h \ - ${TRICK_HOME}/trick_source/trick_utils/comm/include/trick_error_hndlr.h \ - ${TRICK_HOME}/trick_source/sim_services/VariableServer/include/variable_server_sync_types.h \ - ${TRICK_HOME}/trick_source/sim_services/EventManager/include/EventManager_c_intf.hh -object_${TRICK_HOST_CPU}/MTV_c_intf.o: src/MTV_c_intf.cpp \ - ${TRICK_HOME}/trick_source/sim_services/InputProcessor/include/MTV.hh \ - ${TRICK_HOME}/trick_source/sim_services/InputProcessor/include/IPPythonEvent.hh \ - ${TRICK_HOME}/trick_source/sim_services/EventManager/include/Event.hh \ - ${TRICK_HOME}/trick_source/sim_services/include/mm_macros.hh \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/memorymanager_c_intf.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/parameter_types.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/attributes.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/reference.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/value.h \ - ${TRICK_HOME}/trick_source/trick_utils/trick_adt/include/dllist.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/var.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/io_alloc.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/MemoryManager.hh \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/mm_error.h \ - ${TRICK_HOME}/trick_source/sim_services/CheckPointAgent/include/CheckPointAgent.hh \ - ${TRICK_HOME}/trick_source/trick_utils/units/include/UCFn.hh \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/exec_proto.h \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/sim_mode.h \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/JobData.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/InstrumentBase.hh -object_${TRICK_HOST_CPU}/input_processor_ext.o: src/input_processor_ext.cpp \ - ${TRICK_HOME}/trick_source/sim_services/InputProcessor/include/input_processor_proto.h \ - ${TRICK_HOME}/trick_source/sim_services/InputProcessor/include/IPPythonEvent.hh \ - ${TRICK_HOME}/trick_source/sim_services/EventManager/include/Event.hh \ - ${TRICK_HOME}/trick_source/sim_services/include/mm_macros.hh \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/memorymanager_c_intf.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/parameter_types.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/attributes.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/reference.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/value.h \ - ${TRICK_HOME}/trick_source/trick_utils/trick_adt/include/dllist.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/var.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/io_alloc.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/MemoryManager.hh \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/mm_error.h \ - ${TRICK_HOME}/trick_source/sim_services/CheckPointAgent/include/CheckPointAgent.hh \ - ${TRICK_HOME}/trick_source/trick_utils/units/include/UCFn.hh \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/exec_proto.h \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/sim_mode.h \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/JobData.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/InstrumentBase.hh \ - ${TRICK_HOME}/trick_source/sim_services/InputProcessor/include/IPPython.hh \ - ${TRICK_HOME}/trick_source/sim_services/InputProcessor/include/InputProcessor.hh \ - ${TRICK_HOME}/trick_source/sim_services/InputProcessor/include/MTV.hh \ - ${TRICK_HOME}/trick_source/sim_services/EventManager/include/EventManager_c_intf.hh +object_${TRICK_HOST_CPU}/IPPythonEvent.o: IPPythonEvent.cpp \ + ${TRICK_HOME}/include/trick/IPPythonEvent.hh \ + ${TRICK_HOME}/include/trick/Event.hh \ + ${TRICK_HOME}/include/trick/mm_macros.hh \ + ${TRICK_HOME}/include/trick/memorymanager_c_intf.h \ + ${TRICK_HOME}/include/trick/parameter_types.h \ + ${TRICK_HOME}/include/trick/attributes.h \ + ${TRICK_HOME}/include/trick/reference.h \ + ${TRICK_HOME}/include/trick/value.h \ + ${TRICK_HOME}/include/trick/dllist.h \ + ${TRICK_HOME}/include/trick/var.h \ + ${TRICK_HOME}/include/trick/io_alloc.h \ + ${TRICK_HOME}/include/trick/MemoryManager.hh \ + ${TRICK_HOME}/include/trick/mm_error.h \ + ${TRICK_HOME}/include/trick/CheckPointAgent.hh \ + ${TRICK_HOME}/include/trick/UCFn.hh \ + ${TRICK_HOME}/include/trick/exec_proto.h \ + ${TRICK_HOME}/include/trick/sim_mode.h \ + ${TRICK_HOME}/include/trick/JobData.hh \ + ${TRICK_HOME}/include/trick/InstrumentBase.hh \ + ${TRICK_HOME}/include/trick/IPPython.hh \ + ${TRICK_HOME}/include/trick/InputProcessor.hh \ + ${TRICK_HOME}/include/trick/message_proto.h \ + ${TRICK_HOME}/include/trick/message_type.h \ + ${TRICK_HOME}/include/trick/exec_proto.hh \ + ${TRICK_HOME}/include/trick/Executive.hh \ + ${TRICK_HOME}/include/trick/Scheduler.hh \ + ${TRICK_HOME}/include/trick/ScheduledJobQueue.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/ScheduledJobQueue.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/Threads.hh \ + ${TRICK_HOME}/include/trick/ThreadBase.hh \ + ${TRICK_HOME}/include/trick/sim_mode.h +object_${TRICK_HOST_CPU}/InputProcessor.o: InputProcessor.cpp \ + ${TRICK_HOME}/include/trick/InputProcessor.hh \ + ${TRICK_HOME}/include/trick/command_line_protos.h +object_${TRICK_HOST_CPU}/IPPython.o: IPPython.cpp /usr/include/python2.7/Python.h \ + /usr/include/python2.7/patchlevel.h /usr/include/python2.7/pyconfig.h \ + /usr/include/python2.7/pyconfig-64.h \ + /usr/include/python2.7/pymacconfig.h /usr/include/python2.7/pyport.h \ + /usr/include/python2.7/pymath.h /usr/include/python2.7/pymem.h \ + /usr/include/python2.7/object.h /usr/include/python2.7/objimpl.h \ + /usr/include/python2.7/pydebug.h /usr/include/python2.7/unicodeobject.h \ + /usr/include/python2.7/intobject.h /usr/include/python2.7/boolobject.h \ + /usr/include/python2.7/longobject.h /usr/include/python2.7/floatobject.h \ + /usr/include/python2.7/complexobject.h \ + /usr/include/python2.7/rangeobject.h \ + /usr/include/python2.7/stringobject.h \ + /usr/include/python2.7/memoryobject.h \ + /usr/include/python2.7/bufferobject.h \ + /usr/include/python2.7/bytesobject.h \ + /usr/include/python2.7/bytearrayobject.h \ + /usr/include/python2.7/tupleobject.h /usr/include/python2.7/listobject.h \ + /usr/include/python2.7/dictobject.h /usr/include/python2.7/enumobject.h \ + /usr/include/python2.7/setobject.h /usr/include/python2.7/methodobject.h \ + /usr/include/python2.7/moduleobject.h \ + /usr/include/python2.7/funcobject.h /usr/include/python2.7/classobject.h \ + /usr/include/python2.7/fileobject.h /usr/include/python2.7/cobject.h \ + /usr/include/python2.7/pycapsule.h /usr/include/python2.7/traceback.h \ + /usr/include/python2.7/sliceobject.h /usr/include/python2.7/cellobject.h \ + /usr/include/python2.7/iterobject.h /usr/include/python2.7/genobject.h \ + /usr/include/python2.7/descrobject.h /usr/include/python2.7/warnings.h \ + /usr/include/python2.7/weakrefobject.h /usr/include/python2.7/codecs.h \ + /usr/include/python2.7/pyerrors.h /usr/include/python2.7/pystate.h \ + /usr/include/python2.7/pyarena.h /usr/include/python2.7/modsupport.h \ + /usr/include/python2.7/pythonrun.h /usr/include/python2.7/ceval.h \ + /usr/include/python2.7/sysmodule.h /usr/include/python2.7/intrcheck.h \ + /usr/include/python2.7/import.h /usr/include/python2.7/abstract.h \ + /usr/include/python2.7/compile.h /usr/include/python2.7/code.h \ + /usr/include/python2.7/eval.h /usr/include/python2.7/pyctype.h \ + /usr/include/python2.7/pystrtod.h /usr/include/python2.7/pystrcmp.h \ + /usr/include/python2.7/dtoa.h /usr/include/python2.7/pyfpe.h \ + ${TRICK_HOME}/include/trick/IPPython.hh \ + ${TRICK_HOME}/include/trick/InputProcessor.hh \ + ${TRICK_HOME}/include/trick/MemoryManager.hh \ + ${TRICK_HOME}/include/trick/attributes.h \ + ${TRICK_HOME}/include/trick/parameter_types.h \ + ${TRICK_HOME}/include/trick/reference.h \ + ${TRICK_HOME}/include/trick/value.h \ + ${TRICK_HOME}/include/trick/dllist.h \ + ${TRICK_HOME}/include/trick/io_alloc.h \ + ${TRICK_HOME}/include/trick/mm_error.h \ + ${TRICK_HOME}/include/trick/var.h \ + ${TRICK_HOME}/include/trick/CheckPointAgent.hh \ + ${TRICK_HOME}/include/trick/UCFn.hh \ + ${TRICK_HOME}/include/trick/exec_proto.hh \ + ${TRICK_HOME}/include/trick/Executive.hh \ + ${TRICK_HOME}/include/trick/Scheduler.hh \ + ${TRICK_HOME}/include/trick/ScheduledJobQueue.hh \ + ${TRICK_HOME}/include/trick/JobData.hh \ + ${TRICK_HOME}/include/trick/InstrumentBase.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/ScheduledJobQueue.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/Threads.hh \ + ${TRICK_HOME}/include/trick/ThreadBase.hh \ + ${TRICK_HOME}/include/trick/sim_mode.h \ + ${TRICK_HOME}/include/trick/exec_proto.h \ + ${TRICK_HOME}/include/trick/sim_mode.h +object_${TRICK_HOST_CPU}/MTV_c_intf.o: MTV_c_intf.cpp ${TRICK_HOME}/include/trick/MTV.hh \ + ${TRICK_HOME}/include/trick/IPPythonEvent.hh \ + ${TRICK_HOME}/include/trick/Event.hh \ + ${TRICK_HOME}/include/trick/mm_macros.hh \ + ${TRICK_HOME}/include/trick/memorymanager_c_intf.h \ + ${TRICK_HOME}/include/trick/parameter_types.h \ + ${TRICK_HOME}/include/trick/attributes.h \ + ${TRICK_HOME}/include/trick/reference.h \ + ${TRICK_HOME}/include/trick/value.h \ + ${TRICK_HOME}/include/trick/dllist.h \ + ${TRICK_HOME}/include/trick/var.h \ + ${TRICK_HOME}/include/trick/io_alloc.h \ + ${TRICK_HOME}/include/trick/MemoryManager.hh \ + ${TRICK_HOME}/include/trick/mm_error.h \ + ${TRICK_HOME}/include/trick/CheckPointAgent.hh \ + ${TRICK_HOME}/include/trick/UCFn.hh \ + ${TRICK_HOME}/include/trick/exec_proto.h \ + ${TRICK_HOME}/include/trick/sim_mode.h \ + ${TRICK_HOME}/include/trick/JobData.hh \ + ${TRICK_HOME}/include/trick/InstrumentBase.hh +object_${TRICK_HOST_CPU}/input_processor_ext.o: input_processor_ext.cpp \ + ${TRICK_HOME}/include/trick/input_processor_proto.h \ + ${TRICK_HOME}/include/trick/IPPython.hh \ + ${TRICK_HOME}/include/trick/InputProcessor.hh \ + ${TRICK_HOME}/include/trick/IPPythonEvent.hh \ + ${TRICK_HOME}/include/trick/Event.hh \ + ${TRICK_HOME}/include/trick/mm_macros.hh \ + ${TRICK_HOME}/include/trick/memorymanager_c_intf.h \ + ${TRICK_HOME}/include/trick/parameter_types.h \ + ${TRICK_HOME}/include/trick/attributes.h \ + ${TRICK_HOME}/include/trick/reference.h \ + ${TRICK_HOME}/include/trick/value.h \ + ${TRICK_HOME}/include/trick/dllist.h \ + ${TRICK_HOME}/include/trick/var.h \ + ${TRICK_HOME}/include/trick/io_alloc.h \ + ${TRICK_HOME}/include/trick/MemoryManager.hh \ + ${TRICK_HOME}/include/trick/mm_error.h \ + ${TRICK_HOME}/include/trick/CheckPointAgent.hh \ + ${TRICK_HOME}/include/trick/UCFn.hh \ + ${TRICK_HOME}/include/trick/exec_proto.h \ + ${TRICK_HOME}/include/trick/sim_mode.h \ + ${TRICK_HOME}/include/trick/JobData.hh \ + ${TRICK_HOME}/include/trick/InstrumentBase.hh \ + ${TRICK_HOME}/include/trick/MTV.hh \ + ${TRICK_HOME}/include/trick/EventManager_c_intf.hh +object_${TRICK_HOST_CPU}/MTV.o: MTV.cpp ${TRICK_HOME}/include/trick/MTV.hh \ + ${TRICK_HOME}/include/trick/IPPythonEvent.hh \ + ${TRICK_HOME}/include/trick/Event.hh \ + ${TRICK_HOME}/include/trick/mm_macros.hh \ + ${TRICK_HOME}/include/trick/memorymanager_c_intf.h \ + ${TRICK_HOME}/include/trick/parameter_types.h \ + ${TRICK_HOME}/include/trick/attributes.h \ + ${TRICK_HOME}/include/trick/reference.h \ + ${TRICK_HOME}/include/trick/value.h \ + ${TRICK_HOME}/include/trick/dllist.h \ + ${TRICK_HOME}/include/trick/var.h \ + ${TRICK_HOME}/include/trick/io_alloc.h \ + ${TRICK_HOME}/include/trick/MemoryManager.hh \ + ${TRICK_HOME}/include/trick/mm_error.h \ + ${TRICK_HOME}/include/trick/CheckPointAgent.hh \ + ${TRICK_HOME}/include/trick/UCFn.hh \ + ${TRICK_HOME}/include/trick/exec_proto.h \ + ${TRICK_HOME}/include/trick/sim_mode.h \ + ${TRICK_HOME}/include/trick/JobData.hh \ + ${TRICK_HOME}/include/trick/InstrumentBase.hh \ + ${TRICK_HOME}/include/trick/VariableServer.hh \ + ${TRICK_HOME}/include/trick/tc.h \ + ${TRICK_HOME}/include/trick/trick_byteswap.h \ + ${TRICK_HOME}/include/trick/trick_error_hndlr.h \ + ${TRICK_HOME}/include/trick/variable_server_sync_types.h \ + ${TRICK_HOME}/include/trick/VariableServerThread.hh \ + ${TRICK_HOME}/include/trick/ThreadBase.hh \ + ${TRICK_HOME}/include/trick/VariableServerReference.hh \ + ${TRICK_HOME}/include/trick/VariableServerListenThread.hh \ + ${TRICK_HOME}/include/trick/EventManager_c_intf.hh diff --git a/trick_source/sim_services/InputProcessor/main_page.dox_in b/trick_source/sim_services/InputProcessor/docs/main_page.dox_in similarity index 100% rename from trick_source/sim_services/InputProcessor/main_page.dox_in rename to trick_source/sim_services/InputProcessor/docs/main_page.dox_in diff --git a/trick_source/sim_services/InputProcessor/src/input_processor_ext.cpp b/trick_source/sim_services/InputProcessor/input_processor_ext.cpp similarity index 90% rename from trick_source/sim_services/InputProcessor/src/input_processor_ext.cpp rename to trick_source/sim_services/InputProcessor/input_processor_ext.cpp index de8cedba..868f397b 100644 --- a/trick_source/sim_services/InputProcessor/src/input_processor_ext.cpp +++ b/trick_source/sim_services/InputProcessor/input_processor_ext.cpp @@ -3,13 +3,13 @@ #include <sstream> #include <cmath> -#include "sim_services/InputProcessor/include/input_processor_proto.h" -#include "sim_services/InputProcessor/include/IPPython.hh" -#include "sim_services/InputProcessor/include/IPPythonEvent.hh" -#include "sim_services/InputProcessor/include/MTV.hh" -#include "sim_services/EventManager/include/EventManager_c_intf.hh" -#include "sim_services/MemoryManager/include/memorymanager_c_intf.h" -#include "sim_services/Executive/include/exec_proto.h" +#include "trick/input_processor_proto.h" +#include "trick/IPPython.hh" +#include "trick/IPPythonEvent.hh" +#include "trick/MTV.hh" +#include "trick/EventManager_c_intf.hh" +#include "trick/memorymanager_c_intf.h" +#include "trick/exec_proto.h" extern Trick::InputProcessor * the_ip ; diff --git a/trick_source/sim_services/InputProcessor/src/makefile b/trick_source/sim_services/InputProcessor/src/makefile deleted file mode 100644 index 753bd7f7..00000000 --- a/trick_source/sim_services/InputProcessor/src/makefile +++ /dev/null @@ -1,6 +0,0 @@ - -all: - ${MAKE} -C .. - -clean: - ${MAKE} -C .. clean diff --git a/trick_source/sim_services/Integrator/Makefile b/trick_source/sim_services/Integrator/Makefile index 1d28e0aa..2aff12c3 100644 --- a/trick_source/sim_services/Integrator/Makefile +++ b/trick_source/sim_services/Integrator/Makefile @@ -1,27 +1,14 @@ -include ${TRICK_HOME}/makefiles/Makefile.common -include ${TRICK_HOME}/makefiles/Makefile.tricklib +include ${TRICK_HOME}/share/trick/makefiles/Makefile.common +include ${TRICK_HOME}/share/trick/makefiles/Makefile.tricklib -include Makefile_deps -ifeq ($(USE_ER7_UTILS_INTEGRATORS), 1) +ifeq ($(USE_ER7_UTILS_INTEGRATORS), 0) trick: - @echo "#####################################################################" - @echo "## Make ER7 ALGORITHMS ##" - @echo "#####################################################################" - $(MAKE) -C er7_algorithms -else -trick: - @echo "#####################################################################" - @echo "## Make Trick ALGORITHMS ##" - @echo "#####################################################################" $(MAKE) -C trick_algorithms endif clean_algs: - @echo "#####################################################################" - @echo "## Clean Integ ALGORITHMS ##" - @echo "#####################################################################" - $(MAKE) -C er7_algorithms real_clean $(MAKE) -C trick_algorithms real_clean real_clean: clean_algs diff --git a/trick_source/sim_services/Integrator/Makefile_deps b/trick_source/sim_services/Integrator/Makefile_deps index 5e348936..16e827a8 100644 --- a/trick_source/sim_services/Integrator/Makefile_deps +++ b/trick_source/sim_services/Integrator/Makefile_deps @@ -1,137 +1,462 @@ -object_${TRICK_HOST_CPU}/regula_falsi.o: src/regula_falsi.c include/regula_falsi.h -object_${TRICK_HOST_CPU}/reset_regula_falsi.o: src/reset_regula_falsi.c include/regula_falsi.h -object_${TRICK_HOST_CPU}/IntegLoopManager.o: src/IntegLoopManager.cpp \ - src/../include/IntegLoopManager.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/SimObject.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/JobData.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/InstrumentBase.hh \ - ${TRICK_HOME}/trick_source/sim_services/Scheduler/include/Scheduler.hh \ - ${TRICK_HOME}/trick_source/sim_services/ScheduledJobQueue/include/ScheduledJobQueue.hh \ - src/../include/Integrator.hh \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/memorymanager_c_intf.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/parameter_types.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/attributes.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/reference.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/value.h \ - ${TRICK_HOME}/trick_source/trick_utils/trick_adt/include/dllist.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/var.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/io_alloc.h \ - src/../include/IntegJobClassId.hh src/../include/IntegLoopScheduler.hh \ - src/../include/IntegLoopManager.hh src/../include/Integrator.hh \ - src/../include/IntegAlgorithms.hh \ - ${TRICK_HOME}/trick_source/sim_services/Integrator/include/Integrator.hh \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/MemoryManager.hh \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/mm_error.h \ - ${TRICK_HOME}/trick_source/sim_services/CheckPointAgent/include/CheckPointAgent.hh \ - ${TRICK_HOME}/trick_source/trick_utils/units/include/UCFn.hh \ - ${TRICK_HOME}/trick_source/sim_services/Message/include/message_proto.h \ - ${TRICK_HOME}/trick_source/sim_services/Message/include/message_type.h \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/exec_proto.hh \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/Executive.hh \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/Threads.hh \ - ${TRICK_HOME}/trick_source/sim_services/ThreadBase/include/ThreadBase.hh \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/sim_mode.h \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/exec_proto.h +object_${TRICK_HOST_CPU}/regula_falsi.o: src/regula_falsi.c \ + ${TRICK_HOME}/include/trick/regula_falsi.h +object_${TRICK_HOST_CPU}/reset_regula_falsi.o: src/reset_regula_falsi.c \ + ${TRICK_HOME}/include/trick/regula_falsi.h object_${TRICK_HOST_CPU}/IntegLoopScheduler.o: src/IntegLoopScheduler.cpp \ - src/../include/IntegLoopScheduler.hh src/../include/IntegLoopManager.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/SimObject.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/JobData.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/InstrumentBase.hh \ - ${TRICK_HOME}/trick_source/sim_services/Scheduler/include/Scheduler.hh \ - ${TRICK_HOME}/trick_source/sim_services/ScheduledJobQueue/include/ScheduledJobQueue.hh \ - src/../include/Integrator.hh \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/memorymanager_c_intf.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/parameter_types.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/attributes.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/reference.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/value.h \ - ${TRICK_HOME}/trick_source/trick_utils/trick_adt/include/dllist.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/var.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/io_alloc.h \ - src/../include/IntegAlgorithms.hh \ - ${TRICK_HOME}/trick_source/sim_services/Integrator/include/Integrator.hh \ - src/../include/IntegLoopManager.hh src/../include/IntegJobClassId.hh \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/exec_proto.h \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/sim_mode.h \ - ${TRICK_HOME}/trick_source/sim_services/Message/include/message_proto.h \ - ${TRICK_HOME}/trick_source/sim_services/Message/include/message_type.h + ${TRICK_HOME}/include/trick/IntegLoopScheduler.hh \ + ${TRICK_HOME}/include/trick/IntegLoopManager.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/JobData.hh \ + ${TRICK_HOME}/include/trick/InstrumentBase.hh \ + ${TRICK_HOME}/include/trick/Scheduler.hh \ + ${TRICK_HOME}/include/trick/ScheduledJobQueue.hh \ + ${TRICK_HOME}/include/trick/Integrator.hh \ + ${TRICK_HOME}/include/trick/memorymanager_c_intf.h \ + ${TRICK_HOME}/include/trick/parameter_types.h \ + ${TRICK_HOME}/include/trick/attributes.h \ + ${TRICK_HOME}/include/trick/reference.h \ + ${TRICK_HOME}/include/trick/value.h \ + ${TRICK_HOME}/include/trick/dllist.h \ + ${TRICK_HOME}/include/trick/var.h \ + ${TRICK_HOME}/include/trick/io_alloc.h \ + ${TRICK_HOME}/include/trick/IntegAlgorithms.hh \ + ${TRICK_HOME}/include/trick/ABM_Integrator.hh \ + ${TRICK_HOME}/trick_source/er7_utils/integration/abm4/include/abm4_integrator_constructor.hh \ + ${TRICK_HOME}/trick_source/er7_utils/interface/include/er7_class.hh \ + ${TRICK_HOME}/trick_source/er7_utils/interface/include/config.hh \ + ${TRICK_HOME}/trick_source/er7_utils/interface/include/config_trick10.hh \ + ${TRICK_HOME}/trick_source/er7_utils/integration/core/include/priming_integrator_constructor.hh \ + ${TRICK_HOME}/trick_source/er7_utils/integration/core/include/integrator_constructor.hh \ + ${TRICK_HOME}/trick_source/er7_utils/interface/include/deletable.hh \ + ${TRICK_HOME}/trick_source/er7_utils/integration/core/include/generalized_position_derivative.hh \ + ${TRICK_HOME}/trick_source/er7_utils/interface/include/config.hh \ + ${TRICK_HOME}/trick_source/er7_utils/integration/core/include/integration_technique.hh \ + ${TRICK_HOME}/trick_source/er7_utils/integration/rk4/include/rk4_integrator_constructor.hh \ + ${TRICK_HOME}/trick_source/er7_utils/integration/core/include/integrator_constructor.hh \ + ${TRICK_HOME}/trick_source/er7_utils/integration/core/include/single_cycle_integration_controls.hh \ + ${TRICK_HOME}/trick_source/er7_utils/integration/core/include/integration_controls.hh \ + ${TRICK_HOME}/trick_source/er7_utils/integration/core/include/integrator_interface.hh \ + ${TRICK_HOME}/trick_source/er7_utils/integration/rk4/include/rk4_first_order_ode_integrator.hh \ + ${TRICK_HOME}/trick_source/er7_utils/integration/core/include/first_order_ode_integrator.hh \ + ${TRICK_HOME}/trick_source/er7_utils/integration/core/include/state_integrator.hh \ + ${TRICK_HOME}/trick_source/er7_utils/integration/core/include/integrator_result.hh \ + ${TRICK_HOME}/trick_source/er7_utils/integration/rk4/include/rk4_second_order_ode_integrator.hh \ + ${TRICK_HOME}/trick_source/er7_utils/integration/core/include/second_order_ode_integrator.hh \ + ${TRICK_HOME}/trick_source/er7_utils/integration/rk4/include/rk4_second_order_ode_integrator_base.hh \ + ${TRICK_HOME}/trick_source/er7_utils/integration/core/include/priming_integration_controls.hh \ + ${TRICK_HOME}/trick_source/er7_utils/integration/core/include/standard_integration_controls.hh \ + ${TRICK_HOME}/trick_source/er7_utils/integration/abm4/include/abm4_first_order_ode_integrator.hh \ + ${TRICK_HOME}/trick_source/er7_utils/integration/core/include/priming_first_order_ode_integrator.hh \ + ${TRICK_HOME}/trick_source/er7_utils/integration/core/include/integration_controls.hh \ + ${TRICK_HOME}/trick_source/er7_utils/integration/abm4/include/abm4_second_order_ode_integrator.hh \ + ${TRICK_HOME}/trick_source/er7_utils/integration/core/include/priming_second_order_ode_integrator.hh \ + ${TRICK_HOME}/trick_source/er7_utils/trick/integration/include/first_order_ode_integrator.hh \ + ${TRICK_HOME}/trick_source/er7_utils/trick/integration/include/trick_integrator.hh \ + ${TRICK_HOME}/include/trick/compat/sim_services/Integrator/include/Integrator.hh \ + ${TRICK_HOME}/trick_source/er7_utils/integration/core/include/base_integration_group.hh \ + ${TRICK_HOME}/trick_source/er7_utils/integration/core/include/time_interface.hh \ + ${TRICK_HOME}/trick_source/er7_utils/integration/core/include/bogus_integration_controls.hh \ + ${TRICK_HOME}/trick_source/er7_utils/interface/include/alloc.hh \ + ${TRICK_HOME}/include/trick/compat/sim_services/MemoryManager/include/memorymanager_c_intf.h \ + ${TRICK_HOME}/trick_source/er7_utils/interface/include/type_traits.hh \ + ${TRICK_HOME}/trick_source/er7_utils/interface/include/message_handler.hh \ + ${TRICK_HOME}/trick_source/er7_utils/integration/core/include/integration_controls.hh \ + ${TRICK_HOME}/trick_source/er7_utils/integration/core/include/integration_messages.hh \ + ${TRICK_HOME}/trick_source/er7_utils/integration/core/include/integrator_interface.hh \ + ${TRICK_HOME}/trick_source/er7_utils/integration/core/include/time_interface.hh \ + ${TRICK_HOME}/include/trick/Euler_Cromer_Integrator.hh \ + ${TRICK_HOME}/trick_source/er7_utils/integration/symplectic_euler/include/symplectic_euler_integrator_constructor.hh \ + ${TRICK_HOME}/trick_source/er7_utils/integration/euler/include/euler_first_order_ode_integrator.hh \ + ${TRICK_HOME}/trick_source/er7_utils/integration/symplectic_euler/include/symplectic_euler_second_order_ode_integrator.hh \ + ${TRICK_HOME}/trick_source/er7_utils/trick/integration/include/second_order_ode_integrator.hh \ + ${TRICK_HOME}/include/trick/Euler_Integrator.hh \ + ${TRICK_HOME}/trick_source/er7_utils/integration/euler/include/euler_integrator_constructor.hh \ + ${TRICK_HOME}/trick_source/er7_utils/integration/euler/include/euler_first_order_ode_integrator.hh \ + ${TRICK_HOME}/trick_source/er7_utils/integration/euler/include/euler_second_order_ode_integrator.hh \ + ${TRICK_HOME}/include/trick/MM4_Integrator.hh \ + ${TRICK_HOME}/trick_source/er7_utils/integration/mm4/include/mm4_integrator_constructor.hh \ + ${TRICK_HOME}/trick_source/er7_utils/integration/rk2_midpoint/include/rk2_midpoint_first_order_ode_integrator.hh \ + ${TRICK_HOME}/trick_source/er7_utils/integration/mm4/include/mm4_second_order_ode_integrator.hh \ + ${TRICK_HOME}/include/trick/NL2_Integrator.hh \ + ${TRICK_HOME}/trick_source/er7_utils/integration/nl2/include/nl2_integrator_constructor.hh \ + ${TRICK_HOME}/trick_source/er7_utils/integration/nl2/include/nl2_second_order_ode_integrator.hh \ + ${TRICK_HOME}/include/trick/RK2_Integrator.hh \ + ${TRICK_HOME}/trick_source/er7_utils/integration/rk2_heun/include/rk2_heun_integrator_constructor.hh \ + ${TRICK_HOME}/trick_source/er7_utils/integration/rk2_heun/include/rk2_heun_first_order_ode_integrator.hh \ + ${TRICK_HOME}/trick_source/er7_utils/integration/rk2_heun/include/rk2_heun_second_order_ode_integrator.hh \ + ${TRICK_HOME}/include/trick/RK4_Integrator.hh \ + ${TRICK_HOME}/include/trick/RKF45_Integrator.hh \ + ${TRICK_HOME}/trick_source/er7_utils/integration/rkf45/include/rkf45_integrator_constructor.hh \ + ${TRICK_HOME}/trick_source/er7_utils/integration/rkf45/include/rkf45_first_order_ode_integrator.hh \ + ${TRICK_HOME}/trick_source/er7_utils/integration/rkf45/include/rkf45_second_order_ode_integrator.hh \ + ${TRICK_HOME}/include/trick/RKF78_Integrator.hh \ + ${TRICK_HOME}/trick_source/er7_utils/integration/rkf78/include/rkf78_integrator_constructor.hh \ + ${TRICK_HOME}/trick_source/er7_utils/integration/rkf78/include/rkf78_first_order_ode_integrator.hh \ + ${TRICK_HOME}/trick_source/er7_utils/integration/rkf78/include/rkf78_second_order_ode_integrator.hh \ + ${TRICK_HOME}/include/trick/RKG4_Integrator.hh \ + ${TRICK_HOME}/trick_source/er7_utils/integration/rkg4/include/rkg4_integrator_constructor.hh \ + ${TRICK_HOME}/trick_source/er7_utils/integration/rkg4/include/rkg4_first_order_ode_integrator.hh \ + ${TRICK_HOME}/trick_source/er7_utils/integration/rkg4/include/rkg4_second_order_ode_integrator.hh \ + ${TRICK_HOME}/trick_source/er7_utils/integration/rk4/include/rk4_second_order_ode_integrator_base.hh \ + ${TRICK_HOME}/trick_source/er7_utils/integration/rk4/include/rk4_second_order_ode_integrator.hh \ + ${TRICK_HOME}/include/trick/IntegJobClassId.hh \ + ${TRICK_HOME}/include/trick/exec_proto.h \ + ${TRICK_HOME}/include/trick/sim_mode.h \ + ${TRICK_HOME}/include/trick/message_proto.h \ + ${TRICK_HOME}/include/trick/message_type.h +object_${TRICK_HOST_CPU}/IntegLoopManager.o: src/IntegLoopManager.cpp \ + ${TRICK_HOME}/include/trick/IntegLoopManager.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/JobData.hh \ + ${TRICK_HOME}/include/trick/InstrumentBase.hh \ + ${TRICK_HOME}/include/trick/Scheduler.hh \ + ${TRICK_HOME}/include/trick/ScheduledJobQueue.hh \ + ${TRICK_HOME}/include/trick/Integrator.hh \ + ${TRICK_HOME}/include/trick/memorymanager_c_intf.h \ + ${TRICK_HOME}/include/trick/parameter_types.h \ + ${TRICK_HOME}/include/trick/attributes.h \ + ${TRICK_HOME}/include/trick/reference.h \ + ${TRICK_HOME}/include/trick/value.h \ + ${TRICK_HOME}/include/trick/dllist.h \ + ${TRICK_HOME}/include/trick/var.h \ + ${TRICK_HOME}/include/trick/io_alloc.h \ + ${TRICK_HOME}/include/trick/IntegJobClassId.hh \ + ${TRICK_HOME}/include/trick/IntegLoopScheduler.hh \ + ${TRICK_HOME}/include/trick/IntegAlgorithms.hh \ + ${TRICK_HOME}/include/trick/ABM_Integrator.hh \ + ${TRICK_HOME}/trick_source/er7_utils/integration/abm4/include/abm4_integrator_constructor.hh \ + ${TRICK_HOME}/trick_source/er7_utils/interface/include/er7_class.hh \ + ${TRICK_HOME}/trick_source/er7_utils/interface/include/config.hh \ + ${TRICK_HOME}/trick_source/er7_utils/interface/include/config_trick10.hh \ + ${TRICK_HOME}/trick_source/er7_utils/integration/core/include/priming_integrator_constructor.hh \ + ${TRICK_HOME}/trick_source/er7_utils/integration/core/include/integrator_constructor.hh \ + ${TRICK_HOME}/trick_source/er7_utils/interface/include/deletable.hh \ + ${TRICK_HOME}/trick_source/er7_utils/integration/core/include/generalized_position_derivative.hh \ + ${TRICK_HOME}/trick_source/er7_utils/interface/include/config.hh \ + ${TRICK_HOME}/trick_source/er7_utils/integration/core/include/integration_technique.hh \ + ${TRICK_HOME}/trick_source/er7_utils/integration/rk4/include/rk4_integrator_constructor.hh \ + ${TRICK_HOME}/trick_source/er7_utils/integration/core/include/integrator_constructor.hh \ + ${TRICK_HOME}/trick_source/er7_utils/integration/core/include/single_cycle_integration_controls.hh \ + ${TRICK_HOME}/trick_source/er7_utils/integration/core/include/integration_controls.hh \ + ${TRICK_HOME}/trick_source/er7_utils/integration/core/include/integrator_interface.hh \ + ${TRICK_HOME}/trick_source/er7_utils/integration/rk4/include/rk4_first_order_ode_integrator.hh \ + ${TRICK_HOME}/trick_source/er7_utils/integration/core/include/first_order_ode_integrator.hh \ + ${TRICK_HOME}/trick_source/er7_utils/integration/core/include/state_integrator.hh \ + ${TRICK_HOME}/trick_source/er7_utils/integration/core/include/integrator_result.hh \ + ${TRICK_HOME}/trick_source/er7_utils/integration/rk4/include/rk4_second_order_ode_integrator.hh \ + ${TRICK_HOME}/trick_source/er7_utils/integration/core/include/second_order_ode_integrator.hh \ + ${TRICK_HOME}/trick_source/er7_utils/integration/rk4/include/rk4_second_order_ode_integrator_base.hh \ + ${TRICK_HOME}/trick_source/er7_utils/integration/core/include/priming_integration_controls.hh \ + ${TRICK_HOME}/trick_source/er7_utils/integration/core/include/standard_integration_controls.hh \ + ${TRICK_HOME}/trick_source/er7_utils/integration/abm4/include/abm4_first_order_ode_integrator.hh \ + ${TRICK_HOME}/trick_source/er7_utils/integration/core/include/priming_first_order_ode_integrator.hh \ + ${TRICK_HOME}/trick_source/er7_utils/integration/core/include/integration_controls.hh \ + ${TRICK_HOME}/trick_source/er7_utils/integration/abm4/include/abm4_second_order_ode_integrator.hh \ + ${TRICK_HOME}/trick_source/er7_utils/integration/core/include/priming_second_order_ode_integrator.hh \ + ${TRICK_HOME}/trick_source/er7_utils/trick/integration/include/first_order_ode_integrator.hh \ + ${TRICK_HOME}/trick_source/er7_utils/trick/integration/include/trick_integrator.hh \ + ${TRICK_HOME}/include/trick/compat/sim_services/Integrator/include/Integrator.hh \ + ${TRICK_HOME}/trick_source/er7_utils/integration/core/include/base_integration_group.hh \ + ${TRICK_HOME}/trick_source/er7_utils/integration/core/include/time_interface.hh \ + ${TRICK_HOME}/trick_source/er7_utils/integration/core/include/bogus_integration_controls.hh \ + ${TRICK_HOME}/trick_source/er7_utils/interface/include/alloc.hh \ + ${TRICK_HOME}/include/trick/compat/sim_services/MemoryManager/include/memorymanager_c_intf.h \ + ${TRICK_HOME}/trick_source/er7_utils/interface/include/type_traits.hh \ + ${TRICK_HOME}/trick_source/er7_utils/interface/include/message_handler.hh \ + ${TRICK_HOME}/trick_source/er7_utils/integration/core/include/integration_controls.hh \ + ${TRICK_HOME}/trick_source/er7_utils/integration/core/include/integration_messages.hh \ + ${TRICK_HOME}/trick_source/er7_utils/integration/core/include/integrator_interface.hh \ + ${TRICK_HOME}/trick_source/er7_utils/integration/core/include/time_interface.hh \ + ${TRICK_HOME}/include/trick/Euler_Cromer_Integrator.hh \ + ${TRICK_HOME}/trick_source/er7_utils/integration/symplectic_euler/include/symplectic_euler_integrator_constructor.hh \ + ${TRICK_HOME}/trick_source/er7_utils/integration/euler/include/euler_first_order_ode_integrator.hh \ + ${TRICK_HOME}/trick_source/er7_utils/integration/symplectic_euler/include/symplectic_euler_second_order_ode_integrator.hh \ + ${TRICK_HOME}/trick_source/er7_utils/trick/integration/include/second_order_ode_integrator.hh \ + ${TRICK_HOME}/include/trick/Euler_Integrator.hh \ + ${TRICK_HOME}/trick_source/er7_utils/integration/euler/include/euler_integrator_constructor.hh \ + ${TRICK_HOME}/trick_source/er7_utils/integration/euler/include/euler_first_order_ode_integrator.hh \ + ${TRICK_HOME}/trick_source/er7_utils/integration/euler/include/euler_second_order_ode_integrator.hh \ + ${TRICK_HOME}/include/trick/MM4_Integrator.hh \ + ${TRICK_HOME}/trick_source/er7_utils/integration/mm4/include/mm4_integrator_constructor.hh \ + ${TRICK_HOME}/trick_source/er7_utils/integration/rk2_midpoint/include/rk2_midpoint_first_order_ode_integrator.hh \ + ${TRICK_HOME}/trick_source/er7_utils/integration/mm4/include/mm4_second_order_ode_integrator.hh \ + ${TRICK_HOME}/include/trick/NL2_Integrator.hh \ + ${TRICK_HOME}/trick_source/er7_utils/integration/nl2/include/nl2_integrator_constructor.hh \ + ${TRICK_HOME}/trick_source/er7_utils/integration/nl2/include/nl2_second_order_ode_integrator.hh \ + ${TRICK_HOME}/include/trick/RK2_Integrator.hh \ + ${TRICK_HOME}/trick_source/er7_utils/integration/rk2_heun/include/rk2_heun_integrator_constructor.hh \ + ${TRICK_HOME}/trick_source/er7_utils/integration/rk2_heun/include/rk2_heun_first_order_ode_integrator.hh \ + ${TRICK_HOME}/trick_source/er7_utils/integration/rk2_heun/include/rk2_heun_second_order_ode_integrator.hh \ + ${TRICK_HOME}/include/trick/RK4_Integrator.hh \ + ${TRICK_HOME}/include/trick/RKF45_Integrator.hh \ + ${TRICK_HOME}/trick_source/er7_utils/integration/rkf45/include/rkf45_integrator_constructor.hh \ + ${TRICK_HOME}/trick_source/er7_utils/integration/rkf45/include/rkf45_first_order_ode_integrator.hh \ + ${TRICK_HOME}/trick_source/er7_utils/integration/rkf45/include/rkf45_second_order_ode_integrator.hh \ + ${TRICK_HOME}/include/trick/RKF78_Integrator.hh \ + ${TRICK_HOME}/trick_source/er7_utils/integration/rkf78/include/rkf78_integrator_constructor.hh \ + ${TRICK_HOME}/trick_source/er7_utils/integration/rkf78/include/rkf78_first_order_ode_integrator.hh \ + ${TRICK_HOME}/trick_source/er7_utils/integration/rkf78/include/rkf78_second_order_ode_integrator.hh \ + ${TRICK_HOME}/include/trick/RKG4_Integrator.hh \ + ${TRICK_HOME}/trick_source/er7_utils/integration/rkg4/include/rkg4_integrator_constructor.hh \ + ${TRICK_HOME}/trick_source/er7_utils/integration/rkg4/include/rkg4_first_order_ode_integrator.hh \ + ${TRICK_HOME}/trick_source/er7_utils/integration/rkg4/include/rkg4_second_order_ode_integrator.hh \ + ${TRICK_HOME}/trick_source/er7_utils/integration/rk4/include/rk4_second_order_ode_integrator_base.hh \ + ${TRICK_HOME}/trick_source/er7_utils/integration/rk4/include/rk4_second_order_ode_integrator.hh \ + ${TRICK_HOME}/include/trick/MemoryManager.hh \ + ${TRICK_HOME}/include/trick/mm_error.h \ + ${TRICK_HOME}/include/trick/CheckPointAgent.hh \ + ${TRICK_HOME}/include/trick/UCFn.hh \ + ${TRICK_HOME}/include/trick/message_proto.h \ + ${TRICK_HOME}/include/trick/message_type.h \ + ${TRICK_HOME}/include/trick/exec_proto.hh \ + ${TRICK_HOME}/include/trick/Executive.hh \ + ${TRICK_HOME}/include/trick/Scheduler.hh \ + ${TRICK_HOME}/include/trick/ScheduledJobQueue.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/Threads.hh \ + ${TRICK_HOME}/include/trick/ThreadBase.hh \ + ${TRICK_HOME}/include/trick/sim_mode.h \ + ${TRICK_HOME}/include/trick/exec_proto.h \ + ${TRICK_HOME}/include/trick/sim_mode.h object_${TRICK_HOST_CPU}/IntegLoopSimObject.o: src/IntegLoopSimObject.cpp \ - ${TRICK_HOME}/trick_source/sim_services/Integrator/include/IntegLoopSimObject.hh \ - ${TRICK_HOME}/trick_source/sim_services/Integrator/include/IntegLoopScheduler.hh \ - ${TRICK_HOME}/trick_source/sim_services/Integrator/include/IntegLoopManager.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/SimObject.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/JobData.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/InstrumentBase.hh \ - ${TRICK_HOME}/trick_source/sim_services/Scheduler/include/Scheduler.hh \ - ${TRICK_HOME}/trick_source/sim_services/ScheduledJobQueue/include/ScheduledJobQueue.hh \ - ${TRICK_HOME}/trick_source/sim_services/Integrator/include/Integrator.hh \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/memorymanager_c_intf.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/parameter_types.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/attributes.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/reference.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/value.h \ - ${TRICK_HOME}/trick_source/trick_utils/trick_adt/include/dllist.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/var.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/io_alloc.h \ - ${TRICK_HOME}/trick_source/sim_services/Integrator/include/IntegAlgorithms.hh \ - ${TRICK_HOME}/trick_source/sim_services/Integrator/include/Integrator.hh \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/exec_proto.hh \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/Executive.hh \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/Threads.hh \ - ${TRICK_HOME}/trick_source/sim_services/ThreadBase/include/ThreadBase.hh \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/sim_mode.h \ - ${TRICK_HOME}/trick_source/sim_services/CheckPointRestart/include/checkpoint_stl.hh \ - ${TRICK_HOME}/trick_source/sim_services/CheckPointRestart/include/checkpoint_sequence_stl.hh \ - ${TRICK_HOME}/trick_source/sim_services/Message/include/message_proto.h \ - ${TRICK_HOME}/trick_source/sim_services/Message/include/message_type.h \ - ${TRICK_HOME}/trick_source/sim_services/CheckPointRestart/include/checkpoint_map.hh \ - ${TRICK_HOME}/trick_source/sim_services/CheckPointRestart/include/checkpoint_stack.hh \ - ${TRICK_HOME}/trick_source/sim_services/CheckPointRestart/include/checkpoint_sequence_stl.hh \ - ${TRICK_HOME}/trick_source/sim_services/CheckPointRestart/include/checkpoint_queue.hh \ - ${TRICK_HOME}/trick_source/sim_services/CheckPointRestart/include/checkpoint_pair.hh -object_${TRICK_HOST_CPU}/Integrator.o: src/Integrator.cpp include/Integrator.hh \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/memorymanager_c_intf.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/parameter_types.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/attributes.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/reference.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/value.h \ - ${TRICK_HOME}/trick_source/trick_utils/trick_adt/include/dllist.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/var.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/io_alloc.h \ - ${TRICK_HOME}/trick_source/sim_services/Message/include/message_proto.h \ - ${TRICK_HOME}/trick_source/sim_services/Message/include/message_type.h + ${TRICK_HOME}/include/trick/IntegLoopSimObject.hh \ + ${TRICK_HOME}/include/trick/IntegLoopScheduler.hh \ + ${TRICK_HOME}/include/trick/IntegLoopManager.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/JobData.hh \ + ${TRICK_HOME}/include/trick/InstrumentBase.hh \ + ${TRICK_HOME}/include/trick/Scheduler.hh \ + ${TRICK_HOME}/include/trick/ScheduledJobQueue.hh \ + ${TRICK_HOME}/include/trick/Integrator.hh \ + ${TRICK_HOME}/include/trick/memorymanager_c_intf.h \ + ${TRICK_HOME}/include/trick/parameter_types.h \ + ${TRICK_HOME}/include/trick/attributes.h \ + ${TRICK_HOME}/include/trick/reference.h \ + ${TRICK_HOME}/include/trick/value.h \ + ${TRICK_HOME}/include/trick/dllist.h \ + ${TRICK_HOME}/include/trick/var.h \ + ${TRICK_HOME}/include/trick/io_alloc.h \ + ${TRICK_HOME}/include/trick/IntegAlgorithms.hh \ + ${TRICK_HOME}/include/trick/ABM_Integrator.hh \ + ${TRICK_HOME}/trick_source/er7_utils/integration/abm4/include/abm4_integrator_constructor.hh \ + ${TRICK_HOME}/trick_source/er7_utils/interface/include/er7_class.hh \ + ${TRICK_HOME}/trick_source/er7_utils/interface/include/config.hh \ + ${TRICK_HOME}/trick_source/er7_utils/interface/include/config_trick10.hh \ + ${TRICK_HOME}/trick_source/er7_utils/integration/core/include/priming_integrator_constructor.hh \ + ${TRICK_HOME}/trick_source/er7_utils/integration/core/include/integrator_constructor.hh \ + ${TRICK_HOME}/trick_source/er7_utils/interface/include/deletable.hh \ + ${TRICK_HOME}/trick_source/er7_utils/integration/core/include/generalized_position_derivative.hh \ + ${TRICK_HOME}/trick_source/er7_utils/interface/include/config.hh \ + ${TRICK_HOME}/trick_source/er7_utils/integration/core/include/integration_technique.hh \ + ${TRICK_HOME}/trick_source/er7_utils/integration/rk4/include/rk4_integrator_constructor.hh \ + ${TRICK_HOME}/trick_source/er7_utils/integration/core/include/integrator_constructor.hh \ + ${TRICK_HOME}/trick_source/er7_utils/integration/core/include/single_cycle_integration_controls.hh \ + ${TRICK_HOME}/trick_source/er7_utils/integration/core/include/integration_controls.hh \ + ${TRICK_HOME}/trick_source/er7_utils/integration/core/include/integrator_interface.hh \ + ${TRICK_HOME}/trick_source/er7_utils/integration/rk4/include/rk4_first_order_ode_integrator.hh \ + ${TRICK_HOME}/trick_source/er7_utils/integration/core/include/first_order_ode_integrator.hh \ + ${TRICK_HOME}/trick_source/er7_utils/integration/core/include/state_integrator.hh \ + ${TRICK_HOME}/trick_source/er7_utils/integration/core/include/integrator_result.hh \ + ${TRICK_HOME}/trick_source/er7_utils/integration/rk4/include/rk4_second_order_ode_integrator.hh \ + ${TRICK_HOME}/trick_source/er7_utils/integration/core/include/second_order_ode_integrator.hh \ + ${TRICK_HOME}/trick_source/er7_utils/integration/rk4/include/rk4_second_order_ode_integrator_base.hh \ + ${TRICK_HOME}/trick_source/er7_utils/integration/core/include/priming_integration_controls.hh \ + ${TRICK_HOME}/trick_source/er7_utils/integration/core/include/standard_integration_controls.hh \ + ${TRICK_HOME}/trick_source/er7_utils/integration/abm4/include/abm4_first_order_ode_integrator.hh \ + ${TRICK_HOME}/trick_source/er7_utils/integration/core/include/priming_first_order_ode_integrator.hh \ + ${TRICK_HOME}/trick_source/er7_utils/integration/core/include/integration_controls.hh \ + ${TRICK_HOME}/trick_source/er7_utils/integration/abm4/include/abm4_second_order_ode_integrator.hh \ + ${TRICK_HOME}/trick_source/er7_utils/integration/core/include/priming_second_order_ode_integrator.hh \ + ${TRICK_HOME}/trick_source/er7_utils/trick/integration/include/first_order_ode_integrator.hh \ + ${TRICK_HOME}/trick_source/er7_utils/trick/integration/include/trick_integrator.hh \ + ${TRICK_HOME}/include/trick/compat/sim_services/Integrator/include/Integrator.hh \ + ${TRICK_HOME}/trick_source/er7_utils/integration/core/include/base_integration_group.hh \ + ${TRICK_HOME}/trick_source/er7_utils/integration/core/include/time_interface.hh \ + ${TRICK_HOME}/trick_source/er7_utils/integration/core/include/bogus_integration_controls.hh \ + ${TRICK_HOME}/trick_source/er7_utils/interface/include/alloc.hh \ + ${TRICK_HOME}/include/trick/compat/sim_services/MemoryManager/include/memorymanager_c_intf.h \ + ${TRICK_HOME}/trick_source/er7_utils/interface/include/type_traits.hh \ + ${TRICK_HOME}/trick_source/er7_utils/interface/include/message_handler.hh \ + ${TRICK_HOME}/trick_source/er7_utils/integration/core/include/integration_controls.hh \ + ${TRICK_HOME}/trick_source/er7_utils/integration/core/include/integration_messages.hh \ + ${TRICK_HOME}/trick_source/er7_utils/integration/core/include/integrator_interface.hh \ + ${TRICK_HOME}/trick_source/er7_utils/integration/core/include/time_interface.hh \ + ${TRICK_HOME}/include/trick/Euler_Cromer_Integrator.hh \ + ${TRICK_HOME}/trick_source/er7_utils/integration/symplectic_euler/include/symplectic_euler_integrator_constructor.hh \ + ${TRICK_HOME}/trick_source/er7_utils/integration/euler/include/euler_first_order_ode_integrator.hh \ + ${TRICK_HOME}/trick_source/er7_utils/integration/symplectic_euler/include/symplectic_euler_second_order_ode_integrator.hh \ + ${TRICK_HOME}/trick_source/er7_utils/trick/integration/include/second_order_ode_integrator.hh \ + ${TRICK_HOME}/include/trick/Euler_Integrator.hh \ + ${TRICK_HOME}/trick_source/er7_utils/integration/euler/include/euler_integrator_constructor.hh \ + ${TRICK_HOME}/trick_source/er7_utils/integration/euler/include/euler_first_order_ode_integrator.hh \ + ${TRICK_HOME}/trick_source/er7_utils/integration/euler/include/euler_second_order_ode_integrator.hh \ + ${TRICK_HOME}/include/trick/MM4_Integrator.hh \ + ${TRICK_HOME}/trick_source/er7_utils/integration/mm4/include/mm4_integrator_constructor.hh \ + ${TRICK_HOME}/trick_source/er7_utils/integration/rk2_midpoint/include/rk2_midpoint_first_order_ode_integrator.hh \ + ${TRICK_HOME}/trick_source/er7_utils/integration/mm4/include/mm4_second_order_ode_integrator.hh \ + ${TRICK_HOME}/include/trick/NL2_Integrator.hh \ + ${TRICK_HOME}/trick_source/er7_utils/integration/nl2/include/nl2_integrator_constructor.hh \ + ${TRICK_HOME}/trick_source/er7_utils/integration/nl2/include/nl2_second_order_ode_integrator.hh \ + ${TRICK_HOME}/include/trick/RK2_Integrator.hh \ + ${TRICK_HOME}/trick_source/er7_utils/integration/rk2_heun/include/rk2_heun_integrator_constructor.hh \ + ${TRICK_HOME}/trick_source/er7_utils/integration/rk2_heun/include/rk2_heun_first_order_ode_integrator.hh \ + ${TRICK_HOME}/trick_source/er7_utils/integration/rk2_heun/include/rk2_heun_second_order_ode_integrator.hh \ + ${TRICK_HOME}/include/trick/RK4_Integrator.hh \ + ${TRICK_HOME}/include/trick/RKF45_Integrator.hh \ + ${TRICK_HOME}/trick_source/er7_utils/integration/rkf45/include/rkf45_integrator_constructor.hh \ + ${TRICK_HOME}/trick_source/er7_utils/integration/rkf45/include/rkf45_first_order_ode_integrator.hh \ + ${TRICK_HOME}/trick_source/er7_utils/integration/rkf45/include/rkf45_second_order_ode_integrator.hh \ + ${TRICK_HOME}/include/trick/RKF78_Integrator.hh \ + ${TRICK_HOME}/trick_source/er7_utils/integration/rkf78/include/rkf78_integrator_constructor.hh \ + ${TRICK_HOME}/trick_source/er7_utils/integration/rkf78/include/rkf78_first_order_ode_integrator.hh \ + ${TRICK_HOME}/trick_source/er7_utils/integration/rkf78/include/rkf78_second_order_ode_integrator.hh \ + ${TRICK_HOME}/include/trick/RKG4_Integrator.hh \ + ${TRICK_HOME}/trick_source/er7_utils/integration/rkg4/include/rkg4_integrator_constructor.hh \ + ${TRICK_HOME}/trick_source/er7_utils/integration/rkg4/include/rkg4_first_order_ode_integrator.hh \ + ${TRICK_HOME}/trick_source/er7_utils/integration/rkg4/include/rkg4_second_order_ode_integrator.hh \ + ${TRICK_HOME}/trick_source/er7_utils/integration/rk4/include/rk4_second_order_ode_integrator_base.hh \ + ${TRICK_HOME}/trick_source/er7_utils/integration/rk4/include/rk4_second_order_ode_integrator.hh \ + ${TRICK_HOME}/include/trick/exec_proto.hh \ + ${TRICK_HOME}/include/trick/Executive.hh \ + ${TRICK_HOME}/include/trick/Scheduler.hh \ + ${TRICK_HOME}/include/trick/ScheduledJobQueue.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/Threads.hh \ + ${TRICK_HOME}/include/trick/ThreadBase.hh \ + ${TRICK_HOME}/include/trick/sim_mode.h \ + ${TRICK_HOME}/include/trick/checkpoint_stl.hh \ + ${TRICK_HOME}/include/trick/checkpoint_sequence_stl.hh \ + ${TRICK_HOME}/include/trick/message_proto.h \ + ${TRICK_HOME}/include/trick/message_type.h \ + ${TRICK_HOME}/include/trick/checkpoint_map.hh \ + ${TRICK_HOME}/include/trick/checkpoint_stack.hh \ + ${TRICK_HOME}/include/trick/checkpoint_queue.hh \ + ${TRICK_HOME}/include/trick/checkpoint_pair.hh object_${TRICK_HOST_CPU}/Integrator_C_Intf.o: src/Integrator_C_Intf.cpp \ - include/integrator_c_intf.h include/Integrator.hh \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/memorymanager_c_intf.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/parameter_types.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/attributes.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/reference.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/value.h \ - ${TRICK_HOME}/trick_source/trick_utils/trick_adt/include/dllist.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/var.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/io_alloc.h \ - ${TRICK_HOME}/trick_source/sim_services/Message/include/message_proto.h \ - ${TRICK_HOME}/trick_source/sim_services/Message/include/message_type.h + ${TRICK_HOME}/include/trick/integrator_c_intf.h \ + ${TRICK_HOME}/include/trick/Integrator.hh \ + ${TRICK_HOME}/include/trick/memorymanager_c_intf.h \ + ${TRICK_HOME}/include/trick/parameter_types.h \ + ${TRICK_HOME}/include/trick/attributes.h \ + ${TRICK_HOME}/include/trick/reference.h \ + ${TRICK_HOME}/include/trick/value.h \ + ${TRICK_HOME}/include/trick/dllist.h \ + ${TRICK_HOME}/include/trick/var.h \ + ${TRICK_HOME}/include/trick/io_alloc.h \ + ${TRICK_HOME}/include/trick/message_proto.h \ + ${TRICK_HOME}/include/trick/message_type.h +object_${TRICK_HOST_CPU}/Integrator.o: src/Integrator.cpp \ + ${TRICK_HOME}/include/trick/Integrator.hh \ + ${TRICK_HOME}/include/trick/memorymanager_c_intf.h \ + ${TRICK_HOME}/include/trick/parameter_types.h \ + ${TRICK_HOME}/include/trick/attributes.h \ + ${TRICK_HOME}/include/trick/reference.h \ + ${TRICK_HOME}/include/trick/value.h \ + ${TRICK_HOME}/include/trick/dllist.h \ + ${TRICK_HOME}/include/trick/var.h \ + ${TRICK_HOME}/include/trick/io_alloc.h \ + ${TRICK_HOME}/include/trick/message_proto.h \ + ${TRICK_HOME}/include/trick/message_type.h object_${TRICK_HOST_CPU}/getIntegrator.o: src/getIntegrator.cpp \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/memorymanager_c_intf.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/parameter_types.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/attributes.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/reference.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/value.h \ - ${TRICK_HOME}/trick_source/trick_utils/trick_adt/include/dllist.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/var.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/io_alloc.h \ - ${TRICK_HOME}/trick_source/sim_services/Message/include/message_proto.h \ - ${TRICK_HOME}/trick_source/sim_services/Message/include/message_type.h \ - src/../include/Integrator.hh \ - src/../trick_algorithms/ABM_Integrator.hh \ - src/../include/Integrator.hh \ - src/../trick_algorithms/Euler_Cromer_Integrator.hh \ - src/../trick_algorithms/Euler_Integrator.hh \ - src/../trick_algorithms/MM4_Integrator.hh \ - src/../trick_algorithms/NL2_Integrator.hh \ - src/../trick_algorithms/RK2_Integrator.hh \ - src/../trick_algorithms/RK4_Integrator.hh \ - src/../trick_algorithms/RKF45_Integrator.hh \ - src/../trick_algorithms/RKF78_Integrator.hh \ - src/../trick_algorithms/RKG4_Integrator.hh + ${TRICK_HOME}/include/trick/memorymanager_c_intf.h \ + ${TRICK_HOME}/include/trick/parameter_types.h \ + ${TRICK_HOME}/include/trick/attributes.h \ + ${TRICK_HOME}/include/trick/reference.h \ + ${TRICK_HOME}/include/trick/value.h \ + ${TRICK_HOME}/include/trick/dllist.h \ + ${TRICK_HOME}/include/trick/var.h \ + ${TRICK_HOME}/include/trick/io_alloc.h \ + ${TRICK_HOME}/include/trick/message_proto.h \ + ${TRICK_HOME}/include/trick/message_type.h \ + ${TRICK_HOME}/trick_source/er7_utils/interface/include/alloc.hh \ + ${TRICK_HOME}/trick_source/er7_utils/interface/include/config.hh \ + ${TRICK_HOME}/trick_source/er7_utils/interface/include/config_trick10.hh \ + ${TRICK_HOME}/include/trick/compat/sim_services/MemoryManager/include/memorymanager_c_intf.h \ + ${TRICK_HOME}/trick_source/er7_utils/interface/include/type_traits.hh \ + ${TRICK_HOME}/trick_source/er7_utils/integration/core/include/integrator_constructor_factory.hh \ + ${TRICK_HOME}/trick_source/er7_utils/interface/include/er7_class.hh \ + ${TRICK_HOME}/trick_source/er7_utils/integration/core/include/integration_technique.hh \ + ${TRICK_HOME}/trick_source/er7_utils/integration/core/include/integrator_constructor.hh \ + ${TRICK_HOME}/trick_source/er7_utils/interface/include/deletable.hh \ + ${TRICK_HOME}/trick_source/er7_utils/integration/core/include/generalized_position_derivative.hh \ + ${TRICK_HOME}/trick_source/er7_utils/interface/include/config.hh \ + ${TRICK_HOME}/trick_source/er7_utils/integration/abm4/include/abm4_integrator_constructor.hh \ + ${TRICK_HOME}/trick_source/er7_utils/integration/core/include/priming_integrator_constructor.hh \ + ${TRICK_HOME}/trick_source/er7_utils/integration/rk4/include/rk4_integrator_constructor.hh \ + ${TRICK_HOME}/trick_source/er7_utils/integration/core/include/integrator_constructor.hh \ + ${TRICK_HOME}/trick_source/er7_utils/integration/core/include/single_cycle_integration_controls.hh \ + ${TRICK_HOME}/trick_source/er7_utils/integration/core/include/integration_controls.hh \ + ${TRICK_HOME}/trick_source/er7_utils/integration/core/include/integrator_interface.hh \ + ${TRICK_HOME}/trick_source/er7_utils/integration/rk4/include/rk4_first_order_ode_integrator.hh \ + ${TRICK_HOME}/trick_source/er7_utils/integration/core/include/first_order_ode_integrator.hh \ + ${TRICK_HOME}/trick_source/er7_utils/integration/core/include/state_integrator.hh \ + ${TRICK_HOME}/trick_source/er7_utils/integration/core/include/integrator_result.hh \ + ${TRICK_HOME}/trick_source/er7_utils/integration/rk4/include/rk4_second_order_ode_integrator.hh \ + ${TRICK_HOME}/trick_source/er7_utils/integration/core/include/second_order_ode_integrator.hh \ + ${TRICK_HOME}/trick_source/er7_utils/integration/rk4/include/rk4_second_order_ode_integrator_base.hh \ + ${TRICK_HOME}/trick_source/er7_utils/integration/core/include/priming_integration_controls.hh \ + ${TRICK_HOME}/trick_source/er7_utils/integration/core/include/standard_integration_controls.hh \ + ${TRICK_HOME}/trick_source/er7_utils/integration/abm4/include/abm4_first_order_ode_integrator.hh \ + ${TRICK_HOME}/trick_source/er7_utils/integration/core/include/priming_first_order_ode_integrator.hh \ + ${TRICK_HOME}/trick_source/er7_utils/integration/core/include/integration_controls.hh \ + ${TRICK_HOME}/trick_source/er7_utils/integration/abm4/include/abm4_second_order_ode_integrator.hh \ + ${TRICK_HOME}/trick_source/er7_utils/integration/core/include/priming_second_order_ode_integrator.hh \ + ${TRICK_HOME}/trick_source/er7_utils/integration/beeman/include/beeman_integrator_constructor.hh \ + ${TRICK_HOME}/trick_source/er7_utils/integration/rk2_heun/include/rk2_heun_integrator_constructor.hh \ + ${TRICK_HOME}/trick_source/er7_utils/integration/rk2_heun/include/rk2_heun_first_order_ode_integrator.hh \ + ${TRICK_HOME}/trick_source/er7_utils/integration/rk2_heun/include/rk2_heun_second_order_ode_integrator.hh \ + ${TRICK_HOME}/trick_source/er7_utils/integration/rk2_heun/include/rk2_heun_first_order_ode_integrator.hh \ + ${TRICK_HOME}/trick_source/er7_utils/integration/beeman/include/beeman_second_order_ode_integrator.hh \ + ${TRICK_HOME}/trick_source/er7_utils/integration/euler/include/euler_integrator_constructor.hh \ + ${TRICK_HOME}/trick_source/er7_utils/integration/euler/include/euler_first_order_ode_integrator.hh \ + ${TRICK_HOME}/trick_source/er7_utils/integration/euler/include/euler_second_order_ode_integrator.hh \ + ${TRICK_HOME}/trick_source/er7_utils/integration/mm4/include/mm4_integrator_constructor.hh \ + ${TRICK_HOME}/trick_source/er7_utils/integration/rk2_midpoint/include/rk2_midpoint_first_order_ode_integrator.hh \ + ${TRICK_HOME}/trick_source/er7_utils/integration/mm4/include/mm4_second_order_ode_integrator.hh \ + ${TRICK_HOME}/trick_source/er7_utils/integration/nl2/include/nl2_integrator_constructor.hh \ + ${TRICK_HOME}/trick_source/er7_utils/integration/nl2/include/nl2_second_order_ode_integrator.hh \ + ${TRICK_HOME}/trick_source/er7_utils/integration/position_verlet/include/position_verlet_integrator_constructor.hh \ + ${TRICK_HOME}/trick_source/er7_utils/integration/position_verlet/include/position_verlet_second_order_ode_integrator.hh \ + ${TRICK_HOME}/trick_source/er7_utils/integration/rk2_midpoint/include/rk2_midpoint_integrator_constructor.hh \ + ${TRICK_HOME}/trick_source/er7_utils/integration/rk2_midpoint/include/rk2_midpoint_first_order_ode_integrator.hh \ + ${TRICK_HOME}/trick_source/er7_utils/integration/rk2_midpoint/include/rk2_midpoint_second_order_ode_integrator.hh \ + ${TRICK_HOME}/trick_source/er7_utils/integration/rkf45/include/rkf45_integrator_constructor.hh \ + ${TRICK_HOME}/trick_source/er7_utils/integration/rkf45/include/rkf45_first_order_ode_integrator.hh \ + ${TRICK_HOME}/trick_source/er7_utils/integration/rkf45/include/rkf45_second_order_ode_integrator.hh \ + ${TRICK_HOME}/trick_source/er7_utils/integration/rkf78/include/rkf78_integrator_constructor.hh \ + ${TRICK_HOME}/trick_source/er7_utils/integration/rkf78/include/rkf78_first_order_ode_integrator.hh \ + ${TRICK_HOME}/trick_source/er7_utils/integration/rkf78/include/rkf78_second_order_ode_integrator.hh \ + ${TRICK_HOME}/trick_source/er7_utils/integration/rkg4/include/rkg4_integrator_constructor.hh \ + ${TRICK_HOME}/trick_source/er7_utils/integration/rkg4/include/rkg4_first_order_ode_integrator.hh \ + ${TRICK_HOME}/trick_source/er7_utils/integration/rkg4/include/rkg4_second_order_ode_integrator.hh \ + ${TRICK_HOME}/trick_source/er7_utils/integration/rk4/include/rk4_second_order_ode_integrator_base.hh \ + ${TRICK_HOME}/trick_source/er7_utils/integration/rk4/include/rk4_second_order_ode_integrator.hh \ + ${TRICK_HOME}/trick_source/er7_utils/integration/symplectic_euler/include/symplectic_euler_integrator_constructor.hh \ + ${TRICK_HOME}/trick_source/er7_utils/integration/euler/include/euler_first_order_ode_integrator.hh \ + ${TRICK_HOME}/trick_source/er7_utils/integration/symplectic_euler/include/symplectic_euler_second_order_ode_integrator.hh \ + ${TRICK_HOME}/trick_source/er7_utils/integration/velocity_verlet/include/velocity_verlet_integrator_constructor.hh \ + ${TRICK_HOME}/trick_source/er7_utils/integration/velocity_verlet/include/velocity_verlet_second_order_ode_integrator.hh \ + ${TRICK_HOME}/include/trick/Integrator.hh \ + ${TRICK_HOME}/include/trick/IntegAlgorithms.hh \ + ${TRICK_HOME}/include/trick/ABM_Integrator.hh \ + ${TRICK_HOME}/trick_source/er7_utils/trick/integration/include/first_order_ode_integrator.hh \ + ${TRICK_HOME}/trick_source/er7_utils/trick/integration/include/trick_integrator.hh \ + ${TRICK_HOME}/include/trick/compat/sim_services/Integrator/include/Integrator.hh \ + ${TRICK_HOME}/trick_source/er7_utils/integration/core/include/base_integration_group.hh \ + ${TRICK_HOME}/trick_source/er7_utils/integration/core/include/time_interface.hh \ + ${TRICK_HOME}/trick_source/er7_utils/integration/core/include/bogus_integration_controls.hh \ + ${TRICK_HOME}/trick_source/er7_utils/interface/include/message_handler.hh \ + ${TRICK_HOME}/trick_source/er7_utils/integration/core/include/integration_controls.hh \ + ${TRICK_HOME}/trick_source/er7_utils/integration/core/include/integration_messages.hh \ + ${TRICK_HOME}/trick_source/er7_utils/integration/core/include/integrator_interface.hh \ + ${TRICK_HOME}/trick_source/er7_utils/integration/core/include/time_interface.hh \ + ${TRICK_HOME}/include/trick/Euler_Cromer_Integrator.hh \ + ${TRICK_HOME}/trick_source/er7_utils/trick/integration/include/second_order_ode_integrator.hh \ + ${TRICK_HOME}/include/trick/Euler_Integrator.hh \ + ${TRICK_HOME}/include/trick/MM4_Integrator.hh \ + ${TRICK_HOME}/include/trick/NL2_Integrator.hh \ + ${TRICK_HOME}/include/trick/RK2_Integrator.hh \ + ${TRICK_HOME}/include/trick/RK4_Integrator.hh \ + ${TRICK_HOME}/include/trick/RKF45_Integrator.hh \ + ${TRICK_HOME}/include/trick/RKF78_Integrator.hh \ + ${TRICK_HOME}/include/trick/RKG4_Integrator.hh diff --git a/trick_source/sim_services/Integrator/er7_algorithms/Makefile b/trick_source/sim_services/Integrator/er7_algorithms/Makefile deleted file mode 100644 index c2bba323..00000000 --- a/trick_source/sim_services/Integrator/er7_algorithms/Makefile +++ /dev/null @@ -1,4 +0,0 @@ -include ${TRICK_HOME}/makefiles/Makefile.common -include ${TRICK_HOME}/makefiles/Makefile.tricklib --include Makefile_deps - diff --git a/trick_source/sim_services/Integrator/include/IntegAlgorithms.hh b/trick_source/sim_services/Integrator/include/IntegAlgorithms.hh deleted file mode 100644 index abd35f50..00000000 --- a/trick_source/sim_services/Integrator/include/IntegAlgorithms.hh +++ /dev/null @@ -1,36 +0,0 @@ -/* - * PURPOSE: - * ( ) -*/ -#ifndef INTEG_ALGORITHMS_HH -#define INTEG_ALGORITHMS_HH - -#ifndef SWIG - -#if USE_ER7_UTILS_INTEGRATORS - #include "../er7_algorithms/ABM_Integrator.hh" - #include "../er7_algorithms/Euler_Cromer_Integrator.hh" - #include "../er7_algorithms/Euler_Integrator.hh" - #include "../er7_algorithms/MM4_Integrator.hh" - #include "../er7_algorithms/NL2_Integrator.hh" - #include "../er7_algorithms/RK2_Integrator.hh" - #include "../er7_algorithms/RK4_Integrator.hh" - #include "../er7_algorithms/RKF45_Integrator.hh" - #include "../er7_algorithms/RKF78_Integrator.hh" - #include "../er7_algorithms/RKG4_Integrator.hh" -#else - #include "../trick_algorithms/ABM_Integrator.hh" - #include "../trick_algorithms/Euler_Cromer_Integrator.hh" - #include "../trick_algorithms/Euler_Integrator.hh" - #include "../trick_algorithms/MM4_Integrator.hh" - #include "../trick_algorithms/NL2_Integrator.hh" - #include "../trick_algorithms/RK2_Integrator.hh" - #include "../trick_algorithms/RK4_Integrator.hh" - #include "../trick_algorithms/RKF45_Integrator.hh" - #include "../trick_algorithms/RKF78_Integrator.hh" - #include "../trick_algorithms/RKG4_Integrator.hh" -#endif - -#endif - -#endif diff --git a/trick_source/sim_services/Integrator/src/IntegLoopManager.cpp b/trick_source/sim_services/Integrator/src/IntegLoopManager.cpp index 84b4df16..76ff1816 100644 --- a/trick_source/sim_services/Integrator/src/IntegLoopManager.cpp +++ b/trick_source/sim_services/Integrator/src/IntegLoopManager.cpp @@ -13,18 +13,18 @@ Programmers: // Local includes -#include "../include/IntegLoopManager.hh" +#include "trick/IntegLoopManager.hh" -#include "../include/Integrator.hh" -#include "../include/IntegJobClassId.hh" -#include "../include/IntegLoopScheduler.hh" +#include "trick/Integrator.hh" +#include "trick/IntegJobClassId.hh" +#include "trick/IntegLoopScheduler.hh" // Trick includes -#include "sim_services/MemoryManager/include/MemoryManager.hh" -#include "sim_services/Message/include/message_proto.h" -#include "sim_services/Message/include/message_type.h" -#include "sim_services/Executive/include/exec_proto.hh" -#include "sim_services/Executive/include/exec_proto.h" +#include "trick/MemoryManager.hh" +#include "trick/message_proto.h" +#include "trick/message_type.h" +#include "trick/exec_proto.hh" +#include "trick/exec_proto.h" // System includes #include <cmath> diff --git a/trick_source/sim_services/Integrator/src/IntegLoopScheduler.cpp b/trick_source/sim_services/Integrator/src/IntegLoopScheduler.cpp index ddfbeb4d..0d524dc0 100644 --- a/trick_source/sim_services/Integrator/src/IntegLoopScheduler.cpp +++ b/trick_source/sim_services/Integrator/src/IntegLoopScheduler.cpp @@ -1,15 +1,15 @@ // Local includes -#include "../include/IntegLoopScheduler.hh" +#include "trick/IntegLoopScheduler.hh" -#include "../include/IntegLoopManager.hh" -#include "../include/IntegJobClassId.hh" +#include "trick/IntegLoopManager.hh" +#include "trick/IntegJobClassId.hh" // Trick includes -#include "sim_services/Executive/include/exec_proto.h" -#include "sim_services/Message/include/message_proto.h" -#include "sim_services/Message/include/message_type.h" +#include "trick/exec_proto.h" +#include "trick/message_proto.h" +#include "trick/message_type.h" // System includes #include <iostream> diff --git a/trick_source/sim_services/Integrator/src/IntegLoopSimObject.cpp b/trick_source/sim_services/Integrator/src/IntegLoopSimObject.cpp index bd49fb3e..36473cf4 100644 --- a/trick_source/sim_services/Integrator/src/IntegLoopSimObject.cpp +++ b/trick_source/sim_services/Integrator/src/IntegLoopSimObject.cpp @@ -1,7 +1,7 @@ -#include "sim_services/Integrator/include/IntegLoopSimObject.hh" -#include "sim_services/Executive/include/exec_proto.hh" -#include "sim_services/CheckPointRestart/include/checkpoint_stl.hh" +#include "trick/IntegLoopSimObject.hh" +#include "trick/exec_proto.hh" +#include "trick/checkpoint_stl.hh" void IntegLoopSimObject::add_jobs(double in_cycle, unsigned int child) { Trick::JobData * job ; diff --git a/trick_source/sim_services/Integrator/src/Integrator.cpp b/trick_source/sim_services/Integrator/src/Integrator.cpp index 6c451136..59be23fa 100644 --- a/trick_source/sim_services/Integrator/src/Integrator.cpp +++ b/trick_source/sim_services/Integrator/src/Integrator.cpp @@ -1,6 +1,6 @@ -#include "Integrator.hh" -#include "sim_services/Message/include/message_proto.h" -#include "sim_services/Message/include/message_type.h" +#include "trick/Integrator.hh" +#include "trick/message_proto.h" +#include "trick/message_type.h" #include <cstdarg> #include <iostream> diff --git a/trick_source/sim_services/Integrator/src/Integrator_C_Intf.cpp b/trick_source/sim_services/Integrator/src/Integrator_C_Intf.cpp index c5f35714..d98c423c 100644 --- a/trick_source/sim_services/Integrator/src/Integrator_C_Intf.cpp +++ b/trick_source/sim_services/Integrator/src/Integrator_C_Intf.cpp @@ -1,8 +1,8 @@ -#include "integrator_c_intf.h" -#include "Integrator.hh" -#include "sim_services/Message/include/message_proto.h" -#include "sim_services/Message/include/message_type.h" +#include "trick/integrator_c_intf.h" +#include "trick/Integrator.hh" +#include "trick/message_proto.h" +#include "trick/message_type.h" #include <stdarg.h> #include <iostream> diff --git a/trick_source/sim_services/Integrator/src/getIntegrator.cpp b/trick_source/sim_services/Integrator/src/getIntegrator.cpp index 6055a158..31c774f1 100644 --- a/trick_source/sim_services/Integrator/src/getIntegrator.cpp +++ b/trick_source/sim_services/Integrator/src/getIntegrator.cpp @@ -16,9 +16,9 @@ Programmers: #include <iostream> // Trick includes -#include "sim_services/MemoryManager/include/memorymanager_c_intf.h" -#include "sim_services/Message/include/message_proto.h" -#include "sim_services/Message/include/message_type.h" +#include "trick/memorymanager_c_intf.h" +#include "trick/message_proto.h" +#include "trick/message_type.h" #ifdef USE_ER7_UTILS_INTEGRATORS // Interface includes @@ -29,8 +29,8 @@ Programmers: #endif // Local includes -#include "../include/Integrator.hh" -#include "../include/IntegAlgorithms.hh" +#include "trick/Integrator.hh" +#include "trick/IntegAlgorithms.hh" #ifdef USE_ER7_UTILS_INTEGRATORS /** diff --git a/trick_source/sim_services/Integrator/src/regula_falsi.c b/trick_source/sim_services/Integrator/src/regula_falsi.c index 5c7a8c52..b3c86458 100644 --- a/trick_source/sim_services/Integrator/src/regula_falsi.c +++ b/trick_source/sim_services/Integrator/src/regula_falsi.c @@ -2,7 +2,7 @@ #include <math.h> #define M_ABS(x) ((x) < 0 ? -(x) : (x)) -#include "regula_falsi.h" +#include "trick/regula_falsi.h" double regula_falsi( /* Return: Est. time to go to err diff --git a/trick_source/sim_services/Integrator/src/reset_regula_falsi.c b/trick_source/sim_services/Integrator/src/reset_regula_falsi.c index eec34ae5..1fa6b7fb 100644 --- a/trick_source/sim_services/Integrator/src/reset_regula_falsi.c +++ b/trick_source/sim_services/Integrator/src/reset_regula_falsi.c @@ -19,7 +19,7 @@ PROGRAMMERS: current simulation time. */ -#include "regula_falsi.h" +#include "trick/regula_falsi.h" void reset_regula_falsi( /* Return: Estimated time (seconds) to go to error diff --git a/trick_source/sim_services/Integrator/trick_algorithms/ABM_Integrator.cpp b/trick_source/sim_services/Integrator/trick_algorithms/ABM_Integrator.cpp index 7475e85e..2194682b 100644 --- a/trick_source/sim_services/Integrator/trick_algorithms/ABM_Integrator.cpp +++ b/trick_source/sim_services/Integrator/trick_algorithms/ABM_Integrator.cpp @@ -1,5 +1,5 @@ -#include "ABM_Integrator.hh" -#include "sim_services/Message/include/message_proto.h" +#include "trick/trick_algorithms/ABM_Integrator.hh" +#include "trick/message_proto.h" /** */ diff --git a/trick_source/sim_services/Integrator/trick_algorithms/Euler_Cromer_Integrator.cpp b/trick_source/sim_services/Integrator/trick_algorithms/Euler_Cromer_Integrator.cpp index 59d05544..39432582 100644 --- a/trick_source/sim_services/Integrator/trick_algorithms/Euler_Cromer_Integrator.cpp +++ b/trick_source/sim_services/Integrator/trick_algorithms/Euler_Cromer_Integrator.cpp @@ -1,5 +1,5 @@ -#include "Euler_Cromer_Integrator.hh" -#include "sim_services/Message/include/message_proto.h" +#include "trick/trick_algorithms/Euler_Cromer_Integrator.hh" +#include "trick/message_proto.h" #include <cstdarg> /** diff --git a/trick_source/sim_services/Integrator/trick_algorithms/Euler_Integrator.cpp b/trick_source/sim_services/Integrator/trick_algorithms/Euler_Integrator.cpp index beae964b..cbe07ab8 100644 --- a/trick_source/sim_services/Integrator/trick_algorithms/Euler_Integrator.cpp +++ b/trick_source/sim_services/Integrator/trick_algorithms/Euler_Integrator.cpp @@ -1,5 +1,5 @@ -#include "Euler_Integrator.hh" -#include "sim_services/Message/include/message_proto.h" +#include "trick/trick_algorithms/Euler_Integrator.hh" +#include "trick/message_proto.h" #include <iostream> #include <stdlib.h> diff --git a/trick_source/sim_services/Integrator/trick_algorithms/MM4_Integrator.cpp b/trick_source/sim_services/Integrator/trick_algorithms/MM4_Integrator.cpp index 31407b7a..e5ffad06 100644 --- a/trick_source/sim_services/Integrator/trick_algorithms/MM4_Integrator.cpp +++ b/trick_source/sim_services/Integrator/trick_algorithms/MM4_Integrator.cpp @@ -1,5 +1,5 @@ -#include "MM4_Integrator.hh" -#include "sim_services/Message/include/message_proto.h" +#include "trick/trick_algorithms/MM4_Integrator.hh" +#include "trick/message_proto.h" /** */ diff --git a/trick_source/sim_services/Integrator/trick_algorithms/NL2_Integrator.cpp b/trick_source/sim_services/Integrator/trick_algorithms/NL2_Integrator.cpp index 5c07cb46..97e3c740 100644 --- a/trick_source/sim_services/Integrator/trick_algorithms/NL2_Integrator.cpp +++ b/trick_source/sim_services/Integrator/trick_algorithms/NL2_Integrator.cpp @@ -1,5 +1,5 @@ -#include "NL2_Integrator.hh" -#include "sim_services/Message/include/message_proto.h" +#include "trick/trick_algorithms/NL2_Integrator.hh" +#include "trick/message_proto.h" /** */ diff --git a/trick_source/sim_services/Integrator/trick_algorithms/RK2_Integrator.cpp b/trick_source/sim_services/Integrator/trick_algorithms/RK2_Integrator.cpp index 031e5b49..c491800b 100644 --- a/trick_source/sim_services/Integrator/trick_algorithms/RK2_Integrator.cpp +++ b/trick_source/sim_services/Integrator/trick_algorithms/RK2_Integrator.cpp @@ -1,7 +1,7 @@ -#include "RK2_Integrator.hh" +#include "trick/trick_algorithms/RK2_Integrator.hh" #include <iostream> -#include "sim_services/Message/include/message_proto.h" +#include "trick/message_proto.h" /** */ diff --git a/trick_source/sim_services/Integrator/trick_algorithms/RK4_Integrator.cpp b/trick_source/sim_services/Integrator/trick_algorithms/RK4_Integrator.cpp index f1394864..2bb1d83e 100644 --- a/trick_source/sim_services/Integrator/trick_algorithms/RK4_Integrator.cpp +++ b/trick_source/sim_services/Integrator/trick_algorithms/RK4_Integrator.cpp @@ -1,5 +1,5 @@ -#include "RK4_Integrator.hh" -#include "sim_services/Message/include/message_proto.h" +#include "trick/trick_algorithms/RK4_Integrator.hh" +#include "trick/message_proto.h" /** */ diff --git a/trick_source/sim_services/Integrator/trick_algorithms/RKF45_Integrator.cpp b/trick_source/sim_services/Integrator/trick_algorithms/RKF45_Integrator.cpp index 4c938278..93e079f6 100644 --- a/trick_source/sim_services/Integrator/trick_algorithms/RKF45_Integrator.cpp +++ b/trick_source/sim_services/Integrator/trick_algorithms/RKF45_Integrator.cpp @@ -1,5 +1,5 @@ -#include "RKF45_Integrator.hh" -#include "sim_services/Message/include/message_proto.h" +#include "trick/trick_algorithms/RKF45_Integrator.hh" +#include "trick/message_proto.h" /** */ diff --git a/trick_source/sim_services/Integrator/trick_algorithms/RKF78_Integrator.cpp b/trick_source/sim_services/Integrator/trick_algorithms/RKF78_Integrator.cpp index 5b906596..a804b8fb 100644 --- a/trick_source/sim_services/Integrator/trick_algorithms/RKF78_Integrator.cpp +++ b/trick_source/sim_services/Integrator/trick_algorithms/RKF78_Integrator.cpp @@ -1,5 +1,5 @@ -#include "RKF78_Integrator.hh" -#include "sim_services/Message/include/message_proto.h" +#include "trick/trick_algorithms/RKF78_Integrator.hh" +#include "trick/message_proto.h" /** */ diff --git a/trick_source/sim_services/Integrator/trick_algorithms/RKG4_Integrator.cpp b/trick_source/sim_services/Integrator/trick_algorithms/RKG4_Integrator.cpp index 87c2fba2..7138ed7a 100644 --- a/trick_source/sim_services/Integrator/trick_algorithms/RKG4_Integrator.cpp +++ b/trick_source/sim_services/Integrator/trick_algorithms/RKG4_Integrator.cpp @@ -1,5 +1,5 @@ -#include "RKG4_Integrator.hh" -#include "sim_services/Message/include/message_proto.h" +#include "trick/trick_algorithms/RKG4_Integrator.hh" +#include "trick/message_proto.h" /** */ diff --git a/trick_source/sim_services/JITInputFile/src/JITEvent.cpp b/trick_source/sim_services/JITInputFile/JITEvent.cpp similarity index 84% rename from trick_source/sim_services/JITInputFile/src/JITEvent.cpp rename to trick_source/sim_services/JITInputFile/JITEvent.cpp index a8b8bfff..eeed683b 100644 --- a/trick_source/sim_services/JITInputFile/src/JITEvent.cpp +++ b/trick_source/sim_services/JITInputFile/JITEvent.cpp @@ -1,8 +1,8 @@ -#include "sim_services/JITInputFile/include/JITEvent.hh" -#include "sim_services/JITInputFile/include/jit_input_file_proto.hh" -#include "sim_services/Executive/include/exec_proto.h" -#include "sim_services/Message/include/message_proto.h" +#include "trick/JITEvent.hh" +#include "trick/jit_input_file_proto.hh" +#include "trick/exec_proto.h" +#include "trick/message_proto.h" // Default constructor used by Trick for checkpoints. Trick::JITEvent::JITEvent() : diff --git a/trick_source/sim_services/JITInputFile/src/JITInputFile.cpp b/trick_source/sim_services/JITInputFile/JITInputFile.cpp similarity index 95% rename from trick_source/sim_services/JITInputFile/src/JITInputFile.cpp rename to trick_source/sim_services/JITInputFile/JITInputFile.cpp index 1b7bf350..cf10ad1c 100644 --- a/trick_source/sim_services/JITInputFile/src/JITInputFile.cpp +++ b/trick_source/sim_services/JITInputFile/JITInputFile.cpp @@ -13,14 +13,14 @@ #include <errno.h> -#include "sim_services/JITInputFile/include/JITInputFile.hh" -#include "sim_services/CommandLineArguments/include/command_line_protos.h" -#include "sim_services/Message/include/message_type.h" -#include "sim_services/Message/include/message_proto.h" -#include "sim_services/Environment/include/env_proto.h" -#include "sim_services/Executive/include/exec_proto.h" -#include "sim_services/Executive/include/exec_proto.hh" -#include "sim_services/include/TrickConstant.hh" +#include "trick/JITInputFile.hh" +#include "trick/command_line_protos.h" +#include "trick/message_type.h" +#include "trick/message_proto.h" +#include "trick/env_proto.h" +#include "trick/exec_proto.h" +#include "trick/exec_proto.hh" +#include "trick/TrickConstant.hh" Trick::JITInputFile * the_jit = NULL ; diff --git a/trick_source/sim_services/JITInputFile/Makefile b/trick_source/sim_services/JITInputFile/Makefile index 3029433b..a181cedf 100644 --- a/trick_source/sim_services/JITInputFile/Makefile +++ b/trick_source/sim_services/JITInputFile/Makefile @@ -1,5 +1,5 @@ -include ${TRICK_HOME}/makefiles/Makefile.common -include ${TRICK_HOME}/makefiles/Makefile.tricklib +include ${TRICK_HOME}/share/trick/makefiles/Makefile.common +include ${TRICK_HOME}/share/trick/makefiles/Makefile.tricklib -include Makefile_deps diff --git a/trick_source/sim_services/JITInputFile/Makefile_deps b/trick_source/sim_services/JITInputFile/Makefile_deps index 70fb704c..1cb076bb 100644 --- a/trick_source/sim_services/JITInputFile/Makefile_deps +++ b/trick_source/sim_services/JITInputFile/Makefile_deps @@ -1,74 +1,79 @@ -object_${TRICK_HOST_CPU}/JITEvent.o: src/JITEvent.cpp \ - ${TRICK_HOME}/trick_source/sim_services/JITInputFile/include/JITEvent.hh \ - ${TRICK_HOME}/trick_source/sim_services/EventManager/include/Event.hh \ - ${TRICK_HOME}/trick_source/sim_services/include/mm_macros.hh \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/memorymanager_c_intf.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/parameter_types.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/attributes.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/reference.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/value.h \ - ${TRICK_HOME}/trick_source/trick_utils/trick_adt/include/dllist.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/var.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/io_alloc.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/MemoryManager.hh \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/mm_error.h \ - ${TRICK_HOME}/trick_source/sim_services/CheckPointAgent/include/CheckPointAgent.hh \ - ${TRICK_HOME}/trick_source/trick_utils/units/include/UCFn.hh \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/exec_proto.h \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/sim_mode.h -object_${TRICK_HOST_CPU}/JITInputFile.o: src/JITInputFile.cpp \ - ${TRICK_HOME}/trick_source/sim_services/JITInputFile/include/JITInputFile.hh \ - ${TRICK_HOME}/trick_source/sim_services/JITInputFile/include/JITEvent.hh \ - ${TRICK_HOME}/trick_source/sim_services/EventManager/include/Event.hh \ - ${TRICK_HOME}/trick_source/sim_services/include/mm_macros.hh \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/memorymanager_c_intf.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/parameter_types.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/attributes.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/reference.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/value.h \ - ${TRICK_HOME}/trick_source/trick_utils/trick_adt/include/dllist.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/var.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/io_alloc.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/MemoryManager.hh \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/mm_error.h \ - ${TRICK_HOME}/trick_source/sim_services/CheckPointAgent/include/CheckPointAgent.hh \ - ${TRICK_HOME}/trick_source/trick_utils/units/include/UCFn.hh \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/exec_proto.h \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/sim_mode.h \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/JobData.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/InstrumentBase.hh \ - ${TRICK_HOME}/trick_source/sim_services/CommandLineArguments/include/command_line_protos.h \ - ${TRICK_HOME}/trick_source/sim_services/Message/include/message_type.h \ - ${TRICK_HOME}/trick_source/sim_services/Message/include/message_proto.h \ - ${TRICK_HOME}/trick_source/sim_services/Message/include/message_type.h \ - ${TRICK_HOME}/trick_source/sim_services/Environment/include/env_proto.h \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/exec_proto.hh \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/Executive.hh \ - ${TRICK_HOME}/trick_source/sim_services/Scheduler/include/Scheduler.hh \ - ${TRICK_HOME}/trick_source/sim_services/ScheduledJobQueue/include/ScheduledJobQueue.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/SimObject.hh \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/Threads.hh \ - ${TRICK_HOME}/trick_source/sim_services/include/TrickConstant.hh -object_${TRICK_HOST_CPU}/jit_input_file_c_intf.o: src/jit_input_file_c_intf.cpp \ - ${TRICK_HOME}/trick_source/sim_services/JITInputFile/include/jit_input_file_proto.hh \ - ${TRICK_HOME}/trick_source/sim_services/JITInputFile/include/JITInputFile.hh \ - ${TRICK_HOME}/trick_source/sim_services/JITInputFile/include/JITEvent.hh \ - ${TRICK_HOME}/trick_source/sim_services/EventManager/include/Event.hh \ - ${TRICK_HOME}/trick_source/sim_services/include/mm_macros.hh \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/memorymanager_c_intf.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/parameter_types.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/attributes.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/reference.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/value.h \ - ${TRICK_HOME}/trick_source/trick_utils/trick_adt/include/dllist.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/var.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/io_alloc.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/MemoryManager.hh \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/mm_error.h \ - ${TRICK_HOME}/trick_source/sim_services/CheckPointAgent/include/CheckPointAgent.hh \ - ${TRICK_HOME}/trick_source/trick_utils/units/include/UCFn.hh \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/exec_proto.h \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/sim_mode.h \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/JobData.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/InstrumentBase.hh \ - ${TRICK_HOME}/trick_source/sim_services/EventManager/include/EventManager_c_intf.hh +object_${TRICK_HOST_CPU}/JITEvent.o: JITEvent.cpp ${TRICK_HOME}/include/trick/JITEvent.hh \ + ${TRICK_HOME}/include/trick/mm_macros.hh \ + ${TRICK_HOME}/include/trick/memorymanager_c_intf.h \ + ${TRICK_HOME}/include/trick/parameter_types.h \ + ${TRICK_HOME}/include/trick/attributes.h \ + ${TRICK_HOME}/include/trick/reference.h \ + ${TRICK_HOME}/include/trick/value.h \ + ${TRICK_HOME}/include/trick/dllist.h \ + ${TRICK_HOME}/include/trick/var.h \ + ${TRICK_HOME}/include/trick/io_alloc.h \ + ${TRICK_HOME}/include/trick/MemoryManager.hh \ + ${TRICK_HOME}/include/trick/mm_error.h \ + ${TRICK_HOME}/include/trick/CheckPointAgent.hh \ + ${TRICK_HOME}/include/trick/UCFn.hh \ + ${TRICK_HOME}/include/trick/Event.hh \ + ${TRICK_HOME}/include/trick/exec_proto.h \ + ${TRICK_HOME}/include/trick/sim_mode.h \ + ${TRICK_HOME}/include/trick/jit_input_file_proto.hh \ + ${TRICK_HOME}/include/trick/message_proto.h \ + ${TRICK_HOME}/include/trick/message_type.h +object_${TRICK_HOST_CPU}/jit_input_file_c_intf.o: jit_input_file_c_intf.cpp \ + ${TRICK_HOME}/include/trick/jit_input_file_proto.hh \ + ${TRICK_HOME}/include/trick/JITInputFile.hh \ + ${TRICK_HOME}/include/trick/JITEvent.hh \ + ${TRICK_HOME}/include/trick/mm_macros.hh \ + ${TRICK_HOME}/include/trick/memorymanager_c_intf.h \ + ${TRICK_HOME}/include/trick/parameter_types.h \ + ${TRICK_HOME}/include/trick/attributes.h \ + ${TRICK_HOME}/include/trick/reference.h \ + ${TRICK_HOME}/include/trick/value.h \ + ${TRICK_HOME}/include/trick/dllist.h \ + ${TRICK_HOME}/include/trick/var.h \ + ${TRICK_HOME}/include/trick/io_alloc.h \ + ${TRICK_HOME}/include/trick/MemoryManager.hh \ + ${TRICK_HOME}/include/trick/mm_error.h \ + ${TRICK_HOME}/include/trick/CheckPointAgent.hh \ + ${TRICK_HOME}/include/trick/UCFn.hh \ + ${TRICK_HOME}/include/trick/Event.hh \ + ${TRICK_HOME}/include/trick/exec_proto.h \ + ${TRICK_HOME}/include/trick/sim_mode.h \ + ${TRICK_HOME}/include/trick/JobData.hh \ + ${TRICK_HOME}/include/trick/InstrumentBase.hh \ + ${TRICK_HOME}/include/trick/EventManager_c_intf.hh +object_${TRICK_HOST_CPU}/JITInputFile.o: JITInputFile.cpp \ + ${TRICK_HOME}/include/trick/JITInputFile.hh \ + ${TRICK_HOME}/include/trick/JITEvent.hh \ + ${TRICK_HOME}/include/trick/mm_macros.hh \ + ${TRICK_HOME}/include/trick/memorymanager_c_intf.h \ + ${TRICK_HOME}/include/trick/parameter_types.h \ + ${TRICK_HOME}/include/trick/attributes.h \ + ${TRICK_HOME}/include/trick/reference.h \ + ${TRICK_HOME}/include/trick/value.h \ + ${TRICK_HOME}/include/trick/dllist.h \ + ${TRICK_HOME}/include/trick/var.h \ + ${TRICK_HOME}/include/trick/io_alloc.h \ + ${TRICK_HOME}/include/trick/MemoryManager.hh \ + ${TRICK_HOME}/include/trick/mm_error.h \ + ${TRICK_HOME}/include/trick/CheckPointAgent.hh \ + ${TRICK_HOME}/include/trick/UCFn.hh \ + ${TRICK_HOME}/include/trick/Event.hh \ + ${TRICK_HOME}/include/trick/exec_proto.h \ + ${TRICK_HOME}/include/trick/sim_mode.h \ + ${TRICK_HOME}/include/trick/JobData.hh \ + ${TRICK_HOME}/include/trick/InstrumentBase.hh \ + ${TRICK_HOME}/include/trick/command_line_protos.h \ + ${TRICK_HOME}/include/trick/message_type.h \ + ${TRICK_HOME}/include/trick/message_proto.h \ + ${TRICK_HOME}/include/trick/env_proto.h \ + ${TRICK_HOME}/include/trick/exec_proto.hh \ + ${TRICK_HOME}/include/trick/Executive.hh \ + ${TRICK_HOME}/include/trick/Scheduler.hh \ + ${TRICK_HOME}/include/trick/ScheduledJobQueue.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/ScheduledJobQueue.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/Threads.hh \ + ${TRICK_HOME}/include/trick/ThreadBase.hh \ + ${TRICK_HOME}/include/trick/sim_mode.h \ + ${TRICK_HOME}/include/trick/TrickConstant.hh diff --git a/trick_source/sim_services/JITInputFile/main_page.dox_in b/trick_source/sim_services/JITInputFile/docs/main_page.dox_in similarity index 100% rename from trick_source/sim_services/JITInputFile/main_page.dox_in rename to trick_source/sim_services/JITInputFile/docs/main_page.dox_in diff --git a/trick_source/sim_services/JITInputFile/src/jit_input_file_c_intf.cpp b/trick_source/sim_services/JITInputFile/jit_input_file_c_intf.cpp similarity index 90% rename from trick_source/sim_services/JITInputFile/src/jit_input_file_c_intf.cpp rename to trick_source/sim_services/JITInputFile/jit_input_file_c_intf.cpp index 54b77eac..d16730dd 100644 --- a/trick_source/sim_services/JITInputFile/src/jit_input_file_c_intf.cpp +++ b/trick_source/sim_services/JITInputFile/jit_input_file_c_intf.cpp @@ -1,9 +1,9 @@ #include <cmath> -#include "sim_services/JITInputFile/include/jit_input_file_proto.hh" -#include "sim_services/JITInputFile/include/JITInputFile.hh" -#include "sim_services/Executive/include/exec_proto.h" -#include "sim_services/EventManager/include/EventManager_c_intf.hh" +#include "trick/jit_input_file_proto.hh" +#include "trick/JITInputFile.hh" +#include "trick/exec_proto.h" +#include "trick/EventManager_c_intf.hh" extern Trick::JITInputFile * the_jit ; diff --git a/trick_source/sim_services/JITInputFile/src/makefile b/trick_source/sim_services/JITInputFile/src/makefile deleted file mode 100644 index 753bd7f7..00000000 --- a/trick_source/sim_services/JITInputFile/src/makefile +++ /dev/null @@ -1,6 +0,0 @@ - -all: - ${MAKE} -C .. - -clean: - ${MAKE} -C .. clean diff --git a/trick_source/sim_services/JSONVariableServer/src/JSONVariableServer.cpp b/trick_source/sim_services/JSONVariableServer/JSONVariableServer.cpp similarity index 94% rename from trick_source/sim_services/JSONVariableServer/src/JSONVariableServer.cpp rename to trick_source/sim_services/JSONVariableServer/JSONVariableServer.cpp index a6af8c1f..01d270fe 100644 --- a/trick_source/sim_services/JSONVariableServer/src/JSONVariableServer.cpp +++ b/trick_source/sim_services/JSONVariableServer/JSONVariableServer.cpp @@ -3,11 +3,11 @@ #include <pwd.h> #include <sstream> -#include "sim_services/JSONVariableServer/include/JSONVariableServer.hh" -#include "sim_services/JSONVariableServer/include/JSONVariableServerThread.hh" -#include "trick_utils/comm/include/tc_proto.h" -#include "sim_services/Message/include/message_proto.h" -#include "sim_services/Message/include/message_type.h" +#include "trick/JSONVariableServer.hh" +#include "trick/JSONVariableServerThread.hh" +#include "trick/tc_proto.h" +#include "trick/message_proto.h" +#include "trick/message_type.h" Trick::JSONVariableServer::JSONVariableServer() : Trick::ThreadBase("JSONVarServLis"), diff --git a/trick_source/sim_services/JSONVariableServer/src/JSONVariableServerThread.cpp b/trick_source/sim_services/JSONVariableServer/JSONVariableServerThread.cpp similarity index 96% rename from trick_source/sim_services/JSONVariableServer/src/JSONVariableServerThread.cpp rename to trick_source/sim_services/JSONVariableServer/JSONVariableServerThread.cpp index 4544a84c..301453b9 100644 --- a/trick_source/sim_services/JSONVariableServer/src/JSONVariableServerThread.cpp +++ b/trick_source/sim_services/JSONVariableServer/JSONVariableServerThread.cpp @@ -4,13 +4,13 @@ #include <stdlib.h> #include <string.h> -#include "sim_services/JSONVariableServer/include/JSONVariableServerThread.hh" -#include "sim_services/MemoryManager/include/MemoryManager.hh" -#include "sim_services/MemoryManager/include/memorymanager_c_intf.h" -#include "sim_services/Executive/include/exec_proto.h" -#include "sim_services/CheckPointAgent/include/PythonPrint.hh" -#include "trick_utils/comm/include/tc_proto.h" -#include "sim_services/include/TrickConstant.hh" +#include "trick/JSONVariableServerThread.hh" +#include "trick/MemoryManager.hh" +#include "trick/memorymanager_c_intf.h" +#include "trick/exec_proto.h" +#include "trick/PythonPrint.hh" +#include "trick/tc_proto.h" +#include "trick/TrickConstant.hh" Trick::JSONVariableServerThread::JSONVariableServerThread(TCDevice * listen_dev) : Trick::ThreadBase("JSONVarServer") { diff --git a/trick_source/sim_services/JSONVariableServer/Makefile b/trick_source/sim_services/JSONVariableServer/Makefile index 3029433b..a181cedf 100644 --- a/trick_source/sim_services/JSONVariableServer/Makefile +++ b/trick_source/sim_services/JSONVariableServer/Makefile @@ -1,5 +1,5 @@ -include ${TRICK_HOME}/makefiles/Makefile.common -include ${TRICK_HOME}/makefiles/Makefile.tricklib +include ${TRICK_HOME}/share/trick/makefiles/Makefile.common +include ${TRICK_HOME}/share/trick/makefiles/Makefile.tricklib -include Makefile_deps diff --git a/trick_source/sim_services/JSONVariableServer/Makefile_deps b/trick_source/sim_services/JSONVariableServer/Makefile_deps new file mode 100644 index 00000000..45fade5d --- /dev/null +++ b/trick_source/sim_services/JSONVariableServer/Makefile_deps @@ -0,0 +1,37 @@ +object_${TRICK_HOST_CPU}/JSONVariableServer.o: JSONVariableServer.cpp \ + ${TRICK_HOME}/include/trick/JSONVariableServer.hh \ + ${TRICK_HOME}/include/trick/tc.h \ + ${TRICK_HOME}/include/trick/trick_byteswap.h \ + ${TRICK_HOME}/include/trick/trick_error_hndlr.h \ + ${TRICK_HOME}/include/trick/ThreadBase.hh \ + ${TRICK_HOME}/include/trick/JSONVariableServerThread.hh \ + ${TRICK_HOME}/include/trick/tc_proto.h \ + ${TRICK_HOME}/include/trick/tc.h \ + ${TRICK_HOME}/include/trick/attributes.h \ + ${TRICK_HOME}/include/trick/parameter_types.h \ + ${TRICK_HOME}/include/trick/message_proto.h \ + ${TRICK_HOME}/include/trick/message_type.h +object_${TRICK_HOST_CPU}/JSONVariableServerThread.o: JSONVariableServerThread.cpp \ + ${TRICK_HOME}/include/trick/JSONVariableServerThread.hh \ + ${TRICK_HOME}/include/trick/tc.h \ + ${TRICK_HOME}/include/trick/trick_byteswap.h \ + ${TRICK_HOME}/include/trick/trick_error_hndlr.h \ + ${TRICK_HOME}/include/trick/ThreadBase.hh \ + ${TRICK_HOME}/include/trick/MemoryManager.hh \ + ${TRICK_HOME}/include/trick/attributes.h \ + ${TRICK_HOME}/include/trick/parameter_types.h \ + ${TRICK_HOME}/include/trick/reference.h \ + ${TRICK_HOME}/include/trick/value.h \ + ${TRICK_HOME}/include/trick/dllist.h \ + ${TRICK_HOME}/include/trick/io_alloc.h \ + ${TRICK_HOME}/include/trick/mm_error.h \ + ${TRICK_HOME}/include/trick/var.h \ + ${TRICK_HOME}/include/trick/CheckPointAgent.hh \ + ${TRICK_HOME}/include/trick/UCFn.hh \ + ${TRICK_HOME}/include/trick/memorymanager_c_intf.h \ + ${TRICK_HOME}/include/trick/exec_proto.h \ + ${TRICK_HOME}/include/trick/sim_mode.h \ + ${TRICK_HOME}/include/trick/PythonPrint.hh \ + ${TRICK_HOME}/include/trick/tc_proto.h \ + ${TRICK_HOME}/include/trick/tc.h \ + ${TRICK_HOME}/include/trick/TrickConstant.hh diff --git a/trick_source/sim_services/JSONVariableServer/src/makefile b/trick_source/sim_services/JSONVariableServer/src/makefile deleted file mode 100644 index 753bd7f7..00000000 --- a/trick_source/sim_services/JSONVariableServer/src/makefile +++ /dev/null @@ -1,6 +0,0 @@ - -all: - ${MAKE} -C .. - -clean: - ${MAKE} -C .. clean diff --git a/trick_source/sim_services/MasterSlave/src/MSSharedMem.cpp b/trick_source/sim_services/MasterSlave/MSSharedMem.cpp similarity index 98% rename from trick_source/sim_services/MasterSlave/src/MSSharedMem.cpp rename to trick_source/sim_services/MasterSlave/MSSharedMem.cpp index 63fd8258..f68fe7af 100644 --- a/trick_source/sim_services/MasterSlave/src/MSSharedMem.cpp +++ b/trick_source/sim_services/MasterSlave/MSSharedMem.cpp @@ -4,9 +4,9 @@ #include <cstring> // for memcpy #include <unistd.h> -#include "sim_services/MasterSlave/include/MSSharedMem.hh" -#include "trick_utils/shm/include/tsm_proto.h" -#include "sim_services/CommandLineArguments/include/command_line_protos.h" +#include "trick/MSSharedMem.hh" +#include "trick/tsm_proto.h" +#include "trick/command_line_protos.h" Trick::MSSharedMem::MSSharedMem() : tsm_dev() { tsm_dev.default_val = -1; diff --git a/trick_source/sim_services/MasterSlave/src/MSSocket.cpp b/trick_source/sim_services/MasterSlave/MSSocket.cpp similarity index 95% rename from trick_source/sim_services/MasterSlave/src/MSSocket.cpp rename to trick_source/sim_services/MasterSlave/MSSocket.cpp index 05fea722..ba0d5c5a 100644 --- a/trick_source/sim_services/MasterSlave/src/MSSocket.cpp +++ b/trick_source/sim_services/MasterSlave/MSSocket.cpp @@ -3,11 +3,11 @@ #include <sstream> #include <string.h> -#include "sim_services/MasterSlave/include/MSSocket.hh" -#include "sim_services/MasterSlave/include/Master.hh" -#include "trick_utils/comm/include/tc_proto.h" -#include "sim_services/Executive/include/exec_proto.h" -#include "sim_services/CommandLineArguments/include/command_line_protos.h" +#include "trick/MSSocket.hh" +#include "trick/Master.hh" +#include "trick/tc_proto.h" +#include "trick/exec_proto.h" +#include "trick/command_line_protos.h" Trick::MSSocket::MSSocket() : tc_dev() { diff --git a/trick_source/sim_services/MasterSlave/Makefile b/trick_source/sim_services/MasterSlave/Makefile index 9831cd32..e278d427 100644 --- a/trick_source/sim_services/MasterSlave/Makefile +++ b/trick_source/sim_services/MasterSlave/Makefile @@ -1,6 +1,6 @@ -include ${TRICK_HOME}/makefiles/Makefile.common -include ${TRICK_HOME}/makefiles/Makefile.tricklib +include ${TRICK_HOME}/share/trick/makefiles/Makefile.common +include ${TRICK_HOME}/share/trick/makefiles/Makefile.tricklib -include Makefile_deps ifneq ($(DMTCP),) diff --git a/trick_source/sim_services/MasterSlave/Makefile_deps b/trick_source/sim_services/MasterSlave/Makefile_deps index 4a415601..2f34e1f8 100644 --- a/trick_source/sim_services/MasterSlave/Makefile_deps +++ b/trick_source/sim_services/MasterSlave/Makefile_deps @@ -1,54 +1,52 @@ -object_${TRICK_HOST_CPU}/MSSocket.o: src/MSSocket.cpp \ - ${TRICK_HOME}/trick_source/sim_services/MasterSlave/include/MSSocket.hh \ - ${TRICK_HOME}/trick_source/trick_utils/comm/include/tc.h \ - ${TRICK_HOME}/trick_source/trick_utils/comm/include/trick_byteswap.h \ - ${TRICK_HOME}/trick_source/trick_utils/comm/include/trick_error_hndlr.h \ - ${TRICK_HOME}/trick_source/sim_services/MasterSlave/include/MSConnect.hh \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/sim_mode.h \ - ${TRICK_HOME}/trick_source/trick_utils/comm/include/tc_proto.h \ - ${TRICK_HOME}/trick_source/trick_utils/comm/include/tc.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/attributes.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/parameter_types.h \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/exec_proto.h \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/sim_mode.h \ - ${TRICK_HOME}/trick_source/sim_services/CommandLineArguments/include/command_line_protos.h -object_${TRICK_HOST_CPU}/Slave.o: src/Slave.cpp \ - ${TRICK_HOME}/trick_source/sim_services/MasterSlave/include/Slave.hh \ - ${TRICK_HOME}/trick_source/sim_services/MasterSlave/include/MSConnect.hh \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/sim_mode.h \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/exec_proto.h \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/sim_mode.h \ - ${TRICK_HOME}/trick_source/sim_services/Message/include/message_proto.h -object_${TRICK_HOST_CPU}/MSSocket.o: src/MSSocket.cpp \ - ${TRICK_HOME}/trick_source/sim_services/MasterSlave/include/MSSocket.hh \ - ${TRICK_HOME}/trick_source/trick_utils/comm/include/tc.h \ - ${TRICK_HOME}/trick_source/trick_utils/comm/include/trick_byteswap.h \ - ${TRICK_HOME}/trick_source/trick_utils/comm/include/trick_error_hndlr.h \ - ${TRICK_HOME}/trick_source/sim_services/MasterSlave/include/MSConnect.hh \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/sim_mode.h \ - ${TRICK_HOME}/trick_source/trick_utils/comm/include/tc_proto.h \ - ${TRICK_HOME}/trick_source/trick_utils/comm/include/tc.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/attributes.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/parameter_types.h \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/exec_proto.h \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/sim_mode.h \ - ${TRICK_HOME}/trick_source/sim_services/CommandLineArguments/include/command_line_protos.h -object_${TRICK_HOST_CPU}/Master.o: src/Master.cpp \ - ${TRICK_HOME}/trick_source/sim_services/MasterSlave/include/Master.hh \ - ${TRICK_HOME}/trick_source/sim_services/MasterSlave/include/MSConnect.hh \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/sim_mode.h \ - ${TRICK_HOME}/trick_source/sim_services/include/RemoteShell.hh \ - ${TRICK_HOME}/trick_source/sim_services/MasterSlave/include/master_proto.h \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/exec_proto.h \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/sim_mode.h \ - ${TRICK_HOME}/trick_source/sim_services/CommandLineArguments/include/command_line_protos.h \ - ${TRICK_HOME}/trick_source/sim_services/include/unix_commands.h \ - ${TRICK_HOME}/trick_source/sim_services/Message/include/message_proto.h \ - ${TRICK_HOME}/trick_source/sim_services/Environment/include/env_proto.h -object_${TRICK_HOST_CPU}/Slave.o: src/Slave.cpp \ - ${TRICK_HOME}/trick_source/sim_services/MasterSlave/include/Slave.hh \ - ${TRICK_HOME}/trick_source/sim_services/MasterSlave/include/MSConnect.hh \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/sim_mode.h \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/exec_proto.h \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/sim_mode.h \ - ${TRICK_HOME}/trick_source/sim_services/Message/include/message_proto.h +object_${TRICK_HOST_CPU}/MSSocket.o: MSSocket.cpp ${TRICK_HOME}/include/trick/MSSocket.hh \ + ${TRICK_HOME}/include/trick/tc.h \ + ${TRICK_HOME}/include/trick/trick_byteswap.h \ + ${TRICK_HOME}/include/trick/trick_error_hndlr.h \ + ${TRICK_HOME}/include/trick/MSConnect.hh \ + ${TRICK_HOME}/include/trick/ms_sim_mode.h \ + ${TRICK_HOME}/include/trick/Master.hh \ + ${TRICK_HOME}/include/trick/RemoteShell.hh \ + ${TRICK_HOME}/include/trick/tc_proto.h \ + ${TRICK_HOME}/include/trick/tc.h \ + ${TRICK_HOME}/include/trick/attributes.h \ + ${TRICK_HOME}/include/trick/parameter_types.h \ + ${TRICK_HOME}/include/trick/exec_proto.h \ + ${TRICK_HOME}/include/trick/sim_mode.h \ + ${TRICK_HOME}/include/trick/command_line_protos.h +object_${TRICK_HOST_CPU}/MSSharedMem.o: MSSharedMem.cpp \ + ${TRICK_HOME}/include/trick/MSSharedMem.hh \ + ${TRICK_HOME}/include/trick/tsm.h \ + ${TRICK_HOME}/include/trick/MSConnect.hh \ + ${TRICK_HOME}/include/trick/ms_sim_mode.h \ + ${TRICK_HOME}/include/trick/release.h \ + ${TRICK_HOME}/include/trick/tsm_proto.h \ + ${TRICK_HOME}/include/trick/command_line_protos.h +object_${TRICK_HOST_CPU}/Master.o: Master.cpp ${TRICK_HOME}/include/trick/Master.hh \ + ${TRICK_HOME}/include/trick/MSConnect.hh \ + ${TRICK_HOME}/include/trick/ms_sim_mode.h \ + ${TRICK_HOME}/include/trick/RemoteShell.hh \ + ${TRICK_HOME}/include/trick/master_proto.h \ + ${TRICK_HOME}/include/trick/MSSocket.hh \ + ${TRICK_HOME}/include/trick/tc.h \ + ${TRICK_HOME}/include/trick/trick_byteswap.h \ + ${TRICK_HOME}/include/trick/trick_error_hndlr.h \ + ${TRICK_HOME}/include/trick/MSSharedMem.hh \ + ${TRICK_HOME}/include/trick/tsm.h \ + ${TRICK_HOME}/include/trick/release.h \ + ${TRICK_HOME}/include/trick/exec_proto.h \ + ${TRICK_HOME}/include/trick/sim_mode.h \ + ${TRICK_HOME}/include/trick/command_line_protos.h \ + ${TRICK_HOME}/include/trick/unix_commands.h \ + ${TRICK_HOME}/include/trick/message_proto.h \ + ${TRICK_HOME}/include/trick/message_type.h \ + ${TRICK_HOME}/include/trick/env_proto.h \ + ${TRICK_HOME}/include/trick/CheckPointRestart_c_intf.hh +object_${TRICK_HOST_CPU}/Slave.o: Slave.cpp ${TRICK_HOME}/include/trick/Slave.hh \ + ${TRICK_HOME}/include/trick/MSConnect.hh \ + ${TRICK_HOME}/include/trick/ms_sim_mode.h \ + ${TRICK_HOME}/include/trick/exec_proto.h \ + ${TRICK_HOME}/include/trick/sim_mode.h \ + ${TRICK_HOME}/include/trick/message_proto.h \ + ${TRICK_HOME}/include/trick/message_type.h \ + ${TRICK_HOME}/include/trick/CheckPointRestart_c_intf.hh \ + ${TRICK_HOME}/include/trick/command_line_protos.h diff --git a/trick_source/sim_services/MasterSlave/src/Master.cpp b/trick_source/sim_services/MasterSlave/Master.cpp similarity index 97% rename from trick_source/sim_services/MasterSlave/src/Master.cpp rename to trick_source/sim_services/MasterSlave/Master.cpp index 60d3ee5b..bc36884e 100644 --- a/trick_source/sim_services/MasterSlave/src/Master.cpp +++ b/trick_source/sim_services/MasterSlave/Master.cpp @@ -11,18 +11,18 @@ #include <sys/types.h> #include <sys/wait.h> -#include "sim_services/MasterSlave/include/Master.hh" -#include "sim_services/MasterSlave/include/master_proto.h" -#include "sim_services/MasterSlave/include/MSSocket.hh" -#include "sim_services/MasterSlave/include/MSSharedMem.hh" -#include "sim_services/Executive/include/exec_proto.h" -#include "sim_services/Executive/include/sim_mode.h" -#include "sim_services/CommandLineArguments/include/command_line_protos.h" -#include "sim_services/include/unix_commands.h" -#include "sim_services/Message/include/message_proto.h" -#include "sim_services/Message/include/message_type.h" -#include "sim_services/Environment/include/env_proto.h" -#include "sim_services/CheckPointRestart/include/CheckPointRestart_c_intf.hh" // for checkpoint_get_output_file +#include "trick/Master.hh" +#include "trick/master_proto.h" +#include "trick/MSSocket.hh" +#include "trick/MSSharedMem.hh" +#include "trick/exec_proto.h" +#include "trick/sim_mode.h" +#include "trick/command_line_protos.h" +#include "trick/unix_commands.h" +#include "trick/message_proto.h" +#include "trick/message_type.h" +#include "trick/env_proto.h" +#include "trick/CheckPointRestart_c_intf.hh" // for checkpoint_get_output_file Trick::Master * the_ms_master ; diff --git a/trick_source/sim_services/MasterSlave/src/Slave.cpp b/trick_source/sim_services/MasterSlave/Slave.cpp similarity index 97% rename from trick_source/sim_services/MasterSlave/src/Slave.cpp rename to trick_source/sim_services/MasterSlave/Slave.cpp index d4871e39..df57f58a 100644 --- a/trick_source/sim_services/MasterSlave/src/Slave.cpp +++ b/trick_source/sim_services/MasterSlave/Slave.cpp @@ -9,12 +9,12 @@ #include <stdlib.h> // for getenv #include <cstring> -#include "sim_services/MasterSlave/include/Slave.hh" -#include "sim_services/Executive/include/exec_proto.h" -#include "sim_services/Message/include/message_proto.h" -#include "sim_services/Message/include/message_type.h" -#include "sim_services/CheckPointRestart/include/CheckPointRestart_c_intf.hh" // for checkpoint -#include "sim_services/CommandLineArguments/include/command_line_protos.h" // output dir get/set +#include "trick/Slave.hh" +#include "trick/exec_proto.h" +#include "trick/message_proto.h" +#include "trick/message_type.h" +#include "trick/CheckPointRestart_c_intf.hh" // for checkpoint +#include "trick/command_line_protos.h" // output dir get/set Trick::Slave::Slave() { enabled = false ; diff --git a/trick_source/sim_services/MasterSlave/design.dox_in b/trick_source/sim_services/MasterSlave/docs/design.dox_in similarity index 100% rename from trick_source/sim_services/MasterSlave/design.dox_in rename to trick_source/sim_services/MasterSlave/docs/design.dox_in diff --git a/trick_source/sim_services/MasterSlave/main_page.dox_in b/trick_source/sim_services/MasterSlave/docs/main_page.dox_in similarity index 100% rename from trick_source/sim_services/MasterSlave/main_page.dox_in rename to trick_source/sim_services/MasterSlave/docs/main_page.dox_in diff --git a/trick_source/sim_services/MasterSlave/src/makefile b/trick_source/sim_services/MasterSlave/src/makefile deleted file mode 100644 index 753bd7f7..00000000 --- a/trick_source/sim_services/MasterSlave/src/makefile +++ /dev/null @@ -1,6 +0,0 @@ - -all: - ${MAKE} -C .. - -clean: - ${MAKE} -C .. clean diff --git a/trick_source/sim_services/MemoryManager/src/ADefParseContext.cpp b/trick_source/sim_services/MemoryManager/ADefParseContext.cpp similarity index 97% rename from trick_source/sim_services/MemoryManager/src/ADefParseContext.cpp rename to trick_source/sim_services/MemoryManager/ADefParseContext.cpp index 446061d2..a21f9322 100644 --- a/trick_source/sim_services/MemoryManager/src/ADefParseContext.cpp +++ b/trick_source/sim_services/MemoryManager/ADefParseContext.cpp @@ -64,7 +64,7 @@ Example Allocation Declaration strings: #include <stdio.h> #include <stdlib.h> -#include "sim_services/MemoryManager/include/ADefParseContext.hh" +#include "trick/ADefParseContext.hh" /** Constructor diff --git a/trick_source/sim_services/MemoryManager/Makefile b/trick_source/sim_services/MemoryManager/Makefile index dd025ad2..e7cf5896 100644 --- a/trick_source/sim_services/MemoryManager/Makefile +++ b/trick_source/sim_services/MemoryManager/Makefile @@ -1,6 +1,6 @@ -include ${TRICK_HOME}/makefiles/Makefile.common -include ${TRICK_HOME}/makefiles/Makefile.tricklib +include ${TRICK_HOME}/share/trick/makefiles/Makefile.common +include ${TRICK_HOME}/share/trick/makefiles/Makefile.tricklib -include Makefile_deps $(L_OBJS) : TRICK_CXXFLAGS += -Wno-unused-parameter -Wno-unused-function -Wno-sign-compare -x c++ diff --git a/trick_source/sim_services/MemoryManager/Makefile_deps b/trick_source/sim_services/MemoryManager/Makefile_deps index 25797381..0fdf11ad 100644 --- a/trick_source/sim_services/MemoryManager/Makefile_deps +++ b/trick_source/sim_services/MemoryManager/Makefile_deps @@ -1,541 +1,496 @@ -object_${TRICK_HOST_CPU}/insert_bitfield.o: src/insert_bitfield.c \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/bitfield_proto.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/attributes.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/parameter_types.h -object_${TRICK_HOST_CPU}/follow_address_path.o: src/follow_address_path.c \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/reference.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/attributes.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/parameter_types.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/value.h \ - ${TRICK_HOME}/trick_source/trick_utils/trick_adt/include/dllist.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/memorymanager_c_intf.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/var.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/io_alloc.h -object_${TRICK_HOST_CPU}/vval.o: src/vval.c \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/vval.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/var.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/value.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/parameter_types.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/wcs_ext.h -object_${TRICK_HOST_CPU}/parameter_types.o: src/parameter_types.c \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/parameter_types.h -object_${TRICK_HOST_CPU}/extract_bitfield.o: src/extract_bitfield.c \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/bitfield_proto.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/attributes.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/parameter_types.h -object_${TRICK_HOST_CPU}/trickTypeCharString.o: src/trickTypeCharString.c \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/parameter_types.h -object_${TRICK_HOST_CPU}/addr_bitfield.o: src/addr_bitfield.c \ - ${TRICK_HOME}/trick_source/sim_services/include/attributes.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/attributes.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/parameter_types.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/bitfield_proto.h -object_${TRICK_HOST_CPU}/ref_to_value.o: src/ref_to_value.c \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/reference.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/attributes.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/parameter_types.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/value.h \ - ${TRICK_HOME}/trick_source/trick_utils/trick_adt/include/dllist.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/mm_error.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/bitfield_proto.h -object_${TRICK_HOST_CPU}/extract_unsigned_bitfield.o: src/extract_unsigned_bitfield.c \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/bitfield_proto.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/attributes.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/parameter_types.h -object_${TRICK_HOST_CPU}/wcs_ext.o: src/wcs_ext.c \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/wcs_ext.h +object_${TRICK_HOST_CPU}/insert_bitfield.o: insert_bitfield.c \ + ${TRICK_HOME}/include/trick/bitfield_proto.h \ + ${TRICK_HOME}/include/trick/attributes.h \ + ${TRICK_HOME}/include/trick/parameter_types.h +object_${TRICK_HOST_CPU}/follow_address_path.o: follow_address_path.c \ + ${TRICK_HOME}/include/trick/reference.h \ + ${TRICK_HOME}/include/trick/attributes.h \ + ${TRICK_HOME}/include/trick/parameter_types.h \ + ${TRICK_HOME}/include/trick/value.h \ + ${TRICK_HOME}/include/trick/dllist.h \ + ${TRICK_HOME}/include/trick/memorymanager_c_intf.h \ + ${TRICK_HOME}/include/trick/var.h \ + ${TRICK_HOME}/include/trick/io_alloc.h +object_${TRICK_HOST_CPU}/vval.o: vval.c ${TRICK_HOME}/include/trick/vval.h \ + ${TRICK_HOME}/include/trick/var.h \ + ${TRICK_HOME}/include/trick/value.h \ + ${TRICK_HOME}/include/trick/parameter_types.h \ + ${TRICK_HOME}/include/trick/wcs_ext.h +object_${TRICK_HOST_CPU}/parameter_types.o: parameter_types.c \ + ${TRICK_HOME}/include/trick/parameter_types.h +object_${TRICK_HOST_CPU}/extract_bitfield.o: extract_bitfield.c \ + ${TRICK_HOME}/include/trick/bitfield_proto.h \ + ${TRICK_HOME}/include/trick/attributes.h \ + ${TRICK_HOME}/include/trick/parameter_types.h +object_${TRICK_HOST_CPU}/trickTypeCharString.o: trickTypeCharString.c \ + ${TRICK_HOME}/include/trick/parameter_types.h +object_${TRICK_HOST_CPU}/addr_bitfield.o: addr_bitfield.c \ + ${TRICK_HOME}/include/trick/attributes.h \ + ${TRICK_HOME}/include/trick/parameter_types.h \ + ${TRICK_HOME}/include/trick/bitfield_proto.h +object_${TRICK_HOST_CPU}/ref_to_value.o: ref_to_value.c \ + ${TRICK_HOME}/include/trick/reference.h \ + ${TRICK_HOME}/include/trick/attributes.h \ + ${TRICK_HOME}/include/trick/parameter_types.h \ + ${TRICK_HOME}/include/trick/value.h \ + ${TRICK_HOME}/include/trick/dllist.h \ + ${TRICK_HOME}/include/trick/mm_error.h \ + ${TRICK_HOME}/include/trick/bitfield_proto.h +object_${TRICK_HOST_CPU}/extract_unsigned_bitfield.o: extract_unsigned_bitfield.c \ + ${TRICK_HOME}/include/trick/bitfield_proto.h \ + ${TRICK_HOME}/include/trick/attributes.h \ + ${TRICK_HOME}/include/trick/parameter_types.h +object_${TRICK_HOST_CPU}/wcs_ext.o: wcs_ext.c ${TRICK_HOME}/include/trick/wcs_ext.h object_${TRICK_HOST_CPU}/MemoryManager_add_shared_library_symbols.o: \ - src/MemoryManager_add_shared_library_symbols.cpp \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/MemoryManager.hh \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/attributes.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/parameter_types.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/reference.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/value.h \ - ${TRICK_HOME}/trick_source/trick_utils/trick_adt/include/dllist.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/io_alloc.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/mm_error.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/var.h \ - ${TRICK_HOME}/trick_source/sim_services/CheckPointAgent/include/CheckPointAgent.hh \ - ${TRICK_HOME}/trick_source/trick_utils/units/include/UCFn.hh \ - ${TRICK_HOME}/trick_source/sim_services/Message/include/message_proto.h \ - ${TRICK_HOME}/trick_source/sim_services/Message/include/message_type.h -object_${TRICK_HOST_CPU}/MemoryManager.o: src/MemoryManager.cpp \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/MemoryManager.hh \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/attributes.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/parameter_types.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/reference.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/value.h \ - ${TRICK_HOME}/trick_source/trick_utils/trick_adt/include/dllist.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/io_alloc.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/mm_error.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/var.h \ - ${TRICK_HOME}/trick_source/sim_services/CheckPointAgent/include/CheckPointAgent.hh \ - ${TRICK_HOME}/trick_source/trick_utils/units/include/UCFn.hh \ - ${TRICK_HOME}/trick_source/sim_services/CheckPointAgent/include/ClassicCheckPointAgent.hh -object_${TRICK_HOST_CPU}/MemoryManager_realloc.o: src/MemoryManager_realloc.cpp \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/MemoryManager.hh \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/attributes.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/parameter_types.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/reference.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/value.h \ - ${TRICK_HOME}/trick_source/trick_utils/trick_adt/include/dllist.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/io_alloc.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/mm_error.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/var.h \ - ${TRICK_HOME}/trick_source/sim_services/CheckPointAgent/include/CheckPointAgent.hh \ - ${TRICK_HOME}/trick_source/trick_utils/units/include/UCFn.hh \ - ${TRICK_HOME}/trick_source/sim_services/Message/include/message_proto.h \ - ${TRICK_HOME}/trick_source/sim_services/Message/include/message_type.h + MemoryManager_add_shared_library_symbols.cpp \ + ${TRICK_HOME}/include/trick/MemoryManager.hh \ + ${TRICK_HOME}/include/trick/attributes.h \ + ${TRICK_HOME}/include/trick/parameter_types.h \ + ${TRICK_HOME}/include/trick/reference.h \ + ${TRICK_HOME}/include/trick/value.h \ + ${TRICK_HOME}/include/trick/dllist.h \ + ${TRICK_HOME}/include/trick/io_alloc.h \ + ${TRICK_HOME}/include/trick/mm_error.h \ + ${TRICK_HOME}/include/trick/var.h \ + ${TRICK_HOME}/include/trick/CheckPointAgent.hh \ + ${TRICK_HOME}/include/trick/UCFn.hh +object_${TRICK_HOST_CPU}/MemoryManager.o: MemoryManager.cpp \ + ${TRICK_HOME}/include/trick/MemoryManager.hh \ + ${TRICK_HOME}/include/trick/attributes.h \ + ${TRICK_HOME}/include/trick/parameter_types.h \ + ${TRICK_HOME}/include/trick/reference.h \ + ${TRICK_HOME}/include/trick/value.h \ + ${TRICK_HOME}/include/trick/dllist.h \ + ${TRICK_HOME}/include/trick/io_alloc.h \ + ${TRICK_HOME}/include/trick/mm_error.h \ + ${TRICK_HOME}/include/trick/var.h \ + ${TRICK_HOME}/include/trick/CheckPointAgent.hh \ + ${TRICK_HOME}/include/trick/UCFn.hh \ + ${TRICK_HOME}/include/trick/ClassicCheckPointAgent.hh +object_${TRICK_HOST_CPU}/MemoryManager_realloc.o: MemoryManager_realloc.cpp \ + ${TRICK_HOME}/include/trick/MemoryManager.hh \ + ${TRICK_HOME}/include/trick/attributes.h \ + ${TRICK_HOME}/include/trick/parameter_types.h \ + ${TRICK_HOME}/include/trick/reference.h \ + ${TRICK_HOME}/include/trick/value.h \ + ${TRICK_HOME}/include/trick/dllist.h \ + ${TRICK_HOME}/include/trick/io_alloc.h \ + ${TRICK_HOME}/include/trick/mm_error.h \ + ${TRICK_HOME}/include/trick/var.h \ + ${TRICK_HOME}/include/trick/CheckPointAgent.hh \ + ${TRICK_HOME}/include/trick/UCFn.hh object_${TRICK_HOST_CPU}/MemoryManager_make_reference_attr.o: \ - src/MemoryManager_make_reference_attr.cpp \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/MemoryManager.hh \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/attributes.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/parameter_types.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/reference.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/value.h \ - ${TRICK_HOME}/trick_source/trick_utils/trick_adt/include/dllist.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/io_alloc.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/mm_error.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/var.h \ - ${TRICK_HOME}/trick_source/sim_services/CheckPointAgent/include/CheckPointAgent.hh \ - ${TRICK_HOME}/trick_source/trick_utils/units/include/UCFn.hh -object_${TRICK_HOST_CPU}/MemoryManager_set_debug_level.o: src/MemoryManager_set_debug_level.cpp \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/MemoryManager.hh \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/attributes.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/parameter_types.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/reference.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/value.h \ - ${TRICK_HOME}/trick_source/trick_utils/trick_adt/include/dllist.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/io_alloc.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/mm_error.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/var.h \ - ${TRICK_HOME}/trick_source/sim_services/CheckPointAgent/include/CheckPointAgent.hh \ - ${TRICK_HOME}/trick_source/trick_utils/units/include/UCFn.hh -object_${TRICK_HOST_CPU}/MemoryManager_add_attr_info.o: src/MemoryManager_add_attr_info.cpp \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/SimObject.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/JobData.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/InstrumentBase.hh \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/MemoryManager.hh \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/attributes.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/parameter_types.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/reference.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/value.h \ - ${TRICK_HOME}/trick_source/trick_utils/trick_adt/include/dllist.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/io_alloc.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/mm_error.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/var.h \ - ${TRICK_HOME}/trick_source/sim_services/CheckPointAgent/include/CheckPointAgent.hh \ - ${TRICK_HOME}/trick_source/trick_utils/units/include/UCFn.hh \ - ${TRICK_HOME}/trick_source/sim_services/Message/include/message_proto.h \ - ${TRICK_HOME}/trick_source/sim_services/Message/include/message_type.h -object_${TRICK_HOST_CPU}/ref_free.o: src/ref_free.cpp \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/reference.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/attributes.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/parameter_types.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/value.h \ - ${TRICK_HOME}/trick_source/trick_utils/trick_adt/include/dllist.h -object_${TRICK_HOST_CPU}/MemoryManager_alloc_info_map.o: src/MemoryManager_alloc_info_map.cpp \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/MemoryManager.hh \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/attributes.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/parameter_types.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/reference.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/value.h \ - ${TRICK_HOME}/trick_source/trick_utils/trick_adt/include/dllist.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/io_alloc.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/mm_error.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/var.h \ - ${TRICK_HOME}/trick_source/sim_services/CheckPointAgent/include/CheckPointAgent.hh \ - ${TRICK_HOME}/trick_source/trick_utils/units/include/UCFn.hh \ - ${TRICK_HOME}/trick_source/sim_services/Message/include/message_proto.h \ - ${TRICK_HOME}/trick_source/sim_services/Message/include/message_type.h -object_${TRICK_HOST_CPU}/MemoryManager_delete_var.o: src/MemoryManager_delete_var.cpp \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/MemoryManager.hh \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/attributes.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/parameter_types.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/reference.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/value.h \ - ${TRICK_HOME}/trick_source/trick_utils/trick_adt/include/dllist.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/io_alloc.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/mm_error.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/var.h \ - ${TRICK_HOME}/trick_source/sim_services/CheckPointAgent/include/CheckPointAgent.hh \ - ${TRICK_HOME}/trick_source/trick_utils/units/include/UCFn.hh \ - ${TRICK_HOME}/trick_source/sim_services/Message/include/message_proto.h \ - ${TRICK_HOME}/trick_source/sim_services/Message/include/message_type.h + MemoryManager_make_reference_attr.cpp \ + ${TRICK_HOME}/include/trick/MemoryManager.hh \ + ${TRICK_HOME}/include/trick/attributes.h \ + ${TRICK_HOME}/include/trick/parameter_types.h \ + ${TRICK_HOME}/include/trick/reference.h \ + ${TRICK_HOME}/include/trick/value.h \ + ${TRICK_HOME}/include/trick/dllist.h \ + ${TRICK_HOME}/include/trick/io_alloc.h \ + ${TRICK_HOME}/include/trick/mm_error.h \ + ${TRICK_HOME}/include/trick/var.h \ + ${TRICK_HOME}/include/trick/CheckPointAgent.hh \ + ${TRICK_HOME}/include/trick/UCFn.hh +object_${TRICK_HOST_CPU}/MemoryManager_set_debug_level.o: MemoryManager_set_debug_level.cpp \ + ${TRICK_HOME}/include/trick/MemoryManager.hh \ + ${TRICK_HOME}/include/trick/attributes.h \ + ${TRICK_HOME}/include/trick/parameter_types.h \ + ${TRICK_HOME}/include/trick/reference.h \ + ${TRICK_HOME}/include/trick/value.h \ + ${TRICK_HOME}/include/trick/dllist.h \ + ${TRICK_HOME}/include/trick/io_alloc.h \ + ${TRICK_HOME}/include/trick/mm_error.h \ + ${TRICK_HOME}/include/trick/var.h \ + ${TRICK_HOME}/include/trick/CheckPointAgent.hh \ + ${TRICK_HOME}/include/trick/UCFn.hh +object_${TRICK_HOST_CPU}/MemoryManager_add_attr_info.o: MemoryManager_add_attr_info.cpp \ + ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/JobData.hh \ + ${TRICK_HOME}/include/trick/InstrumentBase.hh \ + ${TRICK_HOME}/include/trick/MemoryManager.hh \ + ${TRICK_HOME}/include/trick/attributes.h \ + ${TRICK_HOME}/include/trick/parameter_types.h \ + ${TRICK_HOME}/include/trick/reference.h \ + ${TRICK_HOME}/include/trick/value.h \ + ${TRICK_HOME}/include/trick/dllist.h \ + ${TRICK_HOME}/include/trick/io_alloc.h \ + ${TRICK_HOME}/include/trick/mm_error.h \ + ${TRICK_HOME}/include/trick/var.h \ + ${TRICK_HOME}/include/trick/CheckPointAgent.hh \ + ${TRICK_HOME}/include/trick/UCFn.hh +object_${TRICK_HOST_CPU}/ref_free.o: ref_free.cpp ${TRICK_HOME}/include/trick/reference.h \ + ${TRICK_HOME}/include/trick/attributes.h \ + ${TRICK_HOME}/include/trick/parameter_types.h \ + ${TRICK_HOME}/include/trick/value.h \ + ${TRICK_HOME}/include/trick/dllist.h +object_${TRICK_HOST_CPU}/MemoryManager_alloc_info_map.o: MemoryManager_alloc_info_map.cpp \ + ${TRICK_HOME}/include/trick/MemoryManager.hh \ + ${TRICK_HOME}/include/trick/attributes.h \ + ${TRICK_HOME}/include/trick/parameter_types.h \ + ${TRICK_HOME}/include/trick/reference.h \ + ${TRICK_HOME}/include/trick/value.h \ + ${TRICK_HOME}/include/trick/dllist.h \ + ${TRICK_HOME}/include/trick/io_alloc.h \ + ${TRICK_HOME}/include/trick/mm_error.h \ + ${TRICK_HOME}/include/trick/var.h \ + ${TRICK_HOME}/include/trick/CheckPointAgent.hh \ + ${TRICK_HOME}/include/trick/UCFn.hh +object_${TRICK_HOST_CPU}/MemoryManager_delete_var.o: MemoryManager_delete_var.cpp \ + ${TRICK_HOME}/include/trick/MemoryManager.hh \ + ${TRICK_HOME}/include/trick/attributes.h \ + ${TRICK_HOME}/include/trick/parameter_types.h \ + ${TRICK_HOME}/include/trick/reference.h \ + ${TRICK_HOME}/include/trick/value.h \ + ${TRICK_HOME}/include/trick/dllist.h \ + ${TRICK_HOME}/include/trick/io_alloc.h \ + ${TRICK_HOME}/include/trick/mm_error.h \ + ${TRICK_HOME}/include/trick/var.h \ + ${TRICK_HOME}/include/trick/CheckPointAgent.hh \ + ${TRICK_HOME}/include/trick/UCFn.hh object_${TRICK_HOST_CPU}/MemoryManager_ref_name_from_address.o: \ - src/MemoryManager_ref_name_from_address.cpp \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/MemoryManager.hh \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/attributes.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/parameter_types.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/reference.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/value.h \ - ${TRICK_HOME}/trick_source/trick_utils/trick_adt/include/dllist.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/io_alloc.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/mm_error.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/var.h \ - ${TRICK_HOME}/trick_source/sim_services/CheckPointAgent/include/CheckPointAgent.hh \ - ${TRICK_HOME}/trick_source/trick_utils/units/include/UCFn.hh \ - ${TRICK_HOME}/trick_source/sim_services/CheckPointAgent/include/ClassicCheckPointAgent.hh -object_${TRICK_HOST_CPU}/MemoryManager_ref_name.o: src/MemoryManager_ref_name.cpp \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/MemoryManager.hh \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/attributes.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/parameter_types.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/reference.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/value.h \ - ${TRICK_HOME}/trick_source/trick_utils/trick_adt/include/dllist.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/io_alloc.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/mm_error.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/var.h \ - ${TRICK_HOME}/trick_source/sim_services/CheckPointAgent/include/CheckPointAgent.hh \ - ${TRICK_HOME}/trick_source/trick_utils/units/include/UCFn.hh \ - ${TRICK_HOME}/trick_source/sim_services/Message/include/message_proto.h \ - ${TRICK_HOME}/trick_source/sim_services/Message/include/message_type.h -object_${TRICK_HOST_CPU}/MemoryManager_ref_dim.o: src/MemoryManager_ref_dim.cpp \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/MemoryManager.hh \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/attributes.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/parameter_types.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/reference.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/value.h \ - ${TRICK_HOME}/trick_source/trick_utils/trick_adt/include/dllist.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/io_alloc.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/mm_error.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/var.h \ - ${TRICK_HOME}/trick_source/sim_services/CheckPointAgent/include/CheckPointAgent.hh \ - ${TRICK_HOME}/trick_source/trick_utils/units/include/UCFn.hh \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/vval.h \ - ${TRICK_HOME}/trick_source/sim_services/Message/include/message_proto.h \ - ${TRICK_HOME}/trick_source/sim_services/Message/include/message_type.h -object_${TRICK_HOST_CPU}/MemoryManager_get_size.o: src/MemoryManager_get_size.cpp \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/MemoryManager.hh \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/attributes.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/parameter_types.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/reference.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/value.h \ - ${TRICK_HOME}/trick_source/trick_utils/trick_adt/include/dllist.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/io_alloc.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/mm_error.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/var.h \ - ${TRICK_HOME}/trick_source/sim_services/CheckPointAgent/include/CheckPointAgent.hh \ - ${TRICK_HOME}/trick_source/trick_utils/units/include/UCFn.hh + MemoryManager_ref_name_from_address.cpp \ + ${TRICK_HOME}/include/trick/MemoryManager.hh \ + ${TRICK_HOME}/include/trick/attributes.h \ + ${TRICK_HOME}/include/trick/parameter_types.h \ + ${TRICK_HOME}/include/trick/reference.h \ + ${TRICK_HOME}/include/trick/value.h \ + ${TRICK_HOME}/include/trick/dllist.h \ + ${TRICK_HOME}/include/trick/io_alloc.h \ + ${TRICK_HOME}/include/trick/mm_error.h \ + ${TRICK_HOME}/include/trick/var.h \ + ${TRICK_HOME}/include/trick/CheckPointAgent.hh \ + ${TRICK_HOME}/include/trick/UCFn.hh \ + ${TRICK_HOME}/include/trick/ClassicCheckPointAgent.hh +object_${TRICK_HOST_CPU}/MemoryManager_ref_name.o: MemoryManager_ref_name.cpp \ + ${TRICK_HOME}/include/trick/MemoryManager.hh \ + ${TRICK_HOME}/include/trick/attributes.h \ + ${TRICK_HOME}/include/trick/parameter_types.h \ + ${TRICK_HOME}/include/trick/reference.h \ + ${TRICK_HOME}/include/trick/value.h \ + ${TRICK_HOME}/include/trick/dllist.h \ + ${TRICK_HOME}/include/trick/io_alloc.h \ + ${TRICK_HOME}/include/trick/mm_error.h \ + ${TRICK_HOME}/include/trick/var.h \ + ${TRICK_HOME}/include/trick/CheckPointAgent.hh \ + ${TRICK_HOME}/include/trick/UCFn.hh +object_${TRICK_HOST_CPU}/MemoryManager_ref_dim.o: MemoryManager_ref_dim.cpp \ + ${TRICK_HOME}/include/trick/MemoryManager.hh \ + ${TRICK_HOME}/include/trick/attributes.h \ + ${TRICK_HOME}/include/trick/parameter_types.h \ + ${TRICK_HOME}/include/trick/reference.h \ + ${TRICK_HOME}/include/trick/value.h \ + ${TRICK_HOME}/include/trick/dllist.h \ + ${TRICK_HOME}/include/trick/io_alloc.h \ + ${TRICK_HOME}/include/trick/mm_error.h \ + ${TRICK_HOME}/include/trick/var.h \ + ${TRICK_HOME}/include/trick/CheckPointAgent.hh \ + ${TRICK_HOME}/include/trick/UCFn.hh \ + ${TRICK_HOME}/include/trick/vval.h +object_${TRICK_HOST_CPU}/MemoryManager_get_size.o: MemoryManager_get_size.cpp \ + ${TRICK_HOME}/include/trick/MemoryManager.hh \ + ${TRICK_HOME}/include/trick/attributes.h \ + ${TRICK_HOME}/include/trick/parameter_types.h \ + ${TRICK_HOME}/include/trick/reference.h \ + ${TRICK_HOME}/include/trick/value.h \ + ${TRICK_HOME}/include/trick/dllist.h \ + ${TRICK_HOME}/include/trick/io_alloc.h \ + ${TRICK_HOME}/include/trick/mm_error.h \ + ${TRICK_HOME}/include/trick/var.h \ + ${TRICK_HOME}/include/trick/CheckPointAgent.hh \ + ${TRICK_HOME}/include/trick/UCFn.hh +object_${TRICK_HOST_CPU}/MemoryManager_declare_var.o: MemoryManager_declare_var.cpp \ + ${TRICK_HOME}/include/trick/MemoryManager.hh \ + ${TRICK_HOME}/include/trick/attributes.h \ + ${TRICK_HOME}/include/trick/parameter_types.h \ + ${TRICK_HOME}/include/trick/reference.h \ + ${TRICK_HOME}/include/trick/value.h \ + ${TRICK_HOME}/include/trick/dllist.h \ + ${TRICK_HOME}/include/trick/io_alloc.h \ + ${TRICK_HOME}/include/trick/mm_error.h \ + ${TRICK_HOME}/include/trick/var.h \ + ${TRICK_HOME}/include/trick/CheckPointAgent.hh \ + ${TRICK_HOME}/include/trick/UCFn.hh \ + ${TRICK_HOME}/include/trick/ADefParseContext.hh object_${TRICK_HOST_CPU}/MemoryManager_add_template_name_trans.o: \ - src/MemoryManager_add_template_name_trans.cpp \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/MemoryManager.hh \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/attributes.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/parameter_types.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/reference.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/value.h \ - ${TRICK_HOME}/trick_source/trick_utils/trick_adt/include/dllist.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/io_alloc.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/mm_error.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/var.h \ - ${TRICK_HOME}/trick_source/sim_services/CheckPointAgent/include/CheckPointAgent.hh \ - ${TRICK_HOME}/trick_source/trick_utils/units/include/UCFn.hh -object_${TRICK_HOST_CPU}/MemoryManager_make_declaration.o: src/MemoryManager_make_declaration.cpp \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/MemoryManager.hh \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/attributes.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/parameter_types.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/reference.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/value.h \ - ${TRICK_HOME}/trick_source/trick_utils/trick_adt/include/dllist.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/io_alloc.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/mm_error.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/var.h \ - ${TRICK_HOME}/trick_source/sim_services/CheckPointAgent/include/CheckPointAgent.hh \ - ${TRICK_HOME}/trick_source/trick_utils/units/include/UCFn.hh + MemoryManager_add_template_name_trans.cpp \ + ${TRICK_HOME}/include/trick/MemoryManager.hh \ + ${TRICK_HOME}/include/trick/attributes.h \ + ${TRICK_HOME}/include/trick/parameter_types.h \ + ${TRICK_HOME}/include/trick/reference.h \ + ${TRICK_HOME}/include/trick/value.h \ + ${TRICK_HOME}/include/trick/dllist.h \ + ${TRICK_HOME}/include/trick/io_alloc.h \ + ${TRICK_HOME}/include/trick/mm_error.h \ + ${TRICK_HOME}/include/trick/var.h \ + ${TRICK_HOME}/include/trick/CheckPointAgent.hh \ + ${TRICK_HOME}/include/trick/UCFn.hh +object_${TRICK_HOST_CPU}/MemoryManager_make_declaration.o: MemoryManager_make_declaration.cpp \ + ${TRICK_HOME}/include/trick/MemoryManager.hh \ + ${TRICK_HOME}/include/trick/attributes.h \ + ${TRICK_HOME}/include/trick/parameter_types.h \ + ${TRICK_HOME}/include/trick/reference.h \ + ${TRICK_HOME}/include/trick/value.h \ + ${TRICK_HOME}/include/trick/dllist.h \ + ${TRICK_HOME}/include/trick/io_alloc.h \ + ${TRICK_HOME}/include/trick/mm_error.h \ + ${TRICK_HOME}/include/trick/var.h \ + ${TRICK_HOME}/include/trick/CheckPointAgent.hh \ + ${TRICK_HOME}/include/trick/UCFn.hh object_${TRICK_HOST_CPU}/MemoryManager_map_external_object.o: \ - src/MemoryManager_map_external_object.cpp \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/MemoryManager.hh \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/attributes.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/parameter_types.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/reference.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/value.h \ - ${TRICK_HOME}/trick_source/trick_utils/trick_adt/include/dllist.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/io_alloc.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/mm_error.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/var.h \ - ${TRICK_HOME}/trick_source/sim_services/CheckPointAgent/include/CheckPointAgent.hh \ - ${TRICK_HOME}/trick_source/trick_utils/units/include/UCFn.hh \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/ADefParseContext.hh \ - ${TRICK_HOME}/trick_source/sim_services/Message/include/message_proto.h \ - ${TRICK_HOME}/trick_source/sim_services/Message/include/message_type.h -object_${TRICK_HOST_CPU}/MemoryManager_ref_assignment.o: src/MemoryManager_ref_assignment.cpp \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/MemoryManager.hh \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/attributes.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/parameter_types.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/reference.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/value.h \ - ${TRICK_HOME}/trick_source/trick_utils/trick_adt/include/dllist.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/io_alloc.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/mm_error.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/var.h \ - ${TRICK_HOME}/trick_source/sim_services/CheckPointAgent/include/CheckPointAgent.hh \ - ${TRICK_HOME}/trick_source/trick_utils/units/include/UCFn.hh \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/bitfield_proto.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/vval.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/wcs_ext.h \ - ${TRICK_HOME}/trick_source/sim_services/Message/include/message_proto.h \ - ${TRICK_HOME}/trick_source/sim_services/Message/include/message_type.h \ - ${TRICK_HOME}/trick_source/trick_utils/units/include/Unit.hh \ - ${TRICK_HOME}/trick_source/trick_utils/units/include/units_conv.h \ - ${TRICK_HOME}/trick_source/trick_utils/units/include/UCFn.hh -object_${TRICK_HOST_CPU}/MemoryManager_C_Intf.o: src/MemoryManager_C_Intf.cpp \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/memorymanager_c_intf.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/parameter_types.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/attributes.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/reference.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/value.h \ - ${TRICK_HOME}/trick_source/trick_utils/trick_adt/include/dllist.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/var.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/io_alloc.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/MemoryManager.hh \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/mm_error.h \ - ${TRICK_HOME}/trick_source/sim_services/CheckPointAgent/include/CheckPointAgent.hh \ - ${TRICK_HOME}/trick_source/trick_utils/units/include/UCFn.hh \ - ${TRICK_HOME}/trick_source/sim_services/Message/include/message_proto.h \ - ${TRICK_HOME}/trick_source/sim_services/Message/include/message_type.h -object_${TRICK_HOST_CPU}/MemoryManager_write_checkpoint.o: src/MemoryManager_write_checkpoint.cpp \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/MemoryManager.hh \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/attributes.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/parameter_types.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/reference.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/value.h \ - ${TRICK_HOME}/trick_source/trick_utils/trick_adt/include/dllist.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/io_alloc.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/mm_error.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/var.h \ - ${TRICK_HOME}/trick_source/sim_services/CheckPointAgent/include/CheckPointAgent.hh \ - ${TRICK_HOME}/trick_source/trick_utils/units/include/UCFn.hh \ - ${TRICK_HOME}/trick_source/sim_services/Message/include/message_proto.h \ - ${TRICK_HOME}/trick_source/sim_services/Message/include/message_type.h -object_${TRICK_HOST_CPU}/MemoryManager_declare_var.o: src/MemoryManager_declare_var.cpp \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/MemoryManager.hh \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/attributes.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/parameter_types.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/reference.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/value.h \ - ${TRICK_HOME}/trick_source/trick_utils/trick_adt/include/dllist.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/io_alloc.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/mm_error.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/var.h \ - ${TRICK_HOME}/trick_source/sim_services/CheckPointAgent/include/CheckPointAgent.hh \ - ${TRICK_HOME}/trick_source/trick_utils/units/include/UCFn.hh \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/ADefParseContext.hh \ - ${TRICK_HOME}/trick_source/sim_services/Message/include/message_proto.h \ - ${TRICK_HOME}/trick_source/sim_services/Message/include/message_type.h + MemoryManager_map_external_object.cpp \ + ${TRICK_HOME}/include/trick/MemoryManager.hh \ + ${TRICK_HOME}/include/trick/attributes.h \ + ${TRICK_HOME}/include/trick/parameter_types.h \ + ${TRICK_HOME}/include/trick/reference.h \ + ${TRICK_HOME}/include/trick/value.h \ + ${TRICK_HOME}/include/trick/dllist.h \ + ${TRICK_HOME}/include/trick/io_alloc.h \ + ${TRICK_HOME}/include/trick/mm_error.h \ + ${TRICK_HOME}/include/trick/var.h \ + ${TRICK_HOME}/include/trick/CheckPointAgent.hh \ + ${TRICK_HOME}/include/trick/UCFn.hh \ + ${TRICK_HOME}/include/trick/ADefParseContext.hh +object_${TRICK_HOST_CPU}/MemoryManager_ref_assignment.o: MemoryManager_ref_assignment.cpp \ + ${TRICK_HOME}/include/trick/MemoryManager.hh \ + ${TRICK_HOME}/include/trick/attributes.h \ + ${TRICK_HOME}/include/trick/parameter_types.h \ + ${TRICK_HOME}/include/trick/reference.h \ + ${TRICK_HOME}/include/trick/value.h \ + ${TRICK_HOME}/include/trick/dllist.h \ + ${TRICK_HOME}/include/trick/io_alloc.h \ + ${TRICK_HOME}/include/trick/mm_error.h \ + ${TRICK_HOME}/include/trick/var.h \ + ${TRICK_HOME}/include/trick/CheckPointAgent.hh \ + ${TRICK_HOME}/include/trick/UCFn.hh \ + ${TRICK_HOME}/include/trick/bitfield_proto.h \ + ${TRICK_HOME}/include/trick/vval.h \ + ${TRICK_HOME}/include/trick/wcs_ext.h \ + ${TRICK_HOME}/include/trick/Unit.hh \ + ${TRICK_HOME}/include/trick/units_conv.h +object_${TRICK_HOST_CPU}/MemoryManager_C_Intf.o: MemoryManager_C_Intf.cpp \ + ${TRICK_HOME}/include/trick/memorymanager_c_intf.h \ + ${TRICK_HOME}/include/trick/parameter_types.h \ + ${TRICK_HOME}/include/trick/attributes.h \ + ${TRICK_HOME}/include/trick/reference.h \ + ${TRICK_HOME}/include/trick/value.h \ + ${TRICK_HOME}/include/trick/dllist.h \ + ${TRICK_HOME}/include/trick/var.h \ + ${TRICK_HOME}/include/trick/io_alloc.h \ + ${TRICK_HOME}/include/trick/MemoryManager.hh \ + ${TRICK_HOME}/include/trick/mm_error.h \ + ${TRICK_HOME}/include/trick/CheckPointAgent.hh \ + ${TRICK_HOME}/include/trick/UCFn.hh +object_${TRICK_HOST_CPU}/MemoryManager_write_checkpoint.o: MemoryManager_write_checkpoint.cpp \ + ${TRICK_HOME}/include/trick/MemoryManager.hh \ + ${TRICK_HOME}/include/trick/attributes.h \ + ${TRICK_HOME}/include/trick/parameter_types.h \ + ${TRICK_HOME}/include/trick/reference.h \ + ${TRICK_HOME}/include/trick/value.h \ + ${TRICK_HOME}/include/trick/dllist.h \ + ${TRICK_HOME}/include/trick/io_alloc.h \ + ${TRICK_HOME}/include/trick/mm_error.h \ + ${TRICK_HOME}/include/trick/var.h \ + ${TRICK_HOME}/include/trick/CheckPointAgent.hh \ + ${TRICK_HOME}/include/trick/UCFn.hh object_${TRICK_HOST_CPU}/MemoryManager_get_type_attributes.o: \ - src/MemoryManager_get_type_attributes.cpp \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/MemoryManager.hh \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/attributes.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/parameter_types.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/reference.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/value.h \ - ${TRICK_HOME}/trick_source/trick_utils/trick_adt/include/dllist.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/io_alloc.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/mm_error.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/var.h \ - ${TRICK_HOME}/trick_source/sim_services/CheckPointAgent/include/CheckPointAgent.hh \ - ${TRICK_HOME}/trick_source/trick_utils/units/include/UCFn.hh \ - ${TRICK_HOME}/trick_source/sim_services/Message/include/message_proto.h \ - ${TRICK_HOME}/trick_source/sim_services/Message/include/message_type.h -object_${TRICK_HOST_CPU}/MemoryManager_get_enumerated.o: src/MemoryManager_get_enumerated.cpp \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/MemoryManager.hh \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/attributes.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/parameter_types.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/reference.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/value.h \ - ${TRICK_HOME}/trick_source/trick_utils/trick_adt/include/dllist.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/io_alloc.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/mm_error.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/var.h \ - ${TRICK_HOME}/trick_source/sim_services/CheckPointAgent/include/CheckPointAgent.hh \ - ${TRICK_HOME}/trick_source/trick_utils/units/include/UCFn.hh -object_${TRICK_HOST_CPU}/MemoryManager_add_var.o: src/MemoryManager_add_var.cpp \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/value.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/parameter_types.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/vval.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/var.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/MemoryManager.hh \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/attributes.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/reference.h \ - ${TRICK_HOME}/trick_source/trick_utils/trick_adt/include/dllist.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/io_alloc.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/mm_error.h \ - ${TRICK_HOME}/trick_source/sim_services/CheckPointAgent/include/CheckPointAgent.hh \ - ${TRICK_HOME}/trick_source/trick_utils/units/include/UCFn.hh \ - ${TRICK_HOME}/trick_source/sim_services/Message/include/message_proto.h \ - ${TRICK_HOME}/trick_source/sim_services/Message/include/message_type.h -object_${TRICK_HOST_CPU}/RefParseContext.o: src/RefParseContext.cpp \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/RefParseContext.hh \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/MemoryManager.hh \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/attributes.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/parameter_types.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/reference.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/value.h \ - ${TRICK_HOME}/trick_source/trick_utils/trick_adt/include/dllist.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/io_alloc.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/mm_error.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/var.h \ - ${TRICK_HOME}/trick_source/sim_services/CheckPointAgent/include/CheckPointAgent.hh \ - ${TRICK_HOME}/trick_source/trick_utils/units/include/UCFn.hh + MemoryManager_get_type_attributes.cpp \ + ${TRICK_HOME}/include/trick/MemoryManager.hh \ + ${TRICK_HOME}/include/trick/attributes.h \ + ${TRICK_HOME}/include/trick/parameter_types.h \ + ${TRICK_HOME}/include/trick/reference.h \ + ${TRICK_HOME}/include/trick/value.h \ + ${TRICK_HOME}/include/trick/dllist.h \ + ${TRICK_HOME}/include/trick/io_alloc.h \ + ${TRICK_HOME}/include/trick/mm_error.h \ + ${TRICK_HOME}/include/trick/var.h \ + ${TRICK_HOME}/include/trick/CheckPointAgent.hh \ + ${TRICK_HOME}/include/trick/UCFn.hh +object_${TRICK_HOST_CPU}/MemoryManager_get_enumerated.o: MemoryManager_get_enumerated.cpp \ + ${TRICK_HOME}/include/trick/MemoryManager.hh \ + ${TRICK_HOME}/include/trick/attributes.h \ + ${TRICK_HOME}/include/trick/parameter_types.h \ + ${TRICK_HOME}/include/trick/reference.h \ + ${TRICK_HOME}/include/trick/value.h \ + ${TRICK_HOME}/include/trick/dllist.h \ + ${TRICK_HOME}/include/trick/io_alloc.h \ + ${TRICK_HOME}/include/trick/mm_error.h \ + ${TRICK_HOME}/include/trick/var.h \ + ${TRICK_HOME}/include/trick/CheckPointAgent.hh \ + ${TRICK_HOME}/include/trick/UCFn.hh +object_${TRICK_HOST_CPU}/MemoryManager_add_var.o: MemoryManager_add_var.cpp \ + ${TRICK_HOME}/include/trick/value.h \ + ${TRICK_HOME}/include/trick/parameter_types.h \ + ${TRICK_HOME}/include/trick/vval.h \ + ${TRICK_HOME}/include/trick/var.h \ + ${TRICK_HOME}/include/trick/MemoryManager.hh \ + ${TRICK_HOME}/include/trick/attributes.h \ + ${TRICK_HOME}/include/trick/reference.h \ + ${TRICK_HOME}/include/trick/dllist.h \ + ${TRICK_HOME}/include/trick/io_alloc.h \ + ${TRICK_HOME}/include/trick/mm_error.h \ + ${TRICK_HOME}/include/trick/CheckPointAgent.hh \ + ${TRICK_HOME}/include/trick/UCFn.hh +object_${TRICK_HOST_CPU}/RefParseContext.o: RefParseContext.cpp \ + ${TRICK_HOME}/include/trick/RefParseContext.hh \ + ${TRICK_HOME}/include/trick/MemoryManager.hh \ + ${TRICK_HOME}/include/trick/attributes.h \ + ${TRICK_HOME}/include/trick/parameter_types.h \ + ${TRICK_HOME}/include/trick/reference.h \ + ${TRICK_HOME}/include/trick/value.h \ + ${TRICK_HOME}/include/trick/dllist.h \ + ${TRICK_HOME}/include/trick/io_alloc.h \ + ${TRICK_HOME}/include/trick/mm_error.h \ + ${TRICK_HOME}/include/trick/var.h \ + ${TRICK_HOME}/include/trick/CheckPointAgent.hh \ + ${TRICK_HOME}/include/trick/UCFn.hh object_${TRICK_HOST_CPU}/MemoryManager_set_checkpointagent.o: \ - src/MemoryManager_set_checkpointagent.cpp \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/MemoryManager.hh \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/attributes.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/parameter_types.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/reference.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/value.h \ - ${TRICK_HOME}/trick_source/trick_utils/trick_adt/include/dllist.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/io_alloc.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/mm_error.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/var.h \ - ${TRICK_HOME}/trick_source/sim_services/CheckPointAgent/include/CheckPointAgent.hh \ - ${TRICK_HOME}/trick_source/trick_utils/units/include/UCFn.hh \ - ${TRICK_HOME}/trick_source/sim_services/Message/include/message_proto.h \ - ${TRICK_HOME}/trick_source/sim_services/Message/include/message_type.h -object_${TRICK_HOST_CPU}/MemoryManager_ref_attributes.o: src/MemoryManager_ref_attributes.cpp \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/MemoryManager.hh \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/attributes.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/parameter_types.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/reference.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/value.h \ - ${TRICK_HOME}/trick_source/trick_utils/trick_adt/include/dllist.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/io_alloc.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/mm_error.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/var.h \ - ${TRICK_HOME}/trick_source/sim_services/CheckPointAgent/include/CheckPointAgent.hh \ - ${TRICK_HOME}/trick_source/trick_utils/units/include/UCFn.hh \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/RefParseContext.hh -object_${TRICK_HOST_CPU}/MemoryManager_io_src_intf.o: src/MemoryManager_io_src_intf.cpp \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/MemoryManager.hh \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/attributes.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/parameter_types.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/reference.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/value.h \ - ${TRICK_HOME}/trick_source/trick_utils/trick_adt/include/dllist.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/io_alloc.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/mm_error.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/var.h \ - ${TRICK_HOME}/trick_source/sim_services/CheckPointAgent/include/CheckPointAgent.hh \ - ${TRICK_HOME}/trick_source/trick_utils/units/include/UCFn.hh \ - ${TRICK_HOME}/trick_source/sim_services/Message/include/message_proto.h \ - ${TRICK_HOME}/trick_source/sim_services/Message/include/message_type.h -object_${TRICK_HOST_CPU}/MemoryManager_is_alloced.o: src/MemoryManager_is_alloced.cpp \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/MemoryManager.hh \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/attributes.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/parameter_types.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/reference.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/value.h \ - ${TRICK_HOME}/trick_source/trick_utils/trick_adt/include/dllist.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/io_alloc.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/mm_error.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/var.h \ - ${TRICK_HOME}/trick_source/sim_services/CheckPointAgent/include/CheckPointAgent.hh \ - ${TRICK_HOME}/trick_source/trick_utils/units/include/UCFn.hh -object_${TRICK_HOST_CPU}/MemoryManager_ref_var.o: src/MemoryManager_ref_var.cpp \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/MemoryManager.hh \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/attributes.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/parameter_types.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/reference.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/value.h \ - ${TRICK_HOME}/trick_source/trick_utils/trick_adt/include/dllist.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/io_alloc.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/mm_error.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/var.h \ - ${TRICK_HOME}/trick_source/sim_services/CheckPointAgent/include/CheckPointAgent.hh \ - ${TRICK_HOME}/trick_source/trick_utils/units/include/UCFn.hh \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/vval.h -object_${TRICK_HOST_CPU}/MemoryManager_clear_memory.o: src/MemoryManager_clear_memory.cpp \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/MemoryManager.hh \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/attributes.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/parameter_types.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/reference.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/value.h \ - ${TRICK_HOME}/trick_source/trick_utils/trick_adt/include/dllist.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/io_alloc.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/mm_error.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/var.h \ - ${TRICK_HOME}/trick_source/sim_services/CheckPointAgent/include/CheckPointAgent.hh \ - ${TRICK_HOME}/trick_source/trick_utils/units/include/UCFn.hh \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/bitfield_proto.h \ - ${TRICK_HOME}/trick_source/sim_services/Message/include/message_proto.h \ - ${TRICK_HOME}/trick_source/sim_services/Message/include/message_type.h -object_${TRICK_HOST_CPU}/MemoryManager_write_var.o: src/MemoryManager_write_var.cpp \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/MemoryManager.hh \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/attributes.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/parameter_types.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/reference.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/value.h \ - ${TRICK_HOME}/trick_source/trick_utils/trick_adt/include/dllist.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/io_alloc.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/mm_error.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/var.h \ - ${TRICK_HOME}/trick_source/sim_services/CheckPointAgent/include/CheckPointAgent.hh \ - ${TRICK_HOME}/trick_source/trick_utils/units/include/UCFn.hh \ - ${TRICK_HOME}/trick_source/sim_services/Message/include/message_proto.h \ - ${TRICK_HOME}/trick_source/sim_services/Message/include/message_type.h -object_${TRICK_HOST_CPU}/MemoryManager_restore.o: src/MemoryManager_restore.cpp \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/MemoryManager.hh \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/attributes.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/parameter_types.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/reference.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/value.h \ - ${TRICK_HOME}/trick_source/trick_utils/trick_adt/include/dllist.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/io_alloc.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/mm_error.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/var.h \ - ${TRICK_HOME}/trick_source/sim_services/CheckPointAgent/include/CheckPointAgent.hh \ - ${TRICK_HOME}/trick_source/trick_utils/units/include/UCFn.hh \ - ${TRICK_HOME}/trick_source/sim_services/CheckPointAgent/include/ClassicCheckPointAgent.hh \ - ${TRICK_HOME}/trick_source/sim_services/Message/include/message_proto.h \ - ${TRICK_HOME}/trick_source/sim_services/Message/include/message_type.h -object_${TRICK_HOST_CPU}/MemoryManager_strdup.o: src/MemoryManager_strdup.cpp \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/MemoryManager.hh \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/attributes.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/parameter_types.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/reference.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/value.h \ - ${TRICK_HOME}/trick_source/trick_utils/trick_adt/include/dllist.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/io_alloc.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/mm_error.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/var.h \ - ${TRICK_HOME}/trick_source/sim_services/CheckPointAgent/include/CheckPointAgent.hh \ - ${TRICK_HOME}/trick_source/trick_utils/units/include/UCFn.hh -object_${TRICK_HOST_CPU}/ADefParseContext.o: src/ADefParseContext.cpp \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/ADefParseContext.hh \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/MemoryManager.hh \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/attributes.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/parameter_types.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/reference.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/value.h \ - ${TRICK_HOME}/trick_source/trick_utils/trick_adt/include/dllist.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/io_alloc.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/mm_error.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/var.h \ - ${TRICK_HOME}/trick_source/sim_services/CheckPointAgent/include/CheckPointAgent.hh \ - ${TRICK_HOME}/trick_source/trick_utils/units/include/UCFn.hh -object_${TRICK_HOST_CPU}/MemoryManager_alloc_depends.o: src/MemoryManager_alloc_depends.cpp \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/MemoryManager.hh \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/attributes.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/parameter_types.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/reference.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/value.h \ - ${TRICK_HOME}/trick_source/trick_utils/trick_adt/include/dllist.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/io_alloc.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/mm_error.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/var.h \ - ${TRICK_HOME}/trick_source/sim_services/CheckPointAgent/include/CheckPointAgent.hh \ - ${TRICK_HOME}/trick_source/trick_utils/units/include/UCFn.hh -object_${TRICK_HOST_CPU}/MemoryManager_ref_allocate.o: src/MemoryManager_ref_allocate.cpp \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/attributes.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/parameter_types.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/reference.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/value.h \ - ${TRICK_HOME}/trick_source/trick_utils/trick_adt/include/dllist.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/MemoryManager.hh \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/io_alloc.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/mm_error.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/var.h \ - ${TRICK_HOME}/trick_source/sim_services/CheckPointAgent/include/CheckPointAgent.hh \ - ${TRICK_HOME}/trick_source/trick_utils/units/include/UCFn.hh \ - ${TRICK_HOME}/trick_source/sim_services/Message/include/message_proto.h \ - ${TRICK_HOME}/trick_source/sim_services/Message/include/message_type.h + MemoryManager_set_checkpointagent.cpp \ + ${TRICK_HOME}/include/trick/MemoryManager.hh \ + ${TRICK_HOME}/include/trick/attributes.h \ + ${TRICK_HOME}/include/trick/parameter_types.h \ + ${TRICK_HOME}/include/trick/reference.h \ + ${TRICK_HOME}/include/trick/value.h \ + ${TRICK_HOME}/include/trick/dllist.h \ + ${TRICK_HOME}/include/trick/io_alloc.h \ + ${TRICK_HOME}/include/trick/mm_error.h \ + ${TRICK_HOME}/include/trick/var.h \ + ${TRICK_HOME}/include/trick/CheckPointAgent.hh \ + ${TRICK_HOME}/include/trick/UCFn.hh +object_${TRICK_HOST_CPU}/MemoryManager_ref_attributes.o: MemoryManager_ref_attributes.cpp \ + ${TRICK_HOME}/include/trick/MemoryManager.hh \ + ${TRICK_HOME}/include/trick/attributes.h \ + ${TRICK_HOME}/include/trick/parameter_types.h \ + ${TRICK_HOME}/include/trick/reference.h \ + ${TRICK_HOME}/include/trick/value.h \ + ${TRICK_HOME}/include/trick/dllist.h \ + ${TRICK_HOME}/include/trick/io_alloc.h \ + ${TRICK_HOME}/include/trick/mm_error.h \ + ${TRICK_HOME}/include/trick/var.h \ + ${TRICK_HOME}/include/trick/CheckPointAgent.hh \ + ${TRICK_HOME}/include/trick/UCFn.hh \ + ${TRICK_HOME}/include/trick/RefParseContext.hh +object_${TRICK_HOST_CPU}/MemoryManager_io_src_intf.o: MemoryManager_io_src_intf.cpp \ + ${TRICK_HOME}/include/trick/MemoryManager.hh \ + ${TRICK_HOME}/include/trick/attributes.h \ + ${TRICK_HOME}/include/trick/parameter_types.h \ + ${TRICK_HOME}/include/trick/reference.h \ + ${TRICK_HOME}/include/trick/value.h \ + ${TRICK_HOME}/include/trick/dllist.h \ + ${TRICK_HOME}/include/trick/io_alloc.h \ + ${TRICK_HOME}/include/trick/mm_error.h \ + ${TRICK_HOME}/include/trick/var.h \ + ${TRICK_HOME}/include/trick/CheckPointAgent.hh \ + ${TRICK_HOME}/include/trick/UCFn.hh +object_${TRICK_HOST_CPU}/MemoryManager_is_alloced.o: MemoryManager_is_alloced.cpp \ + ${TRICK_HOME}/include/trick/MemoryManager.hh \ + ${TRICK_HOME}/include/trick/attributes.h \ + ${TRICK_HOME}/include/trick/parameter_types.h \ + ${TRICK_HOME}/include/trick/reference.h \ + ${TRICK_HOME}/include/trick/value.h \ + ${TRICK_HOME}/include/trick/dllist.h \ + ${TRICK_HOME}/include/trick/io_alloc.h \ + ${TRICK_HOME}/include/trick/mm_error.h \ + ${TRICK_HOME}/include/trick/var.h \ + ${TRICK_HOME}/include/trick/CheckPointAgent.hh \ + ${TRICK_HOME}/include/trick/UCFn.hh +object_${TRICK_HOST_CPU}/MemoryManager_ref_var.o: MemoryManager_ref_var.cpp \ + ${TRICK_HOME}/include/trick/MemoryManager.hh \ + ${TRICK_HOME}/include/trick/attributes.h \ + ${TRICK_HOME}/include/trick/parameter_types.h \ + ${TRICK_HOME}/include/trick/reference.h \ + ${TRICK_HOME}/include/trick/value.h \ + ${TRICK_HOME}/include/trick/dllist.h \ + ${TRICK_HOME}/include/trick/io_alloc.h \ + ${TRICK_HOME}/include/trick/mm_error.h \ + ${TRICK_HOME}/include/trick/var.h \ + ${TRICK_HOME}/include/trick/CheckPointAgent.hh \ + ${TRICK_HOME}/include/trick/UCFn.hh \ + ${TRICK_HOME}/include/trick/vval.h +object_${TRICK_HOST_CPU}/MemoryManager_clear_memory.o: MemoryManager_clear_memory.cpp \ + ${TRICK_HOME}/include/trick/MemoryManager.hh \ + ${TRICK_HOME}/include/trick/attributes.h \ + ${TRICK_HOME}/include/trick/parameter_types.h \ + ${TRICK_HOME}/include/trick/reference.h \ + ${TRICK_HOME}/include/trick/value.h \ + ${TRICK_HOME}/include/trick/dllist.h \ + ${TRICK_HOME}/include/trick/io_alloc.h \ + ${TRICK_HOME}/include/trick/mm_error.h \ + ${TRICK_HOME}/include/trick/var.h \ + ${TRICK_HOME}/include/trick/CheckPointAgent.hh \ + ${TRICK_HOME}/include/trick/UCFn.hh \ + ${TRICK_HOME}/include/trick/bitfield_proto.h +object_${TRICK_HOST_CPU}/MemoryManager_write_var.o: MemoryManager_write_var.cpp \ + ${TRICK_HOME}/include/trick/MemoryManager.hh \ + ${TRICK_HOME}/include/trick/attributes.h \ + ${TRICK_HOME}/include/trick/parameter_types.h \ + ${TRICK_HOME}/include/trick/reference.h \ + ${TRICK_HOME}/include/trick/value.h \ + ${TRICK_HOME}/include/trick/dllist.h \ + ${TRICK_HOME}/include/trick/io_alloc.h \ + ${TRICK_HOME}/include/trick/mm_error.h \ + ${TRICK_HOME}/include/trick/var.h \ + ${TRICK_HOME}/include/trick/CheckPointAgent.hh \ + ${TRICK_HOME}/include/trick/UCFn.hh +object_${TRICK_HOST_CPU}/MemoryManager_restore.o: MemoryManager_restore.cpp \ + ${TRICK_HOME}/include/trick/MemoryManager.hh \ + ${TRICK_HOME}/include/trick/attributes.h \ + ${TRICK_HOME}/include/trick/parameter_types.h \ + ${TRICK_HOME}/include/trick/reference.h \ + ${TRICK_HOME}/include/trick/value.h \ + ${TRICK_HOME}/include/trick/dllist.h \ + ${TRICK_HOME}/include/trick/io_alloc.h \ + ${TRICK_HOME}/include/trick/mm_error.h \ + ${TRICK_HOME}/include/trick/var.h \ + ${TRICK_HOME}/include/trick/CheckPointAgent.hh \ + ${TRICK_HOME}/include/trick/UCFn.hh \ + ${TRICK_HOME}/include/trick/ClassicCheckPointAgent.hh +object_${TRICK_HOST_CPU}/MemoryManager_strdup.o: MemoryManager_strdup.cpp \ + ${TRICK_HOME}/include/trick/MemoryManager.hh \ + ${TRICK_HOME}/include/trick/attributes.h \ + ${TRICK_HOME}/include/trick/parameter_types.h \ + ${TRICK_HOME}/include/trick/reference.h \ + ${TRICK_HOME}/include/trick/value.h \ + ${TRICK_HOME}/include/trick/dllist.h \ + ${TRICK_HOME}/include/trick/io_alloc.h \ + ${TRICK_HOME}/include/trick/mm_error.h \ + ${TRICK_HOME}/include/trick/var.h \ + ${TRICK_HOME}/include/trick/CheckPointAgent.hh \ + ${TRICK_HOME}/include/trick/UCFn.hh +object_${TRICK_HOST_CPU}/ADefParseContext.o: ADefParseContext.cpp \ + ${TRICK_HOME}/include/trick/ADefParseContext.hh \ + ${TRICK_HOME}/include/trick/MemoryManager.hh \ + ${TRICK_HOME}/include/trick/attributes.h \ + ${TRICK_HOME}/include/trick/parameter_types.h \ + ${TRICK_HOME}/include/trick/reference.h \ + ${TRICK_HOME}/include/trick/value.h \ + ${TRICK_HOME}/include/trick/dllist.h \ + ${TRICK_HOME}/include/trick/io_alloc.h \ + ${TRICK_HOME}/include/trick/mm_error.h \ + ${TRICK_HOME}/include/trick/var.h \ + ${TRICK_HOME}/include/trick/CheckPointAgent.hh \ + ${TRICK_HOME}/include/trick/UCFn.hh +object_${TRICK_HOST_CPU}/MemoryManager_alloc_depends.o: MemoryManager_alloc_depends.cpp \ + ${TRICK_HOME}/include/trick/MemoryManager.hh \ + ${TRICK_HOME}/include/trick/attributes.h \ + ${TRICK_HOME}/include/trick/parameter_types.h \ + ${TRICK_HOME}/include/trick/reference.h \ + ${TRICK_HOME}/include/trick/value.h \ + ${TRICK_HOME}/include/trick/dllist.h \ + ${TRICK_HOME}/include/trick/io_alloc.h \ + ${TRICK_HOME}/include/trick/mm_error.h \ + ${TRICK_HOME}/include/trick/var.h \ + ${TRICK_HOME}/include/trick/CheckPointAgent.hh \ + ${TRICK_HOME}/include/trick/UCFn.hh +object_${TRICK_HOST_CPU}/MemoryManager_ref_allocate.o: MemoryManager_ref_allocate.cpp \ + ${TRICK_HOME}/include/trick/attributes.h \ + ${TRICK_HOME}/include/trick/parameter_types.h \ + ${TRICK_HOME}/include/trick/reference.h \ + ${TRICK_HOME}/include/trick/value.h \ + ${TRICK_HOME}/include/trick/dllist.h \ + ${TRICK_HOME}/include/trick/MemoryManager.hh \ + ${TRICK_HOME}/include/trick/io_alloc.h \ + ${TRICK_HOME}/include/trick/mm_error.h \ + ${TRICK_HOME}/include/trick/var.h \ + ${TRICK_HOME}/include/trick/CheckPointAgent.hh \ + ${TRICK_HOME}/include/trick/UCFn.hh diff --git a/trick_source/sim_services/MemoryManager/src/MemoryManager.cpp b/trick_source/sim_services/MemoryManager/MemoryManager.cpp similarity index 96% rename from trick_source/sim_services/MemoryManager/src/MemoryManager.cpp rename to trick_source/sim_services/MemoryManager/MemoryManager.cpp index 0cbda512..dec217a7 100644 --- a/trick_source/sim_services/MemoryManager/src/MemoryManager.cpp +++ b/trick_source/sim_services/MemoryManager/MemoryManager.cpp @@ -1,7 +1,7 @@ #include <dlfcn.h> #include <stdlib.h> -#include "sim_services/MemoryManager/include/MemoryManager.hh" -#include "sim_services/CheckPointAgent/include/ClassicCheckPointAgent.hh" +#include "trick/MemoryManager.hh" +#include "trick/ClassicCheckPointAgent.hh" // Global pointer to the (singleton) MemoryManager for the C language interface. Trick::MemoryManager * trick_MM = NULL; diff --git a/trick_source/sim_services/MemoryManager/src/MemoryManager_C_Intf.cpp b/trick_source/sim_services/MemoryManager/MemoryManager_C_Intf.cpp similarity index 99% rename from trick_source/sim_services/MemoryManager/src/MemoryManager_C_Intf.cpp rename to trick_source/sim_services/MemoryManager/MemoryManager_C_Intf.cpp index 54349266..cba47da7 100644 --- a/trick_source/sim_services/MemoryManager/src/MemoryManager_C_Intf.cpp +++ b/trick_source/sim_services/MemoryManager/MemoryManager_C_Intf.cpp @@ -1,7 +1,7 @@ #include <string> #include <iostream> -#include "sim_services/MemoryManager/include/memorymanager_c_intf.h" -#include "sim_services/MemoryManager/include/MemoryManager.hh" +#include "trick/memorymanager_c_intf.h" +#include "trick/MemoryManager.hh" /* Global singleton pointer to the memory manager. */ extern Trick::MemoryManager* trick_MM; diff --git a/trick_source/sim_services/MemoryManager/src/MemoryManager_add_attr_info.cpp b/trick_source/sim_services/MemoryManager/MemoryManager_add_attr_info.cpp similarity index 98% rename from trick_source/sim_services/MemoryManager/src/MemoryManager_add_attr_info.cpp rename to trick_source/sim_services/MemoryManager/MemoryManager_add_attr_info.cpp index a8fa58ff..d1626653 100644 --- a/trick_source/sim_services/MemoryManager/src/MemoryManager_add_attr_info.cpp +++ b/trick_source/sim_services/MemoryManager/MemoryManager_add_attr_info.cpp @@ -7,8 +7,8 @@ #include <cxxabi.h> #endif -#include "sim_services/SimObject/include/SimObject.hh" -#include "sim_services/MemoryManager/include/MemoryManager.hh" +#include "trick/SimObject.hh" +#include "trick/MemoryManager.hh" /** * diff --git a/trick_source/sim_services/MemoryManager/src/MemoryManager_add_shared_library_symbols.cpp b/trick_source/sim_services/MemoryManager/MemoryManager_add_shared_library_symbols.cpp similarity index 92% rename from trick_source/sim_services/MemoryManager/src/MemoryManager_add_shared_library_symbols.cpp rename to trick_source/sim_services/MemoryManager/MemoryManager_add_shared_library_symbols.cpp index 5b6e8ed2..035e8424 100644 --- a/trick_source/sim_services/MemoryManager/src/MemoryManager_add_shared_library_symbols.cpp +++ b/trick_source/sim_services/MemoryManager/MemoryManager_add_shared_library_symbols.cpp @@ -9,7 +9,7 @@ #include <sstream> #include <dlfcn.h> -#include "sim_services/MemoryManager/include/MemoryManager.hh" +#include "trick/MemoryManager.hh" /* This routine only returns the size if ptr points to the beginning of the allocation area */ int Trick::MemoryManager::add_shared_library_symbols(const char * file_name) { diff --git a/trick_source/sim_services/MemoryManager/src/MemoryManager_add_template_name_trans.cpp b/trick_source/sim_services/MemoryManager/MemoryManager_add_template_name_trans.cpp similarity index 74% rename from trick_source/sim_services/MemoryManager/src/MemoryManager_add_template_name_trans.cpp rename to trick_source/sim_services/MemoryManager/MemoryManager_add_template_name_trans.cpp index 3226868e..a2b52259 100644 --- a/trick_source/sim_services/MemoryManager/src/MemoryManager_add_template_name_trans.cpp +++ b/trick_source/sim_services/MemoryManager/MemoryManager_add_template_name_trans.cpp @@ -1,4 +1,4 @@ -#include "sim_services/MemoryManager/include/MemoryManager.hh" +#include "trick/MemoryManager.hh" /** * diff --git a/trick_source/sim_services/MemoryManager/src/MemoryManager_add_var.cpp b/trick_source/sim_services/MemoryManager/MemoryManager_add_var.cpp similarity index 93% rename from trick_source/sim_services/MemoryManager/src/MemoryManager_add_var.cpp rename to trick_source/sim_services/MemoryManager/MemoryManager_add_var.cpp index a8b1f2ba..d377cdf2 100644 --- a/trick_source/sim_services/MemoryManager/src/MemoryManager_add_var.cpp +++ b/trick_source/sim_services/MemoryManager/MemoryManager_add_var.cpp @@ -5,9 +5,9 @@ #include <iostream> #include <sstream> -#include "sim_services/MemoryManager/include/value.h" -#include "sim_services/MemoryManager/include/vval.h" -#include "sim_services/MemoryManager/include/MemoryManager.hh" +#include "trick/value.h" +#include "trick/vval.h" +#include "trick/MemoryManager.hh" void* Trick::MemoryManager::add_var( TRICK_TYPE type, const char* class_name, diff --git a/trick_source/sim_services/MemoryManager/src/MemoryManager_alloc_depends.cpp b/trick_source/sim_services/MemoryManager/MemoryManager_alloc_depends.cpp similarity index 98% rename from trick_source/sim_services/MemoryManager/src/MemoryManager_alloc_depends.cpp rename to trick_source/sim_services/MemoryManager/MemoryManager_alloc_depends.cpp index 427c698a..7dfe9e40 100644 --- a/trick_source/sim_services/MemoryManager/src/MemoryManager_alloc_depends.cpp +++ b/trick_source/sim_services/MemoryManager/MemoryManager_alloc_depends.cpp @@ -1,5 +1,5 @@ -#include "sim_services/MemoryManager/include/MemoryManager.hh" -#include "sim_services/MemoryManager/include/attributes.h" +#include "trick/MemoryManager.hh" +#include "trick/attributes.h" // MEMBER FUNCTION void Trick::MemoryManager::get_alloc_deps_in_allocation(std::vector<ALLOC_INFO*>& dependencies, ALLOC_INFO* alloc_info ) { diff --git a/trick_source/sim_services/MemoryManager/src/MemoryManager_alloc_info_map.cpp b/trick_source/sim_services/MemoryManager/MemoryManager_alloc_info_map.cpp similarity index 95% rename from trick_source/sim_services/MemoryManager/src/MemoryManager_alloc_info_map.cpp rename to trick_source/sim_services/MemoryManager/MemoryManager_alloc_info_map.cpp index b75e9f5d..e2003dc3 100644 --- a/trick_source/sim_services/MemoryManager/src/MemoryManager_alloc_info_map.cpp +++ b/trick_source/sim_services/MemoryManager/MemoryManager_alloc_info_map.cpp @@ -1,4 +1,4 @@ -#include "sim_services/MemoryManager/include/MemoryManager.hh" +#include "trick/MemoryManager.hh" #include <sstream> ALLOC_INFO* Trick::MemoryManager::get_alloc_info_of( void* addr) { diff --git a/trick_source/sim_services/MemoryManager/src/MemoryManager_clear_memory.cpp b/trick_source/sim_services/MemoryManager/MemoryManager_clear_memory.cpp similarity index 98% rename from trick_source/sim_services/MemoryManager/src/MemoryManager_clear_memory.cpp rename to trick_source/sim_services/MemoryManager/MemoryManager_clear_memory.cpp index 43bcd8ea..fb778b60 100644 --- a/trick_source/sim_services/MemoryManager/src/MemoryManager_clear_memory.cpp +++ b/trick_source/sim_services/MemoryManager/MemoryManager_clear_memory.cpp @@ -1,5 +1,5 @@ -#include "sim_services/MemoryManager/include/MemoryManager.hh" -#include "sim_services/MemoryManager/include/bitfield_proto.h" +#include "trick/MemoryManager.hh" +#include "trick/bitfield_proto.h" #include <sstream> void Trick::MemoryManager::clear_rvalue( void* base_address, ATTRIBUTES* attr, int curr_dim, int offset) { diff --git a/trick_source/sim_services/MemoryManager/src/MemoryManager_declare_var.cpp b/trick_source/sim_services/MemoryManager/MemoryManager_declare_var.cpp similarity index 99% rename from trick_source/sim_services/MemoryManager/src/MemoryManager_declare_var.cpp rename to trick_source/sim_services/MemoryManager/MemoryManager_declare_var.cpp index acb639ba..cbe2aae1 100644 --- a/trick_source/sim_services/MemoryManager/src/MemoryManager_declare_var.cpp +++ b/trick_source/sim_services/MemoryManager/MemoryManager_declare_var.cpp @@ -3,8 +3,8 @@ #include <sstream> #include <dlfcn.h> -#include "sim_services/MemoryManager/include/MemoryManager.hh" -#include "sim_services/MemoryManager/include/ADefParseContext.hh" +#include "trick/MemoryManager.hh" +#include "trick/ADefParseContext.hh" /** @page examples_declare_var Examples of declare_var diff --git a/trick_source/sim_services/MemoryManager/src/MemoryManager_delete_var.cpp b/trick_source/sim_services/MemoryManager/MemoryManager_delete_var.cpp similarity index 98% rename from trick_source/sim_services/MemoryManager/src/MemoryManager_delete_var.cpp rename to trick_source/sim_services/MemoryManager/MemoryManager_delete_var.cpp index 62a1a185..ed95c93b 100644 --- a/trick_source/sim_services/MemoryManager/src/MemoryManager_delete_var.cpp +++ b/trick_source/sim_services/MemoryManager/MemoryManager_delete_var.cpp @@ -3,7 +3,7 @@ #include <sstream> #include <dlfcn.h> -#include "sim_services/MemoryManager/include/MemoryManager.hh" +#include "trick/MemoryManager.hh" // MEMBER FUNCTION int Trick::MemoryManager::delete_var(void* address, bool destroy ) { diff --git a/trick_source/sim_services/MemoryManager/src/MemoryManager_get_enumerated.cpp b/trick_source/sim_services/MemoryManager/MemoryManager_get_enumerated.cpp similarity index 92% rename from trick_source/sim_services/MemoryManager/src/MemoryManager_get_enumerated.cpp rename to trick_source/sim_services/MemoryManager/MemoryManager_get_enumerated.cpp index 70228fde..86c98259 100644 --- a/trick_source/sim_services/MemoryManager/src/MemoryManager_get_enumerated.cpp +++ b/trick_source/sim_services/MemoryManager/MemoryManager_get_enumerated.cpp @@ -1,4 +1,4 @@ -#include "sim_services/MemoryManager/include/MemoryManager.hh" +#include "trick/MemoryManager.hh" /** * MEMBER FUNCTION diff --git a/trick_source/sim_services/MemoryManager/src/MemoryManager_get_size.cpp b/trick_source/sim_services/MemoryManager/MemoryManager_get_size.cpp similarity index 98% rename from trick_source/sim_services/MemoryManager/src/MemoryManager_get_size.cpp rename to trick_source/sim_services/MemoryManager/MemoryManager_get_size.cpp index 5b1691e7..8b853f26 100644 --- a/trick_source/sim_services/MemoryManager/src/MemoryManager_get_size.cpp +++ b/trick_source/sim_services/MemoryManager/MemoryManager_get_size.cpp @@ -11,7 +11,7 @@ #include <stdio.h> #include <stdlib.h> -#include "sim_services/MemoryManager/include/MemoryManager.hh" +#include "trick/MemoryManager.hh" /* This routine only returns the size if ptr points to the beginning of the allocation area */ int Trick::MemoryManager::get_size(void *addr) { diff --git a/trick_source/sim_services/MemoryManager/src/MemoryManager_get_type_attributes.cpp b/trick_source/sim_services/MemoryManager/MemoryManager_get_type_attributes.cpp similarity index 98% rename from trick_source/sim_services/MemoryManager/src/MemoryManager_get_type_attributes.cpp rename to trick_source/sim_services/MemoryManager/MemoryManager_get_type_attributes.cpp index fb250de2..f57f2535 100644 --- a/trick_source/sim_services/MemoryManager/src/MemoryManager_get_type_attributes.cpp +++ b/trick_source/sim_services/MemoryManager/MemoryManager_get_type_attributes.cpp @@ -1,4 +1,4 @@ -#include "sim_services/MemoryManager/include/MemoryManager.hh" +#include "trick/MemoryManager.hh" #include <sstream> int Trick::MemoryManager::get_type_attributes( TRICK_TYPE& type, diff --git a/trick_source/sim_services/MemoryManager/src/MemoryManager_io_src_intf.cpp b/trick_source/sim_services/MemoryManager/MemoryManager_io_src_intf.cpp similarity index 99% rename from trick_source/sim_services/MemoryManager/src/MemoryManager_io_src_intf.cpp rename to trick_source/sim_services/MemoryManager/MemoryManager_io_src_intf.cpp index 730d887c..96aeb3b8 100644 --- a/trick_source/sim_services/MemoryManager/src/MemoryManager_io_src_intf.cpp +++ b/trick_source/sim_services/MemoryManager/MemoryManager_io_src_intf.cpp @@ -3,7 +3,7 @@ // Provides stringstream. #include <dlfcn.h> // Provides dlsym(). -#include "sim_services/MemoryManager/include/MemoryManager.hh" +#include "trick/MemoryManager.hh" // MEMBER FUNCTION: void* Trick::MemoryManager::io_src_allocate_class(const char* class_name, int num); diff --git a/trick_source/sim_services/MemoryManager/src/MemoryManager_is_alloced.cpp b/trick_source/sim_services/MemoryManager/MemoryManager_is_alloced.cpp similarity index 91% rename from trick_source/sim_services/MemoryManager/src/MemoryManager_is_alloced.cpp rename to trick_source/sim_services/MemoryManager/MemoryManager_is_alloced.cpp index 2658720d..0f822a73 100644 --- a/trick_source/sim_services/MemoryManager/src/MemoryManager_is_alloced.cpp +++ b/trick_source/sim_services/MemoryManager/MemoryManager_is_alloced.cpp @@ -1,4 +1,4 @@ -#include "sim_services/MemoryManager/include/MemoryManager.hh" +#include "trick/MemoryManager.hh" int Trick::MemoryManager::is_alloced(void *addr) { diff --git a/trick_source/sim_services/MemoryManager/src/MemoryManager_make_declaration.cpp b/trick_source/sim_services/MemoryManager/MemoryManager_make_declaration.cpp similarity index 91% rename from trick_source/sim_services/MemoryManager/src/MemoryManager_make_declaration.cpp rename to trick_source/sim_services/MemoryManager/MemoryManager_make_declaration.cpp index 101b64d8..06e9ec60 100644 --- a/trick_source/sim_services/MemoryManager/src/MemoryManager_make_declaration.cpp +++ b/trick_source/sim_services/MemoryManager/MemoryManager_make_declaration.cpp @@ -1,4 +1,4 @@ -#include "sim_services/MemoryManager/include/MemoryManager.hh" +#include "trick/MemoryManager.hh" #include <sstream> std::string Trick::MemoryManager::make_decl_string( TRICK_TYPE type, diff --git a/trick_source/sim_services/MemoryManager/src/MemoryManager_make_reference_attr.cpp b/trick_source/sim_services/MemoryManager/MemoryManager_make_reference_attr.cpp similarity index 95% rename from trick_source/sim_services/MemoryManager/src/MemoryManager_make_reference_attr.cpp rename to trick_source/sim_services/MemoryManager/MemoryManager_make_reference_attr.cpp index 0de741a5..5c096c52 100644 --- a/trick_source/sim_services/MemoryManager/src/MemoryManager_make_reference_attr.cpp +++ b/trick_source/sim_services/MemoryManager/MemoryManager_make_reference_attr.cpp @@ -1,7 +1,7 @@ #include <stdlib.h> -#include "sim_services/MemoryManager/include/MemoryManager.hh" +#include "trick/MemoryManager.hh" // MEMBER FUNCTION ATTRIBUTES* Trick::MemoryManager::make_reference_attr( ALLOC_INFO* alloc_info) { diff --git a/trick_source/sim_services/MemoryManager/src/MemoryManager_map_external_object.cpp b/trick_source/sim_services/MemoryManager/MemoryManager_map_external_object.cpp similarity index 98% rename from trick_source/sim_services/MemoryManager/src/MemoryManager_map_external_object.cpp rename to trick_source/sim_services/MemoryManager/MemoryManager_map_external_object.cpp index 8ea2dea3..fdb8813b 100644 --- a/trick_source/sim_services/MemoryManager/src/MemoryManager_map_external_object.cpp +++ b/trick_source/sim_services/MemoryManager/MemoryManager_map_external_object.cpp @@ -1,8 +1,8 @@ #include <sstream> #include <stdlib.h> -#include "sim_services/MemoryManager/include/MemoryManager.hh" -#include "sim_services/MemoryManager/include/ADefParseContext.hh" +#include "trick/MemoryManager.hh" +#include "trick/ADefParseContext.hh" /** @par Description: diff --git a/trick_source/sim_services/MemoryManager/src/MemoryManager_realloc.cpp b/trick_source/sim_services/MemoryManager/MemoryManager_realloc.cpp similarity index 99% rename from trick_source/sim_services/MemoryManager/src/MemoryManager_realloc.cpp rename to trick_source/sim_services/MemoryManager/MemoryManager_realloc.cpp index a573ca4e..53eb3892 100644 --- a/trick_source/sim_services/MemoryManager/src/MemoryManager_realloc.cpp +++ b/trick_source/sim_services/MemoryManager/MemoryManager_realloc.cpp @@ -1,4 +1,4 @@ -#include "sim_services/MemoryManager/include/MemoryManager.hh" +#include "trick/MemoryManager.hh" #include <dlfcn.h> #include <stdlib.h> #include <sstream> diff --git a/trick_source/sim_services/MemoryManager/src/MemoryManager_ref_allocate.cpp b/trick_source/sim_services/MemoryManager/MemoryManager_ref_allocate.cpp similarity index 87% rename from trick_source/sim_services/MemoryManager/src/MemoryManager_ref_allocate.cpp rename to trick_source/sim_services/MemoryManager/MemoryManager_ref_allocate.cpp index 22bdaefc..b941b909 100644 --- a/trick_source/sim_services/MemoryManager/src/MemoryManager_ref_allocate.cpp +++ b/trick_source/sim_services/MemoryManager/MemoryManager_ref_allocate.cpp @@ -3,9 +3,9 @@ #include <string.h> #include <sstream> -#include "sim_services/MemoryManager/include/attributes.h" -#include "sim_services/MemoryManager/include/reference.h" -#include "sim_services/MemoryManager/include/MemoryManager.hh" +#include "trick/attributes.h" +#include "trick/reference.h" +#include "trick/MemoryManager.hh" int Trick::MemoryManager::ref_allocate(REF2 * R , int num ) { diff --git a/trick_source/sim_services/MemoryManager/src/MemoryManager_ref_assignment.cpp b/trick_source/sim_services/MemoryManager/MemoryManager_ref_assignment.cpp similarity index 98% rename from trick_source/sim_services/MemoryManager/src/MemoryManager_ref_assignment.cpp rename to trick_source/sim_services/MemoryManager/MemoryManager_ref_assignment.cpp index cda7cb55..f7b63c7a 100644 --- a/trick_source/sim_services/MemoryManager/src/MemoryManager_ref_assignment.cpp +++ b/trick_source/sim_services/MemoryManager/MemoryManager_ref_assignment.cpp @@ -1,9 +1,9 @@ -#include "sim_services/MemoryManager/include/MemoryManager.hh" -#include "sim_services/MemoryManager/include/bitfield_proto.h" -#include "sim_services/MemoryManager/include/vval.h" -#include "sim_services/MemoryManager/include/wcs_ext.h" -#include "trick_utils/units/include/Unit.hh" -#include "trick_utils/units/include/UCFn.hh" +#include "trick/MemoryManager.hh" +#include "trick/bitfield_proto.h" +#include "trick/vval.h" +#include "trick/wcs_ext.h" +#include "trick/Unit.hh" +#include "trick/UCFn.hh" #include <limits.h> #include <sstream> diff --git a/trick_source/sim_services/MemoryManager/src/MemoryManager_ref_attributes.cpp b/trick_source/sim_services/MemoryManager/MemoryManager_ref_attributes.cpp similarity index 89% rename from trick_source/sim_services/MemoryManager/src/MemoryManager_ref_attributes.cpp rename to trick_source/sim_services/MemoryManager/MemoryManager_ref_attributes.cpp index f7f4d13a..8a1d65c0 100644 --- a/trick_source/sim_services/MemoryManager/src/MemoryManager_ref_attributes.cpp +++ b/trick_source/sim_services/MemoryManager/MemoryManager_ref_attributes.cpp @@ -3,8 +3,8 @@ #include <stdio.h> #include <stdlib.h> #include <sstream> -#include "sim_services/MemoryManager/include/MemoryManager.hh" -#include "sim_services/MemoryManager/include/RefParseContext.hh" +#include "trick/MemoryManager.hh" +#include "trick/RefParseContext.hh" extern int REF_debug; diff --git a/trick_source/sim_services/MemoryManager/src/MemoryManager_ref_dim.cpp b/trick_source/sim_services/MemoryManager/MemoryManager_ref_dim.cpp similarity index 91% rename from trick_source/sim_services/MemoryManager/src/MemoryManager_ref_dim.cpp rename to trick_source/sim_services/MemoryManager/MemoryManager_ref_dim.cpp index 8d13f68e..71be4c0b 100644 --- a/trick_source/sim_services/MemoryManager/src/MemoryManager_ref_dim.cpp +++ b/trick_source/sim_services/MemoryManager/MemoryManager_ref_dim.cpp @@ -3,11 +3,11 @@ #include <string.h> #include <sstream> -#include "sim_services/MemoryManager/include/MemoryManager.hh" -#include "sim_services/MemoryManager/include/vval.h" -#include "sim_services/MemoryManager/include/attributes.h" -#include "sim_services/MemoryManager/include/reference.h" -#include "sim_services/MemoryManager/include/parameter_types.h" +#include "trick/MemoryManager.hh" +#include "trick/vval.h" +#include "trick/attributes.h" +#include "trick/reference.h" +#include "trick/parameter_types.h" /* Updates R, a reference to an arrayed object, to a reference to the indexed sub-element of that arrayed object. diff --git a/trick_source/sim_services/MemoryManager/src/MemoryManager_ref_name.cpp b/trick_source/sim_services/MemoryManager/MemoryManager_ref_name.cpp similarity index 92% rename from trick_source/sim_services/MemoryManager/src/MemoryManager_ref_name.cpp rename to trick_source/sim_services/MemoryManager/MemoryManager_ref_name.cpp index dd2c3891..ceaa7616 100644 --- a/trick_source/sim_services/MemoryManager/src/MemoryManager_ref_name.cpp +++ b/trick_source/sim_services/MemoryManager/MemoryManager_ref_name.cpp @@ -7,11 +7,11 @@ #include <string.h> #include <sstream> -#include "sim_services/MemoryManager/include/MemoryManager.hh" -#include "sim_services/MemoryManager/include/attributes.h" -#include "sim_services/MemoryManager/include/reference.h" -#include "sim_services/MemoryManager/include/parameter_types.h" -#include "sim_services/MemoryManager/include/mm_error.h" +#include "trick/MemoryManager.hh" +#include "trick/attributes.h" +#include "trick/reference.h" +#include "trick/parameter_types.h" +#include "trick/mm_error.h" //FIXME TODO make a error file /////// MM_NO_ERROR 0 diff --git a/trick_source/sim_services/MemoryManager/src/MemoryManager_ref_name_from_address.cpp b/trick_source/sim_services/MemoryManager/MemoryManager_ref_name_from_address.cpp similarity index 74% rename from trick_source/sim_services/MemoryManager/src/MemoryManager_ref_name_from_address.cpp rename to trick_source/sim_services/MemoryManager/MemoryManager_ref_name_from_address.cpp index 11eff08c..b625cf22 100644 --- a/trick_source/sim_services/MemoryManager/src/MemoryManager_ref_name_from_address.cpp +++ b/trick_source/sim_services/MemoryManager/MemoryManager_ref_name_from_address.cpp @@ -1,5 +1,5 @@ -#include "sim_services/MemoryManager/include/MemoryManager.hh" -#include "sim_services/CheckPointAgent/include/ClassicCheckPointAgent.hh" +#include "trick/MemoryManager.hh" +#include "trick/ClassicCheckPointAgent.hh" /** @par Detailed Description: diff --git a/trick_source/sim_services/MemoryManager/src/MemoryManager_ref_var.cpp b/trick_source/sim_services/MemoryManager/MemoryManager_ref_var.cpp similarity index 84% rename from trick_source/sim_services/MemoryManager/src/MemoryManager_ref_var.cpp rename to trick_source/sim_services/MemoryManager/MemoryManager_ref_var.cpp index 9fd20abd..8659a5e4 100644 --- a/trick_source/sim_services/MemoryManager/src/MemoryManager_ref_var.cpp +++ b/trick_source/sim_services/MemoryManager/MemoryManager_ref_var.cpp @@ -1,8 +1,8 @@ #include <string.h> #include <stdio.h> -#include "sim_services/MemoryManager/include/MemoryManager.hh" -#include "sim_services/MemoryManager/include/value.h" -#include "sim_services/MemoryManager/include/vval.h" +#include "trick/MemoryManager.hh" +#include "trick/value.h" +#include "trick/vval.h" int Trick::MemoryManager::ref_var( REF2* R, char* name) { diff --git a/trick_source/sim_services/MemoryManager/src/MemoryManager_restore.cpp b/trick_source/sim_services/MemoryManager/MemoryManager_restore.cpp similarity index 96% rename from trick_source/sim_services/MemoryManager/src/MemoryManager_restore.cpp rename to trick_source/sim_services/MemoryManager/MemoryManager_restore.cpp index 59e60aeb..ea763ef5 100644 --- a/trick_source/sim_services/MemoryManager/src/MemoryManager_restore.cpp +++ b/trick_source/sim_services/MemoryManager/MemoryManager_restore.cpp @@ -3,8 +3,8 @@ #include <sstream> #include <fstream> -#include "sim_services/MemoryManager/include/MemoryManager.hh" -#include "sim_services/CheckPointAgent/include/ClassicCheckPointAgent.hh" +#include "trick/MemoryManager.hh" +#include "trick/ClassicCheckPointAgent.hh" int Trick::MemoryManager::read_checkpoint( std::istream *is) { diff --git a/trick_source/sim_services/MemoryManager/src/MemoryManager_set_checkpointagent.cpp b/trick_source/sim_services/MemoryManager/MemoryManager_set_checkpointagent.cpp similarity index 88% rename from trick_source/sim_services/MemoryManager/src/MemoryManager_set_checkpointagent.cpp rename to trick_source/sim_services/MemoryManager/MemoryManager_set_checkpointagent.cpp index 6710d67c..3b2beaec 100644 --- a/trick_source/sim_services/MemoryManager/src/MemoryManager_set_checkpointagent.cpp +++ b/trick_source/sim_services/MemoryManager/MemoryManager_set_checkpointagent.cpp @@ -1,4 +1,4 @@ -#include "sim_services/MemoryManager/include/MemoryManager.hh" +#include "trick/MemoryManager.hh" Trick::CheckPointAgent * Trick::MemoryManager::get_CheckPointAgent() { return currentCheckPointAgent ; diff --git a/trick_source/sim_services/MemoryManager/src/MemoryManager_set_debug_level.cpp b/trick_source/sim_services/MemoryManager/MemoryManager_set_debug_level.cpp similarity index 91% rename from trick_source/sim_services/MemoryManager/src/MemoryManager_set_debug_level.cpp rename to trick_source/sim_services/MemoryManager/MemoryManager_set_debug_level.cpp index 42d21743..90c5e7f9 100644 --- a/trick_source/sim_services/MemoryManager/src/MemoryManager_set_debug_level.cpp +++ b/trick_source/sim_services/MemoryManager/MemoryManager_set_debug_level.cpp @@ -1,4 +1,4 @@ -#include "sim_services/MemoryManager/include/MemoryManager.hh" +#include "trick/MemoryManager.hh" void Trick::MemoryManager::set_debug_level(int level) { debug_level = level; diff --git a/trick_source/sim_services/MemoryManager/src/MemoryManager_strdup.cpp b/trick_source/sim_services/MemoryManager/MemoryManager_strdup.cpp similarity index 90% rename from trick_source/sim_services/MemoryManager/src/MemoryManager_strdup.cpp rename to trick_source/sim_services/MemoryManager/MemoryManager_strdup.cpp index 9d673223..f1db1bae 100644 --- a/trick_source/sim_services/MemoryManager/src/MemoryManager_strdup.cpp +++ b/trick_source/sim_services/MemoryManager/MemoryManager_strdup.cpp @@ -1,4 +1,4 @@ -#include "sim_services/MemoryManager/include/MemoryManager.hh" +#include "trick/MemoryManager.hh" /** @par Detailed Description: diff --git a/trick_source/sim_services/MemoryManager/src/MemoryManager_write_checkpoint.cpp b/trick_source/sim_services/MemoryManager/MemoryManager_write_checkpoint.cpp similarity index 98% rename from trick_source/sim_services/MemoryManager/src/MemoryManager_write_checkpoint.cpp rename to trick_source/sim_services/MemoryManager/MemoryManager_write_checkpoint.cpp index 0c641cc9..4464bc5a 100644 --- a/trick_source/sim_services/MemoryManager/src/MemoryManager_write_checkpoint.cpp +++ b/trick_source/sim_services/MemoryManager/MemoryManager_write_checkpoint.cpp @@ -3,7 +3,7 @@ #include <string.h> #include <stdlib.h> // free() #include <algorithm> // std::sort() -#include "sim_services/MemoryManager/include/MemoryManager.hh" +#include "trick/MemoryManager.hh" // GreenHills stuff #if ( __ghs ) diff --git a/trick_source/sim_services/MemoryManager/src/MemoryManager_write_var.cpp b/trick_source/sim_services/MemoryManager/MemoryManager_write_var.cpp similarity index 98% rename from trick_source/sim_services/MemoryManager/src/MemoryManager_write_var.cpp rename to trick_source/sim_services/MemoryManager/MemoryManager_write_var.cpp index 1dacad64..26c4e246 100644 --- a/trick_source/sim_services/MemoryManager/src/MemoryManager_write_var.cpp +++ b/trick_source/sim_services/MemoryManager/MemoryManager_write_var.cpp @@ -1,7 +1,7 @@ #include <fstream> #include <sstream> #include <string.h> -#include "sim_services/MemoryManager/include/MemoryManager.hh" +#include "trick/MemoryManager.hh" // GreenHills stuff #if ( __ghs ) diff --git a/trick_source/sim_services/MemoryManager/src/RefParseContext.cpp b/trick_source/sim_services/MemoryManager/RefParseContext.cpp similarity index 87% rename from trick_source/sim_services/MemoryManager/src/RefParseContext.cpp rename to trick_source/sim_services/MemoryManager/RefParseContext.cpp index 0d448b70..a8c9c85a 100644 --- a/trick_source/sim_services/MemoryManager/src/RefParseContext.cpp +++ b/trick_source/sim_services/MemoryManager/RefParseContext.cpp @@ -1,6 +1,6 @@ #include <stdio.h> #include <stdlib.h> -#include "sim_services/MemoryManager/include/RefParseContext.hh" +#include "trick/RefParseContext.hh" /** Constructor diff --git a/trick_source/sim_services/MemoryManager/src/addr_bitfield.c b/trick_source/sim_services/MemoryManager/addr_bitfield.c similarity index 96% rename from trick_source/sim_services/MemoryManager/src/addr_bitfield.c rename to trick_source/sim_services/MemoryManager/addr_bitfield.c index 48b21cce..2750e335 100644 --- a/trick_source/sim_services/MemoryManager/src/addr_bitfield.c +++ b/trick_source/sim_services/MemoryManager/addr_bitfield.c @@ -1,5 +1,5 @@ -#include "sim_services/include/attributes.h" -#include "sim_services/MemoryManager/include/bitfield_proto.h" +#include "trick/attributes.h" +#include "trick/bitfield_proto.h" /* Who is using this? (Alex 04/16/12) */ diff --git a/trick_source/sim_services/MemoryManager/src/adef_parser.l b/trick_source/sim_services/MemoryManager/adef_parser.l similarity index 96% rename from trick_source/sim_services/MemoryManager/src/adef_parser.l rename to trick_source/sim_services/MemoryManager/adef_parser.l index 3c32beec..8280ec19 100644 --- a/trick_source/sim_services/MemoryManager/src/adef_parser.l +++ b/trick_source/sim_services/MemoryManager/adef_parser.l @@ -14,9 +14,9 @@ #include <stdio.h> #include <stdlib.h> #include <ctype.h> -#include "sim_services/MemoryManager/include/mm_error.h" -#include "sim_services/MemoryManager/include/ADefParseContext.hh" -#include "sim_services/MemoryManager/src/adef_parser.tab.h" +#include "trick/mm_error.h" +#include "trick/ADefParseContext.hh" +#include "adef_parser.tab.h" #define YY_EXTRA_TYPE Trick::ADefParseContext* diff --git a/trick_source/sim_services/MemoryManager/src/adef_parser.y b/trick_source/sim_services/MemoryManager/adef_parser.y similarity index 94% rename from trick_source/sim_services/MemoryManager/src/adef_parser.y rename to trick_source/sim_services/MemoryManager/adef_parser.y index f8c49e2b..f6ba49d4 100644 --- a/trick_source/sim_services/MemoryManager/src/adef_parser.y +++ b/trick_source/sim_services/MemoryManager/adef_parser.y @@ -14,10 +14,10 @@ #include <sstream> #include <stdlib.h> -#include "sim_services/MemoryManager/include/vval.h" -#include "sim_services/MemoryManager/include/value.h" -#include "sim_services/MemoryManager/include/var.h" -#include "sim_services/MemoryManager/include/ADefParseContext.hh" +#include "trick/vval.h" +#include "trick/value.h" +#include "trick/var.h" +#include "trick/ADefParseContext.hh" #include "adef_parser.tab.h" using namespace std; diff --git a/trick_source/sim_services/MemoryManager/definitions_page.dox b/trick_source/sim_services/MemoryManager/definitions_page.dox deleted file mode 100644 index 593bac76..00000000 --- a/trick_source/sim_services/MemoryManager/definitions_page.dox +++ /dev/null @@ -1,68 +0,0 @@ -/** -@page defsMemoryManager Definitions - -The following definitions describe terms used throughout the documentation of the Memory Manager. - -@anchor definition_of_declaration -@section Declaration - -A declaration is a statement that a region of memory has a particular type, -organization and an optional name. - -A declaration is a statement, consisting of a @ref definition_of_type_specifier "type_specifier" -followed by a @ref definition_of_declarator "declarator", that specifies that a region of memory -has a type, organization and an optional name. - -Example: int *foo[2][3] - -The type-specifier is: int - -The declarator is : *foo[2][3] - -@anchor definition_of_declarator -@section Declarator -A declarator consists of zero or more pointers (asterisks) followed by a variable name, -followed by zero of more bracketed integers. - -@anchor definition_of_intrinsic_type -@section Intrinsic-type -An intrinsic type is a fundemental data type that the Trick Memory Manager -inherently "knows" about, by design. They are a subset of the intrinsic C/C++ -data types: - - - char - - short - - int - - long - - float - - double - - long long - - wchar_t - - unsigned char - - unsigned short - - unsigned int - - unsigned long - - unsigned long long - - -@anchor definition_of_singleton -@section Singleton -A singleton is a set of exactly one item. -For example: -The following is a @ref definition_of_declaration "declaration" of exactly one -double named S. S is not arrayed. S is a singleton. - - double S; - -It is convenient to consider a singleton as a zero dimensional array. - -@anchor definition_of_intrinsic_type_specifier -@section Intrinsic-type-specifier -A type-specifier is a name that specifies an \ref definition_of_intrinsic_type "intrinsic type" -or a \ref definition_of_user_defined_type_specifier "user defined type". - -@anchor definition_of_user_defined_type_specifier -@section User-defined-type-specifier -A user defined type specifier is the name of a typedef'ed struct or a class, including if necessary, -scope resolution operators ( i.e., "::"). -*/ diff --git a/trick_source/sim_services/MemoryManager/MM.doxygen b/trick_source/sim_services/MemoryManager/docs/MM.doxygen similarity index 100% rename from trick_source/sim_services/MemoryManager/MM.doxygen rename to trick_source/sim_services/MemoryManager/docs/MM.doxygen diff --git a/trick_source/sim_services/MemoryManager/main_page.dox_in b/trick_source/sim_services/MemoryManager/docs/main_page.dox_in similarity index 100% rename from trick_source/sim_services/MemoryManager/main_page.dox_in rename to trick_source/sim_services/MemoryManager/docs/main_page.dox_in diff --git a/trick_source/sim_services/MemoryManager/src/extract_bitfield.c b/trick_source/sim_services/MemoryManager/extract_bitfield.c similarity index 98% rename from trick_source/sim_services/MemoryManager/src/extract_bitfield.c rename to trick_source/sim_services/MemoryManager/extract_bitfield.c index 171c4377..242877b2 100644 --- a/trick_source/sim_services/MemoryManager/src/extract_bitfield.c +++ b/trick_source/sim_services/MemoryManager/extract_bitfield.c @@ -5,7 +5,7 @@ PROGRAMMERS: (((Jane Falgout) (Lincom)) ((Alex Lin) (NASA) (8/00))) */ -#include "sim_services/MemoryManager/include/bitfield_proto.h" +#include "trick/bitfield_proto.h" int extract_bitfield_any(int value, /* In: Value to extract bits from */ int size, /* In: Declared size of bitfield */ diff --git a/trick_source/sim_services/MemoryManager/src/extract_unsigned_bitfield.c b/trick_source/sim_services/MemoryManager/extract_unsigned_bitfield.c similarity index 96% rename from trick_source/sim_services/MemoryManager/src/extract_unsigned_bitfield.c rename to trick_source/sim_services/MemoryManager/extract_unsigned_bitfield.c index 025e20e0..4aaa9900 100644 --- a/trick_source/sim_services/MemoryManager/src/extract_unsigned_bitfield.c +++ b/trick_source/sim_services/MemoryManager/extract_unsigned_bitfield.c @@ -6,7 +6,7 @@ ((Alex Lin) (NASA) (8/00))) */ -#include "sim_services/MemoryManager/include/bitfield_proto.h" +#include "trick/bitfield_proto.h" unsigned int extract_unsigned_bitfield_any(unsigned int value, /* In: Value to extract bits from */ int size, /* In: Declared size of bitfield */ diff --git a/trick_source/sim_services/MemoryManager/src/follow_address_path.c b/trick_source/sim_services/MemoryManager/follow_address_path.c similarity index 85% rename from trick_source/sim_services/MemoryManager/src/follow_address_path.c rename to trick_source/sim_services/MemoryManager/follow_address_path.c index 453fba16..cc982635 100644 --- a/trick_source/sim_services/MemoryManager/src/follow_address_path.c +++ b/trick_source/sim_services/MemoryManager/follow_address_path.c @@ -1,6 +1,6 @@ -#include "sim_services/MemoryManager/include/reference.h" -#include "sim_services/MemoryManager/include/memorymanager_c_intf.h" +#include "trick/reference.h" +#include "trick/memorymanager_c_intf.h" void * follow_address_path(REF2 * R) { diff --git a/trick_source/sim_services/MemoryManager/src/insert_bitfield.c b/trick_source/sim_services/MemoryManager/insert_bitfield.c similarity index 98% rename from trick_source/sim_services/MemoryManager/src/insert_bitfield.c rename to trick_source/sim_services/MemoryManager/insert_bitfield.c index 2e6a6d98..06b8cba4 100644 --- a/trick_source/sim_services/MemoryManager/src/insert_bitfield.c +++ b/trick_source/sim_services/MemoryManager/insert_bitfield.c @@ -5,7 +5,7 @@ PROGRAMMERS: (((Jane Falgout) (LinCom)) ((Alex Lin) (NASA) (8/00))) */ -#include "sim_services/MemoryManager/include/bitfield_proto.h" +#include "trick/bitfield_proto.h" unsigned int insert_bitfield_any(unsigned int bitfield, /* In: Bitfiled to insert value into */ int value, /* In: Value */ diff --git a/trick_source/sim_services/MemoryManager/src/parameter_types.c b/trick_source/sim_services/MemoryManager/parameter_types.c similarity index 96% rename from trick_source/sim_services/MemoryManager/src/parameter_types.c rename to trick_source/sim_services/MemoryManager/parameter_types.c index 06592f5f..6a57c809 100644 --- a/trick_source/sim_services/MemoryManager/src/parameter_types.c +++ b/trick_source/sim_services/MemoryManager/parameter_types.c @@ -1,6 +1,6 @@ // Is this function used anywhere? (Alex 10/27/14) -#include "sim_services/MemoryManager/include/parameter_types.h" +#include "trick/parameter_types.h" const char* trick_type_name(TRICK_TYPE type) ; diff --git a/trick_source/sim_services/MemoryManager/src/ref_free.cpp b/trick_source/sim_services/MemoryManager/ref_free.cpp similarity index 88% rename from trick_source/sim_services/MemoryManager/src/ref_free.cpp rename to trick_source/sim_services/MemoryManager/ref_free.cpp index dbb1aefc..4623c1d3 100644 --- a/trick_source/sim_services/MemoryManager/src/ref_free.cpp +++ b/trick_source/sim_services/MemoryManager/ref_free.cpp @@ -5,8 +5,8 @@ #include <stdlib.h> -#include "sim_services/MemoryManager/include/reference.h" -#include "trick_utils/trick_adt/include/dllist.h" +#include "trick/reference.h" +#include "trick/dllist.h" extern "C" void ref_free(REF2 * ref) { if ( ref ) { diff --git a/trick_source/sim_services/MemoryManager/src/ref_parser.l b/trick_source/sim_services/MemoryManager/ref_parser.l similarity index 95% rename from trick_source/sim_services/MemoryManager/src/ref_parser.l rename to trick_source/sim_services/MemoryManager/ref_parser.l index 28119fb4..1a072f99 100644 --- a/trick_source/sim_services/MemoryManager/src/ref_parser.l +++ b/trick_source/sim_services/MemoryManager/ref_parser.l @@ -15,9 +15,9 @@ #include <stdio.h> #include <stdlib.h> #include <ctype.h> -#include "sim_services/MemoryManager/include/mm_error.h" -#include "sim_services/MemoryManager/include/RefParseContext.hh" -#include "sim_services/MemoryManager/src/ref_parser.tab.h" +#include "trick/mm_error.h" +#include "trick/RefParseContext.hh" +#include "ref_parser.tab.h" #define YY_EXTRA_TYPE RefParseContext* diff --git a/trick_source/sim_services/MemoryManager/src/ref_parser.y b/trick_source/sim_services/MemoryManager/ref_parser.y similarity index 95% rename from trick_source/sim_services/MemoryManager/src/ref_parser.y rename to trick_source/sim_services/MemoryManager/ref_parser.y index 9fec207d..aec37fc9 100644 --- a/trick_source/sim_services/MemoryManager/src/ref_parser.y +++ b/trick_source/sim_services/MemoryManager/ref_parser.y @@ -14,10 +14,10 @@ #include <sstream> #include <stdlib.h> -#include "sim_services/MemoryManager/include/RefParseContext.hh" -#include "sim_services/MemoryManager/include/vval.h" -#include "sim_services/MemoryManager/include/value.h" -#include "sim_services/MemoryManager/include/var.h" +#include "trick/RefParseContext.hh" +#include "trick/vval.h" +#include "trick/value.h" +#include "trick/var.h" #include "ref_parser.tab.h" using namespace std; diff --git a/trick_source/sim_services/MemoryManager/src/ref_to_value.c b/trick_source/sim_services/MemoryManager/ref_to_value.c similarity index 95% rename from trick_source/sim_services/MemoryManager/src/ref_to_value.c rename to trick_source/sim_services/MemoryManager/ref_to_value.c index c5b1d7d9..b9bf0845 100644 --- a/trick_source/sim_services/MemoryManager/src/ref_to_value.c +++ b/trick_source/sim_services/MemoryManager/ref_to_value.c @@ -13,10 +13,10 @@ #include <wchar.h> #endif -#include "sim_services/MemoryManager/include/reference.h" -#include "sim_services/MemoryManager/include/parameter_types.h" -#include "sim_services/MemoryManager/include/mm_error.h" -#include "sim_services/MemoryManager/include/bitfield_proto.h" +#include "trick/reference.h" +#include "trick/parameter_types.h" +#include "trick/mm_error.h" +#include "trick/bitfield_proto.h" int ref_to_value(REF2 * R, V_DATA * V) { diff --git a/trick_source/sim_services/MemoryManager/src/convert_07_to_10.dox b/trick_source/sim_services/MemoryManager/src/convert_07_to_10.dox deleted file mode 100644 index 55d107f9..00000000 --- a/trick_source/sim_services/MemoryManager/src/convert_07_to_10.dox +++ /dev/null @@ -1,109 +0,0 @@ - -/** - @page convert_07_to_10 Converting Memory Allocation Calls from Trick 07 - -@anchor ip_alloc_type -@section convert_ip_alloc Converting ip_alloc calls - - In Trick 07, ip_alloc is a macro defined in exec_proto.h as: - - \code #define ip_alloc(NUM, SIZE) ip_alloc_type(NUM, SIZE, NULL, NULL) \endcode - - This macro allocates memory without any type information. - - \attention Allocating non-typed memory is NOT ALLOWED in Trick 10. - - Lets suppose that in your Trick 07 sim, it was your intention to allocate 10 characters (type char), for example: - - \code char* A = (char*)ip_alloc(10, sizeof(char)); \endcode - - In Trick 10 you have several choices. - - If you'd like the use the "C" Memory Mananger Interface, you'll need to - - \code #include "memorymanager_c_intf.h" \endcode - - Then you can replace the ip_alloc call with either: - - - \code char* A = (char*)TMM_declare_var_s("char[10]"); \endcode -or - - \code char* A = (char*)TMM_declare_var_1d("char", 10); \endcode - - If instead you'd like to use the C++ interface: - - \code extern Trick::MemoryManager* trick_MM; \endcode - - Then you can replace the ip_alloc call with either: - - - \code char* A = (char*)trick_MM->declare_var("char[10]"); \endcode -or - - \code char* A = (char*)trick_MM->declare_var("char", 10); \endcode - -@anchor ip_alloc_type -@section convert_ip_alloc_type Converting ip_alloc_type calls - - In Trick 10: use one of the three versions of Trick::MemoryManager::declare_var. - See @subpage examples_declare_var "Examples of declare_var". - - Or, alternatively use the C interfaces: - - TMM_declare_var (Most general form, where each part of a declaration is in a separate parameter). - - TMM_declare_var_1d (Convenience version for creating a 1 dimensional array.) - - TMM_declare_var_s (Convenience version for creating using variable using a declaration string.) - -@anchor ip_alloc_user_type -@section convert_ip_alloc_user_type Converting ip_alloc_user_type calls - - In Trick 10: use one of the three versions of Trick::MemoryManager::declare_ext_var. - - Or, alternatively use the C interfaces: - - TMM_declare_ext_var (Most general form, where each part of a declaration is in a separate parameter). - - TMM_declare_ext_var_1d (Convenience version for declaring an external 1 dimensional array.) - - TMM_declare_ext_var_s (Convenience version for declaring an external variable using a declaration string.) - -@anchor ip_realloc -@section convert_ip_realloc Converting ip_realloc calls - - In Trick 10, use Trick::MemoryManager::resize_array. - - Or, alternatively use the C interfaces: - - TMM_resize_array_a (Resize array by address reference.) - - TMM_resize_array_n (Resize array by name reference.) - - TMM_resize_array_1d_a (Resize one dimensional array by address reference). - - TMM_resize_array_1d_n(Resize one dimensional array by name reference) - -@anchor ip_strdup -@section convert_ip_strdup Converting ip_strdup calls - - In Trick 10, use Trick::MemoryManager::mm_strdup. - -@anchor get_size -@section convert_get_size Converting get_size calls - - In Trick 10, use Trick::MemoryManager::get_size. - -@anchor ip_is_alloced -@section convert_ip_is_alloced Converting ip_is_alloced calls - - In Trick 10, use Trick::MemoryManager::is_alloced. - -@anchor ip_destruct -@section convert_ip_destruct Converting ip_destruct calls - - In Trick 10, use: - - - Trick::MemoryManager::delete_var - or - - Trick::MemoryManager::delete_extern_var. - -@anchor ip_free -@section convert_ip_free Converting ip_free_debug and ip_free_multi_dim_array calls - - In Trick 10, use: - - - Trick::MemoryManager::delete_var - or - - Trick::MemoryManager::delete_extern_var. - -*/ - - diff --git a/trick_source/sim_services/MemoryManager/src/makefile b/trick_source/sim_services/MemoryManager/src/makefile deleted file mode 100644 index f6828f85..00000000 --- a/trick_source/sim_services/MemoryManager/src/makefile +++ /dev/null @@ -1,15 +0,0 @@ -# Go up to parent directory and run make from there -default: - cd .. ; $(MAKE) -ICG: - cd .. ; $(MAKE) ICG -depend: - cd .. ; $(MAKE) depend -io_clean: - cd .. ; $(MAKE) io_clean -catalog_clean: - cd .. ; $(MAKE) catalog_clean -clean: - cd .. ; $(MAKE) clean -real_clean: - cd .. ; $(MAKE) real_clean diff --git a/trick_source/sim_services/MemoryManager/src/placement_new_init.dox b/trick_source/sim_services/MemoryManager/src/placement_new_init.dox deleted file mode 100644 index 51db4f03..00000000 --- a/trick_source/sim_services/MemoryManager/src/placement_new_init.dox +++ /dev/null @@ -1,39 +0,0 @@ -/** - @page placement_new_init Initializing MemoryManager Objects With placement new Operator - -In C++, there are actually three versions of the new operator. - -The first version (and the most commonly used) is used to 1) allocate a new -object and then 2) initialize that object. This version allocates memory for -the specified type, to its right and then calls either a default constructor or -a non-default constructor to initialize the object. If the allocation fails, -new throws a BAD_ALLOC exception. - -\attention Constructors do not allocate memory. They only initialize memory. - -Example: -\code -BAR *B = new BAR; -\endcode -The second version is very similar to the first except that it returns NULL on -an allocation failure rather than throwing an exception. - -Example: -\code -BAR *B = new(nothrow) BAR; -\endcode - -The third version (called "placement new") DOES NOT allocate memory. It only -performs initialization of an object to which it is given a pointer, by calling -a specified constructor. - -Using this third version of new, we can initialize MemoryManager allocated -objects with non-default constructors. Note that the MemoryManager always calls -the default constructor when allocating a C++ class object. - -Example: -\code -BAR *D = (BAR*)trick_MM.declare_var("BAR mydbl"); -D = new (D) BAR(a, b); -\endcode -*/ diff --git a/trick_source/sim_services/MemoryManager/src/trickTypeCharString.c b/trick_source/sim_services/MemoryManager/trickTypeCharString.c similarity index 96% rename from trick_source/sim_services/MemoryManager/src/trickTypeCharString.c rename to trick_source/sim_services/MemoryManager/trickTypeCharString.c index fdc88713..e032d583 100644 --- a/trick_source/sim_services/MemoryManager/src/trickTypeCharString.c +++ b/trick_source/sim_services/MemoryManager/trickTypeCharString.c @@ -1,5 +1,5 @@ -#include "sim_services/MemoryManager/include/parameter_types.h" +#include "trick/parameter_types.h" const char* trickTypeCharString( TRICK_TYPE type, const char* name) { diff --git a/trick_source/sim_services/MemoryManager/src/vval.c b/trick_source/sim_services/MemoryManager/vval.c similarity index 98% rename from trick_source/sim_services/MemoryManager/src/vval.c rename to trick_source/sim_services/MemoryManager/vval.c index fd73ae78..849e684d 100644 --- a/trick_source/sim_services/MemoryManager/src/vval.c +++ b/trick_source/sim_services/MemoryManager/vval.c @@ -4,10 +4,10 @@ #ifndef __Lynx__ #include <wchar.h> #endif -#include "sim_services/MemoryManager/include/vval.h" -#include "sim_services/MemoryManager/include/value.h" -#include "sim_services/MemoryManager/include/parameter_types.h" -#include "sim_services/MemoryManager/include/wcs_ext.h" +#include "trick/vval.h" +#include "trick/value.h" +#include "trick/parameter_types.h" +#include "trick/wcs_ext.h" /** */ diff --git a/trick_source/sim_services/MemoryManager/src/wcs_ext.c b/trick_source/sim_services/MemoryManager/wcs_ext.c similarity index 99% rename from trick_source/sim_services/MemoryManager/src/wcs_ext.c rename to trick_source/sim_services/MemoryManager/wcs_ext.c index 4e7491b5..c1947952 100644 --- a/trick_source/sim_services/MemoryManager/src/wcs_ext.c +++ b/trick_source/sim_services/MemoryManager/wcs_ext.c @@ -11,7 +11,7 @@ #include <string.h> #include <wctype.h> #include <limits.h> -#include "sim_services/MemoryManager/include/wcs_ext.h" +#include "trick/wcs_ext.h" size_t wcs_to_ncs_len(const wchar_t * wcs) diff --git a/trick_source/sim_services/MemoryManagerWrapper/Makefile b/trick_source/sim_services/MemoryManagerWrapper/Makefile deleted file mode 100644 index 11e3de21..00000000 --- a/trick_source/sim_services/MemoryManagerWrapper/Makefile +++ /dev/null @@ -1,9 +0,0 @@ - -include ${TRICK_HOME}/makefiles/Makefile.common -include ${TRICK_HOME}/makefiles/Makefile.tricklib --include Makefile_deps - -ifneq ($(DMTCP),) -TRICK_CXXFLAGS += -D_DMTCP -I$(DMTCP)/dmtcpaware -endif - diff --git a/trick_source/sim_services/MemoryManagerWrapper/Makefile_deps b/trick_source/sim_services/MemoryManagerWrapper/Makefile_deps deleted file mode 100644 index 993a9b45..00000000 --- a/trick_source/sim_services/MemoryManagerWrapper/Makefile_deps +++ /dev/null @@ -1,161 +0,0 @@ -object_${TRICK_HOST_CPU}/AttributesMap.o: src/AttributesMap.cpp \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManagerWrapper/include/AttributesMap.hh \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/attributes.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/parameter_types.h \ - ${TRICK_HOME}/trick_source/sim_services/CommandLineArguments/include/command_line_protos.h -object_${TRICK_HOST_CPU}/AttributesMap_c_intf.o: src/AttributesMap_c_intf.cpp \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManagerWrapper/include/AttributesMap.hh \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/attributes.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/parameter_types.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManagerWrapper/include/AttributesMap_c_intf.hh -object_${TRICK_HOST_CPU}/MemoryManagerWrapper.o: src/MemoryManagerWrapper.cpp \ - ${TRICK_HOME}/trick_source/sim_services/DMTCP/include/DMTCP.hh \ - ${TRICK_HOME}/trick_source/sim_services/DMTCP/include/dmtcp_checkpoint_c_intf.hh \ - ${TRICK_HOME}/trick_source/sim_services/Scheduler/include/Scheduler.hh \ - ${TRICK_HOME}/trick_source/sim_services/ScheduledJobQueue/include/ScheduledJobQueue.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/JobData.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/InstrumentBase.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/SimObject.hh \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManagerWrapper/include/MemoryManagerWrapper.hh \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/MemoryManager.hh \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/attributes.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/parameter_types.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/reference.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/value.h \ - ${TRICK_HOME}/trick_source/trick_utils/trick_adt/include/dllist.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/io_alloc.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/mm_error.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/var.h \ - ${TRICK_HOME}/trick_source/sim_services/CheckPointAgent/include/CheckPointAgent.hh \ - ${TRICK_HOME}/trick_source/trick_utils/units/include/UCFn.hh \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/Executive.hh \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/Threads.hh \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/sim_mode.h \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/exec_proto.hh \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/exec_proto.h \ - ${TRICK_HOME}/trick_source/sim_services/CommandLineArguments/include/command_line_protos.h \ - ${TRICK_HOME}/trick_source/sim_services/Message/include/message_proto.h \ - ${TRICK_HOME}/trick_source/sim_services/Message/include/message_type.h \ - ${TRICK_HOME}/trick_source/sim_services/include/TrickConstant.hh \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManagerWrapper/include/checkpoint_stl.hh \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManagerWrapper/include/checkpoint_sequence_stl.hh \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/memorymanager_c_intf.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManagerWrapper/include/checkpoint_map.hh \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManagerWrapper/include/checkpoint_stack.hh \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManagerWrapper/include/checkpoint_sequence_stl.hh \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManagerWrapper/include/checkpoint_queue.hh \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManagerWrapper/include/checkpoint_pair.hh -object_${TRICK_HOST_CPU}/MemoryManagerWrapper_c_intf.o: src/MemoryManagerWrapper_c_intf.cpp \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManagerWrapper/include/MemoryManagerWrapper.hh \ - ${TRICK_HOME}/trick_source/sim_services/Scheduler/include/Scheduler.hh \ - ${TRICK_HOME}/trick_source/sim_services/ScheduledJobQueue/include/ScheduledJobQueue.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/JobData.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/InstrumentBase.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/SimObject.hh \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/MemoryManager.hh \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/attributes.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/parameter_types.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/reference.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/value.h \ - ${TRICK_HOME}/trick_source/trick_utils/trick_adt/include/dllist.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/io_alloc.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/mm_error.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/var.h \ - ${TRICK_HOME}/trick_source/sim_services/CheckPointAgent/include/CheckPointAgent.hh \ - ${TRICK_HOME}/trick_source/trick_utils/units/include/UCFn.hh \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManagerWrapper/include/MemoryManagerWrapper_c_intf.hh \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/memorymanager_c_intf.h \ - ${TRICK_HOME}/trick_source/sim_services/Message/include/message_proto.h \ - ${TRICK_HOME}/trick_source/sim_services/Message/include/message_type.h -object_${TRICK_HOST_CPU}/MemoryManagerWrapper_sie.o: src/MemoryManagerWrapper_sie.cpp \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManagerWrapper/include/MemoryManagerWrapper.hh \ - ${TRICK_HOME}/trick_source/sim_services/Scheduler/include/Scheduler.hh \ - ${TRICK_HOME}/trick_source/sim_services/ScheduledJobQueue/include/ScheduledJobQueue.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/JobData.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/InstrumentBase.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/SimObject.hh \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/MemoryManager.hh \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/attributes.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/parameter_types.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/reference.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/value.h \ - ${TRICK_HOME}/trick_source/trick_utils/trick_adt/include/dllist.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/io_alloc.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/mm_error.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/var.h \ - ${TRICK_HOME}/trick_source/sim_services/CheckPointAgent/include/CheckPointAgent.hh \ - ${TRICK_HOME}/trick_source/trick_utils/units/include/UCFn.hh \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/exec_proto.hh \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/Executive.hh \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/Threads.hh \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/sim_mode.h \ - ${TRICK_HOME}/trick_source/sim_services/CommandLineArguments/include/command_line_protos.h -object_${TRICK_HOST_CPU}/checkpoint_map.o: src/checkpoint_map.cpp \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManagerWrapper/include/checkpoint_map.hh \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/memorymanager_c_intf.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/parameter_types.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/attributes.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/reference.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/value.h \ - ${TRICK_HOME}/trick_source/trick_utils/trick_adt/include/dllist.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/var.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/io_alloc.h \ - ${TRICK_HOME}/trick_source/sim_services/Message/include/message_proto.h \ - ${TRICK_HOME}/trick_source/sim_services/Message/include/message_type.h -object_${TRICK_HOST_CPU}/checkpoint_pair.o: src/checkpoint_pair.cpp \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManagerWrapper/include/checkpoint_pair.hh \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/memorymanager_c_intf.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/parameter_types.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/attributes.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/reference.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/value.h \ - ${TRICK_HOME}/trick_source/trick_utils/trick_adt/include/dllist.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/var.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/io_alloc.h \ - ${TRICK_HOME}/trick_source/sim_services/Message/include/message_proto.h \ - ${TRICK_HOME}/trick_source/sim_services/Message/include/message_type.h -object_${TRICK_HOST_CPU}/checkpoint_queue.o: src/checkpoint_queue.cpp \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManagerWrapper/include/checkpoint_queue.hh \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManagerWrapper/include/checkpoint_sequence_stl.hh \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/memorymanager_c_intf.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/parameter_types.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/attributes.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/reference.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/value.h \ - ${TRICK_HOME}/trick_source/trick_utils/trick_adt/include/dllist.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/var.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/io_alloc.h \ - ${TRICK_HOME}/trick_source/sim_services/Message/include/message_proto.h \ - ${TRICK_HOME}/trick_source/sim_services/Message/include/message_type.h -object_${TRICK_HOST_CPU}/checkpoint_sequence_stl.o: src/checkpoint_sequence_stl.cpp \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManagerWrapper/include/checkpoint_sequence_stl.hh \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/memorymanager_c_intf.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/parameter_types.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/attributes.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/reference.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/value.h \ - ${TRICK_HOME}/trick_source/trick_utils/trick_adt/include/dllist.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/var.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/io_alloc.h \ - ${TRICK_HOME}/trick_source/sim_services/Message/include/message_proto.h \ - ${TRICK_HOME}/trick_source/sim_services/Message/include/message_type.h -object_${TRICK_HOST_CPU}/checkpoint_stack.o: src/checkpoint_stack.cpp \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManagerWrapper/include/checkpoint_stack.hh \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManagerWrapper/include/checkpoint_sequence_stl.hh \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/memorymanager_c_intf.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/parameter_types.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/attributes.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/reference.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/value.h \ - ${TRICK_HOME}/trick_source/trick_utils/trick_adt/include/dllist.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/var.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/io_alloc.h \ - ${TRICK_HOME}/trick_source/sim_services/Message/include/message_proto.h \ - ${TRICK_HOME}/trick_source/sim_services/Message/include/message_type.h -object_${TRICK_HOST_CPU}/collect.o: src/collect.cpp \ - ${TRICK_HOME}/trick_source/sim_services/include/collect_macros.h \ - ${TRICK_HOME}/trick_source/sim_services/include/exec_proto.h \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/exec_proto.h \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/sim_mode.h -object_${TRICK_HOST_CPU}/next_attr_name.o: src/next_attr_name.cpp \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManagerWrapper/include/MemoryManagerWrapper_c_intf.hh diff --git a/trick_source/sim_services/MemoryManagerWrapper/include/MemoryManagerWrapper_c_intf.hh b/trick_source/sim_services/MemoryManagerWrapper/include/MemoryManagerWrapper_c_intf.hh deleted file mode 100644 index 1d021284..00000000 --- a/trick_source/sim_services/MemoryManagerWrapper/include/MemoryManagerWrapper_c_intf.hh +++ /dev/null @@ -1,2 +0,0 @@ -#pragma message ( "MemoryManagerWrapper_c_intf.hh has moved to sim_services/CheckPointRestart/include/CheckPointRestart_c_intf.hh" ) -#include "sim_services/CheckPointRestart/include/CheckPointRestart_c_intf.hh" diff --git a/trick_source/sim_services/MemoryManagerWrapper/include/checkpoint_map.hh b/trick_source/sim_services/MemoryManagerWrapper/include/checkpoint_map.hh deleted file mode 100644 index c2be87a3..00000000 --- a/trick_source/sim_services/MemoryManagerWrapper/include/checkpoint_map.hh +++ /dev/null @@ -1,2 +0,0 @@ -#pragma message ( "checkpoint_map.hh has moved to sim_services/CheckPointRestart/include/checkpoint_map.hh" ) -#include "sim_services/CheckPointRestart/include/checkpoint_map.hh" diff --git a/trick_source/sim_services/MemoryManagerWrapper/include/checkpoint_pair.hh b/trick_source/sim_services/MemoryManagerWrapper/include/checkpoint_pair.hh deleted file mode 100644 index ee2b6edd..00000000 --- a/trick_source/sim_services/MemoryManagerWrapper/include/checkpoint_pair.hh +++ /dev/null @@ -1,3 +0,0 @@ -#pragma message ( "checkpoint_pair.hh has moved to sim_services/CheckPointRestart/include/checkpoint_pair.hh" ) -#include "sim_services/CheckPointRestart/include/checkpoint_pair.hh" - diff --git a/trick_source/sim_services/MemoryManagerWrapper/include/checkpoint_queue.hh b/trick_source/sim_services/MemoryManagerWrapper/include/checkpoint_queue.hh deleted file mode 100644 index be622667..00000000 --- a/trick_source/sim_services/MemoryManagerWrapper/include/checkpoint_queue.hh +++ /dev/null @@ -1,2 +0,0 @@ -#pragma message ( "checkpoint_queue.hh has moved to sim_services/CheckPointRestart/include/checkpoint_queue.hh" ) -#include "sim_services/CheckPointRestart/include/checkpoint_queue.hh" diff --git a/trick_source/sim_services/MemoryManagerWrapper/include/checkpoint_sequence_stl.hh b/trick_source/sim_services/MemoryManagerWrapper/include/checkpoint_sequence_stl.hh deleted file mode 100644 index e6a84651..00000000 --- a/trick_source/sim_services/MemoryManagerWrapper/include/checkpoint_sequence_stl.hh +++ /dev/null @@ -1,3 +0,0 @@ -#pragma message ( "checkpoint_sequence_stl.hh has moved to sim_services/CheckPointRestart/include/checkpoint_sequence_stl.hh" ) -#include "sim_services/CheckPointRestart/include/checkpoint_sequence_stl.hh" - diff --git a/trick_source/sim_services/MemoryManagerWrapper/include/checkpoint_stack.hh b/trick_source/sim_services/MemoryManagerWrapper/include/checkpoint_stack.hh deleted file mode 100644 index dea55d31..00000000 --- a/trick_source/sim_services/MemoryManagerWrapper/include/checkpoint_stack.hh +++ /dev/null @@ -1,2 +0,0 @@ -#pragma message ( "checkpoint_stack.hh has moved to sim_services/CheckPointRestart/include/checkpoint_stack.hh" ) -#include "sim_services/CheckPointRestart/include/checkpoint_stack.hh" diff --git a/trick_source/sim_services/MemoryManagerWrapper/include/checkpoint_stl.hh b/trick_source/sim_services/MemoryManagerWrapper/include/checkpoint_stl.hh deleted file mode 100644 index 0e8761f1..00000000 --- a/trick_source/sim_services/MemoryManagerWrapper/include/checkpoint_stl.hh +++ /dev/null @@ -1,3 +0,0 @@ -#pragma message ( "checkpoint_stl.hh has moved to sim_services/CheckPointRestart/include/checkpoint_stl.hh" ) -#include "sim_services/CheckPointRestart/include/checkpoint_stl.hh" - diff --git a/trick_source/sim_services/MemoryManagerWrapper/main_page.dox_in b/trick_source/sim_services/MemoryManagerWrapper/main_page.dox_in deleted file mode 100644 index 9cc1189d..00000000 --- a/trick_source/sim_services/MemoryManagerWrapper/main_page.dox_in +++ /dev/null @@ -1,122 +0,0 @@ - -/** -@page LEVEL2 Checkpoints (Trick Memory Manager Wrapper) - -The MemoryManagerWrapper class coordinates checkpoint operations within a Trick simulation. -When a Trick simulation performs a checkpoint, both the Executive and the MemoryManager have -responsibilities. The Executive must execute the "checkpoint" and "post-checkpoint" jobs. The -MemoryManager must dump a representation of the memory state to a file. The MemoryManagerWrapper -ensures harmony by initiating each of these checkpoint operations at the appropriate time. - -When the user turns on the Trick checkpointing feature using one of the @ref chk_routines "User accessible routines" below, Trick will drop a simulation state image checkpoint file which -represents the state of the simulation at a certain point in time. This is an ASCII file with the values of every @e checkpointable -simulation structure / class variable (see @ref chk_data "Checkpointable data" below). Checkpoint files may be used -for debugging purposes or to re-initialize the simulation to a state other than the initial simulation state. - -Checkpoint files are output to the simulation RUN directory. - -@section LEVEL3 User accessible routines -@anchor chk_routines - -@li int @link Trick::MemoryManagerWrapper::checkpoint(std::string,bool,std::string) checkpoint() ; @endlink -@li int @link Trick::MemoryManagerWrapper::checkpoint(double) checkpoint( double in_time ) ; @endlink -@li int checkpoint( const char * file_name ) ; -@li int checkpoint_cpu( int in_cpu_num ) ; -@li int checkpoint_end(int yes_no) ; -@li const char * @link Trick::MemoryManagerWrapper::get_output_file checkpoint_get_output_file() ; @endlink -@li int checkpoint_objects( const char * file_name, const char * objects ) ; -@li int checkpoint_pre_init(int yes_no) ; -@li int checkpoint_post_init(int yes_no) ; -@li int checkpoint_safestore( double in_time ) ; -@li int checkpoint_safestore_set_enabled(int yes_no) ; -@li int load_checkpoint( const char * file_name ) ; - -@section LEVEL3 Checkpointable data -@anchor chk_data -First and foremost, a variable can only be checkpointable if it is in a header flie (.h/.hh) processed by ICG, which is automatically invoked when you CP your simulation. -So your Trick header comment in the .h/.hh file must NOT have "ICG:(No)" specified. Also the variable's i/o specification -(in the Trick comment beside the declare) must NOT be "**" or "*i". - -@section LEVEL4 C primitive data -The following variables are checkpointable: -@li any C primitive type (@e char, @e int, @e double, etc.) -@li a pointer to a C primitive type that was allocated using Trick::MemoryManager -@li any arrayed variable of the above types - -@section LEVEL4 C++ data -In addition to C primitives, the C++ standard data types @e string and @e bool are also checkpointable. - -C++ Standard Template Library (STL) container types (@e vector, @e map, etc.) are inherently not checkpointable because the way that the C++ compiler stores them in memory is hidden. -However, they can be checkpointed with a little help; the user simply must invoke Trick's CHECKPOINT_STL macro. (The macro will invoke Trick code behind the scenes -that will create checkpoint/restart class jobs which essentially copy the specified STL data to/from a checkpointable array.) The following STL types can be checkpointed -via CHECKPOINT_STL: @e deque, @e list, @e map, @e multimap, @e multiset, @e pair, @e priority_queue, @e queue, @e set, @e stack, @e vector. - -In the S_define file, the syntax to checkpoint an STL variable is: -@code CHECKPOINT_STL(<stl_variable_name>) ; @endcode - -In the following example, the MyClass class contains a vector named my_double_vector: -@code -class MySimObject : public Trick::SimObject { - - public: - MyClass stlc ; - - MySimObject() { - - (1.0, "scheduled") stlc.update() ; - CHECKPOINT_STL(stlc.my_double_vector) ; - } - -} ; -MySimObject the_object ; -@endcode - -Trick creates a unique name for the array that my_double_vector is copied to. So for the example above, the checkpoint file would contain something like this: -@code -double the_object_stlc_my_double_vector_[3]; -. -. -the_object_stlc_my_double_vector_ = - {4, 5, 6}; -@endcode - -In case there are circumstances in which you need to call the Trick STL checkpoint code directly, see the following Trick source code: -@li @link trick_source/sim_services/MemoryManagerWrapper/include/stl_s_define_macro.hh stl_s_define_macro.hh @endlink - the macro definition -@li @link trick_source/sim_services/MemoryManagerWrapper/include/checkpoint_stl.hh checkpoint_stl.hh @endlink - include all stl code headers -@li @link trick_source/sim_services/MemoryManagerWrapper/include/checkpoint_map.hh checkpoint_map.hh @endlink, - @link trick_source/sim_services/MemoryManagerWrapper/src/checkpoint_map.cpp checkpoint_map.cpp @endlink - @e map, @e multimap source code -@li @link trick_source/sim_services/MemoryManagerWrapper/include/checkpoint_pair.hh checkpoint_pair.hh @endlink, - @link trick_source/sim_services/MemoryManagerWrapper/src/checkpoint_pair.cpp checkpoint_pair.cpp @endlink - @e pair source code -@li @link trick_source/sim_services/MemoryManagerWrapper/include/checkpoint_queue.hh checkpoint_queue.hh @endlink, - @link trick_source/sim_services/MemoryManagerWrapper/src/checkpoint_queue.cpp checkpoint_queue.cpp @endlink - @e queue, @e priority_queue source code -@li @link trick_source/sim_services/MemoryManagerWrapper/include/checkpoint_sequence_stl.hh checkpoint_sequence_stl.hh @endlink, - @link trick_source/sim_services/MemoryManagerWrapper/src/checkpoint_sequence_stl.cpp checkpoint_sequence_stl.cpp @endlink - @e vector, @e list, @e deque, @e set, @e multiset source code -@li @link trick_source/sim_services/MemoryManagerWrapper/include/checkpoint_stack.hh checkpoint_stack.hh @endlink, - @link trick_source/sim_services/MemoryManagerWrapper/src/checkpoint_stack.cpp checkpoint_stack.cpp @endlink - @e stack source code - -@section LEVEL4 C++ private data -For a class that has private data, if you want that data to be checkpointed you have to give Trick access to it by adding a couple of friend statements to your class. -The syntax for this is: -@code -friend class InputProcessor ; -friend void init_attr<this_class_name> ; -@endcode - -So if your MyClass class contains private data that you want to checkpoint, the MyClass class declaration would look something like this: -@code -class MyClass { - friend class InputProcessor ; - friend void init_attrMyClass ; - private: - . - . - public: - . - . -} -@endcode - -@b NOTE: if you have private data in a @b base class that is inherited in a @b derived class, you must instead make that data @e protected (not private) in the @b base class. - - */ - diff --git a/trick_source/sim_services/Message/Makefile b/trick_source/sim_services/Message/Makefile index 3029433b..a181cedf 100644 --- a/trick_source/sim_services/Message/Makefile +++ b/trick_source/sim_services/Message/Makefile @@ -1,5 +1,5 @@ -include ${TRICK_HOME}/makefiles/Makefile.common -include ${TRICK_HOME}/makefiles/Makefile.tricklib +include ${TRICK_HOME}/share/trick/makefiles/Makefile.common +include ${TRICK_HOME}/share/trick/makefiles/Makefile.tricklib -include Makefile_deps diff --git a/trick_source/sim_services/Message/Makefile_deps b/trick_source/sim_services/Message/Makefile_deps index ca6bbd2d..c874fb4d 100644 --- a/trick_source/sim_services/Message/Makefile_deps +++ b/trick_source/sim_services/Message/Makefile_deps @@ -1,62 +1,51 @@ -object_${TRICK_HOST_CPU}/MessageTCDevice.o: src/MessageTCDevice.cpp \ - ${TRICK_HOME}/trick_source/sim_services/Message/include/MessageTCDevice.hh \ - ${TRICK_HOME}/trick_source/sim_services/Message/include/MessageSubscriber.hh \ - ${TRICK_HOME}/trick_source/trick_utils/comm/include/tc.h \ - ${TRICK_HOME}/trick_source/trick_utils/comm/include/trick_byteswap.h \ - ${TRICK_HOME}/trick_source/trick_utils/comm/include/trick_error_hndlr.h \ - ${TRICK_HOME}/trick_source/sim_services/Message/include/message_type.h \ - ${TRICK_HOME}/trick_source/sim_services/MonteCarlo/include/montecarlo_c_intf.h \ - ${TRICK_HOME}/trick_source/trick_utils/comm/include/tc_proto.h \ - ${TRICK_HOME}/trick_source/trick_utils/comm/include/tc.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/attributes.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/parameter_types.h \ - ${TRICK_HOME}/trick_source/trick_utils/comm/include/tc_proto.h -object_${TRICK_HOST_CPU}/Playback_c_intf.o: src/Playback_c_intf.cpp \ - ${TRICK_HOME}/trick_source/sim_services/Message/include/PlaybackPublisher.hh \ - ${TRICK_HOME}/trick_source/sim_services/Message/include/MessageSubscriber.hh \ - ${TRICK_HOME}/trick_source/sim_services/Message/include/MessageFile.hh \ - ${TRICK_HOME}/trick_source/sim_services/Message/include/message_proto.h \ - ${TRICK_HOME}/trick_source/sim_services/Message/include/message_type.h -object_${TRICK_HOST_CPU}/MessageFile.o: src/MessageFile.cpp \ - ${TRICK_HOME}/trick_source/sim_services/Message/include/MessageFile.hh \ - ${TRICK_HOME}/trick_source/sim_services/Message/include/MessageSubscriber.hh \ - ${TRICK_HOME}/trick_source/sim_services/CommandLineArguments/include/command_line_protos.h -object_${TRICK_HOST_CPU}/MessageCout.o: src/MessageCout.cpp \ - ${TRICK_HOME}/trick_source/sim_services/Message/include/MessageCout.hh \ - ${TRICK_HOME}/trick_source/sim_services/Message/include/MessageSubscriber.hh \ - ${TRICK_HOME}/trick_source/sim_services/Message/include/message_type.h -object_${TRICK_HOST_CPU}/message_publish_standalone.o: src/message_publish_standalone.cpp -object_${TRICK_HOST_CPU}/PlaybackPublisher.o: src/PlaybackPublisher.cpp \ - ${TRICK_HOME}/trick_source/sim_services/Message/include/PlaybackPublisher.hh \ - ${TRICK_HOME}/trick_source/sim_services/Message/include/MessageSubscriber.hh \ - ${TRICK_HOME}/trick_source/sim_services/Message/include/message_proto.h \ - ${TRICK_HOME}/trick_source/sim_services/Message/include/message_type.h \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/exec_proto.h \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/sim_mode.h -object_${TRICK_HOST_CPU}/Message_c_intf.o: src/Message_c_intf.cpp \ - ${TRICK_HOME}/trick_source/sim_services/Message/include/MessagePublisher.hh \ - ${TRICK_HOME}/trick_source/sim_services/Message/include/MessageSubscriber.hh \ - ${TRICK_HOME}/trick_source/sim_services/Message/include/MessageCout.hh \ - ${TRICK_HOME}/trick_source/sim_services/Message/include/MessageFile.hh \ - ${TRICK_HOME}/trick_source/sim_services/Message/include/MessageTCDevice.hh \ - ${TRICK_HOME}/trick_source/trick_utils/comm/include/tc.h \ - ${TRICK_HOME}/trick_source/trick_utils/comm/include/trick_byteswap.h \ - ${TRICK_HOME}/trick_source/trick_utils/comm/include/trick_error_hndlr.h \ - ${TRICK_HOME}/trick_source/sim_services/Message/include/message_proto.h \ - ${TRICK_HOME}/trick_source/sim_services/Message/include/message_type.h -object_${TRICK_HOST_CPU}/MessageSubscriber.o: src/MessageSubscriber.cpp \ - ${TRICK_HOME}/trick_source/sim_services/Message/include/MessageSubscriber.hh -object_${TRICK_HOST_CPU}/MessageLCout.o: src/MessageLCout.cpp \ - ${TRICK_HOME}/trick_source/sim_services/Message/include/MessageLCout.hh \ - ${TRICK_HOME}/trick_source/sim_services/Message/include/MessageSubscriber.hh -object_${TRICK_HOST_CPU}/MessagePublisher.o: src/MessagePublisher.cpp \ - ${TRICK_HOME}/trick_source/sim_services/Message/include/MessagePublisher.hh \ - ${TRICK_HOME}/trick_source/sim_services/Message/include/MessageSubscriber.hh \ - ${TRICK_HOME}/trick_source/sim_services/Message/include/message_proto.h \ - ${TRICK_HOME}/trick_source/sim_services/Message/include/message_type.h \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/exec_proto.h \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/sim_mode.h -object_${TRICK_HOST_CPU}/PlaybackFile.o: src/PlaybackFile.cpp \ - ${TRICK_HOME}/trick_source/sim_services/Message/include/PlaybackFile.hh \ - ${TRICK_HOME}/trick_source/sim_services/Message/include/MessageSubscriber.hh \ - ${TRICK_HOME}/trick_source/sim_services/CommandLineArguments/include/command_line_protos.h +object_${TRICK_HOST_CPU}/PlaybackFile.o: PlaybackFile.cpp \ + ${TRICK_HOME}/include/trick/PlaybackFile.hh \ + ${TRICK_HOME}/include/trick/MessageFile.hh \ + ${TRICK_HOME}/include/trick/MessageSubscriber.hh \ + ${TRICK_HOME}/include/trick/message_type.h +object_${TRICK_HOST_CPU}/MessagePublisher.o: MessagePublisher.cpp \ + ${TRICK_HOME}/include/trick/MessagePublisher.hh \ + ${TRICK_HOME}/include/trick/MessageSubscriber.hh \ + ${TRICK_HOME}/include/trick/message_proto.h \ + ${TRICK_HOME}/include/trick/message_type.h \ + ${TRICK_HOME}/include/trick/exec_proto.h \ + ${TRICK_HOME}/include/trick/sim_mode.h +object_${TRICK_HOST_CPU}/MessageLCout.o: MessageLCout.cpp \ + ${TRICK_HOME}/include/trick/MessageLCout.hh \ + ${TRICK_HOME}/include/trick/MessageSubscriber.hh +object_${TRICK_HOST_CPU}/MessageTCDevice.o: MessageTCDevice.cpp \ + ${TRICK_HOME}/include/trick/MessageTCDevice.hh \ + ${TRICK_HOME}/include/trick/MessageSubscriber.hh \ + ${TRICK_HOME}/include/trick/ThreadBase.hh \ + ${TRICK_HOME}/include/trick/tc.h \ + ${TRICK_HOME}/include/trick/trick_byteswap.h \ + ${TRICK_HOME}/include/trick/trick_error_hndlr.h \ + ${TRICK_HOME}/include/trick/message_type.h \ + ${TRICK_HOME}/include/trick/montecarlo_c_intf.h \ + ${TRICK_HOME}/include/trick/tc_proto.h \ + ${TRICK_HOME}/include/trick/tc.h \ + ${TRICK_HOME}/include/trick/attributes.h \ + ${TRICK_HOME}/include/trick/parameter_types.h +object_${TRICK_HOST_CPU}/Message_c_intf.o: Message_c_intf.cpp \ + ${TRICK_HOME}/include/trick/MessagePublisher.hh \ + ${TRICK_HOME}/include/trick/MessageSubscriber.hh \ + ${TRICK_HOME}/include/trick/MessageCout.hh \ + ${TRICK_HOME}/include/trick/MessageFile.hh \ + ${TRICK_HOME}/include/trick/MessageTCDevice.hh \ + ${TRICK_HOME}/include/trick/ThreadBase.hh \ + ${TRICK_HOME}/include/trick/tc.h \ + ${TRICK_HOME}/include/trick/trick_byteswap.h \ + ${TRICK_HOME}/include/trick/trick_error_hndlr.h \ + ${TRICK_HOME}/include/trick/message_proto.h \ + ${TRICK_HOME}/include/trick/message_type.h +object_${TRICK_HOST_CPU}/message_publish_standalone.o: message_publish_standalone.cpp +object_${TRICK_HOST_CPU}/MessageCout.o: MessageCout.cpp \ + ${TRICK_HOME}/include/trick/MessageCout.hh \ + ${TRICK_HOME}/include/trick/MessageSubscriber.hh \ + ${TRICK_HOME}/include/trick/message_type.h +object_${TRICK_HOST_CPU}/MessageSubscriber.o: MessageSubscriber.cpp \ + ${TRICK_HOME}/include/trick/MessageSubscriber.hh +object_${TRICK_HOST_CPU}/MessageFile.o: MessageFile.cpp \ + ${TRICK_HOME}/include/trick/MessageFile.hh \ + ${TRICK_HOME}/include/trick/MessageSubscriber.hh \ + ${TRICK_HOME}/include/trick/command_line_protos.h diff --git a/trick_source/sim_services/Message/src/MessageCout.cpp b/trick_source/sim_services/Message/MessageCout.cpp similarity index 93% rename from trick_source/sim_services/Message/src/MessageCout.cpp rename to trick_source/sim_services/Message/MessageCout.cpp index 71be6a1e..9c278170 100644 --- a/trick_source/sim_services/Message/src/MessageCout.cpp +++ b/trick_source/sim_services/Message/MessageCout.cpp @@ -1,6 +1,6 @@ -#include "sim_services/Message/include/MessageCout.hh" -#include "sim_services/Message/include/message_type.h" +#include "trick/MessageCout.hh" +#include "trick/message_type.h" #include <sstream> diff --git a/trick_source/sim_services/Message/src/MessageFile.cpp b/trick_source/sim_services/Message/MessageFile.cpp similarity index 90% rename from trick_source/sim_services/Message/src/MessageFile.cpp rename to trick_source/sim_services/Message/MessageFile.cpp index 69a25e4b..d22a3c5e 100644 --- a/trick_source/sim_services/Message/src/MessageFile.cpp +++ b/trick_source/sim_services/Message/MessageFile.cpp @@ -2,8 +2,8 @@ #include <iostream> #include <unistd.h> -#include "sim_services/Message/include/MessageFile.hh" -#include "sim_services/CommandLineArguments/include/command_line_protos.h" +#include "trick/MessageFile.hh" +#include "trick/command_line_protos.h" /** @details diff --git a/trick_source/sim_services/Message/src/MessageLCout.cpp b/trick_source/sim_services/Message/MessageLCout.cpp similarity index 97% rename from trick_source/sim_services/Message/src/MessageLCout.cpp rename to trick_source/sim_services/Message/MessageLCout.cpp index cef99049..a8c5f958 100644 --- a/trick_source/sim_services/Message/src/MessageLCout.cpp +++ b/trick_source/sim_services/Message/MessageLCout.cpp @@ -2,7 +2,7 @@ #include <string.h> #include <sstream> -#include "sim_services/Message/include/MessageLCout.hh" +#include "trick/MessageLCout.hh" Trick::MessageLCout::MessageLCout() { enabled = 1 ; diff --git a/trick_source/sim_services/Message/src/MessagePublisher.cpp b/trick_source/sim_services/Message/MessagePublisher.cpp similarity index 94% rename from trick_source/sim_services/Message/src/MessagePublisher.cpp rename to trick_source/sim_services/Message/MessagePublisher.cpp index e72dbd89..435e4452 100644 --- a/trick_source/sim_services/Message/src/MessagePublisher.cpp +++ b/trick_source/sim_services/Message/MessagePublisher.cpp @@ -7,9 +7,9 @@ #include <math.h> #include <unistd.h> -#include "sim_services/Message/include/MessagePublisher.hh" -#include "sim_services/Message/include/message_proto.h" -#include "sim_services/Executive/include/exec_proto.h" +#include "trick/MessagePublisher.hh" +#include "trick/message_proto.h" +#include "trick/exec_proto.h" #define MAX_MSG_HEADER_SIZE 256 diff --git a/trick_source/sim_services/Message/src/MessageSubscriber.cpp b/trick_source/sim_services/Message/MessageSubscriber.cpp similarity index 81% rename from trick_source/sim_services/Message/src/MessageSubscriber.cpp rename to trick_source/sim_services/Message/MessageSubscriber.cpp index e98f4799..7bbac82c 100644 --- a/trick_source/sim_services/Message/src/MessageSubscriber.cpp +++ b/trick_source/sim_services/Message/MessageSubscriber.cpp @@ -1,5 +1,5 @@ -#include "sim_services/Message/include/MessageSubscriber.hh" +#include "trick/MessageSubscriber.hh" Trick::MessageSubscriber::MessageSubscriber() : enabled(true) , diff --git a/trick_source/sim_services/Message/src/MessageTCDevice.cpp b/trick_source/sim_services/Message/MessageTCDevice.cpp similarity index 96% rename from trick_source/sim_services/Message/src/MessageTCDevice.cpp rename to trick_source/sim_services/Message/MessageTCDevice.cpp index b302928d..ea75de6a 100644 --- a/trick_source/sim_services/Message/src/MessageTCDevice.cpp +++ b/trick_source/sim_services/Message/MessageTCDevice.cpp @@ -2,10 +2,10 @@ #include <string.h> #include <stdlib.h> -#include "sim_services/Message/include/MessageTCDevice.hh" -#include "sim_services/Message/include/message_type.h" -#include "sim_services/MonteCarlo/include/montecarlo_c_intf.h" -#include "trick_utils/comm/include/tc_proto.h" +#include "trick/MessageTCDevice.hh" +#include "trick/message_type.h" +#include "trick/montecarlo_c_intf.h" +#include "trick/tc_proto.h" Trick::MessageTCDeviceListenThread::MessageTCDeviceListenThread(MessageTCDevice * in_mtcd) : Trick::ThreadBase("MessageListen"), diff --git a/trick_source/sim_services/Message/src/Message_c_intf.cpp b/trick_source/sim_services/Message/Message_c_intf.cpp similarity index 91% rename from trick_source/sim_services/Message/src/Message_c_intf.cpp rename to trick_source/sim_services/Message/Message_c_intf.cpp index e0bff6c0..5e717e9a 100644 --- a/trick_source/sim_services/Message/src/Message_c_intf.cpp +++ b/trick_source/sim_services/Message/Message_c_intf.cpp @@ -3,11 +3,11 @@ #include <stdio.h> #include <stdarg.h> -#include "sim_services/Message/include/MessagePublisher.hh" -#include "sim_services/Message/include/MessageCout.hh" -#include "sim_services/Message/include/MessageFile.hh" -#include "sim_services/Message/include/MessageTCDevice.hh" -#include "sim_services/Message/include/message_proto.h" +#include "trick/MessagePublisher.hh" +#include "trick/MessageCout.hh" +#include "trick/MessageFile.hh" +#include "trick/MessageTCDevice.hh" +#include "trick/message_proto.h" #define MAX_MSG_HEADER_SIZE 256 #define MAX_MSG_SIZE 20480 diff --git a/trick_source/sim_services/Message/src/PlaybackFile.cpp b/trick_source/sim_services/Message/PlaybackFile.cpp similarity index 77% rename from trick_source/sim_services/Message/src/PlaybackFile.cpp rename to trick_source/sim_services/Message/PlaybackFile.cpp index 03f50680..76d1c9aa 100644 --- a/trick_source/sim_services/Message/src/PlaybackFile.cpp +++ b/trick_source/sim_services/Message/PlaybackFile.cpp @@ -2,8 +2,8 @@ #include <iostream> #include <unistd.h> -#include "sim_services/Message/include/PlaybackFile.hh" -#include "sim_services/Message/include/message_type.h" +#include "trick/PlaybackFile.hh" +#include "trick/message_type.h" Trick::PlaybackFile::PlaybackFile() { file_name = "varserver_log" ; diff --git a/trick_source/sim_services/Message/main_page.dox_in b/trick_source/sim_services/Message/docs/main_page.dox_in similarity index 100% rename from trick_source/sim_services/Message/main_page.dox_in rename to trick_source/sim_services/Message/docs/main_page.dox_in diff --git a/trick_source/sim_services/Message/src/message_publish_standalone.cpp b/trick_source/sim_services/Message/message_publish_standalone.cpp similarity index 100% rename from trick_source/sim_services/Message/src/message_publish_standalone.cpp rename to trick_source/sim_services/Message/message_publish_standalone.cpp diff --git a/trick_source/sim_services/Message/src/makefile b/trick_source/sim_services/Message/src/makefile deleted file mode 100644 index 753bd7f7..00000000 --- a/trick_source/sim_services/Message/src/makefile +++ /dev/null @@ -1,6 +0,0 @@ - -all: - ${MAKE} -C .. - -clean: - ${MAKE} -C .. clean diff --git a/trick_source/sim_services/MonteCarlo/Makefile b/trick_source/sim_services/MonteCarlo/Makefile index 1d849982..e38d53ca 100644 --- a/trick_source/sim_services/MonteCarlo/Makefile +++ b/trick_source/sim_services/MonteCarlo/Makefile @@ -1,6 +1,6 @@ -include ${TRICK_HOME}/makefiles/Makefile.common -include ${TRICK_HOME}/makefiles/Makefile.tricklib +include ${TRICK_HOME}/share/trick/makefiles/Makefile.common +include ${TRICK_HOME}/share/trick/makefiles/Makefile.tricklib -include Makefile_deps diff --git a/trick_source/sim_services/MonteCarlo/Makefile_deps b/trick_source/sim_services/MonteCarlo/Makefile_deps index 9a4a583f..d95060f3 100644 --- a/trick_source/sim_services/MonteCarlo/Makefile_deps +++ b/trick_source/sim_services/MonteCarlo/Makefile_deps @@ -1,325 +1,471 @@ -object_${TRICK_HOST_CPU}/MonteCarlo.o: src/MonteCarlo.cpp \ - ${TRICK_HOME}/trick_source/sim_services/MonteCarlo/include/MonteCarlo.hh \ - ${TRICK_HOME}/trick_source/sim_services/MonteCarlo/include/MonteVar.hh \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/Executive.hh \ - ${TRICK_HOME}/trick_source/sim_services/Scheduler/include/Scheduler.hh \ - ${TRICK_HOME}/trick_source/sim_services/ScheduledJobQueue/include/ScheduledJobQueue.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/JobData.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/InstrumentBase.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/SimObject.hh \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/Threads.hh \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/sim_mode.h \ - ${TRICK_HOME}/trick_source/sim_services/include/RemoteShell.hh \ - ${TRICK_HOME}/trick_source/trick_utils/comm/include/tc.h \ - ${TRICK_HOME}/trick_source/trick_utils/comm/include/trick_byteswap.h \ - ${TRICK_HOME}/trick_source/trick_utils/comm/include/trick_error_hndlr.h \ - ${TRICK_HOME}/trick_source/trick_utils/comm/include/tc_proto.h \ - ${TRICK_HOME}/trick_source/trick_utils/comm/include/tc.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/attributes.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/parameter_types.h -object_${TRICK_HOST_CPU}/MonteCarlo_c_intf.o: src/MonteCarlo_c_intf.cpp \ - ${TRICK_HOME}/trick_source/sim_services/MonteCarlo/include/MonteCarlo.hh \ - ${TRICK_HOME}/trick_source/sim_services/MonteCarlo/include/MonteVar.hh \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/Executive.hh \ - ${TRICK_HOME}/trick_source/sim_services/Scheduler/include/Scheduler.hh \ - ${TRICK_HOME}/trick_source/sim_services/ScheduledJobQueue/include/ScheduledJobQueue.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/JobData.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/InstrumentBase.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/SimObject.hh \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/Threads.hh \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/sim_mode.h \ - ${TRICK_HOME}/trick_source/sim_services/include/RemoteShell.hh \ - ${TRICK_HOME}/trick_source/trick_utils/comm/include/tc.h \ - ${TRICK_HOME}/trick_source/trick_utils/comm/include/trick_byteswap.h \ - ${TRICK_HOME}/trick_source/trick_utils/comm/include/trick_error_hndlr.h \ - ${TRICK_HOME}/trick_source/sim_services/CommandLineArguments/include/CommandLineArguments.hh \ - ${TRICK_HOME}/trick_source/trick_utils/comm/include/tc_proto.h \ - ${TRICK_HOME}/trick_source/trick_utils/comm/include/tc.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/attributes.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/parameter_types.h -object_${TRICK_HOST_CPU}/MonteCarlo_dispatch_run_to_slave.o: \ - src/MonteCarlo_dispatch_run_to_slave.cpp \ - ${TRICK_HOME}/trick_source/sim_services/MonteCarlo/include/MonteCarlo.hh \ - ${TRICK_HOME}/trick_source/sim_services/MonteCarlo/include/MonteVar.hh \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/Executive.hh \ - ${TRICK_HOME}/trick_source/sim_services/Scheduler/include/Scheduler.hh \ - ${TRICK_HOME}/trick_source/sim_services/ScheduledJobQueue/include/ScheduledJobQueue.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/JobData.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/InstrumentBase.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/SimObject.hh \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/Threads.hh \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/sim_mode.h \ - ${TRICK_HOME}/trick_source/sim_services/include/RemoteShell.hh \ - ${TRICK_HOME}/trick_source/trick_utils/comm/include/tc.h \ - ${TRICK_HOME}/trick_source/trick_utils/comm/include/trick_byteswap.h \ - ${TRICK_HOME}/trick_source/trick_utils/comm/include/trick_error_hndlr.h \ - ${TRICK_HOME}/trick_source/trick_utils/comm/include/tc_proto.h \ - ${TRICK_HOME}/trick_source/trick_utils/comm/include/tc.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/attributes.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/parameter_types.h \ - ${TRICK_HOME}/trick_source/sim_services/Message/include/message_proto.h \ - ${TRICK_HOME}/trick_source/sim_services/Message/include/message_type.h -object_${TRICK_HOST_CPU}/MonteCarlo_funcs.o: src/MonteCarlo_funcs.cpp \ - ${TRICK_HOME}/trick_source/sim_services/MonteCarlo/include/MonteCarlo.hh \ - ${TRICK_HOME}/trick_source/sim_services/MonteCarlo/include/MonteVar.hh \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/Executive.hh \ - ${TRICK_HOME}/trick_source/sim_services/Scheduler/include/Scheduler.hh \ - ${TRICK_HOME}/trick_source/sim_services/ScheduledJobQueue/include/ScheduledJobQueue.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/JobData.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/InstrumentBase.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/SimObject.hh \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/Threads.hh \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/sim_mode.h \ - ${TRICK_HOME}/trick_source/sim_services/include/RemoteShell.hh \ - ${TRICK_HOME}/trick_source/trick_utils/comm/include/tc.h \ - ${TRICK_HOME}/trick_source/trick_utils/comm/include/trick_byteswap.h \ - ${TRICK_HOME}/trick_source/trick_utils/comm/include/trick_error_hndlr.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/memorymanager_c_intf.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/parameter_types.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/attributes.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/reference.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/value.h \ - ${TRICK_HOME}/trick_source/trick_utils/trick_adt/include/dllist.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/var.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/io_alloc.h \ - ${TRICK_HOME}/trick_source/sim_services/CommandLineArguments/include/command_line_protos.h \ - ${TRICK_HOME}/trick_source/trick_utils/comm/include/tc_proto.h \ - ${TRICK_HOME}/trick_source/trick_utils/comm/include/tc.h \ - ${TRICK_HOME}/trick_source/sim_services/Message/include/message_proto.h \ - ${TRICK_HOME}/trick_source/sim_services/Message/include/message_type.h -object_${TRICK_HOST_CPU}/MonteCarlo_init.o: src/MonteCarlo_init.cpp \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/Exec_exception.hh \ - ${TRICK_HOME}/trick_source/sim_services/MonteCarlo/include/MonteCarlo.hh \ - ${TRICK_HOME}/trick_source/sim_services/MonteCarlo/include/MonteVar.hh \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/Executive.hh \ - ${TRICK_HOME}/trick_source/sim_services/Scheduler/include/Scheduler.hh \ - ${TRICK_HOME}/trick_source/sim_services/ScheduledJobQueue/include/ScheduledJobQueue.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/JobData.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/InstrumentBase.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/SimObject.hh \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/Threads.hh \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/sim_mode.h \ - ${TRICK_HOME}/trick_source/sim_services/include/RemoteShell.hh \ - ${TRICK_HOME}/trick_source/trick_utils/comm/include/tc.h \ - ${TRICK_HOME}/trick_source/trick_utils/comm/include/trick_byteswap.h \ - ${TRICK_HOME}/trick_source/trick_utils/comm/include/trick_error_hndlr.h \ - ${TRICK_HOME}/trick_source/sim_services/Message/include/message_proto.h \ - ${TRICK_HOME}/trick_source/sim_services/Message/include/message_type.h \ - ${TRICK_HOME}/trick_source/trick_utils/comm/include/tc_proto.h \ - ${TRICK_HOME}/trick_source/trick_utils/comm/include/tc.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/attributes.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/parameter_types.h \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/exec_proto.h -object_${TRICK_HOST_CPU}/MonteCarlo_master.o: src/MonteCarlo_master.cpp \ - ${TRICK_HOME}/trick_source/sim_services/MonteCarlo/include/MonteCarlo.hh \ - ${TRICK_HOME}/trick_source/sim_services/MonteCarlo/include/MonteVar.hh \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/Executive.hh \ - ${TRICK_HOME}/trick_source/sim_services/Scheduler/include/Scheduler.hh \ - ${TRICK_HOME}/trick_source/sim_services/ScheduledJobQueue/include/ScheduledJobQueue.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/JobData.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/InstrumentBase.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/SimObject.hh \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/Threads.hh \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/sim_mode.h \ - ${TRICK_HOME}/trick_source/sim_services/include/RemoteShell.hh \ - ${TRICK_HOME}/trick_source/trick_utils/comm/include/tc.h \ - ${TRICK_HOME}/trick_source/trick_utils/comm/include/trick_byteswap.h \ - ${TRICK_HOME}/trick_source/trick_utils/comm/include/trick_error_hndlr.h \ - ${TRICK_HOME}/trick_source/sim_services/CommandLineArguments/include/command_line_protos.h \ - ${TRICK_HOME}/trick_source/sim_services/Message/include/message_proto.h \ - ${TRICK_HOME}/trick_source/sim_services/Message/include/message_type.h \ - ${TRICK_HOME}/trick_source/trick_utils/comm/include/tc_proto.h \ - ${TRICK_HOME}/trick_source/trick_utils/comm/include/tc.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/attributes.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/parameter_types.h -object_${TRICK_HOST_CPU}/MonteCarlo_master_init.o: src/MonteCarlo_master_init.cpp \ - ${TRICK_HOME}/trick_source/sim_services/MonteCarlo/include/MonteCarlo.hh \ - ${TRICK_HOME}/trick_source/sim_services/MonteCarlo/include/MonteVar.hh \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/Executive.hh \ - ${TRICK_HOME}/trick_source/sim_services/Scheduler/include/Scheduler.hh \ - ${TRICK_HOME}/trick_source/sim_services/ScheduledJobQueue/include/ScheduledJobQueue.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/JobData.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/InstrumentBase.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/SimObject.hh \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/Threads.hh \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/sim_mode.h \ - ${TRICK_HOME}/trick_source/sim_services/include/RemoteShell.hh \ - ${TRICK_HOME}/trick_source/trick_utils/comm/include/tc.h \ - ${TRICK_HOME}/trick_source/trick_utils/comm/include/trick_byteswap.h \ - ${TRICK_HOME}/trick_source/trick_utils/comm/include/trick_error_hndlr.h \ - ${TRICK_HOME}/trick_source/sim_services/Message/include/message_proto.h \ - ${TRICK_HOME}/trick_source/sim_services/Message/include/message_type.h \ - ${TRICK_HOME}/trick_source/sim_services/CommandLineArguments/include/command_line_protos.h \ - ${TRICK_HOME}/trick_source/trick_utils/comm/include/tc_proto.h \ - ${TRICK_HOME}/trick_source/trick_utils/comm/include/tc.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/attributes.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/parameter_types.h -object_${TRICK_HOST_CPU}/MonteCarlo_master_shutdown.o: src/MonteCarlo_master_shutdown.cpp \ - ${TRICK_HOME}/trick_source/sim_services/MonteCarlo/include/MonteCarlo.hh \ - ${TRICK_HOME}/trick_source/sim_services/MonteCarlo/include/MonteVar.hh \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/Executive.hh \ - ${TRICK_HOME}/trick_source/sim_services/Scheduler/include/Scheduler.hh \ - ${TRICK_HOME}/trick_source/sim_services/ScheduledJobQueue/include/ScheduledJobQueue.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/JobData.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/InstrumentBase.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/SimObject.hh \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/Threads.hh \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/sim_mode.h \ - ${TRICK_HOME}/trick_source/sim_services/include/RemoteShell.hh \ - ${TRICK_HOME}/trick_source/trick_utils/comm/include/tc.h \ - ${TRICK_HOME}/trick_source/trick_utils/comm/include/trick_byteswap.h \ - ${TRICK_HOME}/trick_source/trick_utils/comm/include/trick_error_hndlr.h \ - ${TRICK_HOME}/trick_source/sim_services/CommandLineArguments/include/command_line_protos.h \ - ${TRICK_HOME}/trick_source/sim_services/Message/include/message_proto.h \ - ${TRICK_HOME}/trick_source/sim_services/Message/include/message_type.h \ - ${TRICK_HOME}/trick_source/trick_utils/comm/include/tc_proto.h \ - ${TRICK_HOME}/trick_source/trick_utils/comm/include/tc.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/attributes.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/parameter_types.h -object_${TRICK_HOST_CPU}/MonteCarlo_receive_results.o: src/MonteCarlo_receive_results.cpp \ - ${TRICK_HOME}/trick_source/sim_services/MonteCarlo/include/MonteCarlo.hh \ - ${TRICK_HOME}/trick_source/sim_services/MonteCarlo/include/MonteVar.hh \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/Executive.hh \ - ${TRICK_HOME}/trick_source/sim_services/Scheduler/include/Scheduler.hh \ - ${TRICK_HOME}/trick_source/sim_services/ScheduledJobQueue/include/ScheduledJobQueue.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/JobData.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/InstrumentBase.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/SimObject.hh \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/Threads.hh \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/sim_mode.h \ - ${TRICK_HOME}/trick_source/sim_services/include/RemoteShell.hh \ - ${TRICK_HOME}/trick_source/trick_utils/comm/include/tc.h \ - ${TRICK_HOME}/trick_source/trick_utils/comm/include/trick_byteswap.h \ - ${TRICK_HOME}/trick_source/trick_utils/comm/include/trick_error_hndlr.h \ - ${TRICK_HOME}/trick_source/sim_services/Message/include/message_proto.h \ - ${TRICK_HOME}/trick_source/sim_services/Message/include/message_type.h \ - ${TRICK_HOME}/trick_source/trick_utils/comm/include/tc_proto.h \ - ${TRICK_HOME}/trick_source/trick_utils/comm/include/tc.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/attributes.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/parameter_types.h -object_${TRICK_HOST_CPU}/MonteCarlo_slave.o: src/MonteCarlo_slave.cpp \ - ${TRICK_HOME}/trick_source/sim_services/MonteCarlo/include/MonteCarlo.hh \ - ${TRICK_HOME}/trick_source/sim_services/MonteCarlo/include/MonteVar.hh \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/Executive.hh \ - ${TRICK_HOME}/trick_source/sim_services/Scheduler/include/Scheduler.hh \ - ${TRICK_HOME}/trick_source/sim_services/ScheduledJobQueue/include/ScheduledJobQueue.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/JobData.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/InstrumentBase.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/SimObject.hh \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/Threads.hh \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/sim_mode.h \ - ${TRICK_HOME}/trick_source/sim_services/include/RemoteShell.hh \ - ${TRICK_HOME}/trick_source/trick_utils/comm/include/tc.h \ - ${TRICK_HOME}/trick_source/trick_utils/comm/include/trick_byteswap.h \ - ${TRICK_HOME}/trick_source/trick_utils/comm/include/trick_error_hndlr.h \ - ${TRICK_HOME}/trick_source/sim_services/Message/include/message_proto.h \ - ${TRICK_HOME}/trick_source/sim_services/Message/include/message_type.h \ - ${TRICK_HOME}/trick_source/trick_utils/comm/include/tc_proto.h \ - ${TRICK_HOME}/trick_source/trick_utils/comm/include/tc.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/attributes.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/parameter_types.h -object_${TRICK_HOST_CPU}/MonteCarlo_slave_funcs.o: src/MonteCarlo_slave_funcs.cpp \ - ${TRICK_HOME}/trick_source/sim_services/MonteCarlo/include/MonteCarlo.hh \ - ${TRICK_HOME}/trick_source/sim_services/MonteCarlo/include/MonteVar.hh \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/Executive.hh \ - ${TRICK_HOME}/trick_source/sim_services/Scheduler/include/Scheduler.hh \ - ${TRICK_HOME}/trick_source/sim_services/ScheduledJobQueue/include/ScheduledJobQueue.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/JobData.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/InstrumentBase.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/SimObject.hh \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/Threads.hh \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/sim_mode.h \ - ${TRICK_HOME}/trick_source/sim_services/include/RemoteShell.hh \ - ${TRICK_HOME}/trick_source/trick_utils/comm/include/tc.h \ - ${TRICK_HOME}/trick_source/trick_utils/comm/include/trick_byteswap.h \ - ${TRICK_HOME}/trick_source/trick_utils/comm/include/trick_error_hndlr.h -object_${TRICK_HOST_CPU}/MonteCarlo_slave_init.o: src/MonteCarlo_slave_init.cpp \ - ${TRICK_HOME}/trick_source/sim_services/MonteCarlo/include/MonteCarlo.hh \ - ${TRICK_HOME}/trick_source/sim_services/MonteCarlo/include/MonteVar.hh \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/Executive.hh \ - ${TRICK_HOME}/trick_source/sim_services/Scheduler/include/Scheduler.hh \ - ${TRICK_HOME}/trick_source/sim_services/ScheduledJobQueue/include/ScheduledJobQueue.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/JobData.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/InstrumentBase.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/SimObject.hh \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/Threads.hh \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/sim_mode.h \ - ${TRICK_HOME}/trick_source/sim_services/include/RemoteShell.hh \ - ${TRICK_HOME}/trick_source/trick_utils/comm/include/tc.h \ - ${TRICK_HOME}/trick_source/trick_utils/comm/include/trick_byteswap.h \ - ${TRICK_HOME}/trick_source/trick_utils/comm/include/trick_error_hndlr.h \ - ${TRICK_HOME}/trick_source/sim_services/CommandLineArguments/include/command_line_protos.h \ - ${TRICK_HOME}/trick_source/sim_services/Message/include/message_proto.h \ - ${TRICK_HOME}/trick_source/sim_services/Message/include/message_type.h \ - ${TRICK_HOME}/trick_source/trick_utils/comm/include/tc_proto.h \ - ${TRICK_HOME}/trick_source/trick_utils/comm/include/tc.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/attributes.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/parameter_types.h -object_${TRICK_HOST_CPU}/MonteCarlo_slave_process_run.o: src/MonteCarlo_slave_process_run.cpp \ - ${TRICK_HOME}/trick_source/sim_services/MonteCarlo/include/MonteCarlo.hh \ - ${TRICK_HOME}/trick_source/sim_services/MonteCarlo/include/MonteVar.hh \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/Executive.hh \ - ${TRICK_HOME}/trick_source/sim_services/Scheduler/include/Scheduler.hh \ - ${TRICK_HOME}/trick_source/sim_services/ScheduledJobQueue/include/ScheduledJobQueue.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/JobData.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/InstrumentBase.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/SimObject.hh \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/Threads.hh \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/sim_mode.h \ - ${TRICK_HOME}/trick_source/sim_services/include/RemoteShell.hh \ - ${TRICK_HOME}/trick_source/trick_utils/comm/include/tc.h \ - ${TRICK_HOME}/trick_source/trick_utils/comm/include/trick_byteswap.h \ - ${TRICK_HOME}/trick_source/trick_utils/comm/include/trick_error_hndlr.h \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/Exec_exception.hh \ - ${TRICK_HOME}/trick_source/sim_services/CommandLineArguments/include/command_line_protos.h \ - ${TRICK_HOME}/trick_source/sim_services/InputProcessor/include/input_processor_proto.h \ - ${TRICK_HOME}/trick_source/sim_services/Message/include/message_proto.h \ - ${TRICK_HOME}/trick_source/sim_services/Message/include/message_type.h \ - ${TRICK_HOME}/trick_source/trick_utils/comm/include/tc_proto.h \ - ${TRICK_HOME}/trick_source/trick_utils/comm/include/tc.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/attributes.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/parameter_types.h -object_${TRICK_HOST_CPU}/MonteCarlo_spawn_slaves.o: src/MonteCarlo_spawn_slaves.cpp \ - ${TRICK_HOME}/trick_source/sim_services/MonteCarlo/include/MonteCarlo.hh \ - ${TRICK_HOME}/trick_source/sim_services/MonteCarlo/include/MonteVar.hh \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/Executive.hh \ - ${TRICK_HOME}/trick_source/sim_services/Scheduler/include/Scheduler.hh \ - ${TRICK_HOME}/trick_source/sim_services/ScheduledJobQueue/include/ScheduledJobQueue.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/JobData.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/InstrumentBase.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/SimObject.hh \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/Threads.hh \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/sim_mode.h \ - ${TRICK_HOME}/trick_source/sim_services/include/RemoteShell.hh \ - ${TRICK_HOME}/trick_source/trick_utils/comm/include/tc.h \ - ${TRICK_HOME}/trick_source/trick_utils/comm/include/trick_byteswap.h \ - ${TRICK_HOME}/trick_source/trick_utils/comm/include/trick_error_hndlr.h \ - ${TRICK_HOME}/trick_source/sim_services/CommandLineArguments/include/command_line_protos.h \ - ${TRICK_HOME}/trick_source/sim_services/include/unix_commands.h \ - ${TRICK_HOME}/trick_source/sim_services/Message/include/message_proto.h \ - ${TRICK_HOME}/trick_source/sim_services/Message/include/message_type.h -object_${TRICK_HOST_CPU}/MonteVarCalculated.o: src/MonteVarCalculated.cpp \ - ${TRICK_HOME}/trick_source/sim_services/MonteCarlo/include/MonteVarCalculated.hh \ - ${TRICK_HOME}/trick_source/sim_services/MonteCarlo/include/MonteVar.hh \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/reference.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/attributes.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/parameter_types.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/value.h \ - ${TRICK_HOME}/trick_source/trick_utils/trick_adt/include/dllist.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/memorymanager_c_intf.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/var.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/io_alloc.h \ - ${TRICK_HOME}/trick_source/sim_services/Message/include/message_proto.h \ - ${TRICK_HOME}/trick_source/sim_services/Message/include/message_type.h -object_${TRICK_HOST_CPU}/MonteVarFile.o: src/MonteVarFile.cpp \ - ${TRICK_HOME}/trick_source/sim_services/MonteCarlo/include/MonteVarFile.hh \ - ${TRICK_HOME}/trick_source/sim_services/MonteCarlo/include/MonteVar.hh \ - ${TRICK_HOME}/trick_source/sim_services/Message/include/message_proto.h \ - ${TRICK_HOME}/trick_source/sim_services/Message/include/message_type.h -object_${TRICK_HOST_CPU}/MonteVarFixed.o: src/MonteVarFixed.cpp \ - ${TRICK_HOME}/trick_source/sim_services/MonteCarlo/include/MonteVarFixed.hh \ - ${TRICK_HOME}/trick_source/sim_services/MonteCarlo/include/MonteVar.hh -object_${TRICK_HOST_CPU}/MonteVarRandom.o: src/MonteVarRandom.cpp \ - ${TRICK_HOME}/trick_source/sim_services/MonteCarlo/include/MonteVarRandom.hh \ - ${TRICK_HOME}/trick_source/sim_services/MonteCarlo/include/MonteVar.hh \ - ${TRICK_HOME}/trick_source/trick_utils/math/include/rand_generator.h +object_${TRICK_HOST_CPU}/MonteCarlo_receive_slave_results.o: MonteCarlo_receive_slave_results.cpp \ + ${TRICK_HOME}/include/trick/MonteCarlo.hh \ + ${TRICK_HOME}/include/trick/MonteVar.hh \ + ${TRICK_HOME}/include/trick/Executive.hh \ + ${TRICK_HOME}/include/trick/Scheduler.hh \ + ${TRICK_HOME}/include/trick/ScheduledJobQueue.hh \ + ${TRICK_HOME}/include/trick/JobData.hh \ + ${TRICK_HOME}/include/trick/InstrumentBase.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/ScheduledJobQueue.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/Threads.hh \ + ${TRICK_HOME}/include/trick/ThreadBase.hh \ + ${TRICK_HOME}/include/trick/sim_mode.h \ + ${TRICK_HOME}/include/trick/RemoteShell.hh \ + ${TRICK_HOME}/include/trick/tc.h \ + ${TRICK_HOME}/include/trick/trick_byteswap.h \ + ${TRICK_HOME}/include/trick/trick_error_hndlr.h \ + ${TRICK_HOME}/include/trick/message_proto.h \ + ${TRICK_HOME}/include/trick/message_type.h \ + ${TRICK_HOME}/include/trick/tc_proto.h \ + ${TRICK_HOME}/include/trick/tc.h \ + ${TRICK_HOME}/include/trick/attributes.h \ + ${TRICK_HOME}/include/trick/parameter_types.h +object_${TRICK_HOST_CPU}/MonteCarlo_dispatch_run_to_slave.o: MonteCarlo_dispatch_run_to_slave.cpp \ + ${TRICK_HOME}/include/trick/MonteCarlo.hh \ + ${TRICK_HOME}/include/trick/MonteVar.hh \ + ${TRICK_HOME}/include/trick/Executive.hh \ + ${TRICK_HOME}/include/trick/Scheduler.hh \ + ${TRICK_HOME}/include/trick/ScheduledJobQueue.hh \ + ${TRICK_HOME}/include/trick/JobData.hh \ + ${TRICK_HOME}/include/trick/InstrumentBase.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/ScheduledJobQueue.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/Threads.hh \ + ${TRICK_HOME}/include/trick/ThreadBase.hh \ + ${TRICK_HOME}/include/trick/sim_mode.h \ + ${TRICK_HOME}/include/trick/RemoteShell.hh \ + ${TRICK_HOME}/include/trick/tc.h \ + ${TRICK_HOME}/include/trick/trick_byteswap.h \ + ${TRICK_HOME}/include/trick/trick_error_hndlr.h \ + ${TRICK_HOME}/include/trick/tc_proto.h \ + ${TRICK_HOME}/include/trick/tc.h \ + ${TRICK_HOME}/include/trick/attributes.h \ + ${TRICK_HOME}/include/trick/parameter_types.h \ + ${TRICK_HOME}/include/trick/message_proto.h \ + ${TRICK_HOME}/include/trick/message_type.h +object_${TRICK_HOST_CPU}/StlRandomGenerator.o: StlRandomGenerator.cpp \ + ${TRICK_HOME}/include/trick/StlRandomGenerator.hh \ + ${TRICK_HOME}/include/trick/rand_generator.h +object_${TRICK_HOST_CPU}/MonteCarlo_master_shutdown.o: MonteCarlo_master_shutdown.cpp \ + ${TRICK_HOME}/include/trick/MonteCarlo.hh \ + ${TRICK_HOME}/include/trick/MonteVar.hh \ + ${TRICK_HOME}/include/trick/Executive.hh \ + ${TRICK_HOME}/include/trick/Scheduler.hh \ + ${TRICK_HOME}/include/trick/ScheduledJobQueue.hh \ + ${TRICK_HOME}/include/trick/JobData.hh \ + ${TRICK_HOME}/include/trick/InstrumentBase.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/ScheduledJobQueue.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/Threads.hh \ + ${TRICK_HOME}/include/trick/ThreadBase.hh \ + ${TRICK_HOME}/include/trick/sim_mode.h \ + ${TRICK_HOME}/include/trick/RemoteShell.hh \ + ${TRICK_HOME}/include/trick/tc.h \ + ${TRICK_HOME}/include/trick/trick_byteswap.h \ + ${TRICK_HOME}/include/trick/trick_error_hndlr.h \ + ${TRICK_HOME}/include/trick/command_line_protos.h \ + ${TRICK_HOME}/include/trick/message_proto.h \ + ${TRICK_HOME}/include/trick/message_type.h \ + ${TRICK_HOME}/include/trick/tc_proto.h \ + ${TRICK_HOME}/include/trick/tc.h \ + ${TRICK_HOME}/include/trick/attributes.h \ + ${TRICK_HOME}/include/trick/parameter_types.h \ + ${TRICK_HOME}/include/trick/exec_proto.h \ + ${TRICK_HOME}/include/trick/sim_mode.h +object_${TRICK_HOST_CPU}/MonteCarlo_master.o: MonteCarlo_master.cpp \ + ${TRICK_HOME}/include/trick/MonteCarlo.hh \ + ${TRICK_HOME}/include/trick/MonteVar.hh \ + ${TRICK_HOME}/include/trick/Executive.hh \ + ${TRICK_HOME}/include/trick/Scheduler.hh \ + ${TRICK_HOME}/include/trick/ScheduledJobQueue.hh \ + ${TRICK_HOME}/include/trick/JobData.hh \ + ${TRICK_HOME}/include/trick/InstrumentBase.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/ScheduledJobQueue.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/Threads.hh \ + ${TRICK_HOME}/include/trick/ThreadBase.hh \ + ${TRICK_HOME}/include/trick/sim_mode.h \ + ${TRICK_HOME}/include/trick/RemoteShell.hh \ + ${TRICK_HOME}/include/trick/tc.h \ + ${TRICK_HOME}/include/trick/trick_byteswap.h \ + ${TRICK_HOME}/include/trick/trick_error_hndlr.h \ + ${TRICK_HOME}/include/trick/Exec_exception.hh +object_${TRICK_HOST_CPU}/MonteCarlo_dryrun.o: MonteCarlo_dryrun.cpp \ + ${TRICK_HOME}/include/trick/MonteCarlo.hh \ + ${TRICK_HOME}/include/trick/MonteVar.hh \ + ${TRICK_HOME}/include/trick/Executive.hh \ + ${TRICK_HOME}/include/trick/Scheduler.hh \ + ${TRICK_HOME}/include/trick/ScheduledJobQueue.hh \ + ${TRICK_HOME}/include/trick/JobData.hh \ + ${TRICK_HOME}/include/trick/InstrumentBase.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/ScheduledJobQueue.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/Threads.hh \ + ${TRICK_HOME}/include/trick/ThreadBase.hh \ + ${TRICK_HOME}/include/trick/sim_mode.h \ + ${TRICK_HOME}/include/trick/RemoteShell.hh \ + ${TRICK_HOME}/include/trick/tc.h \ + ${TRICK_HOME}/include/trick/trick_byteswap.h \ + ${TRICK_HOME}/include/trick/trick_error_hndlr.h \ + ${TRICK_HOME}/include/trick/message_proto.h \ + ${TRICK_HOME}/include/trick/message_type.h +object_${TRICK_HOST_CPU}/MonteCarlo_execute_monte.o: MonteCarlo_execute_monte.cpp \ + ${TRICK_HOME}/include/trick/MonteCarlo.hh \ + ${TRICK_HOME}/include/trick/MonteVar.hh \ + ${TRICK_HOME}/include/trick/Executive.hh \ + ${TRICK_HOME}/include/trick/Scheduler.hh \ + ${TRICK_HOME}/include/trick/ScheduledJobQueue.hh \ + ${TRICK_HOME}/include/trick/JobData.hh \ + ${TRICK_HOME}/include/trick/InstrumentBase.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/ScheduledJobQueue.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/Threads.hh \ + ${TRICK_HOME}/include/trick/ThreadBase.hh \ + ${TRICK_HOME}/include/trick/sim_mode.h \ + ${TRICK_HOME}/include/trick/RemoteShell.hh \ + ${TRICK_HOME}/include/trick/tc.h \ + ${TRICK_HOME}/include/trick/trick_byteswap.h \ + ${TRICK_HOME}/include/trick/trick_error_hndlr.h \ + ${TRICK_HOME}/include/trick/message_proto.h \ + ${TRICK_HOME}/include/trick/message_type.h +object_${TRICK_HOST_CPU}/MonteVarFixed.o: MonteVarFixed.cpp \ + ${TRICK_HOME}/include/trick/MonteVarFixed.hh \ + ${TRICK_HOME}/include/trick/MonteVar.hh +object_${TRICK_HOST_CPU}/MonteVarRandom.o: MonteVarRandom.cpp \ + ${TRICK_HOME}/include/trick/MonteVarRandom.hh \ + ${TRICK_HOME}/include/trick/MonteVar.hh \ + ${TRICK_HOME}/include/trick/rand_generator.h \ + ${TRICK_HOME}/include/trick/StlRandomGenerator.hh \ + ${TRICK_HOME}/include/trick/exec_proto.h \ + ${TRICK_HOME}/include/trick/sim_mode.h +object_${TRICK_HOST_CPU}/MonteCarlo_funcs.o: MonteCarlo_funcs.cpp \ + ${TRICK_HOME}/include/trick/MonteCarlo.hh \ + ${TRICK_HOME}/include/trick/MonteVar.hh \ + ${TRICK_HOME}/include/trick/Executive.hh \ + ${TRICK_HOME}/include/trick/Scheduler.hh \ + ${TRICK_HOME}/include/trick/ScheduledJobQueue.hh \ + ${TRICK_HOME}/include/trick/JobData.hh \ + ${TRICK_HOME}/include/trick/InstrumentBase.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/ScheduledJobQueue.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/Threads.hh \ + ${TRICK_HOME}/include/trick/ThreadBase.hh \ + ${TRICK_HOME}/include/trick/sim_mode.h \ + ${TRICK_HOME}/include/trick/RemoteShell.hh \ + ${TRICK_HOME}/include/trick/tc.h \ + ${TRICK_HOME}/include/trick/trick_byteswap.h \ + ${TRICK_HOME}/include/trick/trick_error_hndlr.h \ + ${TRICK_HOME}/include/trick/memorymanager_c_intf.h \ + ${TRICK_HOME}/include/trick/parameter_types.h \ + ${TRICK_HOME}/include/trick/attributes.h \ + ${TRICK_HOME}/include/trick/reference.h \ + ${TRICK_HOME}/include/trick/value.h \ + ${TRICK_HOME}/include/trick/dllist.h \ + ${TRICK_HOME}/include/trick/var.h \ + ${TRICK_HOME}/include/trick/io_alloc.h \ + ${TRICK_HOME}/include/trick/command_line_protos.h \ + ${TRICK_HOME}/include/trick/tc_proto.h \ + ${TRICK_HOME}/include/trick/tc.h \ + ${TRICK_HOME}/include/trick/message_proto.h \ + ${TRICK_HOME}/include/trick/message_type.h \ + ${TRICK_HOME}/include/trick/exec_proto.h \ + ${TRICK_HOME}/include/trick/sim_mode.h \ + ${TRICK_HOME}/include/trick/Exec_exception.hh +object_${TRICK_HOST_CPU}/MonteCarlo_slave_funcs.o: MonteCarlo_slave_funcs.cpp \ + ${TRICK_HOME}/include/trick/MonteCarlo.hh \ + ${TRICK_HOME}/include/trick/MonteVar.hh \ + ${TRICK_HOME}/include/trick/Executive.hh \ + ${TRICK_HOME}/include/trick/Scheduler.hh \ + ${TRICK_HOME}/include/trick/ScheduledJobQueue.hh \ + ${TRICK_HOME}/include/trick/JobData.hh \ + ${TRICK_HOME}/include/trick/InstrumentBase.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/ScheduledJobQueue.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/Threads.hh \ + ${TRICK_HOME}/include/trick/ThreadBase.hh \ + ${TRICK_HOME}/include/trick/sim_mode.h \ + ${TRICK_HOME}/include/trick/RemoteShell.hh \ + ${TRICK_HOME}/include/trick/tc.h \ + ${TRICK_HOME}/include/trick/trick_byteswap.h \ + ${TRICK_HOME}/include/trick/trick_error_hndlr.h +object_${TRICK_HOST_CPU}/MonteCarlo.o: MonteCarlo.cpp \ + ${TRICK_HOME}/include/trick/MonteCarlo.hh \ + ${TRICK_HOME}/include/trick/MonteVar.hh \ + ${TRICK_HOME}/include/trick/Executive.hh \ + ${TRICK_HOME}/include/trick/Scheduler.hh \ + ${TRICK_HOME}/include/trick/ScheduledJobQueue.hh \ + ${TRICK_HOME}/include/trick/JobData.hh \ + ${TRICK_HOME}/include/trick/InstrumentBase.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/ScheduledJobQueue.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/Threads.hh \ + ${TRICK_HOME}/include/trick/ThreadBase.hh \ + ${TRICK_HOME}/include/trick/sim_mode.h \ + ${TRICK_HOME}/include/trick/RemoteShell.hh \ + ${TRICK_HOME}/include/trick/tc.h \ + ${TRICK_HOME}/include/trick/trick_byteswap.h \ + ${TRICK_HOME}/include/trick/trick_error_hndlr.h \ + ${TRICK_HOME}/include/trick/tc_proto.h \ + ${TRICK_HOME}/include/trick/tc.h \ + ${TRICK_HOME}/include/trick/attributes.h \ + ${TRICK_HOME}/include/trick/parameter_types.h +object_${TRICK_HOST_CPU}/MonteCarlo_run_queue.o: MonteCarlo_run_queue.cpp \ + ${TRICK_HOME}/include/trick/MonteCarlo.hh \ + ${TRICK_HOME}/include/trick/MonteVar.hh \ + ${TRICK_HOME}/include/trick/Executive.hh \ + ${TRICK_HOME}/include/trick/Scheduler.hh \ + ${TRICK_HOME}/include/trick/ScheduledJobQueue.hh \ + ${TRICK_HOME}/include/trick/JobData.hh \ + ${TRICK_HOME}/include/trick/InstrumentBase.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/ScheduledJobQueue.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/Threads.hh \ + ${TRICK_HOME}/include/trick/ThreadBase.hh \ + ${TRICK_HOME}/include/trick/sim_mode.h \ + ${TRICK_HOME}/include/trick/RemoteShell.hh \ + ${TRICK_HOME}/include/trick/tc.h \ + ${TRICK_HOME}/include/trick/trick_byteswap.h \ + ${TRICK_HOME}/include/trick/trick_error_hndlr.h \ + ${TRICK_HOME}/include/trick/Exec_exception.hh \ + ${TRICK_HOME}/include/trick/exec_proto.hh +object_${TRICK_HOST_CPU}/MonteCarlo_receive_results.o: MonteCarlo_receive_results.cpp \ + ${TRICK_HOME}/include/trick/MonteCarlo.hh \ + ${TRICK_HOME}/include/trick/MonteVar.hh \ + ${TRICK_HOME}/include/trick/Executive.hh \ + ${TRICK_HOME}/include/trick/Scheduler.hh \ + ${TRICK_HOME}/include/trick/ScheduledJobQueue.hh \ + ${TRICK_HOME}/include/trick/JobData.hh \ + ${TRICK_HOME}/include/trick/InstrumentBase.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/ScheduledJobQueue.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/Threads.hh \ + ${TRICK_HOME}/include/trick/ThreadBase.hh \ + ${TRICK_HOME}/include/trick/sim_mode.h \ + ${TRICK_HOME}/include/trick/RemoteShell.hh \ + ${TRICK_HOME}/include/trick/tc.h \ + ${TRICK_HOME}/include/trick/trick_byteswap.h \ + ${TRICK_HOME}/include/trick/trick_error_hndlr.h \ + ${TRICK_HOME}/include/trick/message_proto.h \ + ${TRICK_HOME}/include/trick/message_type.h \ + ${TRICK_HOME}/include/trick/tc_proto.h \ + ${TRICK_HOME}/include/trick/tc.h \ + ${TRICK_HOME}/include/trick/attributes.h \ + ${TRICK_HOME}/include/trick/parameter_types.h +object_${TRICK_HOST_CPU}/MonteCarlo_master_file_io.o: MonteCarlo_master_file_io.cpp \ + ${TRICK_HOME}/include/trick/MonteCarlo.hh \ + ${TRICK_HOME}/include/trick/MonteVar.hh \ + ${TRICK_HOME}/include/trick/Executive.hh \ + ${TRICK_HOME}/include/trick/Scheduler.hh \ + ${TRICK_HOME}/include/trick/ScheduledJobQueue.hh \ + ${TRICK_HOME}/include/trick/JobData.hh \ + ${TRICK_HOME}/include/trick/InstrumentBase.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/ScheduledJobQueue.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/Threads.hh \ + ${TRICK_HOME}/include/trick/ThreadBase.hh \ + ${TRICK_HOME}/include/trick/sim_mode.h \ + ${TRICK_HOME}/include/trick/RemoteShell.hh \ + ${TRICK_HOME}/include/trick/tc.h \ + ${TRICK_HOME}/include/trick/trick_byteswap.h \ + ${TRICK_HOME}/include/trick/trick_error_hndlr.h \ + ${TRICK_HOME}/include/trick/message_proto.h \ + ${TRICK_HOME}/include/trick/message_type.h \ + ${TRICK_HOME}/include/trick/command_line_protos.h +object_${TRICK_HOST_CPU}/MonteCarlo_initialize_sockets.o: MonteCarlo_initialize_sockets.cpp \ + ${TRICK_HOME}/include/trick/MonteCarlo.hh \ + ${TRICK_HOME}/include/trick/MonteVar.hh \ + ${TRICK_HOME}/include/trick/Executive.hh \ + ${TRICK_HOME}/include/trick/Scheduler.hh \ + ${TRICK_HOME}/include/trick/ScheduledJobQueue.hh \ + ${TRICK_HOME}/include/trick/JobData.hh \ + ${TRICK_HOME}/include/trick/InstrumentBase.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/ScheduledJobQueue.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/Threads.hh \ + ${TRICK_HOME}/include/trick/ThreadBase.hh \ + ${TRICK_HOME}/include/trick/sim_mode.h \ + ${TRICK_HOME}/include/trick/RemoteShell.hh \ + ${TRICK_HOME}/include/trick/tc.h \ + ${TRICK_HOME}/include/trick/trick_byteswap.h \ + ${TRICK_HOME}/include/trick/trick_error_hndlr.h \ + ${TRICK_HOME}/include/trick/message_proto.h \ + ${TRICK_HOME}/include/trick/message_type.h \ + ${TRICK_HOME}/include/trick/tc_proto.h \ + ${TRICK_HOME}/include/trick/tc.h \ + ${TRICK_HOME}/include/trick/attributes.h \ + ${TRICK_HOME}/include/trick/parameter_types.h +object_${TRICK_HOST_CPU}/MonteCarlo_slave_init.o: MonteCarlo_slave_init.cpp \ + ${TRICK_HOME}/include/trick/MonteCarlo.hh \ + ${TRICK_HOME}/include/trick/MonteVar.hh \ + ${TRICK_HOME}/include/trick/Executive.hh \ + ${TRICK_HOME}/include/trick/Scheduler.hh \ + ${TRICK_HOME}/include/trick/ScheduledJobQueue.hh \ + ${TRICK_HOME}/include/trick/JobData.hh \ + ${TRICK_HOME}/include/trick/InstrumentBase.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/ScheduledJobQueue.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/Threads.hh \ + ${TRICK_HOME}/include/trick/ThreadBase.hh \ + ${TRICK_HOME}/include/trick/sim_mode.h \ + ${TRICK_HOME}/include/trick/RemoteShell.hh \ + ${TRICK_HOME}/include/trick/tc.h \ + ${TRICK_HOME}/include/trick/trick_byteswap.h \ + ${TRICK_HOME}/include/trick/trick_error_hndlr.h \ + ${TRICK_HOME}/include/trick/command_line_protos.h \ + ${TRICK_HOME}/include/trick/message_proto.h \ + ${TRICK_HOME}/include/trick/message_type.h \ + ${TRICK_HOME}/include/trick/tc_proto.h \ + ${TRICK_HOME}/include/trick/tc.h \ + ${TRICK_HOME}/include/trick/attributes.h \ + ${TRICK_HOME}/include/trick/parameter_types.h +object_${TRICK_HOST_CPU}/MonteCarlo_spawn_slaves.o: MonteCarlo_spawn_slaves.cpp \ + ${TRICK_HOME}/include/trick/MonteCarlo.hh \ + ${TRICK_HOME}/include/trick/MonteVar.hh \ + ${TRICK_HOME}/include/trick/Executive.hh \ + ${TRICK_HOME}/include/trick/Scheduler.hh \ + ${TRICK_HOME}/include/trick/ScheduledJobQueue.hh \ + ${TRICK_HOME}/include/trick/JobData.hh \ + ${TRICK_HOME}/include/trick/InstrumentBase.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/ScheduledJobQueue.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/Threads.hh \ + ${TRICK_HOME}/include/trick/ThreadBase.hh \ + ${TRICK_HOME}/include/trick/sim_mode.h \ + ${TRICK_HOME}/include/trick/RemoteShell.hh \ + ${TRICK_HOME}/include/trick/tc.h \ + ${TRICK_HOME}/include/trick/trick_byteswap.h \ + ${TRICK_HOME}/include/trick/trick_error_hndlr.h \ + ${TRICK_HOME}/include/trick/command_line_protos.h \ + ${TRICK_HOME}/include/trick/unix_commands.h \ + ${TRICK_HOME}/include/trick/message_proto.h \ + ${TRICK_HOME}/include/trick/message_type.h +object_${TRICK_HOST_CPU}/MonteCarlo_c_intf.o: MonteCarlo_c_intf.cpp \ + ${TRICK_HOME}/include/trick/MonteCarlo.hh \ + ${TRICK_HOME}/include/trick/MonteVar.hh \ + ${TRICK_HOME}/include/trick/Executive.hh \ + ${TRICK_HOME}/include/trick/Scheduler.hh \ + ${TRICK_HOME}/include/trick/ScheduledJobQueue.hh \ + ${TRICK_HOME}/include/trick/JobData.hh \ + ${TRICK_HOME}/include/trick/InstrumentBase.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/ScheduledJobQueue.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/Threads.hh \ + ${TRICK_HOME}/include/trick/ThreadBase.hh \ + ${TRICK_HOME}/include/trick/sim_mode.h \ + ${TRICK_HOME}/include/trick/RemoteShell.hh \ + ${TRICK_HOME}/include/trick/tc.h \ + ${TRICK_HOME}/include/trick/trick_byteswap.h \ + ${TRICK_HOME}/include/trick/trick_error_hndlr.h \ + ${TRICK_HOME}/include/trick/CommandLineArguments.hh \ + ${TRICK_HOME}/include/trick/tc_proto.h \ + ${TRICK_HOME}/include/trick/tc.h \ + ${TRICK_HOME}/include/trick/attributes.h \ + ${TRICK_HOME}/include/trick/parameter_types.h +object_${TRICK_HOST_CPU}/MonteCarlo_slave.o: MonteCarlo_slave.cpp \ + ${TRICK_HOME}/include/trick/MonteCarlo.hh \ + ${TRICK_HOME}/include/trick/MonteVar.hh \ + ${TRICK_HOME}/include/trick/Executive.hh \ + ${TRICK_HOME}/include/trick/Scheduler.hh \ + ${TRICK_HOME}/include/trick/ScheduledJobQueue.hh \ + ${TRICK_HOME}/include/trick/JobData.hh \ + ${TRICK_HOME}/include/trick/InstrumentBase.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/ScheduledJobQueue.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/Threads.hh \ + ${TRICK_HOME}/include/trick/ThreadBase.hh \ + ${TRICK_HOME}/include/trick/sim_mode.h \ + ${TRICK_HOME}/include/trick/RemoteShell.hh \ + ${TRICK_HOME}/include/trick/tc.h \ + ${TRICK_HOME}/include/trick/trick_byteswap.h \ + ${TRICK_HOME}/include/trick/trick_error_hndlr.h \ + ${TRICK_HOME}/include/trick/message_proto.h \ + ${TRICK_HOME}/include/trick/message_type.h \ + ${TRICK_HOME}/include/trick/tc_proto.h \ + ${TRICK_HOME}/include/trick/tc.h \ + ${TRICK_HOME}/include/trick/attributes.h \ + ${TRICK_HOME}/include/trick/parameter_types.h +object_${TRICK_HOST_CPU}/MonteVarCalculated.o: MonteVarCalculated.cpp \ + ${TRICK_HOME}/include/trick/MonteVarCalculated.hh \ + ${TRICK_HOME}/include/trick/MonteVar.hh \ + ${TRICK_HOME}/include/trick/reference.h \ + ${TRICK_HOME}/include/trick/attributes.h \ + ${TRICK_HOME}/include/trick/parameter_types.h \ + ${TRICK_HOME}/include/trick/value.h \ + ${TRICK_HOME}/include/trick/dllist.h \ + ${TRICK_HOME}/include/trick/memorymanager_c_intf.h \ + ${TRICK_HOME}/include/trick/var.h \ + ${TRICK_HOME}/include/trick/io_alloc.h \ + ${TRICK_HOME}/include/trick/message_proto.h \ + ${TRICK_HOME}/include/trick/message_type.h +object_${TRICK_HOST_CPU}/MonteCarlo_master_init.o: MonteCarlo_master_init.cpp \ + ${TRICK_HOME}/include/trick/MonteCarlo.hh \ + ${TRICK_HOME}/include/trick/MonteVar.hh \ + ${TRICK_HOME}/include/trick/Executive.hh \ + ${TRICK_HOME}/include/trick/Scheduler.hh \ + ${TRICK_HOME}/include/trick/ScheduledJobQueue.hh \ + ${TRICK_HOME}/include/trick/JobData.hh \ + ${TRICK_HOME}/include/trick/InstrumentBase.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/ScheduledJobQueue.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/Threads.hh \ + ${TRICK_HOME}/include/trick/ThreadBase.hh \ + ${TRICK_HOME}/include/trick/sim_mode.h \ + ${TRICK_HOME}/include/trick/RemoteShell.hh \ + ${TRICK_HOME}/include/trick/tc.h \ + ${TRICK_HOME}/include/trick/trick_byteswap.h \ + ${TRICK_HOME}/include/trick/trick_error_hndlr.h \ + ${TRICK_HOME}/include/trick/message_proto.h \ + ${TRICK_HOME}/include/trick/message_type.h +object_${TRICK_HOST_CPU}/MonteCarlo_slave_process_run.o: MonteCarlo_slave_process_run.cpp \ + ${TRICK_HOME}/include/trick/MonteCarlo.hh \ + ${TRICK_HOME}/include/trick/MonteVar.hh \ + ${TRICK_HOME}/include/trick/Executive.hh \ + ${TRICK_HOME}/include/trick/Scheduler.hh \ + ${TRICK_HOME}/include/trick/ScheduledJobQueue.hh \ + ${TRICK_HOME}/include/trick/JobData.hh \ + ${TRICK_HOME}/include/trick/InstrumentBase.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/ScheduledJobQueue.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/Threads.hh \ + ${TRICK_HOME}/include/trick/ThreadBase.hh \ + ${TRICK_HOME}/include/trick/sim_mode.h \ + ${TRICK_HOME}/include/trick/RemoteShell.hh \ + ${TRICK_HOME}/include/trick/tc.h \ + ${TRICK_HOME}/include/trick/trick_byteswap.h \ + ${TRICK_HOME}/include/trick/trick_error_hndlr.h \ + ${TRICK_HOME}/include/trick/Exec_exception.hh \ + ${TRICK_HOME}/include/trick/command_line_protos.h \ + ${TRICK_HOME}/include/trick/input_processor_proto.h \ + ${TRICK_HOME}/include/trick/message_proto.h \ + ${TRICK_HOME}/include/trick/message_type.h \ + ${TRICK_HOME}/include/trick/tc_proto.h \ + ${TRICK_HOME}/include/trick/tc.h \ + ${TRICK_HOME}/include/trick/attributes.h \ + ${TRICK_HOME}/include/trick/parameter_types.h +object_${TRICK_HOST_CPU}/MonteVarFile.o: MonteVarFile.cpp \ + ${TRICK_HOME}/include/trick/MonteVarFile.hh \ + ${TRICK_HOME}/include/trick/MonteVar.hh \ + ${TRICK_HOME}/include/trick/message_proto.h \ + ${TRICK_HOME}/include/trick/message_type.h \ + ${TRICK_HOME}/include/trick/exec_proto.h \ + ${TRICK_HOME}/include/trick/sim_mode.h diff --git a/trick_source/sim_services/MonteCarlo/src/MonteCarlo.cpp b/trick_source/sim_services/MonteCarlo/MonteCarlo.cpp similarity index 96% rename from trick_source/sim_services/MonteCarlo/src/MonteCarlo.cpp rename to trick_source/sim_services/MonteCarlo/MonteCarlo.cpp index dc9022e1..e367d4a3 100644 --- a/trick_source/sim_services/MonteCarlo/src/MonteCarlo.cpp +++ b/trick_source/sim_services/MonteCarlo/MonteCarlo.cpp @@ -1,5 +1,5 @@ -#include "sim_services/MonteCarlo/include/MonteCarlo.hh" -#include "trick_utils/comm/include/tc_proto.h" +#include "trick/MonteCarlo.hh" +#include "trick/tc_proto.h" Trick::MonteCarlo * the_mc ; diff --git a/trick_source/sim_services/MonteCarlo/src/MonteCarlo_c_intf.cpp b/trick_source/sim_services/MonteCarlo/MonteCarlo_c_intf.cpp similarity index 97% rename from trick_source/sim_services/MonteCarlo/src/MonteCarlo_c_intf.cpp rename to trick_source/sim_services/MonteCarlo/MonteCarlo_c_intf.cpp index 38fc44ff..e2ec025b 100644 --- a/trick_source/sim_services/MonteCarlo/src/MonteCarlo_c_intf.cpp +++ b/trick_source/sim_services/MonteCarlo/MonteCarlo_c_intf.cpp @@ -1,7 +1,7 @@ -#include "sim_services/MonteCarlo/include/MonteCarlo.hh" -#include "sim_services/CommandLineArguments/include/CommandLineArguments.hh" -#include "trick_utils/comm/include/tc_proto.h" +#include "trick/MonteCarlo.hh" +#include "trick/CommandLineArguments.hh" +#include "trick/tc_proto.h" extern Trick::MonteCarlo *the_mc; extern Trick::CommandLineArguments *the_cmd_args; diff --git a/trick_source/sim_services/MonteCarlo/src/MonteCarlo_dispatch_run_to_slave.cpp b/trick_source/sim_services/MonteCarlo/MonteCarlo_dispatch_run_to_slave.cpp similarity index 91% rename from trick_source/sim_services/MonteCarlo/src/MonteCarlo_dispatch_run_to_slave.cpp rename to trick_source/sim_services/MonteCarlo/MonteCarlo_dispatch_run_to_slave.cpp index f12a2a92..374d4ec8 100644 --- a/trick_source/sim_services/MonteCarlo/src/MonteCarlo_dispatch_run_to_slave.cpp +++ b/trick_source/sim_services/MonteCarlo/MonteCarlo_dispatch_run_to_slave.cpp @@ -2,10 +2,10 @@ #include <iomanip> #include <sstream> -#include "sim_services/MonteCarlo/include/MonteCarlo.hh" -#include "trick_utils/comm/include/tc_proto.h" -#include "sim_services/Message/include/message_proto.h" -#include "sim_services/Message/include/message_type.h" +#include "trick/MonteCarlo.hh" +#include "trick/tc_proto.h" +#include "trick/message_proto.h" +#include "trick/message_type.h" void Trick::MonteCarlo::dispatch_run_to_slave(MonteRun *in_run, MonteSlave *in_slave) { if (in_slave && in_run) { diff --git a/trick_source/sim_services/MonteCarlo/src/MonteCarlo_dryrun.cpp b/trick_source/sim_services/MonteCarlo/MonteCarlo_dryrun.cpp similarity index 72% rename from trick_source/sim_services/MonteCarlo/src/MonteCarlo_dryrun.cpp rename to trick_source/sim_services/MonteCarlo/MonteCarlo_dryrun.cpp index c7ae95b0..90238de8 100644 --- a/trick_source/sim_services/MonteCarlo/src/MonteCarlo_dryrun.cpp +++ b/trick_source/sim_services/MonteCarlo/MonteCarlo_dryrun.cpp @@ -1,7 +1,7 @@ -#include "sim_services/MonteCarlo/include/MonteCarlo.hh" -#include "sim_services/Message/include/message_proto.h" -#include "sim_services/Message/include/message_type.h" +#include "trick/MonteCarlo.hh" +#include "trick/message_proto.h" +#include "trick/message_type.h" /** @par Detailed Design: */ void Trick::MonteCarlo::dryrun() { diff --git a/trick_source/sim_services/MonteCarlo/src/MonteCarlo_execute_monte.cpp b/trick_source/sim_services/MonteCarlo/MonteCarlo_execute_monte.cpp similarity index 73% rename from trick_source/sim_services/MonteCarlo/src/MonteCarlo_execute_monte.cpp rename to trick_source/sim_services/MonteCarlo/MonteCarlo_execute_monte.cpp index 9f3cd757..a83664b7 100644 --- a/trick_source/sim_services/MonteCarlo/src/MonteCarlo_execute_monte.cpp +++ b/trick_source/sim_services/MonteCarlo/MonteCarlo_execute_monte.cpp @@ -1,9 +1,9 @@ #include <sys/resource.h> -#include "sim_services/MonteCarlo/include/MonteCarlo.hh" -#include "sim_services/Message/include/message_proto.h" -#include "sim_services/Message/include/message_type.h" +#include "trick/MonteCarlo.hh" +#include "trick/message_proto.h" +#include "trick/message_type.h" /** @par Detailed Design: */ int Trick::MonteCarlo::execute_monte() { diff --git a/trick_source/sim_services/MonteCarlo/src/MonteCarlo_funcs.cpp b/trick_source/sim_services/MonteCarlo/MonteCarlo_funcs.cpp similarity index 97% rename from trick_source/sim_services/MonteCarlo/src/MonteCarlo_funcs.cpp rename to trick_source/sim_services/MonteCarlo/MonteCarlo_funcs.cpp index 113c76cf..b80a8ea2 100644 --- a/trick_source/sim_services/MonteCarlo/src/MonteCarlo_funcs.cpp +++ b/trick_source/sim_services/MonteCarlo/MonteCarlo_funcs.cpp @@ -1,12 +1,12 @@ -#include "sim_services/MonteCarlo/include/MonteCarlo.hh" -#include "sim_services/MemoryManager/include/memorymanager_c_intf.h" -#include "sim_services/CommandLineArguments/include/command_line_protos.h" -#include "trick_utils/comm/include/tc_proto.h" -#include "sim_services/Message/include/message_proto.h" -#include "sim_services/Message/include/message_type.h" -#include "sim_services/Executive/include/exec_proto.h" -#include "sim_services/Executive/include/Exec_exception.hh" +#include "trick/MonteCarlo.hh" +#include "trick/memorymanager_c_intf.h" +#include "trick/command_line_protos.h" +#include "trick/tc_proto.h" +#include "trick/message_proto.h" +#include "trick/message_type.h" +#include "trick/exec_proto.h" +#include "trick/Exec_exception.hh" void Trick::MonteCarlo::set_enabled(bool in_enabled) { this->enabled = in_enabled; diff --git a/trick_source/sim_services/MonteCarlo/src/MonteCarlo_initialize_sockets.cpp b/trick_source/sim_services/MonteCarlo/MonteCarlo_initialize_sockets.cpp similarity index 85% rename from trick_source/sim_services/MonteCarlo/src/MonteCarlo_initialize_sockets.cpp rename to trick_source/sim_services/MonteCarlo/MonteCarlo_initialize_sockets.cpp index 640bb843..6d215006 100644 --- a/trick_source/sim_services/MonteCarlo/src/MonteCarlo_initialize_sockets.cpp +++ b/trick_source/sim_services/MonteCarlo/MonteCarlo_initialize_sockets.cpp @@ -2,10 +2,10 @@ #include <sys/stat.h> #include <libgen.h> -#include "sim_services/MonteCarlo/include/MonteCarlo.hh" -#include "sim_services/Message/include/message_proto.h" -#include "sim_services/Message/include/message_type.h" -#include "trick_utils/comm/include/tc_proto.h" +#include "trick/MonteCarlo.hh" +#include "trick/message_proto.h" +#include "trick/message_type.h" +#include "trick/tc_proto.h" /** @par Detailed Design: */ int Trick::MonteCarlo::initialize_sockets() { diff --git a/trick_source/sim_services/MonteCarlo/src/MonteCarlo_master.cpp b/trick_source/sim_services/MonteCarlo/MonteCarlo_master.cpp similarity index 94% rename from trick_source/sim_services/MonteCarlo/src/MonteCarlo_master.cpp rename to trick_source/sim_services/MonteCarlo/MonteCarlo_master.cpp index 94aa47b0..ffecd728 100644 --- a/trick_source/sim_services/MonteCarlo/src/MonteCarlo_master.cpp +++ b/trick_source/sim_services/MonteCarlo/MonteCarlo_master.cpp @@ -1,6 +1,6 @@ -#include "sim_services/MonteCarlo/include/MonteCarlo.hh" -#include "sim_services/Executive/include/Exec_exception.hh" +#include "trick/MonteCarlo.hh" +#include "trick/Exec_exception.hh" /** @par Detailed Design: */ int Trick::MonteCarlo::master() { diff --git a/trick_source/sim_services/MonteCarlo/src/MonteCarlo_master_file_io.cpp b/trick_source/sim_services/MonteCarlo/MonteCarlo_master_file_io.cpp similarity index 92% rename from trick_source/sim_services/MonteCarlo/src/MonteCarlo_master_file_io.cpp rename to trick_source/sim_services/MonteCarlo/MonteCarlo_master_file_io.cpp index 0844ba85..00e0ec66 100644 --- a/trick_source/sim_services/MonteCarlo/src/MonteCarlo_master_file_io.cpp +++ b/trick_source/sim_services/MonteCarlo/MonteCarlo_master_file_io.cpp @@ -2,10 +2,10 @@ #include <sys/stat.h> #include <libgen.h> -#include "sim_services/MonteCarlo/include/MonteCarlo.hh" -#include "sim_services/Message/include/message_proto.h" -#include "sim_services/Message/include/message_type.h" -#include "sim_services/CommandLineArguments/include/command_line_protos.h" +#include "trick/MonteCarlo.hh" +#include "trick/message_proto.h" +#include "trick/message_type.h" +#include "trick/command_line_protos.h" /** @par Detailed Design: */ int Trick::MonteCarlo::construct_run_directory() { diff --git a/trick_source/sim_services/MonteCarlo/src/MonteCarlo_master_init.cpp b/trick_source/sim_services/MonteCarlo/MonteCarlo_master_init.cpp similarity index 86% rename from trick_source/sim_services/MonteCarlo/src/MonteCarlo_master_init.cpp rename to trick_source/sim_services/MonteCarlo/MonteCarlo_master_init.cpp index 760c1b34..cd9ace6d 100644 --- a/trick_source/sim_services/MonteCarlo/src/MonteCarlo_master_init.cpp +++ b/trick_source/sim_services/MonteCarlo/MonteCarlo_master_init.cpp @@ -2,8 +2,8 @@ #include <sys/stat.h> #include <libgen.h> -#include "sim_services/MonteCarlo/include/MonteCarlo.hh" -#include "sim_services/Message/include/message_proto.h" +#include "trick/MonteCarlo.hh" +#include "trick/message_proto.h" /** @par Detailed Design: */ int Trick::MonteCarlo::master_init() { diff --git a/trick_source/sim_services/MonteCarlo/src/MonteCarlo_master_shutdown.cpp b/trick_source/sim_services/MonteCarlo/MonteCarlo_master_shutdown.cpp similarity index 92% rename from trick_source/sim_services/MonteCarlo/src/MonteCarlo_master_shutdown.cpp rename to trick_source/sim_services/MonteCarlo/MonteCarlo_master_shutdown.cpp index aecf8044..335f53c6 100644 --- a/trick_source/sim_services/MonteCarlo/src/MonteCarlo_master_shutdown.cpp +++ b/trick_source/sim_services/MonteCarlo/MonteCarlo_master_shutdown.cpp @@ -1,10 +1,10 @@ -#include "sim_services/MonteCarlo/include/MonteCarlo.hh" -#include "sim_services/CommandLineArguments/include/command_line_protos.h" -#include "sim_services/Message/include/message_proto.h" -#include "sim_services/Message/include/message_type.h" -#include "trick_utils/comm/include/tc_proto.h" -#include "sim_services/Executive/include/exec_proto.h" +#include "trick/MonteCarlo.hh" +#include "trick/command_line_protos.h" +#include "trick/message_proto.h" +#include "trick/message_type.h" +#include "trick/tc_proto.h" +#include "trick/exec_proto.h" /** @par Detailed Design: */ void Trick::MonteCarlo::master_shutdown() { diff --git a/trick_source/sim_services/MonteCarlo/src/MonteCarlo_receive_results.cpp b/trick_source/sim_services/MonteCarlo/MonteCarlo_receive_results.cpp similarity index 91% rename from trick_source/sim_services/MonteCarlo/src/MonteCarlo_receive_results.cpp rename to trick_source/sim_services/MonteCarlo/MonteCarlo_receive_results.cpp index c0a9df1e..25a3a82b 100644 --- a/trick_source/sim_services/MonteCarlo/src/MonteCarlo_receive_results.cpp +++ b/trick_source/sim_services/MonteCarlo/MonteCarlo_receive_results.cpp @@ -1,8 +1,8 @@ -#include "sim_services/MonteCarlo/include/MonteCarlo.hh" -#include "sim_services/Message/include/message_proto.h" -#include "sim_services/Message/include/message_type.h" -#include "trick_utils/comm/include/tc_proto.h" +#include "trick/MonteCarlo.hh" +#include "trick/message_proto.h" +#include "trick/message_type.h" +#include "trick/tc_proto.h" /** * @par Detailed Design: diff --git a/trick_source/sim_services/MonteCarlo/src/MonteCarlo_receive_slave_results.cpp b/trick_source/sim_services/MonteCarlo/MonteCarlo_receive_slave_results.cpp similarity index 97% rename from trick_source/sim_services/MonteCarlo/src/MonteCarlo_receive_slave_results.cpp rename to trick_source/sim_services/MonteCarlo/MonteCarlo_receive_slave_results.cpp index c4379fdc..fa1e7017 100644 --- a/trick_source/sim_services/MonteCarlo/src/MonteCarlo_receive_slave_results.cpp +++ b/trick_source/sim_services/MonteCarlo/MonteCarlo_receive_slave_results.cpp @@ -1,8 +1,8 @@ -#include "sim_services/MonteCarlo/include/MonteCarlo.hh" -#include "sim_services/Message/include/message_proto.h" -#include "sim_services/Message/include/message_type.h" -#include "trick_utils/comm/include/tc_proto.h" +#include "trick/MonteCarlo.hh" +#include "trick/message_proto.h" +#include "trick/message_type.h" +#include "trick/tc_proto.h" /** * @par Detailed Design: diff --git a/trick_source/sim_services/MonteCarlo/src/MonteCarlo_run_queue.cpp b/trick_source/sim_services/MonteCarlo/MonteCarlo_run_queue.cpp similarity index 83% rename from trick_source/sim_services/MonteCarlo/src/MonteCarlo_run_queue.cpp rename to trick_source/sim_services/MonteCarlo/MonteCarlo_run_queue.cpp index 54a8874f..3e421e3c 100644 --- a/trick_source/sim_services/MonteCarlo/src/MonteCarlo_run_queue.cpp +++ b/trick_source/sim_services/MonteCarlo/MonteCarlo_run_queue.cpp @@ -2,9 +2,9 @@ #include <iostream> #include <sys/resource.h> -#include "sim_services/MonteCarlo/include/MonteCarlo.hh" -#include "sim_services/Executive/include/Exec_exception.hh" -#include "sim_services/Executive/include/exec_proto.hh" +#include "trick/MonteCarlo.hh" +#include "trick/Exec_exception.hh" +#include "trick/exec_proto.hh" /** @details diff --git a/trick_source/sim_services/MonteCarlo/src/MonteCarlo_slave.cpp b/trick_source/sim_services/MonteCarlo/MonteCarlo_slave.cpp similarity index 93% rename from trick_source/sim_services/MonteCarlo/src/MonteCarlo_slave.cpp rename to trick_source/sim_services/MonteCarlo/MonteCarlo_slave.cpp index 45113c50..b3c7e38f 100644 --- a/trick_source/sim_services/MonteCarlo/src/MonteCarlo_slave.cpp +++ b/trick_source/sim_services/MonteCarlo/MonteCarlo_slave.cpp @@ -1,8 +1,8 @@ -#include "sim_services/MonteCarlo/include/MonteCarlo.hh" -#include "sim_services/Message/include/message_proto.h" -#include "sim_services/Message/include/message_type.h" -#include "trick_utils/comm/include/tc_proto.h" +#include "trick/MonteCarlo.hh" +#include "trick/message_proto.h" +#include "trick/message_type.h" +#include "trick/tc_proto.h" /** @par Detailed Design: */ int Trick::MonteCarlo::slave() { diff --git a/trick_source/sim_services/MonteCarlo/src/MonteCarlo_slave_funcs.cpp b/trick_source/sim_services/MonteCarlo/MonteCarlo_slave_funcs.cpp similarity index 95% rename from trick_source/sim_services/MonteCarlo/src/MonteCarlo_slave_funcs.cpp rename to trick_source/sim_services/MonteCarlo/MonteCarlo_slave_funcs.cpp index 795c9a2b..777381cf 100644 --- a/trick_source/sim_services/MonteCarlo/src/MonteCarlo_slave_funcs.cpp +++ b/trick_source/sim_services/MonteCarlo/MonteCarlo_slave_funcs.cpp @@ -1,5 +1,5 @@ -#include "sim_services/MonteCarlo/include/MonteCarlo.hh" +#include "trick/MonteCarlo.hh" /** @par Detailed Design: */ void Trick::MonteCarlo::slave_shutdown() { diff --git a/trick_source/sim_services/MonteCarlo/src/MonteCarlo_slave_init.cpp b/trick_source/sim_services/MonteCarlo/MonteCarlo_slave_init.cpp similarity index 88% rename from trick_source/sim_services/MonteCarlo/src/MonteCarlo_slave_init.cpp rename to trick_source/sim_services/MonteCarlo/MonteCarlo_slave_init.cpp index 04fb495d..70f235ca 100644 --- a/trick_source/sim_services/MonteCarlo/src/MonteCarlo_slave_init.cpp +++ b/trick_source/sim_services/MonteCarlo/MonteCarlo_slave_init.cpp @@ -2,11 +2,11 @@ #include <sys/stat.h> #include <libgen.h> -#include "sim_services/MonteCarlo/include/MonteCarlo.hh" -#include "sim_services/CommandLineArguments/include/command_line_protos.h" -#include "sim_services/Message/include/message_proto.h" -#include "sim_services/Message/include/message_type.h" -#include "trick_utils/comm/include/tc_proto.h" +#include "trick/MonteCarlo.hh" +#include "trick/command_line_protos.h" +#include "trick/message_proto.h" +#include "trick/message_type.h" +#include "trick/tc_proto.h" /** @par Detailed Design: */ int Trick::MonteCarlo::slave_init() { diff --git a/trick_source/sim_services/MonteCarlo/src/MonteCarlo_slave_process_run.cpp b/trick_source/sim_services/MonteCarlo/MonteCarlo_slave_process_run.cpp similarity index 93% rename from trick_source/sim_services/MonteCarlo/src/MonteCarlo_slave_process_run.cpp rename to trick_source/sim_services/MonteCarlo/MonteCarlo_slave_process_run.cpp index f83599c3..76a0eb9c 100644 --- a/trick_source/sim_services/MonteCarlo/src/MonteCarlo_slave_process_run.cpp +++ b/trick_source/sim_services/MonteCarlo/MonteCarlo_slave_process_run.cpp @@ -4,13 +4,13 @@ #include <stdio.h> #include <sstream> -#include "sim_services/MonteCarlo/include/MonteCarlo.hh" -#include "sim_services/Executive/include/Exec_exception.hh" -#include "sim_services/CommandLineArguments/include/command_line_protos.h" -#include "sim_services/InputProcessor/include/input_processor_proto.h" -#include "sim_services/Message/include/message_proto.h" -#include "sim_services/Message/include/message_type.h" -#include "trick_utils/comm/include/tc_proto.h" +#include "trick/MonteCarlo.hh" +#include "trick/Exec_exception.hh" +#include "trick/command_line_protos.h" +#include "trick/input_processor_proto.h" +#include "trick/message_proto.h" +#include "trick/message_type.h" +#include "trick/tc_proto.h" /** @par Detailed Design: */ int Trick::MonteCarlo::slave_process_run() { diff --git a/trick_source/sim_services/MonteCarlo/src/MonteCarlo_spawn_slaves.cpp b/trick_source/sim_services/MonteCarlo/MonteCarlo_spawn_slaves.cpp similarity index 93% rename from trick_source/sim_services/MonteCarlo/src/MonteCarlo_spawn_slaves.cpp rename to trick_source/sim_services/MonteCarlo/MonteCarlo_spawn_slaves.cpp index ab830446..0bc7592f 100644 --- a/trick_source/sim_services/MonteCarlo/src/MonteCarlo_spawn_slaves.cpp +++ b/trick_source/sim_services/MonteCarlo/MonteCarlo_spawn_slaves.cpp @@ -2,11 +2,11 @@ #include <sstream> #include <stdlib.h> -#include "sim_services/MonteCarlo/include/MonteCarlo.hh" -#include "sim_services/CommandLineArguments/include/command_line_protos.h" -#include "sim_services/include/unix_commands.h" -#include "sim_services/Message/include/message_proto.h" -#include "sim_services/Message/include/message_type.h" +#include "trick/MonteCarlo.hh" +#include "trick/command_line_protos.h" +#include "trick/unix_commands.h" +#include "trick/message_proto.h" +#include "trick/message_type.h" /** * @par Detailed Design: diff --git a/trick_source/sim_services/MonteCarlo/src/MonteVarCalculated.cpp b/trick_source/sim_services/MonteCarlo/MonteVarCalculated.cpp similarity index 90% rename from trick_source/sim_services/MonteCarlo/src/MonteVarCalculated.cpp rename to trick_source/sim_services/MonteCarlo/MonteVarCalculated.cpp index e3d92f17..6deefc3c 100644 --- a/trick_source/sim_services/MonteCarlo/src/MonteVarCalculated.cpp +++ b/trick_source/sim_services/MonteCarlo/MonteVarCalculated.cpp @@ -1,9 +1,9 @@ #include <iostream> -#include "sim_services/MonteCarlo/include/MonteVarCalculated.hh" -#include "sim_services/MemoryManager/include/memorymanager_c_intf.h" -#include "sim_services/Message/include/message_proto.h" -#include "sim_services/Message/include/message_type.h" +#include "trick/MonteVarCalculated.hh" +#include "trick/memorymanager_c_intf.h" +#include "trick/message_proto.h" +#include "trick/message_type.h" Trick::MonteVarCalculated::MonteVarCalculated(std::string in_name, std::string in_unit) { this->name = in_name; diff --git a/trick_source/sim_services/MonteCarlo/src/MonteVarFile.cpp b/trick_source/sim_services/MonteCarlo/MonteVarFile.cpp similarity index 94% rename from trick_source/sim_services/MonteCarlo/src/MonteVarFile.cpp rename to trick_source/sim_services/MonteCarlo/MonteVarFile.cpp index 18b1f5bc..7944b11e 100644 --- a/trick_source/sim_services/MonteCarlo/src/MonteVarFile.cpp +++ b/trick_source/sim_services/MonteCarlo/MonteVarFile.cpp @@ -3,9 +3,9 @@ #include <string.h> #include <limits> -#include "sim_services/MonteCarlo/include/MonteVarFile.hh" -#include "sim_services/Message/include/message_proto.h" -#include "sim_services/Executive/include/exec_proto.h" +#include "trick/MonteVarFile.hh" +#include "trick/message_proto.h" +#include "trick/exec_proto.h" Trick::MonteVarFile::MonteVarFile(std::string in_name, std::string in_file_name, unsigned int in_column, std::string in_unit) { this->name = in_name; diff --git a/trick_source/sim_services/MonteCarlo/src/MonteVarFixed.cpp b/trick_source/sim_services/MonteCarlo/MonteVarFixed.cpp similarity index 90% rename from trick_source/sim_services/MonteCarlo/src/MonteVarFixed.cpp rename to trick_source/sim_services/MonteCarlo/MonteVarFixed.cpp index 356641fa..fb3d5c48 100644 --- a/trick_source/sim_services/MonteCarlo/src/MonteVarFixed.cpp +++ b/trick_source/sim_services/MonteCarlo/MonteVarFixed.cpp @@ -1,6 +1,6 @@ #include <sstream> -#include "sim_services/MonteCarlo/include/MonteVarFixed.hh" +#include "trick/MonteVarFixed.hh" Trick::MonteVarFixed::MonteVarFixed(std::string in_name, double in_value, std::string in_unit) { this->name = in_name; diff --git a/trick_source/sim_services/MonteCarlo/src/MonteVarRandom.cpp b/trick_source/sim_services/MonteCarlo/MonteVarRandom.cpp similarity index 98% rename from trick_source/sim_services/MonteCarlo/src/MonteVarRandom.cpp rename to trick_source/sim_services/MonteCarlo/MonteVarRandom.cpp index f3b94e25..2f49ed49 100644 --- a/trick_source/sim_services/MonteCarlo/src/MonteVarRandom.cpp +++ b/trick_source/sim_services/MonteCarlo/MonteVarRandom.cpp @@ -4,8 +4,8 @@ #include <cmath> #include <limits> -#include "sim_services/MonteCarlo/include/MonteVarRandom.hh" -#include "sim_services/Executive/include/exec_proto.h" +#include "trick/MonteVarRandom.hh" +#include "trick/exec_proto.h" Trick::MonteVarRandom::MonteVarRandom(std::string in_name, Distribution in_distribution, std::string in_unit, StlEngine in_engine) : engineType(in_engine), randist(), stlGenPtr(0) { this->name = in_name; diff --git a/trick_source/sim_services/MonteCarlo/src/StlRandomGenerator.cpp b/trick_source/sim_services/MonteCarlo/StlRandomGenerator.cpp similarity index 99% rename from trick_source/sim_services/MonteCarlo/src/StlRandomGenerator.cpp rename to trick_source/sim_services/MonteCarlo/StlRandomGenerator.cpp index 874c1288..ccf5fa0c 100644 --- a/trick_source/sim_services/MonteCarlo/src/StlRandomGenerator.cpp +++ b/trick_source/sim_services/MonteCarlo/StlRandomGenerator.cpp @@ -1,6 +1,6 @@ #include <stdexcept> -#include "sim_services/MonteCarlo/include/StlRandomGenerator.hh" +#include "trick/StlRandomGenerator.hh" StlRandomGenerator::StlRandomGenerator(double in_param_a, double in_param_b, diff --git a/trick_source/sim_services/MonteCarlo/design.dox_in b/trick_source/sim_services/MonteCarlo/docs/design.dox_in similarity index 100% rename from trick_source/sim_services/MonteCarlo/design.dox_in rename to trick_source/sim_services/MonteCarlo/docs/design.dox_in diff --git a/trick_source/sim_services/MonteCarlo/main_page.dox_in b/trick_source/sim_services/MonteCarlo/docs/main_page.dox_in similarity index 100% rename from trick_source/sim_services/MonteCarlo/main_page.dox_in rename to trick_source/sim_services/MonteCarlo/docs/main_page.dox_in diff --git a/trick_source/sim_services/MonteCarlo/src/makefile b/trick_source/sim_services/MonteCarlo/src/makefile deleted file mode 100644 index 753bd7f7..00000000 --- a/trick_source/sim_services/MonteCarlo/src/makefile +++ /dev/null @@ -1,6 +0,0 @@ - -all: - ${MAKE} -C .. - -clean: - ${MAKE} -C .. clean diff --git a/trick_source/sim_services/RealtimeInjector/Makefile b/trick_source/sim_services/RealtimeInjector/Makefile index 3029433b..a181cedf 100644 --- a/trick_source/sim_services/RealtimeInjector/Makefile +++ b/trick_source/sim_services/RealtimeInjector/Makefile @@ -1,5 +1,5 @@ -include ${TRICK_HOME}/makefiles/Makefile.common -include ${TRICK_HOME}/makefiles/Makefile.tricklib +include ${TRICK_HOME}/share/trick/makefiles/Makefile.common +include ${TRICK_HOME}/share/trick/makefiles/Makefile.tricklib -include Makefile_deps diff --git a/trick_source/sim_services/RealtimeInjector/Makefile_deps b/trick_source/sim_services/RealtimeInjector/Makefile_deps new file mode 100644 index 00000000..556412e2 --- /dev/null +++ b/trick_source/sim_services/RealtimeInjector/Makefile_deps @@ -0,0 +1,58 @@ +object_${TRICK_HOST_CPU}/RtiEvent.o: RtiEvent.cpp ${TRICK_HOME}/include/trick/RtiEvent.hh \ + ${TRICK_HOME}/include/trick/reference.h \ + ${TRICK_HOME}/include/trick/attributes.h \ + ${TRICK_HOME}/include/trick/parameter_types.h \ + ${TRICK_HOME}/include/trick/value.h \ + ${TRICK_HOME}/include/trick/dllist.h \ + ${TRICK_HOME}/include/trick/bitfield_proto.h \ + ${TRICK_HOME}/include/trick/memorymanager_c_intf.h \ + ${TRICK_HOME}/include/trick/var.h \ + ${TRICK_HOME}/include/trick/io_alloc.h \ + ${TRICK_HOME}/include/trick/message_proto.h \ + ${TRICK_HOME}/include/trick/message_type.h +object_${TRICK_HOST_CPU}/RtiList.o: RtiList.cpp ${TRICK_HOME}/include/trick/RtiList.hh \ + ${TRICK_HOME}/include/trick/RtiEvent.hh \ + ${TRICK_HOME}/include/trick/reference.h \ + ${TRICK_HOME}/include/trick/attributes.h \ + ${TRICK_HOME}/include/trick/parameter_types.h \ + ${TRICK_HOME}/include/trick/value.h \ + ${TRICK_HOME}/include/trick/dllist.h \ + ${TRICK_HOME}/include/trick/bitfield_proto.h \ + ${TRICK_HOME}/include/trick/memorymanager_c_intf.h \ + ${TRICK_HOME}/include/trick/var.h \ + ${TRICK_HOME}/include/trick/io_alloc.h \ + ${TRICK_HOME}/include/trick/message_proto.h \ + ${TRICK_HOME}/include/trick/message_type.h +object_${TRICK_HOST_CPU}/RtiStager.o: RtiStager.cpp ${TRICK_HOME}/include/trick/RtiStager.hh \ + ${TRICK_HOME}/include/trick/RtiEvent.hh \ + ${TRICK_HOME}/include/trick/reference.h \ + ${TRICK_HOME}/include/trick/attributes.h \ + ${TRICK_HOME}/include/trick/parameter_types.h \ + ${TRICK_HOME}/include/trick/value.h \ + ${TRICK_HOME}/include/trick/dllist.h \ + ${TRICK_HOME}/include/trick/bitfield_proto.h \ + ${TRICK_HOME}/include/trick/memorymanager_c_intf.h \ + ${TRICK_HOME}/include/trick/var.h \ + ${TRICK_HOME}/include/trick/io_alloc.h \ + ${TRICK_HOME}/include/trick/message_proto.h \ + ${TRICK_HOME}/include/trick/message_type.h \ + ${TRICK_HOME}/include/trick/RtiList.hh \ + ${TRICK_HOME}/include/trick/RtiExec.hh \ + ${TRICK_HOME}/include/trick/exec_proto.h \ + ${TRICK_HOME}/include/trick/sim_mode.h +object_${TRICK_HOST_CPU}/RtiExec.o: RtiExec.cpp ${TRICK_HOME}/include/trick/RtiExec.hh \ + ${TRICK_HOME}/include/trick/RtiList.hh \ + ${TRICK_HOME}/include/trick/RtiEvent.hh \ + ${TRICK_HOME}/include/trick/reference.h \ + ${TRICK_HOME}/include/trick/attributes.h \ + ${TRICK_HOME}/include/trick/parameter_types.h \ + ${TRICK_HOME}/include/trick/value.h \ + ${TRICK_HOME}/include/trick/dllist.h \ + ${TRICK_HOME}/include/trick/bitfield_proto.h \ + ${TRICK_HOME}/include/trick/memorymanager_c_intf.h \ + ${TRICK_HOME}/include/trick/var.h \ + ${TRICK_HOME}/include/trick/io_alloc.h \ + ${TRICK_HOME}/include/trick/message_proto.h \ + ${TRICK_HOME}/include/trick/message_type.h \ + ${TRICK_HOME}/include/trick/exec_proto.h \ + ${TRICK_HOME}/include/trick/sim_mode.h diff --git a/trick_source/sim_services/RealtimeInjector/src/RtiEvent.cpp b/trick_source/sim_services/RealtimeInjector/RtiEvent.cpp similarity index 86% rename from trick_source/sim_services/RealtimeInjector/src/RtiEvent.cpp rename to trick_source/sim_services/RealtimeInjector/RtiEvent.cpp index 0f5e0020..bfa232e0 100644 --- a/trick_source/sim_services/RealtimeInjector/src/RtiEvent.cpp +++ b/trick_source/sim_services/RealtimeInjector/RtiEvent.cpp @@ -1,8 +1,8 @@ #include <stdio.h> -#include "RtiEvent.hh" -#include "sim_services/Message/include/message_proto.h" -#include "sim_services/MemoryManager/include/memorymanager_c_intf.h" +#include "trick/RtiEvent.hh" +#include "trick/message_proto.h" +#include "trick/memorymanager_c_intf.h" void Trick::RtiEventBase::print_rti () { diff --git a/trick_source/sim_services/RealtimeInjector/src/RtiExec.cpp b/trick_source/sim_services/RealtimeInjector/RtiExec.cpp similarity index 93% rename from trick_source/sim_services/RealtimeInjector/src/RtiExec.cpp rename to trick_source/sim_services/RealtimeInjector/RtiExec.cpp index b620ecd8..5bf05d84 100644 --- a/trick_source/sim_services/RealtimeInjector/src/RtiExec.cpp +++ b/trick_source/sim_services/RealtimeInjector/RtiExec.cpp @@ -1,7 +1,7 @@ -#include "RtiExec.hh" -#include "sim_services/Message/include/message_proto.h" -#include "sim_services/Executive/include/exec_proto.h" +#include "trick/RtiExec.hh" +#include "trick/message_proto.h" +#include "trick/exec_proto.h" Trick::RtiExec::RtiExec() : frame_multiple(1) , diff --git a/trick_source/sim_services/RealtimeInjector/src/RtiList.cpp b/trick_source/sim_services/RealtimeInjector/RtiList.cpp similarity index 90% rename from trick_source/sim_services/RealtimeInjector/src/RtiList.cpp rename to trick_source/sim_services/RealtimeInjector/RtiList.cpp index df740b06..2835f778 100644 --- a/trick_source/sim_services/RealtimeInjector/src/RtiList.cpp +++ b/trick_source/sim_services/RealtimeInjector/RtiList.cpp @@ -2,8 +2,8 @@ ******************************** ** PURPOSE: (communications) ********************************/ -#include "RtiList.hh" -#include "sim_services/Message/include/message_proto.h" +#include "trick/RtiList.hh" +#include "trick/message_proto.h" void Trick::RtiList::execute( bool debug ) { std::vector<RtiEventBase * >::iterator rebit ; diff --git a/trick_source/sim_services/RealtimeInjector/src/RtiStager.cpp b/trick_source/sim_services/RealtimeInjector/RtiStager.cpp similarity index 94% rename from trick_source/sim_services/RealtimeInjector/src/RtiStager.cpp rename to trick_source/sim_services/RealtimeInjector/RtiStager.cpp index 4bbd519b..4f6fbae2 100644 --- a/trick_source/sim_services/RealtimeInjector/src/RtiStager.cpp +++ b/trick_source/sim_services/RealtimeInjector/RtiStager.cpp @@ -1,9 +1,9 @@ -#include "RtiStager.hh" -#include "sim_services/Message/include/message_proto.h" -#include "sim_services/Executive/include/exec_proto.h" +#include "trick/RtiStager.hh" +#include "trick/message_proto.h" +#include "trick/exec_proto.h" -#include "sim_services/MemoryManager/include/memorymanager_c_intf.h" +#include "trick/memorymanager_c_intf.h" Trick::RtiStager * the_rtis ; diff --git a/trick_source/sim_services/RealtimeInjector/main_page.dox_in b/trick_source/sim_services/RealtimeInjector/docs/main_page.dox_in similarity index 100% rename from trick_source/sim_services/RealtimeInjector/main_page.dox_in rename to trick_source/sim_services/RealtimeInjector/docs/main_page.dox_in diff --git a/trick_source/sim_services/RealtimeInjector/src/makefile b/trick_source/sim_services/RealtimeInjector/src/makefile deleted file mode 100644 index 753bd7f7..00000000 --- a/trick_source/sim_services/RealtimeInjector/src/makefile +++ /dev/null @@ -1,6 +0,0 @@ - -all: - ${MAKE} -C .. - -clean: - ${MAKE} -C .. clean diff --git a/trick_source/sim_services/RealtimeSync/Makefile b/trick_source/sim_services/RealtimeSync/Makefile index 3029433b..a181cedf 100644 --- a/trick_source/sim_services/RealtimeSync/Makefile +++ b/trick_source/sim_services/RealtimeSync/Makefile @@ -1,5 +1,5 @@ -include ${TRICK_HOME}/makefiles/Makefile.common -include ${TRICK_HOME}/makefiles/Makefile.tricklib +include ${TRICK_HOME}/share/trick/makefiles/Makefile.common +include ${TRICK_HOME}/share/trick/makefiles/Makefile.tricklib -include Makefile_deps diff --git a/trick_source/sim_services/RealtimeSync/Makefile_deps b/trick_source/sim_services/RealtimeSync/Makefile_deps index 703a715d..5ec673e3 100644 --- a/trick_source/sim_services/RealtimeSync/Makefile_deps +++ b/trick_source/sim_services/RealtimeSync/Makefile_deps @@ -1,18 +1,16 @@ -object_${TRICK_HOST_CPU}/RealtimeSync_c_intf.o: src/RealtimeSync_c_intf.cpp \ - ${TRICK_HOME}/trick_source/sim_services/RealtimeSync/include/RealtimeSync.hh \ - ${TRICK_HOME}/trick_source/sim_services/Clock/include/Clock.hh \ - ${TRICK_HOME}/trick_source/sim_services/Timer/include/Timer.hh \ - ${TRICK_HOME}/trick_source/sim_services/Timer/include/Timer.hh -object_${TRICK_HOST_CPU}/RealtimeSync.o: src/RealtimeSync.cpp \ - ${TRICK_HOME}/trick_source/sim_services/RealtimeSync/include/RealtimeSync.hh \ - ${TRICK_HOME}/trick_source/sim_services/Clock/include/Clock.hh \ - ${TRICK_HOME}/trick_source/sim_services/Timer/include/Timer.hh \ - ${TRICK_HOME}/trick_source/sim_services/Timer/include/Timer.hh \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/exec_proto.h \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/sim_mode.h \ - ${TRICK_HOME}/trick_source/sim_services/Message/include/message_proto.h -object_${TRICK_HOST_CPU}/RealtimeSync_c_intf.o: src/RealtimeSync_c_intf.cpp \ - ${TRICK_HOME}/trick_source/sim_services/RealtimeSync/include/RealtimeSync.hh \ - ${TRICK_HOME}/trick_source/sim_services/Clock/include/Clock.hh \ - ${TRICK_HOME}/trick_source/sim_services/Timer/include/Timer.hh \ - ${TRICK_HOME}/trick_source/sim_services/Timer/include/Timer.hh +object_${TRICK_HOST_CPU}/RealtimeSync.o: RealtimeSync.cpp \ + ${TRICK_HOME}/include/trick/RealtimeSync.hh \ + ${TRICK_HOME}/include/trick/Clock.hh \ + ${TRICK_HOME}/include/trick/Timer.hh \ + ${TRICK_HOME}/include/trick/exec_proto.h \ + ${TRICK_HOME}/include/trick/sim_mode.h \ + ${TRICK_HOME}/include/trick/message_proto.h \ + ${TRICK_HOME}/include/trick/message_type.h \ + ${TRICK_HOME}/include/trick/TrickConstant.hh +object_${TRICK_HOST_CPU}/RealtimeSync_c_intf.o: RealtimeSync_c_intf.cpp \ + ${TRICK_HOME}/include/trick/RealtimeSync.hh \ + ${TRICK_HOME}/include/trick/Clock.hh \ + ${TRICK_HOME}/include/trick/Timer.hh \ + ${TRICK_HOME}/include/trick/realtimesync_proto.h \ + ${TRICK_HOME}/include/trick/exec_proto.h \ + ${TRICK_HOME}/include/trick/sim_mode.h diff --git a/trick_source/sim_services/RealtimeSync/src/RealtimeSync.cpp b/trick_source/sim_services/RealtimeSync/RealtimeSync.cpp similarity index 97% rename from trick_source/sim_services/RealtimeSync/src/RealtimeSync.cpp rename to trick_source/sim_services/RealtimeSync/RealtimeSync.cpp index 1d4d612f..232cac72 100644 --- a/trick_source/sim_services/RealtimeSync/src/RealtimeSync.cpp +++ b/trick_source/sim_services/RealtimeSync/RealtimeSync.cpp @@ -7,12 +7,12 @@ PROGRAMMERS: #include <stdio.h> #include <iostream> -#include "sim_services/RealtimeSync/include/RealtimeSync.hh" -#include "sim_services/Executive/include/exec_proto.h" -#include "sim_services/Executive/include/sim_mode.h" -#include "sim_services/Message/include/message_proto.h" -#include "sim_services/Message/include/message_type.h" -#include "sim_services/include/TrickConstant.hh" +#include "trick/RealtimeSync.hh" +#include "trick/exec_proto.h" +#include "trick/sim_mode.h" +#include "trick/message_proto.h" +#include "trick/message_type.h" +#include "trick/TrickConstant.hh" Trick::RealtimeSync * the_rts = NULL ; diff --git a/trick_source/sim_services/RealtimeSync/src/RealtimeSync_c_intf.cpp b/trick_source/sim_services/RealtimeSync/RealtimeSync_c_intf.cpp similarity index 92% rename from trick_source/sim_services/RealtimeSync/src/RealtimeSync_c_intf.cpp rename to trick_source/sim_services/RealtimeSync/RealtimeSync_c_intf.cpp index c25a1ea2..0887a003 100644 --- a/trick_source/sim_services/RealtimeSync/src/RealtimeSync_c_intf.cpp +++ b/trick_source/sim_services/RealtimeSync/RealtimeSync_c_intf.cpp @@ -1,8 +1,8 @@ #include <stdio.h> -#include "sim_services/RealtimeSync/include/RealtimeSync.hh" -#include "sim_services/RealtimeSync/include/realtimesync_proto.h" -#include "sim_services/Executive/include/exec_proto.h" +#include "trick/RealtimeSync.hh" +#include "trick/realtimesync_proto.h" +#include "trick/exec_proto.h" /* Global singleton pointer to the real-time synchronization */ extern Trick::RealtimeSync * the_rts ; diff --git a/trick_source/sim_services/RealtimeSync/design.dox_in b/trick_source/sim_services/RealtimeSync/docs/design.dox_in similarity index 100% rename from trick_source/sim_services/RealtimeSync/design.dox_in rename to trick_source/sim_services/RealtimeSync/docs/design.dox_in diff --git a/trick_source/sim_services/RealtimeSync/main_page.dox_in b/trick_source/sim_services/RealtimeSync/docs/main_page.dox_in similarity index 100% rename from trick_source/sim_services/RealtimeSync/main_page.dox_in rename to trick_source/sim_services/RealtimeSync/docs/main_page.dox_in diff --git a/trick_source/sim_services/RealtimeSync/requirements.dox_in b/trick_source/sim_services/RealtimeSync/docs/requirements.dox_in similarity index 100% rename from trick_source/sim_services/RealtimeSync/requirements.dox_in rename to trick_source/sim_services/RealtimeSync/docs/requirements.dox_in diff --git a/trick_source/sim_services/RealtimeSync/src/makefile b/trick_source/sim_services/RealtimeSync/src/makefile deleted file mode 100644 index 753bd7f7..00000000 --- a/trick_source/sim_services/RealtimeSync/src/makefile +++ /dev/null @@ -1,6 +0,0 @@ - -all: - ${MAKE} -C .. - -clean: - ${MAKE} -C .. clean diff --git a/trick_source/sim_services/STL/Makefile b/trick_source/sim_services/STL/Makefile index 11e3de21..7261c8c1 100644 --- a/trick_source/sim_services/STL/Makefile +++ b/trick_source/sim_services/STL/Makefile @@ -1,6 +1,6 @@ -include ${TRICK_HOME}/makefiles/Makefile.common -include ${TRICK_HOME}/makefiles/Makefile.tricklib +include ${TRICK_HOME}/share/trick/makefiles/Makefile.common +include ${TRICK_HOME}/share/trick/makefiles/Makefile.tricklib -include Makefile_deps ifneq ($(DMTCP),) diff --git a/trick_source/sim_services/STL/Makefile_deps b/trick_source/sim_services/STL/Makefile_deps new file mode 100644 index 00000000..8c8aaa65 --- /dev/null +++ b/trick_source/sim_services/STL/Makefile_deps @@ -0,0 +1,17 @@ +object_${TRICK_HOST_CPU}/STLUtilities.o: STLUtilities.cpp \ + ${TRICK_HOME}/include/trick/STLUtilities.hh \ + ${TRICK_HOME}/include/trick/memorymanager_c_intf.h \ + ${TRICK_HOME}/include/trick/parameter_types.h \ + ${TRICK_HOME}/include/trick/attributes.h \ + ${TRICK_HOME}/include/trick/reference.h \ + ${TRICK_HOME}/include/trick/value.h \ + ${TRICK_HOME}/include/trick/dllist.h \ + ${TRICK_HOME}/include/trick/var.h \ + ${TRICK_HOME}/include/trick/io_alloc.h +object_${TRICK_HOST_CPU}/STLManager.o: STLManager.cpp \ + ${TRICK_HOME}/include/trick/STLManager.hh \ + ${TRICK_HOME}/include/trick/STLInterface.hh +object_${TRICK_HOST_CPU}/STLInterface.o: STLInterface.cpp \ + ${TRICK_HOME}/include/trick/STLInterface.hh \ + ${TRICK_HOME}/include/trick/STLManager.hh \ + ${TRICK_HOME}/include/trick/STLUtilities.hh diff --git a/trick_source/sim_services/STL/src/STLInterface.cpp b/trick_source/sim_services/STL/STLInterface.cpp similarity index 70% rename from trick_source/sim_services/STL/src/STLInterface.cpp rename to trick_source/sim_services/STL/STLInterface.cpp index 3b3cdb73..d8278780 100644 --- a/trick_source/sim_services/STL/src/STLInterface.cpp +++ b/trick_source/sim_services/STL/STLInterface.cpp @@ -1,9 +1,9 @@ #include <iostream> -#include "sim_services/STL/include/STLInterface.hh" -#include "sim_services/STL/include/STLManager.hh" -#include "sim_services/STL/include/STLUtilities.hh" +#include "trick/STLInterface.hh" +#include "trick/STLManager.hh" +#include "trick/STLUtilities.hh" Trick::STLInterface::STLInterface() : restore(false) { stl_id = Trick::STLManager::getSTLManager()->addSTL(*this) ; diff --git a/trick_source/sim_services/STL/src/STLManager.cpp b/trick_source/sim_services/STL/STLManager.cpp similarity index 97% rename from trick_source/sim_services/STL/src/STLManager.cpp rename to trick_source/sim_services/STL/STLManager.cpp index 078b55f5..3eccb767 100644 --- a/trick_source/sim_services/STL/src/STLManager.cpp +++ b/trick_source/sim_services/STL/STLManager.cpp @@ -1,7 +1,7 @@ #include <algorithm> #include <iostream> -#include "sim_services/STL/include/STLManager.hh" +#include "trick/STLManager.hh" Trick::STLManager * trick_stl_manager = NULL ; diff --git a/trick_source/sim_services/STL/src/STLUtilities.cpp b/trick_source/sim_services/STL/STLUtilities.cpp similarity index 89% rename from trick_source/sim_services/STL/src/STLUtilities.cpp rename to trick_source/sim_services/STL/STLUtilities.cpp index 78d6839c..5f213af1 100644 --- a/trick_source/sim_services/STL/src/STLUtilities.cpp +++ b/trick_source/sim_services/STL/STLUtilities.cpp @@ -2,8 +2,8 @@ #include <string> #include <stdio.h> #include <stdlib.h> -#include "sim_services/STL/include/STLUtilities.hh" -#include "sim_services/MemoryManager/include/memorymanager_c_intf.h" +#include "trick/STLUtilities.hh" +#include "trick/memorymanager_c_intf.h" void Trick::delete_trick_stl(std::string object_name , unsigned int stl_id) { char var_declare[128] ; diff --git a/trick_source/sim_services/STL/main_page.dox_in b/trick_source/sim_services/STL/docs/main_page.dox_in similarity index 100% rename from trick_source/sim_services/STL/main_page.dox_in rename to trick_source/sim_services/STL/docs/main_page.dox_in diff --git a/trick_source/sim_services/STL/src/makefile b/trick_source/sim_services/STL/src/makefile deleted file mode 100644 index 753bd7f7..00000000 --- a/trick_source/sim_services/STL/src/makefile +++ /dev/null @@ -1,6 +0,0 @@ - -all: - ${MAKE} -C .. - -clean: - ${MAKE} -C .. clean diff --git a/trick_source/sim_services/ScheduledJobQueue/Makefile b/trick_source/sim_services/ScheduledJobQueue/Makefile index 3029433b..a181cedf 100644 --- a/trick_source/sim_services/ScheduledJobQueue/Makefile +++ b/trick_source/sim_services/ScheduledJobQueue/Makefile @@ -1,5 +1,5 @@ -include ${TRICK_HOME}/makefiles/Makefile.common -include ${TRICK_HOME}/makefiles/Makefile.tricklib +include ${TRICK_HOME}/share/trick/makefiles/Makefile.common +include ${TRICK_HOME}/share/trick/makefiles/Makefile.tricklib -include Makefile_deps diff --git a/trick_source/sim_services/ScheduledJobQueue/Makefile_deps b/trick_source/sim_services/ScheduledJobQueue/Makefile_deps index 2aa4b1c2..8431b989 100644 --- a/trick_source/sim_services/ScheduledJobQueue/Makefile_deps +++ b/trick_source/sim_services/ScheduledJobQueue/Makefile_deps @@ -1,11 +1,11 @@ -object_${TRICK_HOST_CPU}/ScheduledJobQueue.o: src/ScheduledJobQueue.cpp \ - ${TRICK_HOME}/trick_source/sim_services/ScheduledJobQueue/include/ScheduledJobQueue.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/JobData.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/InstrumentBase.hh \ - ${TRICK_HOME}/trick_source/sim_services/ScheduledJobQueue/include/ScheduledJobQueueInstrument.hh \ - ${TRICK_HOME}/trick_source/sim_services/include/TrickConstant.hh -object_${TRICK_HOST_CPU}/ScheduledJobQueueInstrument.o: src/ScheduledJobQueueInstrument.cpp \ - ${TRICK_HOME}/trick_source/sim_services/ScheduledJobQueue/include/ScheduledJobQueueInstrument.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/InstrumentBase.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/JobData.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/SimObject.hh +object_${TRICK_HOST_CPU}/ScheduledJobQueue.o: ScheduledJobQueue.cpp \ + ${TRICK_HOME}/include/trick/ScheduledJobQueue.hh \ + ${TRICK_HOME}/include/trick/JobData.hh \ + ${TRICK_HOME}/include/trick/InstrumentBase.hh \ + ${TRICK_HOME}/include/trick/ScheduledJobQueueInstrument.hh \ + ${TRICK_HOME}/include/trick/TrickConstant.hh +object_${TRICK_HOST_CPU}/ScheduledJobQueueInstrument.o: ScheduledJobQueueInstrument.cpp \ + ${TRICK_HOME}/include/trick/ScheduledJobQueueInstrument.hh \ + ${TRICK_HOME}/include/trick/InstrumentBase.hh \ + ${TRICK_HOME}/include/trick/JobData.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh diff --git a/trick_source/sim_services/ScheduledJobQueue/src/ScheduledJobQueue.cpp b/trick_source/sim_services/ScheduledJobQueue/ScheduledJobQueue.cpp similarity index 98% rename from trick_source/sim_services/ScheduledJobQueue/src/ScheduledJobQueue.cpp rename to trick_source/sim_services/ScheduledJobQueue/ScheduledJobQueue.cpp index ae120b85..a43602ca 100644 --- a/trick_source/sim_services/ScheduledJobQueue/src/ScheduledJobQueue.cpp +++ b/trick_source/sim_services/ScheduledJobQueue/ScheduledJobQueue.cpp @@ -4,9 +4,9 @@ #include <stdlib.h> #include <stdio.h> -#include "sim_services/ScheduledJobQueue/include/ScheduledJobQueue.hh" -#include "sim_services/ScheduledJobQueue/include/ScheduledJobQueueInstrument.hh" -#include "sim_services/include/TrickConstant.hh" +#include "trick/ScheduledJobQueue.hh" +#include "trick/ScheduledJobQueueInstrument.hh" +#include "trick/TrickConstant.hh" /** @design diff --git a/trick_source/sim_services/ScheduledJobQueue/src/ScheduledJobQueueInstrument.cpp b/trick_source/sim_services/ScheduledJobQueue/ScheduledJobQueueInstrument.cpp similarity index 87% rename from trick_source/sim_services/ScheduledJobQueue/src/ScheduledJobQueueInstrument.cpp rename to trick_source/sim_services/ScheduledJobQueue/ScheduledJobQueueInstrument.cpp index f636d27d..4d023362 100644 --- a/trick_source/sim_services/ScheduledJobQueue/src/ScheduledJobQueueInstrument.cpp +++ b/trick_source/sim_services/ScheduledJobQueue/ScheduledJobQueueInstrument.cpp @@ -1,6 +1,6 @@ -#include "sim_services/ScheduledJobQueue/include/ScheduledJobQueueInstrument.hh" -#include "sim_services/SimObject/include/SimObject.hh" +#include "trick/ScheduledJobQueueInstrument.hh" +#include "trick/SimObject.hh" /** @details diff --git a/trick_source/sim_services/ScheduledJobQueue/src/makefile b/trick_source/sim_services/ScheduledJobQueue/src/makefile deleted file mode 100644 index 753bd7f7..00000000 --- a/trick_source/sim_services/ScheduledJobQueue/src/makefile +++ /dev/null @@ -1,6 +0,0 @@ - -all: - ${MAKE} -C .. - -clean: - ${MAKE} -C .. clean diff --git a/trick_source/sim_services/Scheduler/Makefile b/trick_source/sim_services/Scheduler/Makefile index 3029433b..a181cedf 100644 --- a/trick_source/sim_services/Scheduler/Makefile +++ b/trick_source/sim_services/Scheduler/Makefile @@ -1,5 +1,5 @@ -include ${TRICK_HOME}/makefiles/Makefile.common -include ${TRICK_HOME}/makefiles/Makefile.tricklib +include ${TRICK_HOME}/share/trick/makefiles/Makefile.common +include ${TRICK_HOME}/share/trick/makefiles/Makefile.tricklib -include Makefile_deps diff --git a/trick_source/sim_services/Scheduler/Makefile_deps b/trick_source/sim_services/Scheduler/Makefile_deps index e232f436..aacd0365 100644 --- a/trick_source/sim_services/Scheduler/Makefile_deps +++ b/trick_source/sim_services/Scheduler/Makefile_deps @@ -1,5 +1,5 @@ -object_${TRICK_HOST_CPU}/Scheduler.o: src/Scheduler.cpp \ - ${TRICK_HOME}/trick_source/sim_services/Scheduler/include/Scheduler.hh \ - ${TRICK_HOME}/trick_source/sim_services/ScheduledJobQueue/include/ScheduledJobQueue.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/JobData.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/InstrumentBase.hh +object_${TRICK_HOST_CPU}/Scheduler.o: Scheduler.cpp ${TRICK_HOME}/include/trick/Scheduler.hh \ + ${TRICK_HOME}/include/trick/ScheduledJobQueue.hh \ + ${TRICK_HOME}/include/trick/JobData.hh \ + ${TRICK_HOME}/include/trick/InstrumentBase.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh diff --git a/trick_source/sim_services/Scheduler/src/Scheduler.cpp b/trick_source/sim_services/Scheduler/Scheduler.cpp similarity index 97% rename from trick_source/sim_services/Scheduler/src/Scheduler.cpp rename to trick_source/sim_services/Scheduler/Scheduler.cpp index a0bb2ff7..8fe17bfb 100644 --- a/trick_source/sim_services/Scheduler/src/Scheduler.cpp +++ b/trick_source/sim_services/Scheduler/Scheduler.cpp @@ -1,5 +1,5 @@ -#include "sim_services/Scheduler/include/Scheduler.hh" +#include "trick/Scheduler.hh" Trick::Scheduler::~Scheduler() {} diff --git a/trick_source/sim_services/Scheduler/src/makefile b/trick_source/sim_services/Scheduler/src/makefile deleted file mode 100644 index 753bd7f7..00000000 --- a/trick_source/sim_services/Scheduler/src/makefile +++ /dev/null @@ -1,6 +0,0 @@ - -all: - ${MAKE} -C .. - -clean: - ${MAKE} -C .. clean diff --git a/trick_source/sim_services/Sie/src/AttributesMap.cpp b/trick_source/sim_services/Sie/AttributesMap.cpp similarity index 94% rename from trick_source/sim_services/Sie/src/AttributesMap.cpp rename to trick_source/sim_services/Sie/AttributesMap.cpp index c5d86fc5..09c57ed2 100644 --- a/trick_source/sim_services/Sie/src/AttributesMap.cpp +++ b/trick_source/sim_services/Sie/AttributesMap.cpp @@ -1,9 +1,9 @@ #include <iostream> #include <fstream> #include <algorithm> -#include "sim_services/Sie/include/AttributesMap.hh" -#include "sim_services/MemoryManager/include/attributes.h" -#include "sim_services/CommandLineArguments/include/command_line_protos.h" +#include "trick/AttributesMap.hh" +#include "trick/attributes.h" +#include "trick/command_line_protos.h" // Instantiate static variables for template types for ATTRIBUTES * and ENUM_ATTR * namespace Trick { diff --git a/trick_source/sim_services/Sie/src/EnumAttributesMap.cpp b/trick_source/sim_services/Sie/EnumAttributesMap.cpp similarity index 84% rename from trick_source/sim_services/Sie/src/EnumAttributesMap.cpp rename to trick_source/sim_services/Sie/EnumAttributesMap.cpp index 95adc695..c3318e92 100644 --- a/trick_source/sim_services/Sie/src/EnumAttributesMap.cpp +++ b/trick_source/sim_services/Sie/EnumAttributesMap.cpp @@ -1,9 +1,9 @@ #include <iostream> #include <fstream> #include <algorithm> -#include "sim_services/Sie/include/EnumAttributesMap.hh" -#include "sim_services/MemoryManager/include/attributes.h" -#include "sim_services/CommandLineArguments/include/command_line_protos.h" +#include "trick/EnumAttributesMap.hh" +#include "trick/attributes.h" +#include "trick/command_line_protos.h" // Instantiate static variables for template types for ATTRIBUTES * and ENUM_ATTR * namespace Trick { diff --git a/trick_source/sim_services/Sie/Makefile b/trick_source/sim_services/Sie/Makefile index 3029433b..a181cedf 100644 --- a/trick_source/sim_services/Sie/Makefile +++ b/trick_source/sim_services/Sie/Makefile @@ -1,5 +1,5 @@ -include ${TRICK_HOME}/makefiles/Makefile.common -include ${TRICK_HOME}/makefiles/Makefile.tricklib +include ${TRICK_HOME}/share/trick/makefiles/Makefile.common +include ${TRICK_HOME}/share/trick/makefiles/Makefile.tricklib -include Makefile_deps diff --git a/trick_source/sim_services/Sie/Makefile_deps b/trick_source/sim_services/Sie/Makefile_deps index fa10e2bc..a85662f5 100644 --- a/trick_source/sim_services/Sie/Makefile_deps +++ b/trick_source/sim_services/Sie/Makefile_deps @@ -1,43 +1,44 @@ -object_${TRICK_HOST_CPU}/AttributesMap.o: src/AttributesMap.cpp \ - ${TRICK_HOME}/trick_source/sim_services/Sie/include/AttributesMap.hh \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/attributes.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/parameter_types.h \ - ${TRICK_HOME}/trick_source/sim_services/CommandLineArguments/include/command_line_protos.h -object_${TRICK_HOST_CPU}/EnumAttributesMap.o: src/EnumAttributesMap.cpp \ - ${TRICK_HOME}/trick_source/sim_services/Sie/include/EnumAttributesMap.hh \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/attributes.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/parameter_types.h \ - ${TRICK_HOME}/trick_source/sim_services/CommandLineArguments/include/command_line_protos.h -object_${TRICK_HOST_CPU}/Sie.o: src/Sie.cpp \ - ${TRICK_HOME}/trick_source/sim_services/Sie/include/Sie.hh \ - ${TRICK_HOME}/trick_source/sim_services/Sie/include/AttributesMap.hh \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/attributes.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/parameter_types.h \ - ${TRICK_HOME}/trick_source/sim_services/Sie/include/EnumAttributesMap.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/SimObject.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/JobData.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/InstrumentBase.hh \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/reference.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/value.h \ - ${TRICK_HOME}/trick_source/trick_utils/trick_adt/include/dllist.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/memorymanager_c_intf.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/var.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/io_alloc.h \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/exec_proto.hh \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/Executive.hh \ - ${TRICK_HOME}/trick_source/sim_services/Scheduler/include/Scheduler.hh \ - ${TRICK_HOME}/trick_source/sim_services/ScheduledJobQueue/include/ScheduledJobQueue.hh \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/Threads.hh \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/sim_mode.h \ - ${TRICK_HOME}/trick_source/sim_services/CommandLineArguments/include/command_line_protos.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/MemoryManager.hh \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/mm_error.h \ - ${TRICK_HOME}/trick_source/sim_services/CheckPointAgent/include/CheckPointAgent.hh \ - ${TRICK_HOME}/trick_source/trick_utils/units/include/UCFn.hh -object_${TRICK_HOST_CPU}/sie_c_intf.o: src/sie_c_intf.cpp \ - ${TRICK_HOME}/trick_source/sim_services/Sie/include/Sie.hh \ - ${TRICK_HOME}/trick_source/sim_services/Sie/include/AttributesMap.hh \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/attributes.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/parameter_types.h \ - ${TRICK_HOME}/trick_source/sim_services/Sie/include/EnumAttributesMap.hh \ - ${TRICK_HOME}/trick_source/sim_services/Sie/include/sie_c_intf.h +object_${TRICK_HOST_CPU}/Sie.o: Sie.cpp ${TRICK_HOME}/include/trick/Sie.hh \ + ${TRICK_HOME}/include/trick/AttributesMap.hh \ + ${TRICK_HOME}/include/trick/attributes.h \ + ${TRICK_HOME}/include/trick/parameter_types.h \ + ${TRICK_HOME}/include/trick/EnumAttributesMap.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/JobData.hh \ + ${TRICK_HOME}/include/trick/InstrumentBase.hh \ + ${TRICK_HOME}/include/trick/reference.h \ + ${TRICK_HOME}/include/trick/value.h \ + ${TRICK_HOME}/include/trick/dllist.h \ + ${TRICK_HOME}/include/trick/memorymanager_c_intf.h \ + ${TRICK_HOME}/include/trick/var.h \ + ${TRICK_HOME}/include/trick/io_alloc.h \ + ${TRICK_HOME}/include/trick/exec_proto.hh \ + ${TRICK_HOME}/include/trick/Executive.hh \ + ${TRICK_HOME}/include/trick/Scheduler.hh \ + ${TRICK_HOME}/include/trick/ScheduledJobQueue.hh \ + ${TRICK_HOME}/include/trick/ScheduledJobQueue.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/Threads.hh \ + ${TRICK_HOME}/include/trick/ThreadBase.hh \ + ${TRICK_HOME}/include/trick/sim_mode.h \ + ${TRICK_HOME}/include/trick/command_line_protos.h \ + ${TRICK_HOME}/include/trick/MemoryManager.hh \ + ${TRICK_HOME}/include/trick/mm_error.h \ + ${TRICK_HOME}/include/trick/CheckPointAgent.hh \ + ${TRICK_HOME}/include/trick/UCFn.hh +object_${TRICK_HOST_CPU}/EnumAttributesMap.o: EnumAttributesMap.cpp \ + ${TRICK_HOME}/include/trick/EnumAttributesMap.hh \ + ${TRICK_HOME}/include/trick/attributes.h \ + ${TRICK_HOME}/include/trick/parameter_types.h \ + ${TRICK_HOME}/include/trick/command_line_protos.h +object_${TRICK_HOST_CPU}/sie_c_intf.o: sie_c_intf.cpp ${TRICK_HOME}/include/trick/Sie.hh \ + ${TRICK_HOME}/include/trick/AttributesMap.hh \ + ${TRICK_HOME}/include/trick/attributes.h \ + ${TRICK_HOME}/include/trick/parameter_types.h \ + ${TRICK_HOME}/include/trick/EnumAttributesMap.hh \ + ${TRICK_HOME}/include/trick/sie_c_intf.h +object_${TRICK_HOST_CPU}/AttributesMap.o: AttributesMap.cpp \ + ${TRICK_HOME}/include/trick/AttributesMap.hh \ + ${TRICK_HOME}/include/trick/attributes.h \ + ${TRICK_HOME}/include/trick/parameter_types.h \ + ${TRICK_HOME}/include/trick/command_line_protos.h diff --git a/trick_source/sim_services/Sie/src/Sie.cpp b/trick_source/sim_services/Sie/Sie.cpp similarity index 87% rename from trick_source/sim_services/Sie/src/Sie.cpp rename to trick_source/sim_services/Sie/Sie.cpp index 6d886b7b..21557128 100644 --- a/trick_source/sim_services/Sie/src/Sie.cpp +++ b/trick_source/sim_services/Sie/Sie.cpp @@ -4,15 +4,15 @@ #include <fstream> #include <string.h> -#include "sim_services/Sie/include/Sie.hh" -#include "sim_services/SimObject/include/SimObject.hh" -#include "sim_services/MemoryManager/include/attributes.h" -#include "sim_services/MemoryManager/include/reference.h" -#include "sim_services/MemoryManager/include/memorymanager_c_intf.h" -#include "sim_services/Executive/include/exec_proto.hh" -#include "sim_services/CommandLineArguments/include/command_line_protos.h" -#include "sim_services/MemoryManager/include/MemoryManager.hh" -#include "sim_services/MemoryManager/include/parameter_types.h" +#include "trick/Sie.hh" +#include "trick/SimObject.hh" +#include "trick/attributes.h" +#include "trick/reference.h" +#include "trick/memorymanager_c_intf.h" +#include "trick/exec_proto.hh" +#include "trick/command_line_protos.h" +#include "trick/MemoryManager.hh" +#include "trick/parameter_types.h" Trick::Sie * the_sie = NULL ; diff --git a/trick_source/sim_services/Sie/src/sie_c_intf.cpp b/trick_source/sim_services/Sie/sie_c_intf.cpp similarity index 85% rename from trick_source/sim_services/Sie/src/sie_c_intf.cpp rename to trick_source/sim_services/Sie/sie_c_intf.cpp index df738700..f25f4023 100644 --- a/trick_source/sim_services/Sie/src/sie_c_intf.cpp +++ b/trick_source/sim_services/Sie/sie_c_intf.cpp @@ -1,6 +1,6 @@ -#include "sim_services/Sie/include/Sie.hh" -#include "sim_services/Sie/include/sie_c_intf.h" +#include "trick/Sie.hh" +#include "trick/sie_c_intf.h" extern Trick::Sie * the_sie ; diff --git a/trick_source/sim_services/Sie/src/makefile b/trick_source/sim_services/Sie/src/makefile deleted file mode 100644 index 753bd7f7..00000000 --- a/trick_source/sim_services/Sie/src/makefile +++ /dev/null @@ -1,6 +0,0 @@ - -all: - ${MAKE} -C .. - -clean: - ${MAKE} -C .. clean diff --git a/trick_source/sim_services/SimObject/src/JobData.cpp b/trick_source/sim_services/SimObject/JobData.cpp similarity index 98% rename from trick_source/sim_services/SimObject/src/JobData.cpp rename to trick_source/sim_services/SimObject/JobData.cpp index 4198be00..9b91bcc9 100644 --- a/trick_source/sim_services/SimObject/src/JobData.cpp +++ b/trick_source/sim_services/SimObject/JobData.cpp @@ -1,8 +1,8 @@ #include <math.h> -#include "sim_services/SimObject/include/JobData.hh" -#include "sim_services/SimObject/include/SimObject.hh" +#include "trick/JobData.hh" +#include "trick/SimObject.hh" long long Trick::JobData::time_tic_value = 0 ; diff --git a/trick_source/sim_services/SimObject/Makefile b/trick_source/sim_services/SimObject/Makefile index 3029433b..a181cedf 100644 --- a/trick_source/sim_services/SimObject/Makefile +++ b/trick_source/sim_services/SimObject/Makefile @@ -1,5 +1,5 @@ -include ${TRICK_HOME}/makefiles/Makefile.common -include ${TRICK_HOME}/makefiles/Makefile.tricklib +include ${TRICK_HOME}/share/trick/makefiles/Makefile.common +include ${TRICK_HOME}/share/trick/makefiles/Makefile.tricklib -include Makefile_deps diff --git a/trick_source/sim_services/SimObject/Makefile_deps b/trick_source/sim_services/SimObject/Makefile_deps index 7353a266..c4673a5e 100644 --- a/trick_source/sim_services/SimObject/Makefile_deps +++ b/trick_source/sim_services/SimObject/Makefile_deps @@ -1,8 +1,6 @@ -object_${TRICK_HOST_CPU}/JobData.o: src/JobData.cpp \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/JobData.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/InstrumentBase.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/SimObject.hh -object_${TRICK_HOST_CPU}/SimObject.o: src/SimObject.cpp \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/SimObject.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/JobData.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/InstrumentBase.hh +object_${TRICK_HOST_CPU}/JobData.o: JobData.cpp ${TRICK_HOME}/include/trick/JobData.hh \ + ${TRICK_HOME}/include/trick/InstrumentBase.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh +object_${TRICK_HOST_CPU}/SimObject.o: SimObject.cpp ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/JobData.hh \ + ${TRICK_HOME}/include/trick/InstrumentBase.hh diff --git a/trick_source/sim_services/SimObject/src/SimObject.cpp b/trick_source/sim_services/SimObject/SimObject.cpp similarity index 98% rename from trick_source/sim_services/SimObject/src/SimObject.cpp rename to trick_source/sim_services/SimObject/SimObject.cpp index 75fde3a7..88533b83 100644 --- a/trick_source/sim_services/SimObject/src/SimObject.cpp +++ b/trick_source/sim_services/SimObject/SimObject.cpp @@ -1,7 +1,7 @@ #include <iostream> -#include "sim_services/SimObject/include/SimObject.hh" +#include "trick/SimObject.hh" Trick::SimObject::~SimObject() { while ( !jobs.empty() ) { diff --git a/trick_source/sim_services/SimObject/src/makefile b/trick_source/sim_services/SimObject/src/makefile deleted file mode 100644 index 753bd7f7..00000000 --- a/trick_source/sim_services/SimObject/src/makefile +++ /dev/null @@ -1,6 +0,0 @@ - -all: - ${MAKE} -C .. - -clean: - ${MAKE} -C .. clean diff --git a/trick_source/sim_services/SimTime/Makefile b/trick_source/sim_services/SimTime/Makefile index 3029433b..a181cedf 100644 --- a/trick_source/sim_services/SimTime/Makefile +++ b/trick_source/sim_services/SimTime/Makefile @@ -1,5 +1,5 @@ -include ${TRICK_HOME}/makefiles/Makefile.common -include ${TRICK_HOME}/makefiles/Makefile.tricklib +include ${TRICK_HOME}/share/trick/makefiles/Makefile.common +include ${TRICK_HOME}/share/trick/makefiles/Makefile.tricklib -include Makefile_deps diff --git a/trick_source/sim_services/SimTime/Makefile_deps b/trick_source/sim_services/SimTime/Makefile_deps index 6ac7d256..a6342c59 100644 --- a/trick_source/sim_services/SimTime/Makefile_deps +++ b/trick_source/sim_services/SimTime/Makefile_deps @@ -1,6 +1,8 @@ -object_${TRICK_HOST_CPU}/SimTime.o: src/SimTime.cpp \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/exec_proto.h \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/sim_mode.h \ - include/SimTime.hh include/time_offset.h -object_${TRICK_HOST_CPU}/SimTime_c_intf.o: src/SimTime_c_intf.cpp include/SimTime.hh \ - include/time_offset.h include/simtime_proto.h +object_${TRICK_HOST_CPU}/SimTime_c_intf.o: SimTime_c_intf.cpp \ + ${TRICK_HOME}/include/trick/SimTime.hh \ + ${TRICK_HOME}/include/trick/time_offset.h \ + ${TRICK_HOME}/include/trick/simtime_proto.h +object_${TRICK_HOST_CPU}/SimTime.o: SimTime.cpp ${TRICK_HOME}/include/trick/exec_proto.h \ + ${TRICK_HOME}/include/trick/sim_mode.h \ + ${TRICK_HOME}/include/trick/SimTime.hh \ + ${TRICK_HOME}/include/trick/time_offset.h diff --git a/trick_source/sim_services/SimTime/src/SimTime.cpp b/trick_source/sim_services/SimTime/SimTime.cpp similarity index 95% rename from trick_source/sim_services/SimTime/src/SimTime.cpp rename to trick_source/sim_services/SimTime/SimTime.cpp index 9fe374e6..4c515e27 100644 --- a/trick_source/sim_services/SimTime/src/SimTime.cpp +++ b/trick_source/sim_services/SimTime/SimTime.cpp @@ -1,6 +1,6 @@ -#include "sim_services/Executive/include/exec_proto.h" -#include "SimTime.hh" +#include "trick/exec_proto.h" +#include "trick/SimTime.hh" #define GET_TIME( GMT , offset ) \ { \ diff --git a/trick_source/sim_services/SimTime/src/SimTime_c_intf.cpp b/trick_source/sim_services/SimTime/SimTime_c_intf.cpp similarity index 90% rename from trick_source/sim_services/SimTime/src/SimTime_c_intf.cpp rename to trick_source/sim_services/SimTime/SimTime_c_intf.cpp index 688ada93..44616766 100644 --- a/trick_source/sim_services/SimTime/src/SimTime_c_intf.cpp +++ b/trick_source/sim_services/SimTime/SimTime_c_intf.cpp @@ -1,6 +1,6 @@ -#include "SimTime.hh" -#include "simtime_proto.h" +#include "trick/SimTime.hh" +#include "trick/simtime_proto.h" extern Trick::SimTime * the_simtime ; diff --git a/trick_source/sim_services/ThreadBase/Makefile b/trick_source/sim_services/ThreadBase/Makefile index 3029433b..a181cedf 100644 --- a/trick_source/sim_services/ThreadBase/Makefile +++ b/trick_source/sim_services/ThreadBase/Makefile @@ -1,5 +1,5 @@ -include ${TRICK_HOME}/makefiles/Makefile.common -include ${TRICK_HOME}/makefiles/Makefile.tricklib +include ${TRICK_HOME}/share/trick/makefiles/Makefile.common +include ${TRICK_HOME}/share/trick/makefiles/Makefile.tricklib -include Makefile_deps diff --git a/trick_source/sim_services/ThreadBase/Makefile_deps b/trick_source/sim_services/ThreadBase/Makefile_deps index 026e05c1..4da0b0ae 100644 --- a/trick_source/sim_services/ThreadBase/Makefile_deps +++ b/trick_source/sim_services/ThreadBase/Makefile_deps @@ -1,4 +1,4 @@ -object_${TRICK_HOST_CPU}/ThreadBase.o: src/ThreadBase.cpp \ - ${TRICK_HOME}/trick_source/sim_services/ThreadBase/include/ThreadBase.hh \ - ${TRICK_HOME}/trick_source/sim_services/Message/include/message_proto.h \ - ${TRICK_HOME}/trick_source/sim_services/Message/include/message_type.h +object_${TRICK_HOST_CPU}/ThreadBase.o: ThreadBase.cpp \ + ${TRICK_HOME}/include/trick/ThreadBase.hh \ + ${TRICK_HOME}/include/trick/message_proto.h \ + ${TRICK_HOME}/include/trick/message_type.h diff --git a/trick_source/sim_services/ThreadBase/src/ThreadBase.cpp b/trick_source/sim_services/ThreadBase/ThreadBase.cpp similarity index 98% rename from trick_source/sim_services/ThreadBase/src/ThreadBase.cpp rename to trick_source/sim_services/ThreadBase/ThreadBase.cpp index d93f622c..db0d7845 100644 --- a/trick_source/sim_services/ThreadBase/src/ThreadBase.cpp +++ b/trick_source/sim_services/ThreadBase/ThreadBase.cpp @@ -9,9 +9,9 @@ #include <sched.h> #endif -#include "sim_services/ThreadBase/include/ThreadBase.hh" -#include "sim_services/Message/include/message_proto.h" -#include "sim_services/Message/include/message_type.h" +#include "trick/ThreadBase.hh" +#include "trick/message_proto.h" +#include "trick/message_type.h" Trick::ThreadBase::ThreadBase(std::string in_name) : name(in_name) , diff --git a/trick_source/sim_services/ThreadBase/src/makefile b/trick_source/sim_services/ThreadBase/src/makefile deleted file mode 100644 index 753bd7f7..00000000 --- a/trick_source/sim_services/ThreadBase/src/makefile +++ /dev/null @@ -1,6 +0,0 @@ - -all: - ${MAKE} -C .. - -clean: - ${MAKE} -C .. clean diff --git a/trick_source/sim_services/Timer/src/ITimer.cpp b/trick_source/sim_services/Timer/ITimer.cpp similarity index 97% rename from trick_source/sim_services/Timer/src/ITimer.cpp rename to trick_source/sim_services/Timer/ITimer.cpp index d97e45dd..7adf091b 100644 --- a/trick_source/sim_services/Timer/src/ITimer.cpp +++ b/trick_source/sim_services/Timer/ITimer.cpp @@ -20,9 +20,9 @@ PROGRAMMERS: #include <sys/types.h> #include <unistd.h> -#include "ITimer.hh" -#include "sim_services/Executive/include/exec_proto.h" -#include "sim_services/Message/include/message_proto.h" +#include "trick/ITimer.hh" +#include "trick/exec_proto.h" +#include "trick/message_proto.h" Trick::ITimer * the_itimer ; diff --git a/trick_source/sim_services/Timer/Makefile b/trick_source/sim_services/Timer/Makefile index 3029433b..a181cedf 100644 --- a/trick_source/sim_services/Timer/Makefile +++ b/trick_source/sim_services/Timer/Makefile @@ -1,5 +1,5 @@ -include ${TRICK_HOME}/makefiles/Makefile.common -include ${TRICK_HOME}/makefiles/Makefile.tricklib +include ${TRICK_HOME}/share/trick/makefiles/Makefile.common +include ${TRICK_HOME}/share/trick/makefiles/Makefile.tricklib -include Makefile_deps diff --git a/trick_source/sim_services/Timer/Makefile_deps b/trick_source/sim_services/Timer/Makefile_deps index 3be90d3f..43e05189 100644 --- a/trick_source/sim_services/Timer/Makefile_deps +++ b/trick_source/sim_services/Timer/Makefile_deps @@ -1,6 +1,9 @@ -object_${TRICK_HOST_CPU}/ITimer.o: src/ITimer.cpp include/ITimer.hh include/Timer.hh \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/exec_proto.h \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/sim_mode.h -object_${TRICK_HOST_CPU}/it_handler.o: src/it_handler.cpp \ - ${TRICK_HOME}/trick_source/sim_services/Timer/include/ITimer.hh \ - ${TRICK_HOME}/trick_source/sim_services/Timer/include/Timer.hh +object_${TRICK_HOST_CPU}/ITimer.o: ITimer.cpp ${TRICK_HOME}/include/trick/ITimer.hh \ + ${TRICK_HOME}/include/trick/Timer.hh \ + ${TRICK_HOME}/include/trick/exec_proto.h \ + ${TRICK_HOME}/include/trick/sim_mode.h \ + ${TRICK_HOME}/include/trick/message_proto.h \ + ${TRICK_HOME}/include/trick/message_type.h +object_${TRICK_HOST_CPU}/Timer.o: Timer.cpp ${TRICK_HOME}/include/trick/Timer.hh +object_${TRICK_HOST_CPU}/it_handler.o: it_handler.cpp ${TRICK_HOME}/include/trick/ITimer.hh \ + ${TRICK_HOME}/include/trick/Timer.hh diff --git a/trick_source/sim_services/Timer/src/Timer.cpp b/trick_source/sim_services/Timer/Timer.cpp similarity index 90% rename from trick_source/sim_services/Timer/src/Timer.cpp rename to trick_source/sim_services/Timer/Timer.cpp index 8d71f185..e2c29154 100644 --- a/trick_source/sim_services/Timer/src/Timer.cpp +++ b/trick_source/sim_services/Timer/Timer.cpp @@ -5,7 +5,7 @@ PROGRAMMERS: ((Alex Lin) (NASA) (August 2010) (--) (c++ port))) */ -#include "sim_services/Timer/include/Timer.hh" +#include "trick/Timer.hh" Trick::Timer::Timer() : enabled(false) , active(false) {} diff --git a/trick_source/sim_services/Timer/design.dox_in b/trick_source/sim_services/Timer/docs/design.dox_in similarity index 100% rename from trick_source/sim_services/Timer/design.dox_in rename to trick_source/sim_services/Timer/docs/design.dox_in diff --git a/trick_source/sim_services/Timer/main_page.dox_in b/trick_source/sim_services/Timer/docs/main_page.dox_in similarity index 100% rename from trick_source/sim_services/Timer/main_page.dox_in rename to trick_source/sim_services/Timer/docs/main_page.dox_in diff --git a/trick_source/sim_services/Timer/requirements.dox_in b/trick_source/sim_services/Timer/docs/requirements.dox_in similarity index 100% rename from trick_source/sim_services/Timer/requirements.dox_in rename to trick_source/sim_services/Timer/docs/requirements.dox_in diff --git a/trick_source/sim_services/Timer/src/it_handler.cpp b/trick_source/sim_services/Timer/it_handler.cpp similarity index 90% rename from trick_source/sim_services/Timer/src/it_handler.cpp rename to trick_source/sim_services/Timer/it_handler.cpp index dbae113a..935e839e 100644 --- a/trick_source/sim_services/Timer/src/it_handler.cpp +++ b/trick_source/sim_services/Timer/it_handler.cpp @@ -4,7 +4,7 @@ PROGRAMMERS: (((Robert W. Bailey) (LinCom) (April 1992) (--) (Realtime))) */ -#include "sim_services/Timer/include/ITimer.hh" +#include "trick/ITimer.hh" /** @relates Trick::ITimer diff --git a/trick_source/sim_services/Timer/src/makefile b/trick_source/sim_services/Timer/src/makefile deleted file mode 100644 index 753bd7f7..00000000 --- a/trick_source/sim_services/Timer/src/makefile +++ /dev/null @@ -1,6 +0,0 @@ - -all: - ${MAKE} -C .. - -clean: - ${MAKE} -C .. clean diff --git a/trick_source/sim_services/UnitTest/Makefile b/trick_source/sim_services/UnitTest/Makefile index 3029433b..a181cedf 100644 --- a/trick_source/sim_services/UnitTest/Makefile +++ b/trick_source/sim_services/UnitTest/Makefile @@ -1,5 +1,5 @@ -include ${TRICK_HOME}/makefiles/Makefile.common -include ${TRICK_HOME}/makefiles/Makefile.tricklib +include ${TRICK_HOME}/share/trick/makefiles/Makefile.common +include ${TRICK_HOME}/share/trick/makefiles/Makefile.tricklib -include Makefile_deps diff --git a/trick_source/sim_services/UnitTest/Makefile_deps b/trick_source/sim_services/UnitTest/Makefile_deps new file mode 100644 index 00000000..68ed51d7 --- /dev/null +++ b/trick_source/sim_services/UnitTest/Makefile_deps @@ -0,0 +1,5 @@ +object_${TRICK_HOST_CPU}/UnitTest.o: UnitTest.cpp ${TRICK_HOME}/include/trick/UnitTest.hh \ + ${TRICK_HOME}/include/trick/message_proto.h \ + ${TRICK_HOME}/include/trick/message_type.h +object_${TRICK_HOST_CPU}/UnitTest_c_intf.o: UnitTest_c_intf.cpp \ + ${TRICK_HOME}/include/trick/UnitTest.hh diff --git a/trick_source/sim_services/UnitTest/src/UnitTest.cpp b/trick_source/sim_services/UnitTest/UnitTest.cpp similarity index 96% rename from trick_source/sim_services/UnitTest/src/UnitTest.cpp rename to trick_source/sim_services/UnitTest/UnitTest.cpp index 66c2b0af..d64d67db 100644 --- a/trick_source/sim_services/UnitTest/src/UnitTest.cpp +++ b/trick_source/sim_services/UnitTest/UnitTest.cpp @@ -2,9 +2,9 @@ #include <iostream> #include <fstream> -#include "sim_services/UnitTest/include/UnitTest.hh" -#include "sim_services/Message/include/message_proto.h" -#include "sim_services/Message/include/message_type.h" +#include "trick/UnitTest.hh" +#include "trick/message_proto.h" +#include "trick/message_type.h" Trick::UnitTest * the_unit_test_output ; diff --git a/trick_source/sim_services/UnitTest/src/UnitTest_c_intf.cpp b/trick_source/sim_services/UnitTest/UnitTest_c_intf.cpp similarity index 93% rename from trick_source/sim_services/UnitTest/src/UnitTest_c_intf.cpp rename to trick_source/sim_services/UnitTest/UnitTest_c_intf.cpp index 03325973..dffc4cab 100644 --- a/trick_source/sim_services/UnitTest/src/UnitTest_c_intf.cpp +++ b/trick_source/sim_services/UnitTest/UnitTest_c_intf.cpp @@ -2,7 +2,7 @@ #include <iostream> #include <fstream> -#include "sim_services/UnitTest/include/UnitTest.hh" +#include "trick/UnitTest.hh" extern Trick::UnitTest * the_unit_test_output ; diff --git a/trick_source/sim_services/UnitTest/src/makefile b/trick_source/sim_services/UnitTest/src/makefile deleted file mode 100644 index 753bd7f7..00000000 --- a/trick_source/sim_services/UnitTest/src/makefile +++ /dev/null @@ -1,6 +0,0 @@ - -all: - ${MAKE} -C .. - -clean: - ${MAKE} -C .. clean diff --git a/trick_source/sim_services/Units/Makefile b/trick_source/sim_services/Units/Makefile index 3029433b..a181cedf 100644 --- a/trick_source/sim_services/Units/Makefile +++ b/trick_source/sim_services/Units/Makefile @@ -1,5 +1,5 @@ -include ${TRICK_HOME}/makefiles/Makefile.common -include ${TRICK_HOME}/makefiles/Makefile.tricklib +include ${TRICK_HOME}/share/trick/makefiles/Makefile.common +include ${TRICK_HOME}/share/trick/makefiles/Makefile.tricklib -include Makefile_deps diff --git a/trick_source/sim_services/Units/Makefile_deps b/trick_source/sim_services/Units/Makefile_deps index f4be2c1b..1d9501e9 100644 --- a/trick_source/sim_services/Units/Makefile_deps +++ b/trick_source/sim_services/Units/Makefile_deps @@ -1,2 +1 @@ -object_${TRICK_HOST_CPU}/UnitsMap.o: src/UnitsMap.cpp \ - ${TRICK_HOME}/trick_source/sim_services/Units/include/UnitsMap.hh +object_${TRICK_HOST_CPU}/UnitsMap.o: UnitsMap.cpp ${TRICK_HOME}/include/trick/UnitsMap.hh diff --git a/trick_source/sim_services/Units/src/UnitsMap.cpp b/trick_source/sim_services/Units/UnitsMap.cpp similarity index 96% rename from trick_source/sim_services/Units/src/UnitsMap.cpp rename to trick_source/sim_services/Units/UnitsMap.cpp index 2b28924e..ef066d90 100644 --- a/trick_source/sim_services/Units/src/UnitsMap.cpp +++ b/trick_source/sim_services/Units/UnitsMap.cpp @@ -2,7 +2,7 @@ #include <iostream> #include <string.h> #include <stdlib.h> -#include "sim_services/Units/include/UnitsMap.hh" +#include "trick/UnitsMap.hh" // Class static pointer initialization Trick::UnitsMap * Trick::UnitsMap::pInstance = NULL ; diff --git a/trick_source/sim_services/VariableServer/Makefile b/trick_source/sim_services/VariableServer/Makefile index 3029433b..a181cedf 100644 --- a/trick_source/sim_services/VariableServer/Makefile +++ b/trick_source/sim_services/VariableServer/Makefile @@ -1,5 +1,5 @@ -include ${TRICK_HOME}/makefiles/Makefile.common -include ${TRICK_HOME}/makefiles/Makefile.tricklib +include ${TRICK_HOME}/share/trick/makefiles/Makefile.common +include ${TRICK_HOME}/share/trick/makefiles/Makefile.tricklib -include Makefile_deps diff --git a/trick_source/sim_services/VariableServer/Makefile_deps b/trick_source/sim_services/VariableServer/Makefile_deps index 07f60dc2..6946ed3d 100644 --- a/trick_source/sim_services/VariableServer/Makefile_deps +++ b/trick_source/sim_services/VariableServer/Makefile_deps @@ -1,590 +1,609 @@ -object_${TRICK_HOST_CPU}/VariableReference.o: src/VariableReference.cpp \ - ${TRICK_HOME}/trick_source/sim_services/VariableServer/include/VariableServer.hh \ - ${TRICK_HOME}/trick_source/trick_utils/comm/include/tc.h \ - ${TRICK_HOME}/trick_source/trick_utils/comm/include/trick_byteswap.h \ - ${TRICK_HOME}/trick_source/trick_utils/comm/include/trick_error_hndlr.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/reference.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/attributes.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/parameter_types.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/value.h \ - ${TRICK_HOME}/trick_source/trick_utils/trick_adt/include/dllist.h \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/JobData.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/InstrumentBase.hh \ - ${TRICK_HOME}/trick_source/sim_services/VariableServer/include/variable_server_sync_types.h \ - ${TRICK_HOME}/trick_source/sim_services/VariableServer/include/VariableServerThread.hh \ - ${TRICK_HOME}/trick_source/sim_services/VariableServer/include/VariableServerReference.hh \ - ${TRICK_HOME}/trick_source/trick_utils/units/include/UCFn.hh \ - ${TRICK_HOME}/trick_source/sim_services/VariableServer/include/VariableServerListenThread.hh \ - ${TRICK_HOME}/trick_source/sim_services/ThreadBase/include/ThreadBase.hh \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/memorymanager_c_intf.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/var.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/io_alloc.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/wcs_ext.h \ - ${TRICK_HOME}/trick_source/sim_services/Message/include/message_proto.h \ - ${TRICK_HOME}/trick_source/sim_services/Message/include/message_type.h -object_${TRICK_HOST_CPU}/VariableServer.o: src/VariableServer.cpp \ - ${TRICK_HOME}/trick_source/sim_services/VariableServer/include/VariableServer.hh \ - ${TRICK_HOME}/trick_source/trick_utils/comm/include/tc.h \ - ${TRICK_HOME}/trick_source/trick_utils/comm/include/trick_byteswap.h \ - ${TRICK_HOME}/trick_source/trick_utils/comm/include/trick_error_hndlr.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/reference.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/attributes.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/parameter_types.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/value.h \ - ${TRICK_HOME}/trick_source/trick_utils/trick_adt/include/dllist.h \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/JobData.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/InstrumentBase.hh \ - ${TRICK_HOME}/trick_source/sim_services/VariableServer/include/variable_server_sync_types.h \ - ${TRICK_HOME}/trick_source/sim_services/VariableServer/include/VariableServerThread.hh \ - ${TRICK_HOME}/trick_source/sim_services/VariableServer/include/VariableServerReference.hh \ - ${TRICK_HOME}/trick_source/trick_utils/units/include/UCFn.hh \ - ${TRICK_HOME}/trick_source/sim_services/VariableServer/include/VariableServerListenThread.hh \ - ${TRICK_HOME}/trick_source/sim_services/ThreadBase/include/ThreadBase.hh \ - ${TRICK_HOME}/trick_source/trick_utils/comm/include/tc_proto.h \ - ${TRICK_HOME}/trick_source/trick_utils/comm/include/tc.h -object_${TRICK_HOST_CPU}/VariableServerListenThread.o: src/VariableServerListenThread.cpp \ - ${TRICK_HOME}/trick_source/sim_services/VariableServer/include/VariableServerListenThread.hh \ - ${TRICK_HOME}/trick_source/trick_utils/comm/include/tc.h \ - ${TRICK_HOME}/trick_source/trick_utils/comm/include/trick_byteswap.h \ - ${TRICK_HOME}/trick_source/trick_utils/comm/include/trick_error_hndlr.h \ - ${TRICK_HOME}/trick_source/sim_services/ThreadBase/include/ThreadBase.hh \ - ${TRICK_HOME}/trick_source/sim_services/VariableServer/include/VariableServerThread.hh \ - ${TRICK_HOME}/trick_source/sim_services/VariableServer/include/VariableServerReference.hh \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/reference.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/attributes.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/parameter_types.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/value.h \ - ${TRICK_HOME}/trick_source/trick_utils/trick_adt/include/dllist.h \ - ${TRICK_HOME}/trick_source/trick_utils/units/include/UCFn.hh \ - ${TRICK_HOME}/trick_source/sim_services/VariableServer/include/variable_server_sync_types.h \ - ${TRICK_HOME}/trick_source/trick_utils/comm/include/tc_proto.h \ - ${TRICK_HOME}/trick_source/trick_utils/comm/include/tc.h \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/exec_proto.h \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/sim_mode.h \ - ${TRICK_HOME}/trick_source/sim_services/CommandLineArguments/include/command_line_protos.h \ - ${TRICK_HOME}/trick_source/sim_services/Message/include/message_proto.h \ - ${TRICK_HOME}/trick_source/sim_services/Message/include/message_type.h -object_${TRICK_HOST_CPU}/VariableServerThread.o: src/VariableServerThread.cpp \ - ${TRICK_HOME}/trick_source/sim_services/VariableServer/include/VariableServerThread.hh \ - ${TRICK_HOME}/trick_source/trick_utils/comm/include/tc.h \ - ${TRICK_HOME}/trick_source/trick_utils/comm/include/trick_byteswap.h \ - ${TRICK_HOME}/trick_source/trick_utils/comm/include/trick_error_hndlr.h \ - ${TRICK_HOME}/trick_source/sim_services/VariableServer/include/VariableServerReference.hh \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/reference.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/attributes.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/parameter_types.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/value.h \ - ${TRICK_HOME}/trick_source/trick_utils/trick_adt/include/dllist.h \ - ${TRICK_HOME}/trick_source/trick_utils/units/include/UCFn.hh \ - ${TRICK_HOME}/trick_source/sim_services/VariableServer/include/variable_server_sync_types.h \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/exec_proto.h \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/sim_mode.h \ - ${TRICK_HOME}/trick_source/sim_services/include/TrickConstant.hh -object_${TRICK_HOST_CPU}/VariableServerThread_commands.o: src/VariableServerThread_commands.cpp \ - ${TRICK_HOME}/trick_source/sim_services/VariableServer/include/VariableServer.hh \ - ${TRICK_HOME}/trick_source/trick_utils/comm/include/tc.h \ - ${TRICK_HOME}/trick_source/trick_utils/comm/include/trick_byteswap.h \ - ${TRICK_HOME}/trick_source/trick_utils/comm/include/trick_error_hndlr.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/reference.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/attributes.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/parameter_types.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/value.h \ - ${TRICK_HOME}/trick_source/trick_utils/trick_adt/include/dllist.h \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/JobData.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/InstrumentBase.hh \ - ${TRICK_HOME}/trick_source/sim_services/VariableServer/include/variable_server_sync_types.h \ - ${TRICK_HOME}/trick_source/sim_services/VariableServer/include/VariableServerThread.hh \ - ${TRICK_HOME}/trick_source/sim_services/VariableServer/include/VariableServerReference.hh \ - ${TRICK_HOME}/trick_source/trick_utils/units/include/UCFn.hh \ - ${TRICK_HOME}/trick_source/sim_services/VariableServer/include/VariableServerListenThread.hh \ - ${TRICK_HOME}/trick_source/sim_services/ThreadBase/include/ThreadBase.hh \ - ${TRICK_HOME}/trick_source/sim_services/VariableServer/include/variable_server_message_types.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/memorymanager_c_intf.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/var.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/io_alloc.h \ - ${TRICK_HOME}/trick_source/trick_utils/comm/include/tc_proto.h \ - ${TRICK_HOME}/trick_source/trick_utils/comm/include/tc.h \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/exec_proto.h \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/sim_mode.h \ - ${TRICK_HOME}/trick_source/sim_services/CommandLineArguments/include/command_line_protos.h \ - ${TRICK_HOME}/trick_source/trick_utils/units/include/Unit.hh \ - ${TRICK_HOME}/trick_source/trick_utils/units/include/units_conv.h \ - ${TRICK_HOME}/trick_source/trick_utils/units/include/UCFn.hh \ - ${TRICK_HOME}/trick_source/sim_services/Message/include/message_proto.h \ - ${TRICK_HOME}/trick_source/sim_services/Message/include/message_type.h \ - ${TRICK_HOME}/trick_source/sim_services/include/TrickConstant.hh \ - ${TRICK_HOME}/trick_source/sim_services/Sie/include/sie_c_intf.h -object_${TRICK_HOST_CPU}/VariableServerThread_connect.o: src/VariableServerThread_connect.cpp \ - ${TRICK_HOME}/trick_source/sim_services/VariableServer/include/VariableServer.hh \ - ${TRICK_HOME}/trick_source/trick_utils/comm/include/tc.h \ - ${TRICK_HOME}/trick_source/trick_utils/comm/include/trick_byteswap.h \ - ${TRICK_HOME}/trick_source/trick_utils/comm/include/trick_error_hndlr.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/reference.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/attributes.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/parameter_types.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/value.h \ - ${TRICK_HOME}/trick_source/trick_utils/trick_adt/include/dllist.h \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/JobData.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/InstrumentBase.hh \ - ${TRICK_HOME}/trick_source/sim_services/VariableServer/include/variable_server_sync_types.h \ - ${TRICK_HOME}/trick_source/sim_services/VariableServer/include/VariableServerThread.hh \ - ${TRICK_HOME}/trick_source/sim_services/VariableServer/include/VariableServerReference.hh \ - ${TRICK_HOME}/trick_source/trick_utils/units/include/UCFn.hh \ - ${TRICK_HOME}/trick_source/sim_services/VariableServer/include/VariableServerListenThread.hh \ - ${TRICK_HOME}/trick_source/sim_services/ThreadBase/include/ThreadBase.hh \ - ${TRICK_HOME}/trick_source/sim_services/include/release.h -object_${TRICK_HOST_CPU}/VariableServerThread_copy_sim_data.o: \ - src/VariableServerThread_copy_sim_data.cpp \ - ${TRICK_HOME}/trick_source/sim_services/VariableServer/include/VariableServer.hh \ - ${TRICK_HOME}/trick_source/trick_utils/comm/include/tc.h \ - ${TRICK_HOME}/trick_source/trick_utils/comm/include/trick_byteswap.h \ - ${TRICK_HOME}/trick_source/trick_utils/comm/include/trick_error_hndlr.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/reference.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/attributes.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/parameter_types.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/value.h \ - ${TRICK_HOME}/trick_source/trick_utils/trick_adt/include/dllist.h \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/JobData.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/InstrumentBase.hh \ - ${TRICK_HOME}/trick_source/sim_services/VariableServer/include/variable_server_sync_types.h \ - ${TRICK_HOME}/trick_source/sim_services/VariableServer/include/VariableServerThread.hh \ - ${TRICK_HOME}/trick_source/sim_services/VariableServer/include/VariableServerReference.hh \ - ${TRICK_HOME}/trick_source/trick_utils/units/include/UCFn.hh \ - ${TRICK_HOME}/trick_source/sim_services/VariableServer/include/VariableServerListenThread.hh \ - ${TRICK_HOME}/trick_source/sim_services/ThreadBase/include/ThreadBase.hh \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/memorymanager_c_intf.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/var.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/io_alloc.h -object_${TRICK_HOST_CPU}/VariableServerThread_exit_var_thread.o: \ - src/VariableServerThread_exit_var_thread.cpp \ - ${TRICK_HOME}/trick_source/sim_services/VariableServer/include/VariableServer.hh \ - ${TRICK_HOME}/trick_source/trick_utils/comm/include/tc.h \ - ${TRICK_HOME}/trick_source/trick_utils/comm/include/trick_byteswap.h \ - ${TRICK_HOME}/trick_source/trick_utils/comm/include/trick_error_hndlr.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/reference.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/attributes.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/parameter_types.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/value.h \ - ${TRICK_HOME}/trick_source/trick_utils/trick_adt/include/dllist.h \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/JobData.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/InstrumentBase.hh \ - ${TRICK_HOME}/trick_source/sim_services/VariableServer/include/variable_server_sync_types.h \ - ${TRICK_HOME}/trick_source/sim_services/VariableServer/include/VariableServerThread.hh \ - ${TRICK_HOME}/trick_source/sim_services/VariableServer/include/VariableServerReference.hh \ - ${TRICK_HOME}/trick_source/trick_utils/units/include/UCFn.hh \ - ${TRICK_HOME}/trick_source/sim_services/VariableServer/include/VariableServerListenThread.hh \ - ${TRICK_HOME}/trick_source/sim_services/ThreadBase/include/ThreadBase.hh \ - ${TRICK_HOME}/trick_source/trick_utils/comm/include/tc_proto.h \ - ${TRICK_HOME}/trick_source/trick_utils/comm/include/tc.h -object_${TRICK_HOST_CPU}/VariableServerThread_loop.o: src/VariableServerThread_loop.cpp \ - ${TRICK_HOME}/trick_source/sim_services/VariableServer/include/VariableServer.hh \ - ${TRICK_HOME}/trick_source/trick_utils/comm/include/tc.h \ - ${TRICK_HOME}/trick_source/trick_utils/comm/include/trick_byteswap.h \ - ${TRICK_HOME}/trick_source/trick_utils/comm/include/trick_error_hndlr.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/reference.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/attributes.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/parameter_types.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/value.h \ - ${TRICK_HOME}/trick_source/trick_utils/trick_adt/include/dllist.h \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/JobData.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/InstrumentBase.hh \ - ${TRICK_HOME}/trick_source/sim_services/VariableServer/include/variable_server_sync_types.h \ - ${TRICK_HOME}/trick_source/sim_services/VariableServer/include/VariableServerThread.hh \ - ${TRICK_HOME}/trick_source/sim_services/VariableServer/include/VariableServerReference.hh \ - ${TRICK_HOME}/trick_source/trick_utils/units/include/UCFn.hh \ - ${TRICK_HOME}/trick_source/sim_services/VariableServer/include/VariableServerListenThread.hh \ - ${TRICK_HOME}/trick_source/sim_services/ThreadBase/include/ThreadBase.hh \ - ${TRICK_HOME}/trick_source/sim_services/InputProcessor/include/input_processor_proto.h \ - ${TRICK_HOME}/trick_source/sim_services/InputProcessor/include/IPPythonEvent.hh \ - ${TRICK_HOME}/trick_source/sim_services/EventManager/include/Event.hh \ - ${TRICK_HOME}/trick_source/sim_services/include/mm_macros.hh \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/memorymanager_c_intf.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/var.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/io_alloc.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/MemoryManager.hh \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/mm_error.h \ - ${TRICK_HOME}/trick_source/sim_services/CheckPointAgent/include/CheckPointAgent.hh \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/exec_proto.h \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/sim_mode.h \ - ${TRICK_HOME}/trick_source/trick_utils/comm/include/tc_proto.h \ - ${TRICK_HOME}/trick_source/trick_utils/comm/include/tc.h \ - ${TRICK_HOME}/trick_source/sim_services/Message/include/message_proto.h \ - ${TRICK_HOME}/trick_source/sim_services/Message/include/message_type.h \ - ${TRICK_HOME}/trick_source/sim_services/RealtimeSync/include/realtimesync_proto.h \ - ${TRICK_HOME}/trick_source/sim_services/Clock/include/Clock.hh \ - ${TRICK_HOME}/trick_source/sim_services/Timer/include/Timer.hh \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/Exec_exception.hh -object_${TRICK_HOST_CPU}/VariableServerThread_write_data.o: \ - src/VariableServerThread_write_data.cpp \ - ${TRICK_HOME}/trick_source/sim_services/VariableServer/include/VariableServer.hh \ - ${TRICK_HOME}/trick_source/trick_utils/comm/include/tc.h \ - ${TRICK_HOME}/trick_source/trick_utils/comm/include/trick_byteswap.h \ - ${TRICK_HOME}/trick_source/trick_utils/comm/include/trick_error_hndlr.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/reference.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/attributes.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/parameter_types.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/value.h \ - ${TRICK_HOME}/trick_source/trick_utils/trick_adt/include/dllist.h \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/JobData.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/InstrumentBase.hh \ - ${TRICK_HOME}/trick_source/sim_services/VariableServer/include/variable_server_sync_types.h \ - ${TRICK_HOME}/trick_source/sim_services/VariableServer/include/VariableServerThread.hh \ - ${TRICK_HOME}/trick_source/sim_services/VariableServer/include/VariableServerReference.hh \ - ${TRICK_HOME}/trick_source/trick_utils/units/include/UCFn.hh \ - ${TRICK_HOME}/trick_source/sim_services/VariableServer/include/VariableServerListenThread.hh \ - ${TRICK_HOME}/trick_source/sim_services/ThreadBase/include/ThreadBase.hh \ - ${TRICK_HOME}/trick_source/sim_services/VariableServer/include/variable_server_message_types.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/bitfield_proto.h \ - ${TRICK_HOME}/trick_source/trick_utils/comm/include/trick_byteswap.h \ - ${TRICK_HOME}/trick_source/trick_utils/comm/include/tc_proto.h \ - ${TRICK_HOME}/trick_source/trick_utils/comm/include/tc.h \ - ${TRICK_HOME}/trick_source/sim_services/Message/include/message_proto.h \ - ${TRICK_HOME}/trick_source/sim_services/Message/include/message_type.h -object_${TRICK_HOST_CPU}/VariableServerThread_write_stdio.o: \ - src/VariableServerThread_write_stdio.cpp \ - ${TRICK_HOME}/trick_source/sim_services/VariableServer/include/VariableServer.hh \ - ${TRICK_HOME}/trick_source/trick_utils/comm/include/tc.h \ - ${TRICK_HOME}/trick_source/trick_utils/comm/include/trick_byteswap.h \ - ${TRICK_HOME}/trick_source/trick_utils/comm/include/trick_error_hndlr.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/reference.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/attributes.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/parameter_types.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/value.h \ - ${TRICK_HOME}/trick_source/trick_utils/trick_adt/include/dllist.h \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/JobData.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/InstrumentBase.hh \ - ${TRICK_HOME}/trick_source/sim_services/VariableServer/include/variable_server_sync_types.h \ - ${TRICK_HOME}/trick_source/sim_services/VariableServer/include/VariableServerThread.hh \ - ${TRICK_HOME}/trick_source/sim_services/VariableServer/include/VariableServerReference.hh \ - ${TRICK_HOME}/trick_source/trick_utils/units/include/UCFn.hh \ - ${TRICK_HOME}/trick_source/sim_services/VariableServer/include/VariableServerListenThread.hh \ - ${TRICK_HOME}/trick_source/sim_services/ThreadBase/include/ThreadBase.hh \ - ${TRICK_HOME}/trick_source/sim_services/VariableServer/include/variable_server_message_types.h \ - ${TRICK_HOME}/trick_source/trick_utils/comm/include/tc_proto.h \ - ${TRICK_HOME}/trick_source/trick_utils/comm/include/tc.h -object_${TRICK_HOST_CPU}/VariableServer_copy_data_freeze.o: \ - src/VariableServer_copy_data_freeze.cpp \ - ${TRICK_HOME}/trick_source/sim_services/VariableServer/include/VariableServer.hh \ - ${TRICK_HOME}/trick_source/trick_utils/comm/include/tc.h \ - ${TRICK_HOME}/trick_source/trick_utils/comm/include/trick_byteswap.h \ - ${TRICK_HOME}/trick_source/trick_utils/comm/include/trick_error_hndlr.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/reference.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/attributes.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/parameter_types.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/value.h \ - ${TRICK_HOME}/trick_source/trick_utils/trick_adt/include/dllist.h \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/JobData.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/InstrumentBase.hh \ - ${TRICK_HOME}/trick_source/sim_services/VariableServer/include/variable_server_sync_types.h \ - ${TRICK_HOME}/trick_source/sim_services/VariableServer/include/VariableServerThread.hh \ - ${TRICK_HOME}/trick_source/sim_services/VariableServer/include/VariableServerReference.hh \ - ${TRICK_HOME}/trick_source/trick_utils/units/include/UCFn.hh \ - ${TRICK_HOME}/trick_source/sim_services/VariableServer/include/VariableServerListenThread.hh \ - ${TRICK_HOME}/trick_source/sim_services/ThreadBase/include/ThreadBase.hh \ - ${TRICK_HOME}/trick_source/sim_services/VariableServer/include/variable_server_proto.h \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/exec_proto.h \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/sim_mode.h \ - ${TRICK_HOME}/trick_source/sim_services/RealtimeSync/include/realtimesync_proto.h \ - ${TRICK_HOME}/trick_source/sim_services/Clock/include/Clock.hh \ - ${TRICK_HOME}/trick_source/sim_services/Timer/include/Timer.hh -object_${TRICK_HOST_CPU}/VariableServer_copy_data_freeze_scheduled.o: \ - src/VariableServer_copy_data_freeze_scheduled.cpp \ - ${TRICK_HOME}/trick_source/sim_services/VariableServer/include/VariableServer.hh \ - ${TRICK_HOME}/trick_source/trick_utils/comm/include/tc.h \ - ${TRICK_HOME}/trick_source/trick_utils/comm/include/trick_byteswap.h \ - ${TRICK_HOME}/trick_source/trick_utils/comm/include/trick_error_hndlr.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/reference.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/attributes.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/parameter_types.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/value.h \ - ${TRICK_HOME}/trick_source/trick_utils/trick_adt/include/dllist.h \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/JobData.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/InstrumentBase.hh \ - ${TRICK_HOME}/trick_source/sim_services/VariableServer/include/variable_server_sync_types.h \ - ${TRICK_HOME}/trick_source/sim_services/VariableServer/include/VariableServerThread.hh \ - ${TRICK_HOME}/trick_source/sim_services/VariableServer/include/VariableServerReference.hh \ - ${TRICK_HOME}/trick_source/trick_utils/units/include/UCFn.hh \ - ${TRICK_HOME}/trick_source/sim_services/VariableServer/include/VariableServerListenThread.hh \ - ${TRICK_HOME}/trick_source/sim_services/ThreadBase/include/ThreadBase.hh \ - ${TRICK_HOME}/trick_source/sim_services/VariableServer/include/variable_server_proto.h \ - ${TRICK_HOME}/trick_source/sim_services/include/TrickConstant.hh \ - ${TRICK_HOME}/trick_source/sim_services/RealtimeSync/include/realtimesync_proto.h \ - ${TRICK_HOME}/trick_source/sim_services/Clock/include/Clock.hh \ - ${TRICK_HOME}/trick_source/sim_services/Timer/include/Timer.hh +object_${TRICK_HOST_CPU}/VariableServerThread_loop.o: VariableServerThread_loop.cpp \ + ${TRICK_HOME}/include/trick/VariableServer.hh \ + ${TRICK_HOME}/include/trick/tc.h \ + ${TRICK_HOME}/include/trick/trick_byteswap.h \ + ${TRICK_HOME}/include/trick/trick_error_hndlr.h \ + ${TRICK_HOME}/include/trick/reference.h \ + ${TRICK_HOME}/include/trick/attributes.h \ + ${TRICK_HOME}/include/trick/parameter_types.h \ + ${TRICK_HOME}/include/trick/value.h \ + ${TRICK_HOME}/include/trick/dllist.h \ + ${TRICK_HOME}/include/trick/JobData.hh \ + ${TRICK_HOME}/include/trick/InstrumentBase.hh \ + ${TRICK_HOME}/include/trick/variable_server_sync_types.h \ + ${TRICK_HOME}/include/trick/VariableServerThread.hh \ + ${TRICK_HOME}/include/trick/ThreadBase.hh \ + ${TRICK_HOME}/include/trick/VariableServerReference.hh \ + ${TRICK_HOME}/include/trick/UCFn.hh \ + ${TRICK_HOME}/include/trick/VariableServerListenThread.hh \ + ${TRICK_HOME}/include/trick/input_processor_proto.h \ + ${TRICK_HOME}/include/trick/tc_proto.h \ + ${TRICK_HOME}/include/trick/tc.h \ + ${TRICK_HOME}/include/trick/message_proto.h \ + ${TRICK_HOME}/include/trick/message_type.h \ + ${TRICK_HOME}/include/trick/realtimesync_proto.h \ + ${TRICK_HOME}/include/trick/Clock.hh \ + ${TRICK_HOME}/include/trick/Timer.hh \ + ${TRICK_HOME}/include/trick/Exec_exception.hh \ + ${TRICK_HOME}/include/trick/exec_proto.h \ + ${TRICK_HOME}/include/trick/sim_mode.h object_${TRICK_HOST_CPU}/VariableServer_copy_data_scheduled.o: \ - src/VariableServer_copy_data_scheduled.cpp \ - ${TRICK_HOME}/trick_source/sim_services/VariableServer/include/VariableServer.hh \ - ${TRICK_HOME}/trick_source/trick_utils/comm/include/tc.h \ - ${TRICK_HOME}/trick_source/trick_utils/comm/include/trick_byteswap.h \ - ${TRICK_HOME}/trick_source/trick_utils/comm/include/trick_error_hndlr.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/reference.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/attributes.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/parameter_types.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/value.h \ - ${TRICK_HOME}/trick_source/trick_utils/trick_adt/include/dllist.h \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/JobData.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/InstrumentBase.hh \ - ${TRICK_HOME}/trick_source/sim_services/VariableServer/include/variable_server_sync_types.h \ - ${TRICK_HOME}/trick_source/sim_services/VariableServer/include/VariableServerThread.hh \ - ${TRICK_HOME}/trick_source/sim_services/VariableServer/include/VariableServerReference.hh \ - ${TRICK_HOME}/trick_source/trick_utils/units/include/UCFn.hh \ - ${TRICK_HOME}/trick_source/sim_services/VariableServer/include/VariableServerListenThread.hh \ - ${TRICK_HOME}/trick_source/sim_services/ThreadBase/include/ThreadBase.hh \ - ${TRICK_HOME}/trick_source/sim_services/VariableServer/include/variable_server_proto.h \ - ${TRICK_HOME}/trick_source/sim_services/include/TrickConstant.hh \ - ${TRICK_HOME}/trick_source/sim_services/RealtimeSync/include/realtimesync_proto.h \ - ${TRICK_HOME}/trick_source/sim_services/Clock/include/Clock.hh \ - ${TRICK_HOME}/trick_source/sim_services/Timer/include/Timer.hh -object_${TRICK_HOST_CPU}/VariableServer_copy_data_top.o: src/VariableServer_copy_data_top.cpp \ - ${TRICK_HOME}/trick_source/sim_services/VariableServer/include/VariableServer.hh \ - ${TRICK_HOME}/trick_source/trick_utils/comm/include/tc.h \ - ${TRICK_HOME}/trick_source/trick_utils/comm/include/trick_byteswap.h \ - ${TRICK_HOME}/trick_source/trick_utils/comm/include/trick_error_hndlr.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/reference.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/attributes.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/parameter_types.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/value.h \ - ${TRICK_HOME}/trick_source/trick_utils/trick_adt/include/dllist.h \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/JobData.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/InstrumentBase.hh \ - ${TRICK_HOME}/trick_source/sim_services/VariableServer/include/variable_server_sync_types.h \ - ${TRICK_HOME}/trick_source/sim_services/VariableServer/include/VariableServerThread.hh \ - ${TRICK_HOME}/trick_source/sim_services/VariableServer/include/VariableServerReference.hh \ - ${TRICK_HOME}/trick_source/trick_utils/units/include/UCFn.hh \ - ${TRICK_HOME}/trick_source/sim_services/VariableServer/include/VariableServerListenThread.hh \ - ${TRICK_HOME}/trick_source/sim_services/ThreadBase/include/ThreadBase.hh \ - ${TRICK_HOME}/trick_source/sim_services/VariableServer/include/variable_server_proto.h \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/exec_proto.h \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/sim_mode.h \ - ${TRICK_HOME}/trick_source/sim_services/include/TrickConstant.hh \ - ${TRICK_HOME}/trick_source/sim_services/RealtimeSync/include/realtimesync_proto.h \ - ${TRICK_HOME}/trick_source/sim_services/Clock/include/Clock.hh \ - ${TRICK_HOME}/trick_source/sim_services/Timer/include/Timer.hh -object_${TRICK_HOST_CPU}/VariableServer_default_data.o: src/VariableServer_default_data.cpp \ - ${TRICK_HOME}/trick_source/sim_services/VariableServer/include/VariableServer.hh \ - ${TRICK_HOME}/trick_source/trick_utils/comm/include/tc.h \ - ${TRICK_HOME}/trick_source/trick_utils/comm/include/trick_byteswap.h \ - ${TRICK_HOME}/trick_source/trick_utils/comm/include/trick_error_hndlr.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/reference.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/attributes.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/parameter_types.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/value.h \ - ${TRICK_HOME}/trick_source/trick_utils/trick_adt/include/dllist.h \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/JobData.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/InstrumentBase.hh \ - ${TRICK_HOME}/trick_source/sim_services/VariableServer/include/variable_server_sync_types.h \ - ${TRICK_HOME}/trick_source/sim_services/VariableServer/include/VariableServerThread.hh \ - ${TRICK_HOME}/trick_source/sim_services/VariableServer/include/VariableServerReference.hh \ - ${TRICK_HOME}/trick_source/trick_utils/units/include/UCFn.hh \ - ${TRICK_HOME}/trick_source/sim_services/VariableServer/include/VariableServerListenThread.hh \ - ${TRICK_HOME}/trick_source/sim_services/ThreadBase/include/ThreadBase.hh -object_${TRICK_HOST_CPU}/VariableServer_freeze_init.o: src/VariableServer_freeze_init.cpp \ - ${TRICK_HOME}/trick_source/sim_services/VariableServer/include/VariableServer.hh \ - ${TRICK_HOME}/trick_source/trick_utils/comm/include/tc.h \ - ${TRICK_HOME}/trick_source/trick_utils/comm/include/trick_byteswap.h \ - ${TRICK_HOME}/trick_source/trick_utils/comm/include/trick_error_hndlr.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/reference.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/attributes.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/parameter_types.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/value.h \ - ${TRICK_HOME}/trick_source/trick_utils/trick_adt/include/dllist.h \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/JobData.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/InstrumentBase.hh \ - ${TRICK_HOME}/trick_source/sim_services/VariableServer/include/variable_server_sync_types.h \ - ${TRICK_HOME}/trick_source/sim_services/VariableServer/include/VariableServerThread.hh \ - ${TRICK_HOME}/trick_source/sim_services/VariableServer/include/VariableServerReference.hh \ - ${TRICK_HOME}/trick_source/trick_utils/units/include/UCFn.hh \ - ${TRICK_HOME}/trick_source/sim_services/VariableServer/include/VariableServerListenThread.hh \ - ${TRICK_HOME}/trick_source/sim_services/ThreadBase/include/ThreadBase.hh \ - ${TRICK_HOME}/trick_source/sim_services/VariableServer/include/variable_server_proto.h \ - ${TRICK_HOME}/trick_source/sim_services/include/TrickConstant.hh + VariableServer_copy_data_scheduled.cpp \ + ${TRICK_HOME}/include/trick/VariableServer.hh \ + ${TRICK_HOME}/include/trick/tc.h \ + ${TRICK_HOME}/include/trick/trick_byteswap.h \ + ${TRICK_HOME}/include/trick/trick_error_hndlr.h \ + ${TRICK_HOME}/include/trick/reference.h \ + ${TRICK_HOME}/include/trick/attributes.h \ + ${TRICK_HOME}/include/trick/parameter_types.h \ + ${TRICK_HOME}/include/trick/value.h \ + ${TRICK_HOME}/include/trick/dllist.h \ + ${TRICK_HOME}/include/trick/JobData.hh \ + ${TRICK_HOME}/include/trick/InstrumentBase.hh \ + ${TRICK_HOME}/include/trick/variable_server_sync_types.h \ + ${TRICK_HOME}/include/trick/VariableServerThread.hh \ + ${TRICK_HOME}/include/trick/ThreadBase.hh \ + ${TRICK_HOME}/include/trick/VariableServerReference.hh \ + ${TRICK_HOME}/include/trick/UCFn.hh \ + ${TRICK_HOME}/include/trick/VariableServerListenThread.hh \ + ${TRICK_HOME}/include/trick/TrickConstant.hh +object_${TRICK_HOST_CPU}/VariableServer_shutdown.o: VariableServer_shutdown.cpp \ + ${TRICK_HOME}/include/trick/VariableServer.hh \ + ${TRICK_HOME}/include/trick/tc.h \ + ${TRICK_HOME}/include/trick/trick_byteswap.h \ + ${TRICK_HOME}/include/trick/trick_error_hndlr.h \ + ${TRICK_HOME}/include/trick/reference.h \ + ${TRICK_HOME}/include/trick/attributes.h \ + ${TRICK_HOME}/include/trick/parameter_types.h \ + ${TRICK_HOME}/include/trick/value.h \ + ${TRICK_HOME}/include/trick/dllist.h \ + ${TRICK_HOME}/include/trick/JobData.hh \ + ${TRICK_HOME}/include/trick/InstrumentBase.hh \ + ${TRICK_HOME}/include/trick/variable_server_sync_types.h \ + ${TRICK_HOME}/include/trick/VariableServerThread.hh \ + ${TRICK_HOME}/include/trick/ThreadBase.hh \ + ${TRICK_HOME}/include/trick/VariableServerReference.hh \ + ${TRICK_HOME}/include/trick/UCFn.hh \ + ${TRICK_HOME}/include/trick/VariableServerListenThread.hh +object_${TRICK_HOST_CPU}/VariableServer_copy_data_freeze_scheduled.o: \ + VariableServer_copy_data_freeze_scheduled.cpp \ + ${TRICK_HOME}/include/trick/VariableServer.hh \ + ${TRICK_HOME}/include/trick/tc.h \ + ${TRICK_HOME}/include/trick/trick_byteswap.h \ + ${TRICK_HOME}/include/trick/trick_error_hndlr.h \ + ${TRICK_HOME}/include/trick/reference.h \ + ${TRICK_HOME}/include/trick/attributes.h \ + ${TRICK_HOME}/include/trick/parameter_types.h \ + ${TRICK_HOME}/include/trick/value.h \ + ${TRICK_HOME}/include/trick/dllist.h \ + ${TRICK_HOME}/include/trick/JobData.hh \ + ${TRICK_HOME}/include/trick/InstrumentBase.hh \ + ${TRICK_HOME}/include/trick/variable_server_sync_types.h \ + ${TRICK_HOME}/include/trick/VariableServerThread.hh \ + ${TRICK_HOME}/include/trick/ThreadBase.hh \ + ${TRICK_HOME}/include/trick/VariableServerReference.hh \ + ${TRICK_HOME}/include/trick/UCFn.hh \ + ${TRICK_HOME}/include/trick/VariableServerListenThread.hh \ + ${TRICK_HOME}/include/trick/TrickConstant.hh +object_${TRICK_HOST_CPU}/VariableReference.o: VariableReference.cpp \ + ${TRICK_HOME}/include/trick/VariableServer.hh \ + ${TRICK_HOME}/include/trick/tc.h \ + ${TRICK_HOME}/include/trick/trick_byteswap.h \ + ${TRICK_HOME}/include/trick/trick_error_hndlr.h \ + ${TRICK_HOME}/include/trick/reference.h \ + ${TRICK_HOME}/include/trick/attributes.h \ + ${TRICK_HOME}/include/trick/parameter_types.h \ + ${TRICK_HOME}/include/trick/value.h \ + ${TRICK_HOME}/include/trick/dllist.h \ + ${TRICK_HOME}/include/trick/JobData.hh \ + ${TRICK_HOME}/include/trick/InstrumentBase.hh \ + ${TRICK_HOME}/include/trick/variable_server_sync_types.h \ + ${TRICK_HOME}/include/trick/VariableServerThread.hh \ + ${TRICK_HOME}/include/trick/ThreadBase.hh \ + ${TRICK_HOME}/include/trick/VariableServerReference.hh \ + ${TRICK_HOME}/include/trick/UCFn.hh \ + ${TRICK_HOME}/include/trick/VariableServerListenThread.hh \ + ${TRICK_HOME}/include/trick/memorymanager_c_intf.h \ + ${TRICK_HOME}/include/trick/var.h \ + ${TRICK_HOME}/include/trick/io_alloc.h \ + ${TRICK_HOME}/include/trick/wcs_ext.h \ + ${TRICK_HOME}/include/trick/message_proto.h \ + ${TRICK_HOME}/include/trick/message_type.h object_${TRICK_HOST_CPU}/VariableServer_get_next_freeze_call_time.o: \ - src/VariableServer_get_next_freeze_call_time.cpp \ - ${TRICK_HOME}/trick_source/sim_services/VariableServer/include/VariableServer.hh \ - ${TRICK_HOME}/trick_source/trick_utils/comm/include/tc.h \ - ${TRICK_HOME}/trick_source/trick_utils/comm/include/trick_byteswap.h \ - ${TRICK_HOME}/trick_source/trick_utils/comm/include/trick_error_hndlr.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/reference.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/attributes.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/parameter_types.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/value.h \ - ${TRICK_HOME}/trick_source/trick_utils/trick_adt/include/dllist.h \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/JobData.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/InstrumentBase.hh \ - ${TRICK_HOME}/trick_source/sim_services/VariableServer/include/variable_server_sync_types.h \ - ${TRICK_HOME}/trick_source/sim_services/VariableServer/include/VariableServerThread.hh \ - ${TRICK_HOME}/trick_source/sim_services/VariableServer/include/VariableServerReference.hh \ - ${TRICK_HOME}/trick_source/trick_utils/units/include/UCFn.hh \ - ${TRICK_HOME}/trick_source/sim_services/VariableServer/include/VariableServerListenThread.hh \ - ${TRICK_HOME}/trick_source/sim_services/ThreadBase/include/ThreadBase.hh \ - ${TRICK_HOME}/trick_source/sim_services/include/TrickConstant.hh + VariableServer_get_next_freeze_call_time.cpp \ + ${TRICK_HOME}/include/trick/VariableServer.hh \ + ${TRICK_HOME}/include/trick/tc.h \ + ${TRICK_HOME}/include/trick/trick_byteswap.h \ + ${TRICK_HOME}/include/trick/trick_error_hndlr.h \ + ${TRICK_HOME}/include/trick/reference.h \ + ${TRICK_HOME}/include/trick/attributes.h \ + ${TRICK_HOME}/include/trick/parameter_types.h \ + ${TRICK_HOME}/include/trick/value.h \ + ${TRICK_HOME}/include/trick/dllist.h \ + ${TRICK_HOME}/include/trick/JobData.hh \ + ${TRICK_HOME}/include/trick/InstrumentBase.hh \ + ${TRICK_HOME}/include/trick/variable_server_sync_types.h \ + ${TRICK_HOME}/include/trick/VariableServerThread.hh \ + ${TRICK_HOME}/include/trick/ThreadBase.hh \ + ${TRICK_HOME}/include/trick/VariableServerReference.hh \ + ${TRICK_HOME}/include/trick/UCFn.hh \ + ${TRICK_HOME}/include/trick/VariableServerListenThread.hh \ + ${TRICK_HOME}/include/trick/TrickConstant.hh +object_${TRICK_HOST_CPU}/VariableServerThread_write_stdio.o: VariableServerThread_write_stdio.cpp \ + ${TRICK_HOME}/include/trick/VariableServer.hh \ + ${TRICK_HOME}/include/trick/tc.h \ + ${TRICK_HOME}/include/trick/trick_byteswap.h \ + ${TRICK_HOME}/include/trick/trick_error_hndlr.h \ + ${TRICK_HOME}/include/trick/reference.h \ + ${TRICK_HOME}/include/trick/attributes.h \ + ${TRICK_HOME}/include/trick/parameter_types.h \ + ${TRICK_HOME}/include/trick/value.h \ + ${TRICK_HOME}/include/trick/dllist.h \ + ${TRICK_HOME}/include/trick/JobData.hh \ + ${TRICK_HOME}/include/trick/InstrumentBase.hh \ + ${TRICK_HOME}/include/trick/variable_server_sync_types.h \ + ${TRICK_HOME}/include/trick/VariableServerThread.hh \ + ${TRICK_HOME}/include/trick/ThreadBase.hh \ + ${TRICK_HOME}/include/trick/VariableServerReference.hh \ + ${TRICK_HOME}/include/trick/UCFn.hh \ + ${TRICK_HOME}/include/trick/VariableServerListenThread.hh \ + ${TRICK_HOME}/include/trick/variable_server_message_types.h \ + ${TRICK_HOME}/include/trick/tc_proto.h \ + ${TRICK_HOME}/include/trick/tc.h +object_${TRICK_HOST_CPU}/VariableServerThread_commands.o: VariableServerThread_commands.cpp \ + ${TRICK_HOME}/include/trick/VariableServer.hh \ + ${TRICK_HOME}/include/trick/tc.h \ + ${TRICK_HOME}/include/trick/trick_byteswap.h \ + ${TRICK_HOME}/include/trick/trick_error_hndlr.h \ + ${TRICK_HOME}/include/trick/reference.h \ + ${TRICK_HOME}/include/trick/attributes.h \ + ${TRICK_HOME}/include/trick/parameter_types.h \ + ${TRICK_HOME}/include/trick/value.h \ + ${TRICK_HOME}/include/trick/dllist.h \ + ${TRICK_HOME}/include/trick/JobData.hh \ + ${TRICK_HOME}/include/trick/InstrumentBase.hh \ + ${TRICK_HOME}/include/trick/variable_server_sync_types.h \ + ${TRICK_HOME}/include/trick/VariableServerThread.hh \ + ${TRICK_HOME}/include/trick/ThreadBase.hh \ + ${TRICK_HOME}/include/trick/VariableServerReference.hh \ + ${TRICK_HOME}/include/trick/UCFn.hh \ + ${TRICK_HOME}/include/trick/VariableServerListenThread.hh \ + ${TRICK_HOME}/include/trick/variable_server_message_types.h \ + ${TRICK_HOME}/include/trick/memorymanager_c_intf.h \ + ${TRICK_HOME}/include/trick/var.h \ + ${TRICK_HOME}/include/trick/io_alloc.h \ + ${TRICK_HOME}/include/trick/tc_proto.h \ + ${TRICK_HOME}/include/trick/tc.h \ + ${TRICK_HOME}/include/trick/exec_proto.h \ + ${TRICK_HOME}/include/trick/sim_mode.h \ + ${TRICK_HOME}/include/trick/command_line_protos.h \ + ${TRICK_HOME}/include/trick/Unit.hh \ + ${TRICK_HOME}/include/trick/units_conv.h \ + ${TRICK_HOME}/include/trick/message_proto.h \ + ${TRICK_HOME}/include/trick/message_type.h \ + ${TRICK_HOME}/include/trick/TrickConstant.hh \ + ${TRICK_HOME}/include/trick/sie_c_intf.h object_${TRICK_HOST_CPU}/VariableServer_get_next_sync_call_time.o: \ - src/VariableServer_get_next_sync_call_time.cpp \ - ${TRICK_HOME}/trick_source/sim_services/VariableServer/include/VariableServer.hh \ - ${TRICK_HOME}/trick_source/trick_utils/comm/include/tc.h \ - ${TRICK_HOME}/trick_source/trick_utils/comm/include/trick_byteswap.h \ - ${TRICK_HOME}/trick_source/trick_utils/comm/include/trick_error_hndlr.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/reference.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/attributes.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/parameter_types.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/value.h \ - ${TRICK_HOME}/trick_source/trick_utils/trick_adt/include/dllist.h \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/JobData.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/InstrumentBase.hh \ - ${TRICK_HOME}/trick_source/sim_services/VariableServer/include/variable_server_sync_types.h \ - ${TRICK_HOME}/trick_source/sim_services/VariableServer/include/VariableServerThread.hh \ - ${TRICK_HOME}/trick_source/sim_services/VariableServer/include/VariableServerReference.hh \ - ${TRICK_HOME}/trick_source/trick_utils/units/include/UCFn.hh \ - ${TRICK_HOME}/trick_source/sim_services/VariableServer/include/VariableServerListenThread.hh \ - ${TRICK_HOME}/trick_source/sim_services/ThreadBase/include/ThreadBase.hh \ - ${TRICK_HOME}/trick_source/sim_services/include/TrickConstant.hh + VariableServer_get_next_sync_call_time.cpp \ + ${TRICK_HOME}/include/trick/VariableServer.hh \ + ${TRICK_HOME}/include/trick/tc.h \ + ${TRICK_HOME}/include/trick/trick_byteswap.h \ + ${TRICK_HOME}/include/trick/trick_error_hndlr.h \ + ${TRICK_HOME}/include/trick/reference.h \ + ${TRICK_HOME}/include/trick/attributes.h \ + ${TRICK_HOME}/include/trick/parameter_types.h \ + ${TRICK_HOME}/include/trick/value.h \ + ${TRICK_HOME}/include/trick/dllist.h \ + ${TRICK_HOME}/include/trick/JobData.hh \ + ${TRICK_HOME}/include/trick/InstrumentBase.hh \ + ${TRICK_HOME}/include/trick/variable_server_sync_types.h \ + ${TRICK_HOME}/include/trick/VariableServerThread.hh \ + ${TRICK_HOME}/include/trick/ThreadBase.hh \ + ${TRICK_HOME}/include/trick/VariableServerReference.hh \ + ${TRICK_HOME}/include/trick/UCFn.hh \ + ${TRICK_HOME}/include/trick/VariableServerListenThread.hh \ + ${TRICK_HOME}/include/trick/TrickConstant.hh +object_${TRICK_HOST_CPU}/VariableServer_restart.o: VariableServer_restart.cpp \ + ${TRICK_HOME}/include/trick/VariableServer.hh \ + ${TRICK_HOME}/include/trick/tc.h \ + ${TRICK_HOME}/include/trick/trick_byteswap.h \ + ${TRICK_HOME}/include/trick/trick_error_hndlr.h \ + ${TRICK_HOME}/include/trick/reference.h \ + ${TRICK_HOME}/include/trick/attributes.h \ + ${TRICK_HOME}/include/trick/parameter_types.h \ + ${TRICK_HOME}/include/trick/value.h \ + ${TRICK_HOME}/include/trick/dllist.h \ + ${TRICK_HOME}/include/trick/JobData.hh \ + ${TRICK_HOME}/include/trick/InstrumentBase.hh \ + ${TRICK_HOME}/include/trick/variable_server_sync_types.h \ + ${TRICK_HOME}/include/trick/VariableServerThread.hh \ + ${TRICK_HOME}/include/trick/ThreadBase.hh \ + ${TRICK_HOME}/include/trick/VariableServerReference.hh \ + ${TRICK_HOME}/include/trick/UCFn.hh \ + ${TRICK_HOME}/include/trick/VariableServerListenThread.hh \ + ${TRICK_HOME}/include/trick/message_proto.h \ + ${TRICK_HOME}/include/trick/message_type.h \ + ${TRICK_HOME}/include/trick/tc_proto.h \ + ${TRICK_HOME}/include/trick/tc.h +object_${TRICK_HOST_CPU}/var_server_ext.o: var_server_ext.cpp \ + ${TRICK_HOME}/include/trick/VariableServer.hh \ + ${TRICK_HOME}/include/trick/tc.h \ + ${TRICK_HOME}/include/trick/trick_byteswap.h \ + ${TRICK_HOME}/include/trick/trick_error_hndlr.h \ + ${TRICK_HOME}/include/trick/reference.h \ + ${TRICK_HOME}/include/trick/attributes.h \ + ${TRICK_HOME}/include/trick/parameter_types.h \ + ${TRICK_HOME}/include/trick/value.h \ + ${TRICK_HOME}/include/trick/dllist.h \ + ${TRICK_HOME}/include/trick/JobData.hh \ + ${TRICK_HOME}/include/trick/InstrumentBase.hh \ + ${TRICK_HOME}/include/trick/variable_server_sync_types.h \ + ${TRICK_HOME}/include/trick/VariableServerThread.hh \ + ${TRICK_HOME}/include/trick/ThreadBase.hh \ + ${TRICK_HOME}/include/trick/VariableServerReference.hh \ + ${TRICK_HOME}/include/trick/UCFn.hh \ + ${TRICK_HOME}/include/trick/VariableServerListenThread.hh \ + ${TRICK_HOME}/include/trick/exec_proto.h \ + ${TRICK_HOME}/include/trick/sim_mode.h \ + ${TRICK_HOME}/include/trick/message_proto.h \ + ${TRICK_HOME}/include/trick/message_type.h \ + ${TRICK_HOME}/include/trick/memorymanager_c_intf.h \ + ${TRICK_HOME}/include/trick/var.h \ + ${TRICK_HOME}/include/trick/io_alloc.h +object_${TRICK_HOST_CPU}/VariableServerThread_create_socket.o: \ + VariableServerThread_create_socket.cpp \ + ${TRICK_HOME}/include/trick/VariableServerThread.hh \ + ${TRICK_HOME}/include/trick/tc.h \ + ${TRICK_HOME}/include/trick/trick_byteswap.h \ + ${TRICK_HOME}/include/trick/trick_error_hndlr.h \ + ${TRICK_HOME}/include/trick/ThreadBase.hh \ + ${TRICK_HOME}/include/trick/VariableServerReference.hh \ + ${TRICK_HOME}/include/trick/reference.h \ + ${TRICK_HOME}/include/trick/attributes.h \ + ${TRICK_HOME}/include/trick/parameter_types.h \ + ${TRICK_HOME}/include/trick/value.h \ + ${TRICK_HOME}/include/trick/dllist.h \ + ${TRICK_HOME}/include/trick/UCFn.hh \ + ${TRICK_HOME}/include/trick/variable_server_sync_types.h \ + ${TRICK_HOME}/include/trick/tc_proto.h \ + ${TRICK_HOME}/include/trick/tc.h \ + ${TRICK_HOME}/include/trick/message_proto.h \ + ${TRICK_HOME}/include/trick/message_type.h +object_${TRICK_HOST_CPU}/VariableServerListenThread.o: VariableServerListenThread.cpp \ + ${TRICK_HOME}/include/trick/VariableServerListenThread.hh \ + ${TRICK_HOME}/include/trick/tc.h \ + ${TRICK_HOME}/include/trick/trick_byteswap.h \ + ${TRICK_HOME}/include/trick/trick_error_hndlr.h \ + ${TRICK_HOME}/include/trick/ThreadBase.hh \ + ${TRICK_HOME}/include/trick/VariableServerThread.hh \ + ${TRICK_HOME}/include/trick/VariableServerReference.hh \ + ${TRICK_HOME}/include/trick/reference.h \ + ${TRICK_HOME}/include/trick/attributes.h \ + ${TRICK_HOME}/include/trick/parameter_types.h \ + ${TRICK_HOME}/include/trick/value.h \ + ${TRICK_HOME}/include/trick/dllist.h \ + ${TRICK_HOME}/include/trick/UCFn.hh \ + ${TRICK_HOME}/include/trick/variable_server_sync_types.h \ + ${TRICK_HOME}/include/trick/tc_proto.h \ + ${TRICK_HOME}/include/trick/tc.h \ + ${TRICK_HOME}/include/trick/exec_proto.h \ + ${TRICK_HOME}/include/trick/sim_mode.h \ + ${TRICK_HOME}/include/trick/command_line_protos.h \ + ${TRICK_HOME}/include/trick/message_proto.h \ + ${TRICK_HOME}/include/trick/message_type.h +object_${TRICK_HOST_CPU}/VariableServerThread_write_data.o: VariableServerThread_write_data.cpp \ + ${TRICK_HOME}/include/trick/VariableServer.hh \ + ${TRICK_HOME}/include/trick/tc.h \ + ${TRICK_HOME}/include/trick/trick_byteswap.h \ + ${TRICK_HOME}/include/trick/trick_error_hndlr.h \ + ${TRICK_HOME}/include/trick/reference.h \ + ${TRICK_HOME}/include/trick/attributes.h \ + ${TRICK_HOME}/include/trick/parameter_types.h \ + ${TRICK_HOME}/include/trick/value.h \ + ${TRICK_HOME}/include/trick/dllist.h \ + ${TRICK_HOME}/include/trick/JobData.hh \ + ${TRICK_HOME}/include/trick/InstrumentBase.hh \ + ${TRICK_HOME}/include/trick/variable_server_sync_types.h \ + ${TRICK_HOME}/include/trick/VariableServerThread.hh \ + ${TRICK_HOME}/include/trick/ThreadBase.hh \ + ${TRICK_HOME}/include/trick/VariableServerReference.hh \ + ${TRICK_HOME}/include/trick/UCFn.hh \ + ${TRICK_HOME}/include/trick/VariableServerListenThread.hh \ + ${TRICK_HOME}/include/trick/variable_server_message_types.h \ + ${TRICK_HOME}/include/trick/bitfield_proto.h \ + ${TRICK_HOME}/include/trick/trick_byteswap.h \ + ${TRICK_HOME}/include/trick/tc_proto.h \ + ${TRICK_HOME}/include/trick/tc.h \ + ${TRICK_HOME}/include/trick/message_proto.h \ + ${TRICK_HOME}/include/trick/message_type.h +object_${TRICK_HOST_CPU}/VariableServer_init.o: VariableServer_init.cpp \ + ${TRICK_HOME}/include/trick/VariableServer.hh \ + ${TRICK_HOME}/include/trick/tc.h \ + ${TRICK_HOME}/include/trick/trick_byteswap.h \ + ${TRICK_HOME}/include/trick/trick_error_hndlr.h \ + ${TRICK_HOME}/include/trick/reference.h \ + ${TRICK_HOME}/include/trick/attributes.h \ + ${TRICK_HOME}/include/trick/parameter_types.h \ + ${TRICK_HOME}/include/trick/value.h \ + ${TRICK_HOME}/include/trick/dllist.h \ + ${TRICK_HOME}/include/trick/JobData.hh \ + ${TRICK_HOME}/include/trick/InstrumentBase.hh \ + ${TRICK_HOME}/include/trick/variable_server_sync_types.h \ + ${TRICK_HOME}/include/trick/VariableServerThread.hh \ + ${TRICK_HOME}/include/trick/ThreadBase.hh \ + ${TRICK_HOME}/include/trick/VariableServerReference.hh \ + ${TRICK_HOME}/include/trick/UCFn.hh \ + ${TRICK_HOME}/include/trick/VariableServerListenThread.hh \ + ${TRICK_HOME}/include/trick/exec_proto.hh \ + ${TRICK_HOME}/include/trick/Executive.hh \ + ${TRICK_HOME}/include/trick/Scheduler.hh \ + ${TRICK_HOME}/include/trick/ScheduledJobQueue.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/ScheduledJobQueue.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/Threads.hh \ + ${TRICK_HOME}/include/trick/sim_mode.h +object_${TRICK_HOST_CPU}/VariableServer_copy_data_freeze.o: VariableServer_copy_data_freeze.cpp \ + ${TRICK_HOME}/include/trick/VariableServer.hh \ + ${TRICK_HOME}/include/trick/tc.h \ + ${TRICK_HOME}/include/trick/trick_byteswap.h \ + ${TRICK_HOME}/include/trick/trick_error_hndlr.h \ + ${TRICK_HOME}/include/trick/reference.h \ + ${TRICK_HOME}/include/trick/attributes.h \ + ${TRICK_HOME}/include/trick/parameter_types.h \ + ${TRICK_HOME}/include/trick/value.h \ + ${TRICK_HOME}/include/trick/dllist.h \ + ${TRICK_HOME}/include/trick/JobData.hh \ + ${TRICK_HOME}/include/trick/InstrumentBase.hh \ + ${TRICK_HOME}/include/trick/variable_server_sync_types.h \ + ${TRICK_HOME}/include/trick/VariableServerThread.hh \ + ${TRICK_HOME}/include/trick/ThreadBase.hh \ + ${TRICK_HOME}/include/trick/VariableServerReference.hh \ + ${TRICK_HOME}/include/trick/UCFn.hh \ + ${TRICK_HOME}/include/trick/VariableServerListenThread.hh +object_${TRICK_HOST_CPU}/VariableServer_default_data.o: VariableServer_default_data.cpp \ + ${TRICK_HOME}/include/trick/VariableServer.hh \ + ${TRICK_HOME}/include/trick/tc.h \ + ${TRICK_HOME}/include/trick/trick_byteswap.h \ + ${TRICK_HOME}/include/trick/trick_error_hndlr.h \ + ${TRICK_HOME}/include/trick/reference.h \ + ${TRICK_HOME}/include/trick/attributes.h \ + ${TRICK_HOME}/include/trick/parameter_types.h \ + ${TRICK_HOME}/include/trick/value.h \ + ${TRICK_HOME}/include/trick/dllist.h \ + ${TRICK_HOME}/include/trick/JobData.hh \ + ${TRICK_HOME}/include/trick/InstrumentBase.hh \ + ${TRICK_HOME}/include/trick/variable_server_sync_types.h \ + ${TRICK_HOME}/include/trick/VariableServerThread.hh \ + ${TRICK_HOME}/include/trick/ThreadBase.hh \ + ${TRICK_HOME}/include/trick/VariableServerReference.hh \ + ${TRICK_HOME}/include/trick/UCFn.hh \ + ${TRICK_HOME}/include/trick/VariableServerListenThread.hh +object_${TRICK_HOST_CPU}/VariableServer_freeze_init.o: VariableServer_freeze_init.cpp \ + ${TRICK_HOME}/include/trick/VariableServer.hh \ + ${TRICK_HOME}/include/trick/tc.h \ + ${TRICK_HOME}/include/trick/trick_byteswap.h \ + ${TRICK_HOME}/include/trick/trick_error_hndlr.h \ + ${TRICK_HOME}/include/trick/reference.h \ + ${TRICK_HOME}/include/trick/attributes.h \ + ${TRICK_HOME}/include/trick/parameter_types.h \ + ${TRICK_HOME}/include/trick/value.h \ + ${TRICK_HOME}/include/trick/dllist.h \ + ${TRICK_HOME}/include/trick/JobData.hh \ + ${TRICK_HOME}/include/trick/InstrumentBase.hh \ + ${TRICK_HOME}/include/trick/variable_server_sync_types.h \ + ${TRICK_HOME}/include/trick/VariableServerThread.hh \ + ${TRICK_HOME}/include/trick/ThreadBase.hh \ + ${TRICK_HOME}/include/trick/VariableServerReference.hh \ + ${TRICK_HOME}/include/trick/UCFn.hh \ + ${TRICK_HOME}/include/trick/VariableServerListenThread.hh \ + ${TRICK_HOME}/include/trick/variable_server_proto.h \ + ${TRICK_HOME}/include/trick/TrickConstant.hh +object_${TRICK_HOST_CPU}/VariableServer.o: VariableServer.cpp \ + ${TRICK_HOME}/include/trick/VariableServer.hh \ + ${TRICK_HOME}/include/trick/tc.h \ + ${TRICK_HOME}/include/trick/trick_byteswap.h \ + ${TRICK_HOME}/include/trick/trick_error_hndlr.h \ + ${TRICK_HOME}/include/trick/reference.h \ + ${TRICK_HOME}/include/trick/attributes.h \ + ${TRICK_HOME}/include/trick/parameter_types.h \ + ${TRICK_HOME}/include/trick/value.h \ + ${TRICK_HOME}/include/trick/dllist.h \ + ${TRICK_HOME}/include/trick/JobData.hh \ + ${TRICK_HOME}/include/trick/InstrumentBase.hh \ + ${TRICK_HOME}/include/trick/variable_server_sync_types.h \ + ${TRICK_HOME}/include/trick/VariableServerThread.hh \ + ${TRICK_HOME}/include/trick/ThreadBase.hh \ + ${TRICK_HOME}/include/trick/VariableServerReference.hh \ + ${TRICK_HOME}/include/trick/UCFn.hh \ + ${TRICK_HOME}/include/trick/VariableServerListenThread.hh \ + ${TRICK_HOME}/include/trick/tc_proto.h \ + ${TRICK_HOME}/include/trick/tc.h +object_${TRICK_HOST_CPU}/vs_format_ascii.o: vs_format_ascii.cpp \ + ${TRICK_HOME}/include/trick/parameter_types.h \ + ${TRICK_HOME}/include/trick/attributes.h \ + ${TRICK_HOME}/include/trick/bitfield_proto.h \ + ${TRICK_HOME}/include/trick/wcs_ext.h \ + ${TRICK_HOME}/include/trick/VariableServer.hh \ + ${TRICK_HOME}/include/trick/tc.h \ + ${TRICK_HOME}/include/trick/trick_byteswap.h \ + ${TRICK_HOME}/include/trick/trick_error_hndlr.h \ + ${TRICK_HOME}/include/trick/reference.h \ + ${TRICK_HOME}/include/trick/value.h \ + ${TRICK_HOME}/include/trick/dllist.h \ + ${TRICK_HOME}/include/trick/JobData.hh \ + ${TRICK_HOME}/include/trick/InstrumentBase.hh \ + ${TRICK_HOME}/include/trick/variable_server_sync_types.h \ + ${TRICK_HOME}/include/trick/VariableServerThread.hh \ + ${TRICK_HOME}/include/trick/ThreadBase.hh \ + ${TRICK_HOME}/include/trick/VariableServerReference.hh \ + ${TRICK_HOME}/include/trick/UCFn.hh \ + ${TRICK_HOME}/include/trick/VariableServerListenThread.hh \ + ${TRICK_HOME}/include/trick/TrickConstant.hh +object_${TRICK_HOST_CPU}/VariableServerThread_restart.o: VariableServerThread_restart.cpp \ + ${TRICK_HOME}/include/trick/VariableServerThread.hh \ + ${TRICK_HOME}/include/trick/tc.h \ + ${TRICK_HOME}/include/trick/trick_byteswap.h \ + ${TRICK_HOME}/include/trick/trick_error_hndlr.h \ + ${TRICK_HOME}/include/trick/ThreadBase.hh \ + ${TRICK_HOME}/include/trick/VariableServerReference.hh \ + ${TRICK_HOME}/include/trick/reference.h \ + ${TRICK_HOME}/include/trick/attributes.h \ + ${TRICK_HOME}/include/trick/parameter_types.h \ + ${TRICK_HOME}/include/trick/value.h \ + ${TRICK_HOME}/include/trick/dllist.h \ + ${TRICK_HOME}/include/trick/UCFn.hh \ + ${TRICK_HOME}/include/trick/variable_server_sync_types.h +object_${TRICK_HOST_CPU}/VariableServer_copy_data_top.o: VariableServer_copy_data_top.cpp \ + ${TRICK_HOME}/include/trick/VariableServer.hh \ + ${TRICK_HOME}/include/trick/tc.h \ + ${TRICK_HOME}/include/trick/trick_byteswap.h \ + ${TRICK_HOME}/include/trick/trick_error_hndlr.h \ + ${TRICK_HOME}/include/trick/reference.h \ + ${TRICK_HOME}/include/trick/attributes.h \ + ${TRICK_HOME}/include/trick/parameter_types.h \ + ${TRICK_HOME}/include/trick/value.h \ + ${TRICK_HOME}/include/trick/dllist.h \ + ${TRICK_HOME}/include/trick/JobData.hh \ + ${TRICK_HOME}/include/trick/InstrumentBase.hh \ + ${TRICK_HOME}/include/trick/variable_server_sync_types.h \ + ${TRICK_HOME}/include/trick/VariableServerThread.hh \ + ${TRICK_HOME}/include/trick/ThreadBase.hh \ + ${TRICK_HOME}/include/trick/VariableServerReference.hh \ + ${TRICK_HOME}/include/trick/UCFn.hh \ + ${TRICK_HOME}/include/trick/VariableServerListenThread.hh +object_${TRICK_HOST_CPU}/exit_var_thread.o: exit_var_thread.cpp \ + ${TRICK_HOME}/include/trick/VariableServer.hh \ + ${TRICK_HOME}/include/trick/tc.h \ + ${TRICK_HOME}/include/trick/trick_byteswap.h \ + ${TRICK_HOME}/include/trick/trick_error_hndlr.h \ + ${TRICK_HOME}/include/trick/reference.h \ + ${TRICK_HOME}/include/trick/attributes.h \ + ${TRICK_HOME}/include/trick/parameter_types.h \ + ${TRICK_HOME}/include/trick/value.h \ + ${TRICK_HOME}/include/trick/dllist.h \ + ${TRICK_HOME}/include/trick/JobData.hh \ + ${TRICK_HOME}/include/trick/InstrumentBase.hh \ + ${TRICK_HOME}/include/trick/variable_server_sync_types.h \ + ${TRICK_HOME}/include/trick/VariableServerThread.hh \ + ${TRICK_HOME}/include/trick/ThreadBase.hh \ + ${TRICK_HOME}/include/trick/VariableServerReference.hh \ + ${TRICK_HOME}/include/trick/UCFn.hh \ + ${TRICK_HOME}/include/trick/VariableServerListenThread.hh \ + ${TRICK_HOME}/include/trick/tc_proto.h \ + ${TRICK_HOME}/include/trick/tc.h +object_${TRICK_HOST_CPU}/VariableServerThread_copy_data.o: VariableServerThread_copy_data.cpp \ + ${TRICK_HOME}/include/trick/VariableServer.hh \ + ${TRICK_HOME}/include/trick/tc.h \ + ${TRICK_HOME}/include/trick/trick_byteswap.h \ + ${TRICK_HOME}/include/trick/trick_error_hndlr.h \ + ${TRICK_HOME}/include/trick/reference.h \ + ${TRICK_HOME}/include/trick/attributes.h \ + ${TRICK_HOME}/include/trick/parameter_types.h \ + ${TRICK_HOME}/include/trick/value.h \ + ${TRICK_HOME}/include/trick/dllist.h \ + ${TRICK_HOME}/include/trick/JobData.hh \ + ${TRICK_HOME}/include/trick/InstrumentBase.hh \ + ${TRICK_HOME}/include/trick/variable_server_sync_types.h \ + ${TRICK_HOME}/include/trick/VariableServerThread.hh \ + ${TRICK_HOME}/include/trick/ThreadBase.hh \ + ${TRICK_HOME}/include/trick/VariableServerReference.hh \ + ${TRICK_HOME}/include/trick/UCFn.hh \ + ${TRICK_HOME}/include/trick/VariableServerListenThread.hh \ + ${TRICK_HOME}/include/trick/exec_proto.h \ + ${TRICK_HOME}/include/trick/sim_mode.h \ + ${TRICK_HOME}/include/trick/realtimesync_proto.h \ + ${TRICK_HOME}/include/trick/Clock.hh \ + ${TRICK_HOME}/include/trick/Timer.hh +object_${TRICK_HOST_CPU}/VariableServerThread_connect.o: VariableServerThread_connect.cpp \ + ${TRICK_HOME}/include/trick/VariableServer.hh \ + ${TRICK_HOME}/include/trick/tc.h \ + ${TRICK_HOME}/include/trick/trick_byteswap.h \ + ${TRICK_HOME}/include/trick/trick_error_hndlr.h \ + ${TRICK_HOME}/include/trick/reference.h \ + ${TRICK_HOME}/include/trick/attributes.h \ + ${TRICK_HOME}/include/trick/parameter_types.h \ + ${TRICK_HOME}/include/trick/value.h \ + ${TRICK_HOME}/include/trick/dllist.h \ + ${TRICK_HOME}/include/trick/JobData.hh \ + ${TRICK_HOME}/include/trick/InstrumentBase.hh \ + ${TRICK_HOME}/include/trick/variable_server_sync_types.h \ + ${TRICK_HOME}/include/trick/VariableServerThread.hh \ + ${TRICK_HOME}/include/trick/ThreadBase.hh \ + ${TRICK_HOME}/include/trick/VariableServerReference.hh \ + ${TRICK_HOME}/include/trick/UCFn.hh \ + ${TRICK_HOME}/include/trick/VariableServerListenThread.hh \ + ${TRICK_HOME}/include/trick/release.h +object_${TRICK_HOST_CPU}/VariableServerThread_copy_sim_data.o: \ + VariableServerThread_copy_sim_data.cpp \ + ${TRICK_HOME}/include/trick/VariableServer.hh \ + ${TRICK_HOME}/include/trick/tc.h \ + ${TRICK_HOME}/include/trick/trick_byteswap.h \ + ${TRICK_HOME}/include/trick/trick_error_hndlr.h \ + ${TRICK_HOME}/include/trick/reference.h \ + ${TRICK_HOME}/include/trick/attributes.h \ + ${TRICK_HOME}/include/trick/parameter_types.h \ + ${TRICK_HOME}/include/trick/value.h \ + ${TRICK_HOME}/include/trick/dllist.h \ + ${TRICK_HOME}/include/trick/JobData.hh \ + ${TRICK_HOME}/include/trick/InstrumentBase.hh \ + ${TRICK_HOME}/include/trick/variable_server_sync_types.h \ + ${TRICK_HOME}/include/trick/VariableServerThread.hh \ + ${TRICK_HOME}/include/trick/ThreadBase.hh \ + ${TRICK_HOME}/include/trick/VariableServerReference.hh \ + ${TRICK_HOME}/include/trick/UCFn.hh \ + ${TRICK_HOME}/include/trick/VariableServerListenThread.hh \ + ${TRICK_HOME}/include/trick/memorymanager_c_intf.h \ + ${TRICK_HOME}/include/trick/var.h \ + ${TRICK_HOME}/include/trick/io_alloc.h +object_${TRICK_HOST_CPU}/VariableServerThread_freeze_init.o: VariableServerThread_freeze_init.cpp \ + ${TRICK_HOME}/include/trick/VariableServerThread.hh \ + ${TRICK_HOME}/include/trick/tc.h \ + ${TRICK_HOME}/include/trick/trick_byteswap.h \ + ${TRICK_HOME}/include/trick/trick_error_hndlr.h \ + ${TRICK_HOME}/include/trick/ThreadBase.hh \ + ${TRICK_HOME}/include/trick/VariableServerReference.hh \ + ${TRICK_HOME}/include/trick/reference.h \ + ${TRICK_HOME}/include/trick/attributes.h \ + ${TRICK_HOME}/include/trick/parameter_types.h \ + ${TRICK_HOME}/include/trick/value.h \ + ${TRICK_HOME}/include/trick/dllist.h \ + ${TRICK_HOME}/include/trick/UCFn.hh \ + ${TRICK_HOME}/include/trick/variable_server_sync_types.h \ + ${TRICK_HOME}/include/trick/TrickConstant.hh object_${TRICK_HOST_CPU}/VariableServer_get_var_server_port.o: \ - src/VariableServer_get_var_server_port.cpp \ - ${TRICK_HOME}/trick_source/sim_services/VariableServer/include/VariableServer.hh \ - ${TRICK_HOME}/trick_source/trick_utils/comm/include/tc.h \ - ${TRICK_HOME}/trick_source/trick_utils/comm/include/trick_byteswap.h \ - ${TRICK_HOME}/trick_source/trick_utils/comm/include/trick_error_hndlr.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/reference.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/attributes.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/parameter_types.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/value.h \ - ${TRICK_HOME}/trick_source/trick_utils/trick_adt/include/dllist.h \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/JobData.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/InstrumentBase.hh \ - ${TRICK_HOME}/trick_source/sim_services/VariableServer/include/variable_server_sync_types.h \ - ${TRICK_HOME}/trick_source/sim_services/VariableServer/include/VariableServerThread.hh \ - ${TRICK_HOME}/trick_source/sim_services/VariableServer/include/VariableServerReference.hh \ - ${TRICK_HOME}/trick_source/trick_utils/units/include/UCFn.hh \ - ${TRICK_HOME}/trick_source/sim_services/VariableServer/include/VariableServerListenThread.hh \ - ${TRICK_HOME}/trick_source/sim_services/ThreadBase/include/ThreadBase.hh \ - ${TRICK_HOME}/trick_source/sim_services/Message/include/message_proto.h \ - ${TRICK_HOME}/trick_source/sim_services/Message/include/message_type.h \ - ${TRICK_HOME}/trick_source/trick_utils/comm/include/tc_proto.h \ - ${TRICK_HOME}/trick_source/trick_utils/comm/include/tc.h -object_${TRICK_HOST_CPU}/VariableServer_init.o: src/VariableServer_init.cpp \ - ${TRICK_HOME}/trick_source/sim_services/VariableServer/include/VariableServer.hh \ - ${TRICK_HOME}/trick_source/trick_utils/comm/include/tc.h \ - ${TRICK_HOME}/trick_source/trick_utils/comm/include/trick_byteswap.h \ - ${TRICK_HOME}/trick_source/trick_utils/comm/include/trick_error_hndlr.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/reference.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/attributes.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/parameter_types.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/value.h \ - ${TRICK_HOME}/trick_source/trick_utils/trick_adt/include/dllist.h \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/JobData.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/InstrumentBase.hh \ - ${TRICK_HOME}/trick_source/sim_services/VariableServer/include/variable_server_sync_types.h \ - ${TRICK_HOME}/trick_source/sim_services/VariableServer/include/VariableServerThread.hh \ - ${TRICK_HOME}/trick_source/sim_services/VariableServer/include/VariableServerReference.hh \ - ${TRICK_HOME}/trick_source/trick_utils/units/include/UCFn.hh \ - ${TRICK_HOME}/trick_source/sim_services/VariableServer/include/VariableServerListenThread.hh \ - ${TRICK_HOME}/trick_source/sim_services/ThreadBase/include/ThreadBase.hh \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/exec_proto.hh \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/Executive.hh \ - ${TRICK_HOME}/trick_source/sim_services/Scheduler/include/Scheduler.hh \ - ${TRICK_HOME}/trick_source/sim_services/ScheduledJobQueue/include/ScheduledJobQueue.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/SimObject.hh \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/Threads.hh \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/sim_mode.h -object_${TRICK_HOST_CPU}/VariableServer_restart.o: src/VariableServer_restart.cpp \ - ${TRICK_HOME}/trick_source/sim_services/VariableServer/include/VariableServer.hh \ - ${TRICK_HOME}/trick_source/trick_utils/comm/include/tc.h \ - ${TRICK_HOME}/trick_source/trick_utils/comm/include/trick_byteswap.h \ - ${TRICK_HOME}/trick_source/trick_utils/comm/include/trick_error_hndlr.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/reference.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/attributes.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/parameter_types.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/value.h \ - ${TRICK_HOME}/trick_source/trick_utils/trick_adt/include/dllist.h \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/JobData.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/InstrumentBase.hh \ - ${TRICK_HOME}/trick_source/sim_services/VariableServer/include/variable_server_sync_types.h \ - ${TRICK_HOME}/trick_source/sim_services/VariableServer/include/VariableServerThread.hh \ - ${TRICK_HOME}/trick_source/sim_services/VariableServer/include/VariableServerReference.hh \ - ${TRICK_HOME}/trick_source/trick_utils/units/include/UCFn.hh \ - ${TRICK_HOME}/trick_source/sim_services/VariableServer/include/VariableServerListenThread.hh \ - ${TRICK_HOME}/trick_source/sim_services/ThreadBase/include/ThreadBase.hh \ - ${TRICK_HOME}/trick_source/sim_services/Message/include/message_proto.h \ - ${TRICK_HOME}/trick_source/sim_services/Message/include/message_type.h \ - ${TRICK_HOME}/trick_source/sim_services/Message/include/message_type.h \ - ${TRICK_HOME}/trick_source/trick_utils/comm/include/tc_proto.h \ - ${TRICK_HOME}/trick_source/trick_utils/comm/include/tc.h -object_${TRICK_HOST_CPU}/VariableServer_shutdown.o: src/VariableServer_shutdown.cpp \ - ${TRICK_HOME}/trick_source/sim_services/VariableServer/include/VariableServer.hh \ - ${TRICK_HOME}/trick_source/trick_utils/comm/include/tc.h \ - ${TRICK_HOME}/trick_source/trick_utils/comm/include/trick_byteswap.h \ - ${TRICK_HOME}/trick_source/trick_utils/comm/include/trick_error_hndlr.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/reference.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/attributes.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/parameter_types.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/value.h \ - ${TRICK_HOME}/trick_source/trick_utils/trick_adt/include/dllist.h \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/JobData.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/InstrumentBase.hh \ - ${TRICK_HOME}/trick_source/sim_services/VariableServer/include/variable_server_sync_types.h \ - ${TRICK_HOME}/trick_source/sim_services/VariableServer/include/VariableServerThread.hh \ - ${TRICK_HOME}/trick_source/sim_services/VariableServer/include/VariableServerReference.hh \ - ${TRICK_HOME}/trick_source/trick_utils/units/include/UCFn.hh \ - ${TRICK_HOME}/trick_source/sim_services/VariableServer/include/VariableServerListenThread.hh \ - ${TRICK_HOME}/trick_source/sim_services/ThreadBase/include/ThreadBase.hh -object_${TRICK_HOST_CPU}/var_server_ext.o: src/var_server_ext.cpp \ - ${TRICK_HOME}/trick_source/sim_services/VariableServer/include/VariableServer.hh \ - ${TRICK_HOME}/trick_source/trick_utils/comm/include/tc.h \ - ${TRICK_HOME}/trick_source/trick_utils/comm/include/trick_byteswap.h \ - ${TRICK_HOME}/trick_source/trick_utils/comm/include/trick_error_hndlr.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/reference.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/attributes.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/parameter_types.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/value.h \ - ${TRICK_HOME}/trick_source/trick_utils/trick_adt/include/dllist.h \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/JobData.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/InstrumentBase.hh \ - ${TRICK_HOME}/trick_source/sim_services/VariableServer/include/variable_server_sync_types.h \ - ${TRICK_HOME}/trick_source/sim_services/VariableServer/include/VariableServerThread.hh \ - ${TRICK_HOME}/trick_source/sim_services/VariableServer/include/VariableServerReference.hh \ - ${TRICK_HOME}/trick_source/trick_utils/units/include/UCFn.hh \ - ${TRICK_HOME}/trick_source/sim_services/VariableServer/include/VariableServerListenThread.hh \ - ${TRICK_HOME}/trick_source/sim_services/ThreadBase/include/ThreadBase.hh \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/exec_proto.h \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/sim_mode.h \ - ${TRICK_HOME}/trick_source/sim_services/Message/include/message_proto.h \ - ${TRICK_HOME}/trick_source/sim_services/Message/include/message_type.h -object_${TRICK_HOST_CPU}/variable_server.o: src/variable_server.cpp \ - ${TRICK_HOME}/trick_source/sim_services/VariableServer/include/VariableServer.hh \ - ${TRICK_HOME}/trick_source/trick_utils/comm/include/tc.h \ - ${TRICK_HOME}/trick_source/trick_utils/comm/include/trick_byteswap.h \ - ${TRICK_HOME}/trick_source/trick_utils/comm/include/trick_error_hndlr.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/reference.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/attributes.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/parameter_types.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/value.h \ - ${TRICK_HOME}/trick_source/trick_utils/trick_adt/include/dllist.h \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/JobData.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/InstrumentBase.hh \ - ${TRICK_HOME}/trick_source/sim_services/VariableServer/include/variable_server_sync_types.h \ - ${TRICK_HOME}/trick_source/sim_services/VariableServer/include/VariableServerThread.hh \ - ${TRICK_HOME}/trick_source/sim_services/VariableServer/include/VariableServerReference.hh \ - ${TRICK_HOME}/trick_source/trick_utils/units/include/UCFn.hh \ - ${TRICK_HOME}/trick_source/sim_services/VariableServer/include/VariableServerListenThread.hh \ - ${TRICK_HOME}/trick_source/sim_services/ThreadBase/include/ThreadBase.hh -object_${TRICK_HOST_CPU}/vs_format_ascii.o: src/vs_format_ascii.cpp \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/parameter_types.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/attributes.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/bitfield_proto.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/wcs_ext.h \ - ${TRICK_HOME}/trick_source/sim_services/VariableServer/include/VariableServer.hh \ - ${TRICK_HOME}/trick_source/trick_utils/comm/include/tc.h \ - ${TRICK_HOME}/trick_source/trick_utils/comm/include/trick_byteswap.h \ - ${TRICK_HOME}/trick_source/trick_utils/comm/include/trick_error_hndlr.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/reference.h \ - ${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/value.h \ - ${TRICK_HOME}/trick_source/trick_utils/trick_adt/include/dllist.h \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/JobData.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/InstrumentBase.hh \ - ${TRICK_HOME}/trick_source/sim_services/VariableServer/include/variable_server_sync_types.h \ - ${TRICK_HOME}/trick_source/sim_services/VariableServer/include/VariableServerThread.hh \ - ${TRICK_HOME}/trick_source/sim_services/VariableServer/include/VariableServerReference.hh \ - ${TRICK_HOME}/trick_source/trick_utils/units/include/UCFn.hh \ - ${TRICK_HOME}/trick_source/sim_services/VariableServer/include/VariableServerListenThread.hh \ - ${TRICK_HOME}/trick_source/sim_services/ThreadBase/include/ThreadBase.hh \ - ${TRICK_HOME}/trick_source/sim_services/include/TrickConstant.hh + VariableServer_get_var_server_port.cpp \ + ${TRICK_HOME}/include/trick/VariableServer.hh \ + ${TRICK_HOME}/include/trick/tc.h \ + ${TRICK_HOME}/include/trick/trick_byteswap.h \ + ${TRICK_HOME}/include/trick/trick_error_hndlr.h \ + ${TRICK_HOME}/include/trick/reference.h \ + ${TRICK_HOME}/include/trick/attributes.h \ + ${TRICK_HOME}/include/trick/parameter_types.h \ + ${TRICK_HOME}/include/trick/value.h \ + ${TRICK_HOME}/include/trick/dllist.h \ + ${TRICK_HOME}/include/trick/JobData.hh \ + ${TRICK_HOME}/include/trick/InstrumentBase.hh \ + ${TRICK_HOME}/include/trick/variable_server_sync_types.h \ + ${TRICK_HOME}/include/trick/VariableServerThread.hh \ + ${TRICK_HOME}/include/trick/ThreadBase.hh \ + ${TRICK_HOME}/include/trick/VariableServerReference.hh \ + ${TRICK_HOME}/include/trick/UCFn.hh \ + ${TRICK_HOME}/include/trick/VariableServerListenThread.hh +object_${TRICK_HOST_CPU}/VariableServerThread.o: VariableServerThread.cpp \ + ${TRICK_HOME}/include/trick/VariableServerThread.hh \ + ${TRICK_HOME}/include/trick/tc.h \ + ${TRICK_HOME}/include/trick/trick_byteswap.h \ + ${TRICK_HOME}/include/trick/trick_error_hndlr.h \ + ${TRICK_HOME}/include/trick/ThreadBase.hh \ + ${TRICK_HOME}/include/trick/VariableServerReference.hh \ + ${TRICK_HOME}/include/trick/reference.h \ + ${TRICK_HOME}/include/trick/attributes.h \ + ${TRICK_HOME}/include/trick/parameter_types.h \ + ${TRICK_HOME}/include/trick/value.h \ + ${TRICK_HOME}/include/trick/dllist.h \ + ${TRICK_HOME}/include/trick/UCFn.hh \ + ${TRICK_HOME}/include/trick/variable_server_sync_types.h \ + ${TRICK_HOME}/include/trick/exec_proto.h \ + ${TRICK_HOME}/include/trick/sim_mode.h \ + ${TRICK_HOME}/include/trick/TrickConstant.hh diff --git a/trick_source/sim_services/VariableServer/src/VariableReference.cpp b/trick_source/sim_services/VariableServer/VariableReference.cpp similarity index 88% rename from trick_source/sim_services/VariableServer/src/VariableReference.cpp rename to trick_source/sim_services/VariableServer/VariableReference.cpp index 23417ae4..914b5612 100644 --- a/trick_source/sim_services/VariableServer/src/VariableReference.cpp +++ b/trick_source/sim_services/VariableServer/VariableReference.cpp @@ -1,11 +1,11 @@ #include <stdlib.h> #include <iostream> -#include "sim_services/VariableServer/include/VariableServer.hh" -#include "sim_services/MemoryManager/include/memorymanager_c_intf.h" -#include "sim_services/MemoryManager/include/wcs_ext.h" -#include "sim_services/Message/include/message_proto.h" -#include "sim_services/Message/include/message_type.h" +#include "trick/VariableServer.hh" +#include "trick/memorymanager_c_intf.h" +#include "trick/wcs_ext.h" +#include "trick/message_proto.h" +#include "trick/message_type.h" Trick::VariableReference::VariableReference(REF2 * in_ref ) { diff --git a/trick_source/sim_services/VariableServer/src/VariableServer.cpp b/trick_source/sim_services/VariableServer/VariableServer.cpp similarity index 95% rename from trick_source/sim_services/VariableServer/src/VariableServer.cpp rename to trick_source/sim_services/VariableServer/VariableServer.cpp index e99071f8..b88881eb 100644 --- a/trick_source/sim_services/VariableServer/src/VariableServer.cpp +++ b/trick_source/sim_services/VariableServer/VariableServer.cpp @@ -1,7 +1,7 @@ #include <netdb.h> -#include "sim_services/VariableServer/include/VariableServer.hh" -#include "trick_utils/comm/include/tc_proto.h" +#include "trick/VariableServer.hh" +#include "trick/tc_proto.h" Trick::VariableServer * the_vs ; diff --git a/trick_source/sim_services/VariableServer/src/VariableServerListenThread.cpp b/trick_source/sim_services/VariableServer/VariableServerListenThread.cpp similarity index 94% rename from trick_source/sim_services/VariableServer/src/VariableServerListenThread.cpp rename to trick_source/sim_services/VariableServer/VariableServerListenThread.cpp index a8d59c3c..9d01cea0 100644 --- a/trick_source/sim_services/VariableServer/src/VariableServerListenThread.cpp +++ b/trick_source/sim_services/VariableServer/VariableServerListenThread.cpp @@ -2,13 +2,13 @@ #include <iostream> #include <pwd.h> -#include "sim_services/VariableServer/include/VariableServerListenThread.hh" -#include "sim_services/VariableServer/include/VariableServerThread.hh" -#include "trick_utils/comm/include/tc_proto.h" -#include "sim_services/Executive/include/exec_proto.h" -#include "sim_services/CommandLineArguments/include/command_line_protos.h" -#include "sim_services/Message/include/message_proto.h" -#include "sim_services/Message/include/message_type.h" +#include "trick/VariableServerListenThread.hh" +#include "trick/VariableServerThread.hh" +#include "trick/tc_proto.h" +#include "trick/exec_proto.h" +#include "trick/command_line_protos.h" +#include "trick/message_proto.h" +#include "trick/message_type.h" Trick::VariableServerListenThread::VariableServerListenThread() : Trick::ThreadBase("VarServListen"), diff --git a/trick_source/sim_services/VariableServer/src/VariableServerThread.cpp b/trick_source/sim_services/VariableServer/VariableServerThread.cpp similarity index 93% rename from trick_source/sim_services/VariableServer/src/VariableServerThread.cpp rename to trick_source/sim_services/VariableServer/VariableServerThread.cpp index babd77d8..309b32b7 100644 --- a/trick_source/sim_services/VariableServer/src/VariableServerThread.cpp +++ b/trick_source/sim_services/VariableServer/VariableServerThread.cpp @@ -1,8 +1,8 @@ #include <stdlib.h> -#include "sim_services/VariableServer/include/VariableServerThread.hh" -#include "sim_services/Executive/include/exec_proto.h" -#include "sim_services/include/TrickConstant.hh" +#include "trick/VariableServerThread.hh" +#include "trick/exec_proto.h" +#include "trick/TrickConstant.hh" Trick::VariableServer * Trick::VariableServerThread::vs = NULL ; diff --git a/trick_source/sim_services/VariableServer/src/VariableServerThread_commands.cpp b/trick_source/sim_services/VariableServer/VariableServerThread_commands.cpp similarity index 94% rename from trick_source/sim_services/VariableServer/src/VariableServerThread_commands.cpp rename to trick_source/sim_services/VariableServer/VariableServerThread_commands.cpp index 278b890d..db4b0e02 100644 --- a/trick_source/sim_services/VariableServer/src/VariableServerThread_commands.cpp +++ b/trick_source/sim_services/VariableServer/VariableServerThread_commands.cpp @@ -2,17 +2,17 @@ #include <string.h> #include <iostream> #include <stdlib.h> -#include "sim_services/VariableServer/include/VariableServer.hh" -#include "sim_services/VariableServer/include/variable_server_message_types.h" -#include "sim_services/MemoryManager/include/memorymanager_c_intf.h" -#include "trick_utils/comm/include/tc_proto.h" -#include "sim_services/Executive/include/exec_proto.h" -#include "sim_services/CommandLineArguments/include/command_line_protos.h" -#include "trick_utils/units/include/Unit.hh" -#include "sim_services/Message/include/message_proto.h" -#include "sim_services/Message/include/message_type.h" -#include "sim_services/include/TrickConstant.hh" -#include "sim_services/Sie/include/sie_c_intf.h" +#include "trick/VariableServer.hh" +#include "trick/variable_server_message_types.h" +#include "trick/memorymanager_c_intf.h" +#include "trick/tc_proto.h" +#include "trick/exec_proto.h" +#include "trick/command_line_protos.h" +#include "trick/Unit.hh" +#include "trick/message_proto.h" +#include "trick/message_type.h" +#include "trick/TrickConstant.hh" +#include "trick/sie_c_intf.h" int Trick::VariableServerThread::bad_ref_int = 0 ; diff --git a/trick_source/sim_services/VariableServer/src/VariableServerThread_connect.cpp b/trick_source/sim_services/VariableServer/VariableServerThread_connect.cpp similarity index 54% rename from trick_source/sim_services/VariableServer/src/VariableServerThread_connect.cpp rename to trick_source/sim_services/VariableServer/VariableServerThread_connect.cpp index 3f6b96ab..3d9b145b 100644 --- a/trick_source/sim_services/VariableServer/src/VariableServerThread_connect.cpp +++ b/trick_source/sim_services/VariableServer/VariableServerThread_connect.cpp @@ -1,6 +1,6 @@ -#include "sim_services/VariableServer/include/VariableServer.hh" -#include "sim_services/include/release.h" +#include "trick/VariableServer.hh" +#include "trick/release.h" void Trick::VariableServerThread::wait_for_accept() { while ( connection_accepted == false ) { diff --git a/trick_source/sim_services/VariableServer/src/VariableServerThread_copy_data.cpp b/trick_source/sim_services/VariableServer/VariableServerThread_copy_data.cpp similarity index 89% rename from trick_source/sim_services/VariableServer/src/VariableServerThread_copy_data.cpp rename to trick_source/sim_services/VariableServer/VariableServerThread_copy_data.cpp index 5a145599..b02e6267 100644 --- a/trick_source/sim_services/VariableServer/src/VariableServerThread_copy_data.cpp +++ b/trick_source/sim_services/VariableServer/VariableServerThread_copy_data.cpp @@ -2,10 +2,10 @@ #include <iostream> #include <string.h> -#include "sim_services/VariableServer/include/VariableServer.hh" -#include "sim_services/VariableServer/include/variable_server_sync_types.h" -#include "sim_services/Executive/include/exec_proto.h" -#include "sim_services/RealtimeSync/include/realtimesync_proto.h" +#include "trick/VariableServer.hh" +#include "trick/variable_server_sync_types.h" +#include "trick/exec_proto.h" +#include "trick/realtimesync_proto.h" int Trick::VariableServerThread::copy_data_freeze() { diff --git a/trick_source/sim_services/VariableServer/src/VariableServerThread_copy_sim_data.cpp b/trick_source/sim_services/VariableServer/VariableServerThread_copy_sim_data.cpp similarity index 94% rename from trick_source/sim_services/VariableServer/src/VariableServerThread_copy_sim_data.cpp rename to trick_source/sim_services/VariableServer/VariableServerThread_copy_sim_data.cpp index 97949749..699713c2 100644 --- a/trick_source/sim_services/VariableServer/src/VariableServerThread_copy_sim_data.cpp +++ b/trick_source/sim_services/VariableServer/VariableServerThread_copy_sim_data.cpp @@ -2,8 +2,8 @@ #include <iostream> #include <string.h> -#include "sim_services/VariableServer/include/VariableServer.hh" -#include "sim_services/MemoryManager/include/memorymanager_c_intf.h" // for follow_address_path +#include "trick/VariableServer.hh" +#include "trick/memorymanager_c_intf.h" int Trick::VariableServerThread::copy_sim_data() { diff --git a/trick_source/sim_services/VariableServer/src/VariableServerThread_create_socket.cpp b/trick_source/sim_services/VariableServer/VariableServerThread_create_socket.cpp similarity index 86% rename from trick_source/sim_services/VariableServer/src/VariableServerThread_create_socket.cpp rename to trick_source/sim_services/VariableServer/VariableServerThread_create_socket.cpp index 675e2917..1acea03b 100644 --- a/trick_source/sim_services/VariableServer/src/VariableServerThread_create_socket.cpp +++ b/trick_source/sim_services/VariableServer/VariableServerThread_create_socket.cpp @@ -1,9 +1,9 @@ #include <stdlib.h> -#include "sim_services/VariableServer/include/VariableServerThread.hh" -#include "trick_utils/comm/include/tc_proto.h" -#include "sim_services/Message/include/message_proto.h" -#include "sim_services/Message/include/message_type.h" +#include "trick/VariableServerThread.hh" +#include "trick/tc_proto.h" +#include "trick/message_proto.h" +#include "trick/message_type.h" int Trick::VariableServerThread::create_udp_socket(const char * address, unsigned short in_port) { listen_dev = &connection ; diff --git a/trick_source/sim_services/VariableServer/src/VariableServerThread_freeze_init.cpp b/trick_source/sim_services/VariableServer/VariableServerThread_freeze_init.cpp similarity index 69% rename from trick_source/sim_services/VariableServer/src/VariableServerThread_freeze_init.cpp rename to trick_source/sim_services/VariableServer/VariableServerThread_freeze_init.cpp index 816b0855..93a491a4 100644 --- a/trick_source/sim_services/VariableServer/src/VariableServerThread_freeze_init.cpp +++ b/trick_source/sim_services/VariableServer/VariableServerThread_freeze_init.cpp @@ -2,8 +2,8 @@ #include <iostream> #include <string.h> -#include "sim_services/VariableServer/include/VariableServerThread.hh" -#include "sim_services/include/TrickConstant.hh" +#include "trick/VariableServerThread.hh" +#include "trick/TrickConstant.hh" int Trick::VariableServerThread::freeze_init() { if ( enabled and copy_mode == VS_COPY_SCHEDULED) { diff --git a/trick_source/sim_services/VariableServer/src/VariableServerThread_loop.cpp b/trick_source/sim_services/VariableServer/VariableServerThread_loop.cpp similarity index 92% rename from trick_source/sim_services/VariableServer/src/VariableServerThread_loop.cpp rename to trick_source/sim_services/VariableServer/VariableServerThread_loop.cpp index 5830b668..b7071dee 100644 --- a/trick_source/sim_services/VariableServer/src/VariableServerThread_loop.cpp +++ b/trick_source/sim_services/VariableServer/VariableServerThread_loop.cpp @@ -6,15 +6,15 @@ #include <cxxabi.h> #endif -#include "sim_services/VariableServer/include/VariableServer.hh" -#include "sim_services/VariableServer/include/variable_server_sync_types.h" -#include "sim_services/InputProcessor/include/input_processor_proto.h" -#include "trick_utils/comm/include/tc_proto.h" -#include "sim_services/Message/include/message_proto.h" -#include "sim_services/Message/include/message_type.h" -#include "sim_services/RealtimeSync/include/realtimesync_proto.h" -#include "sim_services/Executive/include/Exec_exception.hh" -#include "sim_services/Executive/include/exec_proto.h" +#include "trick/VariableServer.hh" +#include "trick/variable_server_sync_types.h" +#include "trick/input_processor_proto.h" +#include "trick/tc_proto.h" +#include "trick/message_proto.h" +#include "trick/message_type.h" +#include "trick/realtimesync_proto.h" +#include "trick/Exec_exception.hh" +#include "trick/exec_proto.h" void exit_var_thread(void *in_vst) ; diff --git a/trick_source/sim_services/VariableServer/src/VariableServerThread_restart.cpp b/trick_source/sim_services/VariableServer/VariableServerThread_restart.cpp similarity index 94% rename from trick_source/sim_services/VariableServer/src/VariableServerThread_restart.cpp rename to trick_source/sim_services/VariableServer/VariableServerThread_restart.cpp index c19f3cd6..8379611f 100644 --- a/trick_source/sim_services/VariableServer/src/VariableServerThread_restart.cpp +++ b/trick_source/sim_services/VariableServer/VariableServerThread_restart.cpp @@ -1,6 +1,6 @@ #include <stdlib.h> -#include "sim_services/VariableServer/include/VariableServerThread.hh" +#include "trick/VariableServerThread.hh" void Trick::VariableServerThread::preload_checkpoint() { // Let the thread complete any data copying it has to do diff --git a/trick_source/sim_services/VariableServer/src/VariableServerThread_write_data.cpp b/trick_source/sim_services/VariableServer/VariableServerThread_write_data.cpp similarity index 95% rename from trick_source/sim_services/VariableServer/src/VariableServerThread_write_data.cpp rename to trick_source/sim_services/VariableServer/VariableServerThread_write_data.cpp index 6076fa5a..4de30101 100644 --- a/trick_source/sim_services/VariableServer/src/VariableServerThread_write_data.cpp +++ b/trick_source/sim_services/VariableServer/VariableServerThread_write_data.cpp @@ -5,14 +5,14 @@ PROGRAMMERS: (((Alex Lin) (NASA) (8/06) (--))) #include <iostream> #include <pthread.h> -#include "sim_services/VariableServer/include/VariableServer.hh" -#include "sim_services/VariableServer/include/variable_server_message_types.h" -#include "sim_services/MemoryManager/include/parameter_types.h" -#include "sim_services/MemoryManager/include/bitfield_proto.h" -#include "trick_utils/comm/include/trick_byteswap.h" -#include "trick_utils/comm/include/tc_proto.h" -#include "sim_services/Message/include/message_proto.h" -#include "sim_services/Message/include/message_type.h" +#include "trick/VariableServer.hh" +#include "trick/variable_server_message_types.h" +#include "trick/parameter_types.h" +#include "trick/bitfield_proto.h" +#include "trick/trick_byteswap.h" +#include "trick/tc_proto.h" +#include "trick/message_proto.h" +#include "trick/message_type.h" extern "C" { diff --git a/trick_source/sim_services/VariableServer/src/VariableServerThread_write_stdio.cpp b/trick_source/sim_services/VariableServer/VariableServerThread_write_stdio.cpp similarity index 63% rename from trick_source/sim_services/VariableServer/src/VariableServerThread_write_stdio.cpp rename to trick_source/sim_services/VariableServer/VariableServerThread_write_stdio.cpp index 786f452f..462bd6a0 100644 --- a/trick_source/sim_services/VariableServer/src/VariableServerThread_write_stdio.cpp +++ b/trick_source/sim_services/VariableServer/VariableServerThread_write_stdio.cpp @@ -1,7 +1,7 @@ -#include "sim_services/VariableServer/include/VariableServer.hh" -#include "sim_services/VariableServer/include/variable_server_message_types.h" -#include "trick_utils/comm/include/tc_proto.h" +#include "trick/VariableServer.hh" +#include "trick/variable_server_message_types.h" +#include "trick/tc_proto.h" int Trick::VariableServerThread::write_stdio(int stream, std::string text) { diff --git a/trick_source/sim_services/VariableServer/src/VariableServer_copy_data_freeze.cpp b/trick_source/sim_services/VariableServer/VariableServer_copy_data_freeze.cpp similarity index 85% rename from trick_source/sim_services/VariableServer/src/VariableServer_copy_data_freeze.cpp rename to trick_source/sim_services/VariableServer/VariableServer_copy_data_freeze.cpp index a5fab950..bc90291c 100644 --- a/trick_source/sim_services/VariableServer/src/VariableServer_copy_data_freeze.cpp +++ b/trick_source/sim_services/VariableServer/VariableServer_copy_data_freeze.cpp @@ -2,7 +2,7 @@ #include <iostream> #include <sys/time.h> -#include "sim_services/VariableServer/include/VariableServer.hh" +#include "trick/VariableServer.hh" int Trick::VariableServer::copy_data_freeze() { diff --git a/trick_source/sim_services/VariableServer/src/VariableServer_copy_data_freeze_scheduled.cpp b/trick_source/sim_services/VariableServer/VariableServer_copy_data_freeze_scheduled.cpp similarity index 88% rename from trick_source/sim_services/VariableServer/src/VariableServer_copy_data_freeze_scheduled.cpp rename to trick_source/sim_services/VariableServer/VariableServer_copy_data_freeze_scheduled.cpp index 2774fb83..d770e451 100644 --- a/trick_source/sim_services/VariableServer/src/VariableServer_copy_data_freeze_scheduled.cpp +++ b/trick_source/sim_services/VariableServer/VariableServer_copy_data_freeze_scheduled.cpp @@ -2,8 +2,8 @@ #include <iostream> #include <sys/time.h> -#include "sim_services/VariableServer/include/VariableServer.hh" -#include "sim_services/include/TrickConstant.hh" +#include "trick/VariableServer.hh" +#include "trick/TrickConstant.hh" int Trick::VariableServer::copy_data_freeze_scheduled() { diff --git a/trick_source/sim_services/VariableServer/src/VariableServer_copy_data_scheduled.cpp b/trick_source/sim_services/VariableServer/VariableServer_copy_data_scheduled.cpp similarity index 88% rename from trick_source/sim_services/VariableServer/src/VariableServer_copy_data_scheduled.cpp rename to trick_source/sim_services/VariableServer/VariableServer_copy_data_scheduled.cpp index 2d5f9afe..80f9d967 100644 --- a/trick_source/sim_services/VariableServer/src/VariableServer_copy_data_scheduled.cpp +++ b/trick_source/sim_services/VariableServer/VariableServer_copy_data_scheduled.cpp @@ -2,8 +2,8 @@ #include <iostream> #include <sys/time.h> -#include "sim_services/VariableServer/include/VariableServer.hh" -#include "sim_services/include/TrickConstant.hh" +#include "trick/VariableServer.hh" +#include "trick/TrickConstant.hh" int Trick::VariableServer::copy_data_scheduled() { diff --git a/trick_source/sim_services/VariableServer/src/VariableServer_copy_data_top.cpp b/trick_source/sim_services/VariableServer/VariableServer_copy_data_top.cpp similarity index 85% rename from trick_source/sim_services/VariableServer/src/VariableServer_copy_data_top.cpp rename to trick_source/sim_services/VariableServer/VariableServer_copy_data_top.cpp index 47771dab..4c4c2623 100644 --- a/trick_source/sim_services/VariableServer/src/VariableServer_copy_data_top.cpp +++ b/trick_source/sim_services/VariableServer/VariableServer_copy_data_top.cpp @@ -2,7 +2,7 @@ #include <iostream> #include <sys/time.h> -#include "sim_services/VariableServer/include/VariableServer.hh" +#include "trick/VariableServer.hh" int Trick::VariableServer::copy_data_top() { diff --git a/trick_source/sim_services/VariableServer/src/VariableServer_default_data.cpp b/trick_source/sim_services/VariableServer/VariableServer_default_data.cpp similarity index 59% rename from trick_source/sim_services/VariableServer/src/VariableServer_default_data.cpp rename to trick_source/sim_services/VariableServer/VariableServer_default_data.cpp index 8d9c196a..3c8331dc 100644 --- a/trick_source/sim_services/VariableServer/src/VariableServer_default_data.cpp +++ b/trick_source/sim_services/VariableServer/VariableServer_default_data.cpp @@ -1,5 +1,5 @@ -#include "sim_services/VariableServer/include/VariableServer.hh" +#include "trick/VariableServer.hh" int Trick::VariableServer::default_data() { return listen_thread.init_listen_device() ; diff --git a/trick_source/sim_services/VariableServer/src/VariableServer_freeze_init.cpp b/trick_source/sim_services/VariableServer/VariableServer_freeze_init.cpp similarity index 76% rename from trick_source/sim_services/VariableServer/src/VariableServer_freeze_init.cpp rename to trick_source/sim_services/VariableServer/VariableServer_freeze_init.cpp index 87654bfc..1a8f3e36 100644 --- a/trick_source/sim_services/VariableServer/src/VariableServer_freeze_init.cpp +++ b/trick_source/sim_services/VariableServer/VariableServer_freeze_init.cpp @@ -2,10 +2,10 @@ #include <iostream> #include <sys/time.h> -#include "sim_services/VariableServer/include/VariableServer.hh" -#include "sim_services/VariableServer/include/variable_server_proto.h" -#include "sim_services/VariableServer/include/variable_server_sync_types.h" -#include "sim_services/include/TrickConstant.hh" +#include "trick/VariableServer.hh" +#include "trick/variable_server_proto.h" +#include "trick/variable_server_sync_types.h" +#include "trick/TrickConstant.hh" int Trick::VariableServer::freeze_init() { diff --git a/trick_source/sim_services/VariableServer/src/VariableServer_get_next_freeze_call_time.cpp b/trick_source/sim_services/VariableServer/VariableServer_get_next_freeze_call_time.cpp similarity index 77% rename from trick_source/sim_services/VariableServer/src/VariableServer_get_next_freeze_call_time.cpp rename to trick_source/sim_services/VariableServer/VariableServer_get_next_freeze_call_time.cpp index a6145647..1fb12377 100644 --- a/trick_source/sim_services/VariableServer/src/VariableServer_get_next_freeze_call_time.cpp +++ b/trick_source/sim_services/VariableServer/VariableServer_get_next_freeze_call_time.cpp @@ -1,8 +1,8 @@ #include <iostream> -#include "sim_services/VariableServer/include/VariableServer.hh" -#include "sim_services/VariableServer/include/variable_server_sync_types.h" -#include "sim_services/include/TrickConstant.hh" +#include "trick/VariableServer.hh" +#include "trick/variable_server_sync_types.h" +#include "trick/TrickConstant.hh" int Trick::VariableServer::get_next_freeze_call_time() { diff --git a/trick_source/sim_services/VariableServer/src/VariableServer_get_next_sync_call_time.cpp b/trick_source/sim_services/VariableServer/VariableServer_get_next_sync_call_time.cpp similarity index 77% rename from trick_source/sim_services/VariableServer/src/VariableServer_get_next_sync_call_time.cpp rename to trick_source/sim_services/VariableServer/VariableServer_get_next_sync_call_time.cpp index f522b2b1..d728952d 100644 --- a/trick_source/sim_services/VariableServer/src/VariableServer_get_next_sync_call_time.cpp +++ b/trick_source/sim_services/VariableServer/VariableServer_get_next_sync_call_time.cpp @@ -1,8 +1,8 @@ #include <iostream> -#include "sim_services/VariableServer/include/VariableServer.hh" -#include "sim_services/VariableServer/include/variable_server_sync_types.h" -#include "sim_services/include/TrickConstant.hh" +#include "trick/VariableServer.hh" +#include "trick/variable_server_sync_types.h" +#include "trick/TrickConstant.hh" int Trick::VariableServer::get_next_sync_call_time() { diff --git a/trick_source/sim_services/VariableServer/src/VariableServer_get_var_server_port.cpp b/trick_source/sim_services/VariableServer/VariableServer_get_var_server_port.cpp similarity index 95% rename from trick_source/sim_services/VariableServer/src/VariableServer_get_var_server_port.cpp rename to trick_source/sim_services/VariableServer/VariableServer_get_var_server_port.cpp index 5fce02c1..a3093af1 100644 --- a/trick_source/sim_services/VariableServer/src/VariableServer_get_var_server_port.cpp +++ b/trick_source/sim_services/VariableServer/VariableServer_get_var_server_port.cpp @@ -1,6 +1,6 @@ #include <stdio.h> -#include "sim_services/VariableServer/include/VariableServer.hh" +#include "trick/VariableServer.hh" int Trick::VariableServer::create_tcp_socket(const char * address, unsigned short in_port ) { Trick::VariableServerListenThread * new_listen_thread = new Trick::VariableServerListenThread ; diff --git a/trick_source/sim_services/VariableServer/src/VariableServer_init.cpp b/trick_source/sim_services/VariableServer/VariableServer_init.cpp similarity index 73% rename from trick_source/sim_services/VariableServer/src/VariableServer_init.cpp rename to trick_source/sim_services/VariableServer/VariableServer_init.cpp index 92c77571..9a6bfa31 100644 --- a/trick_source/sim_services/VariableServer/src/VariableServer_init.cpp +++ b/trick_source/sim_services/VariableServer/VariableServer_init.cpp @@ -1,6 +1,6 @@ -#include "sim_services/VariableServer/include/VariableServer.hh" -#include "sim_services/Executive/include/exec_proto.hh" +#include "trick/VariableServer.hh" +#include "trick/exec_proto.hh" int Trick::VariableServer::init() { diff --git a/trick_source/sim_services/VariableServer/src/VariableServer_restart.cpp b/trick_source/sim_services/VariableServer/VariableServer_restart.cpp similarity index 88% rename from trick_source/sim_services/VariableServer/src/VariableServer_restart.cpp rename to trick_source/sim_services/VariableServer/VariableServer_restart.cpp index 5a833799..d52b7ff5 100644 --- a/trick_source/sim_services/VariableServer/src/VariableServer_restart.cpp +++ b/trick_source/sim_services/VariableServer/VariableServer_restart.cpp @@ -1,8 +1,8 @@ -#include "sim_services/VariableServer/include/VariableServer.hh" -#include "sim_services/Message/include/message_proto.h" -#include "sim_services/Message/include/message_type.h" -#include "trick_utils/comm/include/tc_proto.h" +#include "trick/VariableServer.hh" +#include "trick/message_proto.h" +#include "trick/message_type.h" +#include "trick/tc_proto.h" int Trick::VariableServer::restart() { listen_thread.restart() ; diff --git a/trick_source/sim_services/VariableServer/src/VariableServer_shutdown.cpp b/trick_source/sim_services/VariableServer/VariableServer_shutdown.cpp similarity index 86% rename from trick_source/sim_services/VariableServer/src/VariableServer_shutdown.cpp rename to trick_source/sim_services/VariableServer/VariableServer_shutdown.cpp index ff51e637..f5c189f7 100644 --- a/trick_source/sim_services/VariableServer/src/VariableServer_shutdown.cpp +++ b/trick_source/sim_services/VariableServer/VariableServer_shutdown.cpp @@ -1,5 +1,5 @@ -#include "sim_services/VariableServer/include/VariableServer.hh" +#include "trick/VariableServer.hh" int Trick::VariableServer::shutdown() { listen_thread.cancel_thread() ; diff --git a/trick_source/sim_services/VariableServer/main_page.dox_in b/trick_source/sim_services/VariableServer/docs/main_page.dox_in similarity index 100% rename from trick_source/sim_services/VariableServer/main_page.dox_in rename to trick_source/sim_services/VariableServer/docs/main_page.dox_in diff --git a/trick_source/sim_services/VariableServer/src/exit_var_thread.cpp b/trick_source/sim_services/VariableServer/exit_var_thread.cpp similarity index 85% rename from trick_source/sim_services/VariableServer/src/exit_var_thread.cpp rename to trick_source/sim_services/VariableServer/exit_var_thread.cpp index 4ebd84a6..95b30e82 100644 --- a/trick_source/sim_services/VariableServer/src/exit_var_thread.cpp +++ b/trick_source/sim_services/VariableServer/exit_var_thread.cpp @@ -1,6 +1,6 @@ -#include "sim_services/VariableServer/include/VariableServer.hh" -#include "trick_utils/comm/include/tc_proto.h" +#include "trick/VariableServer.hh" +#include "trick/tc_proto.h" void exit_var_thread(void *in_vst) { Trick::VariableServerThread * vst = (Trick::VariableServerThread *) in_vst ; diff --git a/trick_source/sim_services/VariableServer/src/makefile b/trick_source/sim_services/VariableServer/src/makefile deleted file mode 100644 index 753bd7f7..00000000 --- a/trick_source/sim_services/VariableServer/src/makefile +++ /dev/null @@ -1,6 +0,0 @@ - -all: - ${MAKE} -C .. - -clean: - ${MAKE} -C .. clean diff --git a/trick_source/sim_services/VariableServer/src/var_server_ext.cpp b/trick_source/sim_services/VariableServer/var_server_ext.cpp similarity index 97% rename from trick_source/sim_services/VariableServer/src/var_server_ext.cpp rename to trick_source/sim_services/VariableServer/var_server_ext.cpp index 3a199983..4a8dc42c 100644 --- a/trick_source/sim_services/VariableServer/src/var_server_ext.cpp +++ b/trick_source/sim_services/VariableServer/var_server_ext.cpp @@ -1,11 +1,11 @@ #include <iostream> -#include "sim_services/VariableServer/include/VariableServer.hh" -#include "sim_services/Executive/include/exec_proto.h" -#include "sim_services/Message/include/message_proto.h" -#include "sim_services/Message/include/message_type.h" -#include "sim_services/MemoryManager/include/memorymanager_c_intf.h" +#include "trick/VariableServer.hh" +#include "trick/exec_proto.h" +#include "trick/message_proto.h" +#include "trick/message_type.h" +#include "trick/memorymanager_c_intf.h" extern Trick::VariableServer * the_vs ; diff --git a/trick_source/sim_services/VariableServer/src/vs_format_ascii.cpp b/trick_source/sim_services/VariableServer/vs_format_ascii.cpp similarity index 95% rename from trick_source/sim_services/VariableServer/src/vs_format_ascii.cpp rename to trick_source/sim_services/VariableServer/vs_format_ascii.cpp index c6f10bc2..c62f5f56 100644 --- a/trick_source/sim_services/VariableServer/src/vs_format_ascii.cpp +++ b/trick_source/sim_services/VariableServer/vs_format_ascii.cpp @@ -9,12 +9,12 @@ PROGRAMMERS: (((Keith Vetter) (LinCom) (September 2001) (--))) #include <ctype.h> #include <limits> -#include "sim_services/MemoryManager/include/parameter_types.h" -#include "sim_services/MemoryManager/include/attributes.h" -#include "sim_services/MemoryManager/include/bitfield_proto.h" -#include "sim_services/MemoryManager/include/wcs_ext.h" -#include "sim_services/VariableServer/include/VariableServer.hh" -#include "sim_services/include/TrickConstant.hh" +#include "trick/parameter_types.h" +#include "trick/attributes.h" +#include "trick/bitfield_proto.h" +#include "trick/wcs_ext.h" +#include "trick/VariableServer.hh" +#include "trick/TrickConstant.hh" /* PROTO */ size_t escape_str(const char *in_s, char *out_s); diff --git a/trick_source/sim_services/Zeroconf/Makefile b/trick_source/sim_services/Zeroconf/Makefile index 3029433b..a181cedf 100644 --- a/trick_source/sim_services/Zeroconf/Makefile +++ b/trick_source/sim_services/Zeroconf/Makefile @@ -1,5 +1,5 @@ -include ${TRICK_HOME}/makefiles/Makefile.common -include ${TRICK_HOME}/makefiles/Makefile.tricklib +include ${TRICK_HOME}/share/trick/makefiles/Makefile.common +include ${TRICK_HOME}/share/trick/makefiles/Makefile.tricklib -include Makefile_deps diff --git a/trick_source/sim_services/Zeroconf/Makefile_deps b/trick_source/sim_services/Zeroconf/Makefile_deps new file mode 100644 index 00000000..c6ff537c --- /dev/null +++ b/trick_source/sim_services/Zeroconf/Makefile_deps @@ -0,0 +1,2 @@ +object_${TRICK_HOST_CPU}/Zeroconf.o: Zeroconf.cpp ${TRICK_HOME}/include/trick/Zeroconf.hh \ + ${TRICK_HOME}/include/trick/variable_server_proto.h diff --git a/trick_source/sim_services/Zeroconf/src/Zeroconf.cpp b/trick_source/sim_services/Zeroconf/Zeroconf.cpp similarity index 95% rename from trick_source/sim_services/Zeroconf/src/Zeroconf.cpp rename to trick_source/sim_services/Zeroconf/Zeroconf.cpp index 3021d85f..664cd722 100644 --- a/trick_source/sim_services/Zeroconf/src/Zeroconf.cpp +++ b/trick_source/sim_services/Zeroconf/Zeroconf.cpp @@ -15,8 +15,8 @@ #endif #endif -#include "sim_services/Zeroconf/include/Zeroconf.hh" -#include "sim_services/VariableServer/include/variable_server_proto.h" +#include "trick/Zeroconf.hh" +#include "trick/variable_server_proto.h" Trick::Zeroconf::Zeroconf() { name = std::string("My Sim!!!") ; diff --git a/trick_source/sim_services/Zeroconf/src/makefile b/trick_source/sim_services/Zeroconf/src/makefile deleted file mode 100644 index 753bd7f7..00000000 --- a/trick_source/sim_services/Zeroconf/src/makefile +++ /dev/null @@ -1,6 +0,0 @@ - -all: - ${MAKE} -C .. - -clean: - ${MAKE} -C .. clean diff --git a/trick_source/sim_services/include/Makefile b/trick_source/sim_services/include/Makefile index 3029433b..a181cedf 100644 --- a/trick_source/sim_services/include/Makefile +++ b/trick_source/sim_services/include/Makefile @@ -1,5 +1,5 @@ -include ${TRICK_HOME}/makefiles/Makefile.common -include ${TRICK_HOME}/makefiles/Makefile.tricklib +include ${TRICK_HOME}/share/trick/makefiles/Makefile.common +include ${TRICK_HOME}/share/trick/makefiles/Makefile.tricklib -include Makefile_deps diff --git a/trick_source/sim_services/include/attributes.h b/trick_source/sim_services/include/attributes.h deleted file mode 100644 index 25f51408..00000000 --- a/trick_source/sim_services/include/attributes.h +++ /dev/null @@ -1 +0,0 @@ -#include "sim_services/MemoryManager/include/attributes.h" diff --git a/trick_source/sim_services/include/constant.h b/trick_source/sim_services/include/constant.h deleted file mode 100644 index 9f6ac4b7..00000000 --- a/trick_source/sim_services/include/constant.h +++ /dev/null @@ -1,3 +0,0 @@ - -#include "trick_utils/units/include/constant.h" - diff --git a/trick_source/sim_services/include/exec_proto.h b/trick_source/sim_services/include/exec_proto.h deleted file mode 100644 index d0050aa3..00000000 --- a/trick_source/sim_services/include/exec_proto.h +++ /dev/null @@ -1,2 +0,0 @@ -#include "sim_services/Executive/include/exec_proto.h" - diff --git a/trick_source/sim_services/include/files_to_ICG.hh b/trick_source/sim_services/include/files_to_ICG.hh deleted file mode 100644 index 32568b33..00000000 --- a/trick_source/sim_services/include/files_to_ICG.hh +++ /dev/null @@ -1,94 +0,0 @@ -#ifndef FILES_TO_ICG_HH -#define FILES_TO_ICG_HH - -#include "trick_utils/math/include/reference_frame.h" -#include "sim_services/Clock/include/GetTimeOfDayClock.hh" -#include "sim_services/Clock/include/BC635Clock.hh" -#include "sim_services/Clock/include/TPROCTEClock.hh" -#include "sim_services/CommandLineArguments/include/CommandLineArguments.hh" -#include "sim_services/DMTCP/include/DMTCP.hh" -#include "sim_services/Executive/include/Executive.hh" -#include "sim_services/Environment/include/Environment.hh" -#include "sim_services/EventManager/include/Event.hh" -#include "sim_services/EventManager/include/EventProcessor.hh" -#include "sim_services/EventManager/include/EventManager.hh" -#include "sim_services/InputProcessor/include/IPPython.hh" -#include "sim_services/InputProcessor/include/IPPythonEvent.hh" -#include "sim_services/InputProcessor/include/MTV.hh" -#include "sim_services/JITInputFile/include/JITEvent.hh" -#include "sim_services/JITInputFile/include/JITInputFile.hh" -#include "sim_services/JSONVariableServer/include/JSONVariableServer.hh" -#include "sim_services/JSONVariableServer/include/JSONVariableServerThread.hh" -#include "sim_services/MasterSlave/include/Master.hh" -#include "sim_services/MasterSlave/include/Slave.hh" -#include "sim_services/MasterSlave/include/MSSocket.hh" -#include "sim_services/MasterSlave/include/MSSharedMem.hh" -#include "sim_services/MemoryManager/include/MemoryManager.hh" -#include "sim_services/Message/include/MessageCout.hh" -#include "sim_services/Message/include/MessageFile.hh" -#include "sim_services/Message/include/MessageLCout.hh" -#include "sim_services/Message/include/MessagePublisher.hh" -#include "sim_services/Message/include/MessageTCDevice.hh" -#include "sim_services/Message/include/PlaybackFile.hh" -#include "sim_services/MonteCarlo/include/MonteCarlo.hh" -#include "sim_services/RealtimeSync/include/RealtimeSync.hh" -#include "sim_services/Timer/include/ITimer.hh" -#include "sim_services/VariableServer/include/VariableServer.hh" -#include "sim_services/Integrator/include/regula_falsi.h" -#include "sim_services/Integrator/include/Integrator.hh" -#include "sim_services/Integrator/include/IntegAlgorithms.hh" -#include "sim_services/Integrator/include/IntegLoopScheduler.hh" -#include "sim_services/Integrator/include/IntegLoopManager.hh" -#include "sim_services/Integrator/include/IntegLoopSimObject.hh" - -#ifdef USE_ER7_UTILS_INTEGRATORS -# include "sim_services/Integrator/er7_algorithms/ABM_Integrator.hh" -# include "sim_services/Integrator/er7_algorithms/Euler_Cromer_Integrator.hh" -# include "sim_services/Integrator/er7_algorithms/Euler_Integrator.hh" -# include "sim_services/Integrator/er7_algorithms/MM4_Integrator.hh" -# include "sim_services/Integrator/er7_algorithms/NL2_Integrator.hh" -# include "sim_services/Integrator/er7_algorithms/RK2_Integrator.hh" -# include "sim_services/Integrator/er7_algorithms/RK4_Integrator.hh" -# include "sim_services/Integrator/er7_algorithms/RKF45_Integrator.hh" -# include "sim_services/Integrator/er7_algorithms/RKF78_Integrator.hh" -# include "sim_services/Integrator/er7_algorithms/RKG4_Integrator.hh" -/* from the er7_utils directory */ -# include "er7_utils/trick/include/files_to_ICG.hh" -#else -# include "sim_services/Integrator/trick_algorithms/ABM_Integrator.hh" -# include "sim_services/Integrator/trick_algorithms/Euler_Cromer_Integrator.hh" -# include "sim_services/Integrator/trick_algorithms/Euler_Integrator.hh" -# include "sim_services/Integrator/trick_algorithms/MM4_Integrator.hh" -# include "sim_services/Integrator/trick_algorithms/NL2_Integrator.hh" -# include "sim_services/Integrator/trick_algorithms/RK2_Integrator.hh" -# include "sim_services/Integrator/trick_algorithms/RK4_Integrator.hh" -# include "sim_services/Integrator/trick_algorithms/RKF45_Integrator.hh" -# include "sim_services/Integrator/trick_algorithms/RKF78_Integrator.hh" -# include "sim_services/Integrator/trick_algorithms/RKG4_Integrator.hh" -#endif - -#include "sim_services/DataRecord/include/DataRecordDispatcher.hh" -#include "sim_services/DataRecord/include/DRAscii.hh" -#include "sim_services/DataRecord/include/DRBinary.hh" -#include "sim_services/DataRecord/include/DRHDF5.hh" -#include "sim_services/DebugPause/include/DebugPause.hh" -#include "sim_services/EchoJobs/include/EchoJobs.hh" -#include "sim_services/FrameLog/include/FrameLog.hh" -#include "sim_services/UnitTest/include/UnitTest.hh" -#include "sim_services/CheckPointRestart/include/CheckPointRestart.hh" -#include "sim_services/Sie/include/Sie.hh" -#include "sim_services/STL/include/STLInterface.hh" -#include "sim_services/ExternalApplications/include/SimControlPanel.hh" -#include "sim_services/ExternalApplications/include/TrickView.hh" -#include "sim_services/ExternalApplications/include/MalfunctionsTrickView.hh" -#include "sim_services/ExternalApplications/include/MonteMonitor.hh" -#include "sim_services/ExternalApplications/include/StripChart.hh" -#include "sim_services/RealtimeInjector/include/RtiStager.hh" -#include "sim_services/RealtimeInjector/include/RtiExec.hh" -#include "sim_services/Units/include/UnitsMap.hh" -#include "sim_services/Zeroconf/include/Zeroconf.hh" -#include "sim_services/include/Flag.h" -#include "trick_utils/math/include/wave_form.h" -#include "trick_utils/math/include/rand_generator.h" - -#endif diff --git a/trick_source/sim_services/include/parameter_types.h b/trick_source/sim_services/include/parameter_types.h deleted file mode 100644 index fb1f653f..00000000 --- a/trick_source/sim_services/include/parameter_types.h +++ /dev/null @@ -1,2 +0,0 @@ -#include "sim_services/MemoryManager/include/parameter_types.h" - diff --git a/trick_source/sim_services/include/simtime.h b/trick_source/sim_services/include/simtime.h deleted file mode 100644 index b502e25a..00000000 --- a/trick_source/sim_services/include/simtime.h +++ /dev/null @@ -1,4 +0,0 @@ - -#include "sim_services/SimTime/include/time_offset.h" -#include "sim_services/SimTime/include/simtime_proto.h" - diff --git a/trick_source/sim_services/mains/Makefile b/trick_source/sim_services/mains/Makefile index 9a7dee6e..4aef7386 100644 --- a/trick_source/sim_services/mains/Makefile +++ b/trick_source/sim_services/mains/Makefile @@ -1,35 +1,32 @@ -include ${TRICK_HOME}/makefiles/Makefile.common - -LIB_DIR = ${TRICK_HOME}/lib_${TRICK_HOST_CPU} - -all: $(LIB_DIR)/master.o - -trick: $(LIB_DIR)/master.o - -$(OBJ_DIR)/master.o : master.cpp | $(OBJ_DIR) - $(TRICK_CPPC) $(TRICK_CXXFLAGS) -c $< -o $@ - -$(LIB_DIR)/master.o : $(OBJ_DIR)/master.o | $(LIB_DIR) - $(CP) $< $@ - -$(OBJ_DIR): - mkdir -p $(OBJ_DIR) - -$(LIB_DIR): - mkdir -p $(LIB_DIR) - -clean: - $(RM) -rf $(OBJ_DIR) - -real_clean: clean - -depend: - @ $(TRICK_CPPC) -MM $(TRICK_CXXFLAGS) master.cpp >> $(DEPTEMPFILE) - @ $(PERL) ${TRICK_HOME}/bin/depend_cp $(DEPTEMPFILE) > $(DEPFILE) - @ $(RM) $(DEPTEMPFILE) - @ echo "Created dependency file $(DEPFILE)" - - +include ${TRICK_HOME}/share/trick/makefiles/Makefile.common +include ${TRICK_HOME}/share/trick/makefiles/Makefile.tricklib -include Makefile_deps +#all: $(TRICK_LIB_DIR)/master.o +# +#trick: $(TRICK_LIB_DIR)/master.o +# +#$(OBJ_DIR)/master.o : master.cpp | $(OBJ_DIR) +# $(TRICK_CPPC) $(TRICK_CXXFLAGS) -c $< -o $@ +# +#$(TRICK_LIB_DIR)/master.o : $(OBJ_DIR)/master.o | $(TRICK_LIB_DIR) +# $(CP) $< $@ +# +#$(OBJ_DIR): +# mkdir -p $(OBJ_DIR) +# +#clean: +# $(RM) -rf $(OBJ_DIR) +# +#real_clean: clean +# +#depend: +# @ $(TRICK_CPPC) -MM $(TRICK_CXXFLAGS) master.cpp >> $(DEPTEMPFILE) +# @ $(PERL) ${TRICK_HOME}/bin/depend_cp $(DEPTEMPFILE) > $(DEPFILE) +# @ $(RM) $(DEPTEMPFILE) +# @ echo "Created dependency file $(DEPFILE)" +# +# +#-include Makefile_deps + diff --git a/trick_source/sim_services/mains/Makefile_deps b/trick_source/sim_services/mains/Makefile_deps index fc7e1aef..9c2403e4 100644 --- a/trick_source/sim_services/mains/Makefile_deps +++ b/trick_source/sim_services/mains/Makefile_deps @@ -1,11 +1,13 @@ -object_${TRICK_HOST_CPU}/master.o: master.cpp \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/Executive.hh \ - ${TRICK_HOME}/trick_source/sim_services/Scheduler/include/Scheduler.hh \ - ${TRICK_HOME}/trick_source/sim_services/ScheduledJobQueue/include/ScheduledJobQueue.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/JobData.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/InstrumentBase.hh \ - ${TRICK_HOME}/trick_source/sim_services/SimObject/include/SimObject.hh \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/Threads.hh \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/sim_mode.h \ - ${TRICK_HOME}/trick_source/sim_services/CommandLineArguments/include/command_line_protos.h \ - ${TRICK_HOME}/trick_source/sim_services/Executive/include/exec_proto.hh +object_${TRICK_HOST_CPU}/master.o: master.cpp ${TRICK_HOME}/include/trick/Executive.hh \ + ${TRICK_HOME}/include/trick/Scheduler.hh \ + ${TRICK_HOME}/include/trick/ScheduledJobQueue.hh \ + ${TRICK_HOME}/include/trick/JobData.hh \ + ${TRICK_HOME}/include/trick/InstrumentBase.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/ScheduledJobQueue.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/Threads.hh \ + ${TRICK_HOME}/include/trick/ThreadBase.hh \ + ${TRICK_HOME}/include/trick/sim_mode.h \ + ${TRICK_HOME}/include/trick/command_line_protos.h \ + ${TRICK_HOME}/include/trick/exec_proto.hh diff --git a/trick_source/sim_services/mains/master.cpp b/trick_source/sim_services/mains/master.cpp index 436e7fc1..21e425d0 100644 --- a/trick_source/sim_services/mains/master.cpp +++ b/trick_source/sim_services/mains/master.cpp @@ -11,9 +11,9 @@ PROGRAMMERS: ( (Robert W. Bailey) (LinCom) (April 1992) ) #include <iostream> #include <locale.h> -#include "sim_services/Executive/include/Executive.hh" -#include "sim_services/CommandLineArguments/include/command_line_protos.h" -#include "sim_services/Executive/include/exec_proto.hh" +#include "trick/Executive.hh" +#include "trick/command_line_protos.h" +#include "trick/exec_proto.hh" //TODO move to proto void memory_init(void); diff --git a/trick_source/trick_swig/Makefile b/trick_source/trick_swig/Makefile index 79c626ac..8d509101 100644 --- a/trick_source/trick_swig/Makefile +++ b/trick_source/trick_swig/Makefile @@ -1,5 +1,5 @@ -include ${TRICK_HOME}/makefiles/Makefile.common +include ${TRICK_HOME}/share/trick/makefiles/Makefile.common ifneq ($(HDF5),) TRICK_CXXFLAGS += -DHDF5 @@ -62,7 +62,7 @@ $(OBJECT_FILES): $(OBJ_DIR)/%.o : %.cpp $(TRICK_CPPC) $(TRICK_CXXFLAGS) -c $< -o $@ $(SWIG_SRC_FILES): swig_${TRICK_HOST_CPU}/%_wrap.cpp : %.i - $(SWIG) $(SWIG_DEFS) -I${TRICK_HOME}/trick_source -c++ -python -includeall -ignoremissing -w201,362,389,451 -o $@ $< + $(SWIG) $(SWIG_DEFS) -I${TRICK_HOME}/trick_source -I${TRICK_HOME}/include -c++ -python -includeall -ignoremissing -w201,362,389,451 -o $@ $< $(TRICK_LIB) : $(SWIG_OBJECT_FILES) $(OBJECT_FILES) ar crs $@ $? diff --git a/trick_source/trick_swig/PrimitiveAttributesMap.hh b/trick_source/trick_swig/PrimitiveAttributesMap.hh index 6380834f..3e259029 100644 --- a/trick_source/trick_swig/PrimitiveAttributesMap.hh +++ b/trick_source/trick_swig/PrimitiveAttributesMap.hh @@ -15,7 +15,7 @@ #include <map> #include <string> -#include "sim_services/MemoryManager/include/attributes.h" +#include "trick/attributes.h" namespace Trick { diff --git a/trick_source/trick_swig/sim_services.i b/trick_source/trick_swig/sim_services.i index 2e840509..b7d75fd8 100644 --- a/trick_source/trick_swig/sim_services.i +++ b/trick_source/trick_swig/sim_services.i @@ -28,122 +28,109 @@ %inline %{ #include "trick_swig/swig_global_vars.hh" -#include "trick_utils/math/include/reference_frame.h" -#include "trick_utils/math/include/rand_generator.h" -#include "trick_utils/math/include/wave_form.h" -#include "sim_services/Integrator/include/integrator_c_intf.h" +#include "trick/reference_frame.h" +#include "trick/rand_generator.h" +#include "trick/wave_form.h" +#include "trick/integrator_c_intf.h" -#include "sim_services/Clock/include/GetTimeOfDayClock.hh" -#include "sim_services/Clock/include/BC635Clock.hh" -#include "sim_services/Clock/include/TPROCTEClock.hh" -#include "sim_services/Clock/include/clock_proto.h" -#include "sim_services/CommandLineArguments/include/CommandLineArguments.hh" -#include "sim_services/CommandLineArguments/include/command_line_protos.h" -#include "sim_services/DataRecord/include/DRAscii.hh" -#include "sim_services/DataRecord/include/DRBinary.hh" +#include "trick/GetTimeOfDayClock.hh" +#include "trick/BC635Clock.hh" +#include "trick/TPROCTEClock.hh" +#include "trick/clock_proto.h" +#include "trick/CommandLineArguments.hh" +#include "trick/command_line_protos.h" +#include "trick/DRAscii.hh" +#include "trick/DRBinary.hh" #ifdef HDF5 -#include "sim_services/DataRecord/include/DRHDF5.hh" +#include "trick/DRHDF5.hh" #endif #ifdef DMTCP -#include "sim_services/DMTCP/include/DMTCP.hh" -#include "sim_services/DMTCP/include/dmtcp_checkpoint_c_intf.hh" +#include "trick/DMTCP.hh" +#include "trick/dmtcp_checkpoint_c_intf.hh" #endif -#include "sim_services/DataRecord/include/DataRecordDispatcher.hh" -#include "sim_services/DataRecord/include/data_record_proto.h" -#include "sim_services/DebugPause/include/DebugPause.hh" -#include "sim_services/DebugPause/include/debug_pause_proto.h" -#include "sim_services/EchoJobs/include/EchoJobs.hh" -#include "sim_services/EchoJobs/include/echojobs_proto.h" -#include "sim_services/Environment/include/Environment.hh" -#include "sim_services/Environment/include/env_proto.h" -#include "sim_services/Executive/include/Executive.hh" -#include "sim_services/Executive/include/exec_proto.h" -#include "sim_services/Executive/include/exec_proto.hh" -#include "sim_services/ExternalApplications/include/MalfunctionsTrickView.hh" -#include "sim_services/ExternalApplications/include/MonteMonitor.hh" -#include "sim_services/ExternalApplications/include/SimControlPanel.hh" -#include "sim_services/ExternalApplications/include/StripChart.hh" -#include "sim_services/ExternalApplications/include/TrickView.hh" -#include "sim_services/ExternalApplications/include/ExternalApplicationManager.hh" -#include "sim_services/ExternalApplications/include/external_application_c_intf.h" -#include "sim_services/FrameLog/include/FrameDataRecordGroup.hh" -#include "sim_services/FrameLog/include/FrameLog.hh" -#include "sim_services/FrameLog/include/framelog_proto.h" -#include "sim_services/InputProcessor/include/IPPython.hh" -#include "sim_services/InputProcessor/include/input_processor_proto.h" -#include "sim_services/InputProcessor/include/MTV.hh" -#include "sim_services/EventManager/include/EventManager.hh" -#include "sim_services/EventManager/include/EventProcessor.hh" -#include "sim_services/EventManager/include/EventManager_c_intf.hh" -#include "sim_services/JITInputFile/include/JITInputFile.hh" -#include "sim_services/JITInputFile/include/jit_input_file_proto.hh" -#include "sim_services/JSONVariableServer/include/JSONVariableServer.hh" -#include "sim_services/Integrator/include/IntegLoopScheduler.hh" -#include "sim_services/Integrator/include/IntegLoopManager.hh" -#include "sim_services/Integrator/include/IntegLoopSimObject.hh" -#include "sim_services/Integrator/include/Integrator.hh" -#include "sim_services/Integrator/include/regula_falsi.h" +#include "trick/DataRecordDispatcher.hh" +#include "trick/data_record_proto.h" +#include "trick/DebugPause.hh" +#include "trick/debug_pause_proto.h" +#include "trick/EchoJobs.hh" +#include "trick/echojobs_proto.h" +#include "trick/Environment.hh" +#include "trick/env_proto.h" +#include "trick/Executive.hh" +#include "trick/exec_proto.h" +#include "trick/exec_proto.hh" +#include "trick/MalfunctionsTrickView.hh" +#include "trick/MonteMonitor.hh" +#include "trick/SimControlPanel.hh" +#include "trick/StripChart.hh" +#include "trick/TrickView.hh" +#include "trick/ExternalApplicationManager.hh" +#include "trick/external_application_c_intf.h" +#include "trick/FrameDataRecordGroup.hh" +#include "trick/FrameLog.hh" +#include "trick/framelog_proto.h" +#include "trick/IPPython.hh" +#include "trick/input_processor_proto.h" +#include "trick/MTV.hh" +#include "trick/EventManager.hh" +#include "trick/EventProcessor.hh" +#include "trick/EventManager_c_intf.hh" +#include "trick/JITInputFile.hh" +#include "trick/jit_input_file_proto.hh" +#include "trick/JSONVariableServer.hh" +#include "trick/IntegLoopScheduler.hh" +#include "trick/IntegLoopManager.hh" +#include "trick/IntegLoopSimObject.hh" +#include "trick/Integrator.hh" +#include "trick/regula_falsi.h" -#ifdef USE_ER7_UTILS_INTEGRATORS -# include "sim_services/Integrator/er7_algorithms/ABM_Integrator.hh" -# include "sim_services/Integrator/er7_algorithms/Euler_Cromer_Integrator.hh" -# include "sim_services/Integrator/er7_algorithms/Euler_Integrator.hh" -# include "sim_services/Integrator/er7_algorithms/MM4_Integrator.hh" -# include "sim_services/Integrator/er7_algorithms/NL2_Integrator.hh" -# include "sim_services/Integrator/er7_algorithms/RK2_Integrator.hh" -# include "sim_services/Integrator/er7_algorithms/RK4_Integrator.hh" -# include "sim_services/Integrator/er7_algorithms/RKF45_Integrator.hh" -# include "sim_services/Integrator/er7_algorithms/RKF78_Integrator.hh" -# include "sim_services/Integrator/er7_algorithms/RKG4_Integrator.hh" -#else -# include "sim_services/Integrator/trick_algorithms/ABM_Integrator.hh" -# include "sim_services/Integrator/trick_algorithms/Euler_Cromer_Integrator.hh" -# include "sim_services/Integrator/trick_algorithms/Euler_Integrator.hh" -# include "sim_services/Integrator/trick_algorithms/MM4_Integrator.hh" -# include "sim_services/Integrator/trick_algorithms/NL2_Integrator.hh" -# include "sim_services/Integrator/trick_algorithms/RK2_Integrator.hh" -# include "sim_services/Integrator/trick_algorithms/RK4_Integrator.hh" -# include "sim_services/Integrator/trick_algorithms/RKF45_Integrator.hh" -# include "sim_services/Integrator/trick_algorithms/RKF78_Integrator.hh" -# include "sim_services/Integrator/trick_algorithms/RKG4_Integrator.hh" -#endif +#include "trick/ABM_Integrator.hh" +#include "trick/Euler_Cromer_Integrator.hh" +#include "trick/Euler_Integrator.hh" +#include "trick/MM4_Integrator.hh" +#include "trick/NL2_Integrator.hh" +#include "trick/RK2_Integrator.hh" +#include "trick/RK4_Integrator.hh" +#include "trick/RKF45_Integrator.hh" +#include "trick/RKF78_Integrator.hh" +#include "trick/RKG4_Integrator.hh" -#include "sim_services/MasterSlave/include/MSSocket.hh" -#include "sim_services/MasterSlave/include/MSSharedMem.hh" -#include "sim_services/MasterSlave/include/Master.hh" -#include "sim_services/MasterSlave/include/Slave.hh" -#include "sim_services/MasterSlave/include/master_proto.h" -#include "sim_services/MemoryManager/include/MemoryManager.hh" -#include "sim_services/MemoryManager/include/memorymanager_c_intf.h" -#include "sim_services/CheckPointRestart/include/CheckPointRestart.hh" -#include "sim_services/CheckPointRestart/include/CheckPointRestart_c_intf.hh" -#include "sim_services/Collect/include/collect_proto.hh" -#include "sim_services/Sie/include/AttributesMap.hh" -#include "sim_services/Sie/include/sie_c_intf.h" -#include "sim_services/Message/include/MessageCout.hh" -#include "sim_services/Message/include/MessageFile.hh" -#include "sim_services/Message/include/MessageLCout.hh" -#include "sim_services/Message/include/MessagePublisher.hh" -#include "sim_services/Message/include/MessageSubscriber.hh" -#include "sim_services/Message/include/MessageTCDevice.hh" -#include "sim_services/Message/include/message_proto.h" -#include "sim_services/MonteCarlo/include/MonteCarlo.hh" -#include "sim_services/MonteCarlo/include/montecarlo_c_intf.h" -#include "sim_services/MonteCarlo/include/MonteVarCalculated.hh" -#include "sim_services/MonteCarlo/include/MonteVarFile.hh" -#include "sim_services/MonteCarlo/include/MonteVarFixed.hh" -#include "sim_services/MonteCarlo/include/MonteVarRandom.hh" -#include "sim_services/RealtimeSync/include/RealtimeSync.hh" -#include "sim_services/RealtimeSync/include/realtimesync_proto.h" -#include "sim_services/RealtimeInjector/include/RtiExec.hh" -#include "sim_services/RealtimeInjector/include/RtiStager.hh" -#include "sim_services/Timer/include/ITimer.hh" -#include "sim_services/UnitTest/include/UnitTest.hh" -#include "sim_services/UnitTest/include/trick_tests.h" -#include "sim_services/VariableServer/include/VariableServer.hh" -#include "sim_services/VariableServer/include/variable_server_proto.h" -#include "sim_services/include/Flag.h" -#include "trick_utils/units/include/Unit.hh" +#include "trick/MSSocket.hh" +#include "trick/MSSharedMem.hh" +#include "trick/Master.hh" +#include "trick/Slave.hh" +#include "trick/master_proto.h" +#include "trick/MemoryManager.hh" +#include "trick/memorymanager_c_intf.h" +#include "trick/CheckPointRestart.hh" +#include "trick/CheckPointRestart_c_intf.hh" +#include "trick/collect_proto.hh" +#include "trick/AttributesMap.hh" +#include "trick/sie_c_intf.h" +#include "trick/MessageCout.hh" +#include "trick/MessageFile.hh" +#include "trick/MessageLCout.hh" +#include "trick/MessagePublisher.hh" +#include "trick/MessageSubscriber.hh" +#include "trick/MessageTCDevice.hh" +#include "trick/message_proto.h" +#include "trick/MonteCarlo.hh" +#include "trick/montecarlo_c_intf.h" +#include "trick/MonteVarCalculated.hh" +#include "trick/MonteVarFile.hh" +#include "trick/MonteVarFixed.hh" +#include "trick/MonteVarRandom.hh" +#include "trick/RealtimeSync.hh" +#include "trick/realtimesync_proto.h" +#include "trick/RtiExec.hh" +#include "trick/RtiStager.hh" +#include "trick/ITimer.hh" +#include "trick/UnitTest.hh" +#include "trick/trick_tests.h" +#include "trick/VariableServer.hh" +#include "trick/variable_server_proto.h" +#include "trick/Flag.h" +#include "trick/Unit.hh" #ifdef USE_ER7_UTILS_INTEGRATORS #include "er7_utils/integration/core/include/integrator_constructor_factory.hh" diff --git a/trick_source/trick_swig/swig_convert_units.cpp b/trick_source/trick_swig/swig_convert_units.cpp index 096c22fc..596260e2 100644 --- a/trick_source/trick_swig/swig_convert_units.cpp +++ b/trick_source/trick_swig/swig_convert_units.cpp @@ -2,7 +2,7 @@ #include <Python.h> #include <iostream> -#include "trick_utils/units/include/Unit.hh" +#include "trick/Unit.hh" int convert_united_value( std::string & to_units , std::string & from_units , long long * val ) { diff --git a/trick_source/trick_swig/swig_double.cpp b/trick_source/trick_swig/swig_double.cpp index 5b034370..ecb3f795 100644 --- a/trick_source/trick_swig/swig_double.cpp +++ b/trick_source/trick_swig/swig_double.cpp @@ -5,7 +5,7 @@ #include "trick_swig/swig_int.hh" #include "trick_swig/swig_convert_units.hh" -#include "trick_utils/units/include/Unit.hh" +#include "trick/Unit.hh" char swig_double::str_output[32] ; diff --git a/trick_source/trick_swig/swig_int.cpp b/trick_source/trick_swig/swig_int.cpp index 09e7d8ed..b31a6b34 100644 --- a/trick_source/trick_swig/swig_int.cpp +++ b/trick_source/trick_swig/swig_int.cpp @@ -5,7 +5,7 @@ #include "trick_swig/swig_double.hh" #include "trick_swig/swig_convert_units.hh" -#include "trick_utils/units/include/Unit.hh" +#include "trick/Unit.hh" char swig_int::str_output[32] ; diff --git a/trick_source/trick_swig/swig_int_typemap.i b/trick_source/trick_swig/swig_int_typemap.i index 489bc933..b4e2db97 100644 --- a/trick_source/trick_swig/swig_int_typemap.i +++ b/trick_source/trick_swig/swig_int_typemap.i @@ -10,10 +10,10 @@ #include "trick_swig/swig_double.hh" #include "trick_swig/swig_ref.hh" #include "trick_swig/PrimitiveAttributesMap.hh" -#include "sim_services/Units/include/UnitsMap.hh" -#include "trick_utils/units/include/Unit.hh" -#include "sim_services/MemoryManager/include/reference.h" -#include "sim_services/MemoryManager/include/memorymanager_c_intf.h" +#include "trick/UnitsMap.hh" +#include "trick/Unit.hh" +#include "trick/reference.h" +#include "trick/memorymanager_c_intf.h" #include "trick_swig/swig_int_templates.hh" diff --git a/trick_source/trick_swig/swig_ref.cpp b/trick_source/trick_swig/swig_ref.cpp index 208e2d50..2083ff31 100644 --- a/trick_source/trick_swig/swig_ref.cpp +++ b/trick_source/trick_swig/swig_ref.cpp @@ -9,9 +9,9 @@ #include "trick_swig/swig_double.hh" #include "trick_swig/swig_int.hh" #include "trick_swig/swig_convert_units.hh" -#include "sim_services/MemoryManager/include/MemoryManager.hh" -#include "sim_services/MemoryManager/include/memorymanager_c_intf.h" -#include "sim_services/CheckPointAgent/include/PythonPrint.hh" +#include "trick/MemoryManager.hh" +#include "trick/memorymanager_c_intf.h" +#include "trick/PythonPrint.hh" #if PY_VERSION_HEX < 0x02050000 #define Py_ssize_t int diff --git a/trick_source/trick_swig/swig_ref.hh b/trick_source/trick_swig/swig_ref.hh index dcde7a4e..94418347 100644 --- a/trick_source/trick_swig/swig_ref.hh +++ b/trick_source/trick_swig/swig_ref.hh @@ -3,7 +3,7 @@ #define SWIG_REF_HH #include <string> -#include "sim_services/MemoryManager/include/reference.h" +#include "trick/reference.h" #define TRICK_SWIG_PARAMETER_INCORRECT_TYPE 9 #define TRICK_SWIG_SLICE_ASSIGNMENT 10 diff --git a/trick_source/trick_swig/trick_swig.i b/trick_source/trick_swig/trick_swig.i index 108b0f71..17c4d653 100644 --- a/trick_source/trick_swig/trick_swig.i +++ b/trick_source/trick_swig/trick_swig.i @@ -18,12 +18,12 @@ %{ #include <sstream> -#include "sim_services/Units/include/UnitsMap.hh" -#include "trick_utils/units/include/Unit.hh" -#include "sim_services/MemoryManager/include/MemoryManager.hh" -#include "sim_services/MemoryManager/include/reference.h" -#include "sim_services/MemoryManager/include/memorymanager_c_intf.h" -#include "sim_services/CheckPointAgent/include/PythonPrint.hh" +#include "trick/UnitsMap.hh" +#include "trick/Unit.hh" +#include "trick/MemoryManager.hh" +#include "trick/reference.h" +#include "trick/memorymanager_c_intf.h" +#include "trick/PythonPrint.hh" #ifndef SWIG_as_voidptr diff --git a/trick_source/trick_swig/units_attach.i b/trick_source/trick_swig/units_attach.i index d83bb6f3..a822a82f 100644 --- a/trick_source/trick_swig/units_attach.i +++ b/trick_source/trick_swig/units_attach.i @@ -5,7 +5,7 @@ #define UNITS_ATTACH_I %inline %{ -#include "trick_utils/units/include/Unit.hh" +#include "trick/Unit.hh" #include "trick_swig/swig_double.hh" %} diff --git a/trick_source/trick_utils/comm/Makefile b/trick_source/trick_utils/comm/Makefile index c440b6a8..063e27cd 100644 --- a/trick_source/trick_utils/comm/Makefile +++ b/trick_source/trick_utils/comm/Makefile @@ -2,7 +2,7 @@ ifdef TRICK_HOME ifneq ($(STAND_ALONE), 1) --include ${TRICK_HOME}/makefiles/Makefile.common +-include ${TRICK_HOME}/share/trick/makefiles/Makefile.common OBJECT_FILES = \ $(OBJ_DIR)/tc_accept.o \ @@ -30,11 +30,9 @@ OBJECT_FILES = \ $(OBJ_DIR)/tc_init_udp_server.o \ $(OBJ_DIR)/trick_bswap_buffer.o \ $(OBJ_DIR)/trick_byteswap.o \ - $(OBJ_DIR)/trick_error_hndlr.o \ - $(OBJ_DIR)/io_tc.o \ - $(OBJ_DIR)/io_trick_error_hndlr.o + $(OBJ_DIR)/trick_error_hndlr.o --include ${TRICK_HOME}/makefiles/Makefile.tricklib +-include ${TRICK_HOME}/share/trick/makefiles/Makefile.tricklib -include Makefile_deps ifneq ($(DMTCP),) diff --git a/trick_source/trick_utils/comm/include/attributes.h b/trick_source/trick_utils/comm/include/attributes.h deleted file mode 100644 index d931b501..00000000 --- a/trick_source/trick_utils/comm/include/attributes.h +++ /dev/null @@ -1,134 +0,0 @@ -/* -PURPOSE: - (Data structure typedef for parameter attributes used by executive IO - routines and filled by the interface code generator.) - -REFERENCE: - (((Bailey, R.W) - (Trick Simulation Environment Developer's Guide - Beta Release) - (NASA:JSC #......) - (JSC / Engineering Directorate / Automation and Robotics Division) - (February 1991) ())) - -PROGRAMMERS: - ((Robert W. Bailey) (LinCom Corp) (September 1990) (Initial Release.)) -*/ - -#ifndef ATTRIBUTES_H -#define ATTRIBUTES_H - -#include <stddef.h> - -#define MAX_INDEX 8 - -#ifdef __cplusplus -extern "C" { -#endif - -/* ADDR_BF is analagous to offsetof for bit field parameters */ -#define ADDR_BF(X,Y,W) ((offsetof(X,Y)+(sizeof(((X*)0)->Y)+(W*4)))) -#define ADDR_BF0(W) (W*4) -#define GET_SIZE(X) ( (X == 0)? 0 : (*((int*)((char*)X-8))) ) -#define REF_LEVEL 16 /* Maximum level for nested data structure names */ - -typedef enum { - Language_C, /* -- ANSI C */ - Language_CPP, /* -- C Plus Plus */ - Language_Ada /* -- Ada */ -} Language; - -typedef struct { - int size; /* -- index for first array element */ - int start; /* -- index for first array element */ -} INDEX; - -typedef struct ATTRIBUTES_tag { - - char *name; /* -- Name of Parameter at current level */ - char *type_name; /* -- Parameter type name */ - char *units; /* -- Units of Measurement */ - char *alias; /* -- Name alias for parameter */ - char *des; /* -- Parameter description */ - int io; /* -- Input / Output processing restrictions, - 0=no processing, - 1=output, - 2=input, - 3=both */ - int visited; /* -- Flag to check if attr struct visited. - Used by sie and db. */ - int type; /* -- Type of parameter */ - int size; /* -- Data type size in bytes */ - double range_min; /* -- Minimum allowable value for parameter */ - double range_max; /* -- Minimum allowable value for parameter */ - Language language; /* -- Native language of parameter */ - int reference; /* -- 0 = No 1 = C++ reference variable */ - unsigned long offset; /* -- Offset in bytes of this param from - beginning of data structure */ - char *attr; /* -- Address to next level parameter - attributes, either ATTRIBUTES* or - ENUM_ATTR* */ - int num_index; /* -- Number of array indices for the param */ - INDEX index[8]; /* -- Array index info */ - -} ATTRIBUTES; - -typedef struct { - char *label; /* -- Enumeration label */ - int value; /* -- Enumeration value */ -} ENUM_ATTR; - -typedef struct { - - char *name; /* -- Name of Parameter at current level */ - char *type_name; /* -- Parameter type name */ - char *units; /* -- Units of Measurement */ - char *alias; /* -- Name alias for parameter */ - char *des; /* -- Parameter description */ - char *attr; /* -- Address to next level param attributes, - either ATTRIBUTES* or ENUM_ATTR* */ - double range_min; /* -- Minimum allowable value for parameter */ - double range_max; /* -- Minimum allowable value for parameter */ - int size; /* -- Size of each data item in BITS */ - int offset; /* -- Offset from beginning of record to - data, in BITS */ - char type; /* -- Type of parameter */ - char io; /* -- Input / Output processing restrictions, - 0=no processing, - 1=output, - 2=input, - 3=both */ - char num_index; /* -- Number of array indices for the param */ - INDEX index[8]; /* -- Array index info */ - -} ADA_ATTR; - - -typedef struct { - - /* Parsed information from input file */ - int level; /* -- Level of nested struct ref */ - char reference[512]; /* -- Main buf for var reference */ - char name[REF_LEVEL][80]; /* -- Ref name for each level */ - int dim[REF_LEVEL]; /* -- Ref array dimensions - for each level */ - int index[REF_LEVEL][MAX_INDEX]; /* -- Array element for each - dimension */ - char units[32]; /* -- Units as specified in - input runstream */ - Language language; /* -- Language syntax used in - input file */ - - /* Parameter attributes */ - int attr_level; /* -- Current ref name level in - IO routines */ - char *address; /* -- Address of the specified ref*/ - int index_lim[REF_LEVEL][MAX_INDEX]; /* -- Max size, each of - ref's dims */ - ATTRIBUTES attr; /* -- Parameter attributes */ - -} REF; - -#ifdef __cplusplus -} -#endif -#endif diff --git a/trick_source/trick_utils/comm/src/stubs.c b/trick_source/trick_utils/comm/src/stubs.c index 3a75ea54..f3e4cc98 100644 --- a/trick_source/trick_utils/comm/src/stubs.c +++ b/trick_source/trick_utils/comm/src/stubs.c @@ -27,7 +27,7 @@ #include <unistd.h> #endif -#include "../include/hs_msg.h" +#include "trick/hs_msg.h" #ifdef STAND_ALONE int send_hs(FILE * fp, char *format, ...); diff --git a/trick_source/trick_utils/comm/src/tc_accept.c b/trick_source/trick_utils/comm/src/tc_accept.c index f8c529c7..7a122e7e 100644 --- a/trick_source/trick_utils/comm/src/tc_accept.c +++ b/trick_source/trick_utils/comm/src/tc_accept.c @@ -3,8 +3,8 @@ * Accept a connection from a communications client */ -#include "../include/tc.h" -#include "../include/tc_proto.h" +#include "trick/tc.h" +#include "trick/tc_proto.h" #if _DMTCP #include <dlfcn.h> diff --git a/trick_source/trick_utils/comm/src/tc_blockio.c b/trick_source/trick_utils/comm/src/tc_blockio.c index 99c85316..fb0bf0bb 100644 --- a/trick_source/trick_utils/comm/src/tc_blockio.c +++ b/trick_source/trick_utils/comm/src/tc_blockio.c @@ -1,6 +1,6 @@ -#include "../include/tc.h" -#include "../include/tc_proto.h" +#include "trick/tc.h" +#include "trick/tc_proto.h" /* *Set a device to BLOCKIO or NOBLOCKIO - may be used as a toggle diff --git a/trick_source/trick_utils/comm/src/tc_broadcast_conninfo.c b/trick_source/trick_utils/comm/src/tc_broadcast_conninfo.c index 92ec112a..49bad025 100644 --- a/trick_source/trick_utils/comm/src/tc_broadcast_conninfo.c +++ b/trick_source/trick_utils/comm/src/tc_broadcast_conninfo.c @@ -3,8 +3,8 @@ * Broadcast Connection Information */ -#include "../include/tc.h" -#include "../include/tc_proto.h" +#include "trick/tc.h" +#include "trick/tc_proto.h" #ifdef __WIN32__ DWORD WINAPI tc_broadcast_conninfo(LPVOID info) diff --git a/trick_source/trick_utils/comm/src/tc_clock_init.c b/trick_source/trick_utils/comm/src/tc_clock_init.c index 4d247beb..654c2f75 100644 --- a/trick_source/trick_utils/comm/src/tc_clock_init.c +++ b/trick_source/trick_utils/comm/src/tc_clock_init.c @@ -3,8 +3,8 @@ * Get system clock reference time */ -#include "../include/tc.h" -#include "../include/tc_proto.h" +#include "trick/tc.h" +#include "trick/tc_proto.h" double tc_clock_init(void) { diff --git a/trick_source/trick_utils/comm/src/tc_clock_time.c b/trick_source/trick_utils/comm/src/tc_clock_time.c index 1c0dc9df..7a2cc7ec 100644 --- a/trick_source/trick_utils/comm/src/tc_clock_time.c +++ b/trick_source/trick_utils/comm/src/tc_clock_time.c @@ -3,8 +3,8 @@ * Get elapsed time since last call to tc_clock_init() */ -#include "../include/tc.h" -#include "../include/tc_proto.h" +#include "trick/tc.h" +#include "trick/tc_proto.h" double tc_clock_time(double ref_time) { diff --git a/trick_source/trick_utils/comm/src/tc_connect.c b/trick_source/trick_utils/comm/src/tc_connect.c index 6d3cd8e7..2b094f7e 100644 --- a/trick_source/trick_utils/comm/src/tc_connect.c +++ b/trick_source/trick_utils/comm/src/tc_connect.c @@ -3,8 +3,8 @@ * Establish a connection with a communications server */ -#include "../include/tc.h" -#include "../include/tc_proto.h" +#include "trick/tc.h" +#include "trick/tc_proto.h" #if _DMTCP #include <dlfcn.h> diff --git a/trick_source/trick_utils/comm/src/tc_dev_copy.c b/trick_source/trick_utils/comm/src/tc_dev_copy.c index 95ca895f..b914e3fb 100644 --- a/trick_source/trick_utils/comm/src/tc_dev_copy.c +++ b/trick_source/trick_utils/comm/src/tc_dev_copy.c @@ -1,7 +1,7 @@ #include <string.h> -#include "../include/tc.h" -#include "../include/tc_proto.h" +#include "trick/tc.h" +#include "trick/tc_proto.h" int tc_dev_copy(TCDevice * dest, TCDevice * src) { diff --git a/trick_source/trick_utils/comm/src/tc_disconnect.c b/trick_source/trick_utils/comm/src/tc_disconnect.c index 1cd250a1..4f59bb74 100644 --- a/trick_source/trick_utils/comm/src/tc_disconnect.c +++ b/trick_source/trick_utils/comm/src/tc_disconnect.c @@ -3,8 +3,8 @@ * Disconnect a device */ -#include "../include/tc.h" -#include "../include/tc_proto.h" +#include "trick/tc.h" +#include "trick/tc_proto.h" int tc_disconnect(TCDevice * device) { diff --git a/trick_source/trick_utils/comm/src/tc_error.c b/trick_source/trick_utils/comm/src/tc_error.c index bac37dde..3f1cc4de 100644 --- a/trick_source/trick_utils/comm/src/tc_error.c +++ b/trick_source/trick_utils/comm/src/tc_error.c @@ -3,8 +3,8 @@ * Turn error reporting On/Off */ -#include "../include/tc.h" -#include "../include/tc_proto.h" +#include "trick/tc.h" +#include "trick/tc_proto.h" int tc_error(TCDevice * device, int on_off) { diff --git a/trick_source/trick_utils/comm/src/tc_init.c b/trick_source/trick_utils/comm/src/tc_init.c index fd6589ce..41f63e94 100644 --- a/trick_source/trick_utils/comm/src/tc_init.c +++ b/trick_source/trick_utils/comm/src/tc_init.c @@ -3,8 +3,8 @@ * Set up a device on which to listen for connections */ #include <fcntl.h> -#include "../include/tc.h" -#include "../include/tc_proto.h" +#include "trick/tc.h" +#include "trick/tc_proto.h" int tc_init(TCDevice * listen_device) { diff --git a/trick_source/trick_utils/comm/src/tc_init_mcast_client.c b/trick_source/trick_utils/comm/src/tc_init_mcast_client.c index d0e94ef5..9b137e92 100644 --- a/trick_source/trick_utils/comm/src/tc_init_mcast_client.c +++ b/trick_source/trick_utils/comm/src/tc_init_mcast_client.c @@ -16,8 +16,8 @@ PROGRAMMERS: (((M. Will) (L3-Com) (29 November 2006) (--) (CAIL))) */ -#include "../include/tc.h" -#include "../include/tc_proto.h" +#include "trick/tc.h" +#include "trick/tc_proto.h" int tc_init_mcast_client(TCDevice * mcast_client_device) { diff --git a/trick_source/trick_utils/comm/src/tc_init_mcast_server.c b/trick_source/trick_utils/comm/src/tc_init_mcast_server.c index cf6f88f9..604b2a09 100644 --- a/trick_source/trick_utils/comm/src/tc_init_mcast_server.c +++ b/trick_source/trick_utils/comm/src/tc_init_mcast_server.c @@ -14,8 +14,8 @@ PROGRAMMERS: (((M. Will) (L3-Com) (29 November 2006) (--) (CAIL))) */ -#include "../include/tc.h" -#include "../include/tc_proto.h" +#include "trick/tc.h" +#include "trick/tc_proto.h" int tc_init_mcast_server(TCDevice * mcast_server_device) { diff --git a/trick_source/trick_utils/comm/src/tc_init_udp_client.c b/trick_source/trick_utils/comm/src/tc_init_udp_client.c index 780e3665..6220bada 100644 --- a/trick_source/trick_utils/comm/src/tc_init_udp_client.c +++ b/trick_source/trick_utils/comm/src/tc_init_udp_client.c @@ -13,8 +13,8 @@ PROGRAMMERS: (((M. Will) (L3-Com) (31 October 2006) (--) (CAIL))) */ -#include "../include/tc.h" -#include "../include/tc_proto.h" +#include "trick/tc.h" +#include "trick/tc_proto.h" static struct sockaddr_in sockin; #ifndef STAND_ALONE diff --git a/trick_source/trick_utils/comm/src/tc_init_udp_server.c b/trick_source/trick_utils/comm/src/tc_init_udp_server.c index 7abe40b8..efeb8160 100644 --- a/trick_source/trick_utils/comm/src/tc_init_udp_server.c +++ b/trick_source/trick_utils/comm/src/tc_init_udp_server.c @@ -13,8 +13,8 @@ PROGRAMMERS: (((M. Will) (L3-Com) (31 October 2006) (--) (CAIL))) */ -#include "../include/tc.h" -#include "../include/tc_proto.h" +#include "trick/tc.h" +#include "trick/tc_proto.h" int tc_init_udp_server( /* RETURN: -- 0 for success */ TCDevice * udp_server_device) diff --git a/trick_source/trick_utils/comm/src/tc_isValid.c b/trick_source/trick_utils/comm/src/tc_isValid.c index 6fe2bbaa..36338da8 100644 --- a/trick_source/trick_utils/comm/src/tc_isValid.c +++ b/trick_source/trick_utils/comm/src/tc_isValid.c @@ -3,8 +3,8 @@ * Check to see if a device is valid */ -#include "../include/tc.h" -#include "../include/tc_proto.h" +#include "trick/tc.h" +#include "trick/tc_proto.h" int tc_isValid(TCDevice * device) { diff --git a/trick_source/trick_utils/comm/src/tc_listen.c b/trick_source/trick_utils/comm/src/tc_listen.c index 84f74cab..fb504c03 100644 --- a/trick_source/trick_utils/comm/src/tc_listen.c +++ b/trick_source/trick_utils/comm/src/tc_listen.c @@ -3,8 +3,8 @@ * Check to see if a client is attempting to connect */ -#include "../include/tc.h" -#include "../include/tc_proto.h" +#include "trick/tc.h" +#include "trick/tc_proto.h" #if (__APPLE__ | __WIN32__| __Lynx__ | __QNX__ | __ghs ) diff --git a/trick_source/trick_utils/comm/src/tc_multiconnect.c b/trick_source/trick_utils/comm/src/tc_multiconnect.c index e2e048c8..9471c558 100644 --- a/trick_source/trick_utils/comm/src/tc_multiconnect.c +++ b/trick_source/trick_utils/comm/src/tc_multiconnect.c @@ -3,8 +3,8 @@ * Multicast connect */ -#include "../include/tc.h" -#include "../include/tc_proto.h" +#include "trick/tc.h" +#include "trick/tc_proto.h" #include <string.h> #ifdef __WIN32__ #include <process.h> diff --git a/trick_source/trick_utils/comm/src/tc_pending.c b/trick_source/trick_utils/comm/src/tc_pending.c index c34b87a3..523ea52e 100644 --- a/trick_source/trick_utils/comm/src/tc_pending.c +++ b/trick_source/trick_utils/comm/src/tc_pending.c @@ -3,8 +3,8 @@ * See if data is available for reading on a non-blocking connection */ -#include "../include/tc.h" -#include "../include/tc_proto.h" +#include "trick/tc.h" +#include "trick/tc_proto.h" int tc_pending(TCDevice * device) { diff --git a/trick_source/trick_utils/comm/src/tc_read.c b/trick_source/trick_utils/comm/src/tc_read.c index 428779a0..b224e70d 100644 --- a/trick_source/trick_utils/comm/src/tc_read.c +++ b/trick_source/trick_utils/comm/src/tc_read.c @@ -3,8 +3,8 @@ * Read data from a device */ -#include "../include/tc.h" -#include "../include/tc_proto.h" +#include "trick/tc.h" +#include "trick/tc_proto.h" int tc_read_(TCDevice * device, char *buffer, int size, const char *file, int line) { diff --git a/trick_source/trick_utils/comm/src/tc_read_byteswap.c b/trick_source/trick_utils/comm/src/tc_read_byteswap.c index d6ccaad8..512f651f 100644 --- a/trick_source/trick_utils/comm/src/tc_read_byteswap.c +++ b/trick_source/trick_utils/comm/src/tc_read_byteswap.c @@ -4,8 +4,8 @@ * byte orders are different. */ -#include "../include/tc.h" -#include "../include/tc_proto.h" +#include "trick/tc.h" +#include "trick/tc_proto.h" int tc_read_byteswap(TCDevice * device, char *buffer, int size, ATTRIBUTES * attr) { diff --git a/trick_source/trick_utils/comm/src/tc_set_blockio.c b/trick_source/trick_utils/comm/src/tc_set_blockio.c index 1c2827c4..07841899 100644 --- a/trick_source/trick_utils/comm/src/tc_set_blockio.c +++ b/trick_source/trick_utils/comm/src/tc_set_blockio.c @@ -3,8 +3,8 @@ * Set the time in seconds that a blocking read will wait before timing out */ -#include "../include/tc.h" -#include "../include/tc_proto.h" +#include "trick/tc.h" +#include "trick/tc_proto.h" int tc_set_blockio_timeout_limit(TCDevice * device, double limit) { diff --git a/trick_source/trick_utils/comm/src/tc_write.c b/trick_source/trick_utils/comm/src/tc_write.c index 005814cd..82df6255 100644 --- a/trick_source/trick_utils/comm/src/tc_write.c +++ b/trick_source/trick_utils/comm/src/tc_write.c @@ -3,8 +3,8 @@ * Write data to a device */ -#include "../include/tc.h" -#include "../include/tc_proto.h" +#include "trick/tc.h" +#include "trick/tc_proto.h" int tc_write_(TCDevice * device, char *buffer, int size, const char *file, int line) { diff --git a/trick_source/trick_utils/comm/src/tc_write_byteswap.c b/trick_source/trick_utils/comm/src/tc_write_byteswap.c index 8f27e3b3..872bcaec 100644 --- a/trick_source/trick_utils/comm/src/tc_write_byteswap.c +++ b/trick_source/trick_utils/comm/src/tc_write_byteswap.c @@ -4,8 +4,8 @@ * byte orders are different. */ -#include "../include/tc.h" -#include "../include/tc_proto.h" +#include "trick/tc.h" +#include "trick/tc_proto.h" int tc_write_byteswap(TCDevice * device, char *buffer, int size, ATTRIBUTES * attr) { diff --git a/trick_source/trick_utils/comm/src/trick_bswap_buffer.c b/trick_source/trick_utils/comm/src/trick_bswap_buffer.c index 1c0f3ca0..09d55fe0 100644 --- a/trick_source/trick_utils/comm/src/trick_bswap_buffer.c +++ b/trick_source/trick_utils/comm/src/trick_bswap_buffer.c @@ -5,15 +5,15 @@ #define TRICK_STRUCTURED 103 #define TRICK_BITFIELD 11 #define TRICK_UNSIGNED_BITFIELD 12 -#include "../include/attributes.h" -#include "../include/trick_byteswap.h" +#include "trick/attributes.h" +#include "trick/trick_byteswap.h" #else -#include "sim_services/MemoryManager/include/attributes.h" -#include "sim_services/MemoryManager/include/parameter_types.h" -#include "trick_utils/comm/include/trick_byteswap.h" +#include "trick/attributes.h" +#include "trick/parameter_types.h" +#include "trick/trick_byteswap.h" #endif -#include "../include/tc_proto.h" +#include "trick/tc_proto.h" /* * tofrom: 1 = to. * Use 1 (to) before writing data. Converts to the other endian diff --git a/trick_source/trick_utils/comm/src/trick_byteswap.c b/trick_source/trick_utils/comm/src/trick_byteswap.c index 745e56ce..af03d3a7 100644 --- a/trick_source/trick_utils/comm/src/trick_byteswap.c +++ b/trick_source/trick_utils/comm/src/trick_byteswap.c @@ -14,9 +14,9 @@ #ifdef STAND_ALONE -#include "../include/trick_byteswap.h" +#include "trick/trick_byteswap.h" #else -#include "trick_utils/comm/include/trick_byteswap.h" +#include "trick/trick_byteswap.h" #endif /* (note from ISP developers) Normally this routine would just zip through the double a byte at a time and reassign diff --git a/trick_source/trick_utils/comm/src/trick_error_hndlr.c b/trick_source/trick_utils/comm/src/trick_error_hndlr.c index d7fea90d..fb4d0522 100644 --- a/trick_source/trick_utils/comm/src/trick_error_hndlr.c +++ b/trick_source/trick_utils/comm/src/trick_error_hndlr.c @@ -24,8 +24,8 @@ #include <unistd.h> #endif -#include "../include/trick_error_hndlr.h" -#include "../include/tc.h" +#include "trick/trick_error_hndlr.h" +#include "trick/tc.h" #ifndef STAND_ALONE extern int send_hs( /* Return: -1 on failure , 0 for completion */ diff --git a/trick_source/trick_utils/interpolator/Makefile b/trick_source/trick_utils/interpolator/Makefile index e6447861..1f1cda7f 100644 --- a/trick_source/trick_utils/interpolator/Makefile +++ b/trick_source/trick_utils/interpolator/Makefile @@ -2,8 +2,8 @@ ifdef TRICK_HOME ifneq ($(STAND_ALONE), 1) --include ${TRICK_HOME}/makefiles/Makefile.common --include ${TRICK_HOME}/makefiles/Makefile.tricklib +-include ${TRICK_HOME}/share/trick/makefiles/Makefile.common +-include ${TRICK_HOME}/share/trick/makefiles/Makefile.tricklib -include Makefile_deps diff --git a/trick_source/trick_utils/interpolator/src/Interpolator.cpp b/trick_source/trick_utils/interpolator/src/Interpolator.cpp index f71543ae..b27ad6ee 100644 --- a/trick_source/trick_utils/interpolator/src/Interpolator.cpp +++ b/trick_source/trick_utils/interpolator/src/Interpolator.cpp @@ -2,7 +2,7 @@ #include <iostream> #include <sstream> #include <stdarg.h> -#include "Interpolator.hh" +#include "trick/Interpolator.hh" double Trick::Interpolator::eval (double param[], unsigned int param_index, unsigned int offset) throw (std::logic_error) { diff --git a/trick_source/trick_utils/makefile b/trick_source/trick_utils/makefile index 51ba61b8..2aac316c 100644 --- a/trick_source/trick_utils/makefile +++ b/trick_source/trick_utils/makefile @@ -7,7 +7,7 @@ # # Once ran, all libraries go into "lib" . -include $(TRICK_HOME)/makefiles/Makefile.common +include $(TRICK_HOME)/share/trick/makefiles/Makefile.common ifndef TRICK_HOST_CPU export TRICK_HOST_CPU := $(shell gte TRICK_HOST_CPU) diff --git a/trick_source/trick_utils/math/Makefile b/trick_source/trick_utils/math/Makefile index a061e8af..262bae0d 100644 --- a/trick_source/trick_utils/math/Makefile +++ b/trick_source/trick_utils/math/Makefile @@ -2,8 +2,8 @@ ifdef TRICK_HOME ifneq ($(STAND_ALONE), 1) --include ${TRICK_HOME}/makefiles/Makefile.common --include ${TRICK_HOME}/makefiles/Makefile.tricklib +-include ${TRICK_HOME}/share/trick/makefiles/Makefile.common +-include ${TRICK_HOME}/share/trick/makefiles/Makefile.tricklib -include Makefile_deps diff --git a/trick_source/trick_utils/math/src/LUD_inv.c b/trick_source/trick_utils/math/src/LUD_inv.c index c62cb515..04df93c1 100644 --- a/trick_source/trick_utils/math/src/LUD_inv.c +++ b/trick_source/trick_utils/math/src/LUD_inv.c @@ -8,7 +8,7 @@ #include <stdio.h> #include <string.h> // for memcpy #include <stdlib.h> // for malloc -#include "../include/trick_math.h" +#include "trick/trick_math.h" int LUD_inv( /* RETURN: -- Zero */ double **y, /* Out: Matrix inverse */ diff --git a/trick_source/trick_utils/math/src/LUT_inv.c b/trick_source/trick_utils/math/src/LUT_inv.c index d4540680..2361bcfc 100644 --- a/trick_source/trick_utils/math/src/LUT_inv.c +++ b/trick_source/trick_utils/math/src/LUT_inv.c @@ -5,7 +5,7 @@ PROGRAMMERS: (((M Schira) (McDonnell Douglas) (Feb 1994) (v1.0) (Init Release))) */ -#include "../include/trick_math.h" +#include "trick/trick_math.h" int LUT_inv( /* RETURN: -- Zero */ double **y, /* OUT: -- Matrix inverse */ diff --git a/trick_source/trick_utils/math/src/LU_bksb.c b/trick_source/trick_utils/math/src/LU_bksb.c index b224109a..0400712f 100644 --- a/trick_source/trick_utils/math/src/LU_bksb.c +++ b/trick_source/trick_utils/math/src/LU_bksb.c @@ -11,7 +11,7 @@ PROGRAMMERS: (((M Schira) (McDonnell Douglas) (Jan 1993) (v1.0) (Init Release))) */ -#include "../include/trick_math.h" +#include "trick/trick_math.h" void LU_bksb( /* Return: Zero */ double *b, /* Inout: Temporary storage */ diff --git a/trick_source/trick_utils/math/src/LU_dcmp.c b/trick_source/trick_utils/math/src/LU_dcmp.c index 760b7acb..014c5deb 100644 --- a/trick_source/trick_utils/math/src/LU_dcmp.c +++ b/trick_source/trick_utils/math/src/LU_dcmp.c @@ -6,7 +6,7 @@ PROGRAMMERS: (((M Schira) (McDonnell Douglas) (Jan 1993) (v1.0) (Init Release))) */ #include <stdio.h> -#include "../include/trick_math.h" +#include "trick/trick_math.h" #define tiny 1.0e-20 diff --git a/trick_source/trick_utils/math/src/dLU_Choleski.c b/trick_source/trick_utils/math/src/dLU_Choleski.c index f21cb2b7..868b85b3 100644 --- a/trick_source/trick_utils/math/src/dLU_Choleski.c +++ b/trick_source/trick_utils/math/src/dLU_Choleski.c @@ -22,7 +22,7 @@ PROGRAMMERS: (((Robert W. Bailey) (LinCom Corp) (2/1/91) (Trick-CR-00000) (Initial Release))) */ #include <stdio.h> -#include "../include/trick_math.h" +#include "trick/trick_math.h" #define TINY (1.0e-37) diff --git a/trick_source/trick_utils/math/src/dLU_solver.c b/trick_source/trick_utils/math/src/dLU_solver.c index 8cc56be4..ef4fd225 100644 --- a/trick_source/trick_utils/math/src/dLU_solver.c +++ b/trick_source/trick_utils/math/src/dLU_solver.c @@ -16,7 +16,7 @@ PROGRAMMERS: (((Robert W. Bailey) (LinCom Corp) (2/1/91) (Trick-CR-00000) (Initial Release))) */ #include <stdio.h> -#include "../include/trick_math.h" +#include "trick/trick_math.h" #define TINY (1.0e-20) diff --git a/trick_source/trick_utils/math/src/dS_function.c b/trick_source/trick_utils/math/src/dS_function.c index 11a49224..d293d5ff 100644 --- a/trick_source/trick_utils/math/src/dS_function.c +++ b/trick_source/trick_utils/math/src/dS_function.c @@ -5,7 +5,7 @@ PROGRAMMERS: (((Robert W. Bailey) (LinCom Corp) (3/22/91) (Trick-CR-00000) (Initial release))) */ -#include "../include/trick_math.h" +#include "trick/trick_math.h" double dS_function( /* Return: -- 0.0 <= value <= 1.0 */ double x, /* In: 'x' parameter */ diff --git a/trick_source/trick_utils/math/src/deuler_123.c b/trick_source/trick_utils/math/src/deuler_123.c index cb34eb2f..b2d8c4e7 100644 --- a/trick_source/trick_utils/math/src/deuler_123.c +++ b/trick_source/trick_utils/math/src/deuler_123.c @@ -19,7 +19,7 @@ PROGRAMMERS: angle[2] = YAW - M_PI <= YAW < M_PI */ -#include "../include/trick_math.h" +#include "trick/trick_math.h" int euler123( double angle[3], /* In: r Method=0, 0=ROLL , 1=PITCH , 2=YAW */ diff --git a/trick_source/trick_utils/math/src/deuler_132.c b/trick_source/trick_utils/math/src/deuler_132.c index 656525ae..12f36d94 100644 --- a/trick_source/trick_utils/math/src/deuler_132.c +++ b/trick_source/trick_utils/math/src/deuler_132.c @@ -32,7 +32,7 @@ PROGRAMMERS: */ #include <stdio.h> -#include "../include/trick_math.h" +#include "trick/trick_math.h" int euler132( double angle[3], /* In: r method=0, 0=ROLL , 1=YAW , 2=PITCH */ diff --git a/trick_source/trick_utils/math/src/deuler_213.c b/trick_source/trick_utils/math/src/deuler_213.c index 0d1aac2a..de3446b3 100644 --- a/trick_source/trick_utils/math/src/deuler_213.c +++ b/trick_source/trick_utils/math/src/deuler_213.c @@ -20,7 +20,7 @@ PROGRAMMERS: */ #include <stdio.h> -#include "../include/trick_math.h" +#include "trick/trick_math.h" int euler213(double angle[3], /* In: r Method=0, 0=PITCH , 1=ROLL , 2=YAW */ double mat[3][3], /* Out: r Method=0, diff --git a/trick_source/trick_utils/math/src/deuler_231.c b/trick_source/trick_utils/math/src/deuler_231.c index 45d24bc6..1c0cdfb7 100644 --- a/trick_source/trick_utils/math/src/deuler_231.c +++ b/trick_source/trick_utils/math/src/deuler_231.c @@ -20,7 +20,7 @@ PROGRAMMERS: */ #include <stdio.h> -#include "../include/trick_math.h" +#include "trick/trick_math.h" int euler231( /* Return: -- None. */ double angle[3], /* In: r Method=0, 0=PITCH, 1=YAW, 2=ROLL */ diff --git a/trick_source/trick_utils/math/src/deuler_312.c b/trick_source/trick_utils/math/src/deuler_312.c index 4afc79ab..ae736d7f 100644 --- a/trick_source/trick_utils/math/src/deuler_312.c +++ b/trick_source/trick_utils/math/src/deuler_312.c @@ -20,7 +20,7 @@ PROGRAMMERS: */ #include <stdio.h> -#include "../include/trick_math.h" +#include "trick/trick_math.h" int euler312( double angle[3], /* In: r Method=0, 0=YAW, 1=ROLL, 2=PITCH */ diff --git a/trick_source/trick_utils/math/src/deuler_321.c b/trick_source/trick_utils/math/src/deuler_321.c index ba53005c..6ef565b0 100644 --- a/trick_source/trick_utils/math/src/deuler_321.c +++ b/trick_source/trick_utils/math/src/deuler_321.c @@ -20,7 +20,7 @@ PROGRAMMERS: */ #include <stdio.h> -#include "../include/trick_math.h" +#include "trick/trick_math.h" int euler321( double angle[3], /* In: r method=0, 0=YAW, 1=PITCH, 2=ROLL */ diff --git a/trick_source/trick_utils/math/src/dm_add.c b/trick_source/trick_utils/math/src/dm_add.c index 605065d0..9f2e6113 100644 --- a/trick_source/trick_utils/math/src/dm_add.c +++ b/trick_source/trick_utils/math/src/dm_add.c @@ -5,7 +5,7 @@ PROGRAMMERS: (((Les Quiocho) (NASA/Johnson Space Center) (Jan 1990) (v1.0) (Init Release))) */ -#include "../include/trick_math.h" +#include "trick/trick_math.h" void dm_add(double sum[3][3], /* Out: Sum of the two matrices */ double mat1[3][3], /* In: Matrix 1 */ diff --git a/trick_source/trick_utils/math/src/dm_copy.c b/trick_source/trick_utils/math/src/dm_copy.c index 2391568c..08a9b9b0 100644 --- a/trick_source/trick_utils/math/src/dm_copy.c +++ b/trick_source/trick_utils/math/src/dm_copy.c @@ -7,7 +7,7 @@ PROGRAMMERS: (((Les Quiocho) (NASA/Johnson Space Center) (Jan 1990) (v1.0) (Init Release))) */ -#include "../include/trick_math.h" +#include "trick/trick_math.h" void dm_copy(double copy[3][3], /* Out: copy of the matrix */ double mat[3][3]) diff --git a/trick_source/trick_utils/math/src/dm_ident.c b/trick_source/trick_utils/math/src/dm_ident.c index bb5dea94..3fd1a524 100644 --- a/trick_source/trick_utils/math/src/dm_ident.c +++ b/trick_source/trick_utils/math/src/dm_ident.c @@ -5,7 +5,7 @@ PROGRAMMERS: (((Les Quiocho) (NASA/Johnson Space Center) (Jan 1990) (v1.0) (Init Release))) */ -#include "../include/trick_math.h" +#include "trick/trick_math.h" void dm_ident(double mat[3][3]) { /* Inout: Matrix identity */ diff --git a/trick_source/trick_utils/math/src/dm_init.c b/trick_source/trick_utils/math/src/dm_init.c index 0af5181c..22f2ecfe 100644 --- a/trick_source/trick_utils/math/src/dm_init.c +++ b/trick_source/trick_utils/math/src/dm_init.c @@ -5,7 +5,7 @@ PROGRAMMERS: (((Les Quiocho) (NASA/Johnson Space Center) (Jan 1990) (v1.0) (Init Release))) */ -#include "../include/trick_math.h" +#include "trick/trick_math.h" void dm_init(double mat[3][3]) { /* Inout: Initialized matrix */ diff --git a/trick_source/trick_utils/math/src/dm_invert.c b/trick_source/trick_utils/math/src/dm_invert.c index e42efaf6..76cbf6a0 100644 --- a/trick_source/trick_utils/math/src/dm_invert.c +++ b/trick_source/trick_utils/math/src/dm_invert.c @@ -5,7 +5,7 @@ PROGRAMMERS: (((Robert W. Bailey) (LinCom Corporation) (4/1/91) (Trick-CR-00004) (Gravity / Inertial Frame Models))) */ -#include "../include/trick_math.h" +#include "trick/trick_math.h" int dm_invert(double inv[3][3], /* Out: The 3X3 inverse of matrix 'm' */ double m[3][3]) diff --git a/trick_source/trick_utils/math/src/dm_invert_symm.c b/trick_source/trick_utils/math/src/dm_invert_symm.c index cc100f90..bdba9cad 100644 --- a/trick_source/trick_utils/math/src/dm_invert_symm.c +++ b/trick_source/trick_utils/math/src/dm_invert_symm.c @@ -5,7 +5,7 @@ PROGRAMMERS: (((Robert W. Bailey) (LinCom Corporation) (4/1/91) (Trick-CR-00004) (Gravity / Inertial Frame Models))) */ -#include "../include/trick_math.h" +#include "trick/trick_math.h" int dm_invert_symm(double inv[3][3], /* Out: The 3X3 inverse of matrix 'm' */ double m[3][3]) diff --git a/trick_source/trick_utils/math/src/dm_orthonormal.c b/trick_source/trick_utils/math/src/dm_orthonormal.c index 1891250c..555176e8 100644 --- a/trick_source/trick_utils/math/src/dm_orthonormal.c +++ b/trick_source/trick_utils/math/src/dm_orthonormal.c @@ -6,7 +6,7 @@ PROGRAMMERS: (((Robert W. Bailey) (LinCom Corp) (4/1/91) (Trick-CR-00004) (Gravity / Inertial Frame Models))) */ -#include "../include/trick_math.h" +#include "trick/trick_math.h" void dm_orthonormal( /* Return: -- none */ double m[3][3], /* Inout: Matrix to be orthonormalized. */ diff --git a/trick_source/trick_utils/math/src/dm_print.c b/trick_source/trick_utils/math/src/dm_print.c index f73afc75..a9968e38 100644 --- a/trick_source/trick_utils/math/src/dm_print.c +++ b/trick_source/trick_utils/math/src/dm_print.c @@ -6,7 +6,7 @@ PROGRAMMERS: (((Les Quiocho) (NASA/JSC) (Jan 1990) (v1.0) (Init Release))) */ #include <stdio.h> -#include "../include/trick_math.h" +#include "trick/trick_math.h" void dm_print(double mat[3][3]) { /* In: matrix to be printed */ diff --git a/trick_source/trick_utils/math/src/dm_scale.c b/trick_source/trick_utils/math/src/dm_scale.c index d30b968b..a3ad90d6 100644 --- a/trick_source/trick_utils/math/src/dm_scale.c +++ b/trick_source/trick_utils/math/src/dm_scale.c @@ -7,7 +7,7 @@ PROGRAMMERS: (((Les Quiocho) (NASA/Johnson Space Center) (Jan 1990) (v1.0) (Init Release))) */ -#include "../include/trick_math.h" +#include "trick/trick_math.h" void dm_scale(double prod[3][3], /* Out: Product of the two matrices */ double mat[3][3], /* In: Matrix */ diff --git a/trick_source/trick_utils/math/src/dm_sub.c b/trick_source/trick_utils/math/src/dm_sub.c index 49b9fa0c..bcb270ed 100644 --- a/trick_source/trick_utils/math/src/dm_sub.c +++ b/trick_source/trick_utils/math/src/dm_sub.c @@ -5,7 +5,7 @@ PROGRAMMERS: (((Les Quiocho) (NASA/Johnson Space Center) (Jan 1990) (v1.0) (Init Release))) */ -#include "../include/trick_math.h" +#include "trick/trick_math.h" void dm_sub(double diff[3][3], /* Out: Difference of the two matrices */ double mat1[3][3], /* In: Matrix 1 */ diff --git a/trick_source/trick_utils/math/src/dm_trans.c b/trick_source/trick_utils/math/src/dm_trans.c index 6b89176e..6f29b58c 100644 --- a/trick_source/trick_utils/math/src/dm_trans.c +++ b/trick_source/trick_utils/math/src/dm_trans.c @@ -5,7 +5,7 @@ PROGRAMMERS: (((Les Quiocho) (NASA/Johnson Space Center) (Jan 1990) (v1.0) (Init Release))) */ -#include "../include/trick_math.h" +#include "trick/trick_math.h" void dm_trans(double trans[3][3], /* Out: transpose of the matrix */ double mat[3][3]) diff --git a/trick_source/trick_utils/math/src/dmtxm.c b/trick_source/trick_utils/math/src/dmtxm.c index c27e9743..da126145 100644 --- a/trick_source/trick_utils/math/src/dmtxm.c +++ b/trick_source/trick_utils/math/src/dmtxm.c @@ -5,7 +5,7 @@ PROGRAMMERS: (((Les Quiocho) (NASA/JSC) (Jan 1990) (v1.0) (Init Release))) */ -#include "../include/trick_math.h" +#include "trick/trick_math.h" void dmtxm(double prod[3][3], /* Out: product of the two matrices */ double mat1[3][3], /* In: matrix 1 */ diff --git a/trick_source/trick_utils/math/src/dmtxmt.c b/trick_source/trick_utils/math/src/dmtxmt.c index 61894cd3..83c70830 100644 --- a/trick_source/trick_utils/math/src/dmtxmt.c +++ b/trick_source/trick_utils/math/src/dmtxmt.c @@ -5,7 +5,7 @@ PROGRAMMERS: (((Les Quiocho) (NASA/JSC) (Jan 1990) (v1.0) (Init Release))) */ -#include "../include/trick_math.h" +#include "trick/trick_math.h" void dmtxmt( /* Return: -- none */ double prod[3][3], /* Out: Product of the two matrices */ diff --git a/trick_source/trick_utils/math/src/dmtxv.c b/trick_source/trick_utils/math/src/dmtxv.c index 83b549f1..4d07b8ef 100644 --- a/trick_source/trick_utils/math/src/dmtxv.c +++ b/trick_source/trick_utils/math/src/dmtxv.c @@ -5,7 +5,7 @@ PROGRAMMERS: (((Les Quiocho) (NASA/JSC) (Jan 1990) (v1.0) (Init Release))) */ -#include "../include/trick_math.h" +#include "trick/trick_math.h" void dmtxv(double prod[], /* Out: Product of the matrix and vector */ double mat[3][3], /* In: Matrix */ diff --git a/trick_source/trick_utils/math/src/dmxm.c b/trick_source/trick_utils/math/src/dmxm.c index 687d3085..6a0d42a0 100644 --- a/trick_source/trick_utils/math/src/dmxm.c +++ b/trick_source/trick_utils/math/src/dmxm.c @@ -5,7 +5,7 @@ PROGRAMMERS: (((Les Quiocho) (NASA/JSC) (Jan 1990) (v1.0) (Init Release))) */ -#include "../include/trick_math.h" +#include "trick/trick_math.h" void dmxm( /* Return: -- none */ double prod[3][3], /* Out: Product of the two matrices */ diff --git a/trick_source/trick_utils/math/src/dmxmt.c b/trick_source/trick_utils/math/src/dmxmt.c index 7b9fd395..6c63ac08 100644 --- a/trick_source/trick_utils/math/src/dmxmt.c +++ b/trick_source/trick_utils/math/src/dmxmt.c @@ -5,7 +5,7 @@ PROGRAMMERS: (((Les Quiocho) (NASA/JSC) (Jan 1990) (v1.0) (Init Release))) */ -#include "../include/trick_math.h" +#include "trick/trick_math.h" void dmxmt(double prod[3][3], /* Out: Product of the two matrices */ double mat1[3][3], /* In: Matrix 1 */ diff --git a/trick_source/trick_utils/math/src/dmxv.c b/trick_source/trick_utils/math/src/dmxv.c index 4e9fe27e..d67a9757 100644 --- a/trick_source/trick_utils/math/src/dmxv.c +++ b/trick_source/trick_utils/math/src/dmxv.c @@ -5,7 +5,7 @@ PROGRAMMERS: (((Les Quiocho) (NASA/JSC) (Jan 1990) (v1.0) (Init Release))) */ -#include "../include/trick_math.h" +#include "trick/trick_math.h" void dmxv(double prod[], /* Out: Product of the matrix and vector */ double mat[3][3], /* In: Matrix */ diff --git a/trick_source/trick_utils/math/src/drandom_gaussian.c b/trick_source/trick_utils/math/src/drandom_gaussian.c index 30874bca..c652bf11 100644 --- a/trick_source/trick_utils/math/src/drandom_gaussian.c +++ b/trick_source/trick_utils/math/src/drandom_gaussian.c @@ -9,7 +9,7 @@ #include <stdlib.h> -#include "../include/trick_math.h" +#include "trick/trick_math.h" #define MAX_VALUE 32768.0 /* 32768 = 2**15 */ diff --git a/trick_source/trick_utils/math/src/dsingle_axis_rot.c b/trick_source/trick_utils/math/src/dsingle_axis_rot.c index fbc14458..a330def0 100644 --- a/trick_source/trick_utils/math/src/dsingle_axis_rot.c +++ b/trick_source/trick_utils/math/src/dsingle_axis_rot.c @@ -29,7 +29,7 @@ #include <math.h> #include <stdio.h> -#include "../include/trick_math.h" +#include "trick/trick_math.h" void dsingle_axis_rot( /* Return: -- None */ diff --git a/trick_source/trick_utils/math/src/dv_add.c b/trick_source/trick_utils/math/src/dv_add.c index abd1ff2b..065e5e53 100644 --- a/trick_source/trick_utils/math/src/dv_add.c +++ b/trick_source/trick_utils/math/src/dv_add.c @@ -5,7 +5,7 @@ PROGRAMMERS: (((Les Quiocho) (NASA/JSC) (Jan 1990) (v1.0) (Init Release))) */ -#include "../include/trick_math.h" +#include "trick/trick_math.h" void dv_add(double sum[], /* Out: Sum of the two vectors */ double vect1[], /* In: Vector 1 */ diff --git a/trick_source/trick_utils/math/src/dv_copy.c b/trick_source/trick_utils/math/src/dv_copy.c index 76045292..ef052d18 100644 --- a/trick_source/trick_utils/math/src/dv_copy.c +++ b/trick_source/trick_utils/math/src/dv_copy.c @@ -5,7 +5,7 @@ PROGRAMMERS: (((Les Quiocho) (NASA/JSC) (Jan 1990) (v1.0) (Init Release))) */ -#include "../include/trick_math.h" +#include "trick/trick_math.h" void dv_copy(double copy[], /* Out: copy of the vector */ double vect[]) diff --git a/trick_source/trick_utils/math/src/dv_cross.c b/trick_source/trick_utils/math/src/dv_cross.c index 824a17c1..0470dfab 100644 --- a/trick_source/trick_utils/math/src/dv_cross.c +++ b/trick_source/trick_utils/math/src/dv_cross.c @@ -4,7 +4,7 @@ PROGRAMMERS: (((Les Quiocho) (NASA/JSC) (Jan 1990) (v1.0) (Init Release))) */ -#include "../include/trick_math.h" +#include "trick/trick_math.h" void dv_cross(double cross[], /* Out: cross product of the two vectors */ double vect1[], /* In: vector 1 */ diff --git a/trick_source/trick_utils/math/src/dv_dot.c b/trick_source/trick_utils/math/src/dv_dot.c index 18d82912..320e9c97 100644 --- a/trick_source/trick_utils/math/src/dv_dot.c +++ b/trick_source/trick_utils/math/src/dv_dot.c @@ -3,7 +3,7 @@ PROGRAMMERS: (((Les Quiocho) (NASA/JSC) (Jan 1990) (v1.0) (Init Release))) */ -#include "../include/trick_math.h" +#include "trick/trick_math.h" double dv_dot( /* Return: Scalar dot or inner product */ double vect1[], /* In: Vector 1 */ diff --git a/trick_source/trick_utils/math/src/dv_init.c b/trick_source/trick_utils/math/src/dv_init.c index 39774c9d..6586bbe6 100644 --- a/trick_source/trick_utils/math/src/dv_init.c +++ b/trick_source/trick_utils/math/src/dv_init.c @@ -5,7 +5,7 @@ PROGRAMMERS: (((Les Quiocho) (NASA/JSC) (Jan 1990) (v1.0) (Init Release))) */ -#include "../include/trick_math.h" +#include "trick/trick_math.h" void dv_init(double vect[]) { /* Inout: Vector to be initialized */ diff --git a/trick_source/trick_utils/math/src/dv_mag.c b/trick_source/trick_utils/math/src/dv_mag.c index 0827997b..3e2a8dec 100644 --- a/trick_source/trick_utils/math/src/dv_mag.c +++ b/trick_source/trick_utils/math/src/dv_mag.c @@ -3,7 +3,7 @@ PROGRAMMERS: (((Les Quiocho) (NASA/JSC) (Jan 1990) (v1.0) (Init Release))) */ -#include "../include/trick_math.h" +#include "trick/trick_math.h" double dv_mag( /* Return: Magnitude of the vector */ double vect[]) diff --git a/trick_source/trick_utils/math/src/dv_norm.c b/trick_source/trick_utils/math/src/dv_norm.c index 3c769a41..cf4b8f40 100644 --- a/trick_source/trick_utils/math/src/dv_norm.c +++ b/trick_source/trick_utils/math/src/dv_norm.c @@ -5,7 +5,7 @@ PROGRAMMERS: (((Les Quiocho) (NASA/JSC) (Jan 1990) (v1.0) (Init Release))) */ -#include "../include/trick_math.h" +#include "trick/trick_math.h" void dv_norm(double norm[3], /* Out: Norm vector */ double vect[3]) diff --git a/trick_source/trick_utils/math/src/dv_print.c b/trick_source/trick_utils/math/src/dv_print.c index a7f243e0..a00ae043 100644 --- a/trick_source/trick_utils/math/src/dv_print.c +++ b/trick_source/trick_utils/math/src/dv_print.c @@ -4,7 +4,7 @@ PROGRAMMERS: (((Les Quiocho) (NASA/JSC) (Jan 1990) (v1.0) (Init Release))) */ #include <stdio.h> -#include "../include/trick_math.h" +#include "trick/trick_math.h" void dv_print(double vect[]) { /* In: Vector to be printed */ diff --git a/trick_source/trick_utils/math/src/dv_scale.c b/trick_source/trick_utils/math/src/dv_scale.c index 4eb4273a..cd19695c 100644 --- a/trick_source/trick_utils/math/src/dv_scale.c +++ b/trick_source/trick_utils/math/src/dv_scale.c @@ -4,7 +4,7 @@ PROGRAMMERS: (((Les Quiocho) (NASA/JSC) (Jan 1990) (v1.0) (Init Release))) */ -#include "../include/trick_math.h" +#include "trick/trick_math.h" void dv_scale(double prod[], /* Out: Produce of the vector and the scalar */ double vect[], /* In: Vector */ diff --git a/trick_source/trick_utils/math/src/dv_skew.c b/trick_source/trick_utils/math/src/dv_skew.c index 065b38d9..9f886ed9 100644 --- a/trick_source/trick_utils/math/src/dv_skew.c +++ b/trick_source/trick_utils/math/src/dv_skew.c @@ -4,7 +4,7 @@ PROGRAMMERS: (((Les Quiocho) (NASA/JSC) (Jan 1990) (v1.0) (Init Release))) */ -#include "../include/trick_math.h" +#include "trick/trick_math.h" void dv_skew(double skew[3][3], /* Out: Skew symmetic matrix */ double vect[]) diff --git a/trick_source/trick_utils/math/src/dv_store.c b/trick_source/trick_utils/math/src/dv_store.c index be88a6cf..8aa4f9c8 100644 --- a/trick_source/trick_utils/math/src/dv_store.c +++ b/trick_source/trick_utils/math/src/dv_store.c @@ -4,7 +4,7 @@ PROGRAMMERS: (((Les Quiocho) (NASA/JSC) (Jan 1990) (v1.0) (Init Release))) */ -#include "../include/trick_math.h" +#include "trick/trick_math.h" void dv_store(double vect[], /* Out: Vector */ double scalar) diff --git a/trick_source/trick_utils/math/src/dv_sub.c b/trick_source/trick_utils/math/src/dv_sub.c index 24f29926..a3782184 100644 --- a/trick_source/trick_utils/math/src/dv_sub.c +++ b/trick_source/trick_utils/math/src/dv_sub.c @@ -4,7 +4,7 @@ PROGRAMMERS: (((Les Quiocho) (NASA/JSC) (Jan 1990) (v1.0) (Init Release))) */ -#include "../include/trick_math.h" +#include "trick/trick_math.h" void dv_sub(double diff[], /* Out: Difference of the two vectors */ double vect1[], /* In: Vector 1 */ diff --git a/trick_source/trick_utils/math/src/dvxm.c b/trick_source/trick_utils/math/src/dvxm.c index 0da91368..57d9f5e0 100644 --- a/trick_source/trick_utils/math/src/dvxm.c +++ b/trick_source/trick_utils/math/src/dvxm.c @@ -5,7 +5,7 @@ */ -#include "../include/trick_math.h" +#include "trick/trick_math.h" void dvxm(double prod[], /* Out: Product of the vector and the matrix */ double vect[], /* In: Vector */ diff --git a/trick_source/trick_utils/math/src/dvxv_add.c b/trick_source/trick_utils/math/src/dvxv_add.c index 5ba8cd85..c2419ab9 100644 --- a/trick_source/trick_utils/math/src/dvxv_add.c +++ b/trick_source/trick_utils/math/src/dvxv_add.c @@ -4,7 +4,7 @@ PROGRAMMERS: (((Les Quiocho) (NASA/JSC) (Jan 1990) (v1.0) (Init Release))) */ -#include "../include/trick_math.h" +#include "trick/trick_math.h" void dvxv_add(double sum[], /* Out: Sum of cross product and sum */ double vect1[], /* In: Vector1 */ diff --git a/trick_source/trick_utils/math/src/dvxv_sub.c b/trick_source/trick_utils/math/src/dvxv_sub.c index 61d28cd7..8f8ebb82 100644 --- a/trick_source/trick_utils/math/src/dvxv_sub.c +++ b/trick_source/trick_utils/math/src/dvxv_sub.c @@ -4,7 +4,7 @@ PROGRAMMERS: (((Les Quiocho) (NASA/JSC) (Jan 1990) (v1.0) (Init Release))) */ -#include "../include/trick_math.h" +#include "trick/trick_math.h" void dvxv_sub(double diff[], /* Out: Difference of cross product and difference */ double vect1[], /* In: Vector1 */ diff --git a/trick_source/trick_utils/math/src/eigen_hh_red.c b/trick_source/trick_utils/math/src/eigen_hh_red.c index 76ab7aa3..c616944e 100644 --- a/trick_source/trick_utils/math/src/eigen_hh_red.c +++ b/trick_source/trick_utils/math/src/eigen_hh_red.c @@ -7,7 +7,7 @@ PROGRAMMERS: (((M Schira) (MDSS) (Jan 1994) (v1.0) (Init Release))) */ -#include "../include/trick_math.h" +#include "trick/trick_math.h" void eigen_hh_red(double **a, /* In: Input matrix */ diff --git a/trick_source/trick_utils/math/src/eigen_jacobi.c b/trick_source/trick_utils/math/src/eigen_jacobi.c index 1dd32ec1..97c6ba11 100644 --- a/trick_source/trick_utils/math/src/eigen_jacobi.c +++ b/trick_source/trick_utils/math/src/eigen_jacobi.c @@ -10,7 +10,7 @@ #include <stdio.h> #include <stdlib.h> -#include "../include/trick_math.h" +#include "trick/trick_math.h" int eigen_jacobi(double **k, /* In: Input stiffness matrix */ diff --git a/trick_source/trick_utils/math/src/eigen_jacobi_4.c b/trick_source/trick_utils/math/src/eigen_jacobi_4.c index ed2bcca7..3985ff01 100644 --- a/trick_source/trick_utils/math/src/eigen_jacobi_4.c +++ b/trick_source/trick_utils/math/src/eigen_jacobi_4.c @@ -10,7 +10,7 @@ #include <stdio.h> #include <stdlib.h> -#include "../include/trick_math.h" +#include "trick/trick_math.h" void eigen_jacobi_4(double k[4][4], /* In: input stiffness matrix */ double mass[4][4], /* In: input mass matrix */ diff --git a/trick_source/trick_utils/math/src/eigen_ql.c b/trick_source/trick_utils/math/src/eigen_ql.c index 5376fb4d..27583e56 100644 --- a/trick_source/trick_utils/math/src/eigen_ql.c +++ b/trick_source/trick_utils/math/src/eigen_ql.c @@ -10,7 +10,7 @@ #include <stdio.h> #include <stdlib.h> #include <math.h> -#include "../include/trick_math.h" +#include "trick/trick_math.h" void eigen_ql(double *d, /* Inout: input diagonal elements, output eigenvalues */ double *e, /* In: off diagonal elements */ diff --git a/trick_source/trick_utils/math/src/euler_matrix.c b/trick_source/trick_utils/math/src/euler_matrix.c index aaab7ea9..b3cfa859 100644 --- a/trick_source/trick_utils/math/src/euler_matrix.c +++ b/trick_source/trick_utils/math/src/euler_matrix.c @@ -6,8 +6,8 @@ PROGRAMMERS: (((Robert W. Bailey) (LinCom Corp) (2/1/91) (Trick-CR-00000) (Initial Release))) */ -#include "../include/reference_frame.h" -#include "../include/trick_math.h" +#include "trick/reference_frame.h" +#include "trick/trick_math.h" int euler_matrix(double angle[3], /* In: r Method=0, Euler angles */ double mat[3][3], /* Out: r Method=0, Coordinate transformation matrix */ diff --git a/trick_source/trick_utils/math/src/gauss_rnd_bell.c b/trick_source/trick_utils/math/src/gauss_rnd_bell.c index 6781c480..26f4b752 100644 --- a/trick_source/trick_utils/math/src/gauss_rnd_bell.c +++ b/trick_source/trick_utils/math/src/gauss_rnd_bell.c @@ -14,8 +14,8 @@ PROGRAMMERS: (((Ray Li) (LMES/DUAL) (96 Nov) (1.0) (ICDS random number generator)) ((Robert Gay) (LinCom) (May 1998) (--) (Trick format)) ((Robert Gay) (Titan-LinCom) (Aug 2001) (--) (Updates to put routines into trick math))) */ -#include "../include/rand_generator.h" -#include "../include/trick_math.h" +#include "trick/rand_generator.h" +#include "trick/trick_math.h" double gauss_rnd_bell( /* Return: Random number */ diff --git a/trick_source/trick_utils/math/src/gauss_rnd_pseudo.c b/trick_source/trick_utils/math/src/gauss_rnd_pseudo.c index f4def854..2c73dda9 100644 --- a/trick_source/trick_utils/math/src/gauss_rnd_pseudo.c +++ b/trick_source/trick_utils/math/src/gauss_rnd_pseudo.c @@ -13,8 +13,8 @@ PROGRAMMERS: (((Ray Li) (LMES/DUAL) (96 Nov) (1.0) (ICDS random number generator)) ((Robert Gay) (LinCom) (May 1998) (--) (Trick format)) ((Robert Gay) (Titan-LinCom) (Aug 2001) (--) (Updates to put routines into trick math))) */ -#include "../include/rand_generator.h" -#include "../include/trick_math.h" +#include "trick/rand_generator.h" +#include "trick/trick_math.h" double gauss_rnd_pseudo( /* Return: random number */ RAND_GENERATOR * G) diff --git a/trick_source/trick_utils/math/src/mat_copy.c b/trick_source/trick_utils/math/src/mat_copy.c index bad6b562..cc9a5170 100644 --- a/trick_source/trick_utils/math/src/mat_copy.c +++ b/trick_source/trick_utils/math/src/mat_copy.c @@ -5,7 +5,7 @@ */ #include <stdio.h> -#include "../include/trick_math.h" +#include "trick/trick_math.h" void mat_copy( /* Return: -- none */ double **copy, /* Out: copy of the matrix */ diff --git a/trick_source/trick_utils/math/src/mat_permute.c b/trick_source/trick_utils/math/src/mat_permute.c index 753d2e0e..5cd1db05 100644 --- a/trick_source/trick_utils/math/src/mat_permute.c +++ b/trick_source/trick_utils/math/src/mat_permute.c @@ -7,7 +7,7 @@ PROGRAMMERS: (((Les Quiocho) (NASA/JSC) (September 93) (Trick-CR-xxxxx) (--))) */ -#include "../include/trick_math.h" +#include "trick/trick_math.h" void mat_permute( /* Return: -- none */ double **A_coeff, /* In: A_coeff */ diff --git a/trick_source/trick_utils/math/src/mat_print.c b/trick_source/trick_utils/math/src/mat_print.c index 026c2585..44732622 100644 --- a/trick_source/trick_utils/math/src/mat_print.c +++ b/trick_source/trick_utils/math/src/mat_print.c @@ -4,7 +4,7 @@ PROGRAMMERS: (((Les Quiocho) (NASA/JSC) (Jan 1993) (v1.0) (Init Release))) */ #include <stdio.h> -#include "../include/trick_math.h" +#include "trick/trick_math.h" void mat_print(double **mat, /* In: Matrix to be printed */ int n) diff --git a/trick_source/trick_utils/math/src/mat_to_quat.c b/trick_source/trick_utils/math/src/mat_to_quat.c index ec3d74ff..7b1dfc61 100644 --- a/trick_source/trick_utils/math/src/mat_to_quat.c +++ b/trick_source/trick_utils/math/src/mat_to_quat.c @@ -7,7 +7,7 @@ */ -#include "../include/trick_math.h" +#include "trick/trick_math.h" void mat_to_quat(double quat[4], /* Out: Quaternion */ double a[3][3]) diff --git a/trick_source/trick_utils/math/src/mat_trans.c b/trick_source/trick_utils/math/src/mat_trans.c index 24c81c7e..0fa4a483 100644 --- a/trick_source/trick_utils/math/src/mat_trans.c +++ b/trick_source/trick_utils/math/src/mat_trans.c @@ -3,7 +3,7 @@ ASSUMPTIONS AND LIMITATIONS: ((Square matrix)) PROGRAMMERS: (((Les Quiocho) (NASA/JSC) (Jan 1993) (v1.0) (Init Release))) */ -#include "../include/trick_math.h" +#include "trick/trick_math.h" void mat_trans(double **trans, /* Out: Product of the two matrices */ double **mat, /* In: Matrix 1 */ diff --git a/trick_source/trick_utils/math/src/matxmat.c b/trick_source/trick_utils/math/src/matxmat.c index ad5c7e3a..f8f8a3a7 100644 --- a/trick_source/trick_utils/math/src/matxmat.c +++ b/trick_source/trick_utils/math/src/matxmat.c @@ -3,7 +3,7 @@ ASSUMPTIONS AND LIMITATIONS: ((Square matrix)) PROGRAMMERS: (((Les Quiocho) (NASA/JSC) (Jan 1993) (v1.0) (Init Release))) */ -#include "../include/trick_math.h" +#include "trick/trick_math.h" void matxmat(double **prod, /* Out: Product of the two matrices */ double **mat1, /* In: Matrix 1 */ diff --git a/trick_source/trick_utils/math/src/matxtrans.c b/trick_source/trick_utils/math/src/matxtrans.c index 7cfb30b6..59a905fd 100644 --- a/trick_source/trick_utils/math/src/matxtrans.c +++ b/trick_source/trick_utils/math/src/matxtrans.c @@ -3,7 +3,7 @@ ASSUMPTIONS AND LIMITATIONS: ((Square matrix)) PROGRAMMERS: (((Les Quiocho) (NASA/JSC) (Jan 1993) (v1.0) (Init Release))) */ -#include "../include/trick_math.h" +#include "trick/trick_math.h" void matxtrans(double **prod, /* Out: product of the two matrices */ double **mat1, /* In: matrix 1 */ diff --git a/trick_source/trick_utils/math/src/matxvec.c b/trick_source/trick_utils/math/src/matxvec.c index 0de6924c..c0db5a97 100644 --- a/trick_source/trick_utils/math/src/matxvec.c +++ b/trick_source/trick_utils/math/src/matxvec.c @@ -3,7 +3,7 @@ ASSUMPTIONS AND LIMITATIONS: ((Square matrix)) PROGRAMMERS: (((Les Quiocho) (NASA/JSC) (Jan 1993) (v1.0) (Init Release))) */ -#include "../include/trick_math.h" +#include "trick/trick_math.h" void matxvec(double *prod, /* Out: product of the two matrices */ double **mat, /* In: matrix 1 */ diff --git a/trick_source/trick_utils/math/src/quat_mult.c b/trick_source/trick_utils/math/src/quat_mult.c index c644c8ee..7b7ebe1b 100644 --- a/trick_source/trick_utils/math/src/quat_mult.c +++ b/trick_source/trick_utils/math/src/quat_mult.c @@ -8,7 +8,7 @@ */ -#include "../include/trick_math.h" +#include "trick/trick_math.h" void quat_mult(double q3[4], /* Out: quaternion */ double q1[4], /* In: quaternion */ diff --git a/trick_source/trick_utils/math/src/quat_norm.c b/trick_source/trick_utils/math/src/quat_norm.c index bfafd49b..2d291dcd 100644 --- a/trick_source/trick_utils/math/src/quat_norm.c +++ b/trick_source/trick_utils/math/src/quat_norm.c @@ -8,7 +8,7 @@ */ -#include "../include/trick_math.h" +#include "trick/trick_math.h" void quat_norm(double q2[4], /* Out: quaternion */ diff --git a/trick_source/trick_utils/math/src/quat_norm_integ.c b/trick_source/trick_utils/math/src/quat_norm_integ.c index 52cbf979..5961b66b 100644 --- a/trick_source/trick_utils/math/src/quat_norm_integ.c +++ b/trick_source/trick_utils/math/src/quat_norm_integ.c @@ -15,7 +15,7 @@ */ -#include "../include/trick_math.h" +#include "trick/trick_math.h" void quat_norm_integ(double q2[4], /* Out: normalized quaternion */ diff --git a/trick_source/trick_utils/math/src/quat_to_mat.c b/trick_source/trick_utils/math/src/quat_to_mat.c index 5f1b711a..aef9123b 100644 --- a/trick_source/trick_utils/math/src/quat_to_mat.c +++ b/trick_source/trick_utils/math/src/quat_to_mat.c @@ -5,7 +5,7 @@ */ -#include "../include/trick_math.h" +#include "trick/trick_math.h" void quat_to_mat(double a[3][3], /* Out: transformation matrix */ double quat[4]) diff --git a/trick_source/trick_utils/math/src/rand_num.c b/trick_source/trick_utils/math/src/rand_num.c index 768a5091..65dcc838 100644 --- a/trick_source/trick_utils/math/src/rand_num.c +++ b/trick_source/trick_utils/math/src/rand_num.c @@ -11,7 +11,7 @@ (Updates to put routines into trick math))) */ #include <stdio.h> -#include "../include/trick_math.h" +#include "trick/trick_math.h" double rand_num(RAND_GENERATOR * G) { /* Inout: Generator parameters */ diff --git a/trick_source/trick_utils/math/src/roundoff.c b/trick_source/trick_utils/math/src/roundoff.c index 1473a945..ab1d2ef7 100644 --- a/trick_source/trick_utils/math/src/roundoff.c +++ b/trick_source/trick_utils/math/src/roundoff.c @@ -7,7 +7,7 @@ PROGRAMMERS: (((Robert W. Bailey) (LinCom Corp) (Feb 1991) (v1.0) (Initial Release.))) */ -#include "../include/trick_math.h" +#include "trick/trick_math.h" double roundoff( /* Return: Value after roundoff */ double res, /* In: Resolution for roundoff function */ diff --git a/trick_source/trick_utils/math/src/tm_print_error.c b/trick_source/trick_utils/math/src/tm_print_error.c index 6ca6aaac..0cc402f0 100644 --- a/trick_source/trick_utils/math/src/tm_print_error.c +++ b/trick_source/trick_utils/math/src/tm_print_error.c @@ -4,7 +4,7 @@ */ #include <stdio.h> -#include "../include/trick_math_error.h" +#include "trick/trick_math_error.h" static char *trick_math_errors[] = { /* 00 */ "Success", diff --git a/trick_source/trick_utils/math/src/transxmat.c b/trick_source/trick_utils/math/src/transxmat.c index 5ef1d648..ed97331f 100644 --- a/trick_source/trick_utils/math/src/transxmat.c +++ b/trick_source/trick_utils/math/src/transxmat.c @@ -4,7 +4,7 @@ PROGRAMMERS: (((Les Quiocho) (NASA/JSC) (Jan 1993) (v1.0) (Init Release))) */ -#include "../include/trick_math.h" +#include "trick/trick_math.h" void transxmat(double **prod, /* Out: Product of the two matrices */ double **mat1, /* In: Matrix 1 */ diff --git a/trick_source/trick_utils/math/src/transxtrans.c b/trick_source/trick_utils/math/src/transxtrans.c index ccb27b50..35b9cbc2 100644 --- a/trick_source/trick_utils/math/src/transxtrans.c +++ b/trick_source/trick_utils/math/src/transxtrans.c @@ -4,7 +4,7 @@ PROGRAMMERS: (((Les Quiocho) (NASA/JSC) (Jan 1993) (v1.0) (Init Release))) */ -#include "../include/trick_math.h" +#include "trick/trick_math.h" void transxtrans(double **prod, /* Out: product of the two matrices */ double **mat1, /* In: matrix 1 */ diff --git a/trick_source/trick_utils/math/src/transxvec.c b/trick_source/trick_utils/math/src/transxvec.c index ea9ada9c..08ba7a86 100644 --- a/trick_source/trick_utils/math/src/transxvec.c +++ b/trick_source/trick_utils/math/src/transxvec.c @@ -4,7 +4,7 @@ PROGRAMMERS: (((Les Quiocho) (NASA/JSC) (Jan 1993) (v1.0) (Init Release))) */ -#include "../include/trick_math.h" +#include "trick/trick_math.h" void transxvec(double *prod, /* Out: Product of the two matrices */ double **mat, /* In: Matrix 1 */ diff --git a/trick_source/trick_utils/math/src/trick_gsl_rand.c b/trick_source/trick_utils/math/src/trick_gsl_rand.c index 46c0cc4f..95e14659 100644 --- a/trick_source/trick_utils/math/src/trick_gsl_rand.c +++ b/trick_source/trick_utils/math/src/trick_gsl_rand.c @@ -7,14 +7,14 @@ #include <stdio.h> #include <limits.h> #include <float.h> -#include "../include/rand_generator.h" -#include "sim_services/Message/include/message_proto.h" -#include "sim_services/Message/include/message_type.h" +#include "trick/rand_generator.h" +#include "trick/message_proto.h" +#include "trick/message_type.h" #if _HAVE_GSL #include "gsl/gsl_randist.h" #else -#include "../include/trick_math_proto.h" +#include "trick/trick_math_proto.h" #endif void trick_gsl_rand_init(TRICK_GSL_RANDIST * G) diff --git a/trick_source/trick_utils/math/src/trns_fnct_1o.c b/trick_source/trick_utils/math/src/trns_fnct_1o.c index af275519..43fcdd94 100644 --- a/trick_source/trick_utils/math/src/trns_fnct_1o.c +++ b/trick_source/trick_utils/math/src/trns_fnct_1o.c @@ -13,7 +13,7 @@ at current time based on initial in, initial out, current in and the transient coefficient -- first order differential equation. */ -#include "../include/trick_math.h" +#include "trick/trick_math.h" /* TOLERANCE FOR TIME CONSTANT AND DELTA TIME STEP */ diff --git a/trick_source/trick_utils/math/src/trns_fnct_2o.c b/trick_source/trick_utils/math/src/trns_fnct_2o.c index 359228df..aca3e5e6 100644 --- a/trick_source/trick_utils/math/src/trns_fnct_2o.c +++ b/trick_source/trick_utils/math/src/trns_fnct_2o.c @@ -6,7 +6,7 @@ PROGRAMMERS: (((Robert W. Bailey) (LinCom Corp) (3/21/91) (Trick-CR-00000) (Development))) */ #include <stdio.h> -#include "../include/trick_math.h" +#include "trick/trick_math.h" void trns_fnct_2o(double *z, /* In: damping ratio */ double *wn, /* In: r/s Natural frequency in */ diff --git a/trick_source/trick_utils/math/src/uniform_rnd_1.c b/trick_source/trick_utils/math/src/uniform_rnd_1.c index 98b912aa..c01354a3 100644 --- a/trick_source/trick_utils/math/src/uniform_rnd_1.c +++ b/trick_source/trick_utils/math/src/uniform_rnd_1.c @@ -28,8 +28,8 @@ #include <sys/times.h> #include <limits.h> #include <unistd.h> -#include "../include/rand_generator.h" -#include "../include/trick_math.h" +#include "trick/rand_generator.h" +#include "trick/trick_math.h" #ifndef HZ #define HZ 100 /* This is a kludge to accomodate for Darwin. On Darwin HZ is actually a kernal diff --git a/trick_source/trick_utils/math/src/uniform_rnd_triple.c b/trick_source/trick_utils/math/src/uniform_rnd_triple.c index bf4ed14d..c613fbfd 100644 --- a/trick_source/trick_utils/math/src/uniform_rnd_triple.c +++ b/trick_source/trick_utils/math/src/uniform_rnd_triple.c @@ -15,8 +15,8 @@ ((Robert Gay) (Titan-LinCom) (Aug 2001) (--) (Updates to put routines into trick math))) */ -#include "../include/rand_generator.h" -#include "../include/trick_math.h" +#include "trick/rand_generator.h" +#include "trick/trick_math.h" #define M1 259200 #define IA1 7141 diff --git a/trick_source/trick_utils/math/src/vec_print.c b/trick_source/trick_utils/math/src/vec_print.c index 193db70c..dfb2d14d 100644 --- a/trick_source/trick_utils/math/src/vec_print.c +++ b/trick_source/trick_utils/math/src/vec_print.c @@ -5,7 +5,7 @@ */ #include <stdio.h> -#include "../include/trick_math.h" +#include "trick/trick_math.h" void vec_print(double *vec, /* In: Matrix to be printed */ diff --git a/trick_source/trick_utils/math/src/wave_form.c b/trick_source/trick_utils/math/src/wave_form.c index ec644fcd..f837bfb8 100644 --- a/trick_source/trick_utils/math/src/wave_form.c +++ b/trick_source/trick_utils/math/src/wave_form.c @@ -19,8 +19,8 @@ #include <sys/times.h> #endif -#include "../include/wave_form.h" -#include "../include/trick_math.h" +#include "trick/wave_form.h" +#include "trick/trick_math.h" #if ( __sun || __linux || __APPLE__ || __CYGWIN__ || __Lynx__ || __QNX__ || __ghs || __INTERIX ) #define gettimeofday(T) gettimeofday(T,NULL) diff --git a/trick_source/trick_utils/shm/Makefile b/trick_source/trick_utils/shm/Makefile index c2c45db4..2689b639 100644 --- a/trick_source/trick_utils/shm/Makefile +++ b/trick_source/trick_utils/shm/Makefile @@ -2,8 +2,8 @@ ifdef TRICK_HOME ifneq ($(STAND_ALONE), 1) --include ${TRICK_HOME}/makefiles/Makefile.common --include ${TRICK_HOME}/makefiles/Makefile.tricklib +-include ${TRICK_HOME}/share/trick/makefiles/Makefile.common +-include ${TRICK_HOME}/share/trick/makefiles/Makefile.tricklib -include Makefile_deps diff --git a/trick_source/trick_utils/shm/src/tsm_disconnect.c b/trick_source/trick_utils/shm/src/tsm_disconnect.c index 53ccb45b..52a6aaf4 100644 --- a/trick_source/trick_utils/shm/src/tsm_disconnect.c +++ b/trick_source/trick_utils/shm/src/tsm_disconnect.c @@ -2,8 +2,8 @@ /* * Disconnect (detach) a shared memory segment */ -#include "../include/tsm.h" -#include "../include/tsm_proto.h" +#include "trick/tsm.h" +#include "trick/tsm_proto.h" int tsm_disconnect(TSMDevice * shm_device) diff --git a/trick_source/trick_utils/shm/src/tsm_init.c b/trick_source/trick_utils/shm/src/tsm_init.c index d08c9512..01f0b937 100644 --- a/trick_source/trick_utils/shm/src/tsm_init.c +++ b/trick_source/trick_utils/shm/src/tsm_init.c @@ -2,8 +2,8 @@ /* * Initialize a shared memory segment - get it and attach to it */ -#include "../include/tsm.h" -#include "../include/tsm_proto.h" +#include "trick/tsm.h" +#include "trick/tsm_proto.h" #include <sys/types.h> #include <sys/stat.h> diff --git a/trick_source/trick_utils/shm/src/tsm_init_with_lock.c b/trick_source/trick_utils/shm/src/tsm_init_with_lock.c index 15136f06..404e1dea 100644 --- a/trick_source/trick_utils/shm/src/tsm_init_with_lock.c +++ b/trick_source/trick_utils/shm/src/tsm_init_with_lock.c @@ -3,8 +3,8 @@ * and initialize the lock to be shared amongst multiple processes. * The user can then use it to lock memory during read/write operations. */ -#include "../include/tsm.h" -#include "../include/tsm_proto.h" +#include "trick/tsm.h" +#include "trick/tsm_proto.h" int tsm_init_with_lock(TSMDevice * shm_device) diff --git a/trick_source/trick_utils/shm/src/tsm_reconnect.c b/trick_source/trick_utils/shm/src/tsm_reconnect.c index 37db8c5a..ad6f0cae 100644 --- a/trick_source/trick_utils/shm/src/tsm_reconnect.c +++ b/trick_source/trick_utils/shm/src/tsm_reconnect.c @@ -1,8 +1,8 @@ /* * Reconnect to a disconnected shared memory segment - get it and attach to it */ -#include "../include/tsm.h" -#include "../include/tsm_proto.h" +#include "trick/tsm.h" +#include "trick/tsm_proto.h" int tsm_reconnect(TSMDevice * shm_device) { diff --git a/trick_source/trick_utils/trick_adt/Makefile b/trick_source/trick_utils/trick_adt/Makefile index 14c44b09..05c7ba6a 100644 --- a/trick_source/trick_utils/trick_adt/Makefile +++ b/trick_source/trick_utils/trick_adt/Makefile @@ -2,8 +2,8 @@ ifdef TRICK_HOME ifneq ($(STAND_ALONE), 1) --include ${TRICK_HOME}/makefiles/Makefile.common --include ${TRICK_HOME}/makefiles/Makefile.tricklib +-include ${TRICK_HOME}/share/trick/makefiles/Makefile.common +-include ${TRICK_HOME}/share/trick/makefiles/Makefile.tricklib -include Makefile_deps diff --git a/trick_source/trick_utils/trick_adt/src/MapStrToPtr.c b/trick_source/trick_utils/trick_adt/src/MapStrToPtr.c index bedc55e9..073ced5e 100644 --- a/trick_source/trick_utils/trick_adt/src/MapStrToPtr.c +++ b/trick_source/trick_utils/trick_adt/src/MapStrToPtr.c @@ -3,11 +3,7 @@ #include <stdio.h> #include <assert.h> #include <stdlib.h> -#include "MapStrToPtr.h" - -#if ( __ghs ) -#include "../../../sim_services/include/ghs_stubs.h" -#endif +#include "trick/MapStrToPtr.h" /* create a new table entry structure */ diff --git a/trick_source/trick_utils/trick_adt/src/bst.c b/trick_source/trick_utils/trick_adt/src/bst.c index b70a1d86..d2a500dc 100644 --- a/trick_source/trick_utils/trick_adt/src/bst.c +++ b/trick_source/trick_utils/trick_adt/src/bst.c @@ -3,7 +3,7 @@ #include <stdio.h> #include <stdlib.h> #include <assert.h> -#include "bst.h" +#include "trick/bst.h" /* locate the node that contains the data pointed to by info */ diff --git a/trick_source/trick_utils/trick_adt/src/bubble_sort.c b/trick_source/trick_utils/trick_adt/src/bubble_sort.c index 51261b44..ba65681b 100644 --- a/trick_source/trick_utils/trick_adt/src/bubble_sort.c +++ b/trick_source/trick_utils/trick_adt/src/bubble_sort.c @@ -13,7 +13,7 @@ PROGRAMMERS: (((Edwin Z. Crues) (LinCom) (10 Oct 97) (Trickified for RGPS work))) ***************************************************************************/ -#include "dllist.h" +#include "trick/dllist.h" #include <stdio.h> int bubble_sort( /* RETURN: -- Always returns zero. */ diff --git a/trick_source/trick_utils/trick_adt/src/dllist.c b/trick_source/trick_utils/trick_adt/src/dllist.c index 5ab5f387..810dd176 100644 --- a/trick_source/trick_utils/trick_adt/src/dllist.c +++ b/trick_source/trick_utils/trick_adt/src/dllist.c @@ -1,7 +1,7 @@ #include <stdlib.h> #include <stdio.h> -#include "dllist.h" +#include "trick/dllist.h" /* create and initialize a DLLIST */ /* return: pointer to the new list */ diff --git a/trick_source/trick_utils/trick_adt/src/lqueue.c b/trick_source/trick_utils/trick_adt/src/lqueue.c index f2a447cc..b6ab2090 100644 --- a/trick_source/trick_utils/trick_adt/src/lqueue.c +++ b/trick_source/trick_utils/trick_adt/src/lqueue.c @@ -3,8 +3,8 @@ #include <stdlib.h> #include <stdio.h> -#include "lqueue.h" -#include "dllist.h" +#include "trick/lqueue.h" +#include "trick/dllist.h" #include <assert.h> /* create and initialize an LQUEUE structure */ diff --git a/trick_source/trick_utils/trick_adt/src/lstack.c b/trick_source/trick_utils/trick_adt/src/lstack.c index cb0a161a..845de183 100644 --- a/trick_source/trick_utils/trick_adt/src/lstack.c +++ b/trick_source/trick_utils/trick_adt/src/lstack.c @@ -1,8 +1,8 @@ /******** implementation of LSTACK *************/ #include <stdlib.h> -#include "lstack.h" -#include "dllist.h" +#include "trick/lstack.h" +#include "trick/dllist.h" /* create an initialize a LSTACK structure */ diff --git a/trick_source/trick_utils/trick_adt/src/record_array.c b/trick_source/trick_utils/trick_adt/src/record_array.c index af910f0c..2e7be8ac 100644 --- a/trick_source/trick_utils/trick_adt/src/record_array.c +++ b/trick_source/trick_utils/trick_adt/src/record_array.c @@ -1,6 +1,6 @@ /* implementation of record array */ -#include "record_array.h" +#include "trick/record_array.h" #include <stdlib.h> diff --git a/trick_source/trick_utils/units/Makefile b/trick_source/trick_utils/units/Makefile index 56449028..b61fc601 100644 --- a/trick_source/trick_utils/units/Makefile +++ b/trick_source/trick_utils/units/Makefile @@ -2,8 +2,8 @@ ifdef TRICK_HOME ifneq ($(STAND_ALONE), 1) --include ${TRICK_HOME}/makefiles/Makefile.common --include ${TRICK_HOME}/makefiles/Makefile.tricklib +-include ${TRICK_HOME}/share/trick/makefiles/Makefile.common +-include ${TRICK_HOME}/share/trick/makefiles/Makefile.tricklib -include Makefile_deps diff --git a/trick_source/trick_utils/units/src/UCFn.cpp b/trick_source/trick_utils/units/src/UCFn.cpp index 54a9691c..81d98e7a 100644 --- a/trick_source/trick_utils/units/src/UCFn.cpp +++ b/trick_source/trick_utils/units/src/UCFn.cpp @@ -6,7 +6,7 @@ PROGRAMMERS: (Initial Release))) */ -#include "UCFn.hh" +#include "trick/UCFn.hh" UCFn::UCFn(const char *in_t_name, const char *in_f_name, double C1, double C0) { this->C[1]=C1; diff --git a/trick_source/trick_utils/units/src/Unit.cpp b/trick_source/trick_utils/units/src/Unit.cpp index 0dd254ce..70caa1f7 100644 --- a/trick_source/trick_utils/units/src/Unit.cpp +++ b/trick_source/trick_utils/units/src/Unit.cpp @@ -7,8 +7,8 @@ PROGRAMMERS: */ #include <string> -#include "Unit.hh" -#include "units_conv.h" +#include "trick/Unit.hh" +#include "trick/units_conv.h" Unit::Unit() { const char *name = "--"; diff --git a/trick_source/trick_utils/units/src/units_conv.c b/trick_source/trick_utils/units/src/units_conv.c index 41fe8525..f7b5fe9e 100644 --- a/trick_source/trick_utils/units/src/units_conv.c +++ b/trick_source/trick_utils/units/src/units_conv.c @@ -5,7 +5,7 @@ #include <stdio.h> #include <string.h> -#include "units_conv.h" +#include "trick/units_conv.h" typedef enum { No_Op, Mult_Op, Div_Op, Square_Op, Cube_Op, Units_Primitive, End_of_input, Unknown