pgadmin-org
/
pgadmin4
mirror of https://github.com/pgadmin-org/pgadmin4.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Adding proper virtual environment path on windows.

pull/3/head
Ashesh Vashi 2016-06-21 16:54:23 +05:30
parent 648eebd230
commit 3484998775
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
runtime/Server.cpp
View File

@ -97,10 +97,10 @@ Server::Server(quint16 port)
// end, so expert users can override the path, but we do not save it.
// Build (and canonicalise) the virtual environment path
QFileInfo venvBinPath(app_dir + "/../venv");
QFileInfo venvLibPath(app_dir + "/../venv/Lib");
QFileInfo venvDLLsPath(app_dir + "/../venv/DLLs");
QFileInfo venvSitePackagesPath(app_dir + "/../venv/Lib/site-packages");
QFileInfo venvBinPath(app_dir + "/../pgAdmin 4/venv");
QFileInfo venvLibPath(app_dir + "/../pgAdmin 4/venv/Lib");
QFileInfo venvDLLsPath(app_dir + "/../pgAdmin 4/venv/DLLs");
QFileInfo venvSitePackagesPath(app_dir + "/../pgAdmin 4/venv/Lib/site-packages");
// Prepend the bin directory to the path
add_to_path(path_env, venvBinPath.canonicalFilePath(), true);
@ -173,8 +173,10 @@ bool Server::Init()
paths.append("../web/"); // Linux source tree
paths.append("../../web/"); // Windows source tree
paths.append("../../../../web/"); // Mac source tree (in a dev env)
#ifdef Q_OS_MAC
#if definded(Q_OS_MAC)
paths.append("../Resources/web/"); // Mac source tree (in a release app bundle)
#elif defined(Q_OS_WIN)
paths.append("../pgAdmin 4/web/"); // Mac source tree (in a release app bundle)
#endif
paths.append(settings.value("ApplicationPath").toString()); // System configured value
paths.append(""); // Should be last!