Skip to content
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

Update CPSW #2

Merged
merged 2 commits into from
Jan 13, 2025
Merged

Update CPSW #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ff25f41
Update license copyright year
JJL772 Jan 11, 2025
652e74e
Update CPSW to R4.5.2
JJL772 Jan 11, 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
3 changes: 1 addition & 2 deletions LICENSE.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@

Copyright (c) 2016, The Board of Trustees of the Leland Stanford Junior
Copyright (c) 2025, The Board of Trustees of the Leland Stanford Junior
University, through SLAC National Accelerator Laboratory (subject to receipt
of any required approvals from the U.S. Dept. of Energy). All rights reserved.
Redistribution and use in source and binary forms, with or without
Expand Down
3 changes: 3 additions & 0 deletions RELEASE_NOTES
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
R2.0.2 01-10-2025 Jeremy Lorelli
- Update CPSW to R4.5.2

R2.0.1 11-01-2024 Jeremy Lorelli
- Adjust PACKAGE_TOP/EPICS_PACKAGE_TOP checks. No source code changes.

Expand Down
8 changes: 5 additions & 3 deletions src/makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,15 @@

ifeq ($(PACKAGE_TOP),)
ifneq ($(EPICS_PACKAGE_TOP),)
PACKAGE_TOP=$(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)
$(error PACKAGE_TOP or EPICS_PACKAGE_TOP must be provided by the environment or on the command line)
endif
endif

CPSW_DIR=$(PACKAGE_TOP)/cpsw/framework/R4.4.1/src
CPSW_VERSION=R4.5.2

CPSW_DIR=$(PACKAGE_TOP)/cpsw/framework/$(CPSW_VERSION)/src

CCACHE_DISABLE=1

Expand Down