summaryrefslogtreecommitdiff
path: root/wrappers/python
diff options
context:
space:
mode:
authorjwijenbergh <jeroenwijenbergh@protonmail.com>2022-05-10 16:16:00 +0200
committerjwijenbergh <jeroenwijenbergh@protonmail.com>2022-05-10 16:16:00 +0200
commitfe8c69997c3d47970cf06e1a6d6c74841eee7b50 (patch)
treebaeb21c889732f85eb0691567f1d9ca98dc0ca69 /wrappers/python
parentcd5019305db965b4e3acb028ec1f1524d0199917 (diff)
Python: Fix lib path
Diffstat (limited to 'wrappers/python')
-rw-r--r--wrappers/python/Makefile6
-rwxr-xr-xwrappers/python/setup.py2
2 files changed, 4 insertions, 4 deletions
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)