git-svn-id: https://stp-fast-prover.svn.sourceforge.net/svnroot/stp-fast-prover/trunk...

diff --git a/scripts/Makefile.in b/scripts/Makefile.in
index 52c580273bba4e76dab78c7a5ea60b67d70aa61b..9b84ae47f1c04c304af5a284f772a6dcb51e826c 100644 (file)
--- a/scripts/Makefile.in
+++ b/scripts/Makefile.in
@@ -4,7 +4,7 @@
  # To make in optimized mode, type 'make "OPTIMIZE=-O3" 
 
 
-include make-scripts/Makefile.common make-scripts/config.info
+include scripts/Makefile.common scripts/config.info
 
 BIN_DIR=$(PREFIX)/bin
 LIB_DIR=$(PREFIX)/lib
@@ -69,8 +69,6 @@ TAGS: FORCE
 FORCE:
 
 # The higher the level, the more tests are run (3 = all)
-REGRESS_TESTS0 = test \
- test/EGT
 REGRESS_LEVEL=4
 REGRESS_TESTS=$(REGRESS_TESTS0)
 REGRESS_LOG = `date +%Y-%m-%d`"-regress.log"
@@ -84,7 +82,7 @@ regress:
        @echo "Starting tests at" `date` | tee -a $(REGRESS_LOG)
        @echo "*********************************************************" \
           | tee -a $(REGRESS_LOG)
-       bin/run_tests $(ALL_OPTIONS) 2>&1 | tee -a $(REGRESS_LOG); [ $${PIPESTATUS[0]} -eq 0 ]
+       scripts/run_cvc_tests.pl $(ALL_OPTIONS) 2>&1 | tee -a $(REGRESS_LOG); [ $${PIPESTATUS[0]} -eq 0 ]
        @echo "*********************************************************" \
           | tee -a $(REGRESS_LOG)
        @echo "Output is saved in $(REGRESS_LOG)" | tee -a $(REGRESS_LOG)
@@ -92,8 +90,6 @@ regress:
           | tee -a $(REGRESS_LOG)
 
 # The higher the level, the more tests are run (3 = all)
-REGRESS_TESTS0 = test \
- test/EGT
 REGRESS_LEVEL=4
 REGRESS_TESTS=$(REGRESS_TESTS0)
 #REGRESS_LOG = `date +%Y-%m-%d`"-regress-bigarray.log"
@@ -107,7 +103,7 @@ regressbigarray:
        @echo "Starting tests at" `date` | tee -a $(REGRESS_LOG)
        @echo "*********************************************************" \
           | tee -a $(REGRESS_LOG)
-       bin/run_bigarray_tests $(ALL_OPTIONS) 2>&1 | tee -a $(REGRESS_LOG); [ $${PIPESTATUS[0]} -eq 0 ]
+       scripts/run_bigarray_tests.pl $(ALL_OPTIONS) 2>&1 | tee -a $(REGRESS_LOG); [ $${PIPESTATUS[0]} -eq 0 ]
        @echo "*********************************************************" \
           | tee -a $(REGRESS_LOG)
        @echo "Output is saved in $(REGRESS_LOG)" | tee -a $(REGRESS_LOG)
@@ -121,7 +117,7 @@ regress_smt:
        @echo "Starting tests at" `date` | tee -a $(REGRESS_LOG)
        @echo "*********************************************************" \
           | tee -a $(REGRESS_LOG)
-       bin/run_smt_tests $(ALL_OPTIONS) 2>&1 | tee -a $(REGRESS_LOG); [ $${PIPESTATUS[0]} -eq 0 ]
+       scripts/run_smt_tests.pl $(ALL_OPTIONS) 2>&1 | tee -a $(REGRESS_LOG); [ $${PIPESTATUS[0]} -eq 0 ]
        @echo "*********************************************************" \
           | tee -a $(REGRESS_LOG)
        @echo "Output is saved in $(REGRESS_LOG)" | tee -a $(REGRESS_LOG)
@@ -149,10 +145,9 @@ grind:
        @echo "Starting tests at" `date` | tee -a $(GRIND_LOG)
        @echo "*********************************************************" \
           | tee -a $(GRIND_LOG)
-       bin/run_tests $(GRIND_OPTIONS) 2>&1 | tee -a $(GRIND_LOG); [ $${PIPESTATUS[0]} -eq 0 ]
+       scripts/run_cvc_tests.pl $(GRIND_OPTIONS) 2>&1 | tee -a $(GRIND_LOG); [ $${PIPESTATUS[0]} -eq 0 ]
        @echo "*********************************************************" \
           | tee -a $(GRIND_LOG)
        @echo "Output is saved in $(GRIND_LOG)" | tee -a $(GRIND_LOG)
        @echo "*********************************************************" \
-          | tee -a $(GRIND_LOG)
-
+          | tee -a $(GRIND_LOG)
\ No newline at end of file

diff --git a/scripts/configure b/scripts/configure
index 016a02d1831215f230b4d31cdfef0e0b1ec84b66..13075a61b5d8fc2c99c9d2854a98664a5f8518ab 100755 (executable)
--- a/scripts/configure
+++ b/scripts/configure
@@ -32,10 +32,10 @@ while [ $# -gt 0 ]; do
 done
 
 
-echo "PREFIX=$PREFIX" > make-scripts/config.info
+echo "PREFIX=$PREFIX" > scripts/config.info
 echo "Setting prefix to... $PREFIX"
 if [ $CXX ]
-then echo "CXX=$CXX" >> make-scripts/config.info
+then echo "CXX=$CXX" >> scripts/config.info
 export CXX="$CXX"
 echo "Setting CXX to... $CXX"
 fi
@@ -57,7 +57,7 @@ then mkdir $PREFIX/include/stp
 fi
 
 echo "STP is configured successfully."
-cp make-scripts/Makefile.in Makefile
+cp scripts/Makefile.in Makefile
 
 echo
 echo "Type 'make' to compile STP."

diff --git a/src/AST/Makefile b/src/AST/Makefile
index 71b4879976b0c4766ac2f37d76b825bec0094792..3358471c4d3ccfd4cf71b14e79489e10f1aed587 100644 (file)
--- a/src/AST/Makefile
+++ b/src/AST/Makefile
@@ -1,4 +1,4 @@
-include ../../make-scripts/Makefile.common
+include ../../scripts/Makefile.common
 
 #SRCS = AST.cpp ASTKind.cpp  ASTUtil.cpp BitBlast.cpp SimpBool.cpp  ToCNF.cpp DPLLMgr.cpp ToSAT.cpp Transform.cpp
 SRCS = AST.cpp ASTKind.cpp  ASTUtil.cpp BitBlast.cpp SimpBool.cpp  ToCNF.cpp ToSAT.cpp Transform.cpp printer/SMTLIBPrinter.cpp  printer/dotPrinter.cpp  printer/CPrinter.cpp

diff --git a/src/bitvec/Makefile b/src/bitvec/Makefile
index 6f4c401ea775266f8452df9eca6310e4af9f4465..1a864f747fcb6c54405e2d3cecc9e833c790a5ce 100644 (file)
--- a/src/bitvec/Makefile
+++ b/src/bitvec/Makefile
@@ -1,4 +1,4 @@
-include ../../make-scripts/Makefile.common
+include ../../scripts/Makefile.common
 
 SRCS = consteval.cpp
 OBJS = $(SRCS:.cpp=.o)

diff --git a/src/c_interface/Makefile b/src/c_interface/Makefile
index ab27595d25118c3e443b493ed45e697b89b5c15e..37cf62efcff0af17903f80b779fd53dfd60fdad2 100644 (file)
--- a/src/c_interface/Makefile
+++ b/src/c_interface/Makefile
@@ -1,4 +1,4 @@
-include ../../make-scripts/Makefile.common
+include ../../scripts/Makefile.common
 
 SRCS = c_interface.cpp
 OBJS = $(SRCS:.cpp=.o)

diff --git a/src/constantbv/Makefile b/src/constantbv/Makefile
index 7d5ef9af44e871a5c4db32144a6f26746b2e4361..58920ad915e4c3cb34ab615267b6d0f315cdd1db 100644 (file)
--- a/src/constantbv/Makefile
+++ b/src/constantbv/Makefile
@@ -1,4 +1,4 @@
-include ../../make-scripts/Makefile.common
+include ../../scripts/Makefile.common
 
 SRCS = constantbv.cpp
 OBJS = $(SRCS:.cpp=.o)

diff --git a/src/parser/Makefile b/src/parser/Makefile
index 82c88c7f94f57757e8b70cefaf291a96769948a6..43d99eec888bbac4d6b047954411bd9a8fec46a9 100644 (file)
--- a/src/parser/Makefile
+++ b/src/parser/Makefile
@@ -1,4 +1,4 @@
-include ../../make-scripts/Makefile.common
+include ../../scripts/Makefile.common
 
 LEX=flex
 YACC=bison -d -y --debug -v

diff --git a/src/simplifier/Makefile b/src/simplifier/Makefile
index 030edc5c7aea96848fc07ee8aec42fa73ad5984b..a486b4da0bdfbcabe7c36b3ae4cfcbb198821e43 100644 (file)
--- a/src/simplifier/Makefile
+++ b/src/simplifier/Makefile
@@ -1,4 +1,4 @@
-include ../../make-scripts/Makefile.common
+include ../../scripts/Makefile.common
 
 SRCS = simplifier.cpp bvsolver.cpp
 OBJS = $(SRCS:.cpp=.o)