git version history

This commit is contained in:
Maliakal Dhanya
2014-06-03 13:55:41 +02:00
parent 35035405a0
commit 73ba765647
15 changed files with 84 additions and 39 deletions

View File

@ -0,0 +1,9 @@
Path: slsDetectorsPackage/slsDetectorSoftware/mythenDetectorServer
URL: origin git@gitorious.psi.ch:sls_det_software/sls_detector_software.git/mythenDetectorServer
Repository Root: origin git@gitorious.psi.ch:sls_det_software/sls_detector_software.git
Repsitory UUID: 046a469b1e6582c4c55bd6eaeb4818b618d0a9a9
Revision: 87
Branch: separate_receiver
Last Changed Author: Maliakal_Dhanya
Last Changed Rev: 14
Last Changed Date: 2014-06-03 12:26:45 +0200

View File

@ -1,11 +1,11 @@
//#define SVNPATH ""
#define SVNURL "file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware/mythenDetectorServer"
#define SVNURL "git@gitorious.psi.ch:sls_det_software/sls_detector_software.git/mythenDetectorServer"
//#define SVNREPPATH ""
#define SVNREPUUID "951219d9-93cf-4727-9268-0efd64621fa3"
//#define SVNREV 0x729
#define SVNREPUUID "046a469b1e6582c4c55bd6eaeb4818b618d0a9a9"
//#define SVNREV 0x14
//#define SVNKIND ""
//#define SVNSCHED ""
#define SVNAUTH "l_maliakal_d"
#define SVNREV 0x729
#define SVNDATE 0x20140130
#define SVNAUTH "Maliakal_Dhanya"
#define SVNREV 0x14
#define SVNDATE 0x20140603
//

View File

@ -8,7 +8,7 @@
#include "firmware_funcs.h"
#include "mcb_funcs.h"
#include "trimming_funcs.h"
#include "gitInfoMythen.h"
// Global variables
@ -580,13 +580,13 @@ int get_id(int file_des) {
retval=getMcsVersion();
break;
case DETECTOR_SOFTWARE_VERSION:
sscanf(THIS_REVISION,"$Rev : %x",&rev1);
retval= SVNREV;
retval= (retval <<32) | SVNDATE;
/* sscanf(THIS_REVISION,"$Rev : %x",&rev1);
rev=((int64_t)rev1);
dat=THIS_SOFTWARE_VERSION;
retval=(dat<<32) | rev;
*/
break;
default:
printf("Required unknown id %d \n", arg);