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

makefiles and versioning update complete

Browse Source
This commit is contained in:
Dhanya Maliakal
2017-06-29 17:09:46 +02:00
parent b6eb4cbb61
commit c01931e5a6
5 changed files with 36 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
slsDetectorGui/Makefile
View File

@ -4,16 +4,13 @@ include ../Makefile.include
$(info ) $(info )
$(info ##################################) $(info ##################################)
$(info # Compiling slsDetectorGui #) $(info # In slsDetectorGui Makefile #)
$(info ##################################) $(info ##################################)
$(info ) $(info )
PROG = $(DESTDIR)/slsDetectorGui
DESTDIR ?= ../bin DESTDIR ?= ../bin
LIBDIR ?= $(DESTDIR) PROG = $(DESTDIR)/slsDetectorGui
DOCDIR ?= docs DOCDIR ?= docs
LIBRARYDIR ?= ../slsDetectorSoftware LIBRARYDIR ?= ../slsDetectorSoftware
@ -29,10 +26,15 @@ INCLUDES ?= $(LIBRARYDIR)/commonFiles -I$(LIBRARYRXRDIR)/MySocketTCP -I$(LIBRA
.PHONY: all lib clean mm doc htmldoc guiclient .PHONY: all lib clean mm doc htmldoc guiclient
all: lib $(PROG) Makefile.gui guiclient all: lib Makefile.gui $(PROG) guiclient
lib: $(DESTDIR)/libSlsDetector.so $(DESTDIR)/libSlsDetector.a lib:
if [ ! -f $(DESTDIR)/libSlsDetector.so ]; then cd ../ && $(MAKE) lib; fi cd $(LIBRARYDIR) && $(MAKE) DESTDIR=$(DESTDIR)
@echo ""
@echo "#######################################"
@echo "# Back in slsDetectorGui Makefile #"
@echo "#######################################"
@echo ""
clean: clean:
@ -44,7 +46,7 @@ clean:
Makefile.gui: mm Makefile.gui: mm
mm: mm:
qmake -set QT_INSTALL_PREFIX $(QTDIR) && qmake -o Makefile.gui INCLUDES='$(INCLUDES)' DESTDIR=$(DESTDIR) SLSDETLIB=$(LIBDIR) SUBLIBS='$(LDFLAGDET)' qmake -set QT_INSTALL_PREFIX $(QTDIR) && qmake -o Makefile.gui INCLUDES='$(INCLUDES)' DESTDIR=$(DESTDIR) SLSDETLIB=$(DESTDIR) SUBLIBS='$(LDFLAGDET)'
doc: doc:
cd manual && $(MAKE) DESTDIR=$(DOCDIR) cd manual && $(MAKE) DESTDIR=$(DOCDIR)
@ -52,12 +54,10 @@ doc:
htmldoc: htmldoc:
cd manual && $(MAKE) html DESTDIR=$(DOCDIR) cd manual && $(MAKE) html DESTDIR=$(DOCDIR)
$(PROG): Makefile.gui slsDetectorGui.pro $(DIR) $(PROG): Makefile slsDetectorGui.pro $(DIR)
echo $(DIR) $(MAKE) -f Makefile.gui SLSDETLIB=$(DESTDIR) DESTDIR=$(DESTDIR) SUBLIBS='$(LDFLAGDET)' INCLUDES='$(INCLUDES)'
./updateGitVersion.sh
$(MAKE) -f Makefile.gui SLSDETLIB=$(LIBDIR) DESTDIR=$(DESTDIR) SUBLIBS='$(LDFLAGDET)' INCLUDES='$(INCLUDES)'
guiclient: guiclient:
echo $(WD) # echo $(WD)
cd client && $(MAKE) DESTDIR=$(DESTDIR) cd client && $(MAKE) DESTDIR=$(DESTDIR)

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: d327f25aa2d79558370a3ad8ca1fbfa78479bb35 Repsitory UUID: 9794596be92a600d19395eb6bf7818ae5e0a68f7
Revision: 397 Revision: 398
Branch: developer Branch: developer
Last Changed Author: Dhanya_Maliakal Last Changed Author: Dhanya_Maliakal
Last Changed Rev: 397 Last Changed Rev: 398
Last Changed Date: 2017-06-29 09:27:26 +0200 Last Changed Date: 2017-06-29 10:18:51 +0200

6
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 "d327f25aa2d79558370a3ad8ca1fbfa78479bb35" #define SVNREPUUID "9794596be92a600d19395eb6bf7818ae5e0a68f7"
//#define SVNREV 0x397 //#define SVNREV 0x398
//#define SVNKIND "" //#define SVNKIND ""
//#define SVNSCHED "" //#define SVNSCHED ""
#define SVNAUTH "Dhanya_Maliakal" #define SVNAUTH "Dhanya_Maliakal"
#define SVNREV 0x397 #define SVNREV 0x398
#define SVNDATE 0x20170629 #define SVNDATE 0x20170629
// //

2
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:
//------------------------------------------------------------------------------------------------------------------------------------------------- //-------------------------------------------------------------------------------------------------------------------------------------------------

15
slsDetectorGui/slsDetectorGui.pro
View File

@ -4,6 +4,7 @@
#When using epics, uncomment epics defines, libs and a line in INCLUDEPATH #When using epics, uncomment epics defines, libs and a line in INCLUDEPATH
QT_INSTALL_PREFIX = $(QTDIR) QT_INSTALL_PREFIX = $(QTDIR)
QMAKE_UIC = $(QTDIR)/bin/uic QMAKE_UIC = $(QTDIR)/bin/uic
QMAKE_MOC = $(QTDIR)/bin/moc QMAKE_MOC = $(QTDIR)/bin/moc
@ -30,7 +31,7 @@ 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
@ -51,6 +52,18 @@ QMAKE_CLEAN += docs/*/*
extralib.target = extra
extralib.commands = echo `tput setaf 6`; \
echo 'xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx'; \
echo 'x Compiling slsDetectorGui x'; \
echo 'xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx'; \
echo `./updateGitVersion.sh; tput sgr0`
extralib.depends = $(target)
QMAKE_EXTRA_TARGETS += extralib
PRE_TARGETDEPS = extra
DEPENDPATH += \ DEPENDPATH += \
slsDetectorPlotting/include\ slsDetectorPlotting/include\