Skip to content

Commit ca51723

Browse files
Damian Rousonzbeekman
authored andcommitted
install.sh -p ofp now builds OFP.
1 parent 5f7c5a1 commit ca51723

File tree

1 file changed

+11
-7
lines changed

1 file changed

+11
-7
lines changed

install.sh

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -256,15 +256,11 @@ elif [[ ! -z "${arg_D:-${arg_P:-${arg_U:-${arg_V}}}}" || "${arg_l}" == "${__fla
256256
"${opencoarrays_src_dir}"/prerequisites/build.sh "${build_flag}" "${build_arg}"
257257
# Add lines other packages the current script builds
258258
if [[ "${arg_l}" == "${__flag_present}" ]]; then
259-
echo "opencoarrays (default version `${build_script} -V opencoarrays`)"
260-
echo "ofp (default version `${build_script} -V ofp`)"
259+
echo "opencoarrays (version `${opencoarrays_src_dir}/install.sh -V opencoarrays`)"
260+
echo "ofp (version: ofp-sdf for OS X )"
261261
fi
262262

263-
elif [[ ! -z "${arg_p:-}" && "${arg_p:-}" != "opencoarrays" ]]; then
264-
265-
"${opencoarrays_src_dir}"/prerequisites/build.sh -p "${arg_p}"
266-
267-
else # Find or install prerequisites and install OpenCoarrays
263+
elif [[ "${arg_p:-}" == "opencoarrays" ]]; then
268264

269265
cd prerequisites
270266
installation_record=install-opencoarrays.log
@@ -273,5 +269,13 @@ else # Find or install prerequisites and install OpenCoarrays
273269
build_opencoarrays 2>&1 | tee ../"${installation_record}"
274270
report_results 2>&1 | tee -a ../"${installation_record}"
275271

272+
elif [[ "${arg_p:-}" == "ofp" ]]; then
273+
274+
"${opencoarrays_src_dir}"/prerequisites/install-ofp.sh
275+
276+
elif [[ ! -z "${arg_p:-}" ]]; then
277+
278+
"${opencoarrays_src_dir}"/prerequisites/build.sh -p "${arg_p}"
279+
276280
fi
277281
# ____________________________________ End of Main Body ____________________________________________

0 commit comments

Comments
 (0)