Updated build script comments and variable names.

Signed-off-by: Damian Rouson <[email protected]>

Author: Damian Rouson

install_prerequisites/buildgcc

@@ -1,12 +1,15 @@
 #!/bin/bash
+#
+# buildgcc
+#
+# -- This script downloads and installs the GNU Compiler Collection (GCC), 
+#    including the C, C++, and Fortran compilers (http://gcc.gnu.org).
+#
 # OpenCoarrays is distributed under the OSI-approved BSD 3-clause License:
 # Copyright (c) 2015, Sourcery, Inc.
 # Copyright (c) 2015, Sourcery Institute
 # All rights reserved.
 #
-# This script downloads and installs the GNU Compiler Collection (GCC), including
-# the GCC C, C++, and Fortran compilers (http://gcc.gnu.org).
-#
 # All rights reserved.
 # Redistribution and use in source and binary forms, with or without modification, 
 # are permitted provided that the following conditions are met:
@@ -37,14 +40,17 @@ usage()
     echo ""
     echo " $cmd - Bash script for building GCC from source"
     echo ""
-    echo " Usage: $cmd <branch-name> <install-path> <number-of-threads> [options] ..."
+    echo " Usage: "
+    echo "     $cmd <branch-name> [<install-path> <number-of-threads>] "
+    echo " or  $cmd [options] ..."
     echo ""
     echo " Options:"
     echo "   --help, -h           Show this help message"
     echo "   --version, -v, -V    Report version and copyright information"
     echo ""
     echo " Example usage:"
     echo ""
+    echo "   $cmd trunk "
     echo "   $cmd trunk /opt/gnu/6.0 4"
     echo "   $cmd gcc-5-branch /opt/gnu/5.2 4"
     echo "   $cmd -v" 
@@ -56,25 +62,32 @@ usage()
     exit 1
 }
 
+# Default to 2 threads if no specified thread count:
+if [ -z $2 ]; then
+  install_path=${PWD}
+else
+  install_path=$2
+fi
+
+# Default to 2 threads if no specified thread count:
+if [ -z $3 ]; then
+  num_threads=2
+else
+  num_threads=$3
+fi
+
 build()
 {
     cd $1 && 
     ./contrib/download_prerequisites &&
     cd .. &&
     mkdir -p $1-build &&
     cd $1\-build &&
-    ../$1/configure --prefix=$2 --enable-languages=c,c++,fortran,lto --disable-multilib --disable-werror && 
+    ../$1/configure --prefix=$install_path --enable-languages=c,c++,fortran,lto --disable-multilib --disable-werror && 
     make -j $num_threads bootstrap 
 }
 
 
-# Default to 2 threads if no specified thread count:
-if [ -z $3 ]; then
-  num_threads=2
-else
-  num_threads=$3
-fi
-
 if [ $# == 0 ]; then
   # Print usage information if script is invoked without arguments
   usage | less
@@ -107,7 +120,7 @@ else
       exit 1;
     else
       svn co svn://gcc.gnu.org/svn/gcc/$url_tail &&
-      build $1 $2 $3
+      build $1 $install_path $num_threads
     fi
   } >&1 | tee build.log
   echo "Check build.log for results.  If the build was successful,"

install_prerequisites/buildmpich

@@ -1,11 +1,14 @@
 #!/bin/bash
+#
+# buildmpich
+#
+# -- This script ownloads and installs the MPICH library (http://www.mpich.org).
+#
 # OpenCoarrays is distributed under the OSI-approved BSD 3-clause License:
 # Copyright (c) 2015, Sourcery, Inc.
 # Copyright (c) 2015, Sourcery Institute
 # All rights reserved.
 #
-# This script downloads and installs the MPICH library (http://www.mpich.org).
-#
 # All rights reserved.
 # Redistribution and use in source and binary forms, with or without modification, 
 # are permitted provided that the following conditions are met:
@@ -34,9 +37,11 @@ cmd=`basename $0`
 usage()
 {
     echo ""
-    echo " $cmd - Bash script for building GCC from source"
+    echo " $cmd - Bash script for building MPICH from source"
     echo ""
-    echo " Usage: $cmd <branch-name> <install-path> <number-of-threads> [options] ..."
+    echo " Usage (optional arguments in square brackets): "
+    echo "      $cmd <version-number> <install-path> <number-of-threads>"
+    echo " or   $cmd [options] "
     echo ""
     echo " Options:"
     echo "   --help, -h           Show this help message"
@@ -49,13 +54,14 @@ usage()
     echo "   $cmd -v" 
     echo "   $cmd --help"
     echo ""
-    echo " Note: use svn ls svn://gcc.gnu.org/svn/gcc/branches"
-    echo " to list all available branches."
+    echo " Note: For a list of available MPICH versions, visit"
+    echo " http://www.mpich.org/static/downloads/"
     echo ""
     exit 1
 }
 
-# Default to compiling with the GNU compilers
+# Default to compiling with the GNU compilers if the environment 
+# variables CC, FC, and CXX, are empty:
 if [ -z "$CC" ]; then
   CC=gcc
 fi
@@ -66,21 +72,40 @@ if [ -z "$CXX" ]; then
   CXX=g++
 fi
 
-build()
-{
-    mkdir -p $src\-build &&
-    cd $src\-build &&
-   CC=$CC FC=$FC CXX=$CXX ../$src/configure --prefix=$2 && 
-   make -j $num_threads 
-}
+# Default to installing MPICH 3.1.4 if no version specified in the first
+# command-line argument
+if [[ $1 == 'default' ]]; then
+  version=3.1.4
+else
+  version=$1 
+fi
+# Default to installing in the current directory if no path is provided
+# in the second command-line argument
+if [ -z $2 ]; then
+  install_path=${PWD}
+else
+  install_path=$2
+fi
 
-# Default to 2 threads if no specified thread count:
+# Default to building with 2 threads if no thread count is specified
+# in the third command-line argument
 if [ -z $3 ]; then
   num_threads=2
 else
   num_threads=$3
 fi
 
+src=mpich-$version
+
+# Make the build directory, configure, and build
+build()
+{
+   mkdir -p $src\-build &&
+   cd $src\-build &&
+   CC=$CC FC=$FC CXX=$CXX ../$src/configure --prefix=$install_path && 
+   make -j $num_threads 
+}
+
 if [ $# == 0 ]; then
   # Print usage information if script is invoked without arguments
   usage | less
@@ -90,7 +115,7 @@ elif [[ $1 == '--help' || $1 == '-h' ]]; then
 elif [[ $1 == '-v' || $1 == '-V' || $1 == '--version' ]]; then
   # Print script copyright if invoked with -v, -V, or --version argument
   echo ""
-  echo "GCC Build Script"
+  echo "MPICH Build Script"
   echo "Copyright (C) 2015 Sourcery, Inc."
   echo "Copyright (C) 2015 Sourcery Institute"
   echo ""
@@ -100,23 +125,20 @@ elif [[ $1 == '-v' || $1 == '-V' || $1 == '--version' ]]; then
   echo "http://www.sourceryinstitute.org/license.html"
   echo ""
 else
-  if [[ $1 == 'default' ]]; then
-    version=3.1.4
-  else
-    version=$1 
-  fi
-  src=mpich-$version
-  # Build mpich
+  # Download and build mpich
   time \
   {
     if ! type wget > /dev/null; then
       echo 
       echo "$cmd requires 'wget'.  Please install it.  Aborting." 
       exit 1;
     else
+      # Download MPICH
       wget http://www.mpich.org/static/downloads/$version/$src.tar.gz &&
+      # Unpack the downloaded tape archive
       tar xvzf $src.tar.gz &&
-      build $version $2 $num_threads
+      # Compile MPICH source
+      build $version $install_path $num_threads
     fi
   } >&1 | tee build.log
   echo "Check build.log for results.  If the build was successful,"