From 79c30b84fc54cf8dfa573dc862a32814ff2e8f74 Mon Sep 17 00:00:00 2001
From: Martin Haye <m1@snyder-haye.com>
Date: Mon, 18 Jan 2016 13:11:43 -0800
Subject: [PATCH] Added PLASMA makefile rule to build plasm.jar

---
 .gitignore                               |  1 +
 Platform/Apple/tools/PLASMA/src/makefile | 14 ++++++++++----
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index babd1d58..40b48751 100644
--- a/.gitignore
+++ b/.gitignore
@@ -34,6 +34,7 @@ mg
 /Platform/Apple/tools/PLASMA/src/plvm
 /Platform/Apple/tools/PLASMA/src/PLVM02.SYSTEM.sys
 /Platform/Apple/tools/PLASMA/src/*#*
+/Platform/Apple/tools/PLASMA/src/plasm.jar
 
 # Ignore other auto-generated files
 /Platform/Apple/virtual/src/plasma/gen_*.pl?
diff --git a/Platform/Apple/tools/PLASMA/src/makefile b/Platform/Apple/tools/PLASMA/src/makefile
index 5857a62c..94815919 100755
--- a/Platform/Apple/tools/PLASMA/src/makefile
+++ b/Platform/Apple/tools/PLASMA/src/makefile
@@ -5,8 +5,9 @@ PLVM    = plvm
 PLVM02	= PLVM02.SYSTEM.sys#2000
 CMD     = CMD\#FF2000
 PLASM   = plasm
+JAR     = $(PLASM).jar
 INCS    = tokens.h symbols.h lex.h parse.h codegen.h
-OBJS	= plasm.c parse.o lex.o codegen.o
+SRCS	= plasm.c parse.c lex.c codegen.c
 #
 # Image filetypes for Virtual ][
 #
@@ -22,13 +23,18 @@ TXTTYPE	= .TXT
 #SYSTYPE	= \#ff0000
 #TXTTYPE	= \#040000
 
-all: $(PLASM) $(PLVM) $(PLVM02) $(CMD)
+all: $(PLASM) $(JAR) $(PLVM) $(PLVM02) $(CMD)
 
 clean:
 	-rm *.o *~ *.a *FE1000 $(PLVM02) $(CMD) $(PLASM) $(PLVM)
 
-$(PLASM): $(OBJS) $(INCS)
-	cc $(OBJS) -o $(PLASM)
+jar: $(JAR)
+
+$(PLASM): $(SRCS) $(INCS)
+	cc $(SRCS) -o $(PLASM)
+
+$(JAR): $(SRCS) $(INCS)
+	docker run -t -v "$(shell pwd):/project" mhaye/nestedvm:v3 /bin/bash -c "cd /project && nestedvm-c2jar $(JAR) plasma.Plasma $(SRCS)"
 
 $(PLVM): plvm.c
 	cc plvm.c -o $(PLVM)