8188910: jib configure requires --src-dir for out fo tree builds, second attempt

Reviewed-by: dholmes, tbell, ihse
This commit is contained in:
Erik Joelsson 2017-10-10 15:20:10 +02:00
parent f40b349dcc
commit 078ae7e907

View File

@ -39,7 +39,7 @@ setup_url() {
jib_repository="jdk-virtual" jib_repository="jdk-virtual"
jib_organization="jpg/infra/builddeps" jib_organization="jpg/infra/builddeps"
jib_module="jib" jib_module="jib"
jib_revision="2.0-SNAPSHOT" jib_revision="3.0-SNAPSHOT"
jib_ext="jib.sh.gz" jib_ext="jib.sh.gz"
closed_script="${mydir}/../../closed/make/conf/jib-install.conf" closed_script="${mydir}/../../closed/make/conf/jib-install.conf"
@ -146,4 +146,9 @@ elif [ ! -e "${install_data}" ] || [ "${data_string}" != "$(cat "${install_data}
install_jib install_jib
fi 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} "$@" ${installed_jib_script} "$@"