Commit Graph

1401 Commits

Author SHA1 Message Date
Derek Bankieris
8a645d7721 Check perl version in configure.ac
Closes 
2019-05-31 09:52:03 -05:00
dbankieris
35c2dacac5
Merge pull request from nasa/746
Clean up duplication in makefiles
2019-05-30 16:27:51 -05:00
dbankieris
ae09b2b243
Merge pull request 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 
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 
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 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 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 
2019-05-29 10:45:26 -05:00
Derek Bankieris
99d856a17f Autogenerate SWIG dependencies
Require SWIG >= 2.0

Closes 
2019-05-29 09:03:19 -05:00
Derek Bankieris
295b9e3285 Infer TRICK_HOME automatically
Refs 
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 
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 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
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. ()
* Fix endl issue in variable server JSON generation. Ref 

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

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

* Change std::endl to linefeed as appropriate. 

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

* Change std::endl to line feed as appropriate in still more files. 
2019-05-13 16:05:01 -05:00
iamthad
3187dd9012 Replace std::endl with "\n" in SIE ()
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 
2019-05-10 15:30:17 -05:00
Derek Bankieris
e6509df362 Improve scoping of SWIG %template directives
Refs  & Refs 
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 
Closes 
2019-05-08 08:41:50 -05:00
Derek Bankieris
4368d412b2 Add C functions for setting MC slave output dir
Refs 
2019-05-06 12:03:26 -05:00
Derek Bankieris
7d7b461b38 Allow specification of MC slave output directory
Refs 
2019-05-06 11:32:12 -05:00
Scott Fennell
3364cd3836
Merge pull request from nasa/fix-clean-bin
 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
Alex Lin
4d82c1589d Python init code does not work when using SWIG 4.0
Forgot to reverse the import order for modules users are adding to
namespaces.  Interesting, the unit tests only failed on the Mac for
this.
2019-05-03 09:14:05 -05:00
Alex Lin
e6abfd21b8 Log frame scheduling time if not running real-time.
If real-time is off, we exit the rt_monitor function early.  The frame
scheduled time was calculated after the exit call.  Moved the frame
scheduled time calcuation before the exit.
2019-05-02 16:36:35 -05:00
Alex Lin
0ec37858d0 Merge branch 'python_namespace' 2019-05-02 08:40:18 -05:00
Alex Lin
a29564bd9c Python init code does not work when using SWIG 4.0
Looks like the way modules are loaded changed a little with SWIG 4.0. So I
changed the order we include everything in __init__.py.  We include all
of the c++ python modules first now instead of having them read in from
the python code itself.  Basically we include the files like this in this order

import _m<hash>
from m<hash> import *
2019-05-02 08:20:06 -05:00
dbankieris
16fef4eaa9
Merge pull request from nmerlene/master
Python 3 Compatibility for variable_server.py
2019-04-25 07:39:45 -05:00
Derek Bankieris
d5544a5991 Correct decimal formatting for ints in TrickView
3032aae added fixed-width to binary formats. Looks like I modified
TVInteger's Decimal format instead of Binary.

Refs 
2019-04-25 07:29:58 -05:00
Penn, John M 047828115
7ccdade441 Fix S_overrides.mk 2019-04-24 18:50:08 -05:00
Penn, John M 047828115
cebfc174ae Don't compile and link HTTP server by default Ref 2019-04-24 18:29:50 -05:00
nmerlene
38bfdf2a54
Convert string to bytes in variable_server.py for Python 3
* Method socket.sendall() expects bytes to be sent, rather than a string
* Python 3 stores text strings as unicode (not ASCII) by default
* Therefore, strings must be explicitly converted to bytes for Python 3 compatibility
* This works for both Python 2 and Python 3 (tested on Python 2.7, Python 3.6, and Python 3.7)
2019-04-24 15:45:06 -05:00
Penn, John M 047828115
b029fae692 Add an experimental mongoose-based embedded web server to SIM_cannon_numeric 2019-04-17 17:26:48 -05:00
Penn, John M 047828115
0f037e6817 Update trickTypeCharString() for STLs, so their names can be generated. 2019-04-17 16:43:12 -05:00
Penn, John M 047828115
05e9535518 Add MemoryManager methods to generate JSON for allocation info. 2019-04-17 16:35:29 -05:00
Derek Bankieris
497f50e152 Immediately add file to md5s after check
Fixes 
2019-04-11 08:55:41 -05:00
Derek Bankieris
bde2ec5158 Lift get_paths into its own module
Fixes 
2019-04-09 13:28:16 -05:00
Derek Bankieris
4611db2e92 Merge branch 'master' of https://github.com/nasa/trick 2019-04-09 13:20:01 -05:00
Derek Bankieris
f1ef983143 Change unbold ascii escape sequence from 21 to 22
21m as unbold is not well supported and sometimes causes
double-underline instead
2019-04-09 13:18:02 -05:00
Scott Fennell
5e0fdc824c
Merge pull request from nasa/VERBOSE-synonym
Verbose synonym
2019-04-02 13:35:08 -05:00
Scott Fennell
49e243b54a
Merge branch 'master' into VERBOSE-synonym 2019-04-02 13:34:52 -05:00
Alex Lin
d33eb22d97
Merge pull request from abrogley/add-trick-mc-to-swig-shortcuts
Create the shortcut trick.mc_add_variable.
2019-04-02 13:04:28 -05:00
Alex Lin
5e445f1a37
Merge pull request from nasa/python_namespace
Python namespace back from the dead
2019-04-02 13:03:32 -05:00