diff options
| author | Morgan Deters <mdeters@cs.nyu.edu> | 2013-04-03 14:36:22 -0400 |
|---|---|---|
| committer | Morgan Deters <mdeters@cs.nyu.edu> | 2013-04-03 14:36:22 -0400 |
| commit | e8da0716fce0ac7cde6e3f843b4b152ecbf56a70 (patch) | |
| tree | 7fd7a0a67d80b746ae1611d93a88e7895202c3cc | |
| parent | 92058c8c7a7bb33602913f6f8afc9a34f2f9c5bc (diff) | |
Pre-release versioning
| -rw-r--r-- | NEWS | 5 | ||||
| -rw-r--r-- | configure.ac | 4 | ||||
| -rwxr-xr-x | contrib/cut-release | 4 | ||||
| -rw-r--r-- | library_versions | 1 |
4 files changed, 11 insertions, 3 deletions
@@ -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 9746b9f94..3aae5163e 100644 --- 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 03c8a3ed1..ed39da6e4 100755 --- 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 f5f3daef7..3b73b28f0 100644 --- 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 |