#!/bin/sh
-test=echo
-if git-status > /dev/null; then
- :
-else
+if [ "x`git status -s -uno`" != "x" ]; then
echo 'Uncommited changes in repository' 1>&2
exit 1
fi
# Update the version numbers
-$test sed -i configure.in "/^AM_INIT_AUTOMAKE/s/2\.[0-9.]*/$version/"
+sed -i configure.ac -e "/^AC_INIT(/s/2\.[0-9.]*/$version/"
-$test sed -i fontconfig/fontconfig.h \
- -e "/^#define FC_MAJOR/s/[0-9]*/$major/" \
- -e "/^#define FC_MINOR/s/[0-9]*/$minor/" \
- -e "/^#define FC_REVISION/s/[0-9]*/$revision/"
+sed -i fontconfig/fontconfig.h \
+ -e "/^#define FC_MAJOR/s/[0-9][0-9]*/$major/" \
+ -e "/^#define FC_MINOR/s/[0-9][0-9]*/$minor/" \
+ -e "/^#define FC_REVISION/s/[0-9][0-9]*/$revision/"
#
# Compute pretty form of new version number
#
# header
#
- (sed '/^2\.[0-9.]*$/,$d' README |
- sed -e "s/Version.*/Version $version_note/" \
- -e "s/200.*/$date/" | awk '
+ (sed '/^2\.[0-9.]*/,$d' README |
+ sed -r -e "s/Version.*/Version $version_note/" \
+ -e "s/[0-9]{4}\-[0-9]{2}\-[0-9]{2}$/$date/" | awk '
/^[ \t]/ {
gsub ("^[ \t]*", "");
gsub ("[ \t]*$", "");
echo $version_note
echo
- git-log --pretty=short $last.. | git-shortlog | cat
+ git log --pretty=short $last.. | git shortlog | cat
#
# previous changelogs
#
- sed -n '/^2\.[0-9.]*$/,$p' README) > README.tmp ||
+ sed -n '/^2\.[0-9.]*/,$p' README) > README.tmp ||
(echo "README update failed"; exit 1)
- $test mv README.tmp README
+ mv README.tmp README
fi
-$test git-commit -m"Bump version to $version" \
- configure.in \
+$test git commit -m"Bump version to $version" \
+ configure.ac \
fontconfig/fontconfig.h \
README
# tag the tree
-$test git-tag -u 096c4dd3 -m"Version $version" $version
+$test git tag -s -m "Version $version" $version
# Make distributed change log
-$test "git-log --stat $last.. > ChangeLog-$version"
+git log --stat $last.. > ChangeLog-$version