summaryrefslogtreecommitdiff
path: root/wrappers/python/Makefile
diff options
context:
space:
mode:
authorStevenWdV <stevenwdv@gmail.com>2022-02-04 01:18:12 +0100
committerStevenWdV <stevenwdv@gmail.com>2022-02-04 01:18:12 +0100
commitb60ecf2fe5ddfe506e02093286b3931873187e91 (patch)
treeb3804b1b95e70e96dec98cb0c2b571e0b895ebdd /wrappers/python/Makefile
parentbb85487e40b47d701e64085e7574cb477a431f1e (diff)
More Makefile cleanup, support building in folder with spaces
Diffstat (limited to 'wrappers/python/Makefile')
-rw-r--r--wrappers/python/Makefile15
1 files changed, 3 insertions, 12 deletions
diff --git a/wrappers/python/Makefile b/wrappers/python/Makefile
index ba4cf5f..f46f06d 100644
--- a/wrappers/python/Makefile
+++ b/wrappers/python/Makefile
@@ -1,11 +1,7 @@
.PHONY: pack test clean
EXPORTS_PATH ?= ../../exports
-EXPORTS_LIB_PATH ?= $(EXPORTS_PATH)/lib
-
-ifneq ($(MAKECMDGOALS),clean)
-include $(EXPORTS_PATH)/platform.mk
-endif
+include $(EXPORTS_PATH)/common.mk
ifdef PLAT_NAME
SETUP_ARGS += --plat-name=$(PLAT_NAME)
@@ -15,13 +11,8 @@ endif
pack:
./setup.py bdist_wheel $(SETUP_ARGS) --exports-lib-path="$(EXPORTS_LIB_PATH)"
-test:
-ifneq ($(EXPORTS_PATH),)
-ifneq ($(wildcard $(EXPORTS_PATH)/Makefile),)
- $(MAKE) -C "$(EXPORTS_PATH)"
-endif
-endif
- install "$(EXPORTS_LIB_PATH)/$(GOOS)/$(GOARCH)/$(LIB_FILE)" -Dt "eduvpncommon/lib"
+test: .try_build_lib
+ install "$(EXPORTS_LIB_SUBFOLDER_PATH)/$(LIB_FILE)" -Dt "eduvpncommon/lib"
python3 -m unittest test_discovery
rm eduvpncommon/lib/*