Skip to content

Fix Clover Package #710

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

Merged
merged 1 commit into from
Sep 14, 2024
Merged

Fix Clover Package #710

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
Fix Clover Package
  • Loading branch information
@chris1111
chris1111 committed Sep 14, 2024
commit 0d24875ee63322476f06659f56c69560c1e042d8
2 changes: 1 addition & 1 deletion .github/workflows/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ jobs:
- name: Upload to Artifacts
uses: actions/upload-artifact@v4
with:
name: Clover beta-${{ env.GIT_SHA }}
name: Clover-GCC-14.1.0-${{ env.GIT_SHA }}
path: |
*.7z
CloverV2*.zip
Expand Down
10 changes: 4 additions & 6 deletions CloverPackage/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ slimpkg2:
slimpkg3:
@${SRCROOT}/makepkg --nothemes --norc --nolegacy

#updatepo:
# @${SRCROOT}/package/translate.sh --update-po
updatepo:
@${SRCROOT}/package/translate.sh --update-po

utils:
@make -C "${SRCROOT}"/utils all
Expand All @@ -32,8 +32,6 @@ install:
@make -C "${SRCROOT}"/utils install

clean:
rm -rf sym obj dst
#CloverPrefpane/build CloverUpdater/build

.PHONY: clean image iso pkg installer utils
rm -rf sym obj dst CloverPrefpane/build CloverUpdater/build

.PHONY: clean image iso pkg installer updatepo utils
2 changes: 1 addition & 1 deletion CloverPackage/makepkg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ echo "${revision}" > revision
# Make the translation
echo ""
echo "========= Translating Resources ========"
#./package/translate.sh || exit $?
./package/translate.sh || exit $?

# Check that XCode is install properly
xcode_path=$(/usr/bin/xcode-select --print-path 2>/dev/null)
Expand Down
10 changes: 5 additions & 5 deletions CloverPackage/package/translate.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,17 +58,17 @@ while [[ $# -gt 0 ]]; do
done

TEMPLATES_DIR="Resources/templates"
#CLOVER_UPDATER_DIR="../CloverUpdater"
#CLOVER_PREFPANE_DIR="../CloverPrefpane"
CLOVER_UPDATER_DIR="../CloverUpdater"
CLOVER_PREFPANE_DIR="../CloverPrefpane"
PODIR="po"

# Update CloverUpdater.strings
#"$CLOVER_UPDATER_DIR"/translate_xib.sh --extract-only
"$CLOVER_UPDATER_DIR"/translate_xib.sh --extract-only

# Update CloverPrefpane.strings
#"$CLOVER_PREFPANE_DIR"/translate_xib.sh --extract-only
"$CLOVER_PREFPANE_DIR"/translate_xib.sh --extract-only
# Update Localizable.strings
#"$CLOVER_PREFPANE_DIR"/translate_source.sh --extract-only
"$CLOVER_PREFPANE_DIR"/translate_source.sh --extract-only

# Check if pot and po files need to be updated
IFS=$'\n' # '
Expand Down