[tuxdroid-svn] r109 - in daemon/trunk: . libs

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

Author: jaguarondi
Date: 2007-02-28 02:52:35 +0100 (Wed, 28 Feb 2007)
New Revision: 109

Added:
   daemon/trunk/tuxdaemon.mdsp
   daemon/trunk/version.txt
Removed:
   daemon/trunk/USBDaemon.mdsp
Modified:
   daemon/trunk/Makefile
   daemon/trunk/USBDaemon_main.c
   daemon/trunk/libs/USBDaemon_command_tux.c
   daemon/trunk/libs/USBDaemon_globals.h
Log:
- CHG: version is now defined in version.txt, version.h is generated in the Makefile and parsed by the program to get all different version numbers.
- CLN: renamed USBDaemon by tuxdaemon


Modified: daemon/trunk/Makefile
===================================================================
--- daemon/trunk/Makefile	2007-02-27 15:56:28 UTC (rev 108)
+++ daemon/trunk/Makefile	2007-02-28 01:52:35 UTC (rev 109)
@@ -15,7 +15,7 @@
 ifeq ($(CFG),Debug)
   OBJ_DIR = Debug
   OUTPUT_DIR = .
-  TARGET = TUXDaemon
+  TARGET = tuxdaemon
   C_INCLUDE_DIRS = -I"../../../../../../../usr/include/glib-2.0" -I"../../../../../../../usr/lib/glib-2.0/include" 
   C_PREPROC = 
   CFLAGS = -pipe  -Wall -g2 -O0 
@@ -57,7 +57,7 @@
 
 .PHONY: print_header directories
 
-$(TARGET): print_header directories $(SRC_OBJS)
+$(TARGET): print_header directories version.h $(SRC_OBJS)
 	$(build_target)
 
 .PHONY: clean cleanall
@@ -79,12 +79,16 @@
 	-@if [ ! -d "$(OUTPUT_DIR)" ]; then mkdir "$(OUTPUT_DIR)"; fi
 	-@if [ ! -d "$(OBJ_DIR)" ]; then mkdir "$(OBJ_DIR)"; fi
 
+version.h: version.txt
+	@echo "#define VERSION \"`cat version.txt`\"" > version.h
+
 $(OBJ_DIR)/USBDaemon_main.o: USBDaemon_main.c	\
 libs/USBDaemon_globals.h	\
 libs/USBDaemon_usb_enum.h	\
 libs/USBDaemon_tcp_server.h	\
 libs/USBDaemon_status_table.h	\
-tuxdefs/commands.h
+tuxdefs/commands.h		\
+version.h
 	$(compile_source)
 
 $(OBJ_DIR)/USBDaemon_usb_enum.o: libs/USBDaemon_usb_enum.c	\

Deleted: daemon/trunk/USBDaemon.mdsp
===================================================================
--- daemon/trunk/USBDaemon.mdsp	2007-02-27 15:56:28 UTC (rev 108)
+++ daemon/trunk/USBDaemon.mdsp	2007-02-28 01:52:35 UTC (rev 109)
@@ -1,113 +0,0 @@
-[Project]
-name=USBDaemon
-target=Linux
-type=linuxconsole
-defaultConfig=0
-
-[Debug]
-// compiler 
-workingDirectory=
-arguments=
-intermediateFilesDirectory=Debug
-outputFilesDirectory=Debug
-compilerPreprocessor=
-extraCompilerOptions=
-compilerIncludeDirectory=|usr|include|glib-2.0;|usr|lib|glib-2.0|include
-noWarning=0
-defaultWarning=0
-allWarning=1
-extraWarning=0
-isoWarning=0
-warningsAsErrors=0
-debugType=1
-debugLevel=2
-exceptionEnabled=1
-runtimeTypeEnabled=1
-optimizeLevel=0
-
-// linker
-libraryPath=|usr|include|glib-2.0;|usr|lib|glib-2.0|include
-outputFilename=.|TUXDaemon
-libraries=glib-2.0;gthread-2.0;usb
-extraLinkerOptions=
-ignoreStartupFile=0
-ignoreDefaultLibs=0
-stripExecutableFile=0
-
-// archive
-extraArchiveOptions=
-
-//resource
-resourcePreprocessor=
-resourceIncludeDirectory=|usr|include|glib-2.0;|usr|lib|glib-2.0|include
-extraResourceOptions=
-
-[Release]
-// compiler 
-workingDirectory=
-arguments=
-intermediateFilesDirectory=Release
-outputFilesDirectory=Release
-compilerPreprocessor=
-extraCompilerOptions=
-compilerIncludeDirectory=
-noWarning=0
-defaultWarning=0
-allWarning=1
-extraWarning=0
-isoWarning=0
-warningsAsErrors=0
-debugType=0
-debugLevel=1
-exceptionEnabled=1
-runtimeTypeEnabled=1
-optimizeLevel=2
-
-// linker
-libraryPath=
-outputFilename=USBDaemon
-libraries=
-extraLinkerOptions=
-ignoreStartupFile=0
-ignoreDefaultLibs=0
-stripExecutableFile=1
-
-// archive
-extraArchiveOptions=
-
-//resource
-resourcePreprocessor=
-resourceIncludeDirectory=
-extraResourceOptions=
-
-[Source]
-1=USBDaemon_main.c
-2=libs|USBDaemon_usb_enum.c
-3=libs|USBDaemon_usb_readWrite.c
-4=libs|USBDaemon_status_table.c
-5=libs|USBDaemon_command_tux.c
-6=libs|USBDaemon_tcp_server.c
-[Header]
-1=libs|USBDaemon_globals.h
-2=libs|USBDaemon_usb_enum.h
-3=libs|USBDaemon_usb_readWrite.h
-4=libs|USBDaemon_status_table.h
-5=libs|USBDaemon_command_tux.h
-6=libs|USBDaemon_tcp_server.h
-7=tuxdefs|commands.h
-[Resource]
-[Other]
-[History]
-libs|USBDaemon_tcp_server.h,1596
-libs|USBDaemon_usb_readWrite.h,0
-libs|USBDaemon_usb_enum.h,1112
-libs|USBDaemon_command_tux.h,225
-libs|USBDaemon_status_table.h,2555
-tuxdefs|commands.h,5471
-libs|USBDaemon_usb_enum.c,2733
-libs|USBDaemon_globals.h,1769
-libs|USBDaemon_status_table.c,2868
-libs|USBDaemon_usb_readWrite.c,4163
-libs|USBDaemon_command_tux.c,7790
-libs|USBDaemon_tcp_server.c,4562
-USBDaemon_main.c,4736

Modified: daemon/trunk/USBDaemon_main.c
===================================================================
--- daemon/trunk/USBDaemon_main.c	2007-02-27 15:56:28 UTC (rev 108)
+++ daemon/trunk/USBDaemon_main.c	2007-02-28 01:52:35 UTC (rev 109)
@@ -21,6 +21,7 @@
 /*_____________________ I N C L U D E S____________________________________ */
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 #include <usb.h>
 #include <glib.h>
 #include <glib-object.h>
@@ -34,16 +35,34 @@
 #include "libs/USBDaemon_usb_enum.h"
 #include "libs/USBDaemon_tcp_server.h"
 #include "libs/USBDaemon_status_table.h"
+#include "version.h"
 /*_____________________ F U N C T I O N S __________________________________*/
 
+struct version_s version = {0, 0, 0, "\0", "\0", 0};
+
     // ***********************************************************************
     // Print_info_daemon
     // ***********************************************************************
     void
     print_info_daemon()
     {
+        const char delimiters[] = " .-";
+        char cp[] = VERSION;
+        char *token;
+
+        if ((token = strtok (cp, delimiters)) != NULL)
+            version.major = atoi (token);
+        if ((token = strtok (NULL, delimiters)) != NULL)
+            version.minor = atoi (token);
+        if ((token = strtok (NULL, delimiters)) != NULL)
+            version.release = atoi (token);
+        if ((token = strtok (NULL, delimiters)) != NULL)
+            strncpy (version.maturity, token, 10);
+        if ((token = strtok (NULL, delimiters)) != NULL)
+            strncpy (version.release_status, token, 20);
+
         printf("-----------------------------------\n");
-        printf("Tux USB Daemon V%d.%d.%d\n",VERSION_MAJOR,VERSION_MINOR,VERSION_RELEASE);
+        printf("Tux USB Daemon version %s\n",VERSION);
         printf("Kysoh 2007.\n");
         printf("-----------------------------------\n");
     }

Modified: daemon/trunk/libs/USBDaemon_command_tux.c
===================================================================
--- daemon/trunk/libs/USBDaemon_command_tux.c	2007-02-27 15:56:28 UTC (rev 108)
+++ daemon/trunk/libs/USBDaemon_command_tux.c	2007-02-28 01:52:35 UTC (rev 109)
@@ -276,9 +276,9 @@
         result[0]=data[0];
         switch(data[0]){
             case SUB_D_REQ_INFO_VERSION:
-                result[1]=VERSION_MAJOR;
-                result[2]=VERSION_MINOR;
-                result[3]=VERSION_RELEASE;
+                result[1]=version.major;
+                result[2]=version.minor;
+                result[3]=version.release;
                 break;
             case SUB_D_REQ_INFO_CLIENT_COUNT:
                 result[1]=tcp_clients_count;

Modified: daemon/trunk/libs/USBDaemon_globals.h
===================================================================
--- daemon/trunk/libs/USBDaemon_globals.h	2007-02-27 15:56:28 UTC (rev 108)
+++ daemon/trunk/libs/USBDaemon_globals.h	2007-02-28 01:52:35 UTC (rev 109)
@@ -22,9 +22,6 @@
 #include <usb.h>
 #include <pthread.h>
 /*_____________________ D E F I N E S ______________________________________*/
-#define VERSION_MAJOR               0
-#define VERSION_MINOR               1
-#define VERSION_RELEASE             7
 #define TUX_PID                     0xFF07
 #define TUX_VID                     0x03EB                     
 #define TUX_INTERFACE               0x03
@@ -40,3 +37,12 @@
 unsigned char SHOW_RAW_STATUS;
 unsigned short DAEMON_PID;
 unsigned char SHOW_INVALID_RAW;
+struct version_s {
+    int major;
+    int minor;
+    int release;
+    char maturity[10];
+    char release_status[20];
+    int revision;
+};
+extern struct version_s version;

Copied: daemon/trunk/tuxdaemon.mdsp (from rev 93, daemon/trunk/USBDaemon.mdsp)
===================================================================
--- daemon/trunk/tuxdaemon.mdsp	                        (rev 0)
+++ daemon/trunk/tuxdaemon.mdsp	2007-02-28 01:52:35 UTC (rev 109)
@@ -0,0 +1,113 @@
+[Project]
+name=tuxdaemon
+target=Linux
+type=linuxconsole
+defaultConfig=0
+
+[Debug]
+// compiler 
+workingDirectory=
+arguments=
+intermediateFilesDirectory=Debug
+outputFilesDirectory=Debug
+compilerPreprocessor=
+extraCompilerOptions=
+compilerIncludeDirectory=|usr|include|glib-2.0;|usr|lib|glib-2.0|include
+noWarning=0
+defaultWarning=0
+allWarning=1
+extraWarning=0
+isoWarning=0
+warningsAsErrors=0
+debugType=1
+debugLevel=2
+exceptionEnabled=1
+runtimeTypeEnabled=1
+optimizeLevel=0
+
+// linker
+libraryPath=|usr|include|glib-2.0;|usr|lib|glib-2.0|include
+outputFilename=.|TUXDaemon
+libraries=glib-2.0;gthread-2.0;usb
+extraLinkerOptions=
+ignoreStartupFile=0
+ignoreDefaultLibs=0
+stripExecutableFile=0
+
+// archive
+extraArchiveOptions=
+
+//resource
+resourcePreprocessor=
+resourceIncludeDirectory=|usr|include|glib-2.0;|usr|lib|glib-2.0|include
+extraResourceOptions=
+
+[Release]
+// compiler 
+workingDirectory=
+arguments=
+intermediateFilesDirectory=Release
+outputFilesDirectory=Release
+compilerPreprocessor=
+extraCompilerOptions=
+compilerIncludeDirectory=
+noWarning=0
+defaultWarning=0
+allWarning=1
+extraWarning=0
+isoWarning=0
+warningsAsErrors=0
+debugType=0
+debugLevel=1
+exceptionEnabled=1
+runtimeTypeEnabled=1
+optimizeLevel=2
+
+// linker
+libraryPath=
+outputFilename=tuxdaemon
+libraries=
+extraLinkerOptions=
+ignoreStartupFile=0
+ignoreDefaultLibs=0
+stripExecutableFile=1
+
+// archive
+extraArchiveOptions=
+
+//resource
+resourcePreprocessor=
+resourceIncludeDirectory=
+extraResourceOptions=
+
+[Source]
+1=main.c
+2=libs|USBDaemon_usb_enum.c
+3=libs|USBDaemon_usb_readWrite.c
+4=libs|USBDaemon_status_table.c
+5=libs|USBDaemon_command_tux.c
+6=libs|USBDaemon_tcp_server.c
+[Header]
+1=libs|USBDaemon_globals.h
+2=libs|USBDaemon_usb_enum.h
+3=libs|USBDaemon_usb_readWrite.h
+4=libs|USBDaemon_status_table.h
+5=libs|USBDaemon_command_tux.h
+6=libs|USBDaemon_tcp_server.h
+7=tuxdefs|commands.h
+[Resource]
+[Other]
+[History]
+libs|USBDaemon_tcp_server.h,1596
+libs|USBDaemon_usb_readWrite.h,0
+libs|USBDaemon_usb_enum.h,1112
+libs|USBDaemon_command_tux.h,225
+libs|USBDaemon_status_table.h,2555
+tuxdefs|commands.h,5471
+libs|USBDaemon_usb_enum.c,2733
+libs|USBDaemon_globals.h,1769
+libs|USBDaemon_status_table.c,2868
+libs|USBDaemon_usb_readWrite.c,4163
+libs|USBDaemon_command_tux.c,7790
+libs|USBDaemon_tcp_server.c,4562
+main.c,4736

Added: daemon/trunk/version.txt
===================================================================
--- daemon/trunk/version.txt	                        (rev 0)
+++ daemon/trunk/version.txt	2007-02-28 01:52:35 UTC (rev 109)
@@ -0,0 +1 @@
+0.2.0-alpha1 (SVN/UNRELEASED)


Property changes on: daemon/trunk/version.txt
___________________________________________________________________
Name: svn:mime-type
   + text/plain
Name: svn:keywords
   + Id
Name: svn:eol-style
   + native