fly/fgmeta
1
0
Fork 0
Code Activity

download_and_compile.sh: cosmetic changes

Browse source
This commit is contained in:
Florent Rougon 2018-09-26 10:02:09 +02:00
parent 250c0c54a8
commit 7c5ad2405e
1 changed files with 10 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
download_and_compile.sh
View file

@ -32,11 +32,11 @@ FGVERSION="release/$(git ls-remote --heads https://git.code.sf.net/p/flightgear/
####################################################### #######################################################
# THANKS TO # THANKS TO
####################################################### #######################################################
# Special thanks to Alessandro Garosi for FGComGui and # Special thanks to Alessandro Garosi for FGComGui and
# other patches # other patches
# Thanks to "Pat Callahan" for patches for fgrun compilation # Thanks to "Pat Callahan" for patches for fgrun compilation
# Thanks to "F-JJTH" for bug fixes and suggestions # Thanks to "F-JJTH" for bug fixes and suggestions
# Thanks again to "F-JJTH" for OpenRTI and FGX # Thanks again to "F-JJTH" for OpenRTI and FGX
# Thanks to André, (taureau89_9) for debian stable packages fixes # Thanks to André, (taureau89_9) for debian stable packages fixes
#############################################################" #############################################################"
@ -419,8 +419,8 @@ while true; do
--git-clone-site-params) --git-clone-site-params)
if [[ "$2" =~ ^([[:alnum:]]+)=([[:alpha:]]+)(:([[:alnum:]]+))?$ ]]; then if [[ "$2" =~ ^([[:alnum:]]+)=([[:alpha:]]+)(:([[:alnum:]]+))?$ ]]; then
site="${BASH_REMATCH[1],,}" # convert the site to lowercase site="${BASH_REMATCH[1],,}" # convert the site to lowercase
proto="${BASH_REMATCH[2],,}" # ditto for the protocol
verbatim_proto="${BASH_REMATCH[2]}" verbatim_proto="${BASH_REMATCH[2]}"
proto="${verbatim_proto,,}" # ditto for the protocol
username="${BASH_REMATCH[4]}" # but take the username verbatim username="${BASH_REMATCH[4]}" # but take the username verbatim
if ! _elementIn "$proto" ssh https git; then if ! _elementIn "$proto" ssh https git; then
@ -726,7 +726,7 @@ if _elementIn "OPENRTI" "${WHATTOBUILD[@]}"; then
-DCMAKE_INSTALL_PREFIX:PATH="$INSTALL_DIR_OPENRTI" \ -DCMAKE_INSTALL_PREFIX:PATH="$INSTALL_DIR_OPENRTI" \
../../openrti 2>&1 | tee -a $LOGFILE ../../openrti 2>&1 | tee -a $LOGFILE
fi fi
_make openrti _make openrti
fi fi
@ -758,7 +758,7 @@ if _elementIn "OSG" "${WHATTOBUILD[@]}"; then
"$CMAKE" -DCMAKE_BUILD_TYPE="$OSG_BUILD_TYPE" \ "$CMAKE" -DCMAKE_BUILD_TYPE="$OSG_BUILD_TYPE" \
-DCMAKE_INSTALL_PREFIX:PATH="$INSTALL_DIR_OSG" ../../openscenegraph/ 2>&1 | tee -a $LOGFILE -DCMAKE_INSTALL_PREFIX:PATH="$INSTALL_DIR_OSG" ../../openscenegraph/ 2>&1 | tee -a $LOGFILE
fi fi
_make openscenegraph _make openscenegraph
#FIX FOR 64 BIT COMPILATION #FIX FOR 64 BIT COMPILATION
if [ -d "$INSTALL_DIR_OSG/lib64" ]; then if [ -d "$INSTALL_DIR_OSG/lib64" ]; then
@ -785,7 +785,7 @@ if _elementIn "SIMGEAR" "${WHATTOBUILD[@]}"; then
cd "$CBD"/simgear cd "$CBD"/simgear
_gitDownload SIMGEAR _gitDownload SIMGEAR
_gitUpdate $FGVERSION _gitUpdate $FGVERSION
if [ "$RECONFIGURE" = "y" ]; then if [ "$RECONFIGURE" = "y" ]; then
cd "$CBD" cd "$CBD"
mkdir -p build/simgear mkdir -p build/simgear
@ -797,7 +797,7 @@ if _elementIn "SIMGEAR" "${WHATTOBUILD[@]}"; then
$SG_CMAKEARGS \ $SG_CMAKEARGS \
../../simgear 2>&1 | tee -a $LOGFILE ../../simgear 2>&1 | tee -a $LOGFILE
fi fi
_make simgear _make simgear
fi fi
@ -900,7 +900,7 @@ if _elementIn "FGRUN" "${WHATTOBUILD[@]}"; then
-DCMAKE_PREFIX_PATH="$INSTALL_DIR_SIMGEAR" \ -DCMAKE_PREFIX_PATH="$INSTALL_DIR_SIMGEAR" \
../../fgrun/ 2>&1 | tee -a $LOGFILE ../../fgrun/ 2>&1 | tee -a $LOGFILE
fi fi
_make fgrun _make fgrun
cd "$CBD" cd "$CBD"
@ -1121,7 +1121,7 @@ if _elementIn "TERRAGEARGUI" "${WHATTOBUILD[@]}"; then
cd "$CBD"/terrageargui cd "$CBD"/terrageargui
_gitDownload TERRAGEARGUI _gitDownload TERRAGEARGUI
_gitUpdate master _gitUpdate master
if [ "$RECONFIGURE" = "y" ]; then if [ "$RECONFIGURE" = "y" ]; then
cd "$CBD" cd "$CBD"
@ -1171,8 +1171,5 @@ else
| tee -a "$LOGFILE" | tee -a "$LOGFILE"
fi fi
echo "" echo
echo "download_and_compile.sh has finished to work" echo "download_and_compile.sh has finished to work"
cd "$CBD"