aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormichael <michael@3ae390bd-cb1e-0410-b409-cd5a39f66f1f>2007-01-23 04:38:43 +0000
committermichael <michael@3ae390bd-cb1e-0410-b409-cd5a39f66f1f>2007-01-23 04:38:43 +0000
commit9f16bd102ac588a85dddcd8557c2217752528e5c (patch)
tree5594bf2f4b3ca0c4d3f5cd400c6e761823c907be
parent69e5f2ef2745bb2a47b65850cc9c0fd55f1f66e3 (diff)
downloadlcd4linux-9f16bd102ac588a85dddcd8557c2217752528e5c.tar.gz
try to add svn version
git-svn-id: https://ssl.bulix.org/svn/lcd4linux/trunk@756 3ae390bd-cb1e-0410-b409-cd5a39f66f1f
Diffstat (limited to '')
-rw-r--r--Makefile.am13
-rw-r--r--Makefile.in12
-rw-r--r--configure.in4
-rw-r--r--lcd4linux.c9
-rw-r--r--svn_version.h1
-rwxr-xr-xsvn_version.sh15
6 files changed, 43 insertions, 11 deletions
diff --git a/Makefile.am b/Makefile.am
index 3d01351..c45fb28 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -18,7 +18,7 @@ lcd4linux_LDADD = @DRIVERS@ @PLUGINS@ @DRVLIBS@ @PLUGINLIBS@
lcd4linux_DEPENDENCIES = @DRIVERS@ @PLUGINS@
lcd4linux_SOURCES = \
-lcd4linux.c \
+lcd4linux.c svn_version.h \
cfg.c cfg.h \
debug.c debug.h \
drv.c drv.h \
@@ -83,7 +83,6 @@ drv_MatrixOrbital.c \
drv_MilfordInstruments.c \
drv_Noritake.c \
drv_NULL.c \
-drv_picoLCD.c \
drv_RouterBoard.c \
drv_Sample.c \
drv_serdisplib.c \
@@ -131,6 +130,7 @@ plugin_xmms.c
EXTRA_DIST = \
+svn_version.sh \
lcd4linux.conf.sample \
lcd4kde.conf \
lcd4linux.kdelnk \
@@ -147,3 +147,12 @@ TODO \
README \
plugin_sample.c
+
+
+# create subversion version
+
+.PHONY: svn_version
+
+svn_version:
+ svn_version.sh
+
diff --git a/Makefile.in b/Makefile.in
index 6ac0e58..af5e8c3 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -213,7 +213,7 @@ lcd4linux_LDFLAGS =
lcd4linux_LDADD = @DRIVERS@ @PLUGINS@ @DRVLIBS@ @PLUGINLIBS@
lcd4linux_DEPENDENCIES = @DRIVERS@ @PLUGINS@
lcd4linux_SOURCES = \
-lcd4linux.c \
+lcd4linux.c svn_version.h \
cfg.c cfg.h \
debug.c debug.h \
drv.c drv.h \
@@ -278,7 +278,6 @@ drv_MatrixOrbital.c \
drv_MilfordInstruments.c \
drv_Noritake.c \
drv_NULL.c \
-drv_picoLCD.c \
drv_RouterBoard.c \
drv_Sample.c \
drv_serdisplib.c \
@@ -325,6 +324,7 @@ plugin_wireless.c \
plugin_xmms.c
EXTRA_DIST = \
+svn_version.sh \
lcd4linux.conf.sample \
lcd4kde.conf \
lcd4linux.kdelnk \
@@ -468,7 +468,6 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/drv_generic_parport.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/drv_generic_serial.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/drv_generic_text.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/drv_picoLCD.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/drv_serdisplib.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/evaluator.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hash.Po@am__quote@
@@ -810,6 +809,13 @@ uninstall-am: uninstall-binPROGRAMS uninstall-info-am
tags uninstall uninstall-am uninstall-binPROGRAMS \
uninstall-info-am
+
+# create subversion version
+
+.PHONY: svn_version
+
+svn_version:
+ svn_version.sh
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
diff --git a/configure.in b/configure.in
index 90796c1..acec6a0 100644
--- a/configure.in
+++ b/configure.in
@@ -28,9 +28,9 @@
# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
AC_PREREQ(2.59)
-AC_INIT([LCD4Linux],[0.10.1-SVN],[lcd4linux-users@lists.sourceforge.net])
+AC_INIT([LCD4Linux],[0.10.1],[lcd4linux-users@lists.sourceforge.net])
AC_CONFIG_SRCDIR([lcd4linux.c])
-AM_INIT_AUTOMAKE([lcd4linux],0.10.1-SVN)
+AM_INIT_AUTOMAKE([lcd4linux],0.10.1)
AM_CONFIG_HEADER(config.h)
# Checks for programs.
diff --git a/lcd4linux.c b/lcd4linux.c
index 87fc47b..33a41e7 100644
--- a/lcd4linux.c
+++ b/lcd4linux.c
@@ -5,7 +5,7 @@
* LCD4Linux
*
* Copyright (C) 1999, 2000, 2001, 2002, 2003 Michael Reinelt <reinelt@eunet.at>
- * Copyright (C) 2004 The LCD4Linux Team <lcd4linux-devel@users.sourceforge.net>
+ * Copyright (C) 2004, 2005, 2006, 2007 The LCD4Linux Team <lcd4linux-devel@users.sourceforge.net>
*
* This file is part of LCD4Linux.
*
@@ -36,6 +36,7 @@
#include <signal.h>
#include <time.h>
+#include "svn_version.h"
#include "cfg.h"
#include "debug.h"
#include "qprintf.h"
@@ -56,8 +57,8 @@
#define PIDFILE "/var/run/lcd4linux.pid"
-static char *release = "LCD4Linux " VERSION;
-static char *copyright = "Copyright (C) 2005 The LCD4Linux Team <lcd4linux-devel@users.sourceforge.net>";
+static char *release = "LCD4Linux " VERSION "-" SVN_VERSION;
+static char *copyright = "Copyright (C) 2005, 2006, 2007 The LCD4Linux Team <lcd4linux-devel@users.sourceforge.net>";
static char **my_argv;
extern char *output;
@@ -255,7 +256,7 @@ int main(int argc, char *argv[])
running_foreground = 1;
}
- info("Version " VERSION " starting");
+ info("Version " VERSION "-" SVN_VERSION " starting");
if (!running_foreground && (my_argv[0] == NULL || my_argv[0][0] != '/')) {
info("invoked without full path; restart may not work!");
}
diff --git a/svn_version.h b/svn_version.h
new file mode 100644
index 0000000..0f76b87
--- /dev/null
+++ b/svn_version.h
@@ -0,0 +1 @@
+#define SVN_VERSION "752:755M"
diff --git a/svn_version.sh b/svn_version.sh
new file mode 100755
index 0000000..82df1b9
--- /dev/null
+++ b/svn_version.sh
@@ -0,0 +1,15 @@
+#!/bin/sh
+
+# $Id$
+# $URL$
+
+
+OLD_VERSION=`cat svn_version.h 2>/dev/null`
+
+if [ -d .svn ]; then
+ NEW_VERSION="#define SVN_VERSION \"`svnversion -n`\""
+fi
+
+if [ "$NEW_VERSION" != "$OLD_VERSION" ]; then
+ echo $NEW_VERSION >svn_version.h
+fi