Cutting release 1.0.

diff --git a/NEWS b/NEWS
index ad3373cf7a41558d867c955d6320cf557d7afa19..a740934926750196c0d48a12a73eb4c2779e0275 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,5 @@
-Preparing for the first public release, CVC4 1.0.
+This file contains a summary of important user-visible changes.
 
--- Morgan Deters <mdeters@cs.nyu.edu>  Sat, 06 Oct 2012 13:22:31 -0400
+This is the first public release, CVC4 1.0.
+
+-- Morgan Deters <mdeters@cs.nyu.edu>  Sat, 01 Dec 2012 12:53:23 -0500

diff --git a/configure.ac b/configure.ac
index e8be43fc1158ce7afa1658dcf4f2d5c9ba21c636..8ac1fb7763dc579be5b8e6e6088c9206c5ef62b2 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,10 +1,10 @@
 #                                               -*- Autoconf -*-
 # Process this file with autoconf to produce a configure script.
 
-m4_define(_CVC4_MAJOR,          0)       dnl version (major)
+m4_define(_CVC4_MAJOR,          1)       dnl version (major)
 m4_define(_CVC4_MINOR,          0)       dnl version (minor)
 m4_define(_CVC4_RELEASE,        0)       dnl version (alpha)
-m4_define(_CVC4_EXTRAVERSION,   [prerelease])      dnl version (extra)
+m4_define(_CVC4_EXTRAVERSION,   [])      dnl version (extra)
 m4_define(_CVC4_RELEASE_STRING, _CVC4_MAJOR[.]_CVC4_MINOR[]m4_if(_CVC4_RELEASE,[0],,[.]_CVC4_RELEASE)_CVC4_EXTRAVERSION) dnl version string
 
 dnl Preprocess CL args. Defined in config/cvc4.m4

diff --git a/contrib/cut-release b/contrib/cut-release
index ef51b6edb8bbf934009dfe778a1c66d9ba8accc0..06fc1268641b8a873839ecda306714f54e166eb2 100755 (executable)
--- a/contrib/cut-release
+++ b/contrib/cut-release
@@ -170,11 +170,11 @@ if ! $SHELL -c '\
        ./autogen.sh || echo "autoconf failed; does library_versions have something to match $version?"; \
        mkdir "release-$version"; \
        cd "release-$version"; \
-       ../configure production-cln-staticbinary --disable-shared --enable-unit-testing --without-cudd --with-readline --with-portfolio; \
+       ../configure production-staticbinary --disable-shared --enable-unit-testing --without-cudd --with-readline --with-portfolio; \
        make dist "$@"; \
        tar xf "cvc4-$version.tar.gz"; \
        cd "cvc4-$version"; \
-       ./configure production-cln-staticbinary --disable-shared --enable-unit-testing --without-cudd --with-readline --with-portfolio; \
+       ./configure production-staticbinary --disable-shared --enable-unit-testing --without-cudd --with-readline --with-portfolio; \
        make check "$@"; \
        make distcheck "$@"; \
 '; then
@@ -185,7 +185,7 @@ if ! [ -e release-$version/cvc4-$version.tar.gz ]; then
   echo "$(basename "$0"): INTERNAL ERROR: Cannot find the distribution tarball I just built" >&2
   exit 1
 fi
-if ! [ -e release-$version/src/main/cvc4 ]; then
+if ! [ -e release-$version/cvc4-$version/builds/src/main/cvc4 ]; then
   echo "$(basename "$0"): INTERNAL ERROR: Cannot find the binary I just built" >&2
   exit 1
 fi
@@ -193,14 +193,14 @@ fi
 echo
 echo 'This release of CVC4 will identify itself as:'
 echo
-release-$version/src/main/cvc4 --version
+release-$version/cvc4-$version/builds/src/main/cvc4 --version
 echo
 isthatright
 
 echo
 echo 'This binary release of CVC4 will identify itself as being configured like this:'
 echo
-release-$version/src/main/cvc4 --show-config
+release-$version/cvc4-$version/builds/src/main/cvc4 --show-config
 echo
 isthatright
 
@@ -209,15 +209,15 @@ echo "Signing tarball..."
 cp -p "release-$version/cvc4-$version.tar.gz" .
 gpg -b --armor "cvc4-$version.tar.gz"
 
-echo
-echo "Signing cvc4 binary..."
-cp -p "release-$version/src/main/cvc4" "cvc4-$version"
-gpg -b --armor "cvc4-$version"
+#echo
+#echo "Signing cvc4 binary..."
+#cp -p "release-$version/cvc4-$version/builds/src/main/cvc4" "cvc4-$version"
+#gpg -b --armor "cvc4-$version"
 
-echo
-echo "Signing pcvc4 binary..."
-cp -p "release-$version/src/main/pcvc4" "pcvc4-$version"
-gpg -b --armor "pcvc4-$version"
+#echo
+#echo "Signing pcvc4 binary..."
+#cp -p "release-$version/src/main/pcvc4" "pcvc4-$version"
+#gpg -b --armor "pcvc4-$version"
 
 echo
 echo "About to run: svn commit -m \"Cutting release $version.\""