drinkingtea/jasper
drinkingtea/jasper
2
0
Fork 0
Code Issues 2 Pull Requests Actions Releases Activity

Compare commits

base: drinkingtea:9123a328ac938156f1080a513dba1ed59d2d0378
Branches Tags
drinkingtea:master
...
compare: drinkingtea:61f8784587d551be238a01a6951a69f2425f5a6d
Branches Tags
drinkingtea:master

3 Commits
9123a328ac ... 61f8784587

Author SHA1 Message Date
Gary Talent
61f8784587 [jasper] Add pkg-mac command to Makefile
All checks were successful
Build / build (push) Successful in 1m30s
Details
2025-05-15 22:28:58 -05:00
Gary Talent
3b2d04003f Merge commit 'e2ca6389a9ffdfc23325faf7d73779887917680d' 2025-05-15 22:27:30 -05:00
Gary Talent
e2ca6389a9 Squashed 'deps/nostalgia/' changes from 0de428a2..00e52b64 
00e52b64 [nostalgia] Make pkg-dmg more versatile
ae404879 [nostalgia/gfx] Add navigateTo handler to TileSheetEditor
84b612c6 [studio/modlib] Give navigateTo a default argument
3c2a6b04 [studio/applib] Make navigateTo handle UUID paths
626da322 [ox/std] Add StringParam(IString const&) constructor

git-subtree-dir: deps/nostalgia
git-subtree-split: 00e52b649141b3daffd9a10b0320b142499c536f
 2025-05-15 22:27:30 -05:00
3 changed files with 11 additions and 5 deletions
Show Stats Expand all files Collapse all files

8
Makefile
View File

@ -16,7 +16,11 @@ endif
.PHONY: pkg-gba .PHONY: pkg-gba
pkg-gba: build pkg-gba: build
${BC_CMD_ENVRUN} ${BC_PY3} ./deps/nostalgia/util/scripts/pkg-gba.py project ${BC_VAR_PROJECT_NAME_CAP} ${BC_CMD_ENVRUN} ${BC_PY3} deps/nostalgia/util/scripts/pkg-gba.py project ${BC_VAR_PROJECT_NAME_CAP}
.PHONY: pkg-mac
pkg-mac: install
${BC_CMD_ENVRUN} ${BC_PY3} deps/nostalgia/util/scripts/pkg-dmg.py JasperStudio
.PHONY: build-player .PHONY: build-player
build-player: build-player:
@ -60,4 +64,4 @@ git-push-nostalgia:
.PHONY: generate-studio-rsrc .PHONY: generate-studio-rsrc
generate-studio-rsrc: generate-studio-rsrc:
${BC_CMD_ENVRUN} ${BC_PY3} ./deps/nostalgia/util/scripts/file-to-cpp.py --rsrc src/jasper/tools/rsrc.json ${BC_CMD_ENVRUN} ${BC_PY3} deps/nostalgia/util/scripts/file-to-cpp.py --rsrc src/jasper/tools/rsrc.json

2
deps/nostalgia/Makefile vendored
View File

@ -19,7 +19,7 @@ pkg-gba: build
.PHONY: pkg-mac .PHONY: pkg-mac
pkg-mac: install pkg-mac: install
${BC_CMD_ENVRUN} ${BC_PY3} ./util/scripts/pkg-dmg.py ${BC_CMD_ENVRUN} ${BC_PY3} ./util/scripts/pkg-dmg.py NostalgiaStudio
.PHONY: generate-studio-rsrc .PHONY: generate-studio-rsrc
generate-studio-rsrc: generate-studio-rsrc:

6
deps/nostalgia/util/scripts/pkg-dmg.py vendored
View File

@ -5,6 +5,8 @@ import shutil
import subprocess import subprocess
import sys import sys
target_name = sys.argv[1]
def rm(path: str): def rm(path: str):
file_exists = os.path.exists(path) file_exists = os.path.exists(path)
is_link = os.path.islink(path) is_link = os.path.islink(path)
@ -26,12 +28,12 @@ def run(args: list[str]):
dmg_dir = 'dist/darwin-arm64-release/NostalgiaStudio' dmg_dir = f'dist/darwin-arm64-release/{target_name}'
dmg = f'{dmg_dir}.dmg' dmg = f'{dmg_dir}.dmg'
rm(dmg) rm(dmg)
rm(dmg_dir) rm(dmg_dir)
mkdir_p(dmg_dir) mkdir_p(dmg_dir)
shutil.copytree('dist/darwin-arm64-release/NostalgiaStudio.app', f'{dmg_dir}/NostalgiaStudio.app') shutil.copytree(f'dist/darwin-arm64-release/{target_name}.app', f'{dmg_dir}/{target_name}.app')
os.symlink('/Applications', f'{dmg_dir}/Applications') os.symlink('/Applications', f'{dmg_dir}/Applications')
run(['hdiutil', 'create', '-srcfolder', dmg_dir, dmg]) run(['hdiutil', 'create', '-srcfolder', dmg_dir, dmg])
rm(dmg_dir) rm(dmg_dir)