Windows Installer: Drop the SCOPY_PYTHONPATH environment variable.

We no longer set the env var. Version v1.1.2 will be the last one that knows how to remove the SCOPY_PYTHONPATH env var from the system at uninstall. If not uninstalled, then the env var will remain and we need to provide backwards compatibility. That is why we append it to the end of the path. If Scopy was installed using the official installer, it will always use the hardcoded paths in applicationDirPath(), where the python3.X folder is. If Scopy is built locally on Windows, the user will set the SCOPY_PYTHONPATH env var manually and, since that one is appended at the end, the program will still function properly. Signed-off-by: Alexandra Trifan <[email protected]>
116428094 · Oct 14, 2020 · d2af6c4 · d2af6c4
1 parent c02d325
commit d2af6c4
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 12 deletions.
diff --git a/config.h.cmakein b/config.h.cmakein
@@ -4,5 +4,6 @@
 #define PROJECT_VERSION	       "@PROJECT_VERSION@"
 #define SCOPY_VERSION_GIT      "@SCOPY_VERSION_GIT@"
 #define BREAKPAD_HANDLER       @BREAKPAD_HANDLER_BOOL@
+#define PYTHON_VERSION		"@PYTHON_VERSION@"
 
 #endif // CONFIG_H_CMAKEIN
diff --git a/scopy-32.iss.cmakein b/scopy-32.iss.cmakein
@@ -65,9 +65,6 @@ Name: "{group}\{#AppName}"; Filename: "{app}\{#AppExeName}"
 Name: "{group}\{cm:UninstallProgram,{#AppName}}"; Filename: "{uninstallexe}"
 Name: "{commondesktop}\{#AppName}"; Filename: "{app}\{#AppExeName}"; Tasks: desktopicon
 
-[Registry]
-Root: HKLM; Subkey: "System\CurrentControlSet\Control\Session Manager\Environment"; ValueType:string; ValueName: "SCOPY_PYTHONPATH"; ValueData: "{app}\{#Python};{app}\{#Python}\plat-win;{app}\{#Python}\lib-dynload;{app}\{#Python}\site-packages"; Flags: uninsdeletevalue
-
 [Code]
 var
   DeleteIniCheckBox: TNewCheckBox;

diff --git a/scopy-64.iss.cmakein b/scopy-64.iss.cmakein
@@ -65,9 +65,6 @@ Name: "{group}\{#AppName}"; Filename: "{app}\{#AppExeName}"
 Name: "{group}\{cm:UninstallProgram,{#AppName}}"; Filename: "{uninstallexe}"
 Name: "{commondesktop}\{#AppName}"; Filename: "{app}\{#AppExeName}"; Tasks: desktopicon
 
-[Registry]
-Root: HKLM; Subkey: "System\CurrentControlSet\Control\Session Manager\Environment"; ValueType:string; ValueName: "SCOPY_PYTHONPATH"; ValueData: "{app}\{#Python};{app}\{#Python}\plat-win;{app}\{#Python}\lib-dynload;{app}\{#Python}\site-packages"; Flags: uninsdeletevalue
-
 [Code]
 var
   DeleteIniCheckBox: TNewCheckBox;

diff --git a/scopy.iss.cmakein b/scopy.iss.cmakein
@@ -66,10 +66,6 @@ Name: "{group}\{#AppName}"; Filename: "{app}\{#AppExeName}"
 Name: "{group}\{cm:UninstallProgram,{#AppName}}"; Filename: "{uninstallexe}"
 Name: "{commondesktop}\{#AppName}"; Filename: "{app}\{#AppExeName}"; Tasks: desktopicon
 
-[Registry]
-Root: HKLM; Subkey: "System\CurrentControlSet\Control\Session Manager\Environment"; ValueType:string; ValueName: "SCOPY_PYTHONPATH"; ValueData: "{app}\{#Python};{app}\{#Python}\plat-win;{app}\{#Python}\lib-dynload;{app}\{#Python}\site-packages"; Flags: uninsdeletevalue
-
-
 [Code]
 var
   DeleteIniCheckBox: TNewCheckBox;

diff --git a/src/main.cpp b/src/main.cpp
@@ -70,9 +70,15 @@ int main(int argc, char **argv)
 		app.setStyleSheet(stylesheet);
 	}
 
+#ifdef WIN32
 	auto pythonpath = qgetenv("SCOPY_PYTHONPATH");
-	if (!pythonpath.isNull())
-		qputenv("PYTHONPATH", pythonpath);
+	auto path_str = QCoreApplication::applicationDirPath() + "\\" + PYTHON_VERSION + ";";
+	path_str += QCoreApplication::applicationDirPath() + "\\" + PYTHON_VERSION + "\\plat-win;";
+	path_str += QCoreApplication::applicationDirPath() + "\\" + PYTHON_VERSION + "\\lib-dynload;";
+	path_str += QCoreApplication::applicationDirPath() + "\\" + PYTHON_VERSION + "\\site-packages;";
+	path_str += QString::fromLocal8Bit(pythonpath);
+	qputenv("PYTHONPATH", path_str.toLocal8Bit());
+#endif
 
 	QCoreApplication::setOrganizationName("ADI");
 	QCoreApplication::setOrganizationDomain("analog.com");