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

testing changes

Browse Source
This commit is contained in:
Dhanya Maliakal 2017-06-29 10:18:51 +02:00
parent 21e1fcf693
commit b6eb4cbb61
4 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
slsDetectorGui/Makefile
View File

@ -52,9 +52,9 @@ doc:
htmldoc: htmldoc:
cd manual && $(MAKE) html DESTDIR=$(DOCDIR) cd manual && $(MAKE) html DESTDIR=$(DOCDIR)
$(PROG): Makefile.gui $(DIR) $(PROG): Makefile.gui slsDetectorGui.pro $(DIR)
echo $(DIR) echo $(DIR)
# ./updateGitVersion.sh ./updateGitVersion.sh
$(MAKE) -f Makefile.gui SLSDETLIB=$(LIBDIR) DESTDIR=$(DESTDIR) SUBLIBS='$(LDFLAGDET)' INCLUDES='$(INCLUDES)' $(MAKE) -f Makefile.gui SLSDETLIB=$(LIBDIR) DESTDIR=$(DESTDIR) SUBLIBS='$(LDFLAGDET)' INCLUDES='$(INCLUDES)'
guiclient: guiclient:

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/sls_detector_gui.git 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 Repository Root: origin git@git.psi.ch:sls_detectors_software/sls_detector_gui.git
Repsitory UUID: f21a3f8c1613400832e403ddd57a39d4fbb05249 Repsitory UUID: d327f25aa2d79558370a3ad8ca1fbfa78479bb35
Revision: 396 Revision: 397
Branch: developer Branch: developer
Last Changed Author: Dhanya_Maliakal Last Changed Author: Dhanya_Maliakal
Last Changed Rev: 396 Last Changed Rev: 397
Last Changed Date: 2017-06-28 18:52:43 +0200 Last Changed Date: 2017-06-29 09:27:26 +0200

8
slsDetectorGui/gitInfoGui.h
View File

@ -1,11 +1,11 @@
//#define SVNPATH "" //#define SVNPATH ""
#define SVNURL "git@git.psi.ch:sls_detectors_software/sls_detector_gui.git" #define SVNURL "git@git.psi.ch:sls_detectors_software/sls_detector_gui.git"
//#define SVNREPPATH "" //#define SVNREPPATH ""
#define SVNREPUUID "f21a3f8c1613400832e403ddd57a39d4fbb05249" #define SVNREPUUID "d327f25aa2d79558370a3ad8ca1fbfa78479bb35"
//#define SVNREV 0x396 //#define SVNREV 0x397
//#define SVNKIND "" //#define SVNKIND ""
//#define SVNSCHED "" //#define SVNSCHED ""
#define SVNAUTH "Dhanya_Maliakal" #define SVNAUTH "Dhanya_Maliakal"
#define SVNREV 0x396 #define SVNREV 0x397
#define SVNDATE 0x20170628 #define SVNDATE 0x20170629
// //

3
slsDetectorGui/slsDetectorGui.pro
View File

@ -30,7 +30,7 @@ QMAKE_CXXFLAGS_WARN_ON = -w
QMAKE_CFLAGS_WARN_ON = -w QMAKE_CFLAGS_WARN_ON = -w
QMAKE_PRE_LINK = updateGitVersion.sh #QMAKE_PRE_LINK = updateGitVersion.sh
DESTDIR ?= bin DESTDIR ?= bin
MOC_DIR = mocs MOC_DIR = mocs
@ -59,6 +59,7 @@ DEPENDPATH += \
INCLUDEPATH = \ INCLUDEPATH = \
. \
$(QWTDIR)/include\ $(QWTDIR)/include\
$(QWTDIR) \ $(QWTDIR) \
$(QWTDIR)/src\ $(QWTDIR)/src\