Commit Graph

1166 Commits

Author SHA1 Message Date
Scott Fennell
b1d791dc94 #805 add C call to clock_tics_per_sec 2019-06-07 08:29:47 -05:00
dbankieris
731b9b9c1f
Merge pull request #804 from nasa/803
Remove SWIG_*_CUSTOM_OUTDIR
2019-06-03 13:13:52 -05:00
Derek Bankieris
1721fc6652 Remove SWIG_*_CUSTOM_OUTDIR
Closes #803
2019-06-03 11:41:39 -05:00
Scott Fennell
c3d64bc977
Merge pull request #800 from nasa/#776
#776 .dat files don't call restore_stls in checkpoint restore
2019-06-03 10:42:16 -05:00
Alex Lin
cbf8258b6a
Add ability to include user makefile rules before main makefile is re… (#802)
* Add ability to include user makefile rules before main makefile is read. #801

Added 2 new files that are optionally included in the main makefile, S_pre.mk and
S_post.mk.  S_post.mk serves the same purpose as S_overrides.mk.  The intent is

1.  (19) Have both files present in the current major version.
2.  (21) Add warning deprecating S_overrides.mk
3.  (23) Actually deprecate S_overrides.mk

* Add ability to include user makefile rules before main makefile #802

Moving pre inclusion to after TRICK_HOME is defined.

* blank line
2019-06-03 09:48:59 -05:00
Scott Fennell
9be53ebb9b #776 default restore_stls to false 2019-06-03 09:44:35 -05:00
dbankieris
f7a7419e0d
Merge pull request #799 from nasa/798
Redo accidentally undone changes
2019-06-03 09:42:32 -05:00
dbankieris
b68eb1b5e6
Merge pull request #797 from nasa/796
Clean up inconsistencies in make_makefile_swig
2019-06-03 09:42:15 -05:00
dbankieris
38d769e995
Merge pull request #795 from nasa/794
Remove make target "sie"
2019-06-03 09:41:59 -05:00
dbankieris
b9487c92f0
Merge pull request #793 from nasa/792
Remove redundant prerequisite for "all" target
2019-06-03 09:41:42 -05:00
dbankieris
c5e5308dd3
Merge pull request #791 from nasa/790
Remove - from most -includes in SIM_*/makefile
2019-06-03 09:41:22 -05:00
Alex Lin
5b55b07263 Autogenerate SWIG dependencies #780
Adding /usr/loca/bin to configure search path.
2019-06-03 07:37:13 -05:00
Scott Fennell
7f7adca0ac #776 .dat files don't call restore_stls in checkpoint restore 2019-06-01 10:48:31 -05:00
Derek Bankieris
893249457f Immediately add file to md5s after check
Fixes #753

(cherry picked from commit 497f50e152)
2019-05-31 15:56:36 -05:00
Derek Bankieris
6fc9e5d1ef Lift get_paths into its own module
Fixes #752

(cherry picked from commit bde2ec5158)

Conflicts:
	libexec/trick/convert_swig
	libexec/trick/make_makefile_swig
2019-05-31 15:54:49 -05:00
Derek Bankieris
2197b3edc2 Clean up inconsistencies in make_makefile_swig
Closes #796
2019-05-31 15:39:57 -05:00
Derek Bankieris
2c6c19e840 Remove make target "sie"
Closes #794
2019-05-31 15:08:55 -05:00
Derek Bankieris
bf1ac4a2c6 Remove redundant prerequisite for "all" target
Closes #792
2019-05-31 14:51:38 -05:00
Derek Bankieris
0890ae8540 Remove - from most -includes in SIM_*/makefile
Closes #790
2019-05-31 14:24:16 -05:00
dbankieris
f85111427f
Merge pull request #788 from nasa/787
Check perl version in configure.ac
2019-05-31 10:11:15 -05:00
Derek Bankieris
8a645d7721 Check perl version in configure.ac
Closes #787
2019-05-31 09:52:03 -05:00
dbankieris
35c2dacac5
Merge pull request #785 from nasa/746
Clean up duplication in makefiles
2019-05-30 16:27:51 -05:00
dbankieris
ae09b2b243
Merge pull request #780 from nasa/505
Autogenerate SWIG dependencies
2019-05-30 16:04:27 -05:00
Derek Bankieris
7b0e84e58e Clean up duplication in makefiles
Normalize behavior of TRICK_VERBOSE_BUILD

Closes #746
2019-05-30 15:47:07 -05:00
Derek Bankieris
cf5c087ef0 Autogenerate SWIG dependencies
Add flags to SWIG invocation for PYTHON MODULE files
Make dependency files order-only prerequisites

Refs #505
2019-05-30 09:52:06 -05:00
Scott Fennell
aed4c94e56 version number to 19.1.dev 2019-05-29 15:29:41 -05:00
Scott Fennell
51c9d69ac8 Trick 19 is here (╯°□°)╯︵ ┻━┻ 2019-05-29 15:23:52 -05:00
Scott Fennell
24e1ec6d46 update version number 2019-05-29 15:13:13 -05:00
dbankieris
a3c7b57a0a
Merge pull request #778 from esduran/fix/with-tpro-path-bug
Consistently use TPRO_HOME over TPROCTE_HOME
2019-05-29 14:54:03 -05:00
Derek Bankieris
36c19e1589 Change TPROCTE_HOME to TPRO_HOME in config_user.mk.in 2019-05-29 14:50:58 -05:00
Derek Bankieris
93d10f3d32 Change TPROCTE_HOME to TPRO_HOME in configure.ac 2019-05-29 14:44:44 -05:00
dbankieris
b694d5412b
Merge pull request #765 from nasa/763
Add ability to specify MC slave output directory
2019-05-29 14:29:04 -05:00
Derek Bankieris
7b7ecaa0c4 Trickification: autogenerate SWIG dependencies
Refs #505
2019-05-29 10:45:26 -05:00
Derek Bankieris
99d856a17f Autogenerate SWIG dependencies
Require SWIG >= 2.0

Closes #505
2019-05-29 09:03:19 -05:00
Derek Bankieris
295b9e3285 Infer TRICK_HOME automatically
Refs #358
2019-05-23 15:09:34 -05:00
Derek Bankieris
881ee69757 Improve Python 3 support in variable_server.py
Correct send_on_copy's variable server string

Closes #777
2019-05-22 11:38:35 -05:00
Esteban Duran
9bfd314726
fix: TPROCTE_HOME Being Used In Place Of TPRO_HOME
When compiling Trick with the --with-tpro option for use of a real-time clock, the TPROCTE_HOME variable was being assigned the contents of the withval variable instead of being assigned to the TPRO_HOME variable. The TPROCTE_HOME variable was never used and the TPRO_HOME variable will always be an empty string. Thus, the configuration file will always check for only /h/tpro.h instead of <user-provided-path-to-tpro>/h/tpro.h
2019-05-21 21:58:49 -05:00
dbankieris
c4bc35d897
Merge pull request #771 from nasa/768
Improve scoping of SWIG %template directives
2019-05-14 09:42:43 -05:00
Alex Lin
7338dd32d3 Merge branch 'master' of https://github.com/nasa/trick 2019-05-14 09:09:13 -05:00
Alex Lin
fedf5bec72 Reduce number of real-time plots per page to 6 #775
Changed the hard coded 8 plots per page to a user settable number.
Defaulted the number to 6.
2019-05-14 09:08:11 -05:00
jmpenn
3f35388b49
Change std::endl to linefeed as appropriate. (#773)
* Fix endl issue in variable server JSON generation. Ref #766

* Change std::endl to line feed as appropraite. #766

* Change std::endl to line feed in MemoryManager as appropriate. #766

* Change std::endl to linefeed as appropriate. #766

* Change std::endl to line feed as appropriate in JSONVariableServer. #766

* Change std::endl to line feed as appropriate in still more files. #766
2019-05-13 16:05:01 -05:00
iamthad
3187dd9012 Replace std::endl with "\n" in SIE (#772)
std::endl flushes the output stream. The SIE functions were using it
multiple times per variable. This can have significant performance
impacts on file I/O.

In testing, the S_sie.resource file for SIM_parachute was flushed over
14000 times, each resulting in a separate write system call. With this
patch, only ~40 write calls were performed, and writing the file took
~1/3 as long.

For more information, see
https://github.com/isocpp/CppCoreGuidelines/blob/master/CppCoreGuidelines.md#Rio-endl
2019-05-13 14:31:46 -05:00
Derek Bankieris
3e3bc02cd2 Correct TRICK_CONVERT_SWIG_FLAGS in Makefile_swig
Fixes #770
2019-05-10 15:30:17 -05:00
Derek Bankieris
e6509df362 Improve scoping of SWIG %template directives
Refs #768 & Refs #769
2019-05-10 15:19:33 -05:00
Scott Fennell
cbc37dd67e
Update README.md 2019-05-09 09:04:39 -05:00
dbankieris
ef1d105bfb
Improve parsing of base-clauses in S_define
A base-clause is the stuff in an inheritance list after the colon in a
class declaration.
https://en.cppreference.com/w/cpp/language/derived_class

Closes #723
Closes #733
2019-05-08 08:41:50 -05:00
Derek Bankieris
4368d412b2 Add C functions for setting MC slave output dir
Refs #763
2019-05-06 12:03:26 -05:00
Derek Bankieris
7d7b461b38 Allow specification of MC slave output directory
Refs #763
2019-05-06 11:32:12 -05:00
Scott Fennell
3364cd3836
Merge pull request #750 from nasa/fix-clean-bin
#507 clean remove 2 data products binaries from bin
2019-05-06 09:33:12 -05:00
Alex Lin
52b30d5e2c Merge branch 'master' of https://github.com/nasa/trick 2019-05-03 09:15:16 -05:00