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

added updateversion into makefile while compiling

Browse Source
This commit is contained in:
Dhanya Maliakal
2017-06-28 10:48:03 +02:00
parent c2624daa9a
commit a7d3006cda
9 changed files with 65 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServerv3.0.0.16.3 Executable file
View File

Binary file not shown.

8
slsDetectorSoftware/eigerDetectorServer/gitInfo.txt
View File

@ -1,9 +1,9 @@
Path: slsDetectorsPackage/slsDetectorSoftware/eigerDetectorServer Path: slsDetectorsPackage/slsDetectorSoftware/eigerDetectorServer
URL: origin git@git.psi.ch:sls_detectors_software/sls_detector_software.git/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 Repository Root: origin git@git.psi.ch:sls_detectors_software/sls_detector_software.git
Repsitory UUID: 0cb2b925263b128c0e4e3d30e546f1bd564a5272 Repsitory UUID: 94d2b8cd58bbf69d26f491b7b81e2b269aac32b9
Revision: 290 Revision: 292
Branch: developer Branch: developer
Last Changed Author: Dhanya_Maliakal Last Changed Author: Dhanya_Maliakal
Last Changed Rev: 1424 Last Changed Rev: 1427
Last Changed Date: 2017-06-27 17:46:32 +0200 Last Changed Date: 2017-06-28 10:27:40 +0200

8
slsDetectorSoftware/eigerDetectorServer/gitInfoEiger.h
View File

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

27
slsDetectorSoftware/eigerDetectorServer/updateGitVersion.sh
View File

@ -1,3 +1,9 @@
SERVER=eigerDetectorServer
TMPFILE=gitInfoEigerTmp.h
INCLFILE=gitInfoEiger.h
WD=slsDetectorSoftware/$SERVER
GITREPO1='git remote -v' GITREPO1='git remote -v'
GITREPO2=" | grep \"fetch\" | cut -d' ' -f1" GITREPO2=" | grep \"fetch\" | cut -d' ' -f1"
BRANCH1='git branch -v' BRANCH1='git branch -v'
@ -12,18 +18,7 @@ FOLDERREV2=" | wc -l" #used for all the individual server folders
REV1='git log --oneline ' REV1='git log --oneline '
REV2=" | wc -l" REV2=" | wc -l"
RDATE1='git log --pretty=format:"%ci" -1' RDATE1='git log --pretty=format:"%ci" -1'
COMMIT_TITLE_SCRIPT='git log --pretty=format:"%s" -1'
cd ..
COMMIT_TITLE_SCRIPT='git log --pretty=format:"%s" -1 eigerDetectorServer'
COMMIT_TITLE=`eval $COMMIT_TITLE_SCRIPT`
echo $COMMIT_TITLE
if [ "$COMMIT_TITLE" == "updatereveiger" ]; then
echo "No update"
elif [ "$COMMIT_TITLE" == "updaterev" ]; then
echo "No update"
else
cd eigerDetectorServer
GITREPO=`eval $GITREPO1 $GITREPO2` GITREPO=`eval $GITREPO1 $GITREPO2`
BRANCH=`eval $BRANCH1 $BRANCH2` BRANCH=`eval $BRANCH1 $BRANCH2`
REPUID=`eval $REPUID1` REPUID=`eval $REPUID1`
@ -32,11 +27,11 @@ AUTH2=`eval $AUTH2_1 $AUTH2_2`
REV=`eval $REV1 $REV2` REV=`eval $REV1 $REV2`
FOLDERREV=`eval $FOLDERREV1 $FOLDERREV2` FOLDERREV=`eval $FOLDERREV1 $FOLDERREV2`
RDATE=`eval $RDATE1` RDATE=`eval $RDATE1`
echo Path: slsDetectorsPackage/slsDetectorSoftware/eigerDetectorServer $'\n'URL: ${GITREPO}/eigerDetectorServer $'\n'Repository Root: ${GITREPO} $'\n'Repsitory UUID: ${REPUID} $'\n'Revision: ${FOLDERREV} $'\n'Branch: ${BRANCH} $'\n'Last Changed Author: ${AUTH1}_${AUTH2} $'\n'Last Changed Rev: ${REV} $'\n'Last Changed Date: ${RDATE} > gitInfo.txt echo Path: slsDetectorsPackage/$WD $'\n'URL: ${GITREPO}/$SERVER $'\n'Repository Root: ${GITREPO} $'\n'Repsitory UUID: ${REPUID} $'\n'Revision: ${FOLDERREV} $'\n'Branch: ${BRANCH} $'\n'Last Changed Author: ${AUTH1}_${AUTH2} $'\n'Last Changed Rev: ${REV} $'\n'Last Changed Date: ${RDATE} > gitInfo.txt
cd ../../ cd ../../
./genVersionHeader.sh slsDetectorSoftware/eigerDetectorServer/gitInfo.txt slsDetectorSoftware/eigerDetectorServer/gitInfoEigerTmp.h slsDetectorSoftware/eigerDetectorServer/gitInfoEiger.h ./genVersionHeader.sh $WD/gitInfo.txt $WD/$TMPFILE $WD/$INCLFILE
echo "Revision Updated" echo "Revision Updated"
cd slsDetectorSoftware cd $WD
fi
cd eigerDetectorServer

5
slsDetectorSoftware/jungfrauDetectorServer/Makefile
View File

@ -10,7 +10,7 @@ INSTMODE = 0777
SRC_CLNT = communication_funcs.c slsDetectorServer.c slsDetectorServer_funcs.c slsDetectorFunctionList.c SRC_CLNT = communication_funcs.c slsDetectorServer.c slsDetectorServer_funcs.c slsDetectorFunctionList.c
OBJS = $(SRC_CLNT:.c=.o) OBJS = $(SRC_CLNT:.c=.o)
all: clean $(PROGS) all: clean updateVersion $(PROGS)
boot: $(OBJS) boot: $(OBJS)
@ -24,3 +24,6 @@ $(PROGS): $(OBJS)
clean: clean:
rm -rf $(DESTDIR)/$(PROGS) *.o rm -rf $(DESTDIR)/$(PROGS) *.o
updateVersion:
./updateGitVersion.sh

BIN
slsDetectorSoftware/jungfrauDetectorServer/bin/jungfrauDetectorServerv3.0.0.3
View File

Binary file not shown.

8
slsDetectorSoftware/jungfrauDetectorServer/gitInfo.txt
View File

@ -1,9 +1,9 @@
Path: slsDetectorsPackage/slsDetectorSoftware/jungfrauDetectorServer Path: slsDetectorsPackage/slsDetectorSoftware/jungfrauDetectorServer
URL: origin git@git.psi.ch:sls_detectors_software/sls_detector_software.git/jungfrauDetectorServer URL: origin git@git.psi.ch:sls_detectors_software/sls_detector_software.git/jungfrauDetectorServer
Repository Root: origin git@git.psi.ch:sls_detectors_software/sls_detector_software.git Repository Root: origin git@git.psi.ch:sls_detectors_software/sls_detector_software.git
Repsitory UUID: d0aea299e999e12df143e036c0cf9c644125d45d Repsitory UUID: 94d2b8cd58bbf69d26f491b7b81e2b269aac32b9
Revision: 82 Revision: 83
Branch: developer Branch: developer
Last Changed Author: Dhanya_Maliakal Last Changed Author: Dhanya_Maliakal
Last Changed Rev: 1423 Last Changed Rev: 1427
Last Changed Date: 2017-06-27 10:22:55 +0200 Last Changed Date: 2017-06-28 10:27:40 +0200

8
slsDetectorSoftware/jungfrauDetectorServer/gitInfoJungfrau.h
View File

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

34
slsDetectorSoftware/jungfrauDetectorServer/updateGitVersion.sh Executable file
View File

@ -0,0 +1,34 @@
SERVER=jungfrauDetectorServer
TMPFILE=gitInfoJungfrauTmp.h
INCLFILE=gitInfoJungfrau.h
WD=slsDetectorSoftware/$SERVER
GITREPO1='git remote -v'
GITREPO2=" | grep \"fetch\" | cut -d' ' -f1"
BRANCH1='git branch -v'
BRANCH2=" | grep '*' | cut -d' ' -f2"
REPUID1='git log --pretty=format:"%H" -1'
AUTH1_1='git log --pretty=format:"%cn" -1'
AUTH1_2=" | cut -d' ' -f1"
AUTH2_1='git log --pretty=format:"%cn" -1'
AUTH2_2=" | cut -d' ' -f2"
FOLDERREV1='git log --oneline . ' #used for all the individual server folders
FOLDERREV2=" | wc -l" #used for all the individual server folders
REV1='git log --oneline '
REV2=" | wc -l"
RDATE1='git log --pretty=format:"%ci" -1'
GITREPO=`eval $GITREPO1 $GITREPO2`
BRANCH=`eval $BRANCH1 $BRANCH2`
REPUID=`eval $REPUID1`
AUTH1=`eval $AUTH1_1 $AUTH1_2`
AUTH2=`eval $AUTH2_1 $AUTH2_2`
REV=`eval $REV1 $REV2`
FOLDERREV=`eval $FOLDERREV1 $FOLDERREV2`
RDATE=`eval $RDATE1`
echo Path: slsDetectorsPackage/$WD $'\n'URL: ${GITREPO}/$SERVER $'\n'Repository Root: ${GITREPO} $'\n'Repsitory UUID: ${REPUID} $'\n'Revision: ${FOLDERREV} $'\n'Branch: ${BRANCH} $'\n'Last Changed Author: ${AUTH1}_${AUTH2} $'\n'Last Changed Rev: ${REV} $'\n'Last Changed Date: ${RDATE} > gitInfo.txt
cd ../../
./genVersionHeader.sh $WD/gitInfo.txt $WD/$TMPFILE $WD/$INCLFILE
echo "Revision Updated"
cd $WD