[chronojump] 7zr on Windows UNTESTED
- From: Xavier de Blas <xaviblas src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [chronojump] 7zr on Windows UNTESTED
- Date: Wed, 28 Sep 2022 14:53:12 +0000 (UTC)
commit 907b2c0586955f5387eca433e874ae71af88d239
Author: Xavier de Blas <xaviblas gmail com>
Date: Wed Sep 28 16:50:09 2022 +0200
7zr on Windows UNTESTED
src/gui/app1/session/export.cs | 4 +++-
src/gui/app1/session/loadAndImport.cs | 4 +++-
win32/deps/bin/7zr.exe | Bin 0 -> 578048 bytes
3 files changed, 6 insertions(+), 2 deletions(-)
---
diff --git a/src/gui/app1/session/export.cs b/src/gui/app1/session/export.cs
index 42e1fddc7..de7b21c55 100644
--- a/src/gui/app1/session/export.cs
+++ b/src/gui/app1/session/export.cs
@@ -265,8 +265,10 @@ public partial class ChronoJumpWindow
//parameters.Add (app1s_fileCopy + Path.DirectorySeparatorChar + "*");
string executable = "7z";
- if(operatingSystem == UtilAll.OperatingSystems.MACOSX)
+ if (operatingSystem == UtilAll.OperatingSystems.MACOSX)
executable = System.IO.Path.Combine(Util.GetPrefixDir(), "bin/7zz");
+ else if (operatingSystem == UtilAll.OperatingSystems.WINDOWS)
+ executable = System.IO.Path.Combine(Util.GetPrefixDir(), "bin/7zr.exe");
ExecuteProcess.Result execute_result = ExecuteProcess.run (executable, parameters,
false, false);
// delete exported folder
diff --git a/src/gui/app1/session/loadAndImport.cs b/src/gui/app1/session/loadAndImport.cs
index 7c5c3013c..bc9b90d1a 100644
--- a/src/gui/app1/session/loadAndImport.cs
+++ b/src/gui/app1/session/loadAndImport.cs
@@ -396,8 +396,10 @@ public partial class ChronoJumpWindow
parameters.Add (filechooser.Filename);
string executable = "7z";
- if(operatingSystem == UtilAll.OperatingSystems.MACOSX)
+ if (operatingSystem == UtilAll.OperatingSystems.MACOSX)
executable = System.IO.Path.Combine(Util.GetPrefixDir(), "bin/7zz");
+ else if (operatingSystem == UtilAll.OperatingSystems.WINDOWS)
+ executable = System.IO.Path.Combine(Util.GetPrefixDir(),
"bin/7zr.exe");
ExecuteProcess.Result execute_result = ExecuteProcess.run (executable,
parameters, false, false);
}
diff --git a/win32/deps/bin/7zr.exe b/win32/deps/bin/7zr.exe
new file mode 100644
index 000000000..25662f768
Binary files /dev/null and b/win32/deps/bin/7zr.exe differ
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]