diff --git a/.ci/license-header.sh b/.ci/license-header.sh index fcc2c1f583..6b19f91185 100755 --- a/.ci/license-header.sh +++ b/.ci/license-header.sh @@ -7,7 +7,7 @@ EXCLUDE_FILES="CPM.cmake CPMUtil.cmake GetSCMRev.cmake renderdoc_app.h tools/cpm tools/shellcheck.sh tools/update-cpm.sh tools/windows/vcvarsall.sh externals/stb externals/glad externals/getopt externals/gamemode externals/FidelityFX-FSR externals/demangle externals/bc_decoder externals/cmake-modules" # license header constants, please change when needed :)))) -YEAR=$(date "+%Y") +YEAR=2026 HOLDER="Eden Emulator Project" LICENSE="GPL-3.0-or-later" @@ -112,10 +112,10 @@ for file in $FILES; do [ "$excluded" = "true" ] && continue case "$file" in - *.cmake|*.sh|*.ps1|*.py|*.rb|*.perl|*.pl|*.nix|*CMakeLists.txt) + *.cmake|*.sh|*CMakeLists.txt) begin="#" ;; - *.kt|*.kts|*.cpp|*.h|*.qml|*.c|*.hpp|*.hxx|*.cxx|*.h.in|*.inc) + *.kt*|*.cpp|*.h|*.qml) begin="//" ;; *) @@ -185,12 +185,11 @@ if [ "$UPDATE" = "true" ]; then for file in $SRC_FILES $OTHER_FILES; do case $(basename -- "$file") in - # Windows Powershell wont use shebangs - *.cmake|*.ps1|*CMakeLists.txt) + *.cmake|*CMakeLists.txt) begin="#" shell="false" ;; - *.sh|*.py|*.rb|*.perl|*.pl|*.nix) + *.sh) begin="#" shell=true ;; diff --git a/.ci/source.sh b/.ci/source.sh new file mode 100755 index 0000000000..cbdacd1cd7 --- /dev/null +++ b/.ci/source.sh @@ -0,0 +1,22 @@ +#!/bin/bash -ex + +# git-archive-all +export PATH="$PATH:/home/$USER/.local/bin" + +GITDATE="`git show -s --date=short --format='%ad' | sed 's/-//g'`" +GITREV="`git show -s --format='%h'`" +REV_NAME="eden-unified-source-${GITDATE}-${GITREV}" + +COMPAT_LIST='dist/compatibility_list/compatibility_list.json' + +mkdir artifacts + +touch "${COMPAT_LIST}" +git describe --abbrev=0 --always HEAD > GIT-COMMIT +git describe --tags HEAD > GIT-TAG || echo 'unknown' > GIT-TAG +git-archive-all --include "${COMPAT_LIST}" --include GIT-COMMIT --include GIT-TAG --force-submodules artifacts/"${REV_NAME}.tar" + +cd artifacts/ +xz -T0 -9 "${REV_NAME}.tar" +sha256sum "${REV_NAME}.tar.xz" > "${REV_NAME}.tar.xz.sha256sum" +cd .. diff --git a/docs/Caveats.md b/docs/Caveats.md index c5b925f4cd..fb86437737 100644 --- a/docs/Caveats.md +++ b/docs/Caveats.md @@ -46,7 +46,7 @@ Qt Widgets appears to be broken. For now, add `-DENABLE_QT=OFF` to your configur This is needed for some dependencies that call cc directly (tz): ```sh -echo '#!/bin/sh -e' >cc +echo '#!/bin/sh' >cc echo 'gcc $@' >>cc chmod +x cc export PATH="$PATH:$PWD" diff --git a/docs/user/SteamROM.md b/docs/user/SteamROM.md index 2ea069bf09..a782b51969 100644 --- a/docs/user/SteamROM.md +++ b/docs/user/SteamROM.md @@ -59,7 +59,7 @@ EmuDeck will automatically create an *Emulators - Emulators* parser for ***Steam 4. Paste the following code into the contents of the file, save and close the file. ```bash - #!/bin/sh -e + #!/bin/bash emuName="eden" #parameterize me . "$HOME/.config/EmuDeck/backend/functions/all.sh" diff --git a/docs/user/ThirdParty.md b/docs/user/ThirdParty.md index 1dd359cec3..5bd72ebe72 100644 --- a/docs/user/ThirdParty.md +++ b/docs/user/ThirdParty.md @@ -13,7 +13,6 @@ The main origin repository is always at https://git.eden-emu.dev/eden-emu/eden. - https://github.com/eden-emulator/mirror - https://git.crueter.xyz/mirror/eden -- https://codeberg.org/eden-emu/eden - https://collective.taymaerz.de/eden/eden Other mirrors obviously exist on the internet, but we can't guarantee their reliability and/or availability. diff --git a/externals/nx_tzdb/tzdb_template.h.in b/externals/nx_tzdb/tzdb_template.h.in index c349a143d5..d7907b846d 100644 --- a/externals/nx_tzdb/tzdb_template.h.in +++ b/externals/nx_tzdb/tzdb_template.h.in @@ -1,6 +1,3 @@ -// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project -// SPDX-License-Identifier: GPL-3.0-or-later - // SPDX-FileCopyrightText: 2023 yuzu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later diff --git a/hooks/pre-commit b/hooks/pre-commit index b543ff36ab..484eef1762 100755 --- a/hooks/pre-commit +++ b/hooks/pre-commit @@ -1,7 +1,5 @@ -#!/bin/sh -e +#!/bin/sh -# SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project -# SPDX-License-Identifier: GPL-3.0-or-later # SPDX-FileCopyrightText: 2015 Citra Emulator Project # SPDX-License-Identifier: GPL-2.0-or-later @@ -12,19 +10,20 @@ paths_to_check="src/ CMakeLists.txt" # If there are whitespace errors, print the offending file names and fail. if ! git diff --cached --check -- $paths_to_check ; then - cat< diff --git a/src/core/hle/service/sockets/sfdnsres.cpp b/src/core/hle/service/sockets/sfdnsres.cpp index fa921790e4..fa3a5bb82a 100644 --- a/src/core/hle/service/sockets/sfdnsres.cpp +++ b/src/core/hle/service/sockets/sfdnsres.cpp @@ -91,7 +91,6 @@ static const constexpr std::array blockedDomains = { "microsoft.com", //minecraft dungeons + other games "mojang.com", "xboxlive.com", - "api.epicgames.dev", // marvel cosmic invasion +? "minecraftservices.com" }; diff --git a/tools/README.md b/tools/README.md index ee82c708b0..767892e7ac 100644 --- a/tools/README.md +++ b/tools/README.md @@ -1,6 +1,6 @@ # Tools -Tools for Eden and other subprojects. When adding new scripts please use `#!/bin/sh -e` or `#!/usr/bin/env ` (for `.py`, `.rb`, or `.perl`). Keep scripts POSIX compliant (i.e not require hard `bash` to run, just plain old `sh`). +Tools for Eden and other subprojects. ## Third-Party diff --git a/tools/clang-format.sh b/tools/clang-format.sh index ca5e6fce39..e2857d9723 100755 --- a/tools/clang-format.sh +++ b/tools/clang-format.sh @@ -1,4 +1,4 @@ -#!/bin/sh -e +#! /bin/sh # SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project # SPDX-License-Identifier: GPL-3.0-or-later diff --git a/tools/dtrace-tool.pl b/tools/dtrace-tool.pl index 693a9e7507..d143d36f3e 100755 --- a/tools/dtrace-tool.pl +++ b/tools/dtrace-tool.pl @@ -1,6 +1,5 @@ -#!/usr/bin/env perl - -# SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project +#!/usr/bin/perl +# SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project # SPDX-License-Identifier: GPL-3.0-or-later # Basic script to run dtrace sampling over the program (requires Flamegraph) # Usage is either running as: ./dtrace-tool.sh pid (then input the pid of the process) diff --git a/tools/lanczos-gen.pl b/tools/lanczos-gen.pl old mode 100755 new mode 100644 index 3eab5cdb10..2e26c8c6b9 --- a/tools/lanczos-gen.pl +++ b/tools/lanczos-gen.pl @@ -1,5 +1,5 @@ -#!/usr/bin/env perl -# SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project +#!/usr/bin/perl +# SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project # SPDX-License-Identifier: GPL-3.0-or-later use strict; use warnings; diff --git a/tools/llvmpipe-run.sh b/tools/llvmpipe-run.sh index f09fe87ef4..c3a5a85d41 100755 --- a/tools/llvmpipe-run.sh +++ b/tools/llvmpipe-run.sh @@ -1,6 +1,5 @@ -#!/bin/sh -e - -# SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project +#!/bin/sh +# SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project # SPDX-License-Identifier: GPL-3.0-or-later # This script basically allows you to "dirtily" use llvmpipe in any configuration diff --git a/tools/optimize-assets.sh b/tools/optimize-assets.sh index a9b2888648..70fa2375a5 100755 --- a/tools/optimize-assets.sh +++ b/tools/optimize-assets.sh @@ -1,6 +1,6 @@ #!/bin/sh -e -# SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project +# SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project # SPDX-License-Identifier: GPL-3.0-or-later which optipng || exit diff --git a/tools/stale-translations.sh b/tools/stale-translations.sh index 63ea87b19a..3a9362a252 100755 --- a/tools/stale-translations.sh +++ b/tools/stale-translations.sh @@ -1,6 +1,6 @@ #!/bin/sh -e -# SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project +# SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project # SPDX-License-Identifier: GPL-3.0-or-later ANDROID=src/android/app/src/main diff --git a/tools/svc_generator.py b/tools/svc_generator.py index 9a99c3ba51..d00fe0ba63 100755 --- a/tools/svc_generator.py +++ b/tools/svc_generator.py @@ -1,5 +1,5 @@ -#!/usr/bin/env python3 -# SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project +#!/usr/bin/python3 +# SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project # SPDX-License-Identifier: GPL-3.0-or-later # SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project # SPDX-License-Identifier: GPL-2.0-or-later @@ -212,7 +212,7 @@ def emit_size_check(): if type != "void": lines.append(f"static_assert(sizeof({type}) == {size});") - return f"\n{lines}" + return "\n".join(lines) # Replaces a type with an arch-specific one, if it exists. @@ -423,7 +423,7 @@ def emit_lines(lines, indent=' '): output_lines.append(line) first = False - return f"\n{output_lines}" + return "\n".join(output_lines) # Emit a C++ function to wrap a guest SVC. @@ -601,7 +601,7 @@ def emit_call(bitness, names, suffix): lines.append(f"{indent}}}") lines.append("}") - return f"\n{lines}" + return "\n".join(lines) def build_fn_declaration(return_type, name, arguments): @@ -623,7 +623,7 @@ def build_enum_declarations(): lines.append(f"{indent}{name} = {hex(imm)},") lines.append("};") - return f"\n{lines}" + return "\n".join(lines) def main(): @@ -665,11 +665,11 @@ def main(): with open("src/core/hle/kernel/svc.h", "w") as f: f.write(COPYRIGHT) f.write(PROLOGUE_H) - f.write(f"\n{svc_fw_declarations}") + f.write("\n".join(svc_fw_declarations)) f.write("\n\n") - f.write(f"\n{arch_fw_declarations[BIT_32]}") + f.write("\n".join(arch_fw_declarations[BIT_32])) f.write("\n\n") - f.write(f"\n{arch_fw_declarations[BIT_64]}") + f.write("\n".join(arch_fw_declarations[BIT_64])) f.write("\n\n") f.write(enum_decls) f.write(EPILOGUE_H) @@ -679,7 +679,7 @@ def main(): f.write(PROLOGUE_CPP) f.write(emit_size_check()) f.write("\n\n") - f.write(f"\n\n{wrapper_fns}") + f.write("\n\n".join(wrapper_fns)) f.write("\n\n") f.write(call_32) f.write("\n\n") diff --git a/tools/translations/qt-source.sh b/tools/translations/qt-source.sh index 707ec2783c..89c881d8c0 100755 --- a/tools/translations/qt-source.sh +++ b/tools/translations/qt-source.sh @@ -1,6 +1,6 @@ -#!/bin/sh -e +#!/bin/sh -# SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project +# SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project # SPDX-License-Identifier: GPL-3.0-or-later SOURCES=$(find src/yuzu src/qt_common -type f \( -name "*.ui" -o -name "*.cpp" -o -name "*.h" -o -name "*.plist" \)) diff --git a/tools/translations/update-translations.sh b/tools/translations/update-translations.sh index 6ed740140d..8bcd79142f 100755 --- a/tools/translations/update-translations.sh +++ b/tools/translations/update-translations.sh @@ -1,6 +1,6 @@ -#!/bin/sh -e +#!/bin/sh -# SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project +# SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project # SPDX-License-Identifier: GPL-3.0-or-later command -v tx-cli && COMMAND=tx-cli diff --git a/tools/unused-strings.sh b/tools/unused-strings.sh index 10f6a63565..1165a203aa 100755 --- a/tools/unused-strings.sh +++ b/tools/unused-strings.sh @@ -1,6 +1,6 @@ #!/bin/sh -e -# SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project +# SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project # SPDX-License-Identifier: GPL-3.0-or-later ANDROID=src/android/app/src/main diff --git a/tools/windows/install-vulkan-sdk.sh b/tools/windows/install-vulkan-sdk.sh index 2151363793..0f136748cf 100644 --- a/tools/windows/install-vulkan-sdk.sh +++ b/tools/windows/install-vulkan-sdk.sh @@ -1,4 +1,4 @@ -#!/bin/sh -e +#!/usr/bin/sh # SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project # SPDX-License-Identifier: GPL-3.0-or-later