Skip to content

Commit 1663cfe

Browse files
committed
build(makefile): add slf4j dependency
1 parent 77339ed commit 1663cfe

File tree

2 files changed

+14
-6
lines changed

2 files changed

+14
-6
lines changed

Makefile

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ DOCKER_RUN_OPTS=--rm
1414
MVN:=mvn
1515
CODESIGN:=docker run $(DOCKER_RUN_OPTS) -v $$PWD:/workdir gotson/rcodesign sign
1616
SRC:=src/main/java
17+
JAVA_CLASSPATH:=$(TARGET)/classpath/slf4j-api.jar
1718
SQLITE_OUT:=$(TARGET)/$(sqlite)-$(OS_NAME)-$(OS_ARCH)
1819
SQLITE_OBJ?=$(SQLITE_OUT)/sqlite3.o
1920
SQLITE_ARCHIVE:=$(TARGET)/$(sqlite)-amal.zip
@@ -42,16 +43,19 @@ $(SQLITE_UNPACKED): $(SQLITE_ARCHIVE)
4243
(mv $(TARGET)/tmp.$(version)/$(SQLITE_AMAL_PREFIX) $(TARGET) && rmdir $(TARGET)/tmp.$(version)) || mv $(TARGET)/tmp.$(version)/ $(TARGET)/$(SQLITE_AMAL_PREFIX)
4344
touch $@
4445

46+
$(JAVA_CLASSPATH):
47+
@mkdir -p $(@D)
48+
curl -L -f -o$@ https://search.maven.org/remotecontent?filepath=org/slf4j/slf4j-api/2.0.9/slf4j-api-2.0.9.jar
4549

4650
$(TARGET)/common-lib/org/sqlite/%.class: src/main/java/org/sqlite/%.java
4751
@mkdir -p $(@D)
4852
$(JAVAC) -source 1.6 -target 1.6 -sourcepath $(SRC) -d $(TARGET)/common-lib $<
4953

5054
jni-header: $(TARGET)/common-lib/NativeDB.h
5155

52-
$(TARGET)/common-lib/NativeDB.h: src/main/java/org/sqlite/core/NativeDB.java
56+
$(TARGET)/common-lib/NativeDB.h: src/main/java/org/sqlite/core/NativeDB.java $(JAVA_CLASSPATH)
5357
@mkdir -p $(TARGET)/common-lib
54-
$(JAVAC) -d $(TARGET)/common-lib -sourcepath $(SRC) -h $(TARGET)/common-lib src/main/java/org/sqlite/core/NativeDB.java
58+
$(JAVAC) -cp $(JAVA_CLASSPATH) -d $(TARGET)/common-lib -sourcepath $(SRC) -h $(TARGET)/common-lib src/main/java/org/sqlite/core/NativeDB.java
5559
mv target/common-lib/org_sqlite_core_NativeDB.h target/common-lib/NativeDB.h
5660

5761
test:

Makefile.common

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,20 +9,24 @@ JAVAC := "$$JAVA_HOME/bin/javac"
99
JAVAH := "$$JAVA_HOME/bin/javah"
1010

1111
TARGET := target
12+
SRC:=src/main/java
1213
OSINFO_CLASS := org.sqlite.util.OSInfo
1314
OSINFO_PROG := lib/org/sqlite/util/OSInfo.class
15+
JAVA_CLASSPATH:=$(TARGET)/classpath/slf4j-api.jar
1416

1517
## building OSInfo.java
1618
ifeq ("$(wildcard $(OSINFO_PROG))","")
1719
$(info Building OSInfo tool)
18-
$(shell $(JAVAC) -cp src/main/java -d lib src/main/java/org/sqlite/util/OSInfo.java)
20+
$(shell mkdir -p $(TARGET)/classpath)
21+
$(shell curl -L -f -o$(JAVA_CLASSPATH) https://search.maven.org/remotecontent?filepath=org/slf4j/slf4j-api/2.0.9/slf4j-api-2.0.9.jar)
22+
$(shell $(JAVAC) -cp $(JAVA_CLASSPATH) -sourcepath $(SRC) -d lib src/main/java/org/sqlite/util/OSInfo.java)
1923
endif
2024

2125
ifndef OS_NAME
22-
OS_NAME := $(shell $(JAVA) -cp lib $(OSINFO_CLASS) --os)
26+
OS_NAME := $(shell $(JAVA) -cp lib:$(JAVA_CLASSPATH) $(OSINFO_CLASS) --os)
2327
endif
2428
ifndef OS_ARCH
25-
OS_ARCH := $(shell $(JAVA) -cp lib $(OSINFO_CLASS) --arch)
29+
OS_ARCH := $(shell $(JAVA) -cp lib:$(JAVA_CLASSPATH) $(OSINFO_CLASS) --arch)
2630
endif
2731

2832
# Windows uses different path separators
@@ -55,7 +59,7 @@ ifeq (,$(findstring $(strip $(target)),$(known_targets)))
5559
target := Default
5660
endif
5761

58-
$(info Will build using target: $(target) (detected os: $(OS_NAME) arch: $(OS_ARCH)))
62+
$(info Will build using target: $(target) (detected os: $(OS_NAME), arch: $(OS_ARCH)))
5963

6064
# cross-compilation toolchain prefix (e.g. "arm-linux-gnueabi-")
6165
CROSS_PREFIX :=

0 commit comments

Comments
 (0)