From 92e69fa8a0801a2190c3be52e1048bbad17e851f Mon Sep 17 00:00:00 2001 From: pk910 Date: Wed, 13 Jul 2011 15:13:05 +0200 Subject: [PATCH] adding git version as revision now --- ircd/version.c | 60 ----------------------------------------------- ircd/version.c.SH | 5 +++- 2 files changed, 4 insertions(+), 61 deletions(-) delete mode 100644 ircd/version.c diff --git a/ircd/version.c b/ircd/version.c deleted file mode 100644 index 7f74b2b..0000000 --- a/ircd/version.c +++ /dev/null @@ -1,60 +0,0 @@ -/* - * IRC - Internet Relay Chat, ircd/version.c - * Copyright (C) 1990 Chelsea Ashley Dyerman - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 1, or (at your option) - * any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - */ - -/* - * This file is generated by version.c.SH. Any changes made will go away. - */ - -#include "version.h" -#include "patchlevel.h" - -const char *generation = "313"; -const char *creation = "Mon Jun 27 2011 at 23:27:26 CEST"; -const char *version = BASE_VERSION RELEASE PATCHLEVEL PATCHSET; -const char *svn_srev = "0"; - -const char *infotext[] = { - "IRC --", - "This program is free software; see LICENSE in the distribution", - "", - "Based on the original code written by Jarkko Oikarinen, version 2.6:", - "Wiz Jarkko Oikarinen ", - "", - "The main developer of version u2.9 and u2.10 was:", - "Run Carlo Wood ", - "", - "The head developer of the u2.10 source tree was:", - "Bleep Thomas Helvey ", - "", - "The current maintainors of the u2.10 source tree are:", - "Isomer Perry Lorier ", - "Kev Kevin Mitchell ", - "", - "Contributors to this release:", - "Kev, Isomer, Gte, Ghostwolf, Bleep", - "Debugging and support:", - "SeKs, Maniac-, HeKTik, OmniDynmc, Liandrin, Dianora", - "Special thanks to Angel and Buff for believing in us and putting" - "up with frantic late night phone calls" - "", - "Thanks goes to all other people who contributed to any version.", - "A full listing of all coders can be found in doc/Authors in the", - "source.", - 0, -}; diff --git a/ircd/version.c.SH b/ircd/version.c.SH index 3243327..92549d5 100644 --- a/ircd/version.c.SH +++ b/ircd/version.c.SH @@ -25,7 +25,10 @@ else \ svn_revision=`svn info | grep Revision | grep -o -E '[0-9]+'` if test "x$svn_revision" = "x" ; then - svn_revision="0" + svn_revision=`git log -n 1 --pretty="format:git-%h"` + if test "x$svn_revision" = "x" ; then + svn_revision="0" + fi fi -- 2.20.1