Commit Graph

133 Commits

Author SHA1 Message Date
jmpenn
c112290265
Replace iText Java PDF library with PDFBox. (#664) 2018-09-04 16:59:06 -05:00
Scott Fennell
d42f75c507
Merge pull request #640 from nasa/swig-flags
#618 add TRICK_SWIG_FLAGS, TRICK_SYSTEM_SWIG_FLAGS, TRICK_SWIG_CFLAGS, TRICK_SYSTEM_SWIG_CFLAGS...
2018-07-09 10:45:39 -05:00
Scott Fennell
bf7ce2db3c #618 revert/remove TRICK_SYSTEM_SWIG_FLAGS. Wiki and trickify.mk update still required 2018-06-29 11:06:50 -05:00
anon
ef634c9f48 #618 add TRICK_SWIG_FLAGS, TRICK_SYSTEM_SWIG_FLAGS, TRICK_SWIG_CFLAGS, TRICK_SYSTEM_SWIG_CFLAGS. *_FLAGS are swig options, *_CFLAGS are g++ compiler options for swig objects. TRICK_SYSTEM_* options should not be changed by trick users 2018-06-27 13:58:44 -05:00
Derek Bankieris
e14e6bc1ec Fix make_makefile_src on CentOS 6
Closes #632
2018-06-21 11:40:00 -05:00
Derek Bankieris
3172be86b1 Fix special treatment of "src" AGAIN
Great feature. Really, I love it.

Refs #627
2018-06-11 13:10:36 -05:00
Derek Bankieris
a0faa289df Restore support for "batch compiling"
In LIBRARY DEPENDENCIES, any file ending in ".a" will cause all
files in that directory and any contained "src" directory to be
compiled. What a terrible "feature".

Refs #627
2018-06-11 13:10:36 -05:00
Derek Bankieris
98b621fd6e In "src", look for makefile_overrides one level up
I don't like this "feature", but it's baggage we're stuck with for now.

Refs #626
2018-06-11 13:10:36 -05:00
Derek Bankieris
334273fa81 Make everything about make_makefile_src better
Fixes #626 #627
2018-06-11 13:10:36 -05:00
Derek Bankieris
ea0878af26 Fix "objects:" in makefile_overrides
Fixes #626
2018-06-11 13:10:36 -05:00
abrogley
1015f6ec90 Retry curl operations to avoid transient failures. (#622) 2018-05-30 16:29:57 -05:00
Derek Bankieris
b6f06e01c1 Ignore unordered_map in convert_swig
Fixes #620
2018-05-16 14:20:25 -05:00
Scott Fennell
ba2df0757e #604 #490 add java.se.ee to application at runtime. (#605) 2018-04-23 17:10:49 -05:00
Alex Lin
8938c3b7b2 Clang no longer supports -Wno-unused-but-set-variable #600
Removed the compile time flag.
2018-04-12 08:41:25 -05:00
Scott Fennell
86eb23c7de #521 added unit tests to build and 3rd party XML formatter that does not rely on ant 2018-03-14 10:29:44 -05:00
Alex Lin
8be09638e7 make_makefile_swig sometimes goes into infinite loop #561
Found a similar loop in make_makefile_src that can go into an infinite loop.
2018-02-09 10:14:49 -06:00
Alex Lin
3ac538775b make_makefile_swig sometimes goes into infinite loop #561
Added a check to see if array has elements before we shift an empty array.
2018-02-09 09:38:58 -06:00
Derek Bankieris
4b2f6e660f Support use of MAKEFILE_LIST in makefile_overrides
Refs #544
2018-02-07 09:11:24 -06:00
Derek Bankieris
58103ff889 Purge empty/whitespace before calling abs_path
Fixes #542
2018-01-11 13:54:38 -06:00
Alex Lin
c694700148 Add environment variable to ignore types from ICG processing #535
Added a new environment variable TRICK_ICG_IGNORE_TYPES.  Class/struct/enum
types found in this semicolon delimited list will not have attributes written
out.
2017-12-19 10:02:41 -06:00
Derek Bankieris
da7a79e897 Invoke qualified lookup of add_job in SimObjects
Fixes #532
2017-12-13 07:58:20 -06:00
Alex Lin
5285f1a72e Symbolic links rise again #530
Found more places where symbolic links cause havoc.  Also added back a #define
that was removed in parameter_types.h and added back the messaging routines to
the list swig processes.
2017-12-12 10:17:24 -06:00
Derek Bankieris
29bd27e931 Restore (module="sim_services") to Trick %imports
Fixes #510
2017-11-03 10:22:38 -05:00
Thadeus Fleming
143d0f2c41 Make object .d files order-only prerequisites
This will ensure objects are rebuilt only due to a missing dependency
file, not a newer one.

Fixes #501.
2017-11-02 12:34:48 -05:00
Thadeus Fleming
b3f03e3fc4 Improve handling of sim object member initializers
Rather than just searching for the first pair of curly braces to find a
sim object's constructor, parse any member initializer list that is
present. Fixes #443.
2017-10-16 15:22:19 -05:00
Alex Lin
de012dde71 Feature request: Support checkpointing and logging of std::array #480
Added std::array as an STL type Trick recognizes.  We can now create io code
that can save and restore std::arrays like std::vectors and other similar
types. Like other STL types, an std::array cannot be logged or viewed in
trick-tv.
2017-09-27 16:01:52 -05:00
Alex Lin
86007c70cd convert_swig mishandles struct templates #468
The new regular expression added a pair of parentheses without the "?:"
substring to ignore the match.  I added the "?:"
2017-08-21 14:07:31 -05:00
David Hammen
8a42a9adcd Fixes #468 2017-08-09 09:14:35 -05:00
Christopher LaChance
7ef539f331 Replaced smartmatch operator with string equality operation. 2017-08-01 15:33:23 -05:00
Derek Bankieris
0bb5995397 Standardize missing S_define include error message
trick_print is not flexible enough for the kind of formatting I want to
do, so I added a new function, trick_formatted_print, that takes
alternating control sequences and strings to allow any kind of
formatting in the console. Like trick_print, it also prints to a file
with the control sequences removed.

Refs #436
2017-05-24 13:10:21 -05:00
Derek Bankieris
56bdafc68b Correct file extension regex in make_makefile_swig
Refs #426
2017-05-23 10:43:54 -05:00
Derek Bankieris
e25a1b6a1f Skip unsupported extensions in make_makefile_swig
There were a lot of places we would need to perform this check,
so just remove them from the list of files to process from the start.
Remove dead code. Refactor.
Refs #426
2017-05-17 14:22:20 -05:00
Derek Bankieris
d417b1bdf1 Ignore unsupported extension in make_makefile_swig
Refs #426
2017-05-16 15:31:07 -05:00
Alex Lin
a11e51cce7 Sim build doesn't stop on error #421
When I added the "tee" commands to split off command outputs to
a file and the screen, I forgot that the exit status of the make commands
takes the exit status of "tee" which does not ususally have an error and
masks any error in the actual compilation.  I added an exit ${PIPESTATUS[0]}
which returns the exit status of the compilation.
2017-05-15 13:36:06 -05:00
Alex Lin
b2ebe157ed Lost the MAKE_out file when we updated simulation makefiles #412
Added echos to all compile commands to append to MAKE_out.  tee'd
the output of the compile command so that it will go to both the MAKE_out
file and the screen.
2017-04-18 10:26:58 -05:00
Derek Bankieris
3affc2080e convert_swig: don't skip EXT_LIB paths for %import
When converting #include to %import statements, we should only skip
paths on TRICK_EXCLUDE and TRICK_SWIG_EXCLUDE, not TRICK_EXT_LIB_DIRS.

Refs #392
2017-04-04 09:25:35 -05:00
Derek Bankieris
a749118ce7 Remove -I$(<D) from Makefile_src rules
Refs #408
2017-03-31 09:24:39 -05:00
Derek Bankieris
2db341cff8 Revert (almost all of) 2e4c3286
Sadly, we cannot yet require SWIG 2.0.

Refs #400
2017-03-28 15:59:08 -05:00
Derek Bankieris
b53c52ac33 Separate ICG & SWIG exclusion constructs
Refs #392
2017-03-27 15:19:43 -05:00
Derek Bankieris
73cbbd96cd Refactor ICG to report skipped files consistently
Refs #394
2017-03-15 15:53:56 -05:00
Derek Bankieris
2e4c3286a3 Automatically generate dependencies with SWIG
Like gcc, swig supports all those -M options. Use them to automatically
manage *_py.cpp dependencies.
Add dependency generation to trickify.mk as well.
2017-03-14 13:38:09 -05:00
Derek Bankieris
e39d57461c Remove unused variables in make_makefile_src
Refs #360
2017-03-14 08:45:41 -05:00
Alex Lin
7c78187abf Using ccache seems to work but prints warnings #390
Found a place in the makefile where TRICK_CC was not being set correctly.
Also found a case in gte.pm where we are not handling ccache properly.
2017-03-13 15:11:57 -05:00
Alex Lin
85f2435af7 S_overrides.mk is included twice when building #360
All .i files for SWIG must be created before SWIG is run.  Added an
order only rule to make sure this happens.
2017-02-28 14:15:34 -06:00
Derek Bankieris
9974e7698d Use -Wno-unused-parameter when compiling SWIG code
Refs #360
2017-02-27 08:56:09 -06:00
Derek Bankieris
ca4dce3582 Fix newline spacing & restore MODEL_OBJECTS header
Refs #360
2017-02-24 09:09:31 -06:00
Alex Lin
b2f8c9894e S_overrides.mk is included twice when building #360
Moving targets to the more correct makefile like defining S_MAIN should
be in make_makefile_src.  Moved the makefile_overrides rules read from
directories into their own makefile.
2017-02-24 08:44:34 -06:00
Derek Bankieris
738959eba1 Add missing prerequisites on dependency files
Refs #360
2017-02-23 16:02:32 -06:00
Alex Lin
31f0ea95ad S_overrides.mk is included twice when building #360
Moved some rules from trick-CP to convert_swig.  Using alternative pattern
rules in Makefile_src I believe is faster.
2017-02-23 14:05:38 -06:00
Derek Bankieris
e6ad95f493 Grand Make Dependency Graph, part 1
Refs #360
2017-02-23 13:26:28 -06:00