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

@@ -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

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

bin/ICG

@@ -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 ;

bin/dre

@@ -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
-     

bin/fxplot

@@ -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
-

bin/gxplot

@@ -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
-

bin/install_user

@@ -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" ;
-

bin/tex/longtable.sty

@@ -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'.

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
 

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) ;
 }
 

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
+     

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 ;
 

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;

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;

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 ;

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;

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;

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 ;

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 ;

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

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;

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> ;

bin/trk2ascii

@@ -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
-

bin/trk2csv

@@ -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
-

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 :=

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

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.

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 {
 

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

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>

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 {
 

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.

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 {
 

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 {

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) %{

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) %{

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

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 {
 

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 {
 

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 {
 

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 {
 

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 {
 

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

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

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 {
 

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 {
 

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 {
 

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 ) ;

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 {
 

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 {
 

include/trick/ExternalApplicationManager.hh

@@ -7,7 +7,7 @@
 
 #include <vector>
 
-#include "ExternalApplication.hh"
+#include "trick/ExternalApplication.hh"
 
 namespace Trick {
 

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 {
 

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 {
 

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 {
 

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 {
 

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

include/trick/ITimer.hh

@@ -17,7 +17,7 @@ PROGRAMMERS:
 #include <semaphore.h>
 #include <string>
 
-#include "Timer.hh"
+#include "trick/Timer.hh"
 
 namespace Trick {
 

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 {
 

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

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>

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>

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

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.

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 {
 

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 {
 

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 {
 

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 {
 

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 {
 

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

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 {
 

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>

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 {
 

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 {
 

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
+

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 {
 

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" {

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

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 {
 

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 {
 

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 {
 

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 {
 

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 {
 

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 {
 

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 ) ;

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

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 {