Pre-release versioning

diff --git a/NEWS b/NEWS
index c6834044261757b660a0e093ab06d557d40651db..8c93b1478137b9cbc1de8ca70de3c509a7cb9e5b 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,10 @@
 This file contains a summary of important user-visible changes.
 
+Changes since 1.1
+=================
+
+* nothing notable yet
+
 Changes since 1.0
 =================
 

diff --git a/configure.ac b/configure.ac
index 9746b9f94b9d5e717552a164c7a705b1fdb24f83..3aae5163e6ac1d62d39afc93086dad58e0019a0a 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -3,8 +3,8 @@
 
 m4_define(_CVC4_MAJOR,          1)       dnl version (major)
 m4_define(_CVC4_MINOR,          1)       dnl version (minor)
-m4_define(_CVC4_RELEASE,        0)       dnl version (alpha)
-m4_define(_CVC4_EXTRAVERSION,   [])      dnl version (extra)
+m4_define(_CVC4_RELEASE,        1)       dnl version (alpha)
+m4_define(_CVC4_EXTRAVERSION,   [-prerelease])      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 03c8a3ed1cda8e3dcb3862ad304645404e82bf9e..ed39da6e4968869e27961f4298849bd3acd25638 100755 (executable)
--- a/contrib/cut-release
+++ b/contrib/cut-release
@@ -249,7 +249,7 @@ $dryrun || git tag "$version"
 
 echo
 andbranch=
-if git status -bs | grep -q '^## master\($\|  *\)'; then
+if git status -bs | grep -q '^## master\($\|  *\|\.\.\.\)'; then
   if [ "$release" = 0 ]; then
     echo "About to run: git branch \"$version.x\""
     isthatright
@@ -273,6 +273,8 @@ echo "1. push to GitHub (don't forget to push master$andbranch and the $version
 echo "2. upload source and binaries"
 echo "3. advertise these packages"
 echo "4. add a $version release and next-milestone to Bugzilla."
+echo "5. change $version to pre-release in master$andbranch"
+echo "   (in configure.ac) and update library_versions and NEWS."
 echo
 
 trap '' EXIT

diff --git a/library_versions b/library_versions
index f5f3daef78a85689c4387b3a93b65b959ef3d837..3b73b28f051a9dc540c299b1b02ca9ba5b837720 100644 (file)
--- a/library_versions
+++ b/library_versions
@@ -48,3 +48,4 @@
 1\.0\.1-prerelease libcvc4:0:0:0 libcvc4parser:0:0:0 libcvc4compat:0:0:0 libcvc4bindings:0:0:0
 1\.1-prerelease libcvc4:0:0:0 libcvc4parser:0:0:0 libcvc4compat:0:0:0 libcvc4bindings:0:0:0
 1\.1 libcvc4:1:0:0 libcvc4parser:1:0:0 libcvc4compat:1:0:0 libcvc4bindings:1:0:0
+1\.1\.1-prerelease libcvc4:1:0:0 libcvc4parser:1:0:0 libcvc4compat:1:0:0 libcvc4bindings:1:0:0