Merge pull request #592 from sourceryinstitute/fix-#591-installer-updates

Fix #591 installer updates

Author: Damian Rouson

install.sh

@@ -164,6 +164,7 @@ info  "-n (--no-color):         ${arg_n}"
 info  "-o (--only-download):    ${arg_o}"
 info  "-p (--package):          ${arg_p}"
 info  "-P (--print-path):       ${arg_P}"
+info  "-r (--prefix-root):      ${arg_r}"
 info  "-u (--from-url):         ${arg_u}"
 info  "-U (--print-url):        ${arg_U}"
 info  "-v (--version):          ${arg_v}"
@@ -197,8 +198,8 @@ info  "-Z (--bootstrap):        ${arg_Z}"
 this_script="$(basename "$0")"
 export this_script
 
-export install_path="${arg_i%/}"
-info "install_path=\"${install_path}\""
+export install_path=${arg_i%/}
+export prefix_root="${arg_r:-}"
 
 export num_threads="${arg_j}"
 info "num_threads=\"${arg_j}\""
@@ -316,7 +317,12 @@ elif [[ "${arg_p:-}" == "opencoarrays" ]]; then
     # shellcheck source=./prerequisites/build-functions/set_SUDO_if_needed_to_write_to_directory.sh
     source "${OPENCOARRAYS_SRC_DIR:-}/prerequisites/build-functions/set_SUDO_if_needed_to_write_to_directory.sh"
     version="$("${opencoarrays_src_dir}/install.sh" -V opencoarrays)"
-    set_SUDO_if_needed_to_write_to_directory "${install_path}"
+
+    if [[ -z "${prefix_root:-}" ]]; then
+      set_SUDO_if_needed_to_write_to_directory "${install_path}"
+    else
+      set_SUDO_if_needed_to_write_to_directory "${prefix_root}"
+    fi
 
     if grep -s -q Microsoft /proc/version  ; then
       info "Windows Subsystem for Linux detected.  Invoking windows-install.sh with the following command:"

install.sh-usage

@@ -7,7 +7,7 @@
   -e --verbose                Enable verbose mode, print script as it is executed.
   -f --with-fortran [arg]     Use specified Fortran compiler (Example: -f /usr/local/bin/gfortran).
   -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-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 8). Default="4"
   -l --list-packages          Print packages this script can install.
@@ -17,6 +17,7 @@
   -o --only-download          Download (without building) the source for the package specified by -p or --package.
   -p --package [arg]          Install specified package (Examples: -p gcc or -p mpich). Default="opencoarrays"
   -P --print-path [arg]       Print installation directory for specified package (Example: -P gcc).
+  -r --prefix-root [arg]      Installation path to which package name/version will be appended. (Example: -r /opt).
   -u --from-url [arg]         Specify a URL to use for downloading a package (Example: -u https://github.com/sourceryinstitute/gcc/archive/teams-rc3.tar.gz).
   -U --print-url [arg]        Print download location for specified package (Example: -U gcc).
   -v --version                Print OpenCoarrays version number.

prerequisites/acceptable_compiler.f90

@@ -35,5 +35,19 @@
 program main
   use iso_fortran_env, only : compiler_version
   implicit none
-  print *,(compiler_version() >= "GCC version 6.1.0 ")
+  integer, parameter :: first_argument=1
+  integer stat
+  character(len=9) version_number
+  call get_command_argument(first_argument,version_number,status=stat)
+  select case(stat)
+    case(-1)
+       error stop "acceptable_compiler.f90: insufficient string length in attempt to read command argument"
+    case(0)
+      ! successful command argument read
+    case(1:)
+       error stop "acceptable_compiler.f90: no version-number supplied"
+    case default
+       error stop "invalid status"
+  end select
+  print *,(compiler_version() >= "GCC version "//adjustl(trim(version_number))//" ")
 end program

prerequisites/build-functions/set_or_print_default_version.sh

@@ -27,7 +27,7 @@ set_or_print_default_version()
   # See http://stackoverflow.com/questions/1494178/how-to-define-hash-tables-in-bash
   package_version=(
     "cmake:3.4.0"
-    "gcc:7.3.0"
+    "gcc:8.2.0"
     "mpich:3.2"
     "wget:1.16.3"
     "flex:2.6.0"

prerequisites/build-functions/set_or_print_installation_path.sh

@@ -7,10 +7,20 @@ set_or_print_installation_path()
   [ ! -z "${arg_P}" ] && [ ! -z "${arg_p:-${arg_D:-${arg_U:-${arg_V}}}}" ] &&
     emergency "Please pass only one of {-D, -p, -P, -U, -V} or a longer equivalent (multiple detected)."
 
+  if [[ $arg_p == "opencoarrays" ]]; then
+    export version_to_build=$(${OPENCOARRAYS_SRC_DIR}/install.sh -V opencoarrays)
+    export package_name="opencoarrays"
+  fi
   arg_i_default="${OPENCOARRAYS_SRC_DIR}/prerequisites/installations/"
-  if [[ "${arg_i:-}" ==  "${arg_i_default}" ]]; then
-    install_path="${arg_i%/}/${arg_p:-${arg_D:-${arg_P:-${arg_U:-${arg_V}}}}}/${version_to_build}"
+  if [[ "${arg_i%/}" == "${arg_i_default}" ]]; then
+    if [[ -z "${arg_r}" ]]; then
+      export install_path="${arg_i%/}/${arg_p:-${arg_D:-${arg_P:-${arg_U:-${arg_V}}}}}/${version_to_build}"
+    else
+      export install_path="${arg_r%/}/${arg_p:-${arg_D:-${arg_P:-${arg_U:-${arg_V}}}}}/${version_to_build}"
+    fi
   else
+    [ ! -z "${arg_r}" ] && 
+      emergency "Please pass only one of {-i,-r} or a longer equivalent (multiple detected). [exit 105]"
     install_path="${arg_i%/}"
   fi
 

prerequisites/build.sh-usage

@@ -17,6 +17,7 @@
   -o --only-download          Download (without building) the package source specified by -p or --package.
   -p --package [arg]          Package to install. 
   -P --print-path [arg]       Print installation path for package specified in argument.
+  -r --prefix-root [arg]      Installation path to which package name/version will be appended. (Example: -r /opt).
   -t --with-tau [arg]         Use the specified TAU parallel performance utilities installation. Default="tauf90"
   -T --install-tau [arg]      Install TAU in specified path. Default="${OPENCOARRAYS_SRC_DIR}/prerequisites/installations/${package_name:-}/${version_to_build:-}/"
   -u --from-url [arg]         Specify a URL from which to download a package. 

prerequisites/install-functions/build_opencoarrays.sh

@@ -39,6 +39,10 @@ build_opencoarrays()
   else
     MPIEXEC="${MPIEXEC_CANDIDATES[0]}"
   fi
+
+  source "${OPENCOARRAYS_SRC_DIR:-}/prerequisites/build-functions/set_or_print_installation_path.sh"
+  set_or_print_installation_path
+
   info "Configuring OpenCoarrays in ${PWD} with the command:"
   info "CC=\"${CC}\" FC=\"${FC}\" $CMAKE \"${opencoarrays_src_dir}\" \"${WDEVFLAG}\" -DCMAKE_INSTALL_PREFIX=\"${install_path}\" -DMPIEXEC=\"${MPIEXEC}\" -DMPI_C_COMPILER=\"${MPICC}\" -DMPI_Fortran_COMPILER=\"${MPIFC}\""
   CC="${CC}" FC="${FC}" $CMAKE "${opencoarrays_src_dir}" "${WDEVFLAG}" -DCMAKE_INSTALL_PREFIX="${install_path}" -DMPIEXEC="${MPIEXEC}" -DMPI_C_COMPILER="${MPICC}" -DMPI_Fortran_COMPILER="${MPIFC}"