Commit Graph

70 Commits

Author SHA1 Message Date
Penn, John M 047828115
4c52ed2753 Merge Caleb Herpins port of Trick webserver from Mongoose to CivetWeb . 2021-08-18 13:15:10 -05:00
Scott Fennell
5d7b6e3bcc
1106 fix python ld path ()
*  re-add in ldflags to python-config command

closes 

Co-authored-by: Fennell, Scott P 263712616 <scott.p.fennell@nasa.gov>
2021-02-05 00:31:08 -06:00
Scott Fennell
abaa5855cb
1076 why path dumb ()
Remove 

closes 
2020-11-19 17:20:26 -06:00
Derek Bankieris
1e8228e344 Use -isystem for Trick and Python headers
Closes 
2020-10-23 08:28:01 -05:00
Scott Fennell
3b89cbfdb2
iss ()
Link correct clang libs based on availability. ICG clang lib link flags are determined by trick/configure
2020-08-28 14:52:23 -05:00
Scott Fennell
119b60d7c5
Ubuntu 20.04, Python 3.8, and improved python configuration in configure.ac () closes closes closes
see , , and .
To support Ubuntu 20.04 we must support new versions of python and gtest. Python has changed the way it provided libraries using python-config, so adjustments had to be made. I've completely ditched the built in autoconf function for finding python, because it adds a bunch of extra flags we don't need for Trick.

Now when we look for python with configure, it will search for python in this order:
python${PYTHON_VERSION}
python
python3

For python-config, it will search in this order:
python<major_version.minor_version>-config
python<major_version>-config
python${PYTHON_VERSION}-config
python-config
python3-config

Instead of python-config --ldflags, we are using python-config --libs
This only gets the flags we need.

For python >= 3.8 we use
python-config --libs --embed
this way it will add -lpython to the flags
2020-04-25 18:49:21 -05:00
Scott Fennell
55f6cc0b5c add python lib path to --with-python 2020-03-18 19:00:14 -05:00
Scott Fennell
3aa32b673e
--with-python ()
add --with-python configure option 
2020-03-17 12:28:34 -05:00
Scott Fennell
eb510bd65e check for trick-offline during configure 2020-02-06 09:33:44 -06:00
Scott Fennell
117bf3ebfb add --enable-mongoose, disable by default 2020-02-05 13:27:26 -06:00
Scott Fennell
a9f36b6dcc disable webserver by default 2020-02-04 15:26:31 -06:00
Scott Fennell
92f3679164 add offline mode --enable-offline 2020-02-04 10:50:35 -06:00
Scott Fennell
78ebc6fda3 apps can find trick_icon, minor change to configure 2020-01-30 09:40:17 -06:00
Scott Fennell
1b43a82f53 refactor java build to use maven to resolve dependencies and build executable jars 2020-01-29 14:11:46 -06:00
Alex Lin
057c31ff95 configure script fails in RHEL/CentOS 8
If gsl is installed the configure script fails because it needs
libgslcblas as well when testing for the library.
2019-11-01 14:10:13 -05:00
Alex Lin
34833be0de
configure script fails in RHEL/CentOS 8 ()
If we can't find python in the configure script then search for
python3.  If python3 is found use python3-config to get the
include directories and libraries.  Call python scripts using the
PYTHON environment variable.
2019-10-21 13:29:26 -05:00
Alex Lin
d1c08ade7a
Make switching to 32bit compile better ()
Added a new configure arugument "--enable-32bit".  If enabled,
TRICK_FORCE_32BIT is automatically set for building Trick and for
all sims built.  Changed the ARCH and added -m32 in the configure
script if 32bit is enabled.  This changes the configure script to
test for 32bit libraries.
2019-06-27 07:58:49 -05:00
Alex Lin
453a03a809
Get configure with no java and no X to work ()
Found if --without-x was specified, that automatically caused an
error condition in the configure script.  Fixed that and only
tested for X windows headers and libs if X is included.  Excluded
a couple of directories from compiling if X is not included.

Didn't seem to be a problem with java.
2019-06-18 11:00:42 -05:00
Alex Lin
5e9723c630
Add support for Mac's removal of /usr/include ()
If we are on a Mac, use xcrun to find the standard include directories.
Some of the makefiles in data_products look for libxml2 which requires
them to get the same change as the configure script.
2019-06-18 10:59:35 -05:00
Alex Lin
a394f0d187 TPROCTE_HOME Being Used In Place Of TPRO_HOME
Needed to make some more fixes to work with modern tsync driver
code.
2019-06-11 09:48:29 -05:00
Alex Lin
5b55b07263 Autogenerate SWIG dependencies
Adding /usr/loca/bin to configure search path.
2019-06-03 07:37:13 -05:00
Derek Bankieris
8a645d7721 Check perl version in configure.ac
Closes 
2019-05-31 09:52:03 -05:00
dbankieris
ae09b2b243
Merge pull request from nasa/505
Autogenerate SWIG dependencies
2019-05-30 16:04:27 -05:00
Derek Bankieris
99d856a17f Autogenerate SWIG dependencies
Require SWIG >= 2.0

Closes 
2019-05-29 09:03:19 -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
Scott Fennell
c752dd1b2c one more line 2018-07-12 16:12:39 -05:00
Scott Fennell
5b5dc148bf remove debugging printouts 2018-07-12 16:09:07 -05:00
Scott Fennell
63ab0ffc22 changed help string for --with-swig 2018-07-12 16:05:39 -05:00
Scott Fennell
2a13bf34af add --with-swig=<path to swig> option to configure 2018-07-11 15:11:02 -05:00
Alex Lin
206ca5710d Fix configure's gcc version check.
We don't want to test the gcc version on the mac.  It is clang
underneath and it does not report a version >= 4.8.  On High Sierra
it reports 4.2.1
2018-04-23 08:36:13 -05:00
Pappy Van Winkle
e313264305 Update configure script based on configure.ac changes.
Relates to: , , 
2018-04-21 13:07:18 -05:00
Derek Bankieris
1682a0d3c5 Add udunits custom install directory to rpath
Other things I tried:

1. Pass the full path of the library directly to the linker.
Doesn't work for 32-bit builds because ICG needs the 64-bit version.

2. Use -static to have the linker statically link in the library.
Doesn't work because there is no 64-bit static library on default
installs.

Fixes 
2017-12-05 09:16:53 -06:00
Derek Bankieris
380ab024a4 Add --with-udunits path to TRICK_EXCLUDE
Fixes 
2017-12-04 11:02:03 -06:00
Alex Lin
1f5be950e4 Unable to configure Trick with Java 9
Changed the java version extractor to look for an optional decimal and
number past the decimal.  Now it can properly find "9" as the version number.
2017-10-10 09:18:51 -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
Alex Lin
a946e16bdd configure script doesn't check for clang headers
Added a configure check for -lz
2016-08-23 09:46:50 -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
bff1967d4d Add a flag to turn off java version check during configure
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
Alex Lin
2112dac2e0 Have the configure script look in devtools for gcc/g++ in RHEL6
Added /opt/rh/devtoolset-3/root/bin to the PATH environment variable
in the configure script.
2016-07-25 16:43:10 -05:00
Alex Lin
bc9fdb1b71 Search for some optional packages in configure script.
The configure script will check in the standard directories for
HDF5, GSL, and gtest.  The user can skip this automatic check by
adding --without-<feature> while running the configure script.

refs 
2016-06-29 17:37:45 -05:00
Alex Lin
4ab584ed55 Support using Python 3
Fixed the configure script to allow the user to specify using a python3
interpreter.  Had to change the the way to load the swig generated python modules.
Also had to change code dealing with python strings, oct, long, and
boolean operations.

refs 
2016-06-28 13:44:21 -05:00
Alex Lin
1224c43e7f Set and use LD in our makefiles correctly.
Set LD in our makefiles to the ld executable found by configure.
Changed the final sim link to use TRICK_CPPC as the link command since
it was using the compiler anyways.  Changed the places where we use "ld" to
use LD.

refs 
2016-06-27 12:48:35 -05:00
Alex Lin
6f20aa4b8b Save X11 include and library information from configure
Saved the value of x_libraries variable from the autoconf AC_PATH_X if
the location is not standard.

refs 
2016-06-27 09:50:04 -05:00
Alex Lin
9ae65f84b2 configure script needs to test for g++ 4.8 and above.
Added a check to test the version of g++ in the configure script.
Also did a "which" command to save the full path of the CC and CXX
commands.  This will ensure that the same CC and CXX executables
are run no matter how the environment changes.

refs 
2016-06-23 09:07:59 -05:00
Alex Lin
237230dc53 Have ICG ignore Fink Dirs (in /sw) on Macs
The UDUNITS_LDFLAGS contents need to be in quotes.  Found this while
trying to use the udunits package in /sw with Fink.

refs 
2016-06-13 10:37:30 -05:00
Alex Lin
0f7a396db1 Build fails on Ubuntu 16.04
The recently introduced configure time test fails to run on RedHat 6 machines.

refs 
2016-06-02 10:18:29 -05:00
Alex Lin
5966c61add Build fails on Ubuntu 16.04
Created a configure time test to see if clang will compile ICG correctly.
If the compilation fails, an error message telling the user to go download
clang/llvm from llvm.org is show.

refs 
2016-06-02 08:52:00 -05:00
Alex Lin
9d3a51625f Allow --with-gtest argument with no directory
Added the option to not provide a directory name when using
--with-gtest

refs 
2016-05-12 14:42:23 -05:00
Alex Lin
7dc034315f ./configure needs to properly enforce java version dependency
Had to change the redirect syntax on the mac.

refs 
2016-05-12 08:55:59 -05:00
Alex Lin
c9b8992fc1 ./configure needs to properly enforce java version dependency
Added a javac version check >= 1.8 to configure.

refs 
2016-05-12 08:50:42 -05:00