From fe8c69997c3d47970cf06e1a6d6c74841eee7b50 Mon Sep 17 00:00:00 2001 From: jwijenbergh Date: Tue, 10 May 2022 16:16:00 +0200 Subject: Python: Fix lib path --- wrappers/python/Makefile | 6 +++--- wrappers/python/setup.py | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'wrappers/python') diff --git a/wrappers/python/Makefile b/wrappers/python/Makefile index 22e9144..1526173 100644 --- a/wrappers/python/Makefile +++ b/wrappers/python/Makefile @@ -9,13 +9,13 @@ endif # Build for current platform only pack: - mkdir -p eduvpncommon/lib + mkdir -p ./src/lib ./setup.py bdist_wheel $(SETUP_ARGS) --exports-lib-path="$(EXPORTS_LIB_PATH)" test: .try-build-lib - install "$(EXPORTS_LIB_SUBFOLDER_PATH)/$(LIB_FILE)" -Dt "eduvpncommon/lib" + install "$(EXPORTS_LIB_SUBFOLDER_PATH)/$(LIB_FILE)" -Dt "src/lib" python3 -m unittest tests - rm eduvpncommon/lib/* + rm src/lib/* clean: rm -rf build/ dist/ *.egg-info/ lib/* diff --git a/wrappers/python/setup.py b/wrappers/python/setup.py index 3ae926f..533ba82 100755 --- a/wrappers/python/setup.py +++ b/wrappers/python/setup.py @@ -76,7 +76,7 @@ class bdist_wheel(_bdist_wheel): print(f"Building wheel for platform {self.plat_name}") # setuptools will only use paths inside the package for package_data, so we copy the library - tmp_lib = shutil.copy(f"{self.exports_lib_path}/{libpath}", "eduvpncommon/lib/") + tmp_lib = shutil.copy(f"{self.exports_lib_path}/{libpath}", "src/lib/") _bdist_wheel.run(self) os.remove(tmp_lib) -- cgit v1.2.3