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

dolphin: Various fixes, including fixing portability #1208

Merged
merged 8 commits into from
Aug 20, 2024
Merged

dolphin: Various fixes, including fixing portability #1208

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
21a4003
dolphin: Add `extract_dir`
RuiNtD Aug 19, 2024
e11bdce
dolphin-beta: Remove due to no longer being a supported channel
RuiNtD Aug 19, 2024
61ae074
dolphin: Add architectures
RuiNtD Aug 19, 2024
ed77a81
dolphin: fix extract_dir on ARM
RuiNtD Aug 19, 2024
b5a4220
dolphin-dev: Move URL to architecture
RuiNtD Aug 19, 2024
8c19d81
dolphin: Update pre_install
RuiNtD Aug 19, 2024
9da046c
dolphin-dev: Update pre_install
RuiNtD Aug 19, 2024
bfc2f70
dolphin: Add DolphinTool shim
RuiNtD Aug 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
49 changes: 0 additions & 49 deletions bucket/dolphin-beta.json
View file
Open in desktop

This file was deleted.

30 changes: 18 additions & 12 deletions bucket/dolphin-dev.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,18 +9,19 @@
"suggest": {
"Microsoft Visual C++ Runtime 2022": "extras/vcredist2022"
},
"url": "https://dl.dolphin-emu.org/builds/2f/c0/dolphin-master-2407-240-x64.7z",
"hash": "8f259a14738d36a68587672dcf3ad790419912d800f399e929310f3c03d8ace1",
"extract_dir": "Dolphin-x64",
"architecture": {
"64bit": {
"url": "https://dl.dolphin-emu.org/builds/2f/c0/dolphin-master-2407-240-x64.7z",
"hash": "8f259a14738d36a68587672dcf3ad790419912d800f399e929310f3c03d8ace1",
"extract_dir": "Dolphin-x64"
}
},
"pre_install": [
"if (!(Test-Path \"$persist_dir\")) {",
" New-item \"$persist_dir\" -ItemType Directory | Out-Null",
" New-item \"$persist_dir\\User\" -ItemType Directory | Out-Null",
" if (Test-Path \"$env:USERPROFILE\\Documents\\Dolphin Emulator\") {",
" Write-host \"Migrating AppData...\" -ForegroundColor yellow",
" Copy-Item -Path \"$env:USERPROFILE\\Documents\\Dolphin Emulator\\*\" -Destination \"$persist_dir\\User\" -Recurse",
" Remove-Item -Path \"$env:USERPROFILE\\Documents\\Dolphin Emulator\" -Recurse",
" }",
"$appdataPath = \"$Env:AppData\\Dolphin Emulator\"",
"if ((Test-Path -Path $appdataPath\\*) -and (!(Test-Path -Path $persist_dir\\*))) {",
" Write-Warning \"Migrating AppData...\"",
" New-Item -Type Directory -Path $persist_dir\\User -Force | Out-Null",
" Copy-Item -Recurse -Force $appdataPath\\* -Destination $persist_dir\\User\\",
"}"
],
"post_install": "Set-Content -Value $null -Path \"$dir\\portable.txt\"",
Expand All @@ -47,6 +48,11 @@
"replace": "${major}-${build}"
},
"autoupdate": {
"url": "https://dl.dolphin-emu.org/builds/$matchRand1/$matchRand2/dolphin-master-$matchMajor-$matchBuild-x64.7z"
"url": "https://dl.dolphin-emu.org/builds/$matchRand1/$matchRand2/dolphin-master-$matchMajor-$matchBuild-x64.7z",
"architecture": {
"64bit": {
"url": "https://dl.dolphin-emu.org/builds/$matchRand1/$matchRand2/dolphin-master-2407-240-x64.7z"
}
}
}
}
43 changes: 30 additions & 13 deletions bucket/dolphin.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,24 +9,34 @@
"suggest": {
"Microsoft Visual C++ Runtime 2019": "extras/vcredist2019"
},
"url": "https://dl.dolphin-emu.org/releases/2407/dolphin-2407-x64.7z",
"hash": "9283423bc40048ee4fd3531c3fc4ca0799e99d9a2d9295f703683c62a3bc280b",
"architecture": {
"64bit": {
"url": "https://dl.dolphin-emu.org/releases/2407/dolphin-2407-x64.7z",
"hash": "9283423bc40048ee4fd3531c3fc4ca0799e99d9a2d9295f703683c62a3bc280b",
"extract_dir": "Dolphin-x64"
},
"arm64": {
"url": "https://dl.dolphin-emu.org/releases/2407/dolphin-2407-ARM64.7z",
"hash": "94edf7e5a48694e2805edd94e9e4d390b2ec2b837a0d43cd042878c48dbb4b1e",
"extract_dir": "Dolphin-ARM64"
}
},
"pre_install": [
"if (!(Test-Path \"$persist_dir\")) {",
" New-item \"$persist_dir\" -ItemType Directory | Out-Null",
" New-item \"$persist_dir\\User\" -ItemType Directory | Out-Null",
" if (Test-Path \"$env:USERPROFILE\\Documents\\Dolphin Emulator\") {",
" Write-host \"Migrating AppData...\" -ForegroundColor yellow",
" Copy-Item -Path \"$env:USERPROFILE\\Documents\\Dolphin Emulator\\*\" -Destination \"$persist_dir\\User\" -Recurse",
" Remove-Item -Path \"$env:USERPROFILE\\Documents\\Dolphin Emulator\" -Recurse",
" }",
"$appdataPath = \"$Env:AppData\\Dolphin Emulator\"",
"if ((Test-Path -Path $appdataPath\\*) -and (!(Test-Path -Path $persist_dir\\*))) {",
" Write-Warning \"Migrating AppData...\"",
" New-Item -Type Directory -Path $persist_dir\\User -Force | Out-Null",
" Copy-Item -Recurse -Force $appdataPath\\* -Destination $persist_dir\\User\\",
"}"
],
"post_install": "Set-Content -Value $null -Path \"$dir\\portable.txt\"",
"bin": "Dolphin-x64\\Dolphin.exe",
"bin": [
"Dolphin.exe",
"DolphinTool.exe"
],
"shortcuts": [
[
"Dolphin-x64\\Dolphin.exe",
"Dolphin.exe",
"Dolphin"
]
],
Expand All @@ -36,6 +46,13 @@
"regex": "https://dl.dolphin-emu.org/releases/(?<version>[\\d]+)/"
},
"autoupdate": {
"url": "https://dl.dolphin-emu.org/releases/$version/dolphin-$version-x64.7z"
"architecture": {
"64bit": {
"url": "https://dl.dolphin-emu.org/releases/$version/dolphin-$version-x64.7z"
},
"arm64": {
"url": "https://dl.dolphin-emu.org/releases/$version/dolphin-$version-ARM64.7z"
}
}
}
}