[open-coarrays] 28/80: Upstream 1.7.0

[Alastair McKinstry]

This is an automated email from the git hooks/post-receive script.

mckinstry pushed a commit to branch debian/master
in repository open-coarrays.

commit 00618156aa1bd66fa3ea9faf0e92fe6b8f6f862c
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Mon Sep 5 08:26:53 2016 +0100

    Upstream 1.7.0
---
 CMakeLists.txt                                                  | 2 +-
 install.sh-usage                                                | 2 +-
 prerequisites/build-functions/set_or_print_installation_path.sh | 7 ++++++-
 prerequisites/build.sh                                          | 2 +-
 4 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index bd24194..709ad5b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -7,7 +7,7 @@ set ( CMAKE_BUILD_TYPE "Release"
 set_property ( CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS ${CMAKE_CONFIGURATION_TYPES} )
 
 #Name project and specify source languages
-project(opencoarrays VERSION 1.6.2 LANGUAGES C Fortran)
+project(opencoarrays VERSION 1.7.0 LANGUAGES C Fortran)
 
 #Print an error message on an attempt to build inside the source directory tree:
 if ("${CMAKE_CURRENT_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_BINARY_DIR}")
diff --git a/install.sh-usage b/install.sh-usage
index 1161b8f..c81e66d 100644
--- a/install.sh-usage
+++ b/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. 
   -h --help                   Print this page.
-  -i --install-prefix [arg]   Install package in specified path. Default="${OPENCOARRAYS_SRC_DIR}/prerequisites/installations/"
+  -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.
   -j --num-threads [arg]      Number of threads to use when invoking make. Default="1"
   -l --list-packages          Print packages this script can install.
diff --git a/prerequisites/build-functions/set_or_print_installation_path.sh b/prerequisites/build-functions/set_or_print_installation_path.sh
index 6c0794b..cb482f4 100644
--- a/prerequisites/build-functions/set_or_print_installation_path.sh
+++ b/prerequisites/build-functions/set_or_print_installation_path.sh
@@ -7,7 +7,12 @@ 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)."
 
-  install_path="${arg_i%/}/${arg_p:-${arg_D:-${arg_P:-${arg_U:-${arg_V}}}}}/${version_to_build}"
+  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}"
+  else
+    install_path="${arg_i%/}"
+  fi
 
   # If -P is present, print ${install_path} and exit with normal status
   if [[ ! -z "${arg_P:-}" ]]; then
diff --git a/prerequisites/build.sh b/prerequisites/build.sh
index 666071a..b83d458 100755
--- a/prerequisites/build.sh
+++ b/prerequisites/build.sh
@@ -124,7 +124,7 @@ fi
 # shellcheck source=./build-functions/set_or_print_downloader.sh
 source "${OPENCOARRAYS_SRC_DIR:-}/prerequisites/build-functions/set_or_print_downloader.sh"
 # shellcheck disable=SC2119
-set_or_print_downloader
+set_or_print_downloader $@
 
 # shellcheck source=./build-functions/set_or_print_url.sh
 source "${OPENCOARRAYS_SRC_DIR:-}/prerequisites/build-functions/set_or_print_url.sh"

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/open-coarrays.git