diff --git a/slsDetectorGui/Makefile b/slsDetectorGui/Makefile index b5a0b7deb..5650a6cbb 100644 --- a/slsDetectorGui/Makefile +++ b/slsDetectorGui/Makefile @@ -52,9 +52,9 @@ doc: htmldoc: cd manual && $(MAKE) html DESTDIR=$(DOCDIR) -$(PROG): Makefile.gui $(DIR) +$(PROG): Makefile.gui slsDetectorGui.pro $(DIR) echo $(DIR) -# ./updateGitVersion.sh + ./updateGitVersion.sh $(MAKE) -f Makefile.gui SLSDETLIB=$(LIBDIR) DESTDIR=$(DESTDIR) SUBLIBS='$(LDFLAGDET)' INCLUDES='$(INCLUDES)' guiclient: diff --git a/slsDetectorGui/gitInfo.txt b/slsDetectorGui/gitInfo.txt index 8a7336802..39d2639e7 100644 --- a/slsDetectorGui/gitInfo.txt +++ b/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: f21a3f8c1613400832e403ddd57a39d4fbb05249 -Revision: 396 +Repsitory UUID: d327f25aa2d79558370a3ad8ca1fbfa78479bb35 +Revision: 397 Branch: developer Last Changed Author: Dhanya_Maliakal -Last Changed Rev: 396 -Last Changed Date: 2017-06-28 18:52:43 +0200 +Last Changed Rev: 397 +Last Changed Date: 2017-06-29 09:27:26 +0200 diff --git a/slsDetectorGui/gitInfoGui.h b/slsDetectorGui/gitInfoGui.h index 9c618114e..048a10e11 100644 --- a/slsDetectorGui/gitInfoGui.h +++ b/slsDetectorGui/gitInfoGui.h @@ -1,11 +1,11 @@ //#define SVNPATH "" #define SVNURL "git@git.psi.ch:sls_detectors_software/sls_detector_gui.git" //#define SVNREPPATH "" -#define SVNREPUUID "f21a3f8c1613400832e403ddd57a39d4fbb05249" -//#define SVNREV 0x396 +#define SVNREPUUID "d327f25aa2d79558370a3ad8ca1fbfa78479bb35" +//#define SVNREV 0x397 //#define SVNKIND "" //#define SVNSCHED "" #define SVNAUTH "Dhanya_Maliakal" -#define SVNREV 0x396 -#define SVNDATE 0x20170628 +#define SVNREV 0x397 +#define SVNDATE 0x20170629 // diff --git a/slsDetectorGui/slsDetectorGui.pro b/slsDetectorGui/slsDetectorGui.pro index be6df9dc6..080cf6c8c 100644 --- a/slsDetectorGui/slsDetectorGui.pro +++ b/slsDetectorGui/slsDetectorGui.pro @@ -30,7 +30,7 @@ QMAKE_CXXFLAGS_WARN_ON = -w QMAKE_CFLAGS_WARN_ON = -w -QMAKE_PRE_LINK = updateGitVersion.sh +#QMAKE_PRE_LINK = updateGitVersion.sh DESTDIR ?= bin MOC_DIR = mocs @@ -59,6 +59,7 @@ DEPENDPATH += \ INCLUDEPATH = \ + . \ $(QWTDIR)/include\ $(QWTDIR) \ $(QWTDIR)/src\ @@ -129,7 +130,7 @@ HEADERS = \ include/qTabDebugging.h\ include/qTabDeveloper.h\ include/qTabMessages.h\ - gitInfoGui.h\ + gitInfoGui.h\ ../slsDetectorSoftware/commonFiles/sls_detector_defs.h\ ../slsReceiverSoftware/include/sls_receiver_defs.h\ include/qServer.h