IntenseWebs/pgadmin4
3
0
Fork 0
mirror of https://github.com/pgadmin-org/pgadmin4.git synced 2025-01-04 13:17:22 -06:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Adding proper virtual environment path on windows."

Browse Source 
As per Dave, we are not using 'pgAdmin 4' from the community installer,
hence - we should not bother about it.

This reverts commit 3484998775.
This commit is contained in:
Ashesh Vashi 2016-06-21 17:38:15 +05:30
parent 9224ce77b3
commit 980ab4735e
1 changed files with 5 additions and 7 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 + "/../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");
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");
// Prepend the bin directory to the path
add_to_path(path_env, venvBinPath.canonicalFilePath(), true);
@ -173,10 +173,8 @@ 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)
#if definded(Q_OS_MAC)
#ifdef 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!