[lmi-commits] [lmi] master 8f18ce9 2/2: Install both 32- and 64-bit MinGW gcc and lmi

[Greg Chicares]

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

    Install both 32- and 64-bit MinGW gcc and lmi
    
    * install_mingw.make: Install 64-bit rather than 32-bit gcc.
    * install_mingw32.make: Copy of last revision of 'install_mingw.make',
      with only a comment changed.
    * install_msw.sh: Install both architectures. Incidentally, improve
      quoting of "java" path to prevent a shellcheck warning.
    
    'install_msw.sh' now installs and builds both architectures. This does
    take about twice as long, and it does eat up an extra half gigabyte of
    disk space. However, it does everything that's wanted, all in one step.
    Soon enough the 32-bit build will be abandoned, so those drawbacks are
    only temporary.
---
 install_mingw.make                         | 16 ++++------------
 install_mingw.make => install_mingw32.make |  2 +-
 install_msw.sh                             | 19 ++++++++++++-------
 3 files changed, 17 insertions(+), 20 deletions(-)

diff --git a/install_mingw.make b/install_mingw.make
index 047a6f9..0881dea 100644
--- a/install_mingw.make
+++ b/install_mingw.make
@@ -1,4 +1,4 @@
-# Installer for MinGW-w64 native toolchain.
+# Installer for MinGW-w64 64-bit msw-native toolchain.
 #
 # Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 
2016, 2017, 2018, 2019 Gregory W. Chicares.
 #
@@ -57,19 +57,11 @@ mirror     := http://downloads.sourceforge.net/mingw-w64
 
 # File lists 
###################################################################
 
-#MinGW-6_3_0 := i686-6.3.0-release-win32-sjlj-rt_v5-rev1.7z
-MinGW-6_3_0 := i686-6.3.0-release-win32-sjlj-rt_v5-rev2.7z
-MinGW-7_2_0 := i686-7.2.0-release-win32-sjlj-rt_v5-rev0.7z
-MinGW-7_3_0 := i686-7.3.0-release-win32-sjlj-rt_v5-rev0.7z
-MinGW-8_1_0 := i686-8.1.0-release-win32-sjlj-rt_v6-rev0.7z
+MinGW-8_1_0 := x86_64-8.1.0-release-win32-seh-rt_v6-rev0.7z
 
 # Archive md5sums 
##############################################################
 
-#$(MinGW-6_3_0)-md5 := b92e8480cf8d5904da78ab6d94f1a047
-$(MinGW-6_3_0)-md5 := 6e15de993400279c24b40b1f978e9380
-$(MinGW-7_2_0)-md5 := f34ff6eca4aa7a645f60c977b107c5d2
-$(MinGW-7_3_0)-md5 := 37d964d08ce48dc170cc95a84679cc4f
-$(MinGW-8_1_0)-md5 := 28ec1e65ab85a9e1043998516045ab62
+$(MinGW-8_1_0)-md5 := ebe9cf22aa13c9e34f5e684a79efaf8e
 
 # Utilities 
####################################################################
 
@@ -108,7 +100,7 @@ ad_hoc_dir_exists = \
 
 .PHONY: all
 all: $(file_list)
-       $(CP) --archive $(ad_hoc_dir)/mingw32/* $(prefix)
+       $(CP) --archive $(ad_hoc_dir)/mingw64/* $(prefix)
        $(RM) --force --recursive $(ad_hoc_dir)
 
 $(file_list): initial_setup
diff --git a/install_mingw.make b/install_mingw32.make
similarity index 98%
copy from install_mingw.make
copy to install_mingw32.make
index 047a6f9..22f103e 100644
--- a/install_mingw.make
+++ b/install_mingw32.make
@@ -1,4 +1,4 @@
-# Installer for MinGW-w64 native toolchain.
+# Legacy installer for MinGW-w64 32-bit msw-native toolchain.
 #
 # Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 
2016, 2017, 2018, 2019 Gregory W. Chicares.
 #
diff --git a/install_msw.sh b/install_msw.sh
index 2c56948..69945f1 100755
--- a/install_msw.sh
+++ b/install_msw.sh
@@ -42,7 +42,7 @@ minimal_path=${MINIMAL_PATH:-"/usr/bin:/bin:/usr/sbin:/sbin"}
 
 case "$lmi_build_type" in
     (*-*-cygwin*)
-        java_path="/cygdrive/c/Program\ Files\ \(x86\)/Common\ 
Files/Oracle/Java/javapath"
+        java_path='/cygdrive/c/Program\ Files\ \(x86\)/Common\ 
Files/Oracle/Java/javapath'
         minimal_path="$minimal_path:$(cygpath --sysdir):$java_path"
         ;;
 esac
@@ -195,17 +195,22 @@ make $coefficiency --output-sync=recurse -f 
install_miscellanea.make
 # it's the one installed to /opt/lmi/bin/ when this script ends.
 export LMI_COMPILER=gcc
 export LMI_TRIPLET
-#for LMI_TRIPLET in x86_64-w64-mingw32 i686-w64-mingw32 ;
 # shellcheck disable=SC2043
-for LMI_TRIPLET in i686-w64-mingw32 ;
+#for LMI_TRIPLET in i686-w64-mingw32 ;
+for LMI_TRIPLET in x86_64-w64-mingw32 i686-w64-mingw32 ;
 do
-  if [ "Cygwin" = "$platform" ]
-  then
     # For Cygwin, install and use this msw-native compiler.
+    # Install it for other build types, too, even if only for
+    # validating the installation procedure.
     mingw_dir=/opt/lmi/${LMI_COMPILER}_${LMI_TRIPLET}/gcc_msw
     [ -d "$mingw_dir" ] && rm --force --recursive "$mingw_dir"
-    make $coefficiency --output-sync=recurse -f install_mingw.make
-  fi
+    if   [ "i686-w64-mingw32"   = "$LMI_TRIPLET" ]; then
+      make $coefficiency --output-sync=recurse -f install_mingw32.make
+    elif [ "x86_64-w64-mingw32" = "$LMI_TRIPLET" ]; then
+      make $coefficiency --output-sync=recurse -f install_mingw.make
+    else
+      printf 'No MinGW compiler for this triplet.\n'
+    fi
 
     make $coefficiency --output-sync=recurse -f install_libxml2_libxslt.make