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

Add README and Applications to macOS dmg #210

Merged
merged 2 commits into from
Jan 21, 2025
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
10 changes: 4 additions & 6 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -89,12 +89,11 @@ jobs:
./configure
make -j4
- name: packaging
working-directory: build
run: macdeployqt iaito.app -dmg -verbose=2
run: make -C dist/macos
- uses: actions/upload-artifact@v4
with:
name: iaito-x64.dmg
path: build/iaito.dmg
path: dist/macos/iaito.dmg
acr-macos-arm64:
runs-on: macos-latest
steps:
Expand All @@ -121,12 +120,11 @@ jobs:
./configure
make -j4
- name: packaging
working-directory: build
run: macdeployqt iaito.app -dmg -verbose=2
run: make -C dist/macos
- uses: actions/upload-artifact@v4
with:
name: iaito-arm64.dmg
path: build/iaito.dmg
path: dist/macos/iaito.dmg
meson:
runs-on: ${{ matrix.os }}
strategy:
Expand Down
6 changes: 5 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -91,4 +91,8 @@ src/out
*.orig

# Translations
src/translations
src/translations

# macOS package
/dist/macos/disk
/dist/macos/*.dmg
24 changes: 16 additions & 8 deletions dist/macos/Makefile
Original file line number Diff line number Diff line change
@@ -1,12 +1,20 @@
all:
rm -f ../../build/iaito.dmg
cd ../../build && macdeployqt iaito.app -dmg && cp -f iaito.dmg ../dist/macos
.PHONY: all app clean

app:
$(SHELL) make-macos-app.sh
all: app iaito.dmg

pkg:
$(SHELL) make-macos-pkg.sh
app: ../../build/iaito.app
mkdir disk
cp -a ../../build/iaito.app disk/
macdeployqt disk/iaito.app -verbose=2

iaito.dmg: app
cp doc/README.txt disk/READ_THIS_FIRST.txt
ln -fs /Applications disk/
hdiutil create -format UDZO -fs APFS -volname iaito -srcfolder disk iaito

../../build/iaito.app:
echo "Building iaito..."
$(MAKE) -C ../..

clean:
rm -rf macos-pkg tmp
rm -rf disk iaito.dmg
26 changes: 0 additions & 26 deletions dist/macos/Metadata/Distribution

This file was deleted.

Loading