[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    playground/utils/charm
From:       Mirko Boehm <mirko () kde ! org>
Date:       2009-05-07 21:30:42
Message-ID: 1241731842.735730.18674.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 965070 by mirko:

 r56650@cutiepie:  mirko | 2009-05-06 20:47:18 +0200
 - move CharmVersion.h to Core/, to be able to use it in the tools as well
 - add -v (print version) option to the time sheet processor


 _M            . (directory)  
 _M            trunk (directory)  
 M  +7 -1      trunk/Autobuild/buildscript.py  
 M  +1 -0      trunk/CMakeLists.txt  
 M  +2 -1      trunk/Charm/Charm.cpp  
 D             trunk/Charm/CharmVersion.h  
 A             trunk/Core/CharmVersion.h   trunk/Charm/CharmVersion.h#910491 [License: UNKNOWN]
 M  +0 -1      trunk/Core/Task.h  
 M  +6 -1      trunk/Tools/TimesheetProcessor/CommandLine.cpp  
 M  +1 -0      trunk/Tools/TimesheetProcessor/CommandLine.h  
 M  +5 -0      trunk/Tools/TimesheetProcessor/main.cpp  


--- trunk/playground/utils/charm/trunk/Autobuild/buildscript.py #965069:965070
@@ -30,4 +30,10 @@
 StaticRelease.setPackageDependencies( [ 'Qt-4.[4-9].?-Static-Release' ] )
 StaticRelease.setOptions( '-D CMAKE_BUILD_TYPE=release -D CHARM_BUILD_STATIC_QT:BOOL=true' )
 
-Product.build( [ Debug, Release, StaticRelease] )
+# a configuration that does not use any Autobuild environments
+PlatformBuild = Configuration( Product, "Platform Build" )
+PlatformBuild.setBuilder( 'cmake' )
+PlatformBuild.setOptions( '-D CMAKE_BUILD_TYPE=release' )
+
+# platform build is not enabled by default: 
+Product.build( [ Debug, Release, StaticRelease ] )
--- trunk/playground/utils/charm/trunk/CMakeLists.txt #965069:965070
@@ -114,6 +114,7 @@
 IF( CHARM_ENABLE_TOOLS_BUILD )
     IF(UNIX)
 	ADD_SUBDIRECTORY( Tools/TimesheetProcessor )
+	ADD_SUBDIRECTORY( Tools/TimesheetGenerator )
 	MESSAGE( "This is Unix, building Charm Tools")
     ENDIF(UNIX)
 ELSE( CHARM_ENABLE_TOOLS_BUILD )
--- trunk/playground/utils/charm/trunk/Charm/Charm.cpp #965069:965070
@@ -1,8 +1,9 @@
 #include <QMessageBox>
 #include <QtPlugin>
 
+#include "Core/CharmVersion.h"
+
 #include "Application.h"
-#include "CharmVersion.h"
 
 #if defined CHARM_BUILD_STATIC_QT
 Q_IMPORT_PLUGIN(qjpeg)
--- trunk/playground/utils/charm/trunk/Core/Task.h #965069:965070
@@ -80,7 +80,6 @@
 
     static bool lowerTaskId( const Task& left, const Task& right );
 
-
 private:
     int m_id;
     int m_parent;
--- trunk/playground/utils/charm/trunk/Tools/TimesheetProcessor/CommandLine.cpp #965069:965070
@@ -16,7 +16,7 @@
 {
 	opterr = 0;
 	int ch;
-	while ((ch = getopt(argc, argv, "hza:x:c:ri:u:")) != -1)
+	while ((ch = getopt(argc, argv, "vhza:x:c:ri:u:")) != -1)
 	{
 		if (ch == '?')
 		{
@@ -145,6 +145,9 @@
 			// initialize the database
 			m_mode = Mode_InitializeDatabase;
 			break;
+                case 'v':
+                    m_mode = Mode_PrintVersion;
+                    break;
 		case 'h':
 		default:
 			// help/usage
@@ -229,6 +232,8 @@
 			<< "Usage: " << endl
 			<< "   * TimesheetProzessor -h                              <-- get help"
 			<< endl
+			<< "   * TimesheetProzessor -v                              <-- print version"
+			<< endl
 			<< "   * TimesheetProzessor -a filename -i index -u userid  <-- add timesheet from file with index"
 			<< endl
 			<< "   * TimesheetProzessor -r -i index -u userid           <-- remove timesheet at index"
--- trunk/playground/utils/charm/trunk/Tools/TimesheetProcessor/CommandLine.h #965069:965070
@@ -13,6 +13,7 @@
         Mode_InitializeDatabase,
         Mode_CheckOrCreateUser,
         Mode_DescribeUsage,
+        Mode_PrintVersion,
         Mode_AddTimesheet,
         Mode_RemoveTimesheet,
         Mode_ExportProjectcodes,
--- trunk/playground/utils/charm/trunk/Tools/TimesheetProcessor/main.cpp #965069:965070
@@ -5,6 +5,8 @@
 
 #include <QObject>
 
+#include "Core/CharmVersion.h"
+
 #include "CommandLine.h"
 #include "Exceptions.h"
 #include "Operations.h"
@@ -34,6 +36,9 @@
         case CommandLine::Mode_ExportProjectcodes:
             exportProjectcodes( cmd );
             break;
+        case CommandLine::Mode_PrintVersion:
+            cout << CHARM_VERSION << endl;
+            break;
         case CommandLine::Mode_DescribeUsage:
         default:
         	CommandLine::usage();
[prev in list] [next in list] [prev in thread] [next in thread]