diff --git a/slsDetectorGui/Makefile b/slsDetectorGui/Makefile index 01d4a0447..b5a0b7deb 100644 --- a/slsDetectorGui/Makefile +++ b/slsDetectorGui/Makefile @@ -53,7 +53,8 @@ htmldoc: cd manual && $(MAKE) html DESTDIR=$(DOCDIR) $(PROG): Makefile.gui $(DIR) - ./updateGitVersion.sh + echo $(DIR) +# ./updateGitVersion.sh $(MAKE) -f Makefile.gui SLSDETLIB=$(LIBDIR) DESTDIR=$(DESTDIR) SUBLIBS='$(LDFLAGDET)' INCLUDES='$(INCLUDES)' guiclient: diff --git a/slsDetectorGui/client/Makefile b/slsDetectorGui/client/Makefile index 9a72c99d7..60f412844 100644 --- a/slsDetectorGui/client/Makefile +++ b/slsDetectorGui/client/Makefile @@ -4,26 +4,26 @@ LDLIBS += -lm -lstdc++ -pthread LDIR = ../../slsDetectorSoftware RDIR = ../../slsReceiverSoftware - +DDIR = ../../bin INCLUDES = -I $(LDIR)/commonFiles -I $(LDIR)/slsDetector -I ../include -I $(RDIR)/include SRC_CLNT = qClient.cpp $(RDIR)/src/MySocketTCP.cpp -DEPSINCLUDES= $(RDIR)/include/MySocketTCP.h $(LDIR)/slsDetector/slsDetectorBase.h $(LDIR)/commonFiles/sls_detector_defs.h +DEPSINCLUDES= qClient.h $(RDIR)/include/MySocketTCP.h $(LDIR)/slsDetector/slsDetectorBase.h $(LDIR)/commonFiles/sls_detector_defs.h all: client -client: $(OBJS) $(DESTDIR)/gui_client +client: $(OBJS) $(DDIR)/gui_client OBJS = $(SRC_CLNT:%.cpp=%.o) -$(DESTDIR)/gui_client : $(SRC_CLNT) $(DEPSINCLUDES) Makefile +$(DDIR)/gui_client : $(SRC_CLNT) $(DEPSINCLUDES) Makefile $(CXX) -o $@ -c $< $(INCLUDES) $(FLAGS) $(LDLIBS) clean: - rm -rf $(DESTDIR)/$(PROGS) *.o + rm -rf $(DDIR)/gui_client *.o diff --git a/slsDetectorGui/gitInfo.txt b/slsDetectorGui/gitInfo.txt index 7d37136d5..8a7336802 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: 6ceaa18c5d55e94339999977a91fca1d8712578d -Revision: 395 +Repsitory UUID: f21a3f8c1613400832e403ddd57a39d4fbb05249 +Revision: 396 Branch: developer Last Changed Author: Dhanya_Maliakal -Last Changed Rev: 395 -Last Changed Date: 2017-06-28 11:18:55 +0200 +Last Changed Rev: 396 +Last Changed Date: 2017-06-28 18:52:43 +0200 diff --git a/slsDetectorGui/include/gitInfoGui.h b/slsDetectorGui/gitInfoGui.h similarity index 68% rename from slsDetectorGui/include/gitInfoGui.h rename to slsDetectorGui/gitInfoGui.h index a98f973cc..9c618114e 100644 --- a/slsDetectorGui/include/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 "6ceaa18c5d55e94339999977a91fca1d8712578d" -//#define SVNREV 0x395 +#define SVNREPUUID "f21a3f8c1613400832e403ddd57a39d4fbb05249" +//#define SVNREV 0x396 //#define SVNKIND "" //#define SVNSCHED "" #define SVNAUTH "Dhanya_Maliakal" -#define SVNREV 0x395 +#define SVNREV 0x396 #define SVNDATE 0x20170628 // diff --git a/slsDetectorGui/include/gitInfoGuiTmp.h b/slsDetectorGui/gitInfoGuiTmp.h similarity index 100% rename from slsDetectorGui/include/gitInfoGuiTmp.h rename to slsDetectorGui/gitInfoGuiTmp.h diff --git a/slsDetectorGui/include/qDefs.h b/slsDetectorGui/include/qDefs.h index 0e5ddff6d..52a1a6b2d 100644 --- a/slsDetectorGui/include/qDefs.h +++ b/slsDetectorGui/include/qDefs.h @@ -19,7 +19,7 @@ #include using namespace std; -class qDefs:public QWidget{ +class qDefs:public QWidget { public: //------------------------------------------------------------------------------------------------------------------------------------------------- @@ -28,7 +28,6 @@ public: qDefs(){}; //------------------------------------------------------------------------------------------------------------------------------------------------- -static const int64_t GUI_VERSION=0x20121213; #define GOODBYE -200 //------------------------------------------------------------------------------------------------------------------------------------------------- diff --git a/slsDetectorGui/slsDetectorGui.pro b/slsDetectorGui/slsDetectorGui.pro index 61c3818d8..be6df9dc6 100644 --- a/slsDetectorGui/slsDetectorGui.pro +++ b/slsDetectorGui/slsDetectorGui.pro @@ -30,6 +30,8 @@ QMAKE_CXXFLAGS_WARN_ON = -w QMAKE_CFLAGS_WARN_ON = -w +QMAKE_PRE_LINK = updateGitVersion.sh + DESTDIR ?= bin MOC_DIR = mocs OBJECTS_DIR = objs @@ -127,7 +129,7 @@ HEADERS = \ include/qTabDebugging.h\ include/qTabDeveloper.h\ include/qTabMessages.h\ - include/gitInfoGui.h\ + gitInfoGui.h\ ../slsDetectorSoftware/commonFiles/sls_detector_defs.h\ ../slsReceiverSoftware/include/sls_receiver_defs.h\ include/qServer.h diff --git a/slsDetectorGui/updateGitVersion.sh b/slsDetectorGui/updateGitVersion.sh index dfce2b2a5..198e8f469 100755 --- a/slsDetectorGui/updateGitVersion.sh +++ b/slsDetectorGui/updateGitVersion.sh @@ -1,7 +1,7 @@ MAINDIR=slsDetectorsPackage SPECDIR=slsDetectorGui -TMPFILE=include/gitInfoGuiTmp.h -INCLFILE=include/gitInfoGui.h +TMPFILE=gitInfoGuiTmp.h +INCLFILE=gitInfoGui.h WD=$PWD GITREPO1='git remote -v'