detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-06-06 10:00:40 +02:00
Code Issues Actions Packages Releases Activity

trying with gui makefile changes

Browse Source
This commit is contained in:
Dhanya Maliakal 2017-06-29 09:27:26 +02:00
parent cfff7969e3
commit 21e1fcf693
8 changed files with 20 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
slsDetectorGui/Makefile
View File

@ -53,7 +53,8 @@ htmldoc:
cd manual && $(MAKE) html DESTDIR=$(DOCDIR) cd manual && $(MAKE) html DESTDIR=$(DOCDIR)
$(PROG): Makefile.gui $(DIR) $(PROG): Makefile.gui $(DIR)
./updateGitVersion.sh echo $(DIR)
# ./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:

10
slsDetectorGui/client/Makefile
View File

@ -4,26 +4,26 @@ LDLIBS += -lm -lstdc++ -pthread
LDIR = ../../slsDetectorSoftware LDIR = ../../slsDetectorSoftware
RDIR = ../../slsReceiverSoftware RDIR = ../../slsReceiverSoftware
DDIR = ../../bin
INCLUDES = -I $(LDIR)/commonFiles -I $(LDIR)/slsDetector -I ../include -I $(RDIR)/include INCLUDES = -I $(LDIR)/commonFiles -I $(LDIR)/slsDetector -I ../include -I $(RDIR)/include
SRC_CLNT = qClient.cpp $(RDIR)/src/MySocketTCP.cpp 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 all: client
client: $(OBJS) $(DESTDIR)/gui_client client: $(OBJS) $(DDIR)/gui_client
OBJS = $(SRC_CLNT:%.cpp=%.o) 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) $(CXX) -o $@ -c $< $(INCLUDES) $(FLAGS) $(LDLIBS)
clean: clean:
rm -rf $(DESTDIR)/$(PROGS) *.o rm -rf $(DDIR)/gui_client *.o

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: 6ceaa18c5d55e94339999977a91fca1d8712578d Repsitory UUID: f21a3f8c1613400832e403ddd57a39d4fbb05249
Revision: 395 Revision: 396
Branch: developer Branch: developer
Last Changed Author: Dhanya_Maliakal Last Changed Author: Dhanya_Maliakal
Last Changed Rev: 395 Last Changed Rev: 396
Last Changed Date: 2017-06-28 11:18:55 +0200 Last Changed Date: 2017-06-28 18:52:43 +0200

6
slsDetectorGui/include/gitInfoGui.h → 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 "6ceaa18c5d55e94339999977a91fca1d8712578d" #define SVNREPUUID "f21a3f8c1613400832e403ddd57a39d4fbb05249"
//#define SVNREV 0x395 //#define SVNREV 0x396
//#define SVNKIND "" //#define SVNKIND ""
//#define SVNSCHED "" //#define SVNSCHED ""
#define SVNAUTH "Dhanya_Maliakal" #define SVNAUTH "Dhanya_Maliakal"
#define SVNREV 0x395 #define SVNREV 0x396
#define SVNDATE 0x20170628 #define SVNDATE 0x20170628
// //

0
slsDetectorGui/include/gitInfoGuiTmp.h → slsDetectorGui/gitInfoGuiTmp.h
View File

3
slsDetectorGui/include/qDefs.h
View File

@ -19,7 +19,7 @@
#include <QAbstractButton> #include <QAbstractButton>
using namespace std; using namespace std;
class qDefs:public QWidget{ class qDefs:public QWidget {
public: public:
//------------------------------------------------------------------------------------------------------------------------------------------------- //-------------------------------------------------------------------------------------------------------------------------------------------------
@ -28,7 +28,6 @@ public:
qDefs(){}; qDefs(){};
//------------------------------------------------------------------------------------------------------------------------------------------------- //-------------------------------------------------------------------------------------------------------------------------------------------------
static const int64_t GUI_VERSION=0x20121213;
#define GOODBYE -200 #define GOODBYE -200
//------------------------------------------------------------------------------------------------------------------------------------------------- //-------------------------------------------------------------------------------------------------------------------------------------------------

4
slsDetectorGui/slsDetectorGui.pro
View File

@ -30,6 +30,8 @@ QMAKE_CXXFLAGS_WARN_ON = -w
QMAKE_CFLAGS_WARN_ON = -w QMAKE_CFLAGS_WARN_ON = -w
QMAKE_PRE_LINK = updateGitVersion.sh
DESTDIR ?= bin DESTDIR ?= bin
MOC_DIR = mocs MOC_DIR = mocs
OBJECTS_DIR = objs OBJECTS_DIR = objs
@ -127,7 +129,7 @@ HEADERS = \
include/qTabDebugging.h\ include/qTabDebugging.h\
include/qTabDeveloper.h\ include/qTabDeveloper.h\
include/qTabMessages.h\ include/qTabMessages.h\
include/gitInfoGui.h\ gitInfoGui.h\
../slsDetectorSoftware/commonFiles/sls_detector_defs.h\ ../slsDetectorSoftware/commonFiles/sls_detector_defs.h\
../slsReceiverSoftware/include/sls_receiver_defs.h\ ../slsReceiverSoftware/include/sls_receiver_defs.h\
include/qServer.h include/qServer.h

4
slsDetectorGui/updateGitVersion.sh
View File

@ -1,7 +1,7 @@
MAINDIR=slsDetectorsPackage MAINDIR=slsDetectorsPackage
SPECDIR=slsDetectorGui SPECDIR=slsDetectorGui
TMPFILE=include/gitInfoGuiTmp.h TMPFILE=gitInfoGuiTmp.h
INCLFILE=include/gitInfoGui.h INCLFILE=gitInfoGui.h
WD=$PWD WD=$PWD
GITREPO1='git remote -v' GITREPO1='git remote -v'