| summaryrefslogtreecommitdiff | 
diff options
| author | Nathanael Sensfelder <SpamShield0@MultiAgentSystems.org> | 2017-07-31 14:28:50 +0200 | 
|---|---|---|
| committer | Nathanael Sensfelder <SpamShield0@MultiAgentSystems.org> | 2017-07-31 14:28:50 +0200 | 
| commit | 05fbf26dbb1b1f19e3ef76a0d0789806fa7be12c (patch) | |
| tree | 215a0f7405c376035cbc5b25a179caaf1d48a99a /instr-to-kodkod/Makefile | |
| parent | f84a9f5f2be00d14168ba40ebf9357bc99fce9ce (diff) | |
Adds a verbosity parameter.
Diffstat (limited to 'instr-to-kodkod/Makefile')
| -rw-r--r-- | instr-to-kodkod/Makefile | 22 | 
1 files changed, 11 insertions, 11 deletions
| diff --git a/instr-to-kodkod/Makefile b/instr-to-kodkod/Makefile index 7232a6e..bdc7324 100644 --- a/instr-to-kodkod/Makefile +++ b/instr-to-kodkod/Makefile @@ -7,13 +7,10 @@ MODEL_FILES = \  	$(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 -#PROPERTY_FILE = ../data/property/incrementer.pro -PROPERTY_FILE = ../data/property/combinational_processes.pro -#PROPERTY_FILE = ../data/property/likely_a_clock.pro -#PROPERTY_FILE = ../data/property/cnes/CNE*.pro -VAR_PREFIX = "_anon_" + +PROPERTIES = \ +	../data/property/combinational_processes.pro \ +	../data/property/likely_a_clock.pro  ## Executables #################################################################  JAVAC = javac @@ -28,12 +25,14 @@ 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) $(MAP_FILES) +GLOBAL_INPUT_FILES = $(MODEL_FILES) $(LEVEL_DIR) $(MAP_FILES)  SOURCES = $(wildcard src/*.java parser/*.java)  GRAMMARS = $(wildcard parser/*.g4)  CLASSES = $(SOURCES:.java=.class) +SOLUTIONS = $(PROPERTIES:.pro=.sol)  ## Makefile Rules ############################################################## +run: $(SOLUTIONS)  all: parser/PropertyParser.java $(CLASSES)  	$(MAKE) -C parser @@ -46,12 +45,13 @@ clean:  	$(MAKE) -C ../ast-to-instr clean  	$(MAKE) -C ../cfg-to-paths clean -run: parser/PropertyParser.java $(CLASSES) $(REQUIRED_JARS) +%.sol: %.pro parser/PropertyParser.java $(CLASSES) $(REQUIRED_JARS) +	echo "Solving \"$<\"..."  	$(MAKE) -C ../ast-to-instr  	$(MAKE) -C ../cfg-to-paths -	$(JAVA) -cp $(CLASSPATH) Main $(VAR_PREFIX) $(INPUT_FILES) +	$(JAVA) -cp $(CLASSPATH) Main $@ $< $(GLOBAL_INPUT_FILES) -%.class: %.java $(REQUIRED_JARS) +%.class: %.java $(REQUIRED_JARS) parser/PropertyParser.java  	$(JAVAC) -cp $(CLASSPATH) $<  %.jar: | 


