[tuxdroid-svn] r1309 - in software_suite_v2/middleware/tuxdriver/trunk: src unix win32

[remi <c2m...@c2...>]

Author: remi
Date: 2008-07-03 16:58:41 +0200 (Thu, 03 Jul 2008)
New Revision: 1309

Added:
   software_suite_v2/middleware/tuxdriver/trunk/src/svnrev.tmpl.h
Modified:
   software_suite_v2/middleware/tuxdriver/trunk/src/tux_sw_status.c
   software_suite_v2/middleware/tuxdriver/trunk/src/version.h
   software_suite_v2/middleware/tuxdriver/trunk/unix/Makefile
   software_suite_v2/middleware/tuxdriver/trunk/win32/Makefile
Log:
* updated version.h with the directory revision requested by the tool :
  svnwcrev on linux
  SubWCRev on windows

Added: software_suite_v2/middleware/tuxdriver/trunk/src/svnrev.tmpl.h
===================================================================
--- software_suite_v2/middleware/tuxdriver/trunk/src/svnrev.tmpl.h	                        (rev 0)
+++ software_suite_v2/middleware/tuxdriver/trunk/src/svnrev.tmpl.h	2008-07-03 14:58:41 UTC (rev 1309)
@@ -0,0 +1,37 @@
+/*
+ * Tux Droid - svnrev template
+ * Copyright (C) 2008 C2ME Sa
+ *
+ * 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 2, 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., 59 Temple Place - Suite 330, Boston, MA
+ * 02111-1307, USA.
+ */
+/* SVN : $Id$ */
+/* This file is a template to generate svnrev.h automatically.
+ * SubWCRev performs keyword susbstitution whith SVN information.
+ */
+
+#ifndef _SVNREV_H_
+#define _SVNREV_H_
+
+#define SVN_REV     $WCREV$
+#define SVN_REVSTR  "$WCREV$"
+#define SVN_REVDATE "$WCDATE$"
+#define SVN_MOD     $WCMODS?1:0$
+#define SVN_MIX     $WCMIXED?1:0$
+#define SVN_STATUS  (SVN_MOD + (SVN_MIX<<1))
+#define SVN_RANGE   "$WCRANGE$"
+#define SVN_URL     "$WCURL$"
+
+#endif /* _SVNREV_H_ */

Modified: software_suite_v2/middleware/tuxdriver/trunk/src/tux_sw_status.c
===================================================================
--- software_suite_v2/middleware/tuxdriver/trunk/src/tux_sw_status.c	2008-07-03 13:13:11 UTC (rev 1308)
+++ software_suite_v2/middleware/tuxdriver/trunk/src/tux_sw_status.c	2008-07-03 14:58:41 UTC (rev 1309)
@@ -213,19 +213,16 @@
 tux_sw_status_init(void)
 {
     static char driver_symbolic_version[128] = "";
-    char tmp_str[14] = VER_REVISION;
-    char my_rev[6] = "00000";
     
 #ifdef USE_MUTEX
     mutex_init(__status_mutex);
 #endif
 
-    memcpy(&my_rev[0], &tmp_str[7], 5);
-    sprintf(driver_symbolic_version, "libtuxdriver-%d.%d.%d-r%s(%s)", 
+    sprintf(driver_symbolic_version, "libtuxdriver_%d.%d.%d-r%d(%s)", 
         VER_MAJOR,
         VER_MINOR,
         VER_UPDATE,
-        my_rev,
+        VER_REVISION,
         VER_STATE);
         
     tux_sw_status_set_strvalue(SW_ID_DRIVER_SYMBOLIC_VERSION, 

Modified: software_suite_v2/middleware/tuxdriver/trunk/src/version.h
===================================================================
--- software_suite_v2/middleware/tuxdriver/trunk/src/version.h	2008-07-03 13:13:11 UTC (rev 1308)
+++ software_suite_v2/middleware/tuxdriver/trunk/src/version.h	2008-07-03 14:58:41 UTC (rev 1309)
@@ -22,11 +22,14 @@
 #ifndef _VERSION_H_
 #define _VERSION_H_
 
+#include "svnrev.h"
+
 #define VER_MAJOR           0
 #define VER_MINOR           0
 #define VER_UPDATE          1
 #define VER_BUILD           11
-#define VER_REVISION        "$Rev::      $"
+#define VER_REVISION        SVN_REV
+#define VER_DATE            SVN_REVDATE
 #define VER_STATE           "BETA"
 #ifdef WIN32
 #   define VER_ARCH         "WIN32"

Modified: software_suite_v2/middleware/tuxdriver/trunk/unix/Makefile
===================================================================
--- software_suite_v2/middleware/tuxdriver/trunk/unix/Makefile	2008-07-03 13:13:11 UTC (rev 1308)
+++ software_suite_v2/middleware/tuxdriver/trunk/unix/Makefile	2008-07-03 14:58:41 UTC (rev 1309)
@@ -76,6 +76,7 @@
 directories:
 	-@if [ ! -d "$(OUTPUT_DIR)" ]; then mkdir "$(OUTPUT_DIR)"; fi
 	-@if [ ! -d "$(OBJ_DIR)" ]; then mkdir "$(OBJ_DIR)"; fi
+	-@svnwcrev ../src ../src/svnrev.tmpl.h ../src/svnrev.h
 
 $(OBJ_DIR)/tux_battery.o: ../src/tux_battery.c	\
 ../src/tux_hw_status.h	\

Modified: software_suite_v2/middleware/tuxdriver/trunk/win32/Makefile
===================================================================
--- software_suite_v2/middleware/tuxdriver/trunk/win32/Makefile	2008-07-03 13:13:11 UTC (rev 1308)
+++ software_suite_v2/middleware/tuxdriver/trunk/win32/Makefile	2008-07-03 14:58:41 UTC (rev 1309)
@@ -71,6 +71,7 @@
 directories:
 	-@if [ ! -d "$(OUTPUT_DIR)" ]; then mkdir "$(OUTPUT_DIR)"; fi
 	-@if [ ! -d "$(OBJ_DIR)" ]; then mkdir "$(OBJ_DIR)"; fi
+	-@SubWCRev ../src ../src/svnrev.tmpl.h ../src/svnrev.h
 
 $(OBJ_DIR)/tux_battery.o: ../src/tux_battery.c	\
 ../src/tux_hw_status.h	\