Skip to content

ECS-6549 Build and release IOCs for Rocky 9 #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
janeliu-slac wants to merge 6 commits into
base: master
Choose a base branch
from
Open

ECS-6549 Build and release IOCs for Rocky 9 #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
498f808
Updated configure/RELEASE file.
janeliu-slac Feb 7, 2025
199f339
Updated RELEASE_SITE file.
janeliu-slac Feb 7, 2025
430a423
Updated RELEASE
janeliu-slac Feb 28, 2025
93972be
Updated RELEASE
janeliu-slac Mar 19, 2025
47a4f9c
update libraries versions + add missing libraries
Aug 8, 2025
ceb78bd
add QSRV
Aug 8, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 4 additions & 6 deletions RELEASE_SITE
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,11 @@
# top directory each time this file is changed.

#==============================================================================
BASE_MODULE_VERSION=R7.0.3.1-2.0
EPICS_SITE_TOP=/cds/group/pcds/epics
BASE_MODULE_VERSION = R7.0.3.1-2.0
EPICS_SITE_TOP = /cds/group/pcds/epics
BASE_SITE_TOP=/cds/group/pcds/epics/base
EPICS_MODULES=/cds/group/pcds/epics/R7.0.3.1-2.0/modules
EPICS_MODULES = $(EPICS_SITE_TOP)/$(BASE_MODULE_VERSION)/modules
PACKAGE_SITE_TOP=/cds/group/pcds/package
MATLAB_PACKAGE_TOP=/reg/common/package/matlab
PSPKG_ROOT=/cds/group/pcds/pkg_mgr
TOOLS_SITE_TOP=/afs/slac/g/lcls/tools
ALARM_CONFIGS_TOP=/afs/slac/g/lcls/tools/AlarmConfigsTop
PSPKG_ROOT = /cds/group/pcds/pkg_mgr
#==============================================================================
20 changes: 13 additions & 7 deletions configure/CONFIG_SITE
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ PKG_ARCH = $(T_A)
WITH_EPICS_V4 = YES
# As of R3-2 WITH_EPICS_V4 changes to WITH_PVA
WITH_PVA = YES
WITH_QSRV = YES

# To install files into a location other than $(TOP) define
# INSTALL_LOCATION here.
Expand All @@ -63,12 +64,10 @@ SHARED_LIBRARIES=YES
ifneq '$(wildcard $(EVENT2))' ''
USR_CFLAGS += -DUSE_EVR_IRQ_HANDLER
endif
# Use LCLS PACKAGE_SITE_TOP for both LCLS and PCDS builds
PACKAGE_SITE_TOP=/afs/slac/g/lcls/package/

# CPSW
CPSW_FRAMEWORK_PACKAGE_NAME = cpsw/framework
CPSW_FRAMEWORK_VERSION = R4.4.1
CPSW_FRAMEWORK_VERSION = R4.5.2
CPSW_FRAMEWORK_TOP = $(PACKAGE_SITE_TOP)/$(CPSW_FRAMEWORK_PACKAGE_NAME)/$(CPSW_FRAMEWORK_VERSION)
CPSW_FRAMEWORK_LIB = $(CPSW_FRAMEWORK_TOP)/$(PKG_ARCH)/lib
CPSW_FRAMEWORK_INCLUDE = $(CPSW_FRAMEWORK_TOP)/$(PKG_ARCH)/include
Expand All @@ -89,28 +88,35 @@ BOOST_INCLUDE = $(BOOST_TOP)/$(PKG_ARCH)/include

# HPS TPR API
HPSTPR_PACKAGE_NAME=timing/hpsTpr
HPSTPR_VERSION=R2.5.0
HPSTPR_VERSION=R2.5.2
HPSTPR_TOP=$(PACKAGE_SITE_TOP)/$(HPSTPR_PACKAGE_NAME)/$(HPSTPR_VERSION)
HPSTPR_LIB=$(HPSTPR_TOP)/$(PKG_ARCH)/lib
HPSTPR_INCLUDE=$(HPSTPR_TOP)/$(PKG_ARCH)/include

# ATCA Common API
COMMONATCA_PACKAGE_NAME=atca/commonATCA
COMMONATCA_VERSION=R1.3.1
COMMONATCA_VERSION=R2.0.2
COMMONATCA_TOP=$(PACKAGE_SITE_TOP)/$(COMMONATCA_PACKAGE_NAME)/$(COMMONATCA_VERSION)
COMMONATCA_LIB=$(COMMONATCA_TOP)/$(PKG_ARCH)/lib
COMMONATCA_INCLUDE=$(COMMONATCA_TOP)/$(PKG_ARCH)/include

# YamlReader
YAMLREADER_PACKAGE_NAME = cpsw/yamlReader
YAMLREADER_VERSION = R1.2.0
YAMLREADER_VERSION = R1.2.2
YAMLREADER_TOP = $(PACKAGE_SITE_TOP)/$(YAMLREADER_PACKAGE_NAME)/$(YAMLREADER_VERSION)
YAMLREADER_LIB = $(YAMLREADER_TOP)/$(PKG_ARCH)/lib
YAMLREADER_INCLUDE = $(YAMLREADER_TOP)/$(PKG_ARCH)/include

# CPSW Device Library
DEVICELIB_PACKAGE_NAME = cpsw/deviceLibrary
DEVICELIB_VERSION = R1.2.0
DEVICELIB_VERSION = R1.2.2
DEVICELIB_TOP = $(PACKAGE_SITE_TOP)/$(DEVICELIB_PACKAGE_NAME)/$(DEVICELIB_VERSION)
DEVICELIB_LIB = $(DEVICELIB_TOP)/$(PKG_ARCH)/lib
DEVICELIB_INCLUDE = $(DEVICELIB_TOP)/$(PKG_ARCH)/include

# TIRPC
TIRPC_PACKAGE_NAME = libtirpc
TIRPC_VERSION = 1.3.5
TIRPC_TOP = $(PSPKG_ROOT)/release/$(TIRPC_PACKAGE_NAME)/$(TIRPC_VERSION)
TIRPC_LIB = $(TIRPC_TOP)/$(PKG_ARCH)/lib
TIRPC_INCLUDE = $(TIRPC_TOP)/$(PKG_ARCH)/include
1 change: 1 addition & 0 deletions configure/CONFIG_SITE.rhel9-x86_64
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
NEEDS_TIRPC=YES
76 changes: 38 additions & 38 deletions configure/RELEASE
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,38 +6,38 @@ include $(TOP)/RELEASE_SITE
# Define the version of modules needed by
# IOC apps or other Support apps
# ===============================================================
ADCORE_MODULE_VERSION = R3.10-1.1.0
ADEDTPDV_MODULE_VERSION = R3.8.4
ADSTREAM_MODULE_VERSION = R3.1.2
ADSUPPORT_MODULE_VERSION = R1.9-0.1.0
ASYNGENICAM_MODULE_VERSION = R1.2.1
ASYN_MODULE_VERSION = R4.39-1.0.1
ATCACOMMON_MODULE_VERSION = R1.6.7
AUTOSAVE_MODULE_VERSION = R5.8-2.1.0
BLD_CLIENT_MODULE_VERSION = R2.17.0
BUSY_MODULE_VERSION = R1.7.2.1-0.1.2
CALC_MODULE_VERSION = R3.7-1.0.1
CAPUTLOG_MODULE_VERSION = R4.0-1.0.0
DIAG_TIMER_MODULE_VERSION = R1.9.2.1
EVENT2_MODULE_VERSION = R6.0.1
FFMPEGSERVER_MODULE_VERSION = R2.1.1-2.2.1
HISTORY_MODULE_VERSION = R2.7.0
IOCADMIN_MODULE_VERSION = R3.1.16-1.3.2
MCOREUTILS_MODULE_VERSION = R1.2.1-0.1.0
NULLHTTPD_MODULE_VERSION = R0.5.1-0.4.0
STREAMDEVICE_MODULE_VERSION = R2.8.9-1.2.1
TIMESTAMPFIFO_MODULE_VERSION = R2.1.3
TIMINGAPI_MODULE_VERSION = R0.10
TPRTRIGGER_MODULE_VERSION = R2.5.3-6.6
YAMLLOADER_MODULE_VERSION = R2.3.4
ADCORE_MODULE_VERSION = R3.10-1.1.1
ADEDTPDV_MODULE_VERSION = R3.8.5
ADSTREAM_MODULE_VERSION = R3.1.3
ADSUPPORT_MODULE_VERSION = R1.9-0.1.0
ASYNGENICAM_MODULE_VERSION = R1.2.2
ASYN_MODULE_VERSION = R4.39-1.0.2
ATCACOMMON_MODULE_VERSION = R2.0.4
AUTOSAVE_MODULE_VERSION = R5.11-2.0.0
BLD_CLIENT_MODULE_VERSION = R2.18.0
BUSY_MODULE_VERSION = R1.7.2.1-0.1.3
CALC_MODULE_VERSION = R3.7-1.0.1
CAPUTLOG_MODULE_VERSION = R4.0-1.0.0
DIAG_TIMER_MODULE_VERSION = R1.9.2.1
EVENT2_MODULE_VERSION = R6.0.2
FFMPEGSERVER_MODULE_VERSION = R2.2.0-1.0.0
HISTORY_MODULE_VERSION = R2.7.0
IOCADMIN_MODULE_VERSION = R3.1.16-1.4.0
MCOREUTILS_MODULE_VERSION = R1.2.1-0.1.0
NULLHTTPD_MODULE_VERSION = R0.5.1-0.4.1
STREAMDEVICE_MODULE_VERSION = R2.8.9-1.2.2
TIMESTAMPFIFO_MODULE_VERSION = R2.1.6
TIMINGAPI_MODULE_VERSION = R0.10
TPRTRIGGER_MODULE_VERSION = R2.5.3-6.11
YAMLLOADER_MODULE_VERSION = R2.3.8

ifndef BASE_7_0
NORMATIVETYPES_MODULE_VERSION = R5.2.0-0.0.1
PVA2PVA_MODULE_VERSION = R1.0.0-0.3.1
PVACCESS_MODULE_VERSION = R6.0.0-0.3.0
PVDATABASE_MODULE_VERSION = R4.3.0-0.0.3
PVDATA_MODULE_VERSION = R7.0.0-0.0.1
endif
# ifndef BASE_7_0
# NORMATIVETYPES_MODULE_VERSION = R5.2.0-0.0.1
# PVA2PVA_MODULE_VERSION = R1.0.0-0.3.1
# PVACCESS_MODULE_VERSION = R6.0.0-0.3.0

# PVDATA_MODULE_VERSION = R7.1.3-0.0.1
# endif

# ============================================================
# External Support module path definitions
Expand Down Expand Up @@ -77,13 +77,13 @@ TIMINGAPI = $(EPICS_MODULES)/timingApi/$(TIMINGAPI_MODULE_VERSION)
TPRTRIGGER = $(EPICS_MODULES)/tprTrigger/$(TPRTRIGGER_MODULE_VERSION)
YAMLLOADER = $(EPICS_MODULES)/yamlLoader/$(YAMLLOADER_MODULE_VERSION)

ifndef BASE_7_0
NORMATIVETYPES = $(EPICS_MODULES)/normativeTypesCPP/$(NORMATIVETYPES_MODULE_VERSION)
PVA2PVA = $(EPICS_MODULES)/pva2pva/$(PVA2PVA_MODULE_VERSION)
PVACCESS = $(EPICS_MODULES)/pvAccessCPP/$(PVACCESS_MODULE_VERSION)
PVDATABASE = $(EPICS_MODULES)/pvDatabaseCPP/$(PVDATABASE_MODULE_VERSION)
PVDATA = $(EPICS_MODULES)/pvDataCPP/$(PVDATA_MODULE_VERSION)
endif
# ifndef BASE_7_0
# NORMATIVETYPES = $(EPICS_MODULES)/normativeTypesCPP/$(NORMATIVETYPES_MODULE_VERSION)
# PVA2PVA = $(EPICS_MODULES)/pva2pva/$(PVA2PVA_MODULE_VERSION)
# PVACCESS = $(EPICS_MODULES)/pvAccessCPP/$(PVACCESS_MODULE_VERSION)
# PVDATABASE = $(EPICS_MODULES)/pvDatabaseCPP/$(PVDATABASE_MODULE_VERSION)
# PVDATA = $(EPICS_MODULES)/pvDataCPP/$(PVDATA_MODULE_VERSION)
# endif

# Set EPICS_BASE last so it appears last in the DB, DBD, INCLUDE, and LIB search paths
EPICS_BASE = $(EPICS_SITE_TOP)/base/$(BASE_MODULE_VERSION)
Expand Down
7 changes: 5 additions & 2 deletions edtApp/TPRsrc/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,14 +125,17 @@ boost_system_DIR = $(BOOST_LIB)
yaml-cpp_DIR = $(YAML_LIB)
hpstpr_DIR = $(HPSTPR_LIB)
commonATCA_DIR = $(COMMONATCA_LIB)

tirpc_DIR = $(TIRPC_LIB)
# ======================================================
# LINK "NON EPICS" EXTERNAL PACKAGE LIBRARIES STATICALLY
#=======================================================
USR_LIBS_Linux += cpsw
USR_LIBS_Linux += boost_system yaml-cpp hpstpr
USR_LIBS_Linux += commonATCA

tpr_LIBS += $(EPICS_BASE_IOC_LIBS)
ifeq ($(NEEDS_TIRPC),YES)
USR_LIBS_Linux += tirpc
endif
#===========================

include $(TOP)/configure/RULES
Expand Down