mirror of
https://github.com/jeremysrand/Apple2GSBuildPipeline.git
synced 2025-02-20 10:28:57 +00:00
Change the build action to just build the binary and the disk image. Add a default shared scheme to the project template and hook up the execute action so that a build just builds but a build and run does a build and launches the emulator. Launch the shell command directly using orca on the Xcode console using a custom scheme.
This commit is contained in:
parent
4c7835f7d5
commit
7d51c6e2cc
@ -18,6 +18,12 @@ fi
|
|||||||
|
|
||||||
cd make
|
cd make
|
||||||
|
|
||||||
$EMULATORPATH
|
# This magic ensure that clicking stop in Xcode results in the emulator terminating.
|
||||||
|
|
||||||
|
$EMULATORPATH &
|
||||||
|
PID=$!
|
||||||
|
|
||||||
|
trap 'kill $PID' SIGTERM SIGINT SIGHUP EXIT
|
||||||
|
wait
|
||||||
|
|
||||||
exit 0
|
exit 0
|
||||||
|
14
make/tail.mk
14
make/tail.mk
@ -7,11 +7,13 @@ export PATH := $(PATH):$(ORCA_BIN)
|
|||||||
CWD=$(shell pwd)
|
CWD=$(shell pwd)
|
||||||
|
|
||||||
DISKIMAGE=$(PGM).2mg
|
DISKIMAGE=$(PGM).2mg
|
||||||
ALLTARGET=execute
|
ALLTARGET=$(DISKIMAGE)
|
||||||
|
EXECTARGET=executeGUI
|
||||||
DISKIMAGEDEST=.
|
DISKIMAGEDEST=.
|
||||||
|
|
||||||
ifeq ($(TARGETTYPE),shell)
|
ifeq ($(TARGETTYPE),shell)
|
||||||
FILETYPE=exe
|
FILETYPE=exe
|
||||||
|
EXECTARGET=executeShell
|
||||||
ALLTARGET=$(PGM)
|
ALLTARGET=$(PGM)
|
||||||
else ifeq ($(TARGETTYPE),desktop)
|
else ifeq ($(TARGETTYPE),desktop)
|
||||||
FILETYPE=s16
|
FILETYPE=s16
|
||||||
@ -68,7 +70,7 @@ ALL_DEPS=$(C_DEPS) $(ASM_DEPS) $(REZ_DEPS)
|
|||||||
|
|
||||||
EXECCMD=
|
EXECCMD=
|
||||||
|
|
||||||
.PHONY: all execute clean
|
.PHONY: all execute executeShell executeGUI clean
|
||||||
|
|
||||||
.PRECIOUS: $(ASM_MACROS)
|
.PRECIOUS: $(ASM_MACROS)
|
||||||
|
|
||||||
@ -123,11 +125,13 @@ endif
|
|||||||
$(DISKIMAGE): $(PGM)
|
$(DISKIMAGE): $(PGM)
|
||||||
make/createDiskImage "$(DISKIMAGE)" "$(PGM)" "$(DISKIMAGEDEST)"
|
make/createDiskImage "$(DISKIMAGE)" "$(PGM)" "$(DISKIMAGEDEST)"
|
||||||
|
|
||||||
execute: $(DISKIMAGE)
|
execute: $(EXECTARGET)
|
||||||
make/launchEmulator
|
|
||||||
|
executeGUI: $(DISKIMAGE)
|
||||||
|
make/launchEmulator -doit
|
||||||
|
|
||||||
executeShell: $(PGM)
|
executeShell: $(PGM)
|
||||||
$(ORCA) $(PGM)
|
$(ORCA) ./$(PGM)
|
||||||
|
|
||||||
%.a: %.c
|
%.a: %.c
|
||||||
$(COMPILE) $< $(CFLAGS) --noroot
|
$(COMPILE) $< $(CFLAGS) --noroot
|
||||||
|
@ -16,6 +16,7 @@
|
|||||||
<string>make/orca-rez</string>
|
<string>make/orca-rez</string>
|
||||||
<string>make/system601.2mg</string>
|
<string>make/system601.2mg</string>
|
||||||
<string>make/tail.mk</string>
|
<string>make/tail.mk</string>
|
||||||
|
<string>../___PACKAGENAME___.xcodeproj/xcshareddata/xcschemes/___PACKAGENAME___.xcscheme</string>
|
||||||
</array>
|
</array>
|
||||||
<key>Definitions</key>
|
<key>Definitions</key>
|
||||||
<dict>
|
<dict>
|
||||||
@ -99,6 +100,15 @@
|
|||||||
<key>Path</key>
|
<key>Path</key>
|
||||||
<string>Makefile</string>
|
<string>Makefile</string>
|
||||||
</dict>
|
</dict>
|
||||||
|
<key>../___PACKAGENAME___.xcodeproj/xcshareddata/xcschemes/___PACKAGENAME___.xcscheme</key>
|
||||||
|
<dict>
|
||||||
|
<key>Group</key>
|
||||||
|
<array>
|
||||||
|
<string>Supporting Files</string>
|
||||||
|
</array>
|
||||||
|
<key>Path</key>
|
||||||
|
<string>___PACKAGENAME___.xcscheme</string>
|
||||||
|
</dict>
|
||||||
</dict>
|
</dict>
|
||||||
<key>Kind</key>
|
<key>Kind</key>
|
||||||
<string>Xcode.Xcode3.ProjectTemplateUnitKind</string>
|
<string>Xcode.Xcode3.ProjectTemplateUnitKind</string>
|
||||||
|
@ -18,6 +18,7 @@
|
|||||||
<string>make/orca-rez</string>
|
<string>make/orca-rez</string>
|
||||||
<string>make/system601.2mg</string>
|
<string>make/system601.2mg</string>
|
||||||
<string>make/tail.mk</string>
|
<string>make/tail.mk</string>
|
||||||
|
<string>../___PACKAGENAME___.xcodeproj/xcshareddata/xcschemes/___PACKAGENAME___.xcscheme</string>
|
||||||
</array>
|
</array>
|
||||||
<key>Definitions</key>
|
<key>Definitions</key>
|
||||||
<dict>
|
<dict>
|
||||||
@ -111,6 +112,15 @@
|
|||||||
<key>Path</key>
|
<key>Path</key>
|
||||||
<string>Makefile</string>
|
<string>Makefile</string>
|
||||||
</dict>
|
</dict>
|
||||||
|
<key>../___PACKAGENAME___.xcodeproj/xcshareddata/xcschemes/___PACKAGENAME___.xcscheme</key>
|
||||||
|
<dict>
|
||||||
|
<key>Group</key>
|
||||||
|
<array>
|
||||||
|
<string>Supporting Files</string>
|
||||||
|
</array>
|
||||||
|
<key>Path</key>
|
||||||
|
<string>___PACKAGENAME___.xcscheme</string>
|
||||||
|
</dict>
|
||||||
</dict>
|
</dict>
|
||||||
<key>Kind</key>
|
<key>Kind</key>
|
||||||
<string>Xcode.Xcode3.ProjectTemplateUnitKind</string>
|
<string>Xcode.Xcode3.ProjectTemplateUnitKind</string>
|
||||||
|
@ -18,6 +18,7 @@
|
|||||||
<string>make/orca-rez</string>
|
<string>make/orca-rez</string>
|
||||||
<string>make/system601.2mg</string>
|
<string>make/system601.2mg</string>
|
||||||
<string>make/tail.mk</string>
|
<string>make/tail.mk</string>
|
||||||
|
<string>../___PACKAGENAME___.xcodeproj/xcshareddata/xcschemes/___PACKAGENAME___.xcscheme</string>
|
||||||
</array>
|
</array>
|
||||||
<key>Definitions</key>
|
<key>Definitions</key>
|
||||||
<dict>
|
<dict>
|
||||||
@ -110,6 +111,15 @@
|
|||||||
<dict>
|
<dict>
|
||||||
<key>Path</key>
|
<key>Path</key>
|
||||||
<string>Makefile</string>
|
<string>Makefile</string>
|
||||||
|
</dict>
|
||||||
|
<key>../___PACKAGENAME___.xcodeproj/xcshareddata/xcschemes/___PACKAGENAME___.xcscheme</key>
|
||||||
|
<dict>
|
||||||
|
<key>Group</key>
|
||||||
|
<array>
|
||||||
|
<string>Supporting Files</string>
|
||||||
|
</array>
|
||||||
|
<key>Path</key>
|
||||||
|
<string>___PACKAGENAME___.xcscheme</string>
|
||||||
</dict>
|
</dict>
|
||||||
</dict>
|
</dict>
|
||||||
<key>Kind</key>
|
<key>Kind</key>
|
||||||
|
@ -18,6 +18,7 @@
|
|||||||
<string>make/orca-rez</string>
|
<string>make/orca-rez</string>
|
||||||
<string>make/system601.2mg</string>
|
<string>make/system601.2mg</string>
|
||||||
<string>make/tail.mk</string>
|
<string>make/tail.mk</string>
|
||||||
|
<string>../___PACKAGENAME___.xcodeproj/xcshareddata/xcschemes/___PACKAGENAME___.xcscheme</string>
|
||||||
</array>
|
</array>
|
||||||
<key>Definitions</key>
|
<key>Definitions</key>
|
||||||
<dict>
|
<dict>
|
||||||
@ -111,6 +112,15 @@
|
|||||||
<key>Path</key>
|
<key>Path</key>
|
||||||
<string>Makefile</string>
|
<string>Makefile</string>
|
||||||
</dict>
|
</dict>
|
||||||
|
<key>../___PACKAGENAME___.xcodeproj/xcshareddata/xcschemes/___PACKAGENAME___.xcscheme</key>
|
||||||
|
<dict>
|
||||||
|
<key>Group</key>
|
||||||
|
<array>
|
||||||
|
<string>Supporting Files</string>
|
||||||
|
</array>
|
||||||
|
<key>Path</key>
|
||||||
|
<string>___PACKAGENAME___.xcscheme</string>
|
||||||
|
</dict>
|
||||||
</dict>
|
</dict>
|
||||||
<key>Kind</key>
|
<key>Kind</key>
|
||||||
<string>Xcode.Xcode3.ProjectTemplateUnitKind</string>
|
<string>Xcode.Xcode3.ProjectTemplateUnitKind</string>
|
||||||
|
@ -12,6 +12,7 @@
|
|||||||
<string>make/orca-macgen</string>
|
<string>make/orca-macgen</string>
|
||||||
<string>make/orca-rez</string>
|
<string>make/orca-rez</string>
|
||||||
<string>make/tail.mk</string>
|
<string>make/tail.mk</string>
|
||||||
|
<string>../___PACKAGENAME___.xcodeproj/xcshareddata/xcschemes/___PACKAGENAME___.xcscheme</string>
|
||||||
</array>
|
</array>
|
||||||
<key>Definitions</key>
|
<key>Definitions</key>
|
||||||
<dict>
|
<dict>
|
||||||
@ -67,6 +68,15 @@
|
|||||||
<key>Path</key>
|
<key>Path</key>
|
||||||
<string>Makefile</string>
|
<string>Makefile</string>
|
||||||
</dict>
|
</dict>
|
||||||
|
<key>../___PACKAGENAME___.xcodeproj/xcshareddata/xcschemes/___PACKAGENAME___.xcscheme</key>
|
||||||
|
<dict>
|
||||||
|
<key>Group</key>
|
||||||
|
<array>
|
||||||
|
<string>Supporting Files</string>
|
||||||
|
</array>
|
||||||
|
<key>Path</key>
|
||||||
|
<string>___PACKAGENAME___.xcscheme</string>
|
||||||
|
</dict>
|
||||||
</dict>
|
</dict>
|
||||||
<key>Kind</key>
|
<key>Kind</key>
|
||||||
<string>Xcode.Xcode3.ProjectTemplateUnitKind</string>
|
<string>Xcode.Xcode3.ProjectTemplateUnitKind</string>
|
||||||
|
@ -12,6 +12,7 @@
|
|||||||
<string>make/orca-macgen</string>
|
<string>make/orca-macgen</string>
|
||||||
<string>make/orca-rez</string>
|
<string>make/orca-rez</string>
|
||||||
<string>make/tail.mk</string>
|
<string>make/tail.mk</string>
|
||||||
|
<string>../___PACKAGENAME___.xcodeproj/xcshareddata/xcschemes/___PACKAGENAME___.xcscheme</string>
|
||||||
</array>
|
</array>
|
||||||
<key>Definitions</key>
|
<key>Definitions</key>
|
||||||
<dict>
|
<dict>
|
||||||
@ -67,6 +68,15 @@
|
|||||||
<key>Path</key>
|
<key>Path</key>
|
||||||
<string>Makefile</string>
|
<string>Makefile</string>
|
||||||
</dict>
|
</dict>
|
||||||
|
<key>../___PACKAGENAME___.xcodeproj/xcshareddata/xcschemes/___PACKAGENAME___.xcscheme</key>
|
||||||
|
<dict>
|
||||||
|
<key>Group</key>
|
||||||
|
<array>
|
||||||
|
<string>Supporting Files</string>
|
||||||
|
</array>
|
||||||
|
<key>Path</key>
|
||||||
|
<string>___PACKAGENAME___.xcscheme</string>
|
||||||
|
</dict>
|
||||||
</dict>
|
</dict>
|
||||||
<key>Kind</key>
|
<key>Kind</key>
|
||||||
<string>Xcode.Xcode3.ProjectTemplateUnitKind</string>
|
<string>Xcode.Xcode3.ProjectTemplateUnitKind</string>
|
||||||
|
Loading…
x
Reference in New Issue
Block a user