Commit Graph

50 Commits

Author SHA1 Message Date
sfennell
8ac5cf7a59 changes to support llvm 9.0 closes #869 2019-09-27 16:04:16 -05:00
Derek Bankieris
422ef225f1 Give er7_utils proper Makefiles
Closes #637
2019-06-21 12:59:00 -05:00
Alex Lin
497f11f132
Make TRICK_CXX variable to specify c++ compiler #767 (#815)
Changed all references of TRICK_CPPC to TRICK_CXX.  Added a
warning message that TRICK_CPPC has been deprecated.
2019-06-18 11:00:08 -05:00
John M. Penn
a29045005c Create a suite of unicode utilities. 2018-10-25 15:14:52 -05:00
Alex Lin
4bf35a9c82 Revert "Merge pull request #533 from nasa/MakefileCleanup"
This reverts commit 269ed77cb4, reversing
changes made to d97f482219.
2018-03-02 08:59:26 -06:00
Alex Lin
9dd302f4b1 Trick makefile output formatting and cleanup. #533
Removed the red from the clean rules.  We'd like to reserve red for
errors.  Ended up removing all color from the clean side.
2018-03-01 08:51:57 -06:00
Christopher LaChance
6a03acfb42 Reformated unit test compilation success message. 2017-12-13 11:09:02 -06:00
Christopher LaChance
fbd9d3237f Cleaned up 'make' target display further. 2017-12-13 11:04:00 -06:00
Christopher LaChance
5e8cb8649f Added formating to the core makefile. Trick compilation is now visually broken into sections. 2017-12-12 12:01:35 -06:00
Christopher LaChance
6e0fcbd947 Updated formating and replaced formating variables. 2017-12-07 15:10:39 -06:00
Christopher LaChance
1bb3ac2a06 Cleaned up 'make clean' output significantly. 2017-12-06 13:12:13 -06:00
Christopher LaChance
f4ef6a7fa4
Removed accidental addition to clean_doxygen. 2017-11-28 09:05:07 -06:00
Christopher LaChance
704bb764b7 Added make as a prerequisite to make install. 2017-11-21 14:55:39 -06:00
Christopher LaChance
954e1aa383 Added warning to 'make install'. 2017-11-17 11:39:17 -06:00
Alex Lin
f1cbacd646 ICG exclude of class member variables now defines incorrect memory offsets in io_src #311
This changes back the default behavior to not use offsetof in io_src code.
Added a flag to ICG, -c or --compat15, to globally generate offsetof statements.
Added an ENV variable that can be used to generate offsetof statements by file or directory.
Added in a warning if classes parsed at ICG time are different in size than at runtime.
2016-10-21 13:13:43 -05:00
Alex Lin
4f0a0bc895 Merge branch '17.0' 2016-09-28 14:59:49 -05:00
Alex Lin
d60601d9b5 Variable Server could not find variable related to trick_sys.sched #315
Added a "-n" argument when calling ICG on Trick core.  I had previously removed
the "friend attr<class>" lines from Trick core classes.  The -n argument
instructs ICG to not create the offsetof calls that require the friend function
and to process protected and private variables by default.
2016-09-28 14:47:42 -05:00
Alex Lin
5903209e00 Create a trick-config script #298
Need to add trick-config to list of executables to remove during uninstall.
2016-09-07 09:40:31 -05:00
Alex Lin
dfde52864f the install command on the Mac does not take the -D argument #283
So I get punished by leaving in a debug statement to hardcode PREFIX for testing. Grrr.
2016-08-18 09:54:35 -05:00
Alex Lin
302f1fe1af the install command on the Mac does not take the -D argument #283
So I get punished by leaving in a debug statement to hardcode PREFIX for testing. Grrr.
2016-08-17 17:14:01 -05:00
Alex Lin
e72036f3be the install command on the Mac does not take the -D argument #283
Instead of having the install command try and create the destination
directory we use a second command to mkdir the directory first.
2016-08-17 17:05:58 -05:00
Alex Lin
34bc467bf9 the install command on the Mac does not take the -D argument #283
Instead of having the install command try and create the destination
directory we use a second command to mkdir the directory first.
2016-08-17 17:03:36 -05:00
Alex Lin
ce1347de74 Remove sim_services/STL #275
Removed the sim object, directory and the entry in the Makefile to compile it.
2016-08-03 14:12:16 -05:00
Alex Lin
bff1967d4d Add a flag to turn off java version check during configure #276
Added an --enable-java=(yes|no) and --disable-java options to the
configure script.  If java is disabled then the java GUIs are
not compiled.
2016-08-03 09:45:22 -05:00
Alex Lin
75fb095960 er7_util header files not being installed
Checked in makefile with debug statement overriding the install prefix. :(

refs #246
2016-06-20 14:05:56 -05:00
Alex Lin
c9e3bc77da er7_util header files not being installed
Added a makefile install rule to copy the header files out of
er7_utils to the install directory.  Adjusted ICG to ignore
Trick header files if they are installed.

refs #246
2016-06-20 13:40:45 -05:00
Alex Lin
684f0e6bdc Use udunits package for units conversions
Initial checkin of using udunits for measurement units conversions.  Replaced
our conversion code in ICG and swig code to use udunits.

Also added code to convert unit symbols that we used in Trick that are different
names in udunits.

Added a sim_object that will eventually allow users to specify a custom
set of files to read units information.

refs #231
2016-05-05 14:49:49 -05:00
Alex Lin
cf4bbfdfe8 Split test sims and fun sims into separate directories.
Moved the 2 thread directories.

refs #191
2016-02-23 10:46:38 -06:00
Alex Lin
90fd0ff9f8 Split test sims and fun sims into separate directories.
Moved SIM_test_ip and a couple of other sims that depend on the same model set
to a new test directory.  I'm doing a couple of sims at a time.

refs #191
2016-02-23 10:23:55 -06:00
Alex Lin
4c3015851f Merge in the er7_utils integrators
Taking in the latest er7_utils directory and adding it into Trick in the
same location it was as an external repository.  Made one change to
the files_to_ICG.hh file in the repository to remove the CheckpointHelper
header files.  Those go in the Trick files_to_ICG.hh file.

refs #180
2016-02-10 09:32:53 -06:00
Alex Lin
362366b908 er7_utils rkn4 directory is not compiled
Yup, it's not.  No one notices we've left it out for a couple of
years now.  I've added the directory to the list of directories to compile.

refs #173
2016-01-29 10:13:56 -06:00
Alex Lin
e263feda27 Include new er7_utils CheckpointHelper directory
Added the CheckpointHelper directory to the master makefile.

refs #98
2015-08-04 09:41:56 -05:00
Alex Lin
b3d1a1d162 Trick should not modify TRICK_CFLAGS and TRICK_CXXFLAGS
Well sims compiled, but I forgot to test if Trick itself
would compile.  It didn't.  Added TRICK_SYSTEM_CFLAGS and
TRICK_SYSTEM_CXXFLAGS where needed.

refs #90
2015-07-22 15:34:54 -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
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
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
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
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
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
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
Alex Lin
bb1457c1b1 Remove java class files when making an rpm.
Added a makefile rule that only removes the intermediate java class
files when we are cleaning out stuff for an rpm.

fixes #61.
2015-05-21 16:57:20 -05:00
Alex Lin
14a75508a3 Cleaning up once include variables and copyright cleanup.
Changed all header file once include variables to follow the same naming
convention and not start with any underscores.  Also deleted old
incorrect copyright notices.  Also removed $Id: tags from all files.

Fixes #14.  Fixes #22.
2015-03-23 16:03:14 -05:00
Alex Lin
2fab93da66 Added rules in the makefile to include er7_utils and fermi-ware if they exist. If they don't exist then the code that depends on them will not be compiled.
Also added the java GUIs to the default build rule.

Finally I added a lot of .gitignore files to ignore generated files.

Fixes #5
2015-03-03 16:08:54 -06:00
Alex Lin
e649692e89 Fixed the make install rules when er7_utils is not present. #4 2015-03-03 09:41:08 -06:00
Alex Lin
35bc121403 don't run unit tests that require er7_utils. Fixes #2 2015-03-02 16:19:38 -06:00
Alex Lin
87741062e0 Getting standalone to compile. Fixes #2 2015-03-02 12:48:17 -06:00
Alex Lin
f0c594f841 Initial commit of everything. 2015-02-26 09:02:31 -06:00