FGFS-4.1/fgmeta
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

download_and_compile.sh: add option --ignore-intercomponent-deps

Browse Source 
Add option --ignore-intercomponent-deps which does the following:

  Ignore dependencies between components (default: don't).

  Example: TERRAGEAR depends on SIMGEAR. Because of this, running
  'download_and_compile.sh TERRAGEAR' would normally update, rebuild,
  etc. both SIMGEAR and TERRAGEAR. Passing the
  --ignore-intercomponent-deps option can be useful if you want to
  update, rebuild, etc. TERRAGEAR *without* doing the same for SIMGEAR
  (for instance, if you are doing repeated TERRAGEAR builds and you know
  your SIMGEAR is already fine and up-to-date).
This commit is contained in:
Florent Rougon 2019-04-26 10:30:45 +02:00
parent 59c9a55baa
commit 5b34458439
1 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
download_and_compile.sh
View File

@ -340,6 +340,12 @@ function _usage() {
echo " -j X pass -jX to the Make program" echo " -j X pass -jX to the Make program"
echo " -O X pass -OX to the Make program" echo " -O X pass -OX to the Make program"
echo " -r y|n y=reconfigure programs before compiling them, n=don't reconfigure default=y" echo " -r y|n y=reconfigure programs before compiling them, n=don't reconfigure default=y"
echo " --ignore-intercomponent-deps"
echo " Ignore dependencies between components (default: don't)."
echo " Example: TERRAGEAR depends on SIMGEAR. Passing the option can be"
echo " useful if you want to update, rebuild, etc. TERRAGEAR without"
echo " doing the same for SIMGEAR (e.g., if doing repeated TERRAGEAR"
echo " builds and you know your SIMGEAR is already fine and up-to-date)."
echo " -s compile only the last known stable versions" echo " -s compile only the last known stable versions"
} }
@ -363,6 +369,7 @@ DOWNLOAD_PACKAGES="y"
COMPILE="y" COMPILE="y"
RECONFIGURE="y" RECONFIGURE="y"
DOWNLOAD="y" DOWNLOAD="y"
IGNORE_INTERCOMPONENT_DEPS="n"
SUDO="sudo" SUDO="sudo"
PKG_MGR="apt-get" PKG_MGR="apt-get"
@ -431,7 +438,7 @@ REPO_SITE[TERRAGEARGUI]="SourceForge"
# built-in function, it allows one to define long options. # built-in function, it allows one to define long options.
TEMP=$(getopt -o '+shc:p:a:d:r:j:O:ib:' \ TEMP=$(getopt -o '+shc:p:a:d:r:j:O:ib:' \
--longoptions git-clone-default-proto:,git-clone-site-params:,help \ --longoptions git-clone-default-proto:,git-clone-site-params:,help \
--longoptions package-manager:,sudo:,version \ --longoptions package-manager:,sudo:,ignore-intercomponent-deps,version \
-n "$PROGNAME" -- "$@") -n "$PROGNAME" -- "$@")
case $? in case $? in
@ -502,6 +509,7 @@ while true; do
;; ;;
--package-manager) PKG_MGR="$2"; shift 2 ;; --package-manager) PKG_MGR="$2"; shift 2 ;;
--sudo) SUDO="$2"; shift 2 ;; --sudo) SUDO="$2"; shift 2 ;;
--ignore-intercomponent-deps) IGNORE_INTERCOMPONENT_DEPS="y"; shift ;;
-r) RECONFIGURE="$2"; shift 2 ;; -r) RECONFIGURE="$2"; shift 2 ;;
-j) JOPTION=" -j$2"; shift 2 ;; -j) JOPTION=" -j$2"; shift 2 ;;
-O) OOPTION=" -O$2"; shift 2 ;; -O) OOPTION=" -O$2"; shift 2 ;;
@ -601,10 +609,12 @@ _logSep
# * Inter-component Dependencies * # * Inter-component Dependencies *
# **************************************************************************** # ****************************************************************************
# TerraGear requires SimGear if [ "$IGNORE_INTERCOMPONENT_DEPS" = "n" ]; then
if _elementIn "TERRAGEAR" "${WHATTOBUILD[@]}" && \ # TerraGear requires SimGear
! _elementIn "SIMGEAR" "${WHATTOBUILD[@]}"; then if _elementIn "TERRAGEAR" "${WHATTOBUILD[@]}" && \
WHATTOBUILD+=(SIMGEAR) ! _elementIn "SIMGEAR" "${WHATTOBUILD[@]}"; then
WHATTOBUILD+=(SIMGEAR)
fi
fi fi
# **************************************************************************** # ****************************************************************************