updates to make fpga-code instruction generation work again

[fleet.git] / Makefile

diff --git a/Makefile b/Makefile
index da98e04..3a362c1 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -9,12 +9,12 @@ run: fleet.jar
        $(java) $(cp) $(interpreter_class)
 
 fleet.jar: $(shell find src -name \*.java) src/edu/berkeley/fleet/assembler/fleet.g
-       mkdir -p bin/edu/berkeley/fleet/assembler/
-       cp src/edu/berkeley/fleet/assembler/fleet.g bin/edu/berkeley/fleet/assembler/
-       javac -cp lib/edu.berkeley.sbp.jar -d bin $(shell find src -name \*.java)
-       cd bin; jar xvf ../lib/edu.berkeley.sbp.jar
-       echo 'Main-Class: $(interpreter_class)' > bin/manifest
-       cd bin; jar cvmf manifest ../$@ .
+       mkdir -p build/class/edu/berkeley/fleet/assembler/
+       cp src/edu/berkeley/fleet/assembler/fleet.g build/class/edu/berkeley/fleet/assembler/
+       javac -cp lib/edu.berkeley.sbp.jar -d build/class/ $(shell find src -name \*.java)
+       cd build/class/; jar xvf ../../lib/edu.berkeley.sbp.jar
+       echo 'Main-Class: $(interpreter_class)' > build/class/manifest
+       cd build/class/; jar cvmf manifest ../../$@ .
 
 
 ## Slipway ####################################################################################
@@ -41,13 +41,13 @@ remote_run += gcc test.c;
 remote_run += echo running;
 remote_run +=  ./a.out /dev/selectmap1 fleet.bin
 
-runfpga: build/main.bit
+runfpga: fleet.jar build/main.bit
        $(java) $(cp) $(interpreter_class) --dump-code < contrib/demo.fleet
-       mv fleet.bin build
        rsync -zare ssh --progress --verbose build/fleet.bin build/main.bit src/edu/berkeley/fleet/slipway/test.c root@bee441.cs.berkeley.edu:
        ssh root@bee441.cs.berkeley.edu '$(remote_run)'
 
-build/main.bit: fleet.jar contrib/demo.ships $(shell find src -name \*.v)
+build/main.bit: contrib/demo.ships $(shell find src -name \*.v)
+       make fleet.jar
        mkdir -p build
        $(java) $(cp) $(interpreter_class) --dump-fabric < contrib/demo.ships | tee build/fabric.v
        rsync -zare ssh --progress --delete --verbose ./ ${host}:${remote_dir}
@@ -92,15 +92,15 @@ javadoc:
 ## Misc ####################################################################################
 
 clean:
-       rm -rf bin fleet.jar build
+       rm -rf fleet.jar build
 
 ## Dist ####################################################################################
 
 dist:
        darcs record
+       darcs push /afs/research.cs.berkeley.edu/class/fleet/website/repos/fleet/
        darcs get . --repo-name=fleet-`date +%d.%h.%y`
        make -C fleet-`date +%d.%h.%y` fleet.jar
-       rm -rf fleet-`date +%d.%h.%y`/bin
        rm -rf fleet-`date +%d.%h.%y`/build
        tar cvzf fleet-`date +%d.%h.%y`.tgz fleet-`date +%d.%h.%y`
        rm -rf fleet-`date +%d.%h.%y`