ExternalVendorCode/trick
1
0
Fork 0
mirror of https://github.com/nasa/trick.git synced 2025-01-18 02:40:08 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Java 9 Compatibility #572

Browse Source 
Made changes to the command to get the java version to make it
compatible with the mac.  Also snuck in my perl script to parse
out the version.
 ____           _ _  _   _____
|  _ \ ___ _ __| | || | | ____|_   _____ _ __
| |_) / _ \ '__| | || |_|  _| \ \ / / _ \ '__|
|  __/  __/ |  | |__   _| |___ \ V /  __/ |
|_|   \___|_|  |_|  |_| |_____| \_/ \___|_|
This commit is contained in:
Alex Lin 2018-03-02 09:04:55 -06:00 committed by dbankieris
parent 3de9a3b2be
commit 573a6bf2a5
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
trick_source/java/makefile
View File

@ -6,7 +6,7 @@ include ${TRICK_HOME}/share/trick/makefiles/Makefile.common
JAVAC ?= javac
JAVAC_FLAGS = -g -Xlint:unchecked -Xlint:deprecation
# delineate 'javac -version' for version number
JAVAC_VERSION := $(shell (${JAVAC} -version |& awk '{print $$2}') | awk -F ""."" '{print $$1}')
JAVAC_VERSION := $(shell ${JAVAC} -version 2>&1 | perl -ne 'print /(\d+)/')
# include java.se.ee for JAXB xml annotations (for trick-tv) in java version 9
ifeq ($(JAVAC_VERSION),9)