makefiles and versioning update complete

This commit is contained in:
Dhanya Maliakal
2017-06-29 17:10:10 +02:00
parent 1a74ceca3e
commit b05e9c194a
14 changed files with 135 additions and 95 deletions

View File

@@ -12,13 +12,14 @@ SRC_CLNT = communication_funcs.c slsDetectorServer.c slsDetectorServer_funcs.c
OBJS = $(SRC_CLNT:.c=.o)
all: clean updateVersion $(PROGS) #hv9m_blackfin_server
all: clean $(PROGS) #hv9m_blackfin_server
boot: $(OBJS)
$(PROGS):
echo $(OBJS)
$(PROGS): $(OBJS)
# echo $(OBJS)
@echo `tput setaf 6; ./updateGitVersion.sh; tput sgr0;`
mkdir -p $(DESTDIR)
$(CC) -o $@ $(SRC_CLNT) $(CFLAGS) $(LDLIBS)
mv $(PROGS) $(DESTDIR)
@@ -32,6 +33,4 @@ hv9m_blackfin_server:9mhvserial_bf.c
clean:
rm -rf $(DESTDIR)/$(PROGS) *.o $(DESTDIR)/hv9m_blackfin_server
updateVersion:
./updateGitVersion.sh

View File

@@ -1,9 +1,9 @@
Path: slsDetectorsPackage/slsDetectorSoftware/eigerDetectorServer
URL: origin git@git.psi.ch:sls_detectors_software/sls_detector_software.git/eigerDetectorServer
Repository Root: origin git@git.psi.ch:sls_detectors_software/sls_detector_software.git
Repsitory UUID: 94d2b8cd58bbf69d26f491b7b81e2b269aac32b9
Revision: 292
Repsitory UUID: d4b0bef367ef407a3267619196da01dc1636865d
Revision: 293
Branch: developer
Last Changed Author: Dhanya_Maliakal
Last Changed Rev: 1427
Last Changed Date: 2017-06-28 10:27:40 +0200
Last Changed Rev: 1435
Last Changed Date: 2017-06-28 18:16:55 +0200

View File

@@ -1,11 +1,11 @@
//#define SVNPATH ""
#define SVNURL "git@git.psi.ch:sls_detectors_software/sls_detector_software.git/eigerDetectorServer"
//#define SVNREPPATH ""
#define SVNREPUUID "94d2b8cd58bbf69d26f491b7b81e2b269aac32b9"
//#define SVNREV 0x1427
#define SVNREPUUID "d4b0bef367ef407a3267619196da01dc1636865d"
//#define SVNREV 0x1435
//#define SVNKIND ""
//#define SVNSCHED ""
#define SVNAUTH "Dhanya_Maliakal"
#define SVNREV 0x1427
#define SVNREV 0x1435
#define SVNDATE 0x20170628
//