detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-04-24 15:20:02 +02:00
Code Issues Actions Packages Releases Activity

solved conflicts from merge of version being used to binary

Browse Source
This commit is contained in:
Dhanya Maliakal 2017-12-06 19:07:06 +01:00
commit 24c305ec59
47 changed files with 292 additions and 356 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
genVersionHeader.sh
View File

@ -21,5 +21,5 @@ echo "Updating $fout"
#awk 'NR==FNR {if ($3=="Date:") {l[FNR]=$4; gsub("-","",l[FNR]);} else { if (match($0,"Rev")) {l[FNR]=$(NF);} else {l[FNR]="\""$(NF)"\"";};};next} {$0=$1" "$2" "l[FNR]}1' $fin $ftmp > $fout #awk 'NR==FNR {if ($3=="Date:") {l[FNR]=$4; gsub("-","",l[FNR]);} else { if (match($0,"Rev")) {l[FNR]=$(NF);} else {l[FNR]="\""$(NF)"\"";};};next} {$0=$1" "$2" "l[FNR]}1' $fin $ftmp > $fout
awk 'BEGIN {l[0]=0; "date +%Y%m%d" | getline l[1]; l[2]="\"/\""; l[3]="\"nobody\""; l[3]="\"nobody\""; l[4]="\"0000-0000-0000\"";} \ awk 'BEGIN {l[0]=0; "date +%Y%m%d" | getline l[1]; l[2]="\"/\""; l[3]="\"nobody\""; l[3]="\"nobody\""; l[4]="\"0000-0000-0000\"";} \
NR==FNR {if (match($0,"Rev")) {l[0]="0x"$(NF);} else if (match($0,"Date")) {l[1]="0x"$4; gsub("-","",l[1]);} else if (match($0,"URL")) {l[2]="\""$(NF)"\"";} else if (match($0,"Author")) {l[3]="\""$(NF)"\"";} else if (match($0,"UUID")) {l[4]="\""$(NF)"\"";};next;} NR==FNR {if (match($0,"Rev")) {l[0]="0x"$(NF);} else if (match($0,"Date")) {l[1]="0x"$4; gsub("-","",l[1]);} else if (match($0,"URL")) {l[2]="\""$(NF)"\"";} else if (match($0,"Author")) {l[3]="\""$(NF)"\"";} else if (match($0,"UUID")) {l[4]="\""$(NF)"\"";} else if (match($0,"Branch")) {l[5]="\""$(NF)"\"";};next;}
{if (match($2,"REV")) {$0=$1" "$2" "l[0];} else if (match($2,"DATE")) {$0=$1" "$2" "l[1];} else if (match($2,"URL")) {$0=$1" "$2" "l[2];} else if (match($2,"AUTH")) {$0=$1" "$2" "l[3];} else if (match($2,"UUID")) {$0=$1" "$2" "l[4];}}1' $fin $ftmp > $fout {if (match($2,"REV")) {$0=$1" "$2" "l[0];} else if (match($2,"DATE")) {$0=$1" "$2" "l[1];} else if (match($2,"URL")) {$0=$1" "$2" "l[2];} else if (match($2,"AUTH")) {$0=$1" "$2" "l[3];} else if (match($2,"UUID")) {$0=$1" "$2" "l[4];} else if (match($2,"BRANCH")) {$0=$1" "$2" "l[5];}}1' $fin $ftmp > $fout

8
slsDetectorGui/gitInfo.txt
View File

@ -1,9 +1,9 @@
Path: slsDetectorsPackage/slsDetectorGui Path: slsDetectorsPackage/slsDetectorGui
URL: origin git@git.psi.ch:sls_detectors_software/slsDetectorPackage.git URL: origin git@git.psi.ch:sls_detectors_software/slsDetectorPackage.git
Repository Root: origin git@git.psi.ch:sls_detectors_software/slsDetectorPackage.git Repository Root: origin git@git.psi.ch:sls_detectors_software/slsDetectorPackage.git
Repsitory UUID: b498043ea612fa3148bf1d7ea2a39c46092addf8 Repsitory UUID: c4a242e10a4aafd102cc9a2a7ddae4ac92b8ba99
Revision: 437 Revision: 439
Branch: 3.0.1 Branch: 3.0.1
Last Changed Author: Dhanya_Maliakal Last Changed Author: Dhanya_Maliakal
Last Changed Rev: 3185 Last Changed Rev: 3187
Last Changed Date: 2017-12-06 08:43:21.000000002 +0100 ./src/qTabSettings.cpp Last Changed Date: 2017-12-06 08:45:14.000000002 +0100 ./src/qTabSettings.cpp

17
slsDetectorGui/include/gitInfoGui.h
View File

@ -1,11 +1,6 @@
//#define SVNPATH "" #define GITURL "git@git.psi.ch:sls_detectors_software/slsDetectorPackage.git"
#define SVNURL "git@git.psi.ch:sls_detectors_software/slsDetectorPackage.git" #define GITREPUUID "c4a242e10a4aafd102cc9a2a7ddae4ac92b8ba99"
//#define SVNREPPATH "" #define GITAUTH "Dhanya_Maliakal"
#define SVNREPUUID "b498043ea612fa3148bf1d7ea2a39c46092addf8" #define GITREV 0x3187
//#define SVNREV 0x3185 #define GITDATE 0x20171206
//#define SVNKIND "" #define GITBRANCH "3.0.1"
//#define SVNSCHED ""
#define SVNAUTH "Dhanya_Maliakal"
#define SVNREV 0x3185
#define SVNDATE 0x20171206
//

17
slsDetectorGui/include/gitInfoGuiTmp.h
View File

@ -1,11 +1,6 @@
//#define SVNPATH "" #define GITURL ""
#define SVNURL "" #define GITREPUUID ""
//#define SVNREPPATH "" #define GITAUTH ""
#define SVNREPUUID "" #define GITREV ""
//#define SVNREV "" #define GITDATE ""
//#define SVNKIND "" #define GITBRANCH ""
//#define SVNSCHED ""
#define SVNAUTH ""
#define SVNREV ""
#define SVNDATE ""
//

5
slsDetectorGui/include/qDetectorMain.h
View File

@ -55,10 +55,11 @@ public:
* This is mainly used to create detector object and all the tabs * This is mainly used to create detector object and all the tabs
* @param argc number of command line arguments for server options * @param argc number of command line arguments for server options
* @param argv server options * @param argv server options
* @param app the qapplication * @param app the qapplication3
* @param ret OK or FAIL of constructor (from command line arguments)
* @param parent makes the parent window 0 by default * @param parent makes the parent window 0 by default
* */ * */
qDetectorMain(int argc, char **argv, QApplication *app, QWidget *parent = 0); qDetectorMain(int argc, char **argv, QApplication *app, int& ret, QWidget *parent = 0);
/**Destructor /**Destructor
* */ * */

130
slsDetectorGui/src/qDetectorMain.cpp
View File

@ -36,7 +36,10 @@ int main (int argc, char **argv) {
// QApplication *theApp = new QApplication(argc, argv); // QApplication *theApp = new QApplication(argc, argv);
theApp->setStyle(new QPlastiqueStyle);//not default when desktop is windows theApp->setStyle(new QPlastiqueStyle);//not default when desktop is windows
theApp->setWindowIcon(QIcon( ":/icons/images/mountain.png" )); theApp->setWindowIcon(QIcon( ":/icons/images/mountain.png" ));
qDetectorMain *det=new qDetectorMain(argc, argv, theApp,0); int ret = 1;
qDetectorMain *det=new qDetectorMain(argc, argv, theApp,ret,0);
if (ret == 1)
return EXIT_FAILURE;
det->show(); det->show();
//theApp->connect( theApp, SIGNAL(lastWindowClosed()), theApp, SLOT(quit())); //theApp->connect( theApp, SIGNAL(lastWindowClosed()), theApp, SLOT(quit()));
return theApp->exec(); return theApp->exec();
@ -46,75 +49,82 @@ int main (int argc, char **argv) {
//------------------------------------------------------------------------------------------------------------------------------------------------- //-------------------------------------------------------------------------------------------------------------------------------------------------
qDetectorMain::qDetectorMain(int argc, char **argv, QApplication *app, QWidget *parent) : qDetectorMain::qDetectorMain(int argc, char **argv, QApplication *app, int& ret, QWidget *parent) :
QMainWindow(parent), theApp(app),myDet(0),detID(0),myPlot(0),tabs(0),isDeveloper(0){ QMainWindow(parent), theApp(app),myDet(0),detID(0),myPlot(0),tabs(0),isDeveloper(0){
// bool found;
int c; // options
string configFName = ""; string fname = "";
optind=1; int64_t tempval = 0;
// Getting all the command line arguments
while(1) { //parse command line for config
static struct option long_options[] = { static struct option long_options[] = {
// These options set a flag.
//{"verbose", no_argument, &verbose_flag, 1},
// These options don’t set a flag. We distinguish them by their indices.
{ "developer", no_argument, 0, 'd' }, { "developer", no_argument, 0, 'd' },
{ "config", required_argument, 0, 'f' }, { "config", required_argument, 0, 'f' },
{ "id", required_argument, 0, 'i' }, { "id", required_argument, 0, 'i' },
{ "f", required_argument, 0, 'f' }, {"version", no_argument, 0, 'v'},
{ "help", no_argument, 0, 'h' }, { "help", no_argument, 0, 'h' },
{ 0, 0, 0, 0 } { 0, 0, 0, 0 }
}; };
c = getopt_long (argc, argv, "hdf:i:", long_options, NULL);
if (c == -1) break;
// getopt_long stores the option index here.
int option_index = 0;
int c = 0;
while ( c != -1 ){
c = getopt_long (argc, argv, "hvdf:i:", long_options, &option_index);
// Detect the end of the options.
if (c == -1)
break;
switch(c){
case 'f':
fname=string(optarg);
#ifdef VERYVERBOSE
cout << long_options[option_index].name << " " << optarg << endl;
#endif
break;
case 'd' :
isDeveloper = 1;
break;
case 'i' :
detID=atoi(optarg);
break;
case 'v':
tempval = GITREV;
tempval = (tempval <<32) | GITDATE;
cout << "SLS Detector GUI " << GITBRANCH << " (0x" << hex << tempval << ")" << endl;
return;
case 'h':
default:
string help_message = "\n"
+ string(argv[0]) + "\n"
+ "Usage: " + string(argv[0]) + " [arguments]\n"
+ "Possible arguments are:\n"
+ "\t-d, --developer : Enables the developer tab\n"
+ "\t-f, --f, --config <fname> : Loads config from file\n"
+ "\t-i, --id <i> : Sets the multi detector id to i. Default: 0. Required \n"
+ "\t only when more than one multi detector object is needed.\n\n";
cout << help_message << endl;
return;
switch (c) {
case 'd' :
isDeveloper=1;
break;
case 'f' :
configFName=string(optarg);
break;
case 'i' :
detID=atoi(optarg);
break;
case 'h' :
default:
cout << endl;
cout << "\t" << argv[0] << " [ARGUMENT]..." << endl;
cout << endl;
cout << "Possible Arguments are:" << endl;
cout << "\t-d, --developer \t\t : \t Enables the developer tab" << endl;
cout << "\t-f, --f, --config fname\t\t : \t Loads config file fname" << endl;
cout << "\t-i, --id NUMBER \t\t : \t Sets the multi detector id to NUMBER (the default is 0). "
"Required only when more than one multi detector object is needed." << endl;
exit(-1);
} }
} }
if (optind < argc) {
cout << "invalid option, try --help" << endl;
exit(-1);
}
/*
for(int iarg=1; iarg<argc; iarg++){
found = false;
if(!strcasecmp(argv[iarg],"--developer")) {isDeveloper=1;found = true;}
if((!strcasecmp(argv[iarg],"--id")) && (iarg+1 < argc)) {detID=atoi(argv[iarg+1]);iarg++;found = true;}
if((!strcasecmp(argv[iarg],"--config")) && (iarg+1 < argc)) {configFName=string(argv[iarg+1]);iarg++;found = true;}
if((!strcasecmp(argv[iarg],"--f")) && (iarg+1 < argc)) {configFName=string(argv[iarg+1]);iarg++;found = true;}
if(!found){
cout << "Possible Arguments are:" << endl;
cout << "--developer \t\t : \t Enables the developer tab" << endl;
cout << "--f [fname]\t\t : \t Loads config file fname" << endl;
cout << "--config [fname]\t : \t Loads config file fname" << endl;
cout << "--id [i] \t\t : \t Sets the multi detector id to i (the default is 0). "
"Required only when more than one multi detector object is needed." << endl;
exit(-1);
}
}
*/
setupUi(this); setupUi(this);
SetUpDetector(configFName); SetUpDetector(fname);
SetUpWidgetWindow(); SetUpWidgetWindow();
Initialization(); Initialization();
ret = 0;
} }
@ -659,8 +669,8 @@ void qDetectorMain::ExecuteHelp(QAction *action){
cout << "About: Common GUI for Mythen, Eiger, Gotthard, Jungfrau, Moench and Propix detectors" << endl; cout << "About: Common GUI for Mythen, Eiger, Gotthard, Jungfrau, Moench and Propix detectors" << endl;
#endif #endif
char version[200]; char version[200];
long long unsigned int retval= SVNREV; long long unsigned int retval= GITREV;
retval= (retval <<32) | SVNDATE; retval= (retval <<32) | GITDATE;
sprintf(version,"%llx",retval); sprintf(version,"%llx",retval);
string thisGUIVersion = string(version); string thisGUIVersion = string(version);

6
slsDetectorGui/updateGitVersion.sh
View File

@ -16,11 +16,11 @@ NEWDATE=$(sed "s/-//g" <<< $RDATE | awk '{print $1;}')
NEWDATE=${NEWDATE/#/0x} NEWDATE=${NEWDATE/#/0x}
#get old date from INCLFILE #get old date from INCLFILE
OLDDATE=$(more $INCLFILE | grep '#define SVNDATE' | awk '{print $3}') OLDDATE=$(more $INCLFILE | grep '#define GITDATE' | awk '{print $3}')
#update INCLFILE if changes #update INCLFILE if changes
if [ "$OLDDATE" != "$NEWDATE" ]; then #if [ "$OLDDATE" != "$NEWDATE" ]; then
echo Path: ${MAINDIR}/${SPECDIR} $'\n'URL: ${GITREPO} $'\n'Repository Root: ${GITREPO} $'\n'Repsitory UUID: ${REPUID} $'\n'Revision: ${FOLDERREV} $'\n'Branch: ${BRANCH} $'\n'Last Changed Author: ${AUTH1}_${AUTH2} $'\n'Last Changed Rev: ${REV} $'\n'Last Changed Date: ${RDATE} > gitInfo.txt echo Path: ${MAINDIR}/${SPECDIR} $'\n'URL: ${GITREPO} $'\n'Repository Root: ${GITREPO} $'\n'Repsitory UUID: ${REPUID} $'\n'Revision: ${FOLDERREV} $'\n'Branch: ${BRANCH} $'\n'Last Changed Author: ${AUTH1}_${AUTH2} $'\n'Last Changed Rev: ${REV} $'\n'Last Changed Date: ${RDATE} > gitInfo.txt
cd .. cd ..
./genVersionHeader.sh $SPECDIR/gitInfo.txt $SPECDIR/$TMPFILE $SPECDIR/$INCLFILE ./genVersionHeader.sh $SPECDIR/gitInfo.txt $SPECDIR/$TMPFILE $SPECDIR/$INCLFILE
cd $WD cd $WD
fi #fi

14
slsDetectorSoftware/eigerDetectorServer/gitInfo.txt
View File

@ -1,9 +1,9 @@
Path: slsDetectorsPackage/slsDetectorSoftware/eigerDetectorServer Path: slsDetectorsPackage/slsDetectorSoftware/eigerDetectorServer
URL: origin git@git.psi.ch:sls_detectors_software/sls_detector_software.git URL: origin git@git.psi.ch:sls_detectors_software/slsDetectorPackage.git
Repository Root: origin git@git.psi.ch:sls_detectors_software/sls_detector_software.git Repository Root: origin git@git.psi.ch:sls_detectors_software/slsDetectorPackage.git
Repsitory UUID: 73bad32c4ab2c8cfb2687547f7da6f932b358c1a Repsitory UUID: 2f3dc8d109de8607f3217cf429619073dc9cc60e
Revision: 314 Revision: 315
Branch: developer Branch: developer
Last Changed Author: Dhanya_Thattil Last Changed Author: Dhanya_Maliakal
Last Changed Rev: 1609 Last Changed Rev: 3397
Last Changed Date: 2017-10-23 11:45:17.000000002 +0200 ./Beb.c Last Changed Date: 2017-12-06 19:05:42.000000002 +0100 ./FebRegisterDefs.h

17
slsDetectorSoftware/eigerDetectorServer/gitInfoEiger.h
View File

@ -1,11 +1,6 @@
//#define SVNPATH "" #define GITURL "git@git.psi.ch:sls_detectors_software/slsDetectorPackage.git"
#define SVNURL "git@git.psi.ch:sls_detectors_software/sls_detector_software.git" #define GITREPUUID "2f3dc8d109de8607f3217cf429619073dc9cc60e"
//#define SVNREPPATH "" #define GITAUTH "Dhanya_Maliakal"
#define SVNREPUUID "73bad32c4ab2c8cfb2687547f7da6f932b358c1a" #define GITREV 0x3397
//#define SVNREV 0x1609 #define GITDATE 0x20171206
//#define SVNKIND "" #define GITBRANCH "developer"
//#define SVNSCHED ""
#define SVNAUTH "Dhanya_Thattil"
#define SVNREV 0x1609
#define SVNDATE 0x20171023
//

17
slsDetectorSoftware/eigerDetectorServer/gitInfoEigerTmp.h
View File

@ -1,11 +1,6 @@
//#define SVNPATH "" #define GITURL ""
#define SVNURL "" #define GITREPUUID ""
//#define SVNREPPATH "" #define GITAUTH ""
#define SVNREPUUID "" #define GITREV ""
//#define SVNREV "" #define GITDATE ""
//#define SVNKIND "" #define GITBRANCH ""
//#define SVNSCHED ""
#define SVNAUTH ""
#define SVNREV ""
#define SVNDATE ""
//

6
slsDetectorSoftware/eigerDetectorServer/slsDetectorFunctionList.c
View File

@ -136,9 +136,9 @@ int64_t getDetectorId(enum idMode arg){
case SOFTWARE_FIRMWARE_API_VERSION: case SOFTWARE_FIRMWARE_API_VERSION:
return (int64_t)Beb_GetFirmwareSoftwareAPIVersion(); return (int64_t)Beb_GetFirmwareSoftwareAPIVersion();
case DETECTOR_SOFTWARE_VERSION: case DETECTOR_SOFTWARE_VERSION:
retval= SVNREV; retval= GITREV;
retval= (retval <<32) | SVNDATE; retval= (retval <<32) | GITDATE;
//cprintf(BLUE,"git date:%x, git rev:%x\n",SVNDATE,SVNREV); //cprintf(BLUE,"git date:%x, git rev:%x\n",GITDATE,GITREV);
break; break;
default: default:
break; break;

2
slsDetectorSoftware/eigerDetectorServer/updateGitVersion.sh
View File

@ -18,7 +18,7 @@ NEWDATE=${NEWDATE/#/0x}
#get old date from INCLFILE #get old date from INCLFILE
OLDDATE=$(more $INCLFILE | grep '#define SVNDATE' | awk '{print $3}') OLDDATE=$(more $INCLFILE | grep '#define GITDATE' | awk '{print $3}')
#update INCLFILE if changes #update INCLFILE if changes

8
slsDetectorSoftware/gitInfo.txt
View File

@ -1,9 +1,9 @@
Path: slsDetectorsPackage/slsDetectorSoftware Path: slsDetectorsPackage/slsDetectorSoftware
URL: origin git@git.psi.ch:sls_detectors_software/slsDetectorPackage.git URL: origin git@git.psi.ch:sls_detectors_software/slsDetectorPackage.git
Repository Root: origin git@git.psi.ch:sls_detectors_software/slsDetectorPackage.git Repository Root: origin git@git.psi.ch:sls_detectors_software/slsDetectorPackage.git
Repsitory UUID: b498043ea612fa3148bf1d7ea2a39c46092addf8 Repsitory UUID: c4a242e10a4aafd102cc9a2a7ddae4ac92b8ba99
Revision: 1627 Revision: 1629
Branch: 3.0.1 Branch: 3.0.1
Last Changed Author: Dhanya_Maliakal Last Changed Author: Dhanya_Maliakal
Last Changed Rev: 3185 Last Changed Rev: 3187
Last Changed Date: 2017-12-06 08:43:21.000000002 +0100 ./slsDetector/slsDetectorUtils.h Last Changed Date: 2017-12-06 19:00:50.000000002 +0100 ./threadFiles/ThreadPool.o

17
slsDetectorSoftware/gotthardDetectorServer/gitInfoGotthard.h
View File

@ -1,11 +1,6 @@
//#define SVNPATH "" #define GITURL "git@git.psi.ch:sls_detectors_software/sls_detector_software.git"
#define SVNURL "git@git.psi.ch:sls_detectors_software/sls_detector_software.git" #define GITREPUUID "c5777e517c451226e3275e6948895baee21a1f94"
//#define SVNREPPATH "" #define GITAUTH "Dhanya_Maliakal"
#define SVNREPUUID "c5777e517c451226e3275e6948895baee21a1f94" #define GITREV 0x1585
//#define SVNREV 0x1585 #define GITDATE 0x20171109
//#define SVNKIND "" #define GITBRANCH "blabla"
//#define SVNSCHED ""
#define SVNAUTH "Dhanya_Maliakal"
#define SVNREV 0x1585
#define SVNDATE 0x20171109
//

17
slsDetectorSoftware/gotthardDetectorServer/gitInfoGotthardTmp.h
View File

@ -1,11 +1,6 @@
//#define SVNPATH "" #define GITURL ""
#define SVNURL "" #define GITREPUUID ""
//#define SVNREPPATH "" #define GITAUTH ""
#define SVNREPUUID "" #define GITREV ""
//#define SVNREV "" #define GITDATE ""
//#define SVNKIND "" #define GITBRANCH ""
//#define SVNSCHED ""
#define SVNAUTH ""
#define SVNREV ""
#define SVNDATE ""
//

7
slsDetectorSoftware/gotthardDetectorServer/server_funcs.c
View File

@ -592,12 +592,9 @@ int get_id(int file_des) {
retval=(retval <<32) | getFirmwareVersion(); retval=(retval <<32) | getFirmwareVersion();
break; break;
case DETECTOR_SOFTWARE_VERSION: case DETECTOR_SOFTWARE_VERSION:
retval= SVNREV; retval= GITREV;
retval= (retval <<32) | SVNDATE; retval= (retval <<32) | GITDATE;
break; break;
/* case DETECTOR_FIRMWARE_SVN_VERSION:
retval=getFirmwareSVNVersion();
break;*/
default: default:
printf("Required unknown id %d \n", arg); printf("Required unknown id %d \n", arg);
ret=FAIL; ret=FAIL;

2
slsDetectorSoftware/gotthardDetectorServer/updateGitVersion.sh
View File

@ -18,7 +18,7 @@ NEWDATE=${NEWDATE/#/0x}
#get old date from INCLFILE #get old date from INCLFILE
OLDDATE=$(more $INCLFILE | grep '#define SVNDATE' | awk '{print $3}') OLDDATE=$(more $INCLFILE | grep '#define GITDATE' | awk '{print $3}')
#update INCLFILE if changes #update INCLFILE if changes

12
slsDetectorSoftware/jctbDetectorServer/gitInfo.txt
View File

@ -1,9 +1,9 @@
Path: slsDetectorsPackage/slsDetectorSoftware/jctbDetectorServer Path: slsDetectorsPackage/slsDetectorSoftware/jctbDetectorServer
URL: origin git@git.psi.ch:sls_detectors_software/sls_detector_software.git URL: origin git@git.psi.ch:sls_detectors_software/slsDetectorPackage.git
Repository Root: origin git@git.psi.ch:sls_detectors_software/sls_detector_software.git Repository Root: origin git@git.psi.ch:sls_detectors_software/slsDetectorPackage.git
Repsitory UUID: 9701f00f9e6e9ed5563b6b5c4ace2f4a431b1db7 Repsitory UUID: 2f3dc8d109de8607f3217cf429619073dc9cc60e
Revision: 16 Revision: 17
Branch: developer Branch: developer
Last Changed Author: Dhanya_Maliakal Last Changed Author: Dhanya_Maliakal
Last Changed Rev: 1669 Last Changed Rev: 3397
Last Changed Date: 2017-11-20 11:32:02.000000002 +0100 ./firmware_funcs.c Last Changed Date: 2017-12-06 19:05:47.000000002 +0100 ./server_funcs.c

17
slsDetectorSoftware/jctbDetectorServer/gitInfoMoench.h
View File

@ -1,11 +1,6 @@
//#define SVNPATH "" #define GITURL "git@git.psi.ch:sls_detectors_software/slsDetectorPackage.git"
#define SVNURL "git@git.psi.ch:sls_detectors_software/sls_detector_software.git" #define GITREPUUID "2f3dc8d109de8607f3217cf429619073dc9cc60e"
//#define SVNREPPATH "" #define GITAUTH "Dhanya_Maliakal"
#define SVNREPUUID "9701f00f9e6e9ed5563b6b5c4ace2f4a431b1db7" #define GITREV 0x3397
//#define SVNREV 0x1669 #define GITDATE 0x20171206
//#define SVNKIND "" #define GITBRANCH "developer"
//#define SVNSCHED ""
#define SVNAUTH "Dhanya_Maliakal"
#define SVNREV 0x1669
#define SVNDATE 0x20171120
//

17
slsDetectorSoftware/jctbDetectorServer/gitInfoMoenchTmp.h
View File

@ -1,11 +1,6 @@
//#define SVNPATH "" #define GITURL ""
#define SVNURL "" #define GITREPUUID ""
//#define SVNREPPATH "" #define GITAUTH ""
#define SVNREPUUID "" #define GITREV ""
//#define SVNREV "" #define GITDATE ""
//#define SVNKIND "" #define GITBRANCH ""
//#define SVNSCHED ""
#define SVNAUTH ""
#define SVNREV ""
#define SVNDATE ""
//

BIN
slsDetectorSoftware/jctbDetectorServer/jctbDetectorServer
View File

Binary file not shown.

7
slsDetectorSoftware/jctbDetectorServer/server_funcs.c
View File

@ -706,12 +706,9 @@ int get_id(int file_des) {
retval=(retval <<32) | getFirmwareVersion(); retval=(retval <<32) | getFirmwareVersion();
break; break;
case DETECTOR_SOFTWARE_VERSION: case DETECTOR_SOFTWARE_VERSION:
retval= SVNREV; retval= GITREV;
retval= (retval <<32) | SVNDATE; retval= (retval <<32) | GITDATE;
break; break;
/* case DETECTOR_FIRMWARE_SVN_VERSION:
retval=getFirmwareSVNVersion();
break;*/
default: default:
printf("Required unknown id %d \n", arg); printf("Required unknown id %d \n", arg);
ret=FAIL; ret=FAIL;

2
slsDetectorSoftware/jctbDetectorServer/updateGitVersion.sh
View File

@ -19,7 +19,7 @@ NEWDATE=${NEWDATE/#/0x}
#get old date from INCLFILE #get old date from INCLFILE
OLDDATE=$(more $INCLFILE | grep '#define SVNDATE' | awk '{print $3}') OLDDATE=$(more $INCLFILE | grep '#define GITDATE' | awk '{print $3}')
#update INCLFILE if changes #update INCLFILE if changes

12
slsDetectorSoftware/jungfrauDetectorServer/gitInfo.txt
View File

@ -1,9 +1,9 @@
Path: slsDetectorsPackage/slsDetectorSoftware/jungfrauDetectorServer Path: slsDetectorsPackage/slsDetectorSoftware/jungfrauDetectorServer
URL: origin git@git.psi.ch:sls_detectors_software/sls_detector_software.git URL: origin git@git.psi.ch:sls_detectors_software/slsDetectorPackage.git
Repository Root: origin git@git.psi.ch:sls_detectors_software/sls_detector_software.git Repository Root: origin git@git.psi.ch:sls_detectors_software/slsDetectorPackage.git
Repsitory UUID: 4148ec5bbbaa20171fbda3e9c53e59a0d2d77db0 Repsitory UUID: 2f3dc8d109de8607f3217cf429619073dc9cc60e
Revision: 93 Revision: 103
Branch: developer Branch: developer
Last Changed Author: Dhanya_Maliakal Last Changed Author: Dhanya_Maliakal
Last Changed Rev: 1610 Last Changed Rev: 3397
Last Changed Date: 2017-10-25 16:48:35.000000002 +0200 ./RegisterDefs.h Last Changed Date: 2017-12-04 18:23:05.000000002 +0100 ./RegisterDefs.h

17
slsDetectorSoftware/jungfrauDetectorServer/gitInfoJungfrau.h
View File

@ -1,11 +1,6 @@
//#define SVNPATH "" #define GITURL "git@git.psi.ch:sls_detectors_software/slsDetectorPackage.git"
#define SVNURL "git@git.psi.ch:sls_detectors_software/sls_detector_software.git" #define GITREPUUID "2f3dc8d109de8607f3217cf429619073dc9cc60e"
//#define SVNREPPATH "" #define GITAUTH "Dhanya_Maliakal"
#define SVNREPUUID "4148ec5bbbaa20171fbda3e9c53e59a0d2d77db0" #define GITREV 0x3397
//#define SVNREV 0x1610 #define GITDATE 0x20171204
//#define SVNKIND "" #define GITBRANCH "developer"
//#define SVNSCHED ""
#define SVNAUTH "Dhanya_Maliakal"
#define SVNREV 0x1610
#define SVNDATE 0x20171025
//

17
slsDetectorSoftware/jungfrauDetectorServer/gitInfoJungfrauTmp.h
View File

@ -1,11 +1,6 @@
//#define SVNPATH "" #define GITURL ""
#define SVNURL "" #define GITREPUUID ""
//#define SVNREPPATH "" #define GITAUTH ""
#define SVNREPUUID "" #define GITREV ""
//#define SVNREV "" #define GITDATE ""
//#define SVNKIND "" #define GITBRANCH ""
//#define SVNSCHED ""
#define SVNAUTH ""
#define SVNREV ""
#define SVNDATE ""
//

4
slsDetectorSoftware/jungfrauDetectorServer/slsDetectorFunctionList.c
View File

@ -184,8 +184,8 @@ int64_t getDetectorId(enum idMode arg){
//case SOFTWARE_FIRMWARE_API_VERSION: //case SOFTWARE_FIRMWARE_API_VERSION:
//return GetFirmwareSoftwareAPIVersion(); //return GetFirmwareSoftwareAPIVersion();
case DETECTOR_SOFTWARE_VERSION: case DETECTOR_SOFTWARE_VERSION:
retval= SVNREV; retval= GITREV;
retval= (retval <<32) | SVNDATE; retval= (retval <<32) | GITDATE;
break; break;
default: default:
break; break;

2
slsDetectorSoftware/jungfrauDetectorServer/updateGitVersion.sh
View File

@ -19,7 +19,7 @@ NEWDATE=${NEWDATE/#/0x}
#get old date from INCLFILE #get old date from INCLFILE
OLDDATE=$(more $INCLFILE | grep '#define SVNDATE' | awk '{print $3}') OLDDATE=$(more $INCLFILE | grep '#define GITDATE' | awk '{print $3}')
#update INCLFILE if changes #update INCLFILE if changes

17
slsDetectorSoftware/moenchDetectorServer/gitInfoMoench.h
View File

@ -1,11 +1,6 @@
//#define SVNPATH "" #define GITURL "git@git.psi.ch:sls_detectors_software/sls_detector_software.git"
#define SVNURL "git@git.psi.ch:sls_detectors_software/sls_detector_software.git" #define GITREPUUID "9f1b82c18ab0893d65bfadeb646b8ea244614632"
//#define SVNREPPATH "" #define GITAUTH "Dhanya_Maliakal"
#define SVNREPUUID "9f1b82c18ab0893d65bfadeb646b8ea244614632" #define GITREV 0x1443
//#define SVNREV 0x1443 #define GITDATE 0x20170710
//#define SVNKIND "" #define GITBRANCH "blabla"
//#define SVNSCHED ""
#define SVNAUTH "Dhanya_Maliakal"
#define SVNREV 0x1443
#define SVNDATE 0x20170710
//

17
slsDetectorSoftware/moenchDetectorServer/gitInfoMoenchTmp.h
View File

@ -1,11 +1,6 @@
//#define SVNPATH "" #define GITURL ""
#define SVNURL "" #define GITREPUUID ""
//#define SVNREPPATH "" #define GITAUTH ""
#define SVNREPUUID "" #define GITREV ""
//#define SVNREV "" #define GITDATE ""
//#define SVNKIND "" #define GITBRANCH ""
//#define SVNSCHED ""
#define SVNAUTH ""
#define SVNREV ""
#define SVNDATE ""
//

7
slsDetectorSoftware/moenchDetectorServer/server_funcs.c
View File

@ -597,12 +597,9 @@ int get_id(int file_des) {
retval=(retval <<32) | getFirmwareVersion(); retval=(retval <<32) | getFirmwareVersion();
break; break;
case DETECTOR_SOFTWARE_VERSION: case DETECTOR_SOFTWARE_VERSION:
retval= SVNREV; retval= GITREV;
retval= (retval <<32) | SVNDATE; retval= (retval <<32) | GITDATE;
break; break;
/* case DETECTOR_FIRMWARE_SVN_VERSION:
retval=getFirmwareSVNVersion();
break;*/
default: default:
printf("Required unknown id %d \n", arg); printf("Required unknown id %d \n", arg);
ret=FAIL; ret=FAIL;

2
slsDetectorSoftware/moenchDetectorServer/updateGitVersion.sh
View File

@ -19,7 +19,7 @@ NEWDATE=${NEWDATE/#/0x}
#get old date from INCLFILE #get old date from INCLFILE
OLDDATE=$(more $INCLFILE | grep '#define SVNDATE' | awk '{print $3}') OLDDATE=$(more $INCLFILE | grep '#define GITDATE' | awk '{print $3}')
#update INCLFILE if changes #update INCLFILE if changes

17
slsDetectorSoftware/mythenDetectorServer/gitInfoMythen.h
View File

@ -1,11 +1,6 @@
//#define SVNPATH "" #define GITURL "git@git.psi.ch:sls_detectors_software/sls_detector_software.git/mythenDetectorServer"
#define SVNURL "git@git.psi.ch:sls_detectors_software/sls_detector_software.git/mythenDetectorServer" #define GITREPUUID "8aceb5d4b0ca6bd95a11b53e7a799b463b92d51b"
//#define SVNREPPATH "" #define GITAUTH "Dhanya_Maliakal"
#define SVNREPUUID "8aceb5d4b0ca6bd95a11b53e7a799b463b92d51b" #define GITREV 0x334
//#define SVNREV 0x334 #define GITDATE 0x20160812
//#define SVNKIND "" #define GITBRANCH "blabla"
//#define SVNSCHED ""
#define SVNAUTH "Dhanya_Maliakal"
#define SVNREV 0x334
#define SVNDATE 0x20160812
//

17
slsDetectorSoftware/mythenDetectorServer/gitInfoMythenTmp.h
View File

@ -1,11 +1,6 @@
//#define SVNPATH "" #define GITURL ""
#define SVNURL "" #define GITREPUUID ""
//#define SVNREPPATH "" #define GITAUTH ""
#define SVNREPUUID "" #define GITREV ""
//#define SVNREV "" #define GITDATE ""
//#define SVNKIND "" #define GITBRANCH ""
//#define SVNSCHED ""
#define SVNAUTH ""
#define SVNREV ""
#define SVNDATE ""
//

4
slsDetectorSoftware/mythenDetectorServer/server_funcs.c
View File

@ -586,8 +586,8 @@ int get_id(int file_des) {
retval=getMcsVersion(); retval=getMcsVersion();
break; break;
case DETECTOR_SOFTWARE_VERSION: case DETECTOR_SOFTWARE_VERSION:
retval= SVNREV; retval= GITREV;
retval= (retval <<32) | SVNDATE; retval= (retval <<32) | GITDATE;
/* sscanf(THIS_REVISION,"$Rev : %x",&rev1); /* sscanf(THIS_REVISION,"$Rev : %x",&rev1);
rev=((int64_t)rev1); rev=((int64_t)rev1);
dat=THIS_SOFTWARE_VERSION; dat=THIS_SOFTWARE_VERSION;

2
slsDetectorSoftware/mythenDetectorServer/updateGitVersion.sh
View File

@ -19,7 +19,7 @@ NEWDATE=${NEWDATE/#/0x}
#get old date from INCLFILE #get old date from INCLFILE
OLDDATE=$(more $INCLFILE | grep '#define SVNDATE' | awk '{print $3}') OLDDATE=$(more $INCLFILE | grep '#define GITDATE' | awk '{print $3}')
#update INCLFILE if changes #update INCLFILE if changes

17
slsDetectorSoftware/slsDetector/gitInfoLib.h
View File

@ -1,11 +1,6 @@
//#define SVNPATH "" #define GITURL "git@git.psi.ch:sls_detectors_software/slsDetectorPackage.git"
#define SVNURLLIB "git@git.psi.ch:sls_detectors_software/slsDetectorPackage.git" #define GITREPUUID "c4a242e10a4aafd102cc9a2a7ddae4ac92b8ba99"
//#define SVNREPPATH "" #define GITAUTH "Dhanya_Maliakal"
#define SVNREPUUIDLIB "b498043ea612fa3148bf1d7ea2a39c46092addf8" #define GITREV 0x3187
//#define SVNREV 0x3185 #define GITDATE 0x20171206
//#define SVNKIND "" #define GITBRANCH "3.0.1"
//#define SVNSCHED ""
#define SVNAUTHLIB "Dhanya_Maliakal"
#define SVNREVLIB 0x3185
#define SVNDATELIB 0x20171206
//

17
slsDetectorSoftware/slsDetector/gitInfoLibTmp.h
View File

@ -1,11 +1,6 @@
//#define SVNPATH "" #define GITURL ""
#define SVNURLLIB "/root/" #define GITREPUUID ""
//#define SVNREPPATH "" #define GITAUTH ""
#define SVNREPUUIDLIB "00000-00000-00000" #define GITREV ""
//#define SVNREV "" #define GITDATE ""
//#define SVNKIND "" #define GITBRANCH ""
//#define SVNSCHED ""
#define SVNAUTHLIB "nobody"
#define SVNREVLIB 0
#define SVNDATELIB 20000101
//

4
slsDetectorSoftware/slsDetector/slsDetector.cpp
View File

@ -2244,8 +2244,8 @@ int64_t slsDetector::getId( idMode mode, int imod){
#endif #endif
if (mode==THIS_SOFTWARE_VERSION) { if (mode==THIS_SOFTWARE_VERSION) {
ret=OK; ret=OK;
retval=SVNREVLIB; retval=GITREV;
retval=(retval<<32) | SVNDATELIB; retval=(retval<<32) | GITDATE;
} else if (mode==RECEIVER_VERSION) { } else if (mode==RECEIVER_VERSION) {
if (thisDetector->receiverOnlineFlag==ONLINE_FLAG) { if (thisDetector->receiverOnlineFlag==ONLINE_FLAG) {
if (connectData() == OK){ if (connectData() == OK){

10
slsDetectorSoftware/slsDetectorClient/sls_detector_client.cpp
View File

@ -1,4 +1,5 @@
#include "multiSlsDetectorClient.h" #include "multiSlsDetectorClient.h"
#include "gitInfoLib.h"
#include <stdlib.h> #include <stdlib.h>
@ -7,6 +8,15 @@ using namespace std;
int main(int argc, char *argv[]) int main(int argc, char *argv[])
{ {
for (int i = 1; i < argc; ++i ) {
if (!(strcmp (argv[i],"--version")) || !(strcmp (argv[i],"-v"))) {
int64_t tempval = GITREV;
tempval = (tempval <<32) | GITDATE;
cout << argv[0] << " " << GITBRANCH << " (0x" << hex << tempval << ")" << endl;
return 0;
}
}
#ifdef PUT #ifdef PUT
int action=slsDetectorDefs::PUT_ACTION; int action=slsDetectorDefs::PUT_ACTION;
#endif #endif

6
slsDetectorSoftware/updateGitVersion.sh
View File

@ -16,13 +16,13 @@ NEWDATE=$(sed "s/-//g" <<< $RDATE | awk '{print $1;}')
NEWDATE=${NEWDATE/#/0x} NEWDATE=${NEWDATE/#/0x}
#get old date from INCLFILE #get old date from INCLFILE
OLDDATE=$(more $INCLFILE | grep '#define SVNDATE' | awk '{print $3}') OLDDATE=$(more $INCLFILE | grep '#define GITDATE' | awk '{print $3}')
#update INCLFILE if changes #update INCLFILE if changes
if [ "$OLDDATE" != "$NEWDATE" ]; then #if [ "$OLDDATE" != "$NEWDATE" ]; then
echo Path: ${MAINDIR}/${SPECDIR} $'\n'URL: ${GITREPO} $'\n'Repository Root: ${GITREPO} $'\n'Repsitory UUID: ${REPUID} $'\n'Revision: ${FOLDERREV} $'\n'Branch: ${BRANCH} $'\n'Last Changed Author: ${AUTH1}_${AUTH2} $'\n'Last Changed Rev: ${REV} $'\n'Last Changed Date: ${RDATE} > gitInfo.txt echo Path: ${MAINDIR}/${SPECDIR} $'\n'URL: ${GITREPO} $'\n'Repository Root: ${GITREPO} $'\n'Repsitory UUID: ${REPUID} $'\n'Revision: ${FOLDERREV} $'\n'Branch: ${BRANCH} $'\n'Last Changed Author: ${AUTH1}_${AUTH2} $'\n'Last Changed Rev: ${REV} $'\n'Last Changed Date: ${RDATE} > gitInfo.txt
cd .. cd ..
./genVersionHeader.sh $SPECDIR/gitInfo.txt $SPECDIR/$TMPFILE $SPECDIR/$INCLFILE ./genVersionHeader.sh $SPECDIR/gitInfo.txt $SPECDIR/$TMPFILE $SPECDIR/$INCLFILE
cd $WD cd $WD
fi #fi

8
slsReceiverSoftware/gitInfo.txt
View File

@ -1,9 +1,9 @@
Path: slsDetectorsPackage/slsReceiverSoftware Path: slsDetectorsPackage/slsReceiverSoftware
URL: origin git@git.psi.ch:sls_detectors_software/slsDetectorPackage.git URL: origin git@git.psi.ch:sls_detectors_software/slsDetectorPackage.git
Repository Root: origin git@git.psi.ch:sls_detectors_software/slsDetectorPackage.git Repository Root: origin git@git.psi.ch:sls_detectors_software/slsDetectorPackage.git
Repsitory UUID: b498043ea612fa3148bf1d7ea2a39c46092addf8 Repsitory UUID: 7436d6c8d3538cef443e0fa76bc01762fd6cc246
Revision: 687 Revision: 688
Branch: 3.0.1 Branch: 3.0.1
Last Changed Author: Dhanya_Maliakal Last Changed Author: Dhanya_Maliakal
Last Changed Rev: 3185 Last Changed Rev: 3186
Last Changed Date: 2017-12-06 08:43:21.000000002 +0100 ./src/UDPStandardImplementation.cpp Last Changed Date: 2017-12-06 08:45:14.000000002 +0100 ./src/UDPStandardImplementation.cpp

17
slsReceiverSoftware/include/gitInfoReceiver.h
View File

@ -1,11 +1,6 @@
//#define SVNPATH "" #define GITURL "git@git.psi.ch:sls_detectors_software/slsDetectorPackage.git"
#define SVNURL "git@git.psi.ch:sls_detectors_software/slsDetectorPackage.git" #define GITREPUUID "7436d6c8d3538cef443e0fa76bc01762fd6cc246"
//#define SVNREPPATH "" #define GITAUTH "Dhanya_Maliakal"
#define SVNREPUUID "b498043ea612fa3148bf1d7ea2a39c46092addf8" #define GITREV 0x3186
//#define SVNREV 0x3185 #define GITDATE 0x20171206
//#define SVNKIND "" #define GITBRANCH "3.0.1"
//#define SVNSCHED ""
#define SVNAUTH "Dhanya_Maliakal"
#define SVNREV 0x3185
#define SVNDATE 0x20171206
//

17
slsReceiverSoftware/include/gitInfoReceiverTmp.h
View File

@ -1,11 +1,6 @@
//#define SVNPATH "" #define GITURL ""
#define SVNURL "" #define GITREPUUID ""
//#define SVNREPPATH "" #define GITAUTH ""
#define SVNREPUUID "" #define GITREV ""
//#define SVNREV "" #define GITDATE ""
//#define SVNKIND "" #define GITBRANCH ""
//#define SVNSCHED ""
#define SVNAUTH ""
#define SVNREV ""
#define SVNDATE ""
//

62
slsReceiverSoftware/src/slsReceiver.cpp
View File

@ -12,7 +12,7 @@
#include <getopt.h> #include <getopt.h>
#include "slsReceiver.h" #include "slsReceiver.h"
//#include "UDPInterface.h" #include "gitInfoReceiver.h"
using namespace std; using namespace std;
@ -23,34 +23,37 @@ slsReceiver::slsReceiver(int argc, char *argv[], int &success):
udp_interface (NULL) udp_interface (NULL)
{ {
success=OK; success=OK;
// options // options
map<string, string> configuration_map; map<string, string> configuration_map;
int tcpip_port_no = 1954; int tcpip_port_no = 1954;
string fname = ""; string fname = "";
int64_t tempval = 0;
//parse command line for config //parse command line for config
static struct option long_options[] = { static struct option long_options[] = {
// These options set a flag. // These options set a flag.
//{"verbose", no_argument, &verbose_flag, 1}, //{"verbose", no_argument, &verbose_flag, 1},
// These options don’t set a flag. We distinguish them by their indices. // These options don’t set a flag. We distinguish them by their indices.
{"config", required_argument, 0, 'f'}, {"config", required_argument, 0, 'f'},
{"rx_tcpport", required_argument, 0, 't'}, {"rx_tcpport", required_argument, 0, 't'},
{"help", no_argument, 0, 'h'}, {"version", no_argument, 0, 'v'},
{0, 0, 0, 0} {"help", no_argument, 0, 'h'},
}; {0, 0, 0, 0}
};
// getopt_long stores the option index here. // getopt_long stores the option index here.
int option_index = 0; int option_index = 0;
int c=0; int c = 0;
optind = 1;
while ( c != -1 ){ while ( c != -1 ){
c = getopt_long (argc, argv, "hf:t:", long_options, &option_index); c = getopt_long (argc, argv, "hvf:t:", long_options, &option_index);
// Detect the end of the options. // Detect the end of the options.
if (c == -1) if (c == -1)
break; break;
switch(c){ switch(c){
case 'f': case 'f':
@ -63,17 +66,28 @@ slsReceiver::slsReceiver(int argc, char *argv[], int &success):
case 't': case 't':
sscanf(optarg, "%d", &tcpip_port_no); sscanf(optarg, "%d", &tcpip_port_no);
break; break;
case 'v':
tempval = GITREV;
tempval = (tempval <<32) | GITDATE;
cout << "SLS Receiver " << GITBRANCH << " (0x" << hex << tempval << ")" << endl;
success = FAIL; // to exit
break;
case 'h': case 'h':
string help_message = "\nSLS Receiver Server\n\n"; default:
help_message += "Usage: slsReceiver [arguments]\nPossible arguments are:\n"; string help_message = "\n"
help_message += "\t-f, --config: Configuration filename\n"; + string(argv[0]) + "\n"
help_message += "\t-t, --rx_tcpport: TCP Port with the client. Default: 1954.\n" + "Usage: " + string(argv[0]) + " [arguments]\n"
"\t Required for multiple receivers\n\n"; + "Possible arguments are:\n"
+ "\t-f, --config <fname> : Loads config from file\n"
+ "\t-t, --rx_tcpport <port> : TCP Communication Port with client. \n"
+ "\t Default: 1954. Required for multiple \n"
+ "\t receivers\n\n";
FILE_LOG(logINFO) << help_message << endl; FILE_LOG(logINFO) << help_message << endl;
break; break;
} }
} }
@ -85,7 +99,7 @@ slsReceiver::slsReceiver(int argc, char *argv[], int &success):
} }
catch(...){ catch(...){
FILE_LOG(logERROR) << "Coult not open configuration file " << fname ; FILE_LOG(logERROR) << "Coult not open configuration file " << fname ;
success = FAIL; success = FAIL;
} }
} }

4
slsReceiverSoftware/src/slsReceiverTCPIPInterface.cpp
View File

@ -152,8 +152,8 @@ void slsReceiverTCPIPInterface::stop(){
int64_t slsReceiverTCPIPInterface::getReceiverVersion(){ int64_t slsReceiverTCPIPInterface::getReceiverVersion(){
int64_t retval = SVNREV; int64_t retval = GITREV;
retval= (retval <<32) | SVNDATE; retval= (retval <<32) | GITDATE;
return retval; return retval;
} }

2
slsReceiverSoftware/updateGitVersion.sh
View File

@ -16,7 +16,7 @@ NEWDATE=$(sed "s/-//g" <<< $RDATE | awk '{print $1;}')
NEWDATE=${NEWDATE/#/0x} NEWDATE=${NEWDATE/#/0x}
#get old date from INCLFILE #get old date from INCLFILE
OLDDATE=$(more $INCLFILE | grep '#define SVNDATE' | awk '{print $3}') OLDDATE=$(more $INCLFILE | grep '#define GITDATE' | awk '{print $3}')
#update INCLFILE if changes #update INCLFILE if changes
if [ "$OLDDATE" != "$NEWDATE" ]; then if [ "$OLDDATE" != "$NEWDATE" ]; then