[chronojump] Importer on windows can use python3
- From: Xavier de Blas <xaviblas src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [chronojump] Importer on windows can use python3
- Date: Mon, 8 Jun 2020 12:20:36 +0000 (UTC)
commit f1b5b03b6e597d4e53b60fe9f96874333a2ba15e
Author: Xavier de Blas <xaviblas gmail com>
Date: Mon Jun 8 14:19:18 2020 +0200
Importer on windows can use python3
src/chronojumpImporter.cs | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
---
diff --git a/src/chronojumpImporter.cs b/src/chronojumpImporter.cs
index 4ca1928f..ef005968 100644
--- a/src/chronojumpImporter.cs
+++ b/src/chronojumpImporter.cs
@@ -334,7 +334,12 @@ LogB.Information("import A ");
if (UtilAll.IsWindows()) {
// On Windows we execute the .exe file (it's the Python with py2exe)
- importer_executable = System.IO.Path.Combine (Util.GetPrefixDir (),
"bin\\chronojump-importer\\chronojump_importer.exe");
+ // right now default to python2
+ if(pythonVersion == Preferences.pythonVersionEnum.Python ||
+ pythonVersion == Preferences.pythonVersionEnum.Python2)
+ importer_executable = System.IO.Path.Combine (Util.GetPrefixDir (),
"bin\\chronojump-importer\\chronojump_importer.exe");
+ else
+ importer_executable = System.IO.Path.Combine (Util.GetPrefixDir (),
"bin\\chronojump-importer-python3\\chronojump_importer.exe");
} else {
// On Linux and OSX we execute Python and we pass the path to the script as a first
argument
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]