Skip to content
Snippets Groups Projects
Commit ded1c14e authored by inso's avatar inso
Browse files

Fix build on windows

parent c6a39929
No related branches found
No related tags found
No related merge requests found
...@@ -26,13 +26,6 @@ packages = ["libnacl", "encodings", "jsonschema"] ...@@ -26,13 +26,6 @@ packages = ["libnacl", "encodings", "jsonschema"]
includefiles = [] includefiles = []
zipincludes = [] zipincludes = []
schemas = os.path.join(site.getsitepackages()[0], "jsonschema", "schemas")
onlyfiles = [ f for f in listdir(schemas) if isfile(join(schemas,f)) ]
for f in onlyfiles:
zipincludes.append((os.path.join(schemas, f), os.path.join("jsonschema", "schemas", f)))
if sys.platform == "win32": if sys.platform == "win32":
app = QtCore.QCoreApplication(sys.argv) app = QtCore.QCoreApplication(sys.argv)
libEGL_path = "" libEGL_path = ""
...@@ -43,7 +36,13 @@ if sys.platform == "win32": ...@@ -43,7 +36,13 @@ if sys.platform == "win32":
libEGL_path = os.path.join(os.path.dirname(path), "libEGL.dll") libEGL_path = os.path.join(os.path.dirname(path), "libEGL.dll")
if 'CONDA_DEFAULT_ENV' in os.environ: if 'CONDA_DEFAULT_ENV' in os.environ:
# Check if we are in Conda env # Check if we are in Conda env
schemas = os.path.join(site.getsitepackages()[1], "jsonschema", "schemas")
onlyfiles = [ f for f in listdir(schemas) if isfile(join(schemas,f)) ]
for f in onlyfiles:
zipincludes.append((os.path.join(schemas, f), os.path.join("jsonschema", "schemas", f)))
path = QtCore.QCoreApplication.libraryPaths()[0] path = QtCore.QCoreApplication.libraryPaths()[0]
libEGL_path = os.path.join(path, "Scripts", "libEGL.dll") libEGL_path = os.path.join(path, "Scripts", "libEGL.dll")
libsodium_path = os.path.join(path, "Scripts", "libsodium.dll") libsodium_path = os.path.join(path, "Scripts", "libsodium.dll")
...@@ -64,18 +63,26 @@ elif sys.platform == "darwin": ...@@ -64,18 +63,26 @@ elif sys.platform == "darwin":
else: else:
libsodium_path = "" libsodium_path = ""
print(QtCore.QCoreApplication.libraryPaths()) print(QtCore.QCoreApplication.libraryPaths())
schemas = os.path.join(site.getsitepackages()[0], "jsonschema", "schemas")
for f in onlyfiles:
zipincludes.append((os.path.join(schemas, f), os.path.join("jsonschema", "schemas", f)))
onlyfiles = [ f for f in listdir(schemas) if isfile(join(schemas,f)) ]
# Check if we are in Conda env # Check if we are in Conda env
if 'CONDA_ENV_PATH' in os.environ: if 'CONDA_ENV_PATH' in os.environ:
libsodium_path = os.path.join(os.environ['CONDA_ENV_PATH'], "lib", libsodium_path = os.path.join(os.environ['CONDA_ENV_PATH'], "lib",
"libsodium.so.13") "libsodium.so.13")
includefiles.append((libsodium_path, "libsodium.so.13")) includefiles.append((libsodium_path, "libsodium.so.13"))
print("Includes : ") print("Includes : ")
print(includes) print(includes)
print("Excludes : ") print("Excludes : ")
print(exclude) print(exclude)
print("Include files : ") print("Include files : ")
print(includefiles) print(includefiles)
print("Zip files : ")
print(zipincludes)
print("Packages : ") print("Packages : ")
print(packages) print(packages)
print(sys.path) print(sys.path)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment