Commit Graph

64 Commits

Author SHA1 Message Date
Scott Fennell
1b43a82f53 refactor java build to use maven to resolve dependencies and build executable jars 2020-01-29 14:11:46 -06:00
Scott Fennell
4f439d3682
clean S_sie.json closes 2019-12-04 15:39:12 -06:00
sfennell
5004f95fdd changes to support llvm 9.0 closes 2019-09-27 14:58:54 -05:00
Scott Fennell
82bae3b0d0 remove all S_default.dat stuff 2019-07-09 15:58:26 -05:00
Alex Lin
497f11f132
Make TRICK_CXX variable to specify c++ compiler ()
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
Alex Lin
cbf8258b6a
Add ability to include user makefile rules before main makefile is re… ()
* Add ability to include user makefile rules before main makefile is read. 

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 

Moving pre inclusion to after TRICK_HOME is defined.

* blank line
2019-06-03 09:48:59 -05:00
dbankieris
b9487c92f0
Merge pull request from nasa/792
Remove redundant prerequisite for "all" target
2019-06-03 09:41:42 -05:00
Derek Bankieris
bf1ac4a2c6 Remove redundant prerequisite for "all" target
Closes 
2019-05-31 14:51:38 -05:00
Derek Bankieris
0890ae8540 Remove - from most -includes in SIM_*/makefile
Closes 
2019-05-31 14:24:16 -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
Scott Fennell
644a9a0e00 add VERBOSE synonym everywhere 2019-03-21 09:28:52 -05:00
Scott Fennell
422d5ee2ac add VERBOSE synonym 2019-03-20 17:32:29 -05:00
Pappy Van Winkle
a44014c0a3 Give trick-CP the same -C/--directory option that 'make' has.
Now one can do the following command:
     path/to/trick-CP -C path/to/SIM_example

without first having to cd to the path that contains the S_define.
2019-02-28 21:26:23 -06:00
Scott Fennell
e17509b6d1 add trick-CP --help message 2018-10-22 09:20:55 -05:00
anon
9a2bab0df2 2018-05-22 14:53:10 -05:00
anon
bd0cfec731 2018-05-22 14:36:46 -05:00
anon
d764a67709 restored 'make print-%' in sim directory 2018-05-22 14:01:32 -05:00
Alex Lin
2b241acc0f Put units warnings in MAKE_out
Redirected the output of ICG and other commands in the top level
makefile to build/MAKE_out.  Moved the command that removes the
MAKE_out file to where it will only be executed once when the
make process starts.
2018-02-20 09:47:59 -06:00
Alex Lin
c3f94fec49 Only print TRICK_CFLAGS and TRICK_CXXFLAGS once during compilation
Added a test to see if MAKE_RESTARTS exists.  If it does not print
the TRICK_CFLAGS and TRICK_CXXFLAGS.
2018-01-23 14:18:01 -06:00
Alex Lin
36a91abbc3 S_overrides.mk is not read last.
Switched the inclusion of S_overrides.mk and build/Makefile_overrides.  S_overrides.mk
is now last as it is supposed to be.
2018-01-18 13:20:46 -06:00
Christopher LaChance
418df6bb9d Fixed typo in trick-units. 2017-08-01 15:39:12 -05:00
Christopher LaChance
947a0a24cf Added a new binary file that will display Trick's available units when called. 2017-08-01 14:23:21 -05:00
Alex Lin
b2ebe157ed Lost the MAKE_out file when we updated simulation makefiles
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
b53c52ac33 Separate ICG & SWIG exclusion constructs
Refs 
2017-03-27 15:19:43 -05:00
Derek Bankieris
22d0fe9f23 Disable built-in implicit rules when building SIMs
Make spends a considerable amount of time checking targets against
built-in implicit rules. Let's turn them off, enjoy some speedup, and
see if anyone was relying on them!

Refs 
2017-03-14 10:50:14 -05:00
Alex Lin
b2f8c9894e S_overrides.mk is included twice when building
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 
2017-02-23 16:02:32 -06:00
Alex Lin
31f0ea95ad S_overrides.mk is included twice when building
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 
2017-02-23 13:26:28 -06:00
Alex Lin
02617bf7da S_overrides.mk is included twice when building
Changed some order only dependencies to actual dependencies.  Added a
check in make_makefile_src for new files that should trigger recreating
Makefile_src.
2017-02-22 08:44:12 -06:00
Derek Bankieris
55d53c3f5e Include S_overrides.mk regardless of build target
We if exclude it for clean targets, users can't append any prerequisites
to clean targets.

Refs 
2017-02-17 15:47:23 -06:00
Alex Lin
9d587a45c2 S_overrides.mk is included twice when building
Moved makefile assignment of S_MAIN out of MAkefile.common to simulation
makefile.  The definition in Makefile.common was causing trouble for
autotesting because it changes TRICK_HOST_CPU.
2017-02-14 08:34:02 -06:00
Alex Lin
337139cacb S_overrides.mk is included twice when building
A different approach.  Instead of trying to limit the number of times
S_overrides.mk is included, combine the makefiles so only one
call to make is made.
2017-02-09 09:46:58 -06:00
Alex Lin
55db2fedb3 Create a distclean target in the sim makefile
distclean target added to makefile.
2016-11-03 15:20:05 -05:00
Alex Lin
2918662767 Create a trick-config script
Created trick-config that can print the version, installation prefix,
and compile and link flags that Trick defines.
2016-09-07 09:33:03 -05:00
Alex Lin
d0349772d5 configure script doesn't check for clang headers
Added a configure check for clang/Basic/LLVM.h.
Also removed -lz from the link libraries.  I don't think we need it.
2016-08-23 08:58:16 -05:00
Alex Lin
60473dde03 Move clean rules to makefile in sim directory.
Moved the clean rules to the makefile in the sim directory.  They will
always work whether the rest of Trick is set up or not.
2016-08-19 09:57:13 -05:00
Derek Bankieris
d8dad4a7f7 Forgot to remove the executable with the last commit 2016-08-02 10:14:10 -05:00
Alex Lin
ca02209d8f man pages completely out of date
Created man pages for each executable we have in bin.  Updated the
couple of man pages we did have in there.  Modified trick-CP
to accept arguments.  Updated the version number reported by ICG
as well.
2016-08-02 09:56:43 -05:00
Dan Jordan
1f30ac8e04 Added optional var=value support for trick-CP as passthroughs to the
make system.
                             ***     ***
                           **   ** **   **
                          *       *       *
                          *   MAKE_out    *
                           *             *
                            **         **
                              **     **
                                ** **
       -------------------        *        --------------------
   ../                     \..         ../                     \..
  /                           \       /                           \
 |.,       __   _..._          \     /        ....     ___         |
 /  \     /  `-'     `-------...    ..--`````'    `--'    \.    ./` \
 |   \--_-               /    o ``X'  o    \                '--/    |
 |         ( ( ( ( (    /    \   /``\   /   \  ) ) ) ) )            |
 |   /---\                   ./|`    |`\.                  ..-..    |
 |  /     \-..-........-```/`./       \..`--.........-.  ./     `-./
  `'\                      /             \.            ``       /--
      \___________________/                \___________________/
2015-10-21 14:44:49 -05:00
Alex Lin
e1c1bbaccf Split CP up into components that can be called individually
Initial rough checkin that partially works for the ball sim.

refs 
2015-07-16 15:36:36 -05:00
Alex Lin
eed8837478 Standardize directory names
RedHat systems use a libexec directory, MacOSX and Ubuntu use lib.  Changed our scripts and makefiles to handle both.

refs 
2015-06-12 15:24:36 -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 
2015-06-09 08:44:42 -05:00
Alex Lin
5bfee865cd Creating 15.0.0 release
Incrementing version number in trick_ver.txt to 15.1.0

refs 
2015-05-21 16:30:28 -05:00
Alex Lin
514a06a0f7 Creating changelog for release.
Creating changelog for release.

refs 
2015-05-18 14:57:28 -05:00
John M. Penn
d8013068cc Fix : Created a python script to generate the changelog 2015-05-05 11:19:48 -05:00
Alex Lin
1b5ed16686 Add batch files to start GUIs under Windows
Forgot need to keep the name of the directory that houses the
batch files bin, not bat.
2015-04-29 15:33:33 -05:00
Alex Lin
7ecfcad90a Add batch files to start GUIs under Windows
Added a couple of batch files in the java GUI area so they can be used with
Windows.  Made an addition in TrickApplication.java to add the .bat suffix
to script calls when using Windows.

Fixes 
2015-04-29 15:01:45 -05:00
John M. Penn
6aff648c0d Change trick_ver.txt to 15.0.0 and add Change Log. Fix 2015-04-27 10:17:20 -05:00
John M. Penn
8608fd73fc Fix#45: removed thread_version and services issues cruft 2015-04-24 15:51:09 -05:00