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

Squashed commit of the following:

commit 6247d5d8f860481ef8715c556cafce46dd554272
Author: Insoleet <insomniak.fr@gmail.com>
Date:   Fri Nov 6 10:12:03 2015 +0100

    Fix Conda path

commit 92766fd74eafde0cefe0682604f889ddf254a713
Author: Insoleet <insomniak.fr@gmail.com>
Date:   Fri Nov 6 09:58:34 2015 +0100

    Print environment

commit 51c1266f468a3c3575c4cd4028130a9f04df24b3
Author: Inso <insomniak.fr@gmail.com>
Date:   Fri Nov 6 08:53:26 2015 +0100

    Fix syntax error

commit 6c2f6da500cdb0f414342cfeec02a0e08de66678
Author: Inso <insomniak.fr@gmail.com>
Date:   Fri Nov 6 08:45:49 2015 +0100

    Try to analyse the problem

commit 2cd1fb498e21353199cb97df4ce36ebb17701cb9
Author: Inso <insomniak.fr@gmail.com>
Date:   Fri Nov 6 08:39:37 2015 +0100

    Try to fix windows build
parent 5a369b4f
No related branches found
No related tags found
No related merge requests found
......@@ -18,7 +18,7 @@ pip install base58
pip install git+https://github.com/Insoleet/quamash.git@sockets_only
pip install aiohttp
pip install git+https://github.com/ucoin-io/ucoin-python-api.git
pip install git+https://github.com/Insoleet/pretenders.git@develop
pip install pretenders
python gen_resources.py
if %errorlevel% neq 0 exit /b 1s
......
......@@ -12,6 +12,8 @@ from PyQt5 import QtCore
sys.path.append(os.path.abspath(os.path.join(os.path.dirname(__file__), 'src')))
print(sys.path)
print("Environnement:")
print(os.environ)
includes = ["sip", "re", "json", "logging",
"hashlib", "os", "urllib",
"ucoinpy", "pylibscrypt"]
......@@ -29,7 +31,7 @@ if sys.platform == "win32":
if os.path.isfile(os.path.join(os.path.dirname(path), "libEGL.dll")):
libEGL_path = os.path.join(os.path.dirname(path), "libEGL.dll")
if 'CONDA_ENV_PATH' in os.environ:
if 'CONDA_DEFAULT_ENV' in os.environ:
# Check if we are in Conda env
path = QtCore.QCoreApplication.libraryPaths()[0]
libEGL_path = os.path.join(path, "Scripts", "libEGL.dll")
......@@ -52,11 +54,20 @@ else:
libsodium_path = ""
print(QtCore.QCoreApplication.libraryPaths())
# Check if we are in Conda env
if 'CONDA_ENV_PATH' in os.environ:
libsodium_path = os.path.join(os.environ['CONDA_ENV_PATH'], "lib",
if 'CONDA_DEFAULT_ENV' in os.environ:
libsodium_path = os.path.join(os.environ['CONDA_DEFAULT_ENV'], "lib",
"libsodium.so.13")
includefiles.append((libsodium_path, "libsodium.so.13"))
print("Includes : ")
print(includes)
print("Excludes : ")
print(exclude)
print("Include files : ")
print(includefiles)
print("Packages : ")
print(packages)
print(sys.path)
options = {"path": sys.path,
"includes": includes,
......
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