Skip to content

Commit 2bb4a66

Browse files
committed
fixup! Refactor to use Maven for building and publishing Java packages
1 parent 6ce09fd commit 2bb4a66

1 file changed

Lines changed: 4 additions & 4 deletions

File tree

Makefile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2397,7 +2397,7 @@ rocksdbjavageneratepom:
23972397
jl/%.o: %.cc
23982398
$(AM_V_CC)mkdir -p $(@D) && $(CXX) $(CXXFLAGS) -fPIC -c $< -o $@ $(COVERAGEFLAGS)
23992399

2400-
rocksdbjava: $(LIB_OBJECTS) rocksdbjavanativedir
2400+
rocksdbjava: $(LIB_OBJECTS) rocksdbjavanativedir rocksdbjavageneratepom
24012401
ifeq ($(JAVA_HOME),)
24022402
$(error JAVA_HOME is not set)
24032403
endif
@@ -2406,13 +2406,13 @@ endif
24062406
$(AM_V_at)$(CXX) $(CXXFLAGS) -I./java/. -I./java/rocksjni $(JAVA_INCLUDE) $(ROCKSDB_PLUGIN_JNI_CXX_INCLUDEFLAGS) -shared -fPIC -o ./$(JAVA_NATIVE_DIR)/$(ROCKSDBJNILIB) $(ALL_JNI_NATIVE_SOURCES) $(LIB_OBJECTS) $(JAVA_LDFLAGS) $(COVERAGEFLAGS)
24072407
$(AM_V_at)cd java; $(MAVEN_CMD) package -DskipTests
24082408

2409-
jclean:
2409+
jclean: rocksdbjavageneratepom
24102410
cd java;$(MAKE) clean;
24112411

24122412
jtest_compile: rocksdbjava
24132413
cd java;$(MAKE) java_test
24142414

2415-
jtest_run:
2415+
jtest_run: rocksdbjavageneratepom
24162416
cd java;$(MAKE) run_test
24172417

24182418
jtest: rocksdbjava
@@ -2421,7 +2421,7 @@ jtest: rocksdbjava
24212421
jpmd: rocksdbjavageneratepom
24222422
cd java;$(MAKE) java java_test pmd
24232423

2424-
jdb_bench:
2424+
jdb_bench: rocksdbjavageneratepom
24252425
cd java;$(MAKE) db_bench;
24262426

24272427
commit_prereq:

0 commit comments

Comments
 (0)