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

Update build scripts for .NET 7.0.

Browse Source
This commit is contained in:
Natalia Portillo
2022-12-23 17:37:31 +00:00
parent e10c237ebd
commit 89ea1b2b3e
2 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
build.sh
View File

@@ -8,9 +8,9 @@ mkdir -p build
cd Aaru
for conf in Debug Release;
do
for distro in alpine-x64 linux-arm64 linux-arm linux-x64 osx-x64 win-arm64 win-arm win-x64 win-x86 debian-arm debian-arm64 debian-x64 rhel-arm64 rhel-x64 sles-x64;
for distro in alpine-arm64 alpine-arm alpine-x64 linux-arm64 linux-arm linux-x64 osx-arm64 osx-x64 win-arm64 win-arm win-x64 win-x86 debian-arm debian-arm64 debian-x64 rhel-arm64 rhel-x64 sles-x64;
do
dotnet publish -f net6 -r ${distro} -c ${conf}
dotnet publish -f net7.0 -r ${distro} -c ${conf}
# Package the Linux packages (stopped working)
# if [[ ${distro} == alpine* ]] || [[ ${distro} == linux* ]]; then
@@ -22,7 +22,7 @@ do
# else
# pkg="deb"
# fi
# dotnet ${pkg} -f net6 -r ${distro} -c ${conf} -o ../build
# dotnet ${pkg} -f net7.0 -r ${distro} -c ${conf} -o ../build
#
# Package the Linux packages using MSBuild
@@ -40,8 +40,8 @@ do
extension="deb"
fi
dotnet msbuild Aaru.csproj /t:${task} /p:TargetFramework=net6 /p:RuntimeIdentifier=${distro} /p:Configuration=${conf}
mv bin/${conf}/net6/${distro}/*.${extension} ../build
dotnet msbuild Aaru.csproj /t:${task} /p:TargetFramework=net7.0 /p:RuntimeIdentifier=${distro} /p:Configuration=${conf}
mv bin/${conf}/net7.0/${distro}/*.${extension} ../build
done
done
@@ -87,10 +87,10 @@ mkdir -p build/macos/Aaru.app/Contents/Resources
mkdir -p build/macos/Aaru.app/Contents/MacOS
cp Aaru/Aaru.icns build/macos/Aaru.app/Contents/Resources
cp Aaru/Info.plist build/macos/Aaru.app/Contents
cp -r Aaru/bin/Release/net6/osx-x64/publish/* build/macos/Aaru.app/Contents/MacOS
cp -r Aaru/bin/Release/net7.0/osx-x64/publish/* build/macos/Aaru.app/Contents/MacOS
rm -Rf build/macos-dbg/Aaru.app
mkdir -p build/macos-dbg/Aaru.app/Contents/Resources
mkdir -p build/macos-dbg/Aaru.app/Contents/MacOS
cp Aaru/Aaru.icns build/macos-dbg/Aaru.app/Contents/Resources
cp Aaru/Info.plist build/macos-dbg/Aaru.app/Contents
cp -r Aaru/bin/Debug/net6/osx-x64/publish/* build/macos-dbg/Aaru.app/Contents/MacOS
cp -r Aaru/bin/Debug/net7.0/osx-x64/publish/* build/macos-dbg/Aaru.app/Contents/MacOS

8
pkg/pacman/stable/PKGBUILD
View File

@@ -1,7 +1,8 @@
#@IgnoreInspection BashAddShebang
# Maintainer: Natalia Portillo <claunia@claunia.com>
packager='Natalia Portillo <claunia@claunia.com>'
_netcoretarget='netcoreapp3.1'
_netcoretarget='net7.0'
_aarubase='Aaru'
packager='Natalia Portillo <claunia@claunia.com>'
pkgname='aaru'
pkgver=5.3.2
pkgrel=1
@@ -16,7 +17,7 @@ options=('staticlibs')
validpgpkeys=('236F1E21B540FC0D40F7AD1751D20488C724CA9F')
provides=('aaru')
conflicts=('aaru')
depends=('icu70' 'krb5' 'libcurl.so' 'libunwind' 'openssl-1.1>=1.1.1' 'zlib')
depends=('icu' 'krb5' 'libcurl.so' 'libunwind' 'openssl' 'zlib')
if [ $arch == 'aarch64' ]; then
dotnet_rid=linux-arm64
@@ -47,7 +48,6 @@ package() {
# Copy Linux dependencies
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
# Copy .NET dependencies