From e886022343d97925b76d3df8c81273078b5c6950 Mon Sep 17 00:00:00 2001
From: Andrew Johnson <anj@aps.anl.gov>
Date: Wed, 10 Dec 2014 13:35:15 -0600
Subject: [PATCH] Deprecate and remove all uses of PATH_FILTER

---
 configure/CONFIG_BASE                      |  6 +++---
 configure/CONFIG_COMMON                    |  6 +++++-
 configure/os/CONFIG.win32-x86-mingw.Common |  3 ---
 configure/os/CONFIG.win32-x86.Common       |  3 ---
 documentation/RELEASE_NOTES.html           | 10 ++++++++++
 src/ca/legacy/gdd/Makefile                 |  4 ++--
 6 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/configure/CONFIG_BASE b/configure/CONFIG_BASE
index 08515ac02..236f1457a 100644
--- a/configure/CONFIG_BASE
+++ b/configure/CONFIG_BASE
@@ -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)
diff --git a/configure/CONFIG_COMMON b/configure/CONFIG_COMMON
index 3d4df3bd2..0df8ced84 100644
--- a/configure/CONFIG_COMMON
+++ b/configure/CONFIG_COMMON
@@ -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
 #
diff --git a/configure/os/CONFIG.win32-x86-mingw.Common b/configure/os/CONFIG.win32-x86-mingw.Common
index 35b62ce72..a488c6647 100644
--- a/configure/os/CONFIG.win32-x86-mingw.Common
+++ b/configure/os/CONFIG.win32-x86-mingw.Common
@@ -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
diff --git a/configure/os/CONFIG.win32-x86.Common b/configure/os/CONFIG.win32-x86.Common
index 42937222d..f2c75b055 100644
--- a/configure/os/CONFIG.win32-x86.Common
+++ b/configure/os/CONFIG.win32-x86.Common
@@ -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
diff --git a/documentation/RELEASE_NOTES.html b/documentation/RELEASE_NOTES.html
index aa27e96c5..ad503c2a7 100644
--- a/documentation/RELEASE_NOTES.html
+++ b/documentation/RELEASE_NOTES.html
@@ -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
diff --git a/src/ca/legacy/gdd/Makefile b/src/ca/legacy/gdd/Makefile
index af656d138..78c69321e 100644
--- a/src/ca/legacy/gdd/Makefile
+++ b/src/ca/legacy/gdd/Makefile
@@ -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) $@