Include revision in build

master
Yevgen Muntyan 2008-09-13 01:21:51 -05:00
parent e3919b1f27
commit 08bff23668
10 changed files with 33 additions and 19 deletions

View File

@ -15,6 +15,7 @@ Makefile.in
.moo.mprj.session
a.out
aclocal.m4
revision.m4
compile
config.guess
config.h.in

View File

@ -6,7 +6,8 @@ EXTRA_DIST += \
COPYING.GPL \
COPYING \
LICENSE \
THANKS
THANKS \
gen-revision-m4
@MOO_PO_SUBDIRS_RULE@
@MOO_PO_SUBDIRS_RULE2@
@ -59,14 +60,6 @@ DISTCLEANFILES += \
# DISTCHECK_CONFIGURE_FLAGS = --enable-unit-tests
distuninstallcheck_listfiles = find . -type f -print | grep -v share/mime/ | grep -v share/icons/hicolor
snapshot:
if [ -d $(top_srcdir)/.hg ]; then \
suffix=r`hg tip --template '{rev}'`; \
else \
suffix=`date +%F-%H-%M`; \
fi; \
$(MAKE) dist && mv $(PACKAGE)-$(VERSION).tar.bz2 $(PACKAGE)-"$$suffix".tar.bz2
win-test-stuff:
$(MAKE) all
mkdir -p test-stuff/test-data

View File

@ -26,6 +26,11 @@ AUTOCONF=${AUTOCONF:-autoconf}
LIBTOOLIZE=${LIBTOOLIZE:-libtoolize}
UGLY=${UGLY:-./ugly/ugly}
if [ -x gen-revision-m4 ]; then
echo ./gen-revision-m4
./gen-revision-m4 || exit $?
fi
if [ -f Makefile.ug ]; then
echo $UGLY
$UGLY || exit $?

View File

@ -3,12 +3,16 @@
#
# keep version in sync with doc/medit.t2t
AC_INIT([medit],[0.9.5],[muntyan@tamu.edu],[medit])
m4_define([moo_version], [0.9.5])
m4_include(revision.m4)
m4_ifndef([moo_version_detail], [m4_define([moo_version_detail],[])])
AC_INIT([medit],[moo_version[]moo_version_detail],[muntyan@tamu.edu],[medit])
AM_INIT_AUTOMAKE([foreign])
AC_CANONICAL_HOST
AC_CONFIG_HEADERS(config.h)
MOO_DEFINE_VERSIONS(moo, AC_PACKAGE_VERSION)
MOO_DEFINE_VERSIONS(moo,[moo_version],[moo_version_detail])
MOO_DEFINE_MODULE_VERSIONS(1,0)
MOO_AC_I18N(moo)

11
gen-revision-m4 Normal file
View File

@ -0,0 +1,11 @@
#! /bin/sh
if [ -z "$node" ]; then
node=`hg log -r tip --template {node} 2>/dev/null`
fi
node=`echo $node | head -c 12`
cat > revision.m4 << _EOFEOF
m4_define([moo_version_detail], [.$node])
_EOFEOF

View File

@ -17,7 +17,7 @@ VS_VERSION_INFO VERSIONINFO
BEGIN
VALUE "CompanyName", "http://mooedit.sourceforge.net/"
VALUE "FileDescription", "medit text editor"
VALUE "FileVersion", "@MOO_VERSION_UNQUOTED@.0"
VALUE "FileVersion", @MOO_VERSION@
VALUE "InternalName", "medit-@MOO_VERSION_UNQUOTED@"
VALUE "LegalCopyright", "(C) 2004-2008 by Yevgen Muntyan <muntyan@tamu.edu>"
VALUE "OriginalFilename", "medit.exe"

View File

@ -16,7 +16,7 @@ VS_VERSION_INFO VERSIONINFO
BEGIN
VALUE "CompanyName", "http://mooedit.sourceforge.net/"
VALUE "FileDescription", "libmoo"
VALUE "FileVersion", "@MOO_VERSION_UNQUOTED@.0"
VALUE "FileVersion", @MOO_VERSION@
VALUE "InternalName", "libmoo-@MOO_VERSION_UNQUOTED@"
VALUE "LegalCopyright", "(C) 2004-2008 by Yevgen Muntyan <muntyan@tamu.edu>"
VALUE "OriginalFilename", "libmoo.dll"

View File

@ -16,7 +16,7 @@ VS_VERSION_INFO VERSIONINFO
BEGIN
VALUE "CompanyName", "http://mooedit.sourceforge.net/"
VALUE "FileDescription", "libmoo bindings for python"
VALUE "FileVersion", "@MOO_VERSION_UNQUOTED@.0"
VALUE "FileVersion", @MOO_VERSION@
VALUE "InternalName", "moo-mod-@MOO_VERSION_UNQUOTED@"
VALUE "LegalCopyright", "(C) 2004-2008 by Yevgen Muntyan <muntyan@tamu.edu>"
VALUE "OriginalFilename", "moo.pyd"

View File

@ -16,7 +16,7 @@ VS_VERSION_INFO VERSIONINFO
BEGIN
VALUE "CompanyName", "http://mooedit.sourceforge.net/"
VALUE "FileDescription", "python plugin for medit"
VALUE "FileVersion", "@MOO_VERSION_UNQUOTED@.0"
VALUE "FileVersion", @MOO_VERSION@
VALUE "InternalName", "pymoo-@MOO_VERSION_UNQUOTED@"
VALUE "LegalCopyright", "(C) 2004-2008 by Yevgen Muntyan <muntyan@tamu.edu>"
VALUE "OriginalFilename", "pymoo.dll"

View File

@ -9,18 +9,18 @@ $1[]_MICRO_VERSION=`echo "$2" | $SED 's/[[^.]][[^.]]*.[[^.]][[^.]]*.\(.*\)/\1/'`
])
##############################################################################
# MOO_DEFINE_VERSIONS(pkg,version)
# MOO_DEFINE_VERSIONS(pkg,version,detail)
#
AC_DEFUN([MOO_DEFINE_VERSIONS],[
_MOO_SPLIT_VERSION([m4_toupper($1)], [$2])
m4_toupper($1)_VERSION=\"$2\"
m4_toupper($1)_VERSION_UNQUOTED=$2
m4_toupper($1)_VERSION=\"[$2][$3]\"
m4_toupper($1)_VERSION_UNQUOTED=[$2][$3]
AC_DEFINE(m4_toupper($1)_VERSION, ["$2" "$3"], [$1 version])
AC_SUBST(m4_toupper($1)_VERSION)
AC_SUBST(m4_toupper($1)_VERSION_UNQUOTED)
AC_SUBST(m4_toupper($1)_MAJOR_VERSION)
AC_SUBST(m4_toupper($1)_MINOR_VERSION)
AC_SUBST(m4_toupper($1)_MICRO_VERSION)
AC_DEFINE(m4_toupper($1)_VERSION, ["$2"], [$1 version])
AC_DEFINE_UNQUOTED(m4_toupper($1)_MAJOR_VERSION, [$[]m4_toupper($1)_MAJOR_VERSION], [$1 major version])
AC_DEFINE_UNQUOTED(m4_toupper($1)_MINOR_VERSION, [$[]m4_toupper($1)_MINOR_VERSION], [$1 minor version])
AC_DEFINE_UNQUOTED(m4_toupper($1)_MICRO_VERSION, [$[]m4_toupper($1)_MICRO_VERSION], [$1 micro version])