stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8188136: jib configure requires --src-dir for out of tree builds

Browse Source 
8188123: jib.sh looks for closed config file in the wrong place after repo consolidation

Reviewed-by: dholmes, tbell
This commit is contained in:
Erik Joelsson 2017-09-29 15:26:13 +02:00
parent fc05af8f41
commit 734398b8e0
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
bin/jib.sh
View File

@ -28,8 +28,8 @@
mydir="$(dirname "${BASH_SOURCE[0]}")" mydir="$(dirname "${BASH_SOURCE[0]}")"
myname="$(basename "${BASH_SOURCE[0]}")" myname="$(basename "${BASH_SOURCE[0]}")"
installed_jib_script=${mydir}/../../.jib/jib installed_jib_script=${mydir}/../.jib/jib
install_data=${mydir}/../../.jib/.data install_data=${mydir}/../.jib/.data
setup_url() { setup_url() {
if [ -f ~/.config/jib/jib.conf ]; then if [ -f ~/.config/jib/jib.conf ]; then
@ -42,7 +42,7 @@ setup_url() {
jib_revision="2.0-SNAPSHOT" jib_revision="2.0-SNAPSHOT"
jib_ext="jib.sh.gz" jib_ext="jib.sh.gz"
closed_script="${mydir}/../../../closed/conf/jib-install.conf" closed_script="${mydir}/../../closed/make/conf/jib-install.conf"
if [ -f "${closed_script}" ]; then if [ -f "${closed_script}" ]; then
source "${closed_script}" source "${closed_script}"
fi fi
@ -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} "$@"