declaration of dependencies moved to variant files
This commit is contained in:
@@ -3,14 +3,12 @@
|
||||
declare buildblock=$1
|
||||
declare variants=$2
|
||||
|
||||
|
||||
declare -r OS=$(uname -s)
|
||||
|
||||
# File format example
|
||||
# 1.10.2 Linux,Darwin unstable gcc/4.8.5
|
||||
# 1.10.2 unstable gcc/4.8.5
|
||||
declare -a toks=()
|
||||
declare version=''
|
||||
declare oss=''
|
||||
declare release=''
|
||||
declare -a dependencies=()
|
||||
|
||||
@@ -18,13 +16,11 @@ while read -a toks; do
|
||||
# skip comment and empty line
|
||||
(( ${#toks[@]} == 0 )) && continue
|
||||
[[ "${toks[0]:0:1}" == "#" ]] && continue
|
||||
version=${toks[0]}
|
||||
oss=${toks[1]}
|
||||
release=${toks[2]}
|
||||
dependencies=( ${toks[@]:3} )
|
||||
module=${toks[0]}
|
||||
release=${toks[1]}
|
||||
dependencies=( ${toks[@]:2} )
|
||||
|
||||
[[ "${oss}" =~ "${OS}" ]] || continue
|
||||
"${buildblock}" "${version}" --release=${release} "${dependencies[@]/#/--with=}"
|
||||
"${buildblock}" "${module#*/}" --release=${release} "${dependencies[@]/#/--with=}"
|
||||
if [[ $? != 0 ]]; then
|
||||
echo "Failed building: ${version} --release=${release} ${dependencies[@]/#/--with=}" 1>&2
|
||||
exit 42
|
||||
|
||||
Reference in New Issue
Block a user