3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-10 08:17:49 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Renamed folder structure to venv structure

Browse source 
Contributes to CURA-9365
This commit is contained in:
j.spijker@ultimaker.com 2022-06-30 09:39:21 +02:00 • committed by Jelle Spijker
parent d47635c0f9
commit 6b51753973
1 changed files with 6 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

15
conanfile.py
View file

@ -100,26 +100,22 @@ class CuraConan(ConanFile):
def _share_dir(self): def _share_dir(self):
return self._base_dir.joinpath("share") return self._base_dir.joinpath("share")
@property
def _bin_dir(self):
return self._base_dir.joinpath("bin")
@property @property
def _script_dir(self): def _script_dir(self):
if self.settings.os == "Windows": if self.settings.os == "Windows":
return self._bin_dir.joinpath("Scripts") return self._base_dir.joinpath("Scripts")
return self._bin_dir.joinpath("bin") return self._base_dir.joinpath("bin")
@property @property
def _site_packages(self): def _site_packages(self):
if self.settings.os == "Windows": if self.settings.os == "Windows":
return self._bin_dir.joinpath("Lib", "site-packages") return self._base_dir.joinpath("Lib", "site-packages")
py_version = tools.Version(self.deps_cpp_info["cpython"].version) py_version = tools.Version(self.deps_cpp_info["cpython"].version)
return self._bin_dir.joinpath("lib", f"python{py_version.major}.{py_version.minor}", "site-packages") return self._base_dir.joinpath("lib", f"python{py_version.major}.{py_version.minor}", "site-packages")
@property @property
def _py_interp(self): def _py_interp(self):
py_interp = self._bin_dir.joinpath(Path(self.deps_user_info["cpython"].python).name) py_interp = self._script_dir.joinpath(Path(self.deps_user_info["cpython"].python).name)
if self.settings.os == "Windows": if self.settings.os == "Windows":
py_interp = Path(*[f'"{p}"' if " " in p else p for p in py_interp.parts]) py_interp = Path(*[f'"{p}"' if " " in p else p for p in py_interp.parts])
return py_interp return py_interp
@ -284,6 +280,7 @@ class CuraConan(ConanFile):
# Copy requirements.txt's # Copy requirements.txt's
self.copy("*.txt", src = self.cpp_info.resdirs[-1], dst = self._base_dir.joinpath("pip_requirements")) self.copy("*.txt", src = self.cpp_info.resdirs[-1], dst = self._base_dir.joinpath("pip_requirements"))
def package(self): def package(self):
self.copy("cura_app.py", src = ".", dst = self.cpp.package.bindirs[0]) self.copy("cura_app.py", src = ".", dst = self.cpp.package.bindirs[0])
self.copy("*", src = "cura", dst = self.cpp.package.libdirs[0]) self.copy("*", src = "cura", dst = self.cpp.package.libdirs[0])