EPICS_base/epics-base
0
0
Fork 0
Code Issues Pull Requests Projects Wiki Activity

"Quote" exe program paths for Windows

Browse Source 
Clean up old EPICS_DATABASE var's (pre-7.0?)
This commit is contained in:
Andrew Johnson
2022-02-08 14:18:13 -06:00
parent 0e56e202fc
commit 3a182a9eea
3 changed files with 16 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
configure/CONFIG_DATABASE_MODULE
View File

@ -5,22 +5,16 @@
# in file LICENSE that is included with this distribution. # in file LICENSE that is included with this distribution.
#************************************************************************* #*************************************************************************
# Set EPICS_DATABASE if necessary # Our locally-built tools
ifndef EPICS_DATABASE DBEXPAND = $(PERL) $(EPICS_BASE_HOST_BIN)/dbdExpand.pl
EPICS_DATABASE = $(if $(BUILDING_DATABASE),$(INSTALL_LOCATION),$(EPICS_BASE)) DBTORECORDTYPEH = $(PERL) $(EPICS_BASE_HOST_BIN)/dbdToRecordtypeH.pl
DBTOMENUH = $(PERL) $(EPICS_BASE_HOST_BIN)/dbdToMenuH.pl
DBDTOHTML = $(PERL) $(EPICS_BASE_HOST_BIN)/dbdToHtml.pl
REGISTERRECORDDEVICEDRIVER = $(PERL) $(EPICS_BASE_HOST_BIN)/registerRecordDeviceDriver.pl
# Paths to tools built here # Windows can need these paths to be quoted
EPICS_DATABASE_HOST_BIN = $(EPICS_DATABASE)/bin/$(EPICS_HOST_ARCH) MAKEBPT = "$(EPICS_BASE_HOST_BIN)/makeBpt$(HOSTEXE)"
endif MSI3_15 = "$(EPICS_BASE_HOST_BIN)/msi$(HOSTEXE)"
# Set location of locally-built tools
MAKEBPT = $(EPICS_DATABASE_HOST_BIN)/makeBpt$(HOSTEXE)
DBEXPAND = $(PERL) $(EPICS_DATABASE_HOST_BIN)/dbdExpand.pl
DBTORECORDTYPEH = $(PERL) $(EPICS_DATABASE_HOST_BIN)/dbdToRecordtypeH.pl
DBTOMENUH = $(PERL) $(EPICS_DATABASE_HOST_BIN)/dbdToMenuH.pl
DBDTOHTML = $(PERL) $(EPICS_DATABASE_HOST_BIN)/dbdToHtml.pl
REGISTERRECORDDEVICEDRIVER = $(PERL) $(EPICS_DATABASE_HOST_BIN)/registerRecordDeviceDriver.pl
MSI3_15 = $(EPICS_DATABASE_HOST_BIN)/msi$(HOSTEXE)
# Libraries needed to link a basic IOC # Libraries needed to link a basic IOC
EPICS_BASE_IOC_LIBS = dbRecStd dbCore ca Com EPICS_BASE_IOC_LIBS = dbRecStd dbCore ca Com

7
configure/CONFIG_LIBCOM_MODULE
View File

@ -5,9 +5,10 @@
# in file LICENSE that is included with this distribution. # in file LICENSE that is included with this distribution.
#************************************************************************* #*************************************************************************
# Set location of locally generated tools # Our locally-built tools
YACC = $(abspath $(EPICS_BASE)/bin/$(EPICS_HOST_ARCH))/antelope$(HOSTEXE) # Windows can need these paths to be quoted
LEX = $(abspath $(EPICS_BASE)/bin/$(EPICS_HOST_ARCH))/e_flex$(HOSTEXE) \ YACC = "$(EPICS_BASE_HOST_BIN)/antelope$(HOSTEXE)"
LEX = "$(EPICS_BASE_HOST_BIN)/e_flex$(HOSTEXE)" \
-S$(EPICS_BASE)/include/flex.skel.static -S$(EPICS_BASE)/include/flex.skel.static
# Default stack size for osiThread # Default stack size for osiThread

5
modules/database/src/ioc/bpt/RULES
View File

@ -11,5 +11,6 @@
# This is a Makefile fragment, see src/ioc/Makefile. # This is a Makefile fragment, see src/ioc/Makefile.
$(patsubst %,$(COMMON_DIR)/%,$(BPT_DBD)) : \ $(addprefix $(COMMON_DIR)/,$(BPT_DBD)) : $(COMMON_DIR)/bpt%.dbd : \
$(COMMON_DIR)/bpt%.dbd : $(MAKEBPT) $(EPICS_BASE_HOST_BIN)/makeBpt$(HOSTEXE)
# Don't try to use $(MAKEBPT) above