From 990f73398dfae2d4617e442fd4d753433407fe99 Mon Sep 17 00:00:00 2001 From: Marshall Pierce Date: Fri, 13 Dec 2019 15:58:28 -0700 Subject: [PATCH] Use javac -h instead of javah (#238) This allows it to build on JDK10. --- .gitignore | 2 +- Makefile | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index fc37fa8..07cd814 100644 --- a/.gitignore +++ b/.gitignore @@ -22,4 +22,4 @@ project/plugins/project/ .scala_dependencies atlassian-ide-plugin.xml - +src/main/java/**/*.h diff --git a/Makefile b/Makefile index 2a81419..18979ab 100644 --- a/Makefile +++ b/Makefile @@ -90,17 +90,15 @@ snappy-header: $(SNAPPY_CMAKE_CACHE) $(TARGET)/jni-classes/org/xerial/snappy/SnappyNative.class: $(SRC)/org/xerial/snappy/SnappyNative.java @mkdir -p $(TARGET)/jni-classes - $(JAVAC) -source 1.7 -target 1.7 -d $(TARGET)/jni-classes -sourcepath $(SRC) $< + $(JAVAC) -source 1.7 -target 1.7 -h $(SRC)/org/xerial/snappy/ -d $(TARGET)/jni-classes -sourcepath $(SRC) $< $(SRC)/org/xerial/snappy/SnappyNative.h: $(TARGET)/jni-classes/org/xerial/snappy/SnappyNative.class - $(JAVAH) -force -classpath $(TARGET)/jni-classes -o $@ org.xerial.snappy.SnappyNative $(TARGET)/jni-classes/org/xerial/snappy/BitShuffleNative.class: $(SRC)/org/xerial/snappy/BitShuffleNative.java @mkdir -p $(TARGET)/jni-classes - $(JAVAC) -source 1.7 -target 1.7 -d $(TARGET)/jni-classes -sourcepath $(SRC) $< + $(JAVAC) -source 1.7 -target 1.7 -h $(SRC)/org/xerial/snappy/ -d $(TARGET)/jni-classes -sourcepath $(SRC) $< $(SRC)/org/xerial/snappy/BitShuffleNative.h: $(TARGET)/jni-classes/org/xerial/snappy/BitShuffleNative.class - $(JAVAH) -force -classpath $(TARGET)/jni-classes -o $@ org.xerial.snappy.BitShuffleNative $(SNAPPY_SRC): $(SNAPPY_GIT_UNPACKED)