Commit Graph

59 Commits

Author SHA1 Message Date
7277b16017 #1063 move sim service xml file (#1069)
Co-authored-by: Fennell, Scott P 263712616 <scott.p.fennell@nasa.gov>
2020-10-23 15:45:32 -05:00
1e8228e344 Use -isystem for Trick and Python headers
Closes #1067
2020-10-23 08:28:01 -05:00
b724f502b3 fix 32 bit test (#953)
* fix tests for 32 bit mode

* fix issues with mongoose build

* Update docker.yml
2020-02-14 10:23:19 -06:00
499f60417a edit makefile java no longer rebuilds every time trick is build 2020-02-12 12:38:34 -06:00
4f5ce7e4a1 Maven, offline mode, and --enable-mongoose (#939)
closes #938 
closes #941 
closes #943
2020-02-05 14:31:58 -06:00
122eb8837b Remove errant line-continuation character 2019-11-21 12:34:46 -06:00
64385229a0 check for DPX/test directory when building tests. Directory is excluded from releases 2019-11-20 14:50:10 -06:00
d86a23834c Fix a race condition between ICG and mongoose install (#891)
* Fix a race condition between ICG and mongoose install

* Update mongoose to version 6.16
2019-10-25 13:21:39 -05:00
95c6659733 Incorporate Webserver into Trick, so one only has to include HttpServ… (#886)
* Incorporate Webserver into Trick, so one only has to include HttpServer.sm

* Tweaks in default index.html file

* Rename HTTPServer.sm to WebServer.sm

* Rename http_server to WebServer

* Add --retry to curl invocations in HttpServer makefile.

* Fix #include in VariableServerVariable.hh

* Include cleanup and curl tweaks in the hopes of making Jenkins happy.

* Doh! problem in makefile masked by preinstalled mongoose in usr/local/lib

* DIE Make Bug DIE

* Fix include in WebServer.sm

* WebServer.sm constructor name

* Don't SWIG mongoose.h

* Compile with -std=c++11

* Attempt to fix race condition in makefile

* makefie tweek

* Fix trick library name problem for Centos and Redhat
2019-10-23 11:58:19 -05:00
8ac5cf7a59 changes to support llvm 9.0 closes #869 2019-09-27 16:04:16 -05:00
422ef225f1 Give er7_utils proper Makefiles
Closes #637
2019-06-21 12:59:00 -05:00
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
a29045005c Create a suite of unicode utilities. 2018-10-25 15:14:52 -05:00
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
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
6a03acfb42 Reformated unit test compilation success message. 2017-12-13 11:09:02 -06:00
fbd9d3237f Cleaned up 'make' target display further. 2017-12-13 11:04:00 -06:00
5e8cb8649f Added formating to the core makefile. Trick compilation is now visually broken into sections. 2017-12-12 12:01:35 -06:00
6e0fcbd947 Updated formating and replaced formating variables. 2017-12-07 15:10:39 -06:00
1bb3ac2a06 Cleaned up 'make clean' output significantly. 2017-12-06 13:12:13 -06:00
f4ef6a7fa4 Removed accidental addition to clean_doxygen. 2017-11-28 09:05:07 -06:00
704bb764b7 Added make as a prerequisite to make install. 2017-11-21 14:55:39 -06:00
954e1aa383 Added warning to 'make install'. 2017-11-17 11:39:17 -06:00
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
4f0a0bc895 Merge branch '17.0' 2016-09-28 14:59:49 -05:00
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
03284bf97d Break the Memory Manager out of libtrick.a into libtrick_mm.a. 2015-06-30 17:57:26 -05:00
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
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
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
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
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
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
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