diff options
| -rw-r--r-- | CHANGELOG | 5 | ||||
| -rwxr-xr-x | Makefile.am | 8 | ||||
| -rw-r--r-- | config_w32.h | 6 | ||||
| -rw-r--r-- | configure.in | 2 | ||||
| -rwxr-xr-x | htdocs/index.html | 2 | ||||
| -rwxr-xr-x | re2c_docs.sh | 1 | ||||
| -rwxr-xr-x | release.sh | 18 |
7 files changed, 30 insertions, 12 deletions
@@ -1,5 +1,10 @@ +Version 0.13.7.2 (2014-07-27) +----------------------------- +- Included man page into dist, respect users CXXFLAGS. + Version 0.13.7.1 (2014-07-26) ----------------------------- +- Added missing files to tarball Version 0.13.7 (2014-07-25) --------------------------- diff --git a/Makefile.am b/Makefile.am index 5ec3f04f..017691d4 100755 --- a/Makefile.am +++ b/Makefile.am @@ -13,7 +13,8 @@ BUILT_SOURCES = parser.cc scanner.cc #CXXFLAGS = -O2 -Wall -Wno-unused -Wno-parentheses -Wno-deprecated #CXXFLAGS = -ggdb -fno-inline -O2 -Wall -Wextra -pedantic -Wconversion -Wpointer-arith -Wwrite-strings -Wredundant-decls -Werror -Wunused-function -DPEDANTIC -CXXFLAGS = -W -Wall -Wextra -pedantic -Wredundant-decls -DPEDANTIC -O2 -g +#CXXFLAGS += -O2 +CXXFLAGS += -W -Wall -Wextra -pedantic -Wredundant-decls -DPEDANTIC YFLAGS = -d RE2C = re2c$(EXEEXT) @@ -23,8 +24,11 @@ CLEANFILES = parser.cc y.tab.c y.tab.h scanner.cc re2c.1 .version htdocs/manua DISTCLEANFILES = makerpm re2c.spec README scanner.cc re2c$(EXEEXT) +man_MANS = re2c.1 + EXTRA_SRC = README parser.y scanner.re y.tab.h CHANGELOG NO_WARRANTY \ - doc examples test bootstrap/*.cc bootstrap/*.h lessons + doc examples test bootstrap/*.cc bootstrap/*.h lessons \ + $(man_MANS) $(DOCS_IN) $(DOCS_GEN) EXTRA_DIST = $(EXTRA_SRC) makerpm.in re2c.spec.in re2c.spec README.in config_w32.h.in EXTRA_ZIP = $(EXTRA_SRC) config_w32.h *.sln *.vcproj re2c.rules diff --git a/config_w32.h b/config_w32.h index 8f46783d..6f23e275 100644 --- a/config_w32.h +++ b/config_w32.h @@ -59,13 +59,13 @@ #define PACKAGE_NAME "re2c" /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "re2c 0.13.7.1" +#define PACKAGE_STRING "re2c 0.13.7.2" /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME "re2c" /* Define to the version of this package. */ -#define PACKAGE_VERSION "0.13.7.1" +#define PACKAGE_VERSION "0.13.7.2" /* The size of a `char', as computed by sizeof. */ #define SIZEOF_CHAR 1 @@ -83,7 +83,7 @@ #define STDC_HEADERS 1 /* Version number of package */ -#define VERSION "0.13.7.1" +#define VERSION "0.13.7.2" /* Define to empty if `const' does not conform to ANSI C. */ /* #undef const */ diff --git a/configure.in b/configure.in index 033b370c..d945e91a 100644 --- a/configure.in +++ b/configure.in @@ -1,5 +1,5 @@ AC_PREREQ([2.57]) -AC_INIT(re2c, 0.13.7.1, re2c-general@lists.sourceforge.net) +AC_INIT(re2c, 0.13.7.2, re2c-general@lists.sourceforge.net) AM_INIT_AUTOMAKE(re2c, $PACKAGE_VERSION) AC_CONFIG_SRCDIR(actions.cc) AM_CONFIG_HEADER(config.h) diff --git a/htdocs/index.html b/htdocs/index.html index 599b43a7..3225fbec 100755 --- a/htdocs/index.html +++ b/htdocs/index.html @@ -68,6 +68,8 @@ </ul> <hr /> <h1>Changelog</h1> + <h2>2014-07-27: 0.13.7.2</h2> + <li>Included man page into dist, respect users CXXFLAGS.</li> <h2>2014-07-26: 0.13.7.1</h2> <li>Added missing files to tarball</li> <h2>2014-07-25: 0.13.7</h2> diff --git a/re2c_docs.sh b/re2c_docs.sh index f7f8592e..8fbce9b1 100755 --- a/re2c_docs.sh +++ b/re2c_docs.sh @@ -4,4 +4,5 @@ a2x -f manpage re2c.ad # generate htdocs/manual.html from re2c.ad +mkdir -p htdocs asciidoc -o htdocs/manual.html re2c.ad @@ -1,4 +1,6 @@ -#!/bin/sh -e +#!/bin/bash + +set -e if [ $# -ne 1 ] then @@ -11,15 +13,16 @@ version="$1" # edit version in configure.in lcontext="AC_INIT\(re2c, " rcontext=", re2c-general@lists\.sourceforge\.net\)" -old="[0-9]+\.[0-9]+\.[0-9]+" +old="[0-9]+(\.[0-9]+)*(\.dev)?" new=$version sed -i -E "s/$lcontext$old$rcontext/$lcontext$new$rcontext/" configure.in ./autogen.sh ./configure make clean -make tests -j5 -make zip dist docs +make -j5 +make tests +make zip dist # dist-check tmpdir=` date +"%Y%m%d%H%M%S%N"` @@ -29,13 +32,16 @@ cd $tmpdir gunzip re2c-$version.tar.gz tar -x -f re2c-$version.tar cd re2c-$version -./configure && make -j5 && make tests +./configure +make -j5 +make tests cd ../.. rm -r $tmpdir # commit release git commit -a -m "Release $version." -git push +git tag $version +git push --tags # upload files on sourceforge src=release |