From f1cd6cd2df0de4b118b68ca2fcb0c116ab524914 Mon Sep 17 00:00:00 2001
From: dmose <dmose@meer.net>
Date: Thu, 21 Aug 2003 00:45:37 +0000
Subject: [PATCH] ANTLR build fixes

---
 build/linux/make.sh | 21 +++++++++++++++++----
 build/linux/stub.sh |  2 +-
 2 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/build/linux/make.sh b/build/linux/make.sh
index 2c3c4ecc7..cd8e11017 100755
--- a/build/linux/make.sh
+++ b/build/linux/make.sh
@@ -87,17 +87,30 @@ cd app
 
 echo Building PDE for JDK 1.3
 
-CLASSPATH=../build/linux/work/classes:../build/linux/work/lib/kjc.jar:../build/linux/work/lib/oro.jar:../build/linux/work/java/lib/rt.jar:../build/linux/work/lib/RXTXcomm.jar
+cd preprocessor
 
-perl ../bagel/buzz.pl "jikes +D -classpath $CLASSPATH -d ../build/linux/work/classes" -dJDK13 -dRXTX *.java jeditsyntax/*.java
+# first build the default java goop
+java -cp ../../build/linux/work/lib/antlr.jar antlr.Tool java.g
+java -cp ../../build/linux/work/lib/antlr.jar antlr.Tool java.tree.g
+
+# now build the pde stuff that extends the java classes
+java -cp ../../build/linux/work/lib/antlr.jar antlr.Tool \
+    -glib java.g pde.g
+java -cp ../../build/linux/work/lib/antlr.jar antlr.Tool \
+    -glib java.tree.g pde.tree.g
+
+cd ..
+
+CLASSPATH=../build/linux/work/classes:../build/linux/work/lib/kjc.jar:../build/linux/work/lib/antlr.jar:../build/linux/work/lib/oro.jar:../build/linux/work/java/lib/rt.jar:../build/linux/work/lib/RXTXcomm.jar
+
+perl ../bagel/buzz.pl "jikes +D -classpath $CLASSPATH -d ../build/linux/work/classes" -dJDK13 -dRXTX *.java jeditsyntax/*.java preprocessor/*.java
 
 cd ../build/linux/work/classes
 rm -f ../lib/pde.jar
-zip -0q ../lib/pde.jar *.class
+zip -0rq ../lib/pde.jar .
 cd ../..
 
 
 ### -- BUILD STUB -----------------------------------------------
 
 install -m 755 stub.sh work/processing
-
diff --git a/build/linux/stub.sh b/build/linux/stub.sh
index d1690a5e6..c685663e5 100644
--- a/build/linux/stub.sh
+++ b/build/linux/stub.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-CLASSPATH=java/lib/rt.jar:lib:lib/build:lib/pde.jar:lib/kjc.jar:lib/oro.jar:lib/RXTXcomm.jar
+CLASSPATH=java/lib/rt.jar:lib:lib/build:lib/pde.jar:lib/kjc.jar:lib/antlr.jar:lib/oro.jar:lib/RXTXcomm.jar
 export CLASSPATH
 
 exec java/bin/java PdeBase