From ff70e9f976c41d2ccac19f7d2a8994492d35da22 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexander=20F=C3=A6r=C3=B8y?= Date: Sat, 31 May 2014 01:13:46 +0200 Subject: [PATCH] Kill svn support from irssi-version.sh --- Makefile.am | 2 ++ irssi-version.sh | 12 ++++-------- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/Makefile.am b/Makefile.am index 158b7619..07c5d292 100644 --- a/Makefile.am +++ b/Makefile.am @@ -7,8 +7,10 @@ BUILT_SOURCES = default-config.h default-theme.h irssi-version.h default-config.h: $(srcdir)/irssi.conf $(srcdir)/file2header.sh $(srcdir)/irssi.conf default_config > default-config.h + default-theme.h: $(srcdir)/default.theme $(srcdir)/file2header.sh $(srcdir)/default.theme default_theme > default-theme.h + irssi-version.h: $(srcdir)/irssi-version.sh $(srcdir) | cmp -s - $@ || $(srcdir)/irssi-version.sh $(srcdir) >$@ diff --git a/irssi-version.sh b/irssi-version.sh index e147c96f..49abc55e 100755 --- a/irssi-version.sh +++ b/irssi-version.sh @@ -1,13 +1,9 @@ -#! /bin/sh +#!/bin/sh + +DATE=`GIT_DIR=$1/.git git log -1 --pretty=format:%ai HEAD` -if test -d "$1"/.svn ; then - DATE=`LC_ALL=C svn info "$1" | sed -n 's/^Last Changed Date: \(.*\)/\1/p'` -elif test -d "$1"/.git ; then - DATE=`GIT_DIR=$1/.git git log -1 --pretty=format:%ai HEAD` -else - DATE=`awk -F'|' 'NR == 2{print substr($3, 2)}' "$1"/ChangeLog` -fi VERSION_DATE=`echo $DATE | cut -f 1 -d ' ' | tr -d -` VERSION_TIME=`echo $DATE | cut -f 2 -d ' ' | awk -F: '{printf "%d", $1$2}'` + echo "#define IRSSI_VERSION_DATE $VERSION_DATE" echo "#define IRSSI_VERSION_TIME $VERSION_TIME"