| summaryrefslogtreecommitdiff |
diff options
| author | Nathanael Sensfelder <SpamShield0@MultiAgentSystems.org> | 2017-09-20 17:19:42 +0200 |
|---|---|---|
| committer | Nathanael Sensfelder <SpamShield0@MultiAgentSystems.org> | 2017-09-20 17:19:42 +0200 |
| commit | bc3e8933e1005e93e4a97b9a207cb40db454a2a8 (patch) | |
| tree | c6b6431a7ab6e1188faab80efb2d89712d4b48a6 /instr-to-kodkod/Makefile | |
| parent | 71e7acf1ac104258a295a2662d6dc71f49ac77aa (diff) | |
Solves the missing solutions bug. Starts PropDeps.
Diffstat (limited to 'instr-to-kodkod/Makefile')
| -rw-r--r-- | instr-to-kodkod/Makefile | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/instr-to-kodkod/Makefile b/instr-to-kodkod/Makefile index b708c16..322205f 100644 --- a/instr-to-kodkod/Makefile +++ b/instr-to-kodkod/Makefile @@ -91,6 +91,8 @@ ANTLR_JAR = ${CURDIR}/antlr-4.7-complete.jar SOURCES = $(wildcard src/*.java) CLASSES = $(SOURCES:.java=.class) SOLUTION_FILES = $(addprefix $(SOL_DIR)/,$(notdir $(PROPERTY_FILES:.pro=.sol))) +DEPENDENCY_FILES = \ + $(addprefix $(DEPENDENCIES_DIR)/,$(notdir $(PROPERTY_FILES:.pro=.deps))) MODEL_FILES = \ $(MODEL_DIR)/structural.mod \ $(MODEL_DIR)/depths.mod \ @@ -115,12 +117,14 @@ clean: $(MAKE) -C cfg-to-paths clean rm -f $(CLASSES) rm -f $(SOL_DIR)/*.sol + rm -f $(DEPENDENCY_FILES) clean_model: $(MAKE) -C cfg-to-paths clean_model clean_solutions: rm -f $(SOL_DIR)/*.sol + rm -f $(DEPENDENCY_FILES) ######## cfg-generator: @@ -129,7 +133,8 @@ cfg-generator: $(PARSER_CLASSES): antlr-4.7-complete.jar kodkod.jar $(PARSER_SOURCES) $(MAKE) -C parser -$(SOL_DIR)/%.sol: $(PROPERTY_FILES) $(MODEL_FILES) $(LEVEL_FILES) +$(SOL_DIR)/%.sol: \ + $(DEPENDENCIES_DIR)/%.deps $(PROPERTY_FILES) $(MODEL_FILES) $(LEVEL_FILES) touch $@ $(JAVA) -cp $(CLASSPATH) Main $@ -v \ $(filter %$(basename $(notdir $@)).pro,$(PROPERTY_FILES)) \ @@ -137,6 +142,10 @@ $(SOL_DIR)/%.sol: $(PROPERTY_FILES) $(MODEL_FILES) $(LEVEL_FILES) $(MODEL_FILES) \ $(wildcard $(PATH_MODEL_DIR)/*.mod) +$(DEPENDENCY_FILES): $(PROPERTY_FILES) + sed -n 's/^#require \"\(.*\)\"$$/\1/p' \ + $(filter %$(basename $(notdir $@)).pro,$(PROPERTY_FILES)) > $@ + src/%.class: src/%.java $(PARSER_CLASSES) $(REQUIRED_JARS) $(JAVAC) -cp $(CLASSPATH) $< |