summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdrian Thurston <thurston@colm.net>2019-11-18 14:08:34 -0800
committerAdrian Thurston <thurston@colm.net>2019-11-18 14:08:34 -0800
commit365d61749fdf450bd2142e427aadc4244e716355 (patch)
treef4fd561181e4335b932394544e2df465644d36cc
parent2d20f7c170494dc581fdff23fd07e99e928907f2 (diff)
downloadcolm-365d61749fdf450bd2142e427aadc4244e716355.tar.gz
declaring stable version 0.13.1 of colm and 7.0.1 of ragel
Packing these up in colm-suite version 1.0.1. Using a separate version number for the contaning package.
-rw-r--r--colm/Makefile.am6
-rw-r--r--colm/main.cc2
-rw-r--r--configure.ac12
3 files changed, 12 insertions, 8 deletions
diff --git a/colm/Makefile.am b/colm/Makefile.am
index cce19986..20930e4b 100644
--- a/colm/Makefile.am
+++ b/colm/Makefile.am
@@ -40,7 +40,7 @@ lib_LTLIBRARIES = libcolm.la
noinst_LIBRARIES = libprog.a
libcolm_la_SOURCES = $(RUNTIME_SRC)
-libcolm_la_LDFLAGS = -release ${PACKAGE_VERSION} -no-undefined
+libcolm_la_LDFLAGS = -release ${COLM_VERSION} -no-undefined
if LINKER_NO_UNDEFINED
libcolm_la_LDFLAGS += -Wl,--no-undefined
@@ -134,8 +134,8 @@ include/colm:
ln -s .. include/colm
version.h: Makefile
- echo '#define VERSION "$(PACKAGE_VERSION)"' > version.h
- echo '#define PUBDATE "$(PUBDATE)"' >> version.h
+ echo '#define COLM_VERSION "$(COLM_VERSION)"' > version.h
+ echo '#define COLM_PUBDATE "$(COLM_PUBDATE)"' >> version.h
config.h: ../src/config.h
cp ../src/config.h ./
diff --git a/colm/main.cc b/colm/main.cc
index 023baed5..def8b150 100644
--- a/colm/main.cc
+++ b/colm/main.cc
@@ -203,7 +203,7 @@ void usage()
/* Print version information. */
void version()
{
- cout << "Colm version " VERSION << " " PUBDATE << endl <<
+ cout << "Colm version " COLM_VERSION << " " COLM_PUBDATE << endl <<
"Copyright (c) 2007-2019 by Adrian D. Thurston" << endl;
}
diff --git a/configure.ac b/configure.ac
index 932e3af3..e8a38785 100644
--- a/configure.ac
+++ b/configure.ac
@@ -20,11 +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, 0.13.0.7)
-PUBDATE="May 2019"
+AC_INIT(colm-suite, 1.0.1)
-RAGEL_VERSION="7.0.0.12"
-RAGEL_PUBDATE="May 2019"
+RAGEL_VERSION="7.0.1"
+RAGEL_PUBDATE="November 2019"
+
+COLM_VERSION="0.13.1"
+COLM_PUBDATE="November 2019"
AM_INIT_AUTOMAKE([foreign])
@@ -34,6 +36,8 @@ AM_INIT_AUTOMAKE([foreign])
AC_CONFIG_MACRO_DIR([m4])
AC_SUBST(PUBDATE)
+AC_SUBST(COLM_VERSION)
+AC_SUBST(COLM_PUBDATE)
AC_SUBST(RAGEL_VERSION)
AC_SUBST(RAGEL_PUBDATE)
AC_CHECK_SIZEOF([int])