diff --git a/CHANGES_since_1.0 b/CHANGES_since_1.0 index 9b917c7..45320fa 100644 --- a/CHANGES_since_1.0 +++ b/CHANGES_since_1.0 @@ -1,7 +1,7 @@ -3.0 - 2021-??-?? +3.0 - 2022-05-09 ------------------ * Now runs in parallel by default on multicore systems, simplified parallel options - * Restructure code to enable integration in other programs + * Restructure code to enable integration in other programs (see lib_examples.py) * Remove support for Python 2.7 * Lots of cleanup and refactoring diff --git a/README.md b/README.md index a52d6c6..a5b2bdc 100644 --- a/README.md +++ b/README.md @@ -42,8 +42,8 @@ before running MARCO. Tested Platforms: - Linux - - Cygwin - OS X + - Cygwin Requirements: diff --git a/VERSION b/VERSION index 7ec1d6d..9f55b2c 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.1.0 +3.0 diff --git a/mkdist.sh b/mkdist.sh index 2663c78..1ee5d9f 100755 --- a/mkdist.sh +++ b/mkdist.sh @@ -1,11 +1,11 @@ #!/bin/bash # gather "whitelist" of files to include -marco_files="*.py muser2-static muser2-para README CHANGES* VERSION" +marco_files="*.py src/marco/*.py src/marco/muser2-para README* CHANGES* VERSION" if [ $# -lt 2 -o "$2" != "notest" ] ; then test_files="tests/*.cnf tests/*.gcnf tests/*.smt2 tests/*.gz tests/*.py tests/out/*/*" fi -minisolvers_files=`find pyminisolvers/ \( -name "*.cc" -or -name "*.cpp" -or -name "*.h" -or -name "Makefile" -or -name "makefile" -or -name "*.py" -or -name "*.pyx" \) -print` +minisolvers_files=`find src/pyminisolvers/ \( -name "*.cc" -or -name "*.cpp" -or -name "*.h" -or -name "Makefile" -or -name "makefile" -or -name "*.py" -or -name "*.pyx" \) -print` if [ "$1" = "list" ] ; then echo "Selected files:"