aaru-dps/Aaru
1
0
Fork 0
mirror of https://github.com/aaru-dps/Aaru.git synced 2025-12-16 19:24:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Bump version and fix Arch Linux package building scripts.

Browse Source
This commit is contained in:
Natalia Portillo
2020-07-25 03:31:28 +01:00
parent b8ee2ad0e7
commit 8548a16c32
31 changed files with 55 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Aaru.Checksums

Submodule Aaru.Checksums updated: b2612422ab...293a9bc264

2
Aaru.CommonTypes

Submodule Aaru.CommonTypes updated: 1389baf6b2...c84f5791c6

2
Aaru.Compression/Aaru.Compression.csproj
View File

@@ -12,7 +12,7 @@
<ReleaseVersion>$(Version)</ReleaseVersion>
<EnableDefaultCompileItems>false</EnableDefaultCompileItems>
<GenerateAssemblyInfo>true</GenerateAssemblyInfo>
<Version>5.0.99.2991</Version>
<Version>5.1.0.3214</Version>
<Company>Claunia.com</Company>
<Copyright>Copyright © 2011-2020 Natalia Portillo</Copyright>
<Product>Aaru Data Preservation Suite</Product>

2
Aaru.Console

Submodule Aaru.Console updated: fa739c4751...dbe94a0da2

2
Aaru.Core/Aaru.Core.csproj
View File

@@ -11,7 +11,7 @@
<ReleaseVersion>$(Version)</ReleaseVersion>
<EnableDefaultCompileItems>false</EnableDefaultCompileItems>
<GenerateAssemblyInfo>true</GenerateAssemblyInfo>
<Version>5.0.99.2991</Version>
<Version>5.1.0.3214</Version>
<Company>Claunia.com</Company>
<Copyright>Copyright © 2011-2020 Natalia Portillo</Copyright>
<Product>Aaru Data Preservation Suite</Product>

2
Aaru.Database/Aaru.Database.csproj
View File

@@ -10,7 +10,7 @@
<ReleaseVersion>$(Version)</ReleaseVersion>
<EnableDefaultCompileItems>false</EnableDefaultCompileItems>
<GenerateAssemblyInfo>true</GenerateAssemblyInfo>
<Version>5.0.99.2991</Version>
<Version>5.1.0.3214</Version>
<Company>Claunia.com</Company>
<Copyright>Copyright © 2011-2020 Natalia Portillo</Copyright>
<Product>Aaru Data Preservation Suite</Product>

2
Aaru.Decoders

Submodule Aaru.Decoders updated: b52d623764...21610ea7a0

2
Aaru.Devices/Aaru.Devices.csproj
View File

@@ -11,7 +11,7 @@
<ReleaseVersion>$(Version)</ReleaseVersion>
<EnableDefaultCompileItems>false</EnableDefaultCompileItems>
<GenerateAssemblyInfo>true</GenerateAssemblyInfo>
<Version>5.0.99.2991</Version>
<Version>5.1.0.3214</Version>
<Company>Claunia.com</Company>
<Copyright>Copyright © 2011-2020 Natalia Portillo</Copyright>
<Product>Aaru Data Preservation Suite</Product>

2
Aaru.Dto

Submodule Aaru.Dto updated: ae5a792fec...9627e9283b

2
Aaru.Filesystems/Aaru.Filesystems.csproj
View File

@@ -11,7 +11,7 @@
<ReleaseVersion>$(Version)</ReleaseVersion>
<EnableDefaultCompileItems>false</EnableDefaultCompileItems>
<GenerateAssemblyInfo>true</GenerateAssemblyInfo>
<Version>5.0.99.2991</Version>
<Version>5.1.0.3214</Version>
<Company>Claunia.com</Company>
<Copyright>Copyright © 2011-2020 Natalia Portillo</Copyright>
<Product>Aaru Data Preservation Suite</Product>

2
Aaru.Filters/Aaru.Filters.csproj
View File

@@ -11,7 +11,7 @@
<ReleaseVersion>$(Version)</ReleaseVersion>
<EnableDefaultCompileItems>false</EnableDefaultCompileItems>
<GenerateAssemblyInfo>true</GenerateAssemblyInfo>
<Version>5.0.99.2991</Version>
<Version>5.1.0.3214</Version>
<Company>Claunia.com</Company>
<Copyright>Copyright © 2011-2020 Natalia Portillo</Copyright>
<Product>Aaru Data Preservation Suite</Product>

2
Aaru.Gui/Aaru.Gui.csproj
View File

@@ -4,7 +4,7 @@
<AssemblyName>Aaru.Gui</AssemblyName>
<ReleaseVersion>$(Version)</ReleaseVersion>
<GenerateAssemblyInfo>true</GenerateAssemblyInfo>
<Version>5.99.0.2990</Version>
<Version>5.99.0.3214</Version>
<Company>Claunia.com</Company>
<Copyright>Copyright © 2011-2020 Natalia Portillo</Copyright>
<Product>Aaru Data Preservation Suite</Product>

2
Aaru.Helpers

Submodule Aaru.Helpers updated: 430db71b37...48929629bd

2
Aaru.Images/Aaru.Images.csproj
View File

@@ -11,7 +11,7 @@
<ReleaseVersion>$(Version)</ReleaseVersion>
<EnableDefaultCompileItems>false</EnableDefaultCompileItems>
<GenerateAssemblyInfo>true</GenerateAssemblyInfo>
<Version>5.0.99.2991</Version>
<Version>5.1.0.3214</Version>
<Company>Claunia.com</Company>
<Copyright>Copyright © 2011-2020 Natalia Portillo</Copyright>
<Product>Aaru Data Preservation Suite</Product>

2
Aaru.Partitions/Aaru.Partitions.csproj
View File

@@ -11,7 +11,7 @@
<ReleaseVersion>$(Version)</ReleaseVersion>
<EnableDefaultCompileItems>false</EnableDefaultCompileItems>
<GenerateAssemblyInfo>true</GenerateAssemblyInfo>
<Version>5.0.99.2991</Version>
<Version>5.1.0.3214</Version>
<Company>Claunia.com</Company>
<Copyright>Copyright © 2011-2020 Natalia Portillo</Copyright>
<Product>Aaru Data Preservation Suite</Product>

2
Aaru.Settings/Aaru.Settings.csproj
View File

@@ -11,7 +11,7 @@
<ReleaseVersion>$(Version)</ReleaseVersion>
<EnableDefaultCompileItems>false</EnableDefaultCompileItems>
<GenerateAssemblyInfo>true</GenerateAssemblyInfo>
<Version>5.0.99.2991</Version>
<Version>5.1.0.3214</Version>
<Company>Claunia.com</Company>
<Copyright>Copyright © 2011-2020 Natalia Portillo</Copyright>
<Product>Aaru Data Preservation Suite</Product>

2
Aaru.Tests.Devices/Aaru.Tests.Devices.csproj
View File

@@ -11,7 +11,7 @@
<EnableDefaultCompileItems>false</EnableDefaultCompileItems>
<TargetFramework>netcoreapp3.1</TargetFramework>
<GenerateAssemblyInfo>true</GenerateAssemblyInfo>
<Version>4.5.99.1693</Version>
<Version>5.1.0.3214</Version>
<Company>Claunia.com</Company>
<Copyright>Copyright © 2011-2020 Natalia Portillo</Copyright>
<Product>Aaru Data Preservation Suite</Product>

10
Aaru/Aaru.csproj
View File

@@ -12,7 +12,7 @@
<EnableDefaultCompileItems>false</EnableDefaultCompileItems>
<TargetFramework>netcoreapp3.1</TargetFramework>
<GenerateAssemblyInfo>true</GenerateAssemblyInfo>
<Version>5.0.99.2991</Version>
<Version>5.1.0.3214</Version>
<Company>Claunia.com</Company>
<Copyright>Copyright © 2011-2020 Natalia Portillo</Copyright>
<Product>Aaru Data Preservation Suite</Product>
@@ -22,11 +22,13 @@
<TargetLatestRuntimePatch>true</TargetLatestRuntimePatch>
<LangVersion>8</LangVersion>
</PropertyGroup>
<!--
<PropertyGroup>
<NrtRevisionFormat>$(Version)+{chash:8} built by {mname} in $(Configuration){!:, modified}</NrtRevisionFormat>
<NrtResolveSimpleAttributes>true</NrtResolveSimpleAttributes>
<NrtShowRevision>true</NrtShowRevision>
</PropertyGroup>
-->
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
<DebugSymbols>True</DebugSymbols>
<DebugType>full</DebugType>
@@ -201,7 +203,9 @@
<Name>Aaru.Checksums</Name>
</ProjectReference>
<ProjectReference Include="..\Aaru.Database\Aaru.Database.csproj" />
<!--
<ProjectReference Include="..\Aaru.Gui\Aaru.Gui.csproj" />
-->
<ProjectReference Include="..\Aaru.Helpers\Aaru.Helpers.csproj">
<Project>{F8BDF57B-1571-4CD0-84B3-B422088D359A}</Project>
<Name>Aaru.Helpers</Name>
@@ -274,7 +278,9 @@
<PackageReference Include="System.CommandLine" Version="2.0.0-beta1.20104.2" />
<PackageReference Include="System.Text.Encoding.CodePages" Version="4.7.1" />
<PackageReference Include="System.ValueTuple" Version="4.5.0" />
<!--
<PackageReference Include="Unclassified.NetRevisionTask" Version="0.3.0" />
-->
<PackageReference Include="System.Collections" Version="4.3.0" />
<PackageReference Include="System.Diagnostics.Debug" Version="4.3.0" />
<PackageReference Include="System.IO.FileSystem.Primitives" Version="4.3.0" />
@@ -300,7 +306,7 @@
</PropertyGroup>
<PropertyGroup>
<PackageVersion>5.0.99.2991-1</PackageVersion>
<PackageVersion>5.1.0.3214-1</PackageVersion>
<PackagePrefix>aaru</PackagePrefix>
<Authors>Natalia Portillo &lt;claunia@claunia.com&gt;</Authors>
<Section>net</Section>

3
Aaru/Commands/Device/List.cs
View File

@@ -37,7 +37,6 @@ using Aaru.CommonTypes.Enums;
using Aaru.Console;
using Aaru.Core;
using Aaru.Devices;
using JetBrains.Annotations;
namespace Aaru.Commands.Device
{
@@ -55,7 +54,7 @@ namespace Aaru.Commands.Device
Handler = CommandHandler.Create(GetType().GetMethod(nameof(Invoke)));
}
public static int Invoke(bool debug, bool verbose, [CanBeNull] string aaruRemoteHost)
public static int Invoke(bool debug, bool verbose, string aaruRemoteHost)
{
MainClass.PrintCopyright();

5
Aaru/Commands/Filesystem/ExtractFiles.cs
View File

@@ -42,7 +42,6 @@ using Aaru.CommonTypes.Interfaces;
using Aaru.CommonTypes.Structs;
using Aaru.Console;
using Aaru.Core;
using JetBrains.Annotations;
using FileAttributes = Aaru.CommonTypes.Structs.FileAttributes;
namespace Aaru.Commands.Filesystem
@@ -337,8 +336,8 @@ namespace Aaru.Commands.Filesystem
return (int)ErrorNumber.NoError;
}
static void ExtractFilesInDir(string path, [NotNull] IReadOnlyFilesystem fs, string volumeName,
string outputDir, bool doXattrs)
static void ExtractFilesInDir(string path, IReadOnlyFilesystem fs, string volumeName, string outputDir,
bool doXattrs)
{
if(path.StartsWith('/'))
path = path.Substring(1);

3
Aaru/Commands/Filesystem/Ls.cs
View File

@@ -42,7 +42,6 @@ using Aaru.CommonTypes.Interfaces;
using Aaru.CommonTypes.Structs;
using Aaru.Console;
using Aaru.Core;
using JetBrains.Annotations;
namespace Aaru.Commands.Filesystem
{
@@ -310,7 +309,7 @@ namespace Aaru.Commands.Filesystem
return (int)ErrorNumber.NoError;
}
static void ListFilesInDir(string path, [NotNull] IReadOnlyFilesystem fs, bool longFormat)
static void ListFilesInDir(string path, IReadOnlyFilesystem fs, bool longFormat)
{
if(path.StartsWith('/'))
path = path.Substring(1);

4
Aaru/Commands/Filesystem/Options.cs
View File

@@ -40,7 +40,6 @@ using Aaru.CommonTypes.Enums;
using Aaru.CommonTypes.Interfaces;
using Aaru.Console;
using Aaru.Core;
using JetBrains.Annotations;
namespace Aaru.Commands.Filesystem
{
@@ -87,8 +86,7 @@ namespace Aaru.Commands.Filesystem
return (int)ErrorNumber.NoError;
}
[NotNull]
static string TypeToString([NotNull] Type type)
static string TypeToString(Type type)
{
if(type == typeof(bool))
return "boolean";

5
Aaru/Commands/Image/CreateSidecar.cs
View File

@@ -43,7 +43,6 @@ using Aaru.CommonTypes.Enums;
using Aaru.CommonTypes.Interfaces;
using Aaru.Console;
using Aaru.Core;
using JetBrains.Annotations;
using Schemas;
namespace Aaru.Commands.Image
@@ -91,8 +90,8 @@ namespace Aaru.Commands.Image
Handler = CommandHandler.Create(GetType().GetMethod(nameof(Invoke)));
}
public static int Invoke(bool debug, bool verbose, uint blockSize, [CanBeNull] string encodingName,
string imagePath, bool tape)
public static int Invoke(bool debug, bool verbose, uint blockSize, string encodingName, string imagePath,
bool tape)
{
MainClass.PrintCopyright();

4
Aaru/Commands/Image/Options.cs
View File

@@ -40,7 +40,6 @@ using Aaru.CommonTypes.Enums;
using Aaru.CommonTypes.Interfaces;
using Aaru.Console;
using Aaru.Core;
using JetBrains.Annotations;
namespace Aaru.Commands.Image
{
@@ -89,8 +88,7 @@ namespace Aaru.Commands.Image
return (int)ErrorNumber.NoError;
}
[NotNull]
static string TypeToString([NotNull] Type type)
static string TypeToString(Type type)
{
if(type == typeof(bool))
return "boolean";

2
Aaru/Info.plist
View File

@@ -15,7 +15,7 @@
<key>CFBundleIdentifier</key>
<string>app.aaru</string>
<key>CFBundleShortVersionString</key>
<string>5.99.0.2990-alpha2</string>
<string>5.99.0.3214-alpha3</string>
<key>CFBundleExecutable</key>
<string>aaru</string>
<key>LSExecutableArchitectures</key>

4
Aaru/Main.cs
View File

@@ -67,13 +67,13 @@ namespace Aaru
as AssemblyInformationalVersionAttribute;
_assemblyCopyright = ((AssemblyCopyrightAttribute)attributes[0]).Copyright;
/*
if(args.Length == 1 &&
args[0].ToLowerInvariant() == "gui")
{
return Gui.Main.Start(args);
}
*/
AaruConsole.WriteLineEvent += System.Console.WriteLine;
AaruConsole.WriteEvent += System.Console.Write;
AaruConsole.ErrorWriteLineEvent += System.Console.Error.WriteLine;

3
Changelog.md
View File

@@ -1,4 +1,4 @@
# [5.1.0.xxxx] - 2020-07-xx
# [5.1.0.3214] - 2020-07-25
## Added
### - Aaru Image Format
- Save Compact Disc track indexes in.
@@ -1355,6 +1355,7 @@ Aaru.Server (previously DiscImageChef.Server), aaruformat (previously dicformat)
- Master Boot Record (aka MBR).
- NeXT disklabels.
[5.1.0.3214]: https://github.com/aaru-dps/Aaru/releases/tag/v5.1.0.3214
[5.0.1.2884]: https://github.com/aaru-dps/Aaru/releases/tag/v5.0.1.2884
[5.0.0.2879]: https://github.com/aaru-dps/Aaru/releases/tag/v5.0.0.2879
[4.5.1.1692]: https://github.com/aaru-dps/Aaru/releases/tag/v4.5.1.1692

2
README.md
View File

@@ -1,4 +1,4 @@
Aaru Data Preservation Suite v5.0.99.2991
Aaru Data Preservation Suite v5.1.0.3214
Aaru

2
build.sh Normal file → Executable file
View File

@@ -1,5 +1,5 @@
#!/usr/bin/env bash
AARU_VERSION=5.0.99.2991
AARU_VERSION=5.1.0.3214
OS_NAME=`uname`
mkdir -p build

11
pkg/pacman/rolling/PKGBUILD
View File

@@ -5,7 +5,7 @@ _aarubase='Aaru'
packager='Natalia Portillo <claunia@claunia.com>'
pkgbase='aaru-git'
pkgname=('aaru-git')
pkgver=v5.1.99.2967.r1190.g4decb6d4
pkgver=v5.1.99.3214.r1190.g4decb6d4
pkgrel=1
pkgdesc='Disc image management and creation tool for disks, tapes, optical and solid state media'
arch=('x86_64' 'armv7h' 'aarch64')
@@ -39,18 +39,16 @@ prepare() {
build() {
cd "${srcdir}"/"${_aarubase}"
dotnet restore Aaru.sln
dotnet build -f ${_netcoretarget} -c Debug Aaru.sln
dotnet publish -f ${_netcoretarget} -c Debug --self-contained -r ${dotnet_rid} Aaru.sln
dotnet publish -f ${_netcoretarget} -c Debug --self-contained -r ${dotnet_rid}
}
package() {
# Install MIME database file
cd "${srcdir}"/Aaru
cd "${srcdir}"/"${_aarubase}"
install -d -m0755 -g 0 "${pkgdir}"/usr/share/mime/packages
install -m0755 -g 0 -t "${pkgdir}"/usr/share/mime/packages aaruformat.xml
cd "${srcdir}"/"${_aarubase}"/Aaru/bin/Debug/${_netcoretarget}/${dotnet_rid}/publish
cd "${srcdir}"/"${_aarubase}"/bin/Debug/${_netcoretarget}/${dotnet_rid}/publish
# Create destination directory
install -d -m0755 -g 0 "${pkgdir}"/opt/Aaru
@@ -62,7 +60,6 @@ package() {
install -m0755 -g 0 -t "${pkgdir}"/opt/Aaru *.so
install -m0755 -g 0 -t "${pkgdir}"/opt/Aaru *.a
install -m0755 -g 0 -t "${pkgdir}"/opt/Aaru createdump
install -m0755 -g 0 -t "${pkgdir}"/opt/Aaru sosdocsunix.txt
# Copy .NET dependencies
install -m0755 -g 0 -t "${pkgdir}"/opt/Aaru *.dll

24
pkg/pacman/stable/PKGBUILD
View File

@@ -1,16 +1,17 @@
# Maintainer: Natalia Portillo <claunia@claunia.com>
packager='Natalia Portillo <claunia@claunia.com>'
_netcoretarget='netcoreapp2.1'
_netcoretarget='netcoreapp3.1'
_aarubase='Aaru'
pkgname='aaru'
pkgver=5.0.0.2879
pkgver=5.1.0.3214
pkgrel=1
pkgdesc='Disc image management and creation tool for disks, tapes, optical and solid state media'
arch=('x86_64' 'armv7h' 'aarch64')
url='http://www.aaru.app'
license=('GPL')
source=('aaru-src-5.0.0.2879.tar.xz::local://aaru-src-5.0.0.2879.tar.xz'
'aaru-src-5.0.0.2879.tar.xz.asc::local://aaru-src-5.0.0.2879.tar.xz.asc')
makedepends=('dotnet-sdk>=2.1.0')
source=('aaru-src-5.1.0.3214.tar.xz::local://aaru-src-5.1.0.3214.tar.xz'
'aaru-src-5.1.0.3214.tar.xz.asc::local://aaru-src-5.1.0.3214.tar.xz.asc')
makedepends=('dotnet-sdk>=3.1.0')
options=('staticlibs')
validpgpkeys=('236F1E21B540FC0D40F7AD1751D20488C724CA9F')
provides=('aaru')
@@ -26,19 +27,17 @@ else
fi
build() {
cd "${srcdir}"
dotnet restore Aaru.sln
dotnet build -f ${_netcoretarget} -c Release Aaru.sln
dotnet publish -f ${_netcoretarget} -c Release --self-contained -r ${dotnet_rid} Aaru.sln
cd "${srcdir}"/"${_aarubase}"
dotnet publish -f ${_netcoretarget} -c Release --self-contained -r ${dotnet_rid}
}
package() {
# Install MIME database file
cd "${srcdir}"/Aaru
cd "${srcdir}"/"${_aarubase}"
install -d -m0755 -g 0 "${pkgdir}"/usr/share/mime/packages
install -m0755 -g 0 -t "${pkgdir}"/usr/share/mime/packages aaruformat.xml
cd "${srcdir}"/Aaru/bin/Release/${_netcoretarget}/${dotnet_rid}/publish
cd "${srcdir}"/"${_aarubase}"/bin/Release/${_netcoretarget}/${dotnet_rid}/publish
# Create destination directory
install -d -m0755 -g 0 "${pkgdir}"/opt/Aaru
@@ -50,7 +49,6 @@ package() {
install -m0755 -g 0 -t "${pkgdir}"/opt/Aaru *.so
install -m0755 -g 0 -t "${pkgdir}"/opt/Aaru *.a
install -m0755 -g 0 -t "${pkgdir}"/opt/Aaru createdump
install -m0755 -g 0 -t "${pkgdir}"/opt/Aaru sosdocsunix.txt
# Copy .NET dependencies
install -m0755 -g 0 -t "${pkgdir}"/opt/Aaru *.dll
@@ -79,4 +77,4 @@ post_upgrade() {
post_remove() {
post_install "$1"
}
}