From e7fcaa4d9297850780ff4023d44443c2beb48acc Mon Sep 17 00:00:00 2001 From: fyrz Date: Wed, 19 Nov 2014 21:21:21 +0100 Subject: [PATCH] [RocksJava] JavaDoc is executed too often Previous to this commit too much targets got dependencies on javadocs target. Introduced one additional target "javalib" which resolves that situation. JavaDoc will now be generated once while executing a task with prefix "rocksdbjava". --- Makefile | 4 ++-- java/Makefile | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index fc80fa377..ad79d0589 100644 --- a/Makefile +++ b/Makefile @@ -594,7 +594,7 @@ libsnappy.a: rocksdbjavastatic: libz.a libbz2.a libsnappy.a OPT="-fPIC -DNDEBUG -O2" $(MAKE) $(LIBRARY) -j - cd java;$(MAKE) java; + cd java;$(MAKE) javalib; rm -f ./java/$(ROCKSDBJNILIB) $(CXX) $(CXXFLAGS) -I./java/. $(JAVA_INCLUDE) -shared -fPIC -o ./java/$(ROCKSDBJNILIB) $(JNI_NATIVE_SOURCES) $(LIBOBJECTS) $(COVERAGEFLAGS) libz.a libbz2.a libsnappy.a cd java;jar -cf $(ROCKSDB_JAR) org/rocksdb/*.class org/rocksdb/util/*.class HISTORY*.md $(ROCKSDBJNILIB) @@ -615,7 +615,7 @@ rocksdbjavastaticpublish: rocksdbjavastaticrelease rocksdbjava: OPT="-fPIC -DNDEBUG -O2" $(MAKE) $(LIBRARY) -j32 - cd java;$(MAKE) java; + cd java;$(MAKE) javalib; rm -f ./java/$(ROCKSDBJNILIB) $(CXX) $(CXXFLAGS) -I./java/. $(JAVA_INCLUDE) -shared -fPIC -o ./java/$(ROCKSDBJNILIB) $(JNI_NATIVE_SOURCES) $(LIBOBJECTS) $(JAVA_LDFLAGS) $(COVERAGEFLAGS) cd java;jar -cf $(ROCKSDB_JAR) org/rocksdb/*.class org/rocksdb/util/*.class HISTORY*.md $(ROCKSDBJNILIB) diff --git a/java/Makefile b/java/Makefile index c9e6ce80f..e8dc5cb47 100644 --- a/java/Makefile +++ b/java/Makefile @@ -97,7 +97,9 @@ clean: javadocs: mkdir -p javadoc; javadoc -d javadoc -sourcepath . -subpackages org -exclude org.rocksdb.test -java: javadocs resolve_test_deps +javalib: java javadocs + +java: resolve_test_deps javac org/rocksdb/util/*.java org/rocksdb/*.java javac -cp $(JAVA_TESTCLASSPATH) org/rocksdb/test/*.java @cp ../HISTORY.md ./HISTORY-CPP.md