PsychoticNinja/irssi
1
0
Fork 1
mirror of https://github.com/irssi/irssi.git synced 2025-04-26 21:11:19 -05:00
Code Issues Projects Releases Wiki Activity

Handle missing svn, and running autogen from the tarball better

Browse Source 
Use svn from SVN env var if given
Revert quotes in messages getting broken from r3709


git-svn-id: http://svn.irssi.org/repos/irssi/trunk@3986 dbcabf3a-b0e7-0310-adc4-f8d773084564
This commit is contained in:
Wouter Coekaerts 2005-09-08 11:01:21 +00:00 committed by coekie
parent 2998ce6daa
commit 6ff6947c40
1 changed files with 31 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
autogen.sh
View File

@ -32,7 +32,10 @@ perl syntax.pl
# create changelog # create changelog
# the TZ hack is needed. # the TZ hack is needed.
# otherwise the log will have local timezone # otherwise the log will have local timezone
if test -z "$SVN"; then
SVN=svn SVN=svn
fi
if type -p $SVN > /dev/null; then
if test -f $srcdir/ChangeLog; then if test -f $srcdir/ChangeLog; then
CHANGELOG_VERSION=`head -n 2 $srcdir/ChangeLog| grep '^r' | sed 's/^r\([0-9]*\).*/\1/'` CHANGELOG_VERSION=`head -n 2 $srcdir/ChangeLog| grep '^r' | sed 's/^r\([0-9]*\).*/\1/'`
fi fi
@ -41,10 +44,9 @@ if test -z $CHANGELOG_VERSION; then
TZ=UTC $SVN log -v > $srcdir/ChangeLog TZ=UTC $SVN log -v > $srcdir/ChangeLog
else else
SVN_VERSION=`$SVN info $srcdir | grep 'Last Changed Rev' | awk '{print $4}'` SVN_VERSION=`$SVN info $srcdir | grep 'Last Changed Rev' | awk '{print $4}'`
if test -z SVN_VERSION; then if test -z "$SVN_VERSION"; then
echo "**Error**: Couldn't get svn revision number. svn or .svn dirs missing?" echo "**Warning**: Couldn't get svn revision number. This is probably not an svn checkout."
exit 1 else
fi
if test $SVN_VERSION -eq $CHANGELOG_VERSION; then if test $SVN_VERSION -eq $CHANGELOG_VERSION; then
echo ChangeLog is already up-to-date. echo ChangeLog is already up-to-date.
else else
@ -54,6 +56,15 @@ else
cat $srcdir/ChangeLog.prev >> $srcdir/ChangeLog cat $srcdir/ChangeLog.prev >> $srcdir/ChangeLog
fi fi
fi fi
fi
else
if test -f $srcdir/ChangeLog; then
echo "**Warning**: svn not found, skipping ChangeLog updating. The reported irssi version may be incorrect."
else
echo "**Error**: svn not found, and ChangeLog file missing, can not determine version."
exit 1
fi
fi
files=`echo docs/help/in/*.in|sed -e 's,docs/help/in/Makefile.in ,,' -e 's,docs/help/in/,!,g' -e 's/\.in /.in ?/g'` files=`echo docs/help/in/*.in|sed -e 's,docs/help/in/Makefile.in ,,' -e 's,docs/help/in/,!,g' -e 's/\.in /.in ?/g'`
cat docs/help/in/Makefile.am.gen|sed "s/@HELPFILES@/$files/g"|sed 's/?/\\?/g'|tr '!?' '\t\n' > docs/help/in/Makefile.am cat docs/help/in/Makefile.am.gen|sed "s/@HELPFILES@/$files/g"|sed 's/?/\\?/g'|tr '!?' '\t\n' > docs/help/in/Makefile.am
@ -115,7 +126,7 @@ fi
if test -z "$*"; then if test -z "$*"; then
echo "**Warning**: I am going to run \`configure' with no arguments." echo "**Warning**: I am going to run \`configure' with no arguments."
echo "If you wish to pass any to it, please specify them on the" echo "If you wish to pass any to it, please specify them on the"
echo "\`$0\' command line." echo \`$0\'" command line."
echo echo
fi fi
@ -166,9 +177,9 @@ conf_flags="--enable-maintainer-mode --enable-compile-warnings" #--enable-iso-c
if test x$NOCONFIGURE = x; then if test x$NOCONFIGURE = x; then
echo Running $srcdir/configure $conf_flags "$@" ... echo Running $srcdir/configure $conf_flags "$@" ...
$srcdir/configure $conf_flags "$@" \ $srcdir/configure $conf_flags "$@" \
&& echo "Now type \`make\' to compile $PKG_NAME" || exit 1 && echo Now type \`make\' to compile $PKG_NAME || exit 1
else else
echo "Skipping configure process." echo Skipping configure process.
fi fi
# make sure perl hashes have correct length # make sure perl hashes have correct length