From 192a615aa9fac594afd734244b9850fcd03755d4 Mon Sep 17 00:00:00 2001
From: Jeremy Rand <jeremy@rand-family.com>
Date: Mon, 25 Jun 2018 22:54:53 -0400
Subject: [PATCH] Capture build errors in xcode

---
 make/errorFilter.sh                           | 59 +++++++++++++++++++
 make/tail.mk                                  |  6 +-
 .../TemplateInfo.plist                        |  8 +++
 .../TemplateInfo.plist                        |  8 +++
 4 files changed, 78 insertions(+), 3 deletions(-)
 create mode 100755 make/errorFilter.sh

diff --git a/make/errorFilter.sh b/make/errorFilter.sh
new file mode 100755
index 0000000..30259c1
--- /dev/null
+++ b/make/errorFilter.sh
@@ -0,0 +1,59 @@
+#!/bin/sh
+
+PWD=`pwd`
+
+$* 2> /tmp/errors.$$
+RESULT=$?
+
+if [ $RESULT -ne 0 ]
+then
+    exec /usr/bin/perl -x $0 $RESULT /tmp/errors.$$ "$PWD"
+fi
+exit 0
+
+#!/usr/bin/perl
+
+use strict;
+
+my $result = $ARGV[0];
+my $filename = $ARGV[1];
+my $pwd = $ARGV[2];
+
+open(FILE, "<$filename") || die "$0: Unable to open file, $!";
+
+my $unresolvedRefError = undef;
+
+while (<FILE>) {
+    chomp;
+
+    if (defined $unresolvedRefError) {
+        if (m/^  ([^(]+)\(([0-9]+)\)/) {
+            my $file = $1;
+            my $lineno = $2;
+
+            if (! -f "$pwd/$file") {
+                $file =~ s/\.s$/.c/;
+            }
+
+            $_ = "$pwd/$file:$lineno:0: Error: $unresolvedRefError";
+        } else {
+            $unresolvedRefError = undef;
+        }
+    }
+
+    if (m/^(Unresolved external .* referenced) in:/) {
+        $unresolvedRefError = $1;
+        $_ = "";
+    } elsif (m/^([^(]+)\(([0-9]+)\):(.*)$/) {
+        my $file = $1;
+        my $lineno = $2;
+        my $error = $3;
+
+        $_ = "$pwd/$file:$lineno:0:$error";
+    }
+    print STDERR "$_\n";
+}
+
+unlink($filename);
+
+exit($result);
diff --git a/make/tail.mk b/make/tail.mk
index 6463582..4d72c06 100644
--- a/make/tail.mk
+++ b/make/tail.mk
@@ -95,7 +95,7 @@ cleanMacCruft:
 	rm -rf pkg
 
 $(PGM): $(OBJS)
-	$(CL65) $(MACHCONFIG) --mapfile $(MAPFILE) $(LDFLAGS) -o "$(PGM)" $(OBJS)
+	make/errorFilter.sh $(CL65) $(MACHCONFIG) --mapfile $(MAPFILE) $(LDFLAGS) -o "$(PGM)" $(OBJS)
 
 $(DISKIMAGE): $(PGM)
 	make/createDiskImage $(AC) $(MACHINE) "$(DISKIMAGE)" "$(PGM)" "$(START_ADDR)" $(COPYDIRS)
@@ -104,12 +104,12 @@ execute: $(DISKIMAGE)
 	osascript make/V2Make.scpt "$(CWD)" "$(PGM)" "$(CWD)/make/DevApple.vii" "$(EXECCMD)"
 
 %.o:	%.c
-	$(CL65) $(MACHCONFIG) $(CFLAGS) --create-dep -c -o $@ $<
+	make/errorFilter.sh $(CL65) $(MACHCONFIG) $(CFLAGS) --create-dep -c -o $@ $<
 	sed -i .bak 's/\.s:/.o:/' $(@:.o=.u)
 	rm -f $(@:.o=.u).bak
 
 %.o:	%.s
-	$(CL65) $(MACHCONFIG) --cpu $(CPU) $(ASMFLAGS) -l -c -o $@ $<
+	make/errorFilter.sh $(CL65) $(MACHCONFIG) --cpu $(CPU) $(ASMFLAGS) -l -c -o $@ $<
 
 $(OBJS): Makefile
 
diff --git a/pkg/Templates/Apple II/Apple II Asm Project.xctemplate/TemplateInfo.plist b/pkg/Templates/Apple II/Apple II Asm Project.xctemplate/TemplateInfo.plist
index 6cfb521..b616654 100644
--- a/pkg/Templates/Apple II/Apple II Asm Project.xctemplate/TemplateInfo.plist	
+++ b/pkg/Templates/Apple II/Apple II Asm Project.xctemplate/TemplateInfo.plist	
@@ -10,6 +10,7 @@
 		<string>make/createDiskImage</string>
 		<string>make/DevApple.vii</string>
 		<string>make/dos33_template.dsk</string>
+		<string>make/errorFilter.sh</string>
 		<string>make/head.mk</string>
 		<string>make/prodos_template.dsk</string>
 		<string>make/tail.mk</string>
@@ -30,6 +31,13 @@
 			<key>Path</key>
 			<string>make/V2Make.scpt</string>
 		</dict>
+		<key>make/errorFilter.sh</key>
+		<dict>
+			<key>Group</key>
+			<string>make</string>
+			<key>Path</key>
+			<string>make/errorFilter.sh</string>
+		</dict>
 		<key>make/tail.mk</key>
 		<dict>
 			<key>Group</key>
diff --git a/pkg/Templates/Apple II/Apple II C Project.xctemplate/TemplateInfo.plist b/pkg/Templates/Apple II/Apple II C Project.xctemplate/TemplateInfo.plist
index f14f212..bc163ad 100644
--- a/pkg/Templates/Apple II/Apple II C Project.xctemplate/TemplateInfo.plist	
+++ b/pkg/Templates/Apple II/Apple II C Project.xctemplate/TemplateInfo.plist	
@@ -10,6 +10,7 @@
 		<string>make/createDiskImage</string>
 		<string>make/DevApple.vii</string>
 		<string>make/dos33_template.dsk</string>
+		<string>make/errorFilter.sh</string>
 		<string>make/head.mk</string>
 		<string>make/prodos_template.dsk</string>
 		<string>make/tail.mk</string>
@@ -30,6 +31,13 @@
 			<key>Path</key>
 			<string>make/V2Make.scpt</string>
 		</dict>
+		<key>make/errorFilter.sh</key>
+		<dict>
+			<key>Group</key>
+			<string>make</string>
+			<key>Path</key>
+			<string>make/errorFilter.sh</string>
+		</dict>
 		<key>make/tail.mk</key>
 		<dict>
 			<key>Group</key>