Moves the templates to accommodate the tests.

22 files changed, 31 insertions, 33 deletions

diff --git a/Makefile b/Makefile
index a959838..177bd88 100644
--- a/Makefile
+++ b/Makefile
@@ -1,15 +1,16 @@
 ## Makefile Parameters #########################################################
-LEVEL_FILES = $(wildcard ${CURDIR}/data/level/*.lvl)
-PROPERTY_FILES = \
+LEVEL_FILES ?= $(wildcard ${CURDIR}/data/level/*.lvl)
+PROPERTY_FILES ?= \
 	$(wildcard ${CURDIR}/data/property/*.pro) \
 	$(wildcard ${CURDIR}/data/property/cnes/*.pro)
-AST_FILE = ${CURDIR}/data/ast/best_chronometer_ever.xml
+AST_FILE ?= ${CURDIR}/data/ast/best_chronometer_ever.xml
+TEMPLATE_DIR ?= ${CURDIR}/data/template/
 #AST_FILE = ${CURDIR}/data/ast/pong.xml
 
-TMP_DIR = /tmp/tabellion
-MODEL_DIR = $(TMP_DIR)/mod
-MODEL_INSTANCES_DIR = $(MODEL_DIR)/instance
-SOL_DIR = $(TMP_DIR)/sol
+TMP_DIR ?= /tmp/tabellion
+MODEL_DIR ?= $(TMP_DIR)/mod
+MODEL_INSTANCES_DIR ?= $(MODEL_DIR)/instance
+SOL_DIR ?= $(TMP_DIR)/sol
 
 ## Sub-programs ################################################################
 AST_TO_INSTR = ast-to-instr
diff --git a/data/property/cnes/CNE_00100.pp b/data/template/CNE_00100.pp
index 41164c6..41164c6 100644
--- a/data/property/cnes/CNE_00100.pp
+++ b/data/template/CNE_00100.pp
diff --git a/data/property/cnes/CNE_01100.pp b/data/template/CNE_01100.pp
index 4039897..4039897 100644
--- a/data/property/cnes/CNE_01100.pp
+++ b/data/template/CNE_01100.pp
diff --git a/data/property/cnes/CNE_01200.pp b/data/template/CNE_01200.pp
index 68479eb..68479eb 100644
--- a/data/property/cnes/CNE_01200.pp
+++ b/data/template/CNE_01200.pp
diff --git a/data/property/cnes/CNE_01400.pp b/data/template/CNE_01400.pp
index 6050265..6050265 100644
--- a/data/property/cnes/CNE_01400.pp
+++ b/data/template/CNE_01400.pp
diff --git a/data/property/cnes/CNE_01700.pp b/data/template/CNE_01700.pp
index 8a32e7d..8a32e7d 100644
--- a/data/property/cnes/CNE_01700.pp
+++ b/data/template/CNE_01700.pp
diff --git a/data/property/cnes/CNE_01800.pp b/data/template/CNE_01800.pp
index 5dea929..5dea929 100644
--- a/data/property/cnes/CNE_01800.pp
+++ b/data/template/CNE_01800.pp
diff --git a/data/property/cnes/CNE_01900.pp b/data/template/CNE_01900.pp
index 0402d55..0402d55 100644
--- a/data/property/cnes/CNE_01900.pp
+++ b/data/template/CNE_01900.pp
diff --git a/data/property/cnes/CNE_02100.pp b/data/template/CNE_02100.pp
index ff0b8e7..ff0b8e7 100644
--- a/data/property/cnes/CNE_02100.pp
+++ b/data/template/CNE_02100.pp
diff --git a/data/property/cnes/CNE_02600.pp b/data/template/CNE_02600.pp
index ea2d44f..ea2d44f 100644
--- a/data/property/cnes/CNE_02600.pp
+++ b/data/template/CNE_02600.pp
diff --git a/data/property/cnes/CNE_04500.pp b/data/template/CNE_04500.pp
index 0a2ec8e..0a2ec8e 100644
--- a/data/property/cnes/CNE_04500.pp
+++ b/data/template/CNE_04500.pp
diff --git a/data/property/cnes/CNE_05100.pp b/data/template/CNE_05100.pp
index 242dd8d..242dd8d 100644
--- a/data/property/cnes/CNE_05100.pp
+++ b/data/template/CNE_05100.pp
diff --git a/data/property/cnes/STD_04800.pp b/data/template/STD_04800.pp
index eb2653c..eb2653c 100644
--- a/data/property/cnes/STD_04800.pp
+++ b/data/template/STD_04800.pp
diff --git a/data/property/combinational_processes.pp b/data/template/combinational_processes.pp
index 7d73bf9..7d73bf9 100644
--- a/data/property/combinational_processes.pp
+++ b/data/template/combinational_processes.pp
diff --git a/data/property/test-case/fast.pp b/data/template/fast.pp
index b460eec..b460eec 100644
--- a/data/property/test-case/fast.pp
+++ b/data/template/fast.pp
diff --git a/data/property/impossible_processes.pp b/data/template/impossible_processes.pp
index a13e0e5..a13e0e5 100644
--- a/data/property/impossible_processes.pp
+++ b/data/template/impossible_processes.pp
diff --git a/data/property/incrementer.pp b/data/template/incrementer.pp
index e4768d9..e4768d9 100644
--- a/data/property/incrementer.pp
+++ b/data/template/incrementer.pp
diff --git a/data/property/likely_a_clock.pp b/data/template/likely_a_clock.pp
index aea7af2..aea7af2 100644
--- a/data/property/likely_a_clock.pp
+++ b/data/template/likely_a_clock.pp
diff --git a/data/property/simple_flip_flop.pp b/data/template/simple_flip_flop.pp
index fbad237..fbad237 100644
--- a/data/property/simple_flip_flop.pp
+++ b/data/template/simple_flip_flop.pp
diff --git a/data/property/test-case/slow.pp b/data/template/slow.pp
index b460eec..b460eec 100644
--- a/data/property/test-case/slow.pp
+++ b/data/template/slow.pp
diff --git a/data/test/Makefile b/data/test/Makefile
index fe2d1ff..43e2232 100644
--- a/data/test/Makefile
+++ b/data/test/Makefile
@@ -1,23 +1,30 @@
-TABELLION_MAIN ?= $(shell pwd)/../../
+TABELLION_MAIN ?= ${CURDIR}/../../
 AST_CREATOR = ghdl --file-to-xml
-TEST_DIRS ?= $(addprefix $(shell pwd)/,$(wildcard */))
-PROPERTY_DIR ?= $(shell pwd)/../property
+#TEST_DIRS ?= $(addprefix ${CURDIR}/,$(wildcard */))
+TEST_DIRS ?= $(patsubst %/,%,$(wildcard */))
+PROPERTY_DIR ?= ${CURDIR}/../property
 SOLUTION_DIR ?= /tmp/tabellion/sol/
-ORACLE_CREATOR_SCRIPT = $(shell pwd)/oracle_creator.py
+ORACLE_CREATOR_SCRIPT = ${CURDIR}/oracle_creator.py
 ################################################################################
-TEST_FILES = \
-	$(addsuffix /valid,$(TEST_DIRS)) \
-	$(addsuffix /invalid,$(TEST_DIRS))
+TEST_FILES = $(addsuffix /valid,$(TEST_DIRS))
 
 #VHD_FILES = $(addsuffix .vhd, $(TEST_FILES))
 AST_FILES = $(addsuffix .xml, $(TEST_FILES))
 OCL_FILES = $(addsuffix .ocl, $(TEST_FILES))
-SOL_FILES = $(addsuffix .sol, $(TEST_FILES))
 
 all: $(AST_FILES) $(OCL_FILES)
+	for TD in $(TEST_DIRS) ; do \
+		$(MAKE) -C $$TD PROPERTY_FILES=$$TD.pro
+		
+
+clean:
+	rm -f $(AST_FILES)
+	rm -f $(OCL_FILES)
 
 $(AST_FILES): %.xml : %.vhd
 	$(AST_CREATOR) $< > $@
 
 $(OCL_FILES): %.ocl : %.vhd
 	grep -no "\$$SOL:[0-9]\+:[0-9]\+\\$$" $< | $(ORACLE_CREATOR_SCRIPT) > $@
+
+
diff --git a/sol-pretty-printer/Makefile b/sol-pretty-printer/Makefile
index 9dd1ee9..5390e28 100644
--- a/sol-pretty-printer/Makefile
+++ b/sol-pretty-printer/Makefile
@@ -1,29 +1,19 @@
 ## Parameters ##################################################################
 #### Where to find the solutions.
-ifndef SOL_DIR
-SOL_DIR =
-endif
+SOL_DIR ?=
 
 #### Where to find the model's data
-ifndef MODEL_DIR
-MODEL_DIR =
-endif
+MODEL_DIR ?=
 
 #### Where to find the properties' pretty-print files
-ifndef PROPERTY_FILES
-PROPERTY_FILES =
-endif
+TEMPLATE_DIR ?=
 
 #### Binaries
 ###### JRE binary
-ifndef JAVA
-JAVA = java
-endif
+JAVA ?= java
 
 ###### JDK binary
-ifndef JAVAC
-JAVAC = javac
-endif
+JAVAC ?= javac
 
 ## Parameters Sanity Check #####################################################
 ifeq ($(strip $(SOL_DIR)),)
@@ -34,8 +24,8 @@ ifeq ($(strip $(MODEL_DIR)),)
 $(error No MODEL_DIR defined as parameter.)
 endif
 
-ifeq ($(strip $(PROPERTY_FILES)),)
-$(error No PROPERTY_FILES defined as parameter.)
+ifeq ($(strip $(TEMPLATE_DIR)),)
+$(error No TEMPLATE_DIR defined as parameter.)
 endif
 
 ifeq ($(strip $(JAVA)),)
@@ -54,7 +44,7 @@ SOURCES = $(wildcard src/*.java)
 CLASSES = $(SOURCES:.java=.class)
 
 SOLUTION_FILES = $(wildcard $(SOL_DIR)/*.sol)
-PROPERTY_PP_FILES = $(PROPERTY_FILES:.pro=.pp)
+PROPERTY_PP_FILES = $(wildcard $(TEMPLATE_DIR)/*.pp)
 SOLUTION_PP_PAIRS = \
 	$(foreach sf,$(SOLUTION_FILES),$(sf) $(filter %$(basename $(notdir $(sf))).pp,$(PROPERTY_PP_FILES)))