andreacavalli/rocksdb
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Allow rocksdbjavastatic to also be built as debug build

Browse Source 
Summary: Closes https://github.com/facebook/rocksdb/pull/3654

Differential Revision: D7417948

Pulled By: sagar0

fbshipit-source-id: 9514df9328181e54a6384764444c0c7ce66e7f5f
This commit is contained in:
Adam Retter 2018-03-28 16:18:21 -07:00 committed by Facebook Github Bot
parent 0377ff9dea
commit 3cb591954e
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Makefile
View File

@ -76,7 +76,9 @@ ifeq ($(MAKECMDGOALS),install)
endif endif
ifeq ($(MAKECMDGOALS),rocksdbjavastatic) ifeq ($(MAKECMDGOALS),rocksdbjavastatic)
DEBUG_LEVEL=0 ifneq ($(DEBUG_LEVEL),2)
DEBUG_LEVEL=0
endif
endif endif
ifeq ($(MAKECMDGOALS),rocksdbjavastaticrelease) ifeq ($(MAKECMDGOALS),rocksdbjavastaticrelease)
@ -1719,7 +1721,9 @@ rocksdbjavastatic: $(java_static_all_libobjects)
-o ./java/target/$(ROCKSDBJNILIB) $(JNI_NATIVE_SOURCES) \ -o ./java/target/$(ROCKSDBJNILIB) $(JNI_NATIVE_SOURCES) \
$(java_static_all_libobjects) $(COVERAGEFLAGS) \ $(java_static_all_libobjects) $(COVERAGEFLAGS) \
$(JAVA_COMPRESSIONS) $(JAVA_STATIC_LDFLAGS) $(JAVA_COMPRESSIONS) $(JAVA_STATIC_LDFLAGS)
cd java/target;strip $(STRIPFLAGS) $(ROCKSDBJNILIB) cd java/target;if [ "$(DEBUG_LEVEL)" == "0" ]; then \
strip $(STRIPFLAGS) $(ROCKSDBJNILIB); \
fi
cd java;jar -cf target/$(ROCKSDB_JAR) HISTORY*.md cd java;jar -cf target/$(ROCKSDB_JAR) HISTORY*.md
cd java/target;jar -uf $(ROCKSDB_JAR) $(ROCKSDBJNILIB) cd java/target;jar -uf $(ROCKSDB_JAR) $(ROCKSDBJNILIB)
cd java/target/classes;jar -uf ../$(ROCKSDB_JAR) org/rocksdb/*.class org/rocksdb/util/*.class cd java/target/classes;jar -uf ../$(ROCKSDB_JAR) org/rocksdb/*.class org/rocksdb/util/*.class