[lmi-commits] [lmi] master b75c427 6/6: Withdraw support for twentieth-century shells

[Greg Chicares]

branch: master
commit b75c42784e8abf1ac13730997060caa54c43eac2
Author: Gregory W. Chicares <address@hidden>
Commit: Gregory W. Chicares <address@hidden>

    Withdraw support for twentieth-century shells
---
 install_wx.make       | 59 ---------------------------------------------------
 install_wxpdfdoc.make |  1 -
 workhorse.make        | 14 ++----------
 3 files changed, 2 insertions(+), 72 deletions(-)

diff --git a/install_wx.make b/install_wx.make
index 815e4dc..904aab1 100644
--- a/install_wx.make
+++ b/install_wx.make
@@ -121,7 +121,6 @@ config_options = \
 
 # Utilities 
####################################################################
 
-CHMOD  := chmod
 ECHO   := echo
 MD5SUM := md5sum
 MKDIR  := mkdir
@@ -142,7 +141,6 @@ all: clobber $(source_archives)
        [ ! -e $(patchset) ] || $(PATCH) $(PATCHFLAGS) <$(patchset)
        $(MKDIR) --parents $(build_dir)
        $(MAKE) --file=$(this_makefile) --directory=$(build_dir) wx
-       $(MAKE) --file=$(this_makefile) --directory=$(prefix)/bin 
portable_script
 
 # Simulated order-only prerequisites.
 $(source_archives): initial_setup
@@ -197,63 +195,6 @@ wx:
        export PATH="$(mingw_bin_dir):${PATH}" \
          && ../configure $(config_options) && $(MAKE) && $(MAKE) install \
 
-# 'wx-config' is not portable. For example, it uses 'printf(1)', which
-# zsh supports only in versions after 4.0.1 . Far worse, it underlies
-# a problem discussed in these messages
-#   http://lists.gnu.org/archive/html/lmi/2006-04/msg00010.html
-#   http://lists.gnu.org/archive/html/lmi/2006-05/msg00001.html
-#   http://lists.gnu.org/archive/html/lmi/2006-05/msg00019.html
-#   http://lists.gnu.org/archive/html/lmi/2006-05/msg00021.html
-# and extensive offline discussions, which has consumed person-weeks
-# of our time; though we can't pinpoint the exact cause, we have never
-# encountered any such problem except with 'wx-config'. Therefore, we
-# run 'wx-config' only here (in bash, in the present makefile) and
-# write the results of the only commands actually used during lmi build
-# into a portable script.
-#
-# Even if a forgiving shell is used, this portable script runs an
-# order of magnitude faster than the one wx creates.
-# WX !! Is any useful advantage lost?
-
-.PHONY: portable_script
-portable_script:
-       $(ECHO) '#!/bin/sh'                                              
>wx-config-portable
-       $(ECHO) 'last_with_arg=0'                                       
>>wx-config-portable
-       $(ECHO) 'while [ $$# -gt 0 ]; do'                               
>>wx-config-portable
-       $(ECHO) '    case "$$1" in'                                     
>>wx-config-portable
-       $(ECHO) '        --basename)'                                   
>>wx-config-portable
-       $(ECHO) "            echo `./wx-config --basename`"             
>>wx-config-portable
-       $(ECHO) '            ;;'                                        
>>wx-config-portable
-       $(ECHO) '        --cflags | --cppflags | --cxxflags)'           
>>wx-config-portable
-       $(ECHO) "            echo `./wx-config --cxxflags`"             
>>wx-config-portable
-       $(ECHO) '            this_with_arg=1'                           
>>wx-config-portable
-       $(ECHO) '            ;;'                                        
>>wx-config-portable
-       $(ECHO) '        --host*)'                                      
>>wx-config-portable
-       $(ECHO) '            ;;'                                        
>>wx-config-portable
-       $(ECHO) '        --libs)'                                       
>>wx-config-portable
-       $(ECHO) "            echo `./wx-config --libs`"                 
>>wx-config-portable
-       $(ECHO) '            this_with_arg=1'                           
>>wx-config-portable
-       $(ECHO) '            ;;'                                        
>>wx-config-portable
-       $(ECHO) '        --rescomp)'                                    
>>wx-config-portable
-       $(ECHO) "            echo `./wx-config --rescomp`"              
>>wx-config-portable
-       $(ECHO) '            ;;'                                        
>>wx-config-portable
-       $(ECHO) '        --selected_config)'                            
>>wx-config-portable
-       $(ECHO) "            echo `./wx-config --selected_config`"      
>>wx-config-portable
-       $(ECHO) '            ;;'                                        
>>wx-config-portable
-       $(ECHO) '        --version)'                                    
>>wx-config-portable
-       $(ECHO) "            echo `./wx-config --version`"              
>>wx-config-portable
-       $(ECHO) '            ;;'                                        
>>wx-config-portable
-       $(ECHO) '        *)'                                            
>>wx-config-portable
-       $(ECHO) '            if [ "$$last_with_arg" -ne 1 ]; then'      
>>wx-config-portable
-       $(ECHO) '                echo Bad argument $$1'                 
>>wx-config-portable
-       $(ECHO) '                exit 1'                                
>>wx-config-portable
-       $(ECHO) '            fi'                                        
>>wx-config-portable
-       $(ECHO) '    esac'                                              
>>wx-config-portable
-       $(ECHO) '    last_with_arg=$$this_with_arg'                     
>>wx-config-portable
-       $(ECHO) '    shift'                                             
>>wx-config-portable
-       $(ECHO) 'done'                                                  
>>wx-config-portable
-       $(CHMOD) 755 wx-config-portable
-
 .PHONY: clobber
 clobber:
 # WX !! The 'uninstall' target doesn't remove quite everything.
diff --git a/install_wxpdfdoc.make b/install_wxpdfdoc.make
index d7ccba2..14cd36b 100644
--- a/install_wxpdfdoc.make
+++ b/install_wxpdfdoc.make
@@ -70,7 +70,6 @@ config_options = \
   --build=$(build_type) \
   --host=$(host_type) \
   --disable-dependency-tracking \
-  --with-wx-config=$(prefix)/bin/wx-config-portable \
   CFLAGS='$(wx_cc_flags)' \
   CXXFLAGS='$(wx_cxx_flags)' \
 
diff --git a/workhorse.make b/workhorse.make
index ee0f49d..6463937 100644
--- a/workhorse.make
+++ b/workhorse.make
@@ -159,16 +159,7 @@ endif
 
 wx_dir := /opt/lmi/local/bin
 
-# Use our '-portable' script if it exists; else fall back on the
-# script wx provides.
-
-wx_config_script := \
-  $(firstword \
-    $(wildcard \
-      $(addprefix $(wx_dir)/,wx-config-portable wx-config \
-      ) \
-    ) \
-  )
+wx_config_script := wx-config
 
 # The conventional autotools usage...
 ifeq (gcc,$(toolset))
@@ -176,8 +167,7 @@ ifeq (gcc,$(toolset))
   wx_config_libs     := $(shell $(wx_config_script) --libs)
   wx_config_basename := $(shell $(wx_config_script) --basename)
   wx_config_version  := $(shell $(wx_config_script) --version)
-
-  # Define the variables used to construct the names of wxCode libraries.
+  # [variables used to construct the names of wxCode libraries]
   wxcode_basename := $(shell echo $(wx_config_basename) | sed 's/^wx/wxcode/')
   wxcode_version  := $(shell echo $(wx_config_version) | sed 's/\.[0-9]*$$//')
 endif