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.

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

Example RELEASE.local files are incorrect #56

Merged
merged 1 commit into from
Mar 23, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
15 changes: 8 additions & 7 deletions ExampleRELEASE.local
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,13 @@

EPICS7_DIR=/home/install/epics/base-7.0.4

PVDATABASE=${EPICS7_DIR}/modules/database
PVACLIENT=${EPICS7_DIR}/modules/pvaClient
PVA2PVA=${EPICS7_DIR}/modules/pva2pva
PVACCESS=${EPICS7_DIR}/modules/pvAccess
NORMATIVETYPES=${EPICS7_DIR}modules/normativeTypes
PVDATA=${EPICS7_DIR}modules/pvData
EPICS_BASE=${EPICS7_DIR}
# Do not change these paths (or the order)
EPICS_BASE=$(EPICS7_DIR)
PVDATABASE=$(EPICS7_DIR)/modules/database
PVACLIENT=$(EPICS7_DIR)/modules/pvaClient
PVA2PVA=$(EPICS7_DIR)/modules/pva2pva
PVACCESS=$(EPICS7_DIR)/modules/pvAccess
NORMATIVETYPES=$(EPICS7_DIR)/modules/normativeTypes
PVDATA=$(EPICS7_DIR)/modules/pvData
TEMPLATE_TOP=$(EPICS_BASE)/templates/makeBaseApp/top

17 changes: 9 additions & 8 deletions MasterRELEASE.local
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,14 @@
# Change the first line and also EPICS_BASE and also possibly EPICS_BASE
# type make at top level
EPICS7_DIR=/home/epics7
PVDATABASE=${EPICS7_DIR}/modules/pvDatabaseCPP
PVACLIENT=${EPICS7_DIR}/modules/pvaClientCPP
PVA2PVA=${EPICS7_DIR}/modules/pva2pva
PVACCESS=${EPICS7_DIR}/modules/pvAccessCPP
NORMATIVETYPES=${EPICS7_DIR}/modules/normativeTypesCPP
PVDATA=${EPICS7_DIR}/modules/pvDataCPP
PVCOMMON=${EPICS7_DIR}/modules/pvCommonCPP
EPICS_BASE=${EPICS7_DIR}/epics-base

EPICS_BASE=$(EPICS7_DIR)/epics-base
PVDATABASE=$(EPICS7_DIR)/modules/pvDatabaseCPP
PVACLIENT=$(EPICS7_DIR)/modules/pvaClientCPP
PVA2PVA=$(EPICS7_DIR)/modules/pva2pva
PVACCESS=$(EPICS7_DIR)/modules/pvAccessCPP
NORMATIVETYPES=$(EPICS7_DIR)/modules/normativeTypesCPP
PVDATA=$(EPICS7_DIR)/modules/pvDataCPP
PVCOMMON=$(EPICS7_DIR)/modules/pvCommonCPP
TEMPLATE_TOP=$(EPICS_BASE)/templates/makeBaseApp/top