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

Deprecate and remove all uses of PATH_FILTER

Browse Source
This commit is contained in:
Andrew Johnson
2014-12-10 13:35:15 -06:00
parent d1481b23d9
commit e886022343
6 changed files with 20 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
configure/CONFIG_BASE
View File

@ -58,7 +58,7 @@ TOOLS = $(EPICS_BASE_HOST_BIN)
#---------------------------------------------------------------
# Epics base build tools and tool flags
MAKEBPT = $(call PATH_FILTER, $(TOOLS)/makeBpt$(HOSTEXE))
MAKEBPT = $(TOOLS)/makeBpt$(HOSTEXE)
DBEXPAND = $(PERL) $(TOOLS)/dbdExpand.pl
DBTORECORDTYPEH = $(PERL) $(TOOLS)/dbdToRecordtypeH.pl
DBTOMENUH = $(PERL) $(TOOLS)/dbdToMenuH.pl
@ -80,8 +80,8 @@ REPLACEVAR = $(PERL) $(TOOLS)/replaceVAR.pl
#---------------------------------------------------------------
# private versions of lex/yacc from EPICS
EYACC = $(call PATH_FILTER, $(TOOLS)/antelope$(HOSTEXE))
ELEX = $(call PATH_FILTER, $(TOOLS)/e_flex$(HOSTEXE)) -S$(EPICS_BASE)/include/flex.skel.static
EYACC = $(TOOLS)/antelope$(HOSTEXE)
ELEX = $(TOOLS)/e_flex$(HOSTEXE) -S$(EPICS_BASE)/include/flex.skel.static
YACC = $(EYACC)
LEX = $(ELEX)

6
configure/CONFIG_COMMON
View File

@ -314,7 +314,6 @@ LEXOPT += -I
#--------------------------------------------------
# Build compile line here
PATH_FILTER = $(1)
COMPILE.c = $(CC) $(CPPFLAGS) $(CFLAGS) $(INCLUDES)
COMPILE.cpp = $(CCC) $(CPPFLAGS) $(CXXFLAGS) $(INCLUDES)
@ -346,6 +345,11 @@ TARGET_SRCS = $(foreach name, \
SRC_FILES = $(LIB_SRCS) $(LIBSRCS) $(SRCS) $(USR_SRCS) $(PROD_SRCS) $(TARGET_SRCS)
HDEPENDS_FILES = $(addsuffix $(DEP),$(notdir $(basename $(SRC_FILES))))
#--------------------------------------------------
# Deprecated and no longer used in Base
PATH_FILTER = $(1)$(warning PATH_FILTER is deprecated; used for $(1))
#---------------------------------------------------------------
# Names of installed items
#

3
configure/os/CONFIG.win32-x86-mingw.Common
View File

@ -10,9 +10,6 @@
#Include definitions common to unix hosts
include $(CONFIG)/os/CONFIG.UnixCommon.Common
# convert UNIX path to native path
PATH_FILTER = $(subst /,\\,$(1))
CP = $(PERL) -MExtUtils::Command -e cp
MV = $(PERL) -MExtUtils::Command -e mv
RM = $(PERL) -MExtUtils::Command -e rm_f

3
configure/os/CONFIG.win32-x86.Common
View File

@ -7,9 +7,6 @@
# Sites may override these definitions in CONFIG_SITE.win32-x86.Common
#-------------------------------------------------------
# convert UNIX path to native path
PATH_FILTER = $(subst /,\\,$(1))
CP = $(PERL) -MExtUtils::Command -e cp
MV = $(PERL) -MExtUtils::Command -e mv
RM = $(PERL) -MExtUtils::Command -e rm_f

10
documentation/RELEASE_NOTES.html
View File

@ -14,6 +14,16 @@
<h2 align="center">Changes between 3.15.1 and 3.15.2</h2>
<!-- Insert new items immediately below here ... -->
<h3>Use of PATH_FILTER in Makefiles deprecated</h3>
<p>The PATH_FILTER variable was being called to convert forward shashes
<tt><b>/</b></tt> in file paths into pairs of backward slashes
<tt><b>\\</b></tt> on Windows architectures. This has never been strictly
necessary, and was added about 10 years ago to get around some short-comings in
Windows tools at the time. All uses of PATH_FILTER in Base have now been
removed; the definition is still present, but will result in a warning being
printed if it is ever used.</p>
<h3>Using msi for dependencies</h3>
<p>To reduce confusion the msi program has been modified to allow the generation

4
src/ca/legacy/gdd/Makefile
View File

@ -80,8 +80,8 @@ dbMapper$(DEP): $(COMMON_DIR)/gddApps.h
# Rules for generated files
#
$(COMMON_DIR)/aitConvertGenerated.cc: $(TOOLS)/aitGen$(HOSTEXE)
$(call PATH_FILTER, $(TOOLS)/aitGen$(HOSTEXE)) $@
$(TOOLS)/aitGen$(HOSTEXE) $@
$(COMMON_DIR)/gddApps.h : $(TOOLS)/genApps$(HOSTEXE)
$(call PATH_FILTER, $(TOOLS)/genApps$(HOSTEXE)) $@
$(TOOLS)/genApps$(HOSTEXE) $@