diff options
| author | StevenWdV <stevenwdv@gmail.com> | 2022-02-04 01:18:12 +0100 |
|---|---|---|
| committer | StevenWdV <stevenwdv@gmail.com> | 2022-02-04 01:18:12 +0100 |
| commit | b60ecf2fe5ddfe506e02093286b3931873187e91 (patch) | |
| tree | b3804b1b95e70e96dec98cb0c2b571e0b895ebdd /wrappers/java | |
| parent | bb85487e40b47d701e64085e7574cb477a431f1e (diff) | |
More Makefile cleanup, support building in folder with spaces
Diffstat (limited to 'wrappers/java')
| -rw-r--r-- | wrappers/java/Makefile | 9 | ||||
| -rw-r--r-- | wrappers/java/README.md | 3 |
2 files changed, 5 insertions, 7 deletions
diff --git a/wrappers/java/Makefile b/wrappers/java/Makefile index a63aef7..ebb8103 100644 --- a/wrappers/java/Makefile +++ b/wrappers/java/Makefile @@ -1,7 +1,7 @@ .PHONY: build pack test clean EXPORTS_PATH ?= ../../exports -EXPORTS_LIB_PATH ?= $(EXPORTS_PATH)/lib +include $(EXPORTS_PATH)/common.mk build: mvn --no-transfer-progress compile -DEXPORTS_LIB_PATH="$(EXPORTS_LIB_PATH)" @@ -9,12 +9,7 @@ build: pack: mvn --no-transfer-progress package -DEXPORTS_LIB_PATH="$(EXPORTS_LIB_PATH)" -test: -ifneq ($(EXPORTS_PATH),) -ifneq ($(wildcard $(EXPORTS_PATH)/Makefile),) - $(MAKE) -C "$(EXPORTS_PATH)" -endif -endif +test: .try_build_lib mvn --no-transfer-progress test -DEXPORTS_LIB_PATH="$(EXPORTS_LIB_PATH)" clean: diff --git a/wrappers/java/README.md b/wrappers/java/README.md index b72d90e..e19075b 100644 --- a/wrappers/java/README.md +++ b/wrappers/java/README.md @@ -24,6 +24,9 @@ make pack The JAR will include all versions of the library that are built in the `exports` folder. +If you do not build this as part of the full repository, specify `EXPORTS_PATH="path/to/exports-folder"` +when calling make. This folder must contain `common.mk` and the `lib/` folder with built libraries. + Test: ```shell |