Merge pull request #588 from sourceryinstitute/issue-#559-installer-updates

Issue #559 installer updates

Author: zbeekman

install.sh

@@ -169,7 +169,7 @@ info  "-U (--print-url):        ${arg_U}"
 info  "-v (--version):          ${arg_v}"
 info  "-V (--print-version):    ${arg_V}"
 info  "-y (--yes-to-all):       ${arg_y}"
-info  "-z (--disable-bootstrap):${arg_z}"
+info  "-Z (--bootstrap):        ${arg_Z}"
 }
 # This file is organized into three sections:
 # 1. Command-line argument and environment variable processing.

install.sh-usage

@@ -9,7 +9,7 @@
   -h --help                   Print this page.
   -i --install-prefix [arg]   Install package in specified path. Default="${OPENCOARRAYS_SRC_DIR}/prerequisites/installations/${package_name:-}/${version_to_build:-}"
   -I --install-version [arg]  Install package version (Example: -I 7.2.0).
-  -j --num-threads [arg]      Number of threads to use when invoking make (Example: -j 4). Default="1"
+  -j --num-threads [arg]      Number of threads to use when invoking make (Example: -j 8). Default="4"
   -l --list-packages          Print packages this script can install.
   -m --with-cmake [arg]       Use specified CMake installation (Example: -m /usr/local/bin/cmake).
   -M --with-mpi [arg]         Use specified MPI installation (Examples: -M /usr/local/ or -m /opt/mpich-3.2/).
@@ -22,4 +22,4 @@
   -v --version                Print OpenCoarrays version number.
   -V --print-version [arg]    Print version number for specified package (Example: -V mpich).
   -y --yes-to-all             Build non-interactively by assuming affirmative user responses.
-  -z --disable-bootstrap      Disabling bootstrap build of GCC for speed when a recent GCC is already installed.
+  -Z --bootstrap              Enable bootstrap build for robustness when building the required GCC version with an old GCC version.

prerequisites/build-functions/build_and_install.sh

@@ -16,6 +16,9 @@ build_and_install()
 
   set_SUDO_if_needed_to_write_to_directory "${build_path}"
   set_SUDO_if_needed_to_write_to_directory "${install_path}"
+  if [[ -d "${build_path}" ]]; then
+    rm -rf "${build_path}"
+  fi
   mkdir -p "${build_path}"
   info "pushd ${build_path}"
   pushd "${build_path}"

prerequisites/build.sh

@@ -103,15 +103,15 @@ info "-l (--list-packages):    ${arg_l} "
 info "-m (--with-cmake):       ${arg_m} "
 info "-M (--with-mpi):         ${arg_M} "
 info "-n (--no-color):         ${arg_n} "
-info "-p (--package):          ${arg_p}"
+info "-p (--package):          ${arg_p} "
 info "-P (--print-path):       ${arg_P} "
 info "-t (--with-tau):         ${arg_t} "
 info "-u (--from-url):         ${arg_u} "
 info "-U (--print-url):        ${arg_U} "
 info "-v (--version):          ${arg_v} "
 info "-V (--print-version):    ${arg_V} "
 info "-y (--yes-to-all):       ${arg_y} "
-info "-z (--disable-bootstrap):${arg_z} "
+info "-Z (--bootstrap):        ${arg_Z} "
 }
 
 if [[ -z "${arg_B}" ]]; then
@@ -148,8 +148,9 @@ if [[ ${arg_o:-} == "${__flag_present}" ]]; then
    exit 0
 fi
 
-# If -z or --disable-bootstrap was specified, disable bootstrap configure & build
-if [[ ${arg_z:-} == "${__flag_present}" ]]; then
+# If -Z or --bootstrap was specified, enable bootstrap configure & build
+if [[ ${arg_Z:-} != "${__flag_present}" ]]; then
+   info "Disabling bootstrap. If the gcc/g++/gfortran build fails, try './install.sh --bootstrap'."
    export bootstrap_configure="--disable-bootstrap"
    export bootstrap_build=""
 else

prerequisites/build.sh-usage

@@ -9,7 +9,7 @@
   -h --help                   This page.
   -i --install-prefix [arg]   Install package in specified path. Default="${OPENCOARRAYS_SRC_DIR%/}/prerequisites/installations/"
   -I --install-version [arg]  Package version to install. (To see default, use -V or --print-version)
-  -j --num-threads [arg]      Number of threads to use when invoking make. Default="1"
+  -j --num-threads [arg]      Number of threads to use when invoking make. Default="4"
   -l --list-packages          List the packages this script can install.
   -m --with-cmake [arg]       Use the specified CMake installation. Default="cmake"
   -M --with-mpi [arg]         Use the specified MPI installation. 
@@ -24,4 +24,4 @@
   -v --version                Print OpenCoarrays version number.
   -V --print-version [arg]    Print installation version for package specified in argument.
   -y --yes-to-all             Build non-interactively by assuming affirmative user responses.
-  -z --disable-bootstrap      Disabling bootstrap build of GCC for speed when a recent GCC is already installed.
+  -Z --bootstrap              Enable bootstrap build for robustness when building the required GCC version with an old GCC version.

prerequisites/install-functions/build_opencoarrays.sh

@@ -8,6 +8,9 @@ build_opencoarrays()
   info "Invoking find_or_install cmake"
   find_or_install cmake
   build_path="${build_path}"/opencoarrays/$("${opencoarrays_src_dir}"/install.sh -V opencoarrays)
+  if [[ -d "${build_path}" ]]; then
+    rm -rf "${build_path}"
+  fi
   mkdir -p "$build_path"
   pushd "$build_path"
   if [[ -z ${MPIFC:-} || -z ${MPICC:-} ]]; then

prerequisites/install-functions/find_or_install.sh

@@ -599,9 +599,13 @@ find_or_install()
       yes_to_all="-y"
     fi
 
+    if [[ "${arg_Z}" == "${__flag_present}" ]]; then
+      bootstrap="-Z"
+    fi
+
     echo -e "$this_script: Downloading, building, and installing $package \n"
-    echo "$this_script: Build command: FC=$FC CC=$CC CXX=$CXX ./build.sh -p $package -i $package_install_prefix -j $num_threads ${yes_to_all:-}"
-    FC="$FC" CC="$CC" CXX="$CXX" ./build.sh -p "$package" -i "$package_install_prefix" -j "$num_threads" "${yes_to_all:-}"
+    echo "$this_script: Build command: FC=$FC CC=$CC CXX=$CXX ./build.sh -p $package -i $package_install_prefix -j $num_threads ${yes_to_all:-} ${bootstrap:-}"
+    FC="$FC" CC="$CC" CXX="$CXX" ./build.sh -p "$package" -i "$package_install_prefix" -j "$num_threads" "${yes_to_all:-}" "${bootstrap:-}"
 
     if [[ -x "$package_install_path/bin/$executable" ]]; then
       echo -e "$this_script: Installation successful.\n"

prerequisites/install-functions/print_header.sh

@@ -10,30 +10,39 @@ print_header() {
   m4ver="$("${__file}" -V m4)"
   popd >/dev/null
   clear
-  echo ""
-  echo "*** By default, building OpenCoarrays requires CMake ${cmakever} or later,      ***"
-  echo "*** MPICH ${mpichver}, and GCC Fortran (gfortran) ${gccver} or later.  To see         ***"
-  echo "*** options for forcing the use of older or alternative packages, execute ***"
-  echo "*** this script with the -h flag.  This script will recursively traverse  ***"
-  echo "*** the following dependency tree, asking permission to download, build,  ***"
-  echo "*** and install any packages that are required for building another       ***"
-  echo "*** package and are neither in your PATH nor in                           ***"
-  echo "*** opencoarrays/prerequisites/installations:                             ***"
+  echo "__________ Please read these instructions carefully before proceeding. ___________"
+  echo "__________________________________________________________________________________"
+  echo "*** Most end users will find it easier to install OpenCoarrays via the native  ***"
+  echo "*** package manager for the target operating system.  Advanced developers will ***"
+  echo "*** find it best to install via CMake.  Please see the OpenCoarrays README.md  ***"
+  echo "*** for a list of supported package installers or for instructions on using    ***"
+  echo "*** CMake to install.  The current script offers a fallback when other methods ***"
+  echo "*** prove infeasible. This script builds any missing prerequisites from source ***"
+  echo "*** and then builds OpenCoarrays from source.  The process might take a few    ***"
+  echo "*** minutes if the script finds all prerequisites or several hours if the      ***"
+  echo "*** script finds no prerequisites. (Run './install.sh --help' without quotes   ***"
+  echo "*** to see the installation options.)  This script traverses the following     ***"
+  echo "*** dependency tree and asks permission to install packages that are not in    ***"
+  echo "*** your PATH, not in the prerequisites/installations subdirectory of the      ***"
+  echo "*** OpenCoarrays source tree, or have insufficiently recent version numbers:   ***"
   echo ""
   # Generate the following text using the `tree` command w/ dummy directory structure
   cat <<-EOF
     opencoarrays
-    ├── cmake-${cmakever}
-    └── mpich-${mpichver}
-        └── gcc-${gccver}
-            ├── flex-${flexver}
-            │   └── bison-${bisonver}
-            │       └── m4-${m4ver}
-            ├── gmp
-            ├── mpc
-            └── mpfr
+    |__ cmake-${cmakever}
+    |__ mpich-${mpichver}
+        |__ gcc-${gccver}
+            |__ flex-${flexver}
+            |   |__ bison-${bisonver}
+            |       |__ m4-${m4ver}
+            |__ gmp
+            |__ mpc
+            |__ mpfr
 
 EOF
+  echo "*** For a non-interactive installation, relaunch this script with the command  ***"
+  echo "*** './install.sh --yes-to-all' without quotes to instruct the script to       ***"
+  echo "*** assume affirmative answers to all user queries.                            ***"
   echo ""
   printf "%s will be installed in %s\n" "${arg_p}" "${install_path}"
   echo ""