From c24e74da822748bf9aef4dff862e2e9bb927caa8 Mon Sep 17 00:00:00 2001 From: Jeremy Lorelli Date: Fri, 10 Jan 2025 17:22:07 -0800 Subject: [PATCH] Update cpsw to R4.5.2, allow usage of EPICS_PACKAGE_TOP --- RELEASE_NOTES | 4 ++++ src/makefile | 12 +++++++++++- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/RELEASE_NOTES b/RELEASE_NOTES index db6481a..17a5ee5 100644 --- a/RELEASE_NOTES +++ b/RELEASE_NOTES @@ -1,3 +1,7 @@ +R1.2.1 Jan 10, 2024 Jeremy Lorelli (lorelli) + - Update to CPSW R4.5.2 + - Use new PACKAGE_TOP/EPICS_PACKAGE_TOP pattern + R1.2.0 Sep 01, 2023 Michael Skoufis (skoufis) - Add phase offset and weight interfaces diff --git a/src/makefile b/src/makefile index f97ce2e..ccb43e0 100644 --- a/src/makefile +++ b/src/makefile @@ -1,4 +1,14 @@ -CPSW_DIR=/afs/slac/g/lcls/package/cpsw/framework/R4.4.1/src +ifeq ($(PACKAGE_TOP),) +ifneq ($(EPICS_PACKAGE_TOP),) +PACKAGE_TOP=$(EPICS_PACKAGE_TOP) +else +$(error PACKAGE_TOP or EPICS_PACKAGE_TOP must be provided by the environment or on the command line) +endif +endif + +CPSW_VERSION=R4.5.2 + +CPSW_DIR=$(PACKAGE_TOP)/cpsw/framework/$(CPSW_VERSION)/src CCACHE_DISABLE=1