fly/fgmeta
1
0
Fork 0
Code Activity

download_and_compile.sh: download FGData before building FG

Browse source 
This works better with the new translation system based on XLIFF files.
This commit is contained in:
Florent Rougon 2018-09-15 16:50:07 +02:00
parent 4128259e8e
commit 705bd47bcd
1 changed files with 17 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
download_and_compile.sh
View file

@ -579,14 +579,26 @@ FGFS_INSTALL_DIR=flightgear
INSTALL_DIR_FGFS=$INSTALL_DIR/$FGFS_INSTALL_DIR INSTALL_DIR_FGFS=$INSTALL_DIR/$FGFS_INSTALL_DIR
cd "$CBD" cd "$CBD"
if [[ "$(declare -p WHATTOBUILD)" =~ '['([0-9]+)']="FGFS"' || "$(declare -p WHATTOBUILD)" =~ '['([0-9]+)']="DATA"' ]]; then if [[ "$(declare -p WHATTOBUILD)" =~ '['([0-9]+)']="FGFS"' || "$(declare -p WHATTOBUILD)" =~ '['([0-9]+)']="DATA"' ]]; then
mkdir -p "$INSTALL_DIR_FGFS"/fgdata
cd "$INSTALL_DIR_FGFS"/fgdata
if [[ "$(declare -p WHATTOBUILD)" =~ '['([0-9]+)']="DATA"' ]]; then
echo "****************************************" | tee -a $LOGFILE
echo "**************** DATA ******************" | tee -a $LOGFILE
echo "****************************************" | tee -a $LOGFILE
_gitDownload https://git.code.sf.net/p/flightgear/fgdata
_gitUpdate $FGVERSION
fi
mkdir -p "$CBD"/flightgear
cd "$CBD"/flightgear
if [[ "$(declare -p WHATTOBUILD)" =~ '['([0-9]+)']="FGFS"' ]]; then
echo "****************************************" | tee -a $LOGFILE echo "****************************************" | tee -a $LOGFILE
echo "************** FLIGHTGEAR **************" | tee -a $LOGFILE echo "************** FLIGHTGEAR **************" | tee -a $LOGFILE
echo "****************************************" | tee -a $LOGFILE echo "****************************************" | tee -a $LOGFILE
mkdir -p "flightgear"
cd "$CBD"/flightgear
if [[ "$(declare -p WHATTOBUILD)" =~ '['([0-9]+)']="FGFS"' ]]; then
_gitDownload https://git.code.sf.net/p/flightgear/flightgear _gitDownload https://git.code.sf.net/p/flightgear/flightgear
_gitUpdate $FGVERSION _gitUpdate $FGVERSION
@ -599,24 +611,13 @@ if [[ "$(declare -p WHATTOBUILD)" =~ '['([0-9]+)']="FGFS"' || "$(declare -p WHAT
-DENABLE_FLITE=ON \ -DENABLE_FLITE=ON \
-DCMAKE_INSTALL_PREFIX:PATH="$INSTALL_DIR_FGFS" \ -DCMAKE_INSTALL_PREFIX:PATH="$INSTALL_DIR_FGFS" \
-DCMAKE_PREFIX_PATH="$INSTALL_DIR_SIMGEAR;$INSTALL_DIR_OSG;$INSTALL_DIR_OPENRTI;$INSTALL_DIR_PLIB" \ -DCMAKE_PREFIX_PATH="$INSTALL_DIR_SIMGEAR;$INSTALL_DIR_OSG;$INSTALL_DIR_OPENRTI;$INSTALL_DIR_PLIB" \
-DFG_DATA_DIR="$INSTALL_DIR_FGFS/fgdata" \
$FG_CMAKEARGS \ $FG_CMAKEARGS \
../../flightgear 2>&1 | tee -a $LOGFILE ../../flightgear 2>&1 | tee -a $LOGFILE
fi fi
_make flightgear _make flightgear
fi fi
mkdir -p $INSTALL_DIR_FGFS/fgdata
cd $INSTALL_DIR_FGFS/fgdata
if [[ "$(declare -p WHATTOBUILD)" =~ '['([0-9]+)']="DATA"' ]]; then
echo "****************************************" | tee -a $LOGFILE
echo "**************** DATA ******************" | tee -a $LOGFILE
echo "****************************************" | tee -a $LOGFILE
_gitDownload https://git.code.sf.net/p/flightgear/fgdata
_gitUpdate $FGVERSION
fi
cd "$CBD" cd "$CBD"
SCRIPT=run_fgfs.sh SCRIPT=run_fgfs.sh