some more changes to make file for automatic versioning, but changes to cpp file does not affect make, need to include that

slsDetectorGui/Makefile

@@ -55,7 +55,7 @@ doc:
 htmldoc:
 	cd manual && $(MAKE) html DESTDIR=$(DOCDIR)
 
-$(PROG): Makefile slsDetectorGui.pro $(DIR)
+$(PROG): Makefile $(DIR)
 	$(MAKE) -f Makefile.gui SLSDETLIB=$(DESTDIR) DESTDIR=$(DESTDIR) SUBLIBS='$(LDFLAGDET)' INCLUDES='$(INCLUDES)' LIBDIR='$(LIBDIR)'
 
 guiclient:

slsDetectorGui/gitInfo.txt

@@ -1,9 +1,9 @@
 Path: slsDetectorsPackage/slsDetectorGui 
 URL: origin git@git.psi.ch:sls_detectors_software/sls_detector_gui.git 
 Repository Root: origin git@git.psi.ch:sls_detectors_software/sls_detector_gui.git 
-Repsitory UUID: b1b9f6776cfa5994a7c360a5d170b7f8bc6ee41e 
+Repsitory UUID: 082fbe9d8d959d49d7dd10907e3ac10007154dc6 
-Revision: 401 
+Revision: 402 
 Branch: developer 
 Last Changed Author: Dhanya_Maliakal 
-Last Changed Rev: 401 
+Last Changed Rev: 402 
-Last Changed Date: 2017-07-03 14:45:29 +0200
+Last Changed Date: 2017-07-07 14:32:51.000000002 +0200 ./Makefile.gui

slsDetectorGui/include/qTabDeveloper.h

@@ -56,7 +56,7 @@ private:
 /**
  *@short sets up the Developer parameters
  */
-class qTabDeveloper:public QWidget{
+class qTabDeveloper:public QWidget {
 	Q_OBJECT
 
 public:

slsDetectorGui/slsDetectorGui.pro

@@ -22,7 +22,7 @@ QMAKE_LIBS 			= 	-L$(QTDIR)/lib
 
 #default
 DEFINES 			+= 	 VERBOSE DACS_INT PRINT_LOG  #VERYVERBOSE CHECKINFERROR 
-LIBS				=	-L$(QWTDIR)/lib	  -lqwt -L$(QWT3D)/lib 
+LIBS				=	-L$(QWTDIR)/lib	  -lqwt -L$(QWT3D)/lib $(LDFLAGDET)
 
 CXXFLAGS			+=  -g
 
@@ -59,6 +59,7 @@ extralib.commands = 	echo `tput setaf 6`;	\
 	echo 'xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx';	\
 	echo `./updateGitVersion.sh; tput sgr0`
 extralib.depends = $(target)
+
 QMAKE_EXTRA_TARGETS += extralib
 PRE_TARGETDEPS = extra
 
@@ -71,8 +72,7 @@ DEPENDPATH  		+=		\
 							forms/include
 
 
-INCLUDEPATH 		= 	\	 
+INCLUDEPATH 		+= 		\	 
-							. \
 							$(QWTDIR)/include\
 							$(QWTDIR) \
                             $(QWTDIR)/src\
@@ -87,6 +87,7 @@ INCLUDEPATH 		= 	\
 							/usr/include/QtCore\
 							/usr/include/QtGui\
 							$(INCLUDES) 
+							
 #epics
 #                            $(INCLUDES) /usr/local/epics/base/include/ -I /usr/local/epics/base/include/os/Linux/
 
@@ -143,7 +144,7 @@ HEADERS 			=  		\
 							include/qTabDebugging.h\
 							include/qTabDeveloper.h\
 							include/qTabMessages.h\
-							gitInfoGui.h\  
+							include/gitInfoGui.h\  
 							../slsDetectorSoftware/commonFiles/sls_detector_defs.h\
 							../slsReceiverSoftware/include/sls_receiver_defs.h\
 							include/qServer.h

slsDetectorGui/src/qTabDeveloper.cpp

@@ -25,7 +25,7 @@ int qTabDeveloper::NUM_ADC_WIDGETS(0);
 //-------------------------------------------------------------------------------------------------------------------------------------------------
 
 
-qTabDeveloper::qTabDeveloper(qDetectorMain *parent,multiSlsDetector*& detector):
+qTabDeveloper::qTabDeveloper(qDetectorMain *parent,multiSlsDetector*& detector) :
 								thisParent(parent),
 								myDet(detector),
 								det(0),
@@ -50,7 +50,7 @@ qTabDeveloper::qTabDeveloper(qDetectorMain *parent,multiSlsDetector*& detector):
 //-------------------------------------------------------------------------------------------------------------------------------------------------
 
 
-qTabDeveloper::~qTabDeveloper(){
+qTabDeveloper::~qTabDeveloper() {
 	delete myDet;
 	if(det) delete det;
 	if(thisParent) delete thisParent;
@@ -60,7 +60,7 @@ qTabDeveloper::~qTabDeveloper(){
 //-------------------------------------------------------------------------------------------------------------------------------------------------
 
 
-void qTabDeveloper::SetupWidgetWindow(){
+void qTabDeveloper::SetupWidgetWindow() {
 	//Detector Type
 	detType=myDet->getDetectorsType();
 
@@ -224,7 +224,6 @@ void qTabDeveloper::SetupWidgetWindow(){
 	layout->addWidget(comboDetector,0,0);
 	layout->addWidget(boxDacs,1,0);
 
-
 	//adcs
 	if(NUM_ADC_WIDGETS)		{
 		int rows = NUM_ADC_WIDGETS/2;
@@ -241,7 +240,7 @@ void qTabDeveloper::SetupWidgetWindow(){
 			layout->setVerticalSpacing(diff/2);
 		}
 		//timer to check adcs
-		/*adcTimer = new QTimer(this); adc timer disabled, display adcs only when refreshing developer tab*/
+		/*adcTimer = new QTimer(this); adc timer disabled, display adcs only when refreshing developer tab */
 	}
 
 	qDefs::checkErrorMessage(myDet,"qTabDeveloper::SetupWidgetWindow");

slsDetectorGui/updateGitVersion.sh

@@ -1,35 +1,28 @@
 MAINDIR=slsDetectorsPackage
 SPECDIR=slsDetectorGui
-TMPFILE=gitInfoGuiTmp.h
+TMPFILE=include/gitInfoGuiTmp.h
-INCLFILE=gitInfoGui.h
+INCLFILE=include/gitInfoGui.h
 WD=$PWD
 
-GITREPO1='git remote -v'
+#evaluate the variables
-GITREPO2=" | grep \"fetch\" | cut -d' ' -f1"
+EVALFILE=../evalVersionVariables.sh
-BRANCH1='git branch -v'
+source $EVALFILE
-BRANCH2=" | grep '*' | cut -d' ' -f2"
-REPUID1='git log --pretty=format:"%H" -1'
-AUTH1_1='git log --pretty=format:"%cn" -1'
-AUTH1_2=" | cut -d' ' -f1"
-AUTH2_1='git log --pretty=format:"%cn" -1'
-AUTH2_2=" | cut -d' ' -f2"
-FOLDERREV1='git log --oneline . '   #used for all the individual server folders
-FOLDERREV2=" | wc -l"  #used for all the individual server folders
-REV1='git log --oneline  '
-REV2=" | wc -l"
-RDATE1='git log --pretty=format:"%ci" -1'
 
-GITREPO=`eval $GITREPO1  $GITREPO2`
+#get modified date
-BRANCH=`eval $BRANCH1  $BRANCH2`
+#RDATE1='git log --pretty=format:"%ci" -1'
-REPUID=`eval $REPUID1`
+RDATE1="find . -type f -exec stat --format '%Y :%y %n' '{}' \; | sort -nr | cut -d: -f2- | egrep -v 'gitInfo|build|.git|updateGitVersion' | head -n 1"
-AUTH1=`eval $AUTH1_1  $AUTH1_2`
-AUTH2=`eval $AUTH2_1  $AUTH2_2`
-REV=`eval $REV1  $REV2`
-FOLDERREV=`eval $FOLDERREV1  $FOLDERREV2`
 RDATE=`eval $RDATE1`
-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 
+NEWDATE=$(sed "s/-//g" <<< $RDATE | awk '{print $1;}') 
-cd ..
+NEWDATE=${NEWDATE/#/0x}
-./genVersionHeader.sh $SPECDIR/gitInfo.txt $SPECDIR/$TMPFILE $SPECDIR/$INCLFILE 
-echo "Revision Updated"
-cd $WD
 
+#get old date from INCLFILE
+OLDDATE=$(more $INCLFILE | grep '#define SVNDATE' | awk '{print $3}')
+echo $OLDDATE
+echo $NEWDATE
+#update INCLFILE if changes
+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 
+	cd ..
+	./genVersionHeader.sh $SPECDIR/gitInfo.txt $SPECDIR/$TMPFILE $SPECDIR/$INCLFILE 
+	cd $WD
+fi