Skip to content

Commit

Permalink
8188910: jib configure requires --src-dir for out fo tree builds, sec…
Browse files Browse the repository at this point in the history
…ond attempt

Reviewed-by: dholmes, tbell, ihse
  • Loading branch information
erikj committed Oct 10, 2017
1 parent f241bff commit 94fb362
Showing 1 changed file with 6 additions and 1 deletion.
7 changes: 6 additions & 1 deletion bin/jib.sh
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ setup_url() {
jib_repository="jdk-virtual"
jib_organization="jpg/infra/builddeps"
jib_module="jib"
jib_revision="2.0-SNAPSHOT"
jib_revision="3.0-SNAPSHOT"
jib_ext="jib.sh.gz"

closed_script="${mydir}/../../closed/make/conf/jib-install.conf"
Expand Down Expand Up @@ -146,4 +146,9 @@ elif [ ! -e "${install_data}" ] || [ "${data_string}" != "$(cat "${install_data}
install_jib
fi

# Provide a reasonable default for the --src-dir parameter if run out of tree
if [ -z "${JIB_SRC_DIR}" ]; then
export JIB_SRC_DIR="${mydir}/../"
fi

${installed_jib_script} "$@"

0 comments on commit 94fb362

Please sign in to comment.