Commit f7a73985 authored by Ryan Berkheimer's avatar Ryan Berkheimer

Updated makefile to use javac (javah deprecated, javac should work on all java version builds.

parent d1c668a4
Pipeline #4931 failed with stage
in 0 seconds
......@@ -30,6 +30,7 @@ pom.xml.asc
#for visual-studio-code
bin/*
.vscode/*
#output and debugging
*.log
......
......@@ -19,12 +19,13 @@ LIBNAME=InteropTest
#USER SPECIFIED
#The following var should contain a list of fully qualified Java classes used by the C glue functions.
JAVAHCLASSES:=gov.noaa.taskapi.test.InteropTest gov.noaa.taskapi.test.InteropTest2 gov.noaa.taskapi.test.InteropTest3
#These should be separated by slashes instead of .s for the namespace.
JAVAHCLASSES:=$(PROJECTPATH)/src/java/test/gov/noaa/taskapi/test/InteropTest.java $(PROJECTPATH)/src/java/test/gov/noaa/taskapi/test/InteropTest2.java $(PROJECTPATH)/src/java/test/gov/noaa/taskapi/test/InteropTest3.java
#USER SPECIFIED
#The following var should contain a list of JARS or other dirs/containers holding sources or their dependencies,
#separated by ':', used in generating java headers for native interop for classes listed in JAVACLASSES
JAVAHPATH=$(PROJECTPATH)/dependencies/clojure-1.8.0.jar:$(PROJECTPATH)/dependencies/onyx-java-0.1.8.jar:$(PROJECTPATH)/src/java/main:$(PROJECTPATH)/src/java/test
JAVAHPATH=$(PROJECTPATH)/dependencies/clojure-1.8.0.jar:$(PROJECTPATH)/dependencies/onyx-java-0.1.8.jar:$(PROJECTPATH)/src/java/main:$(PROJECTPATH)/src/java/test:$(PROJECTPATH)/src/java/test/gov/noaa/taskapi/test
#USER SPECIFIED
#The following vars should contain strings representing the C, Fortran, and CPP libraries that glue the fortran code to java code.
......@@ -114,7 +115,8 @@ all: clean gen-headers build
gen-headers:
echo "Generating headers. "
echo ""
$(foreach header,$(JAVAHCLASSES),javah -d $(USERCPATH) -classpath $(JAVAHPATH) -force $(header);)
#$(foreach header,$(JAVAHCLASSES),javah -d $(USERCPATH) -classpath $(JAVAHPATH) -force $(header);)
$(foreach header,$(JAVAHCLASSES),javac -h $(USERCPATH) -classpath $(JAVAHPATH) $(header);)
echo ""
build:
......
......@@ -19,12 +19,13 @@ LIBNAME=InteropTest
#USER SPECIFIED
#The following var should contain a list of fully qualified Java classes used by the C glue functions.
JAVAHCLASSES:=gov.noaa.taskapi.test.InteropTest gov.noaa.taskapi.test.InteropTest2 gov.noaa.taskapi.test.InteropTest3
#These should be separated by slashes instead of .s for the namespace.
JAVAHCLASSES:=$(PROJECTPATH)/src/java/test/gov/noaa/taskapi/test/InteropTest.java $(PROJECTPATH)/src/java/test/gov/noaa/taskapi/test/InteropTest2.java $(PROJECTPATH)/src/java/test/gov/noaa/taskapi/test/InteropTest3.java
#USER SPECIFIED
#The following var should contain a list of JARS or other dirs/containers holding sources or their dependencies,
#separated by ':', used in generating java headers for native interop for classes listed in JAVACLASSES
JAVAHPATH=$(PROJECTPATH)/dependencies/clojure-1.8.0.jar:$(PROJECTPATH)/dependencies/onyx-java-0.1.8.jar:$(PROJECTPATH)/src/java/main:$(PROJECTPATH)/src/java/test
JAVAHPATH=$(PROJECTPATH)/dependencies/clojure-1.8.0.jar:$(PROJECTPATH)/dependencies/onyx-java-0.1.8.jar:$(PROJECTPATH)/src/java/main:$(PROJECTPATH)/src/java/test:$(PROJECTPATH)/src/java/test/gov/noaa/taskapi/test
#USER SPECIFIED
#The following vars should contain strings representing the C, Fortran, and CPP libraries that glue the fortran code to java code.
......@@ -114,7 +115,8 @@ all: clean gen-headers build
gen-headers:
echo "Generating headers. "
echo ""
$(foreach header,$(JAVAHCLASSES),javah -d $(USERCPATH) -classpath $(JAVAHPATH) -force $(header);)
#$(foreach header,$(JAVAHCLASSES),javah -d $(USERCPATH) -classpath $(JAVAHPATH) -force $(header);)
$(foreach header,$(JAVAHCLASSES),javac -h $(USERCPATH) -classpath $(JAVAHPATH) $(header);)
echo ""
build:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment