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.

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

Fix workflow, fix typos for zh-hans language and update submodules #705

Merged
merged 2 commits into from
Apr 13, 2024
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
8 changes: 3 additions & 5 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ jobs:
container: devkitpro/devkita64:latest

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@master
with:
submodules: recursive

Expand Down Expand Up @@ -38,17 +38,15 @@ jobs:
- name: Build libusbhsfs dependencies
run: |
cd libusbhsfs
cd libntfs-3g; su -s /bin/bash nobody -c "dkp-makepkg -c -C -f" > /dev/null; sudo -n dkp-pacman -U --needed --noconfirm *.pkg.tar.* > /dev/null; cd ..
cd liblwext4; su -s /bin/bash nobody -c "dkp-makepkg -c -C -f" > /dev/null; sudo -n dkp-pacman -U --needed --noconfirm *.pkg.tar.* > /dev/null; cd ..
make BUILD_TYPE=GPL release
make BUILD_TYPE=GPL install -j$(nproc)

- name: Build Goldleaf
run: |
python3 arc/arc.py gen_db default+Goldleaf/include/base_Results.rc.hpp
python3 arc/arc.py gen_cpp rc GLEAF Goldleaf/include/base_Results.gen.hpp
make -j$(nproc)

- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@master
with:
name: Goldleaf
path: Goldleaf/Goldleaf.nro
Expand Down
2 changes: 1 addition & 1 deletion Goldleaf/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ LIBS := -lcurl -lz -lmbedtls -lmbedcrypto -lmbedx509 -lnx -lusbhsfs -lntfs-3g -l
# list of directories containing libraries, this must be the top level containing
# include and lib
#---------------------------------------------------------------------------------
LIBDIRS := $(PORTLIBS) $(LIBNX) /run/media/xor/MDA/Nintendo/Switch/Proyectos/Plutonium/Plutonium $(CURDIR)/../libusbhsfs
LIBDIRS := $(PORTLIBS) $(LIBNX) $(CURDIR)/../Plutonium/Plutonium $(CURDIR)/../libusbhsfs


#---------------------------------------------------------------------------------
Expand Down
8 changes: 4 additions & 4 deletions Goldleaf/romfs/Strings/zh-Hans.json
Original file line number Diff line number Diff line change
Expand Up @@ -297,7 +297,7 @@
"正在等待 amiibo 输入...按 B 键可取消",
"检测到 Amiibo:提取中",
"到 emuiibo 文件夹...",
"amiibo提取完成",
"amiibo 提取完成",
"浏览远程 PC",
"主机尚未连接到 PC,请使用 USB-C 数据线连接",
"提取实体 amiibo 数据以使用 emuiibo(amiibo 模拟)",
Expand Down Expand Up @@ -462,7 +462,7 @@
"无法重启到选定的 payload...",
"该 NSP 包含多个主内容",
"该 NSP 包含以下主内容:",
"该内容未包含数据\n(可能是文件 title,或是尚未插入游戏卡带的空白卡带 Title)",
"该内容未包含数据\n(可能是已归档的 title,或是尚未插入游戏卡带的空白卡带 Title)",
"查看上一个",
"查看下一个",
"其他",
Expand All @@ -473,7 +473,7 @@
"存在同名文件夹。需要删除该文件夹吗?",
"正在复制文件...",
"正在复制文件夹...",
"忽略隐藏文件或者目录",
"忽略隐藏的文件或者目录",
"安装NSP后显示删除提示",
"写入功能被禁用..."
"写入权限被禁用..."
]
8 changes: 3 additions & 5 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -3,21 +3,19 @@
.PHONY: all dev allclean clean libclean setup arc

all:
@$(MAKE) -C libusbhsfs/ BUILD_TYPE=GPL release
@$(MAKE) -C Plutonium/
@$(MAKE) -C Goldleaf/

dev:
@$(MAKE) -C libusbhsfs/ BUILD_TYPE=GPL release
@$(MAKE) -C Plutonium/
@$(MAKE) -C Goldleaf/ DEV_PREFIX=-dev

arc:
@python arc/arc.py gen_db default+$(CURDIR)/Goldleaf/include/base_Results.rc.hpp
@python arc/arc.py gen_cpp rc GLEAF $(CURDIR)/Goldleaf/include/base_Results.gen.hpp
@python arc/arc.py gen_db default+./Goldleaf/include/base_Results.rc.hpp
@python arc/arc.py gen_cpp rc GLEAF ./Goldleaf/include/base_Results.gen.hpp

setup: arc
@$(MAKE) -C libusbhsfs/ fs-libs
@$(MAKE) -C libusbhsfs/ BUILD_TYPE=GPL install

allclean: libclean clean

Expand Down
2 changes: 1 addition & 1 deletion Plutonium
Submodule Plutonium updated 426 files
2 changes: 1 addition & 1 deletion arc