Merge branch 'master' of ssh://plrg.eecs.uci.edu/home/git/smartthings-infrastructure

diff --git a/lib/jpf.jar b/lib/jpf.jar
new file mode 100644 (file)
index 0000000..15b1668
Binary files /dev/null and b/lib/jpf.jar differ

diff --git a/main.groovy b/main.groovy
index 6ba6942..5460511 100644 (file)
--- a/main.groovy
+++ b/main.groovy
@@ -27,6 +27,8 @@ import MusicPlayer.MusicPlayers
 import Event.Event
 import Timer.SimulatedTimer
 
+import gov.nasa.jpf.vm.Verify
+
 //Global eventHandler
 /////////////////////////////////////////////////////////////////////
 def eventHandler(LinkedHashMap eventDataMap) {

diff --git a/makefile b/makefile
index fa243bc..11ff4dd 100644 (file)
--- a/makefile
+++ b/makefile
@@ -2,13 +2,14 @@ PYTHON = python
 GROOVY = groovyc
 GFLAGS = -d
 RMFLAGS = -r
+CPATH = -cp
 
 default: Runner main
 
 Runner: Runner.py
        $(PYTHON) Runner.py
 main: main.groovy
-       $(GROOVY) $(GFLAGS) bin/main main.groovy
+       $(GROOVY) $(CPATH) lib/jpf.jar $(GFLAGS) bin/main main.groovy
 
 
 clean: