Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Build locally instead of grabbing binaries (+ add arm64 support) #5

Closed
wants to merge 4 commits into from
Closed

Build locally instead of grabbing binaries (+ add arm64 support) #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c0febc5
Build locally instead of grabbing binaries (+ add arm64 support)
dginovker Jan 8, 2023
7ea06bf
Use https url for git, not ssh
dginovker Jan 8, 2023
a37a30e
Checkpoint stuff
dginovker Jan 13, 2023
0fb3680
It compiles but it doesn't run, think I'ma give up on building from s…
dginovker Jan 14, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 0 additions & 3 deletions flathub.json
View file
Open in desktop

This file was deleted.

492 changes: 492 additions & 0 deletions glitonea_sources.json
View file
Open in desktop

Large diffs are not rendered by default.

9 changes: 9 additions & 0 deletions manual-x64.json
View file
Open in desktop
@@ -0,0 +1,9 @@
[
{
"type": "file",
"url": "https://www.nuget.org/api/v2/package/Microsoft.NETCore.App.Host.linux-x64/6.0.12",
"sha512": "9bb143b8426b219eb6f9ec2bf9c2b6eb3bfd85d00d18d365112189817a16f5c8ad5cb0aa077413dccf805b4c2dafd070ad588ac84658c9efbc25772570bc7c26",
"dest": "nuget-sources",
"dest-filename": "microsoft.netcore.app.host.linux-x64.6.0.12.nupkg"
}
]
30 changes: 30 additions & 0 deletions manual.json
View file
Open in desktop
@@ -0,0 +1,30 @@
[
{
"type": "file",
"url": "https://www.nuget.org/api/v2/package/Microsoft.NETCore.App.Ref/6.0.12",
"sha512": "acd27a7f22d3beb3fe4a1a653396c60abac6bd2eddf4f53e6c94c1a1210d32668f931c38f7dd15d737532e4465f391b1126edb6cb93f11197d7a3ec283042b2e",
"dest": "nuget-sources",
"dest-filename": "microsoft.netcore.app.ref.6.0.12.nupkg"
},
{
"type": "file",
"url": "https://www.nuget.org/api/v2/package/Microsoft.AspNetCore.App.Ref/6.0.12",
"sha512": "9d795bf58747b8deb8ae12a2e10c27f3f5c40b3202dcb38a45d18476df737bacb942bb019ad45cc997602a797dc4b6af6e5aecd43d0d9b9114ab8c654bf97fe1",
"dest": "nuget-sources",
"dest-filename": "microsoft.aspnetcore.app.ref.6.0.12.nupkg"
},
{
"type": "file",
"url": "https://www.nuget.org/api/v2/package/GitLabApiClient/1.8.0",
"sha512": "ec16668cad7534aa9bdf39cffa00a1b7e59c2a7f0f189c2eba5a2e99c76b6f6bac5cd1ae24e1b7da12ae9a178a1335922af19a6b6db29d0c83298356ce76a489",
"dest": "nuget-sources",
"dest-filename": "gitlabapiclient.1.8.0.nupkg"
},
{
"type": "file",
"url": "https://www.nuget.org/api/v2/package/Newtonsoft.Json/13.0.2",
"sha512": "d743ae673bac17fdbf53c05983dba2ffdb99d7e6af8cf5fe008d57aa30b6c6ca615d672c4140eec516e529eb6ad5acf29c20b5cc059c86f98c80865652acdde1",
"dest": "nuget-sources",
"dest-filename": "newtonsoft.json.13.0.2.nupkg"
}
]
86 changes: 73 additions & 13 deletions org._2009scape.Launcher.json
View file
Open in desktop
Expand Up @@ -6,8 +6,16 @@
"command": "2009scape-launcher",
"separate-locales": false,
"sdk-extensions": [
"org.freedesktop.Sdk.Extension.openjdk11"
"org.freedesktop.Sdk.Extension.openjdk11",
"org.freedesktop.Sdk.Extension.dotnet6"
],
"build-options": {
"append-path": "/usr/lib/sdk/dotnet6/bin",
"append-ld-library-path": "/usr/lib/sdk/dotnet6/lib",
"env": {
"PKG_CONFIG_PATH": "/app/lib/pkgconfig:/app/share/pkgconfig:/usr/lib/pkgconfig:/usr/share/pkgconfig:/usr/lib/sdk/dotnet6/lib/pkgconfig"
}
},
"finish-args": [
"--share=network",
"--socket=x11",
Expand All @@ -26,11 +34,29 @@
{
"name": "2009scape",
"buildsystem": "simple",
"build-options": {
"arch": {
"aarch64": {
"env" : {
"RUNTIME": "linux-arm64"
}
},
"x86_64": {
"env" : {
"RUNTIME": "linux-x64"
}
}
}
},
"build-commands": [
"install -D 2009scape-launcher-sc /app/bin/2009scape-launcher",
"install -Dm644 saradomin.svg /app/share/icons/hicolor/scalable/apps/org._2009scape.Launcher.svg",
"install -Dm644 org._2009scape.Launcher.desktop /app/share/applications/org._2009scape.Launcher.desktop",
"install -Dm644 org._2009scape.Launcher.appdata.xml /app/share/metainfo/org._2009scape.Launcher.appdata.xml"
"install-sdk.sh",
"cd Saradomin",
"dotnet publish --runtime ${RUNTIME} -c Release --source nuget-sources",

"install -D Saradomin/bin/Release/net6.0/${RUNTIME}/Saradomin /app/bin/2009scape-launcher",
"install -Dm644 Saradomin/Resources/Icons/saradomin.svg /app/share/icons/hicolor/scalable/apps/org._2009scape.Launcher.svg",
"install -Dm644 Saradomin/Resources/Linux/org._2009scape.Launcher.desktop /app/share/applications/org._2009scape.Launcher.desktop",
"install -Dm644 Saradomin/Resources/Linux/org._2009scape.Launcher.appdata.xml /app/share/metainfo/org._2009scape.Launcher.appdata.xml"
],
"sources": [
{
Expand All @@ -40,25 +66,59 @@
"exec 2009scape-launcher \"$@\""
]
},
{
"type": "git",
"url": "https://gitlab.com/2009scape/Saradomin-Launcher.git",
"commit": "3335f58325a54a891de425792cbd441f3bc70781"
},


"saradomin-arm64-sources.json",
"saradomin-x64-sources.json",
"manual-x64.json",
"manual.json",

{
"type": "file",
"url": "https://api.nuget.org/v3-flatcontainer/microsoft.aspnetcore.app.runtime.linux-arm/7.0.0/microsoft.aspnetcore.app.runtime.linux-arm.7.0.0.nupkg",
"sha512": "fe68af4fac5062db9b9be6a298a577f3a1cc70e218d05d1e98ea47fa2536e10977033d38c995daf90da2035bbe275c2e2c163ff639ee7adfaf094fd166a39933",
"dest": "nuget-sources",
"dest-filename": "microsoft.aspnetcore.app.runtime.linux-arm.7.0.0.nupkg"
},
{
"type": "file",
"url": "https://api.nuget.org/v3-flatcontainer/microsoft.aspnetcore.app.runtime.linux-arm64/7.0.0/microsoft.aspnetcore.app.runtime.linux-arm64.7.0.0.nupkg",
"sha512": "1c3ea618c23823c54f6fa82799b8743c4e919e1fa1196d18402e547faaafb52a4d6e2131ddef6092dc71a308e8f7bcd3feac825565cec112705dacf88b1f7e57",
"dest": "nuget-sources",
"dest-filename": "microsoft.aspnetcore.app.runtime.linux-arm64.7.0.0.nupkg"
},
{
"type": "file",
"url": "https://gitlab.com/2009scape/Saradomin-Launcher/-/jobs/artifacts/master/raw/Saradomin/2009scape-launcher-sc?job=pack_linux_sc",
"sha256": "9ef41bdc84b25f4e9dbf10c9856cfa3c5e3f21f3527839bd76623b83f43d7a14"
"url": "https://api.nuget.org/v3-flatcontainer/microsoft.aspnetcore.app.runtime.linux-x64/7.0.0/microsoft.aspnetcore.app.runtime.linux-x64.7.0.0.nupkg",
"sha512": "285817dc47116766e8f3279c0c6b7add76e1c362ed455b7d03790874bb4fab70f0507a31747a109a8afa3b80215b9c463a3d245e80ba14ee896114ef44f8892d",
"dest": "nuget-sources",
"dest-filename": "microsoft.aspnetcore.app.runtime.linux-x64.7.0.0.nupkg"
},
{
"type": "file",
"url": "https://gitlab.com/2009scape/Saradomin-Launcher/-/raw/a6db6fc7e456b15e620a1da5891cd17150be7b91/Saradomin/Resources/Icons/saradomin.svg",
"sha256": "50e7b37c63c510ed8b077cfce7925f2a847abcbdeeef5160d7d0ef9c36040363"
"url": "https://api.nuget.org/v3-flatcontainer/microsoft.netcore.app.runtime.linux-arm/7.0.0/microsoft.netcore.app.runtime.linux-arm.7.0.0.nupkg",
"sha512": "7860233cc8030f239a9a8fe3c5963cd19efc4b8fe25527230e84491b1c7b5d2ddfa6ad85f494c711f50a84bc1b4d9c6a6196ffce8df757b6487e592fa00640c2",
"dest": "nuget-sources",
"dest-filename": "microsoft.netcore.app.runtime.linux-arm.7.0.0.nupkg"
},
{
"type": "file",
"url": "https://gitlab.com/2009scape/Saradomin-Launcher/-/raw/a6db6fc7e456b15e620a1da5891cd17150be7b91/Saradomin/Resources/Linux/org._2009scape.Launcher.desktop",
"sha256": "b6bc5a6fce0c9ad567f520b6e3a58e68351b34ff46197949298f4643aa362c98"
"url": "https://api.nuget.org/v3-flatcontainer/microsoft.netcore.app.runtime.linux-arm64/7.0.0/microsoft.netcore.app.runtime.linux-arm64.7.0.0.nupkg",
"sha512": "b0970c968b230486964549a6665d90c69c8e38f44471f02d83ecf2bba1e76c162bd383abffbf2779b515413486ceba0507d234f41b690d961a5975c41ce6f437",
"dest": "nuget-sources",
"dest-filename": "microsoft.netcore.app.runtime.linux-arm64.7.0.0.nupkg"
},
{
"type": "file",
"url": "https://gitlab.com/2009scape/Saradomin-Launcher/-/raw/28ff4971e9882c72b43cbfee29cd8391a3584af8/Saradomin/Resources/Linux/org._2009scape.Launcher.appdata.xml",
"sha256": "7efebb49ffdee3734a9c989d470d1cd842c982f6bbdee9e2805e0297f76693c9"
"url": "https://api.nuget.org/v3-flatcontainer/microsoft.netcore.app.runtime.linux-x64/7.0.0/microsoft.netcore.app.runtime.linux-x64.7.0.0.nupkg",
"sha512": "0d2c0cd4a669b753abebb2edaf65b9fd277836b029d6f945bc95f98ed487221b462f9a82dc199dd08c5b12f1f15134531e208fcad5931c426f9fdba6ab068786",
"dest": "nuget-sources",
"dest-filename": "microsoft.netcore.app.runtime.linux-x64.7.0.0.nupkg"
}
]
}
Expand Down