summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdrian Thurston <thurston@colm.net>2019-12-31 17:06:00 +0200
committerAdrian Thurston <thurston@colm.net>2019-12-31 17:09:19 +0200
commit40c519e1a325d3f69389bbee472dea06118b3770 (patch)
tree62b56fc0fead53d4c20bf542c948d15eff9044ee
parent06fbe467c0b900ce20705ad3b4eb8e8454b4a56e (diff)
downloadragel-40c519e1a325d3f69389bbee472dea06118b3770.tar.gz
containing package versioned X and sub-packages X.Y
Containing package (colm-suite) will start at version 1. This first release will contain colm 0.14 and ragel 7.0. refs #101
-rw-r--r--.gitignore4
-rw-r--r--configure.ac10
-rw-r--r--test/dist.sh9
3 files changed, 12 insertions, 11 deletions
diff --git a/.gitignore b/.gitignore
index fed26541..7b7f5162 100644
--- a/.gitignore
+++ b/.gitignore
@@ -28,5 +28,5 @@
/install_manifest.txt
/*.user
-colm-suite-*.*.*
-colm-suite-*.*.*.tar.{gz,bz2}
+colm-suite-*.tar.{gz,bz2}
+colm-suite-*
diff --git a/configure.ac b/configure.ac
index e9ff3652..8a518f8b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -20,13 +20,13 @@ dnl LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM
dnl OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
dnl SOFTWARE.
-AC_INIT(colm-suite, 1.0.1)
+AC_INIT(colm-suite, 1)
-RAGEL_VERSION="7.0.1"
-RAGEL_PUBDATE="November 2019"
+RAGEL_VERSION="7.0"
+RAGEL_PUBDATE="January 2020"
-COLM_VERSION="0.13.1"
-COLM_PUBDATE="November 2019"
+COLM_VERSION="0.14"
+COLM_PUBDATE="January 2020"
AM_INIT_AUTOMAKE([foreign])
diff --git a/test/dist.sh b/test/dist.sh
index 5fa26523..297e9bad 100644
--- a/test/dist.sh
+++ b/test/dist.sh
@@ -6,13 +6,14 @@
set -ex
-make dist
+VERSION=`sed -n '/^[ \t]*AC_INIT\>/{ s/.*, *//; s/ *).*//; p }' configure.ac`
-rm -Rf colm-suite-1.0.1
+rm -Rf colm-suite-${VERSION}.tar.{gz,bz2} colm-suite-${VERSION}
-tar -zxvf colm-suite-1.0.1.tar.gz
+make dist
+tar -zxvf colm-suite-${VERSION}.tar.gz
-cd colm-suite-1.0.1
+cd colm-suite-${VERSION}
./configure --prefix=/tmp/colm-suite \
--with-crack=/home/thurston/pkgs/crack --enable-manual --enable-debug