r2727 - trunk/src/target/gsm/src/gsmd

laforge at sita.openmoko.org laforge at sita.openmoko.org
Fri Aug 17 10:33:59 CEST 2007


Author: laforge
Date: 2007-08-17 10:33:56 +0200 (Fri, 17 Aug 2007)
New Revision: 2727

Modified:
   trunk/src/target/gsm/src/gsmd/Makefile.am
   trunk/src/target/gsm/src/gsmd/gsmd.c
Log:
Implement GSMD version printout (Matt Mets <matt.mets at cibomahto.com>)


Modified: trunk/src/target/gsm/src/gsmd/Makefile.am
===================================================================
--- trunk/src/target/gsm/src/gsmd/Makefile.am	2007-08-17 08:32:50 UTC (rev 2726)
+++ trunk/src/target/gsm/src/gsmd/Makefile.am	2007-08-17 08:33:56 UTC (rev 2727)
@@ -2,6 +2,12 @@
 AM_CFLAGS = -std=gnu99
 plugindir = $(libdir)/gsmd
 
+gsmd-version.h:
+	echo -e '#ifndef GSMD_VERSION' \
+	'\n#define GSMD_VERSION "'`svnversion`'"' \
+	'\n#endif' > gsmd-version.h
+
+BUILT_SOURCES = gsmd-version.h
 sbin_PROGRAMS = gsmd
 
 gsmd_CFLAGS = -D PLUGINDIR=\"$(plugindir)\"

Modified: trunk/src/target/gsm/src/gsmd/gsmd.c
===================================================================
--- trunk/src/target/gsm/src/gsmd/gsmd.c	2007-08-17 08:32:50 UTC (rev 2726)
+++ trunk/src/target/gsm/src/gsmd/gsmd.c	2007-08-17 08:33:56 UTC (rev 2727)
@@ -36,6 +36,7 @@
 #include <sys/stat.h>
 
 #include "gsmd.h"
+#include "gsmd-version.h"
 
 #include <gsmd/gsmd.h>
 #include <gsmd/atcmd.h>
@@ -325,6 +326,11 @@
 	       "This program is FREE SOFTWARE under the terms of GNU GPL\n\n");
 }
 
+static void print_version(void)
+{
+	printf("gsmd, version %s\n",GSMD_VERSION);
+}
+
 static void print_usage(void)
 {
 	printf("Usage:\n"
@@ -382,7 +388,8 @@
 	while ((argch = getopt_long(argc, argv, "FVLdhp:s:l:v:m:", opts, NULL)) != -1) {
 		switch (argch) {
 		case 'V':
-			/* FIXME */
+			print_version();
+			exit(0);
 			break;
 		case 'L':
 			talloc_enable_leak_report_full();





More information about the commitlog mailing list