From 5af0aa7f5c09f29793a0666c4b974df717386338 Mon Sep 17 00:00:00 2001
From: Jeremy Rand <jeremy@rand-family.com>
Date: Fri, 19 Jul 2019 10:51:55 -0500
Subject: [PATCH] Add merlin file templates.  Handle errors in merlin source
 better.

---
 Makefile                                      |   4 +-
 make/head.mk                                  |   5 ++-
 make/merlin-asm                               |  38 ++++++++++++++++++
 make/orca-cc                                  |   2 +-
 make/orca-rez                                 |   2 +-
 make/tail.mk                                  |   6 +--
 .../TemplateInfo.plist                        |  14 ++-----
 .../TemplateInfo.plist                        |  14 ++-----
 .../Merlin Control Panel.xctemplate/main.s    |   2 +-
 .../TemplateInfo.plist                        |  14 ++-----
 .../main.s                                    |   1 +
 .../TemplateInfo.plist                        |  14 ++-----
 .../main.s                                    |   1 +
 .../TemplateIcon.png                          | Bin 0 -> 4398 bytes
 .../TemplateIcon@2x.png                       | Bin 0 -> 6437 bytes
 .../TemplateInfo.plist                        |  20 +++++++++
 .../___FILEBASENAME___.s                      |  16 ++++++++
 pkg/createPackage                             |   6 ++-
 pkg/scripts/preinstall                        |   1 +
 19 files changed, 105 insertions(+), 55 deletions(-)
 create mode 100755 make/merlin-asm
 create mode 100644 pkg/Templates/File Templates/Apple II/Merlin Assembly File.xctemplate/TemplateIcon.png
 create mode 100644 pkg/Templates/File Templates/Apple II/Merlin Assembly File.xctemplate/TemplateIcon@2x.png
 create mode 100644 pkg/Templates/File Templates/Apple II/Merlin Assembly File.xctemplate/TemplateInfo.plist
 create mode 100755 pkg/Templates/File Templates/Apple II/Merlin Assembly File.xctemplate/___FILEBASENAME___.s

diff --git a/Makefile b/Makefile
index 2ca5f3f..4656e07 100644
--- a/Makefile
+++ b/Makefile
@@ -106,7 +106,9 @@ COPYDIRS=
 # Add any rules you want to execute before any compiles or assembly
 # commands are called here, if any.  You can generate .c, .s or .h
 # files for example.  You can generate data files.  Whatever you
-# might need.
+# might need.  You should generate these files in the $(GENDIR)
+# directory or within a subdirectory under $(GENDIR) which you create
+# yourself.
 #
 # All of your commands associated with a rule _must_ start with a tab
 # character.  Xcode makes it a bit tough to type a tab character by
diff --git a/make/head.mk b/make/head.mk
index 628bb1a..20a1aca 100644
--- a/make/head.mk
+++ b/make/head.mk
@@ -13,8 +13,9 @@ TARGETTYPE=shell
 ASSEMBLER=orcam
 
 MERLIN_DIR=/usr/local
-MERLIN_BIN=$(MERLIN_DIR)/bin/Merlin32
-MERLIN_LIB=$(MERLIN_DIR)/lib/Merlin
+export MERLIN_BIN=$(MERLIN_DIR)/bin/Merlin32
+export MERLIN_LIB=$(MERLIN_DIR)/lib/Merlin
+MERLIN_ASM=make/merlin-asm
 
 SRCDIRS=.
 
diff --git a/make/merlin-asm b/make/merlin-asm
new file mode 100755
index 0000000..9bed373
--- /dev/null
+++ b/make/merlin-asm
@@ -0,0 +1,38 @@
+#!/bin/bash
+
+ERROUTPUT=/tmp/merlin-err.$$
+
+LINKSCRIPT="$1"
+shift
+
+OUTFILE="$1"
+shift
+
+TARGETOUTPUT="$1"
+shift
+
+cleanup()
+{
+    rm -r error_output.txt
+    rm -f _FileInformation.txt
+    rm -f _Output.txt
+    rm -f "$ERROUTPUT"
+}
+
+"$MERLIN_BIN" -V "$MERLIN_LIB" "$LINKSCRIPT" 2>&1 | tee "$ERROUTPUT"
+if [ ! -f "$OUTFILE" ]
+then
+    cat error_output.txt
+    tr "'" '"' < "$ERROUTPUT" |
+        grep '\[Error\]' |
+        sed 's!^.*\[Error\] \(.*file "\([^"]*\.s\)".*line \([1-9][0-9]*\).*\)$!'`pwd`'/\2:\3:0: error: \1!' |
+        sed 's!^.*\[Error\] \(.*line \([1-9][0-9]*\).*file "\([^"]*\.s\)".*\)$!'`pwd`'/\3:\2:0: error: \1!'
+    cleanup
+    exit 1
+fi
+
+mv "$OUTFILE" "$TARGETOUTPUT"
+
+cleanup
+
+exit 0
diff --git a/make/orca-cc b/make/orca-cc
index 8c1a549..0f6b429 100755
--- a/make/orca-cc
+++ b/make/orca-cc
@@ -49,7 +49,7 @@ awk '
 
     /^ *\^/ {
         sub(/^ *\^/, "", $0)
-        printf("%s/%s:%d:0:%s\n", PWD, FILE, LINENO, $0)
+        printf("%s/%s:%d:0: error: %s\n", PWD, FILE, LINENO, $0)
     }
 ' "PWD=`pwd`" "FILE=$FILENAME" $STDOUTPUT
 
diff --git a/make/orca-rez b/make/orca-rez
index 553d06f..d5204e4 100755
--- a/make/orca-rez
+++ b/make/orca-rez
@@ -36,7 +36,7 @@ awk '
         sub(/;/,"",$4)
         LINENO=$4
         sub(/^File [^ ]*; Line [0-9][0-9]*/, "", $0)
-        printf("%s/%s:%d:0:%s\n", PWD, FILE, LINENO, $0)
+        printf("%s/%s:%d:0: error: %s\n", PWD, FILE, LINENO, $0)
     }
 ' "PWD=`pwd`" "FILE=$FILENAME" $ERROUTPUT >&2
 
diff --git a/make/tail.mk b/make/tail.mk
index 5f03635..565bacf 100644
--- a/make/tail.mk
+++ b/make/tail.mk
@@ -133,8 +133,7 @@ endif
 
 $(TARGETDIR)/$(PGM): $(BUILD_OBJS) $(ASM_SRCS)
 	$(RM) $(TARGETDIR)/$(PGM)
-	$(MERLIN_BIN) -V $(MERLIN_LIB) linkscript.s
-	$(MV) $(PGM) $(TARGETDIR)/$(PGM)
+	$(MERLIN_ASM) linkscript.s $(PGM) $(TARGETDIR)/$(PGM)
 ifneq ($(REZ_OBJS),)
 	$(CP) $(REZ_OBJS)/..namedfork/rsrc $(TARGETDIR)/$(PGM)/..namedfork/rsrc
 endif
@@ -160,8 +159,7 @@ $(BINTARGET): $(BUILD_OBJS)
 # resource compile will read the $(PGM).bin binary and load it into the
 # resources # also.
 $(BINTARGET): $(BUILD_OBJS) $(ASM_SRCS)
-	$(MERLIN_BIN) -V $(MERLIN_LIB) linkscript.s
-	$(MV) $(PGM) $(BINTARGET)
+	$(MERLIN_ASM) linkscript.s $(PGM) $(BINTARGET)
 
     endif
 
diff --git a/pkg/Templates/Apple IIgs/Merlin Classic Desk Accessory.xctemplate/TemplateInfo.plist b/pkg/Templates/Apple IIgs/Merlin Classic Desk Accessory.xctemplate/TemplateInfo.plist
index f052a1f..5db2a67 100644
--- a/pkg/Templates/Apple IIgs/Merlin Classic Desk Accessory.xctemplate/TemplateInfo.plist	
+++ b/pkg/Templates/Apple IIgs/Merlin Classic Desk Accessory.xctemplate/TemplateInfo.plist	
@@ -11,8 +11,7 @@
 		<string>make/createDiskImage</string>
 		<string>make/head.mk</string>
 		<string>make/launchEmulator</string>
-                <string>make/orca-asm</string>
-		<string>make/orca-cc</string>
+		<string>make/merlin-asm</string>
 		<string>make/orca-rez</string>
 		<string>make/system601.2mg</string>
 		<string>make/tail.mk</string>
@@ -58,19 +57,12 @@
 			<key>Path</key>
 			<string>make/launchEmulator</string>
 		</dict>
-		<key>make/orca-asm</key>
+		<key>make/merlin-asm</key>
 		<dict>
 			<key>Group</key>
 			<string>make</string>
 			<key>Path</key>
-			<string>make/orca-asm</string>
-		</dict>
-		<key>make/orca-cc</key>
-		<dict>
-			<key>Group</key>
-			<string>make</string>
-			<key>Path</key>
-			<string>make/orca-cc</string>
+			<string>make/merlin-asm</string>
 		</dict>
 		<key>make/orca-rez</key>
 		<dict>
diff --git a/pkg/Templates/Apple IIgs/Merlin Control Panel.xctemplate/TemplateInfo.plist b/pkg/Templates/Apple IIgs/Merlin Control Panel.xctemplate/TemplateInfo.plist
index cb30819..b58c84d 100644
--- a/pkg/Templates/Apple IIgs/Merlin Control Panel.xctemplate/TemplateInfo.plist	
+++ b/pkg/Templates/Apple IIgs/Merlin Control Panel.xctemplate/TemplateInfo.plist	
@@ -12,8 +12,7 @@
 		<string>make/createDiskImage</string>
 		<string>make/head.mk</string>
 		<string>make/launchEmulator</string>
-                <string>make/orca-asm</string>
-		<string>make/orca-cc</string>
+		<string>make/merlin-asm</string>
 		<string>make/orca-rez</string>
 		<string>make/system601.2mg</string>
 		<string>make/tail.mk</string>
@@ -64,19 +63,12 @@
 			<key>Path</key>
 			<string>make/launchEmulator</string>
 		</dict>
-		<key>make/orca-asm</key>
+		<key>make/merlin-asm</key>
 		<dict>
 			<key>Group</key>
 			<string>make</string>
 			<key>Path</key>
-			<string>make/orca-asm</string>
-		</dict>
-		<key>make/orca-cc</key>
-		<dict>
-			<key>Group</key>
-			<string>make</string>
-			<key>Path</key>
-			<string>make/orca-cc</string>
+			<string>make/merlin-asm</string>
 		</dict>
 		<key>make/orca-rez</key>
 		<dict>
diff --git a/pkg/Templates/Apple IIgs/Merlin Control Panel.xctemplate/main.s b/pkg/Templates/Apple IIgs/Merlin Control Panel.xctemplate/main.s
index 34fded3..efd4963 100644
--- a/pkg/Templates/Apple IIgs/Merlin Control Panel.xctemplate/main.s	
+++ b/pkg/Templates/Apple IIgs/Merlin Control Panel.xctemplate/main.s	
@@ -6,7 +6,6 @@
 * Copyright (c) ___YEAR___ ___ORGANIZATIONNAME___. All rights reserved.
 *
 
-
 ]XCODESTART     ; Keep this at the start and put your code after this
     
         mx %00
@@ -245,3 +244,4 @@ notClear
 doneEdit
         rtl
 
+]XCODEEND       ; Keep this at the end and put your code above this
diff --git a/pkg/Templates/Apple IIgs/Merlin Desktop Application.xctemplate/TemplateInfo.plist b/pkg/Templates/Apple IIgs/Merlin Desktop Application.xctemplate/TemplateInfo.plist
index f11fef3..5313c01 100644
--- a/pkg/Templates/Apple IIgs/Merlin Desktop Application.xctemplate/TemplateInfo.plist	
+++ b/pkg/Templates/Apple IIgs/Merlin Desktop Application.xctemplate/TemplateInfo.plist	
@@ -12,8 +12,7 @@
 		<string>make/createDiskImage</string>
 		<string>make/head.mk</string>
 		<string>make/launchEmulator</string>
-                <string>make/orca-asm</string>
-		<string>make/orca-cc</string>
+		<string>make/merlin-asm</string>
 		<string>make/orca-rez</string>
 		<string>make/system601.2mg</string>
 		<string>make/tail.mk</string>
@@ -64,19 +63,12 @@
 			<key>Path</key>
 			<string>make/launchEmulator</string>
 		</dict>
-		<key>make/orca-asm</key>
+		<key>make/merlin-asm</key>
 		<dict>
 			<key>Group</key>
 			<string>make</string>
 			<key>Path</key>
-			<string>make/orca-asm</string>
-		</dict>
-		<key>make/orca-cc</key>
-		<dict>
-			<key>Group</key>
-			<string>make</string>
-			<key>Path</key>
-			<string>make/orca-cc</string>
+			<string>make/merlin-asm</string>
 		</dict>
 		<key>make/orca-rez</key>
 		<dict>
diff --git a/pkg/Templates/Apple IIgs/Merlin Desktop Application.xctemplate/main.s b/pkg/Templates/Apple IIgs/Merlin Desktop Application.xctemplate/main.s
index f7f68f4..1284035 100644
--- a/pkg/Templates/Apple IIgs/Merlin Desktop Application.xctemplate/main.s	
+++ b/pkg/Templates/Apple IIgs/Merlin Desktop Application.xctemplate/main.s	
@@ -278,3 +278,4 @@ wmLastClickPt_horiz dw 0
 * Used by doQuit
 quitDCB         dw 0
 
+]XCODEEND       ; Keep this at the end and put your code above this
diff --git a/pkg/Templates/Apple IIgs/Merlin New Desk Accessory.xctemplate/TemplateInfo.plist b/pkg/Templates/Apple IIgs/Merlin New Desk Accessory.xctemplate/TemplateInfo.plist
index 31d2b07..b5b1fe2 100644
--- a/pkg/Templates/Apple IIgs/Merlin New Desk Accessory.xctemplate/TemplateInfo.plist	
+++ b/pkg/Templates/Apple IIgs/Merlin New Desk Accessory.xctemplate/TemplateInfo.plist	
@@ -12,8 +12,7 @@
 		<string>make/createDiskImage</string>
 		<string>make/head.mk</string>
 		<string>make/launchEmulator</string>
-                <string>make/orca-asm</string>
-		<string>make/orca-cc</string>
+		<string>make/merlin-asm</string>
 		<string>make/orca-rez</string>
 		<string>make/system601.2mg</string>
 		<string>make/tail.mk</string>
@@ -64,19 +63,12 @@
 			<key>Path</key>
 			<string>make/launchEmulator</string>
 		</dict>
-		<key>make/orca-asm</key>
+		<key>make/merlin-asm</key>
 		<dict>
 			<key>Group</key>
 			<string>make</string>
 			<key>Path</key>
-			<string>make/orca-asm</string>
-		</dict>
-		<key>make/orca-cc</key>
-		<dict>
-			<key>Group</key>
-			<string>make</string>
-			<key>Path</key>
-			<string>make/orca-cc</string>
+			<string>make/merlin-asm</string>
 		</dict>
 		<key>make/orca-rez</key>
 		<dict>
diff --git a/pkg/Templates/Apple IIgs/Merlin New Desk Accessory.xctemplate/main.s b/pkg/Templates/Apple IIgs/Merlin New Desk Accessory.xctemplate/main.s
index 5cafe67..baf5400 100644
--- a/pkg/Templates/Apple IIgs/Merlin New Desk Accessory.xctemplate/main.s	
+++ b/pkg/Templates/Apple IIgs/Merlin New Desk Accessory.xctemplate/main.s	
@@ -342,3 +342,4 @@ wmTaskData4         adrl 0
 wmLastClickPt_vert  dw 0
 wmLastClickPt_horiz dw 0
 
+]XCODEEND       ; Keep this at the end and put your code above this
diff --git a/pkg/Templates/File Templates/Apple II/Merlin Assembly File.xctemplate/TemplateIcon.png b/pkg/Templates/File Templates/Apple II/Merlin Assembly File.xctemplate/TemplateIcon.png
new file mode 100644
index 0000000000000000000000000000000000000000..4786b7ef439dfeb833863ca17a292160ba960023
GIT binary patch
literal 4398
zcmV+}5z+36P)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm000U^X+uL$Nkc;*
zP;zf(X>4Tx07wm;mUmPX*B8g%%xo{TU6vwc>AklFq%OTkl_m<y?gC3$)@2v4H$(*@
ziiikSBq(CQXebgZqF4wB7VH5DB1#NK5fzop#vJwcJ16=5PTn7PKJ$I|o_FWo`_35v
zC;=e?VGgVSK(<gKj`a6t#>FQv@x1^BM1TV}0C2duqR=S6Xn?LjUp6xrb&~O43j*Nv
zEr418u3H3zGns$s|L;SQD-ufpfWpxLJ03rmi*g~#S@{x?OrJ!Vo{}kJ7$ajbnjp%m
zGEV!%=70KpVow?KvV}a<N0zgQm(7!L7s?y+q<oZ-5R{AZ1pIuIZ=kH7CCwI~{03!u
zHlLFV0EQydC46o=%GM}T#L<y#l;;9Kprn1pDPOUKUx4Nb06RytL@Y>4moSaFCQKV=
zXBIPnpP$8-NG!rR+)R#`$7JVZi#Wn10DSspSrkx`)s~4C+0n+?(b2-z5-tDd^^cpM
zz5W?wz5V3zGUCskL5!X++LzcbT23thtSPiMTfS&1I{|204}j|3FPi>70OSh+Xzlyz
zdl<5LNtZ}OE>>3g`T3RtKG#xK(9i3CI(+v0d-&=+OWAp!Ysd8Ar*foO5~i%E+?=c&
zshF87;&Ay)i~k<te;xQ$T3_X19?4JTi}^zIs2Ft01j015-9nx~BFGUk1;W4U@V^ZE
zDhC;Unrjqjbsqse$r32^(E;*n55UmK07=|~?m(aW7D9{xvYQvHJ@#qtQAYRwwEtn?
zGV~SB6{Im`GCMMw$(4%pWQ^VknZW`QkOy?22DE@4Fa{RD7B~S{;0b&|5C{X&ARa6N
zT#yd3ff(e2<zNjc0wrJz*bb_}UQh=bKod9y+Q3P04qOCR!8LFb+yg^k6g&fy;5C?m
zAP5gpAsVCxX+s8(8DtBwAa}?Y3V|Y_cqkc4gM^S2S`Mv)N}zJ68rlyvK;J_rpmWe=
zs2{om4MXG5@6bCKfhjN@)`SgVE0_g)!NG7eybw-<7sE^8LU=P=1=qqy;8yq?d=<V4
z55dpiDFh&7gn{TF76=PrBVkAal8T6tl}IsCiPR!ZNC(o5Tt|kG3FIvXhoNDZ7z>Om
zCIB-Z!^JGdti+UJsxgN!t(Y#%b<8kk67vyD#cE*9urAm@Y#cTXn~yERR$}Y1E!Yd#
zo7hq8Ya9;8z!~A3Z~?e@Tn26#t`xT$*Ni)h>&K1Yrto;Y8r}@=h7ZGY@Dh9xekcA2
z{tSKqKZ<`tAQQ9+wgf*y0zpVvOQ<9qCY&Y=5XJ~IL<OP&(S;aB<Pnz;%ZPQv4q_j1
zlsH3DBpH$1NYSJW(i&0~sfl!fbf5H+OeX7+oyieo0eLmKihPuOi9AexOHrbjQrMJ4
zij=aMa*%SCa)<JgN~Ic7J*f#)33W5IfqI_$korcBCTA%ZD94jqC08TYDmNhaT%IUz
zAnzr=NPek&rTlUEKKTg+qJp6UTY;mnQlUoSgu<Z0lp;;hMlnn=Td`E}u;OLKCrWrF
zLnU7&o>HOG0j2XwBQ%7jM`P2tv~{#P+6CGu9Y;5!2hua>CG_v;z4S?CC1rc%807-x
z8s$^ULkxsr$OvR)G0GUn7`GVjR5Vq*RQM{JRGL%<RHjwusCugMRf|=dRd1@kQ)8<6
zs%5HeRcljwppH>DRgX~5SKp(4L49HleU9rK?wsN|$L8GCfHh1tA~lw29MI^|n9|hJ
z^w$(=?$kW5IibbS^3=-Es?a*EHLgw5cGnhYS7@Kne#%s4dNH$@Rm?8tq>hG8fR0pW
zzfP~tjINRHeBHIW&AJctNO~;2RJ{tlPQ6KeZT(RF<@$~KcMXUJEQ54|9R}S7(}qTd
zv4$HA+YFx=sTu_uEj4O1x^GN1_Ap*-Tx)#81ZToB$u!w*a?KPrbudjgtugI0gUuYx
z1ZKO<`pvQC&gMe%TJu2*iiMX&o<*a@uqDGX#B!}=o8@yWeX9hktybMuAFUm%v#jf^
z@7XBX1lg>$>9G0T*3_13TVs2}j%w#;x5}>F?uEUXJ>Pzh{cQ)DL#V?BhfaqNj!uqZ
z$0o;dCw-@6r(I5iEIKQkRm!^LjCJ;QUgdn!`K^nii^S!a%Wtk0u9>cfU7yS~n#-SC
zH+RHM*Nx-0-)+d9>7MMq&wa>4$AjZh>+#4_&y(j_?>XjW;+5fb#Ot}YwYS*2#e16V
z!d}5X>x20C`xN{1`YQR(_pSDQ=%?$K=GW*q>F?mb%>QfvHXt})YrtTjW*|4PA#gIt
zDQHDdS1=_wD!4lMQHW`XIHV&K4h;(37J7f4!93x-wlEMD7`83!LAX));_x3Ma1r4V
zH4%>^Z6cRPc1O{olA;bry^i*dE{nc5-*~=serJq)Okzw!%yg_zY<cWZoK@V4xU2E%
z@q+mF1bjkFLVd#20^bGO7mOx4Bo-y!T4=PeVBzIO>Wi`#ol25V;v^kU#wN!mA5MPH
z3FFjqrcwe^cBM>m+1wr6XFN|{1#g`1#xLiOrMjh-r#?w@OWT$<p6-!enLZ(43#tV#
zG6FL8W=v;>Wgg6&&5F%x&L(6hXP*!%2{VOVIa)adIsGCtQITk9vCHD^izmgw;`&@D
zcVTY3gpU49^+=7S>!rha?s+wNZ}MaEj~6Hw2n%|am@e70WNfM5(r=exmT{MLF4tMU
zX8G_6uNC`OLMu~NcCOM}Rk&(&wg2ivYe;J{*Zj2BdTsgISL<TebrfnAt}Yx|@4vpW
zNUlg+G`PWa!`_XUje?E6o9s62-1M=SSA3<!x}>t?eJQu}$~QLORDCnMIdyYynPb_W
zEx0YhEw{FMY&}%2SiZD;WLxOA)(U1tamB0cN!u@1+E?z~LE0hRF;o>&)xJ}I=a!xC
ztJAA*)_B)6@6y<{Y1i~_-tK`to_m`1YVIxB`);3L-|hYW`&(-bYby`n4&)tpTo+T<
z{VnU;hI;k-lKKw^g$IWYMIP#EaB65ctZ}%k5pI+=jvq-pa_u{x@7kLzn)Wv{noEv?
zqtc^Kzfb=D*0JDYoyS?nn|?6(VOI;SrMMMpUD7()mfkkh9^c-7BIrbChiga6kCs0k
zJgIZC=9KcOveTr~g{NoFEIl)IR&;jaT-v#j&ZN$J=i|=b=!)p-y%2oi(nY_E=exbS
z&s=i5bn>#x<r7y}SK6*RUTy7h=xO=M;ir~f$KKXHr@r=U&euBn=k}i-@EACE-RJtn
z8-X{j-kf){|JM9lw+9mkhi>z3Ke>~2=f&N;yEFGz-^boBexUH6@}b7V+Mi8+ZXR+R
zIyLMw-18{v(Y+Dw$g^K^e|bMz_?Y^*a!h-y;fd{&ljDBl*PbqTI{HlXY-Xb9SH)j<
zJvV;-!*8Cy^-RW1j=m7TnEk!<rP|Abuk2rSPK8fBe4YJzX1e%|+M7dfS#P`F#l9Px
z$$yW3U-iM{L&wM9kN0P@XJ`Ka1DNyt5f0H{000K1Nkl<ZXa((BZD^Hc7{0f&ot<-b
zc63XoO_rKd)Tk`V1q-4t@`wLS)L9^v?ME<S6$EP(2E|5<i7SO*EGa2k^&=C4NHi?1
z>5mjmotkU7FOS>KwsW?#o%42G@Aho(&UxRn^SL0p;okGS&*yzT_s4U;?^%|ZQx=--
z;HBVPFrVWkZF*oB<s^6<902>lY*YQHrcPFZWn<~Py1Tpk64^r2G$Dt>;R#S+Y;3G=
zU|`^KM@Pqr>gwvRhlYlFupYsr4TKp0w&j3Jy<YD%lyQ*~o`a`B5QqST`2Bvd*=$$p
z>+AQnwzi(akWnzTkuq5UpxLY%9v=QP-W@13NdZwHLZOfZgF*56eBy98ybTQvRfi58
z`Vm8i!6}2V0zmt}HxLM1L>U*E0bm;eC=f6q$<NRCH8nN8*4WtiJr?$XLvd|jF(@Vg
zoLt-hxPBxEnh;rmfJP-ND@&YCr@y(mxn|$KeQlUF2u>OVZQYWxv+2w6lMw)CQCKpG
zeR+9#GCn>o1qB5zIQ4!!yJ~A|KSTEbm=P;siU~k%p75&E6X3Wr0H}%F++5uscrY-f
zysE0I252L{rl#f-O!0!LiIgK0k1P+o9-C^3GR#FIPfkwijBu(U5@{nNBifxiceKvV
zPQ4$R(BNYlB3<a<!Gj-Qzq`RaP&2bebNn;|0BTQ|jDQswf}pT)Vy&yIOJ9?H1VM1P
zE5a=;Ee9ata&V#-XB4uO08lywLII#QC@h><>*?v4ITZFIQ0RRCp&dDLqy^HHCIZ4t
zU2N0CD0WIH3aO*OJXM_&ndrbO60y!pjwOly;c~g8y}iAyva<3`^xZ=91bB8a4ve6T
z0N@^GAaLTk(9np$taRojXJpRn?d?6bYuB!7nB3o3Dkg}G0Wg9vf`NJIf)fM*v1A*W
zb!vow`uqET*t~i39{3LPCx%#4O(YiRDOD0=495(iG#B0pWTY25Bb<uc?UusALh*P!
zQc_a#92~nE+vS7J4qBHaqX3M88|wtYJAy#$cDv53=j7z*Z3KdQLdwg_Uj^R-NiD-`
zMgj1MjDknj`Ai^W3U6eBfL1(pb#+^@jDt&Yy-3P90B#s5xDrCOQzJ?%3J^=A98y|Z
zT7mISE~Dld%b2NzabT)-3agx13C?F#SL>^1HNLpGxD0(t0|YV0nHLNI1yn+@PBK0#
z!P!o25F8n%RD>qW+c_fuyu%aHcDhe4b@^prbV6Kqn=CKNlV=|+lJYek$~dn!6gWgG
zH-_85rY2<8$hM?!;&;EiAxF>MmTiv}%TxCkiajS=&R+LP%TL|X<sFxbb&KTlz4u{@
zSrGce^dDtrs*TTZ?)7-S4vu-LsW}9oXQP;$5WU`dMcee&@0xcw7&Q-RkG7-ng0`;u
z*Qh>~JDHWtmmm)TP^PE@Pg@ka**_-VoavXHk1v%XH%)df!K~%uJ!{3|indysi{iPn
zru-zb&G;O>nz1*5`pHX!62@8i{MK)Wg#h--(@guV$>_}1qh@>3rU9pYYN;<y^~jm4
zd{;N8J<lvR??|#WZ2-1ByhI9|Ht~;#WoOd`scF3`j7FKJv;lBH15LZvh~1Wj%u;lJ
zsHi<FZyfH(D3B<x#)+jAMt_DcQ0U&l;LPDWa<gU2BTMA%tt(`4ezb$n478}gFE*fy
zVU&x`xrx&bfHDL_VQD_rC5KP+$l&Pg*AlnGCUwuRl<gJ#W*k2)H~=LYfgAvkPmlMA
zFE9m!pNZbtwn}zC89N%OHCX;@0F)3TV<CC3?S_2yOP?NUsflwRJ_>({&jn)vh;IcY
zNs=W6u79CS-mhG(I~V~SKhH0UsZ-hj)PH+3X8fn9J8(;{Eph2mPcl@cfzk$miQ0GV
zx91gUS)pCm!p4;a^Nx*YK-vI!N2XHf%eVMTk~z_-|M+V}9$Mwr(`)lliM6H;0He%U
zFf7{}F9`2~NMhg1AK~{BM4|mJt&QwX`Z;a)z{!h)(sZ;_&UcQ=B(k~(R=8zTnMdfr
z*Lnl;8}g&o%be2iVp+ncA1ex_4S+gAn#t+QKDiE|hy0UzYF)g@E>CP&EKE0&p#=qy
zjDYjai3K3JBbjf<1?>MHzycn&=~n+)4KU}PP3TRrFKA=bdw|;A>ZP6leDMB_C>MdP
z#;J8ORWb)30`nz%&WnuN(Ci*yA5DuNxA;+&CC6EfMOQ|M0xL`4KZsBZQ5m3>P)cC+
oNzZCrMkF^Zsz9jUkE68k4_*0hW|VUxt^fc407*qoM6N<$g8Eos#Q*>R

literal 0
HcmV?d00001

diff --git a/pkg/Templates/File Templates/Apple II/Merlin Assembly File.xctemplate/TemplateIcon@2x.png b/pkg/Templates/File Templates/Apple II/Merlin Assembly File.xctemplate/TemplateIcon@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..21d5bd1b9a354a904f73f068e05b70c8ad942e47
GIT binary patch
literal 6437
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

literal 0
HcmV?d00001

diff --git a/pkg/Templates/File Templates/Apple II/Merlin Assembly File.xctemplate/TemplateInfo.plist b/pkg/Templates/File Templates/Apple II/Merlin Assembly File.xctemplate/TemplateInfo.plist
new file mode 100644
index 0000000..590728d
--- /dev/null
+++ b/pkg/Templates/File Templates/Apple II/Merlin Assembly File.xctemplate/TemplateInfo.plist	
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+    <dict>
+        <key>AllowedTypes</key>
+        <array>
+            <string>com.rand-family.xcode.merlin</string>
+        </array>
+	<key>DefaultCompletionName</key>
+	<string>File</string>
+	<key>Description</key>
+	<string>A Merlin assembly source file.</string>
+	<key>Kind</key>
+	<string>Xcode.IDEKit.TextSubstitutionFileTemplateKind</string>
+	<key>MainTemplateFile</key>
+	<string>___FILEBASENAME___.s</string>
+	<key>Summary</key>
+	<string>A Merlin assembly source file</string>
+    </dict>
+</plist>
diff --git a/pkg/Templates/File Templates/Apple II/Merlin Assembly File.xctemplate/___FILEBASENAME___.s b/pkg/Templates/File Templates/Apple II/Merlin Assembly File.xctemplate/___FILEBASENAME___.s
new file mode 100755
index 0000000..1253eab
--- /dev/null
+++ b/pkg/Templates/File Templates/Apple II/Merlin Assembly File.xctemplate/___FILEBASENAME___.s	
@@ -0,0 +1,16 @@
+*
+*  ___FILENAME___
+*  ___PROJECTNAME___
+*
+*  Created by ___FULLUSERNAME___ on ___DATE___.
+*  ___COPYRIGHT___
+*
+
+]XCODESTART     ; Keep this at the start and put your code after this
+
+* Put your code here.  We need these markers to convince Xcode to indent
+* properly.  If you delete them or put your code outside the markers, your
+* build will work but the Xcode editor will be annoying.
+
+]XCODEEND       ; Keep this at the end and put your code above this
+
diff --git a/pkg/createPackage b/pkg/createPackage
index 359bbc9..ae47b2b 100755
--- a/pkg/createPackage
+++ b/pkg/createPackage
@@ -34,14 +34,19 @@ do
     SUPPORTS_RES_MODE=`echo $PROJECT | awk -F: '{print $4}'`
     SUPPORTS_MESSAGE_CENTER=`echo $PROJECT | awk -F: '{print $5}'`
 
+    cp -R make "${TMPDIR}/Templates/Apple IIgs/${PROJECT_NAME}.xctemplate/"
+
     if [ $SHELL_TYPE = merlin ]
     then
         sed "
             /^# TARGETTYPE=${PROJECT_TYPE}/s/^# //" Makefile.merlin > "${TMPDIR}/Templates/Apple IIgs/${PROJECT_NAME}.xctemplate/Makefile"
+        rm -f "${TMPDIR}/Templates/Apple IIgs/${PROJECT_NAME}.xctemplate/make/orca-asm"
+        rm -f "${TMPDIR}/Templates/Apple IIgs/${PROJECT_NAME}.xctemplate/make/orca-cc"
     else
         sed "
             /^# TARGETTYPE=${PROJECT_TYPE}/s/^# //
             /^# export ORCA=.*\/${SHELL_TYPE}$/s/^# //" Makefile > "${TMPDIR}/Templates/Apple IIgs/${PROJECT_NAME}.xctemplate/Makefile"
+        rm -f "${TMPDIR}/Templates/Apple IIgs/${PROJECT_NAME}.xctemplate/make/merlin-asm"
     fi
 
     if [ "$SUPPORTS_RES_MODE" -eq 1 ]
@@ -54,7 +59,6 @@ do
 	sed -i "" 's/^# MESSAGE_CENTER=.*$/MESSAGE_CENTER=___VARIABLE_MESSAGECENTER___/' "${TMPDIR}/Templates/Apple IIgs/${PROJECT_NAME}.xctemplate/Makefile"
     fi
 
-    cp -R make "${TMPDIR}/Templates/Apple IIgs/${PROJECT_NAME}.xctemplate/"
 done < $PROJECTS
 
 rm -f $PROJECTS
diff --git a/pkg/scripts/preinstall b/pkg/scripts/preinstall
index e0f655a..0e40919 100755
--- a/pkg/scripts/preinstall
+++ b/pkg/scripts/preinstall
@@ -2,5 +2,6 @@
 
 rm -rf "$2/Templates/Apple IIgs"
 rm -rf "$2/Templates/File Templates/Apple IIgs"
+rm -rf "$2/Templates/File Templates/Apple II/Merlin Assembly File.xctemplate"
 rm -rf "$2/Plug-ins/OrcaM.ideplugin"