Browse Source

Add 7z assets, python paths

pull/109/head
ionite34 1 year ago
parent
commit
a15b7734d4
No known key found for this signature in database
GPG Key ID: B3404C5F3827849B
  1. 9
      StabilityMatrix.Avalonia/Assets.cs
  2. BIN
      StabilityMatrix.Avalonia/Assets/macos-arm64/7zz
  3. 88
      StabilityMatrix.Avalonia/Assets/macos-arm64/7zz - LICENSE.txt
  4. 4
      StabilityMatrix.Avalonia/Helpers/UnixPrerequisiteHelper.cs
  5. 2
      StabilityMatrix.Avalonia/StabilityMatrix.Avalonia.csproj
  6. 6
      StabilityMatrix.Core/Helper/ArchiveHelper.cs
  7. 2
      StabilityMatrix.Core/Helper/Compat.cs
  8. 13
      StabilityMatrix.Core/Python/PyRunner.cs

9
StabilityMatrix.Avalonia/Assets.cs

@ -27,17 +27,22 @@ internal static class Assets
[SupportedOSPlatform("windows")]
[SupportedOSPlatform("linux")]
[SupportedOSPlatform("macos")]
public static AvaloniaResource SevenZipExecutable => Compat.Switch(
(PlatformKind.Windows,
new AvaloniaResource("avares://StabilityMatrix.Avalonia/Assets/win-x64/7za.exe")),
(PlatformKind.Linux | PlatformKind.X64,
new AvaloniaResource("avares://StabilityMatrix.Avalonia/Assets/linux-x64/7zzs", (UnixFileMode) 0x777)));
new AvaloniaResource("avares://StabilityMatrix.Avalonia/Assets/linux-x64/7zzs", (UnixFileMode) 0777)),
(PlatformKind.MacOS | PlatformKind.Arm,
new AvaloniaResource("avares://StabilityMatrix.Avalonia/Assets/macos-arm64/7zz", (UnixFileMode) 0x777)));
[SupportedOSPlatform("windows")]
[SupportedOSPlatform("linux")]
[SupportedOSPlatform("macos")]
public static AvaloniaResource SevenZipLicense => Compat.Switch(
(PlatformKind.Windows, new AvaloniaResource("avares://StabilityMatrix.Avalonia/Assets/win-x64/7za - LICENSE.txt")),
(PlatformKind.Linux | PlatformKind.X64, new AvaloniaResource("avares://StabilityMatrix.Avalonia/Assets/linux-x64/7zzs - LICENSE.txt")));
(PlatformKind.Linux | PlatformKind.X64, new AvaloniaResource("avares://StabilityMatrix.Avalonia/Assets/linux-x64/7zzs - LICENSE.txt")),
(PlatformKind.MacOS | PlatformKind.Arm, new AvaloniaResource("avares://StabilityMatrix.Avalonia/Assets/macos-arm64/7zz - LICENSE.txt")));
public static AvaloniaResource PyScriptSiteCustomize => new(
"avares://StabilityMatrix.Avalonia/Assets/sitecustomize.py");

BIN
StabilityMatrix.Avalonia/Assets/macos-arm64/7zz

Binary file not shown.

88
StabilityMatrix.Avalonia/Assets/macos-arm64/7zz - LICENSE.txt

@ -0,0 +1,88 @@
7-Zip
~~~~~
License for use and distribution
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
7-Zip Copyright (C) 1999-2023 Igor Pavlov.
The licenses for 7zz and 7zzs files are:
- The "GNU LGPL" as main license for most of the code
- The "GNU LGPL" with "unRAR license restriction" for some code
- The "BSD 3-clause License" for some code
Redistributions in binary form must reproduce related license information from this file.
Note:
You can use 7-Zip on any computer, including a computer in a commercial
organization. You don't need to register or pay for 7-Zip.
GNU LGPL information
--------------------
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation; either
version 2.1 of the License, or (at your option) any later version.
This library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.
You can receive a copy of the GNU Lesser General Public License from
http://www.gnu.org/
BSD 3-clause License
--------------------
The "BSD 3-clause License" is used for the code in 7z.dll that implements LZFSE data decompression.
That code was derived from the code in the "LZFSE compression library" developed by Apple Inc,
that also uses the "BSD 3-clause License":
----
Copyright (c) 2015-2016, Apple Inc. All rights reserved.
Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer
in the documentation and/or other materials provided with the distribution.
3. Neither the name of the copyright holder(s) nor the names of any contributors may be used to endorse or promote products derived
from this software without specific prior written permission.
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
----
unRAR license restriction
-------------------------
The decompression engine for RAR archives was developed using source
code of unRAR program.
All copyrights to original unRAR code are owned by Alexander Roshal.
The license for original unRAR code has the following restriction:
The unRAR sources cannot be used to re-create the RAR compression algorithm,
which is proprietary. Distribution of modified unRAR sources in separate form
or as a part of other software is permitted, provided that it is clearly
stated in the documentation and source comments that the code may
not be used to develop a RAR (WinRAR) compatible archiver.
--
Igor Pavlov

4
StabilityMatrix.Avalonia/Helpers/UnixPrerequisiteHelper.cs

@ -173,8 +173,8 @@ public class UnixPrerequisiteHelper : IPrerequisiteHelper
progress?.Report(new ProgressReport(0, "Installing Python", isIndeterminate: true));
await ArchiveHelper.Extract7ZAuto(downloadPath, PythonDir);
// For Linux, move the inner 'python' folder up to the root PythonDir
if (Compat.IsLinux)
// For Unix, move the inner 'python' folder up to the root PythonDir
if (Compat.IsUnix)
{
var innerPythonDir = PythonDir.JoinDir("python");
if (!innerPythonDir.Exists)

2
StabilityMatrix.Avalonia/StabilityMatrix.Avalonia.csproj

@ -77,6 +77,8 @@
<AvaloniaResource Include="Assets\win-x64\**" Condition="'$(RuntimeIdentifier)' == 'win-x64'" />
<!-- Only for linux-64 -->
<AvaloniaResource Include="Assets\linux-x64\**" Condition="'$(RuntimeIdentifier)' == 'linux-x64'" />
<!-- Only for osx-arm64 -->
<AvaloniaResource Include="Assets\macos-arm64\**" Condition="'$(RuntimeIdentifier)' == 'osx-arm64'" />
</ItemGroup>
<ItemGroup>

6
StabilityMatrix.Core/Helper/ArchiveHelper.cs

@ -31,10 +31,14 @@ public static partial class ArchiveHelper
{
return "7za.exe";
}
if (Compat.Platform.HasFlag(PlatformKind.Linux))
if (Compat.IsLinux)
{
return "7zzs";
}
if (Compat.IsMacOS)
{
return "7zz";
}
throw new PlatformNotSupportedException("7z is not supported on this platform.");
}
}

2
StabilityMatrix.Core/Helper/Compat.cs

@ -114,7 +114,7 @@ public static class Compat
throw new PlatformNotSupportedException();
}
if (RuntimeInformation.ProcessArchitecture == Architecture.Arm)
if (RuntimeInformation.ProcessArchitecture == Architecture.Arm64)
{
Platform |= PlatformKind.Arm;
}

13
StabilityMatrix.Core/Python/PyRunner.cs

@ -31,17 +31,18 @@ public class PyRunner : IPyRunner
/// </summary>
public static string RelativePythonDllPath => Compat.Switch(
(PlatformKind.Windows, "python310.dll"),
(PlatformKind.Linux, Path.Combine("lib", "libpython3.10.so")));
(PlatformKind.Linux, Path.Combine("lib", "libpython3.10.so")),
(PlatformKind.MacOS, Path.Combine("lib", "libpython3.10.dylib")));
public static string PythonDllPath => Compat.Switch(
(PlatformKind.Windows, Path.Combine(PythonDir, "python310.dll")),
(PlatformKind.Linux, Path.Combine(PythonDir, "lib", "libpython3.10.so")));
public static string PythonDllPath => Path.Combine(PythonDir, RelativePythonDllPath);
public static string PythonExePath => Compat.Switch(
(PlatformKind.Windows, Path.Combine(PythonDir, "python.exe")),
(PlatformKind.Linux, Path.Combine(PythonDir, "bin", "python3")));
(PlatformKind.Linux, Path.Combine(PythonDir, "bin", "python3")),
(PlatformKind.MacOS, Path.Combine(PythonDir, "bin", "python3")));
public static string PipExePath => Compat.Switch(
(PlatformKind.Windows, Path.Combine(PythonDir, "Scripts", "pip.exe")),
(PlatformKind.Linux, Path.Combine(PythonDir, "bin", "pip3")));
(PlatformKind.Linux, Path.Combine(PythonDir, "bin", "pip3")),
(PlatformKind.MacOS, Path.Combine(PythonDir, "bin", "pip3")));
public static string GetPipPath => Path.Combine(PythonDir, "get-pip.pyc");

Loading…
Cancel
Save