| summaryrefslogtreecommitdiff |
diff options
| author | Nathanael Sensfelder <SpamShield0@MultiAgentSystems.org> | 2017-07-25 14:45:05 +0200 |
|---|---|---|
| committer | Nathanael Sensfelder <SpamShield0@MultiAgentSystems.org> | 2017-07-25 14:45:05 +0200 |
| commit | 97439a89b5439ce120e5bc2814251ce9dc513ce0 (patch) | |
| tree | cfefd60c8ee3179cd76ac0c54023f5fff77bb6ae /instr-to-kodkod/Makefile | |
| parent | a19063a8dc55750e4ae6d6d6acacdd537fbbdb08 (diff) | |
Improves error reports for the property.
Diffstat (limited to 'instr-to-kodkod/Makefile')
| -rw-r--r-- | instr-to-kodkod/Makefile | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/instr-to-kodkod/Makefile b/instr-to-kodkod/Makefile index efcfaa5..c25c95f 100644 --- a/instr-to-kodkod/Makefile +++ b/instr-to-kodkod/Makefile @@ -1,6 +1,7 @@ ## Target(s) Configuration ##################################################### #MODEL_FILES = $(wildcard ../data/instructions/*.mod) MODEL_FILES = ../ast-to-instr/structural.mod $(wildcard ../ast-to-instr/cfg_*.mod) $(wildcard ../cfg-to-paths/*.mod) +MAP_FILES = $(wildcard ../ast-to-instr/*.map) LEVEL_DIR = $(wildcard ../data/level/*.lvl) #PROPERTY_FILE = ../data/property/unread_waveforms.pro #PROPERTY_FILE = ../data/property/impossible_processes.pro @@ -20,7 +21,7 @@ JAR_SOURCE = https://noot-noot.org/onera_2017/jar/ REQUIRED_JARS = kodkod.jar org.sat4j.core.jar antlr-4.7-complete.jar ## Makefile Magic ############################################################## -INPUT_FILES = $(MODEL_FILES) $(LEVEL_DIR) $(PROPERTY_FILE) +INPUT_FILES = $(MODEL_FILES) $(LEVEL_DIR) $(PROPERTY_FILE) $(MAP_FILES) SOURCES = $(wildcard src/*.java parser/*.java) GRAMMARS = $(wildcard parser/*.g4) CLASSES = $(SOURCES:.java=.class) @@ -28,6 +29,7 @@ CLASSES = $(SOURCES:.java=.class) ## Makefile Rules ############################################################## all: parser/PropertyParser.java $(CLASSES) + $(MAKE) -C parser $(MAKE) -C ../ast-to-instr $(MAKE) -C ../cfg-to-paths |