Create a disk image with the built executable copied onto it. Launch an emulator booting that disk image

This commit is contained in:
Jeremy Rand 2017-07-17 00:53:56 -04:00
parent 94f3f12c24
commit 85a4ae7112
7 changed files with 160 additions and 14 deletions

View File

@ -55,5 +55,15 @@ ASMFLAGS+=
# Add any arguments you want passed to the linker to this variable: # Add any arguments you want passed to the linker to this variable:
LDFLAGS+= LDFLAGS+=
# By default, the build expects that you have GSplus in the path:
# /Applications/GSplus.app/Contents/MacOS/gsplus
# If you have it in a different location, specify that here.
# GSPLUS=/Applications/GSplus.app/Contents/MacOS/gsplus
# By default, the build expects that you have GSport in the path:
# /Applications/GSport/GSport.app/Contents/MacOS/GSport
# If you have it in a different location, specify that here.
# GSPORT=/Applications/GSport/GSport.app/Contents/MacOS/GSport
# Do not change anything else below here... # Do not change anything else below here...
include make/tail.mk include make/tail.mk

View File

@ -37,3 +37,9 @@ CHTYP=$(ORCA) chtyp
RM=rm -f RM=rm -f
CP=cp CP=cp
GSPLUS=/Applications/GSplus.app/Contents/MacOS/gsplus
GSPORT=/Applications/GSport/GSport.app/Contents/MacOS/GSport
export GSPLUS
export GSPORT

View File

@ -6,21 +6,31 @@ export PATH := $(PATH):$(ORCA_BIN)
CWD=$(shell pwd) CWD=$(shell pwd)
DISKIMAGE=$(PGM).2mg
ALLTARGET=execute
DISKIMAGEDEST=.
ifeq ($(TARGETTYPE),shell) ifeq ($(TARGETTYPE),shell)
FILETYPE=exe FILETYPE=exe
ALLTARGET=$(PGM)
else ifeq ($(TARGETTYPE),desktop) else ifeq ($(TARGETTYPE),desktop)
FILETYPE=s16 FILETYPE=s16
else ifeq ($(TARGETTYPE),cda) else ifeq ($(TARGETTYPE),cda)
FILETYPE=cda FILETYPE=cda
DISKIMAGEDEST=System/Desk.Accs
else ifeq ($(TARGETTYPE),cdev) else ifeq ($(TARGETTYPE),cdev)
BINTARGET=$(PGM).bin BINTARGET=$(PGM).bin
FILETYPE=199 FILETYPE=199
DISKIMAGEDEST=System/CDevs
else ifeq ($(TARGETTYPE),nba) else ifeq ($(TARGETTYPE),nba)
FILETYPE=exe FILETYPE=exe
ALLTARGET=$(PGM)
else ifeq ($(TARGETTYPE),nda) else ifeq ($(TARGETTYPE),nda)
FILETYPE=nda FILETYPE=nda
DISKIMAGEDEST=System/Desk.Accs
else ifeq ($(TARGETTYPE),xcmd) else ifeq ($(TARGETTYPE),xcmd)
FILETYPE=exe FILETYPE=exe
ALLTARGET=$(PGM)
endif endif
ifeq ($(wildcard $(ROOTCFILE)),) ifeq ($(wildcard $(ROOTCFILE)),)
@ -58,14 +68,6 @@ ALL_DEPS=$(C_DEPS) $(ASM_DEPS) $(REZ_DEPS)
EXECCMD= EXECCMD=
#ALLTARGET=$(DISKIMAGE)
#ifeq ($(TARGETTYPE),shell)
# ALLTARGET=execute
#else
# ALLTARGET=$(PGM)
#endif
ALLTARGET=$(PGM)
.PHONY: all execute clean .PHONY: all execute clean
.PRECIOUS: $(ASM_MACROS) .PRECIOUS: $(ASM_MACROS)
@ -78,7 +80,7 @@ clean:
$(RM) $(ALL_ROOTS) $(RM) $(ALL_ROOTS)
$(RM) $(ALL_DEPS) $(RM) $(ALL_DEPS)
$(RM) $(ASM_MACROS) $(RM) $(ASM_MACROS)
# $(RM) "$(DISKIMAGE)" $(RM) "$(DISKIMAGE)"
createPackage: createPackage:
pkg/createPackage pkg/createPackage
@ -118,13 +120,13 @@ $(PGM): $(REZ_OBJS)
endif endif
#$(DISKIMAGE): $(PGM) $(DISKIMAGE): $(PGM)
# make/createDiskImage $(AC) $(MACHINE) "$(DISKIMAGE)" "$(PGM)" "$(START_ADDR)" make/createDiskImage "$(DISKIMAGE)" "$(PGM)" "$(DISKIMAGEDEST)"
#execute: $(DISKIMAGE) execute: $(DISKIMAGE)
# osascript make/V2Make.scpt "$(CWD)" "$(PGM)" "$(CWD)/make/DevApple.vii" "$(EXECCMD)" make/launchEmulator
execute: $(PGM) executeShell: $(PGM)
$(ORCA) $(PGM) $(ORCA) $(PGM)
%.a: %.c %.a: %.c

View File

@ -6,11 +6,15 @@
<array> <array>
<string>main.c</string> <string>main.c</string>
<string>Makefile</string> <string>Makefile</string>
<string>make/config.txt</string>
<string>make/createDiskImage</string>
<string>make/head.mk</string> <string>make/head.mk</string>
<string>make/launchEmulator</string>
<string>make/orca-asm</string> <string>make/orca-asm</string>
<string>make/orca-cc</string> <string>make/orca-cc</string>
<string>make/orca-macgen</string> <string>make/orca-macgen</string>
<string>make/orca-rez</string> <string>make/orca-rez</string>
<string>make/system601.2mg</string>
<string>make/tail.mk</string> <string>make/tail.mk</string>
</array> </array>
<key>Definitions</key> <key>Definitions</key>
@ -20,6 +24,20 @@
<key>Path</key> <key>Path</key>
<string>main.c</string> <string>main.c</string>
</dict> </dict>
<key>make/config.txt</key>
<dict>
<key>Group</key>
<string>make</string>
<key>Path</key>
<string>make/config.txt</string>
</dict>
<key>make/createDiskImage</key>
<dict>
<key>Group</key>
<string>make</string>
<key>Path</key>
<string>make/createDiskImage</string>
</dict>
<key>make/head.mk</key> <key>make/head.mk</key>
<dict> <dict>
<key>Group</key> <key>Group</key>
@ -27,6 +45,13 @@
<key>Path</key> <key>Path</key>
<string>make/head.mk</string> <string>make/head.mk</string>
</dict> </dict>
<key>make/launchEmulator</key>
<dict>
<key>Group</key>
<string>make</string>
<key>Path</key>
<string>make/launchEmulator</string>
</dict>
<key>make/orca-asm</key> <key>make/orca-asm</key>
<dict> <dict>
<key>Group</key> <key>Group</key>
@ -55,6 +80,13 @@
<key>Path</key> <key>Path</key>
<string>make/orca-rez</string> <string>make/orca-rez</string>
</dict> </dict>
<key>make/system601.2mg</key>
<dict>
<key>Group</key>
<string>make</string>
<key>Path</key>
<string>make/system601.2mg</string>
</dict>
<key>make/tail.mk</key> <key>make/tail.mk</key>
<dict> <dict>
<key>Group</key> <key>Group</key>

View File

@ -8,11 +8,15 @@
<string>main.h</string> <string>main.h</string>
<string>main.rez</string> <string>main.rez</string>
<string>Makefile</string> <string>Makefile</string>
<string>make/config.txt</string>
<string>make/createDiskImage</string>
<string>make/head.mk</string> <string>make/head.mk</string>
<string>make/launchEmulator</string>
<string>make/orca-asm</string> <string>make/orca-asm</string>
<string>make/orca-cc</string> <string>make/orca-cc</string>
<string>make/orca-macgen</string> <string>make/orca-macgen</string>
<string>make/orca-rez</string> <string>make/orca-rez</string>
<string>make/system601.2mg</string>
<string>make/tail.mk</string> <string>make/tail.mk</string>
</array> </array>
<key>Definitions</key> <key>Definitions</key>
@ -32,6 +36,20 @@
<key>Path</key> <key>Path</key>
<string>main.rez</string> <string>main.rez</string>
</dict> </dict>
<key>make/config.txt</key>
<dict>
<key>Group</key>
<string>make</string>
<key>Path</key>
<string>make/config.txt</string>
</dict>
<key>make/createDiskImage</key>
<dict>
<key>Group</key>
<string>make</string>
<key>Path</key>
<string>make/createDiskImage</string>
</dict>
<key>make/head.mk</key> <key>make/head.mk</key>
<dict> <dict>
<key>Group</key> <key>Group</key>
@ -39,6 +57,13 @@
<key>Path</key> <key>Path</key>
<string>make/head.mk</string> <string>make/head.mk</string>
</dict> </dict>
<key>make/launchEmulator</key>
<dict>
<key>Group</key>
<string>make</string>
<key>Path</key>
<string>make/launchEmulator</string>
</dict>
<key>make/orca-asm</key> <key>make/orca-asm</key>
<dict> <dict>
<key>Group</key> <key>Group</key>
@ -67,6 +92,13 @@
<key>Path</key> <key>Path</key>
<string>make/orca-rez</string> <string>make/orca-rez</string>
</dict> </dict>
<key>make/system601.2mg</key>
<dict>
<key>Group</key>
<string>make</string>
<key>Path</key>
<string>make/system601.2mg</string>
</dict>
<key>make/tail.mk</key> <key>make/tail.mk</key>
<dict> <dict>
<key>Group</key> <key>Group</key>

View File

@ -8,11 +8,15 @@
<string>main.h</string> <string>main.h</string>
<string>main.rez</string> <string>main.rez</string>
<string>Makefile</string> <string>Makefile</string>
<string>make/config.txt</string>
<string>make/createDiskImage</string>
<string>make/head.mk</string> <string>make/head.mk</string>
<string>make/launchEmulator</string>
<string>make/orca-asm</string> <string>make/orca-asm</string>
<string>make/orca-cc</string> <string>make/orca-cc</string>
<string>make/orca-macgen</string> <string>make/orca-macgen</string>
<string>make/orca-rez</string> <string>make/orca-rez</string>
<string>make/system601.2mg</string>
<string>make/tail.mk</string> <string>make/tail.mk</string>
</array> </array>
<key>Definitions</key> <key>Definitions</key>
@ -32,6 +36,20 @@
<key>Path</key> <key>Path</key>
<string>main.rez</string> <string>main.rez</string>
</dict> </dict>
<key>make/config.txt</key>
<dict>
<key>Group</key>
<string>make</string>
<key>Path</key>
<string>make/config.txt</string>
</dict>
<key>make/createDiskImage</key>
<dict>
<key>Group</key>
<string>make</string>
<key>Path</key>
<string>make/createDiskImage</string>
</dict>
<key>make/head.mk</key> <key>make/head.mk</key>
<dict> <dict>
<key>Group</key> <key>Group</key>
@ -39,6 +57,13 @@
<key>Path</key> <key>Path</key>
<string>make/head.mk</string> <string>make/head.mk</string>
</dict> </dict>
<key>make/launchEmulator</key>
<dict>
<key>Group</key>
<string>make</string>
<key>Path</key>
<string>make/launchEmulator</string>
</dict>
<key>make/orca-asm</key> <key>make/orca-asm</key>
<dict> <dict>
<key>Group</key> <key>Group</key>
@ -67,6 +92,13 @@
<key>Path</key> <key>Path</key>
<string>make/orca-rez</string> <string>make/orca-rez</string>
</dict> </dict>
<key>make/system601.2mg</key>
<dict>
<key>Group</key>
<string>make</string>
<key>Path</key>
<string>make/system601.2mg</string>
</dict>
<key>make/tail.mk</key> <key>make/tail.mk</key>
<dict> <dict>
<key>Group</key> <key>Group</key>

View File

@ -8,11 +8,15 @@
<string>main.h</string> <string>main.h</string>
<string>main.rez</string> <string>main.rez</string>
<string>Makefile</string> <string>Makefile</string>
<string>make/config.txt</string>
<string>make/createDiskImage</string>
<string>make/head.mk</string> <string>make/head.mk</string>
<string>make/launchEmulator</string>
<string>make/orca-asm</string> <string>make/orca-asm</string>
<string>make/orca-cc</string> <string>make/orca-cc</string>
<string>make/orca-macgen</string> <string>make/orca-macgen</string>
<string>make/orca-rez</string> <string>make/orca-rez</string>
<string>make/system601.2mg</string>
<string>make/tail.mk</string> <string>make/tail.mk</string>
</array> </array>
<key>Definitions</key> <key>Definitions</key>
@ -32,6 +36,20 @@
<key>Path</key> <key>Path</key>
<string>main.rez</string> <string>main.rez</string>
</dict> </dict>
<key>make/config.txt</key>
<dict>
<key>Group</key>
<string>make</string>
<key>Path</key>
<string>make/config.txt</string>
</dict>
<key>make/createDiskImage</key>
<dict>
<key>Group</key>
<string>make</string>
<key>Path</key>
<string>make/createDiskImage</string>
</dict>
<key>make/head.mk</key> <key>make/head.mk</key>
<dict> <dict>
<key>Group</key> <key>Group</key>
@ -39,6 +57,13 @@
<key>Path</key> <key>Path</key>
<string>make/head.mk</string> <string>make/head.mk</string>
</dict> </dict>
<key>make/launchEmulator</key>
<dict>
<key>Group</key>
<string>make</string>
<key>Path</key>
<string>make/launchEmulator</string>
</dict>
<key>make/orca-asm</key> <key>make/orca-asm</key>
<dict> <dict>
<key>Group</key> <key>Group</key>
@ -67,6 +92,13 @@
<key>Path</key> <key>Path</key>
<string>make/orca-rez</string> <string>make/orca-rez</string>
</dict> </dict>
<key>make/system601.2mg</key>
<dict>
<key>Group</key>
<string>make</string>
<key>Path</key>
<string>make/system601.2mg</string>
</dict>
<key>make/tail.mk</key> <key>make/tail.mk</key>
<dict> <dict>
<key>Group</key> <key>Group</key>