detector servers moved out of slsdetector software, eiger server compiles with new headers

This commit is contained in:
maliakal_d 2018-10-11 14:20:50 +02:00
parent c24a9b223c
commit 0ee7f67965
192 changed files with 56 additions and 44 deletions

4
slsDetectorServers/.gitignore vendored Normal file
View File

@ -0,0 +1,4 @@
*.o
*~
#*#
.project

View File

@ -0,0 +1 @@
../../slsSupportLib/include/ansi.h

View File

@ -0,0 +1 @@
../../slsSupportLib/include/communication_funcs.c

View File

@ -0,0 +1 @@
../../slsSupportLib/include/communication_funcs.h

View File

@ -0,0 +1,9 @@
Path: slsDetectorPackage/slsDetectorServers/eigerDetectorServer
URL: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git
Repository Root: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git
Repsitory UUID: c24a9b223cbb066d3851599f4d977ae835feffe4
Revision: 0
Branch: refactor
Last Changed Author: Dhanya_Thattil
Last Changed Rev: 4099
Last Changed Date: 2018-10-11 13:46:08.000000002 +0200 ./xparameters.h

View File

@ -1,6 +1,6 @@
#define GITURL "git@github.com:slsdetectorgroup/slsDetectorPackage.git" #define GITURL "git@github.com:slsdetectorgroup/slsDetectorPackage.git"
#define GITREPUUID "b9f97f42a6a369dfb5c484bffeaa7a417e9cbca1" #define GITREPUUID "c24a9b223cbb066d3851599f4d977ae835feffe4"
#define GITAUTH "Dhanya_Thattil" #define GITAUTH "Dhanya_Thattil"
#define GITREV 0x4067 #define GITREV 0x4099
#define GITDATE 0x20181008 #define GITDATE 0x20181011
#define GITBRANCH "refactor" #define GITBRANCH "refactor"

View File

@ -0,0 +1 @@
../../slsSupportLib/include/sls_detector_defs.h

View File

@ -0,0 +1 @@
../../slsSupportLib/include/sls_detector_funcs.h

View File

@ -1,11 +1,11 @@
SERVER=eigerDetectorServer SERVER=eigerDetectorServer
MAINDIR=slsDetectorPackage MAINDIR=slsDetectorPackage
SPECDIR=slsDetectorSoftware/slsDetectorServers/$SERVER SPECDIR=slsDetectorServers/$SERVER
TMPFILE=gitInfoEigerTmp.h TMPFILE=gitInfoEigerTmp.h
INCLFILE=gitInfoEiger.h INCLFILE=gitInfoEiger.h
#evaluate the variables #evaluate the variables
EVALFILE=../../../evalVersionVariables.sh EVALFILE=../../evalVersionVariables.sh
source $EVALFILE source $EVALFILE
@ -24,7 +24,7 @@ OLDDATE=$(more $INCLFILE | grep '#define GITDATE' | awk '{print $3}')
#update INCLFILE if changes #update INCLFILE if changes
if [ "$OLDDATE" != "$NEWDATE" ]; then if [ "$OLDDATE" != "$NEWDATE" ]; then
echo Path: ${MAINDIR}/${SPECDIR} $'\n'URL: ${GITREPO} $'\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: ${MAINDIR}/${SPECDIR} $'\n'URL: ${GITREPO} $'\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 $SPECDIR/gitInfo.txt $SPECDIR/$TMPFILE $SPECDIR/$INCLFILE ./genVersionHeader.sh $SPECDIR/gitInfo.txt $SPECDIR/$TMPFILE $SPECDIR/$INCLFILE
cd $WD cd $WD
fi fi

View File

@ -0,0 +1 @@
../../slsSupportLib/include/versionAPI.h

Some files were not shown because too many files have changed in this diff Show More