Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 3 additions & 3 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
- [ ] I have read and followed the [Contribution Guidelines](https://github.com/Djihads80/Eglantine/blob/nx2/CONTRIBUTING.md#code-contributions).
- [ ] I have read and followed the [AI Policy](https://github.com/Djihads80/Eglantine/blob/nx2/docs/policies/AI.md).
- [ ] I have read and followed the [Coding Guidelines](https://github.com/Djihads80/Eglantine/blob/nx2/docs/policies/Coding.md) to the best of my ability.
- [ ] I have read and followed the [Contribution Guidelines](https://github.com/Framerr/Frameropia/blob/nx2/CONTRIBUTING.md#code-contributions).
- [ ] I have read and followed the [AI Policy](https://github.com/Framerr/Frameropia/blob/nx2/docs/policies/AI.md).
- [ ] I have read and followed the [Coding Guidelines](https://github.com/Framerr/Frameropia/blob/nx2/docs/policies/Coding.md) to the best of my ability.
- [ ] **I have put [HUMANMADE] in the title if the pr was human-mande**

---
Expand Down
34 changes: 17 additions & 17 deletions .github/workflows/build-linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -200,12 +200,12 @@ jobs:
shell: bash
run: |
set -euo pipefail
test -x build/release/bin/eglantine
test -x build/release/bin/eden-cli
strip build/release/bin/eglantine build/release/bin/eden-cli
tar -czf "eglantine-${SHA}-${PLATFORM}.tar.gz" \
-C build/release/bin eglantine eden-cli
ls -la "eglantine-${SHA}-${PLATFORM}.tar.gz"
test -x build/release/bin/frameropia
test -x build/release/bin/frameropia-cli
strip build/release/bin/frameropia build/release/bin/frameropia-cli
tar -czf "frameropia-${SHA}-${PLATFORM}.tar.gz" \
-C build/release/bin frameropia frameropia-cli
ls -la "frameropia-${SHA}-${PLATFORM}.tar.gz"

# A self-contained AppImage: linuxdeploy bundles every library the two programs need except
# the base system ones (glibc, X11/Wayland client libraries, the GPU driver and Vulkan loader),
Expand All @@ -216,8 +216,8 @@ jobs:
VERSION_LABEL: ${{ inputs.version }}
run: |
set -euo pipefail
test -x build/release/bin/eglantine
test -x build/release/bin/eden-cli
test -x build/release/bin/frameropia
test -x build/release/bin/frameropia-cli
tools="$RUNNER_TEMP/linuxdeploy"
mkdir -p "$tools"
arch=$(uname -m) # aarch64 or x86_64
Expand All @@ -226,8 +226,8 @@ jobs:
curl -fsSL -o "$tools/linuxdeploy-plugin-qt-$arch.AppImage" \
"https://github.com/linuxdeploy/linuxdeploy-plugin-qt/releases/download/continuous/linuxdeploy-plugin-qt-$arch.AppImage"
chmod +x "$tools"/*.AppImage
# The desktop file names its icon dev.eglantine.eglantine.
icon="$RUNNER_TEMP/dev.eglantine.eglantine.png"
# The desktop file uses the Frameropia application ID.
icon="$RUNNER_TEMP/io.github.framerr.frameropia.png"
cp dist/Eglantine.png "$icon"
export APPIMAGE_EXTRACT_AND_RUN=1
export QMAKE="$QT_ROOT_DIR/bin/qmake"
Expand All @@ -236,13 +236,13 @@ jobs:
export EXTRA_PLATFORM_PLUGINS='libqwayland-egl.so;libqwayland-generic.so'
# Embedded in the AppImage metadata: the version label of this build.
export LDAI_VERSION="$VERSION_LABEL"
export LDAI_OUTPUT="eglantine-${SHA}-${PLATFORM}.AppImage"
export LDAI_OUTPUT="frameropia-${SHA}-${PLATFORM}.AppImage"
export OUTPUT="$LDAI_OUTPUT"
export ARCH="$arch"
"$tools/linuxdeploy-$arch.AppImage" --appdir AppDir \
--executable build/release/bin/eglantine \
--executable build/release/bin/eden-cli \
--desktop-file dist/dev.eden_emu.eden.desktop \
--executable build/release/bin/frameropia \
--executable build/release/bin/frameropia-cli \
--desktop-file dist/io.github.framerr.frameropia.desktop \
--icon-file "$icon" \
--plugin qt \
--output appimage
Expand All @@ -253,10 +253,10 @@ jobs:
- name: Upload Linux binary
uses: actions/upload-artifact@v7
with:
name: eglantine-${{ env.PLATFORM }}-${{ inputs.sha }}
name: frameropia-${{ env.PLATFORM }}-${{ inputs.sha }}
path: |
eglantine-${{ inputs.sha }}-${{ env.PLATFORM }}.tar.gz
eglantine-${{ inputs.sha }}-${{ env.PLATFORM }}.AppImage
frameropia-${{ inputs.sha }}-${{ env.PLATFORM }}.tar.gz
frameropia-${{ inputs.sha }}-${{ env.PLATFORM }}.AppImage
if-no-files-found: error
compression-level: 0
retention-days: 7
36 changes: 18 additions & 18 deletions .github/workflows/build-macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -114,15 +114,15 @@ jobs:
shell: bash
run: |
set -euo pipefail
app=build/release/bin/eglantine.app
test -x "$app/Contents/MacOS/eglantine"
test -x build/release/bin/eden-cli
for binary in "$app/Contents/MacOS/eglantine" build/release/bin/eden-cli; do
app=build/release/bin/frameropia.app
test -x "$app/Contents/MacOS/frameropia"
test -x build/release/bin/frameropia-cli
for binary in "$app/Contents/MacOS/frameropia" build/release/bin/frameropia-cli; do
test "$(lipo -archs "$binary")" = arm64
done
cp build/release/bin/eden-cli "$app/Contents/MacOS/eden-cli"
cp build/release/bin/frameropia-cli "$app/Contents/MacOS/frameropia-cli"
"$(brew --prefix qt@6)/bin/macdeployqt" "$app" \
-executable="$app/Contents/MacOS/eden-cli" -libpath="$(brew --prefix)/lib" \
-executable="$app/Contents/MacOS/frameropia-cli" -libpath="$(brew --prefix)/lib" \
-always-overwrite -verbose=1
# Qt's virtual keyboard input plugin pulls in the QML stack, which the emulator doesn't use.
rm -f "$app/Contents/PlugIns/platforminputcontexts/libqtvirtualkeyboardplugin.dylib"
Expand All @@ -135,7 +135,7 @@ jobs:
done
done
# Libraries that load their dependencies through @rpath find them in the bundle.
for program in eglantine eden-cli; do
for program in frameropia frameropia-cli; do
install_name_tool -add_rpath @executable_path/../Frameworks \
"$app/Contents/MacOS/$program" 2> /dev/null
done
Expand All @@ -154,28 +154,28 @@ jobs:
codesign --force --deep --sign - "$app"
if [ -f dist/eglantine.entitlements ]; then
codesign --force --sign - --entitlements dist/eglantine.entitlements \
"$app/Contents/MacOS/eden-cli"
"$app/Contents/MacOS/frameropia-cli"
codesign --force --sign - --entitlements dist/eglantine.entitlements "$app"
fi
codesign --verify --deep --strict "$app"
ditto -c -k --keepParent "$app" "eglantine-${SHA}-${PLATFORM}.zip"
ls -la "eglantine-${SHA}-${PLATFORM}.zip"
# Also ship a .dmg (drag eglantine.app onto Applications).
ditto -c -k --keepParent "$app" "frameropia-${SHA}-${PLATFORM}.zip"
ls -la "frameropia-${SHA}-${PLATFORM}.zip"
# Also ship a .dmg (drag frameropia.app onto Applications).
dmgdir=$(mktemp -d)
ditto "$app" "$dmgdir/eglantine.app"
ditto "$app" "$dmgdir/frameropia.app"
ln -s /Applications "$dmgdir/Applications"
hdiutil create -volname "Eglantine" -srcfolder "$dmgdir" -ov -format UDZO \
"eglantine-${SHA}-${PLATFORM}.dmg"
ls -la "eglantine-${SHA}-${PLATFORM}.dmg"
hdiutil create -volname "Frameropia" -srcfolder "$dmgdir" -ov -format UDZO \
"frameropia-${SHA}-${PLATFORM}.dmg"
ls -la "frameropia-${SHA}-${PLATFORM}.dmg"

# Zipped with ditto beforehand: the bundle's framework symlinks don't survive artifact zipping.
- name: Upload macOS app
uses: actions/upload-artifact@v7
with:
name: eglantine-${{ env.PLATFORM }}-${{ inputs.sha }}
name: frameropia-${{ env.PLATFORM }}-${{ inputs.sha }}
path: |
eglantine-${{ inputs.sha }}-${{ env.PLATFORM }}.zip
eglantine-${{ inputs.sha }}-${{ env.PLATFORM }}.dmg
frameropia-${{ inputs.sha }}-${{ env.PLATFORM }}.zip
frameropia-${{ inputs.sha }}-${{ env.PLATFORM }}.dmg
if-no-files-found: error
compression-level: 0
retention-days: 7
16 changes: 8 additions & 8 deletions .github/workflows/build-windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -130,19 +130,19 @@ jobs:
- name: Package Windows binary
shell: pwsh
run: |
foreach ($exe in 'eglantine.exe', 'eden-cli.exe') {
foreach ($exe in 'frameropia.exe', 'frameropia-cli.exe') {
if (-not (Test-Path "build/release/bin/$exe")) {
throw "build/release/bin/$exe was not produced"
}
}
windeployqt --release --no-translations build/release/bin/eglantine.exe
windeployqt --release --no-translations build/release/bin/frameropia.exe

# The artifact is the bin folder itself: GitHub zips artifacts on download, and uploading a
# zip gave a zip inside a zip. The release job zips it once for the release.
- name: Upload Windows binary
uses: actions/upload-artifact@v7
with:
name: eglantine-windows-x86_64-${{ inputs.sha }}
name: frameropia-windows-x86_64-${{ inputs.sha }}
path: build/release/bin/
if-no-files-found: error
retention-days: 7
Expand Down Expand Up @@ -252,10 +252,10 @@ jobs:
set -euo pipefail
export PATH="/ucrt64/bin:$PATH"
cd build/release/bin
test -f eglantine.exe
test -f eden-cli.exe
test -f frameropia.exe
test -f frameropia-cli.exe
windeployqt6 --no-translations --no-compiler-runtime --no-opengl-sw \
--no-system-dxc-compiler --no-system-d3d-compiler eglantine.exe
--no-system-dxc-compiler --no-system-d3d-compiler frameropia.exe
deps() {
objdump -p "$1" | awk '/DLL Name:/ {print $3}' | while read -r dll; do
[ -z "$dll" ] && continue
Expand All @@ -271,7 +271,7 @@ jobs:
fi
done
}
for exe in eglantine.exe eden-cli.exe; do
for exe in frameropia.exe frameropia-cli.exe; do
deps "$exe"
done
find . -name '*.dll' | while read -r dll; do
Expand All @@ -281,7 +281,7 @@ jobs:
- name: Upload MinGW binary
uses: actions/upload-artifact@v7
with:
name: eglantine-windows-x86_64-pgo-${{ inputs.sha }}
name: frameropia-windows-x86_64-pgo-${{ inputs.sha }}
path: build/release/bin/
if-no-files-found: error
retention-days: 7
6 changes: 6 additions & 0 deletions .github/workflows/fork-preflight.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,3 +47,9 @@ jobs:
set -euo pipefail
test -s docs/POKOPIA_TESTING.md
test -s .github/ISSUE_TEMPLATE/pokopia_bug.yml

- name: Validate Frameropia branding and package identifiers
shell: bash
run: |
set -euo pipefail
bash tools/ci/check-frameropia-branding.sh
33 changes: 33 additions & 0 deletions .github/workflows/fork-windows-check.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
name: fork-windows-check

# Read-only Windows compilation check for source/build-system pull requests.
on:
pull_request:
branches: [nx2]
paths:
- .github/workflows/fork-windows-check.yml
- .github/workflows/build-windows.yml
- src/yuzu/**
- src/yuzu_cmd/**
- src/qt_common/**
- src/core/launch_params.cpp
- CMakeModules/**
- CMakeLists.txt
- dist/**
- tools/ci/**
workflow_dispatch:

permissions:
contents: read

jobs:
windows:
uses: ./.github/workflows/build-windows.yml
with:
sha: ${{ github.event.pull_request.head.sha || github.sha }}
version: ci
refspec: frameropia-ci
tag: ci
release: false
nightly: true
pgo: none
2 changes: 1 addition & 1 deletion .github/workflows/fork-windows-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ jobs:
with:
kind: stable
tag: ${{ needs.prepare.outputs.tag }}
title: Eglantine-Framer ${{ needs.prepare.outputs.tag }} (test build)
title: Frameropia ${{ needs.prepare.outputs.tag }} (test build)
prerelease: true
sha: ${{ needs.prepare.outputs.sha }}
branch: nx2
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ jobs:
- name: Download binaries
uses: actions/download-artifact@v8
with:
pattern: eglantine-*-${{ inputs.sha }}
pattern: frameropia-*-${{ inputs.sha }}
path: artifacts

# Asset names drop the commit sha: the tag already identifies the build, and stable names let
Expand Down
8 changes: 8 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,14 @@ New entries go under `## [Unreleased]`; `tools/ci/bump-version.sh` turns them in

## [Unreleased]

### Frameropia rebrand (after v0.0.1)

- Rebrand the GUI, dialogs, startup messages, and packaged executable names to **Frameropia**.
- Remove Discord links and presence options from the application's interface.
- Point the fork's documentation, help screens, issue reporting, and release links to the Frameropia GitHub repository.
- Update CI release assets and packaging metadata for Windows, Linux, and macOS.
- Preserve legacy Eden/Eglantine data paths to avoid disrupting existing settings and saves.

- Added OOT Compatibility
- Improved MKW Performances
- Added StarFox Compatibility
Expand Down
11 changes: 6 additions & 5 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -284,7 +284,7 @@ option(NIGHTLY_BUILD "Use Nightly qualifiers in the update checker and build met
cmake_dependent_option(YUZU_ROOM "Enable dedicated room functionality" ON "NOT ANDROID" OFF)
cmake_dependent_option(YUZU_ROOM_STANDALONE "Enable standalone room executable" ON "YUZU_ROOM" OFF)

cmake_dependent_option(YUZU_CMD "Compile the eden-cli executable" ON "NOT ANDROID" OFF)
cmake_dependent_option(YUZU_CMD "Compile the frameropia-cli executable" ON "NOT ANDROID" OFF)

cmake_dependent_option(YUZU_CRASH_DUMPS "Compile crash dump (Minidump) support" OFF "WIN32 OR LINUX" OFF)

Expand Down Expand Up @@ -752,15 +752,16 @@ endif()

# TODO: Icon/install handling n such should be put into dist/CMakeLists.txt
if(ENABLE_QT AND UNIX AND NOT APPLE)
install(FILES "dist/dev.eden_emu.eden.desktop"
install(FILES "dist/io.github.framerr.frameropia.desktop"
DESTINATION "share/applications")
install(FILES "dist/dev.eden_emu.eden.svg"
DESTINATION "share/icons/hicolor/scalable/apps")
DESTINATION "share/icons/hicolor/scalable/apps"
RENAME "io.github.framerr.frameropia.svg")

# TODO: these files need to be updated.
install(FILES "dist/dev.eden_emu.eden.xml"
install(FILES "dist/io.github.framerr.frameropia.xml"
DESTINATION "share/mime/packages")
install(FILES "dist/dev.eden_emu.eden.metainfo.xml"
install(FILES "dist/io.github.framerr.frameropia.metainfo.xml"
DESTINATION "share/metainfo")
endif()

Expand Down
14 changes: 7 additions & 7 deletions CMakeModules/GenerateSCMRev.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -35,21 +35,21 @@ set(GIT_DESC ${BUILD_VERSION})
# Generate cpp with Git revision from template

# TODO(crueter): Stable releases feed.
set(BUILD_AUTO_UPDATE_STABLE_REPO "eden-emu/eden")
set(BUILD_AUTO_UPDATE_STABLE_REPO "Framerr/Frameropia")
set(BUILD_AUTO_UPDATE_STABLE_API "git.eden-emu.dev")
set(BUILD_AUTO_UPDATE_STABLE_API_PATH "/api/v1/repos/")

set(BUILD_AUTO_UPDATE_API_PATH "/latest/release.json")
if (NIGHTLY_BUILD)
set(BUILD_AUTO_UPDATE_WEBSITE "https://git.eden-emu.dev")
set(BUILD_AUTO_UPDATE_WEBSITE "https://github.com/Framerr/Frameropia")
set(BUILD_AUTO_UPDATE_API "nightly.eden-emu.dev")
set(BUILD_AUTO_UPDATE_REPO "eden-ci/nightly")
set(REPO_NAME "Eglantine Nightly")
set(BUILD_AUTO_UPDATE_REPO "Framerr/Frameropia")
set(REPO_NAME "Frameropia Nightly")
else()
set(BUILD_AUTO_UPDATE_WEBSITE "https://git.eden-emu.dev")
set(BUILD_AUTO_UPDATE_WEBSITE "https://github.com/Framerr/Frameropia")
set(BUILD_AUTO_UPDATE_API "stable.eden-emu.dev")
set(BUILD_AUTO_UPDATE_REPO "eden-emu/eden")
set(REPO_NAME "Eglantine")
set(BUILD_AUTO_UPDATE_REPO "Framerr/Frameropia")
set(REPO_NAME "Frameropia")
endif()

set(BUILD_ID ${GIT_REFSPEC})
Expand Down
Loading
Loading