From fd9ee2f1bfa7689e4ca08bbb8ed3ee53ce27ba47 Mon Sep 17 00:00:00 2001 From: megacz Date: Thu, 8 Jan 2009 17:35:44 -0800 Subject: [PATCH] deal with bootstrapping dependency while building a fresh checkout --- Makefile | 2 +- src/edu/berkeley/fleet/Main.java | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 7ccb687..ef7597d 100644 --- a/Makefile +++ b/Makefile @@ -20,7 +20,7 @@ fleet.jar: $(java_files) $(ship_files) src/edu/berkeley/fleet/assembler/fleet.g javac -classpath lib/RXTXcomm.jar:lib/edu.berkeley.sbp.jar -d build/class/ $(shell find src -name \*.java) cd build/class/; jar xf ../../lib/edu.berkeley.sbp.jar for A in `find ships -name \*.ship`;\ - do java -cp fleet.jar edu.berkeley.fleet.Main expand $$A;\ + do java -cp fleet.jar:build/class edu.berkeley.fleet.Main expand $$A;\ done javac -classpath lib/RXTXcomm.jar:build/class${ps}lib/edu.berkeley.sbp.jar -d build/class/ `find build/java -name \*.java` echo 'Main-Class: edu.berkeley.fleet.Main' > build/class/manifest diff --git a/src/edu/berkeley/fleet/Main.java b/src/edu/berkeley/fleet/Main.java index 42f678f..ff07e9a 100644 --- a/src/edu/berkeley/fleet/Main.java +++ b/src/edu/berkeley/fleet/Main.java @@ -40,6 +40,8 @@ public class Main { fleet = new Fpga(); } else if ("sim".equals(target) || "fleetsim".equals(target)) { fleet = (Fleet)Class.forName("com.sunlabs.fleetsim.fleet.FleetDescription").newInstance(); + } else if (command.equals("expand")) { + fleet = new Interpreter(new String[0], false); } else { fleet = new Interpreter(); } -- 1.7.10.4