mirror of
https://github.com/slsdetectorgroup/slsDetectorPackage.git
synced 2025-04-24 23:30:03 +02:00

- removed getClientServerAPIVersion in server (not used) - removed rxr side (clientversion compatibility check), removed enum as well as it is now done on the client side. - versionAPI.h - GITBRANCH changed to RELEASE - dates for all API changed to "sem_version date". Scripts to compile servers modified for this. Empty "branch" name will end up with developer for sem_version. - Version class with constructor taking in the long version (APILIB date). Other member functions including concise(to get sem_version for new releases and date for old releases), - bypassing initial tests, also now bypasses the client-rxr compatibility check (at rx_hostname command) - previously, compatibility between client-det was ensuring both had the same detector API (eg. same APIJUNGFRAU) - Now, compatibility only checks APILIB (client side) and detector API(eg. APIJUNGFRAU) (detector side) have same major version. It only does backward compatibility test. Rest is upto user to ensure. - If server is from an older release, it will compare dates like previous implementation (APIJUNGFRAU from both client and det) - - previously, compatibility between client-rxr was ensuring both had the same APIRECEIVER - Now, compatibility only checks APILIB (client side) and APIRECEIVER (rxr side) have same major version. It only does backward compatibility test. Rest is upto user to ensure. - If rxr is from an older release, it will compare dates like previous implementation (APIRECEIVER from both client and rxr) - removed APIGUI, evalVersionVariables.sh, genVersionHeader.sh (not needed or not used) - clientVersion, rxrversion and detectorserverversion all return strings and not integers (in hex) anymore. Depending if it has semantic versioning, it will print that or the date if it is too old. - fixed in python (strings for versions) - check_version function in detector server changed to "initial checks" as it only checks server-firmware compatibility and initial server checks. Client compatibilities are moved to client side. - --version gives sem_version and date? Is date needed as well. The clientversion, detserverversion and rxrversion API gives only sem_version (no date) - - formatting
48 lines
1.7 KiB
Makefile
Executable File
48 lines
1.7 KiB
Makefile
Executable File
# SPDX-License-Identifier: LGPL-3.0-or-other
|
|
# Copyright (C) 2021 Contributors to the SLS Detector Package
|
|
current_dir = $(shell pwd)
|
|
main_inc = ../slsDetectorServer/include/
|
|
main_src = ../slsDetectorServer/src/
|
|
support_lib = ../../slsSupportLib/include/
|
|
det_lib = ../../slsDetectorSoftware/include/sls/
|
|
md5_dir = ../../slsSupportLib/src/
|
|
|
|
CROSS = bfin-uclinux-
|
|
CC = $(CROSS)gcc
|
|
CFLAGS += -Wall -std=gnu99 -DCHIPTESTBOARDD -DSTOP_SERVER -I$(main_inc) -I$(support_lib) -I$(det_lib) -I$(current_dir) #-DDEBUG1 #-DVERBOSEI #-DVERBOSE
|
|
LDLIBS += -lm -lrt -pthread
|
|
PROGS = ctbDetectorServer
|
|
DESTDIR ?= bin
|
|
INSTMODE = 0777
|
|
|
|
SRCS = slsDetectorFunctionList.c
|
|
SRCS += $(main_src)slsDetectorServer.c $(main_src)slsDetectorServer_funcs.c $(main_src)communication_funcs.c $(main_src)blackfin.c $(main_src)common.c $(main_src)commonServerFunctions.c $(main_src)communication_funcs_UDP.c $(main_src)UDPPacketHeaderGenerator.c $(main_src)AD7689.c $(main_src)AD9257.c $(main_src)ALTERA_PLL.c $(main_src)I2C.c $(main_src)INA226.c $(main_src)LTC2620.c $(main_src)MAX1932.c $(main_src)programViaBlackfin.c $(main_src)/sharedMemory.c $(main_src)/loadPattern.c $(md5_dir)md5.c
|
|
|
|
OBJS = $(SRCS:.c=.o)
|
|
|
|
all: clean $(PROGS)
|
|
version: clean versioning $(PROGS)
|
|
|
|
boot: $(OBJS)
|
|
|
|
version_branch=$(API_BRANCH)
|
|
version_name=APICTB
|
|
version_path=slsDetectorServers/ctbDetectorServer
|
|
versioning:
|
|
cd ../../ && echo $(PWD) && echo `tput setaf 6; ./updateAPIVersion.sh $(version_name) $(version_path) $(version_branch); tput sgr0;`
|
|
|
|
|
|
$(PROGS): $(OBJS)
|
|
# echo $(OBJS)
|
|
mkdir -p $(DESTDIR)
|
|
$(CC) -o $@ $^ $(CFLAGS) $(LDLIBS)
|
|
mv $(PROGS) $(DESTDIR)
|
|
rm *.gdb
|
|
rm $(main_src)*.o $(md5_dir)*.o
|
|
|
|
clean:
|
|
rm -rf $(DESTDIR)/$(PROGS) *.o *.gdb $(main_src)*.o $(md5_dir)*.o
|
|
|
|
|
|
|