Commit Graph

2189 Commits

Author SHA1 Message Date
John M. Penn
293bdad014 Merge Alex's and my changes to Makefile.common 2015-06-30 18:09:25 -05:00
John M. Penn
03284bf97d Break the Memory Manager out of libtrick.a into libtrick_mm.a. 2015-06-30 17:57:26 -05:00
Alex Lin
9c6dfed624 SWIG files in model libraries not being init'ed
Found that we need to add python files to lists of expected modules
before testing if they are being excluded.  Moved the check to
exclude to after adding the files to the list.

This may have uninteded consequences.  Might have to revisit using
different mechanism to exclude files and mark files as expected from
libraries.

refs #74
2015-06-30 11:01:30 -05:00
Alex Lin
8dc9966d7f Compile optional er7_utils code into its own library
Changed the master makefile to compile er7_utils into its own library.
Changed the sim makefile to include -ler7_utils if it is available.

refs #73
2015-06-29 09:52:18 -05:00
Alex Lin
9a32414be4 Use configure to determine pthread variables in makefile
Added AX_PTHREAD to the configure.ac script.  This change forces us to
have install-sh, config.sub and some other autoconf files.  Created
an autoconf directory to hold these files.  Changed the makefiles to
use the PTHREAD variables coming out of configure.

refs #69
2015-06-26 09:35:49 -05:00
Alex Lin
3c64d2cbe1 Remove duplicate stand-alone libraries
Removed additional stand alone rules in master makefile and the stand alone makefile in trick_utils.

refs #71
2015-06-25 14:40:18 -05:00
Alex Lin
cf3738d3fd Memory Manager tests trying to write io_src files in sim_services/include
Added 2 flags to trick-ICG. "-o" will specify an output directory.  Added this
option to the calls to trick-ICG for the Memory Manager tests.  Also added
a "-m" option to create the map files ICG creates for sims.  The memory manager
tests do not need these maps so we don't include the option.  Added the -m option
to the sim makefile and the master makefile so we do create the map when compile
Trick core and sims.

refs #72
2015-06-24 17:49:14 -05:00
Alex Lin
bfc197f81c Remove duplicate stand-alone libraries
defined CONFIG_MK in the trick_util makefiles to allow making those directories
without running configure first.  Removed link to hs_msg.h which no longer
exists.

refs #71
2015-06-24 17:18:06 -05:00
Alex Lin
44736be398 Remove dupilcate stand-alone libraries
The test programs now need more than just -ltrick.

refs #71
2015-06-24 16:54:15 -05:00
Alex Lin
03979a2079 Memory manager test programs need libtrick_units.a
Added libtrick_units.a to the linking of memory manager test programs.

refs #71
2015-06-24 16:26:11 -05:00
Alex Lin
5ab9b966c8 Remove duplicate stand-alone libraries
Forgot that the rpath syntax is different on Linux and Macs.

refs #71
2015-06-24 16:15:21 -05:00
Alex Lin
941eb5c1cc Remove duplicate stand-alone libraries
I changed trick comm so that there is only one version built, not a slightly different version
if you are in or out of a sim.  While I was in the trick comm code, I removed all of the
unnecessary system header file inclusions out of tc.h.   I modified each of the source files
to include the system files it requires.  Some sim_services files were including tc.h and
also had to be edited to add headers.  I removed the stand-alone makefiles out of all
of the trick_utils directories.  Finally I modified the master makefile to exclude the
trick_util directories comm, math, and units from being archived into libtrick.a.  Each of
those directories will create their own library and will be included when linking a Trick sim.

refs #71
2015-06-24 15:58:17 -05:00
Alex Lin
67da980bdd Test code does not work with new directory locations.
somehow missed a few files.

refs #70
2015-06-22 16:56:35 -05:00
Alex Lin
d3acfa5fc0 Test code does not work with new directory locations.
Adjusted all of the source code to point to the header files in their new
locations.  Adjusted the makefiles for the header locations as well.
Added .gitignore files in the test directories to ignore test object code.
2015-06-22 16:11:08 -05:00
Alexander Lin
5ce0658907 Make Trick Mac Homebrew friendly.
Trk2csv executables also need -lc++abi when compiling with
Homebrew.

refs #66
2015-06-17 16:24:51 -05:00
Alexander Lin
478ddbded9 Make Trick Mac Homebrew friendly.
For some reason, fxplot and gxplot are not linking now because
they are missing symbols.  Adding -lc++abi to fix it (maybe).

refs #66
2015-06-17 15:56:47 -05:00
John M. Penn
cc49e4e4a8 Merge branch 'master' of https://github.com/nasa/Trick 2015-06-17 15:12:42 -05:00
John M. Penn
000f101a4f Fixes #68: Changed the path where TrickDPActionController expects to find jar files 2015-06-17 15:11:29 -05:00
Alex Lin
733d64a250 Trick swig headers don't make it to the destination directory with make install
Moved the header files and the swig .i files to include/trick/swig.  Adjusted the
source files and the convert_swig script to find the headers in their new
location.

refs #67
2015-06-17 14:07:52 -05:00
Alex Lin
76756d450a Make Trick Mac Homebrew friendly
Copy and paste error of CXXFLAGS instead of CLANGLIBS.

refs #66
2015-06-17 10:32:20 -05:00
Alex Lin
11253dcfcb Make Trick Mac Homebrew friendly
I have /usr/local/bin in my PATH and so I was finding swig there.
Running configure through brew does not include /usr/local/bin.
I changed the test to look for swig in a set of directories we
normally use.

refs #66
2015-06-17 09:48:08 -05:00
Alex Lin
80091454ce Make Trick Mac Homebrew friendly
Added /usr/local to the list of search directories in the configure script
for the motif header files.  Added -lc++abi to the list of link libraries.

refs #66
2015-06-17 09:00:18 -05:00
Alex Lin
3577e72bce trick-ICG fails when using clang < 3.4
The clang path created uses the patchlevel which prior to 3.4 was not used by
clang.  This resulted in a bad being created and eventually an llvm assertion
error.  Added a compiler ifdef so that the patchlevel is not used before 3.4

refs #65
2015-06-15 11:38:21 -05:00
Alex Lin
8193b5de7b Standardize directory names
Tried using clang/llvm from ubuntu distribution.  Needed to change the include directory for compiling ICG. Also found that
the clang include files can be in a linked directory.  Used realpath to make sure we have the absolute path.

refs #63
2015-06-12 16:59:00 -05:00
Alex Lin
eed8837478 Standardize directory names
RedHat systems use a libexec directory, MacOSX and Ubuntu use lib.  Changed our scripts and makefiles to handle both.

refs #63
2015-06-12 15:24:36 -05:00
Alex Lin
55ac9a7eea configure not setting JAVAC variable correctly
Forgot to change the substitution string for configure to JAVA_CC from JAVAC

refs #13
2015-06-11 15:55:17 -05:00
Alex Lin
657c7ee921 configure looks for gcj before javac
By default configure looks for gcj before javac.  gcj does not work for our code.  Changed the configure script to look only for javac.

refs #13
2015-06-11 15:46:10 -05:00
Alex Lin
2eeb311a70 Standardize directory names
Moved the no_arch swig files to share/trick/swig and adjusted the makefiles to look for the files in the new location.  Changed the install rule to only copy the files we need for our installation.

refs #63
2015-06-11 14:40:14 -05:00
Alex Lin
eb1f4f7e71 Fix options in configure script
Fixed copy and paste errors for the optional gsl and gtest packages for the configure script.

refs #13
2015-06-10 17:49:09 -05:00
Alex Lin
7f48653697 Convert configure script to autoconf
Replaced our handmade configure script with one created with autoconf.  Added a config_user.mk.in file that is populated with the output of a configure.  Some platform specific makefile assignments that never change are included in the files config_Darwin.mk and config_Linux.mk.

refs #13
2015-06-10 15:11:54 -05:00
Alex Lin
77510d0ccd Standardize directory names
Found that on the Mac ICG was ignoring all of header files comments in ${TRICK_HOME}/include because it had the relative directory "include" listed as a system path.  Comments were only processed if it wasn't in a system directory.  Changed the check to use our function that checks to see if a header is in user or Trick code, basically the same check, but it only uses full paths and doesn't get confused with "include".

refs #63
2015-06-10 14:19:00 -05:00
Alex Lin
036b85cae1 Standardize directory names
The changes from this change are large enough warrant a bump in the major number.

refs #63
2015-06-09 09:57:05 -05:00
Alex Lin
6950b0eb61 Standardize directory names
Changed the configure script to look for libclang.dylib on the mac in addition to libclang.a

refs #63
2015-06-09 09:55:12 -05:00
Alex Lin
95f3efa948 Merge branch 'standardDirs' of https://github.com/nasa/trick into standardDirs 2015-06-09 08:46:45 -05:00
Alex Lin
407040507d Standardize directory names
Tested without the er7_utils directory and found some makefile dependencies that depend on er7_tuils files.  Also found that I forgot to change the include directories for the trick_algorithm integrators.

refs #63
2015-06-09 08:44:45 -05:00
Alex Lin
ccbc52cdcc Standardize directory names
On some systems llvm-config includes -ledit as a system library to link with. Our application doesn't need -ledit and sometimes that library is not installed.  I filtered out that library in the makefile.

refs #63
2015-06-09 08:44:44 -05:00
Alex Lin
d491c86b84 Standardize directory names
Some linux specific include files got into our dependency files.

refs #63
2015-06-09 08:44:44 -05:00
Alex Lin
c5d0b2a872 /usr/lib64/llvm/clang/3.4.2 not found
Modified the makefile for ICG to be able to use clang from yum, fink, and manual installs.  Removed the requirement for copying the clang friendly header files into Trick.  However Trick will be expecting the clang header files to be in it's search path.

refs #40
2015-06-09 08:44:44 -05:00
Alex Lin
60e3983344 Standardize directory names
Moved the io_src code created by sim_services to sim_servivces/include.  Also found some makefiles that needed to be changed to refer to the makefiles in their new locations.

refs #63
2015-06-09 08:44:44 -05:00
Alex Lin
24cfabbdef Standardize directory names
Added headers with previous path for backwards compatability.  Changed name of Exec_exception to ExecutiveException.

refs #63
2015-06-09 08:44:43 -05:00
Alex Lin
19025d77ad 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
2015-06-09 08:44:42 -05:00
John M. Penn
f6fed320c4 Fix #64: Fixed the call to register_group_with_mm in DRHDF5 constructor. 2015-06-03 19:32:23 -05:00
Alex Lin
d3f2264faa Standardize directory names
Tested without the er7_utils directory and found some makefile dependencies that depend on er7_tuils files.  Also found that I forgot to change the include directories for the trick_algorithm integrators.

refs #63
2015-05-27 19:31:05 -05:00
Alex Lin
78f361bb71 Standardize directory names
On some systems llvm-config includes -ledit as a system library to link with. Our application doesn't need -ledit and sometimes that library is not installed.  I filtered out that library in the makefile.

refs #63
2015-05-27 19:28:55 -05:00
Alex Lin
d7d62cf590 Standardize directory names
Some linux specific include files got into our dependency files.

refs #63
2015-06-04 13:46:40 -05:00
Alex Lin
45c6aad6d5 /usr/lib64/llvm/clang/3.4.2 not found
Modified the makefile for ICG to be able to use clang from yum, fink, and manual installs.  Removed the requirement for copying the clang friendly header files into Trick.  However Trick will be expecting the clang header files to be in it's search path.

refs #40
2015-06-04 13:17:53 -05:00
Alex Lin
f1ebc55820 Standardize directory names
Moved the io_src code created by sim_services to sim_servivces/include.  Also found some makefiles that needed to be changed to refer to the makefiles in their new locations.

refs #63
2015-06-02 10:25:40 -05:00
Alex Lin
c8f685bb2d Standardize directory names
Added headers with previous path for backwards compatability.  Changed name of Exec_exception to ExecutiveException.

refs #63
2015-06-02 08:29:34 -05:00
Alex Lin
7eca378f17 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
2015-06-01 10:28:29 -05:00
Alex Lin
27f22235b8 FXPlot linking includes non-existent -lsz
Changed the FXPLOT makefile to use the HDF5 libraries determined by the master makefile.  This makes it consistent with the way we build sims.

refs #62.
2015-05-21 17:02:12 -05:00