new version: 2016.4.4

After removal of fgrun, this folder does not exist anymore

.gitmodules

@@ -1,11 +1,11 @@
 [submodule "simgear"]
 	path = simgear
 	url = git://git.code.sf.net/p/flightgear/simgear
-	branch = next
+	branch = release/2016.4
 [submodule "flightgear"]
 	path = flightgear
 	url = git://git.code.sf.net/p/flightgear/flightgear
-	branch = next
+	branch = release/2016.4
 [submodule "fgrun"]
 	path = fgrun
 	url = git://git.code.sf.net/p/flightgear/fgrun
@@ -13,7 +13,7 @@
 [submodule "fgdata"]
 	path = fgdata
 	url = git://git.code.sf.net/p/flightgear/fgdata
-	branch = next
+	branch = release/2016.4
 [submodule "windows-3rd-party"]
 	path = windows-3rd-party
 	url = git://git.code.sf.net/p/flightgear/windows-3rd-party

FlightGear.iss

@@ -16,7 +16,7 @@
 ;
 ;     C:\> subst X: F:\Path\to\FlightGear\root
 ;     C:\> subst X: F:\
-;                             
+;
 
 #include "InstallConfig.iss"
 
@@ -74,7 +74,7 @@ ArchitecturesAllowed=x86 x64
 [Tasks]
 ; NOTE: The following entry contains English phrases ("Create a desktop icon" and "Additional icons"). You are free to translate them into another language if required.
 Name: "desktopicon"; Description: "Create a &desktop icon"; GroupDescription: "Additional icons:"
-;Name: "insoal"; Description: "Install OpenAL (the sound engine)"
+Name: "insoal"; Description: "Install OpenAL (the sound engine)"
 
 [Files]
 ; NOTE: run subst X: F:\ (or whatever path the expanded tree resides at)
@@ -82,7 +82,8 @@ Name: "desktopicon"; Description: "Create a &desktop icon"; GroupDescription: "A
 ; 32 bits install
 
 Source: "{#InstallDir32}\bin\*.*"; DestDir: "{app}\bin"; Excludes: "{#ExcludedBinaries}"; Flags: ignoreversion recursesubdirs; Check: not Is64BitInstallMode
-Source: "{#InstallDir32}\share\locale\*"; DestDir: "{app}\bin\locale"; Flags: ignoreversion recursesubdirs; Check: not Is64BitInstallMode
+;locale only exists for fgrun - which has been disabled
+;Source: "{#InstallDir32}\share\locale\*"; DestDir: "{app}\bin\locale"; Flags: ignoreversion recursesubdirs; Check: not Is64BitInstallMode
 
 Source: "{#ThirdPartyDir}\3rdParty\bin\zlib.dll"; DestDir: "{app}\bin"; Check: not Is64BitInstallMode
 Source: "{#ThirdPartyDir}\3rdParty\bin\OpenAL32.dll"; DestDir: "{app}\bin"; Check: not Is64BitInstallMode
@@ -96,7 +97,8 @@ Source: "{#VCInstallDir}\redist\x86\Microsoft.VC140.CRT\*.dll"; DestDir:  "{app}
 
 ; 64 bits install
 Source: "{#InstallDir64}\bin\*.*"; DestDir: "{app}\bin"; Excludes: "{#ExcludedBinaries}"; Flags: ignoreversion recursesubdirs; Check: Is64BitInstallMode
-Source: "{#InstallDir64}\share\locale\*"; DestDir: "{app}\bin\locale"; Flags: ignoreversion recursesubdirs; Check: Is64BitInstallMode
+;locale only exists for fgrun - which has been disabled
+;Source: "{#InstallDir64}\share\locale\*"; DestDir: "{app}\bin\locale"; Flags: ignoreversion recursesubdirs; Check: Is64BitInstallMode
 
 Source: "{#ThirdPartyDir}\3rdParty.x64\bin\zlib.dll"; DestDir: "{app}\bin"; Check: Is64BitInstallMode
 Source: "{#ThirdPartyDir}\3rdParty.x64\bin\OpenAL32.dll"; DestDir: "{app}\bin"; Check: Is64BitInstallMode
@@ -111,7 +113,7 @@ Source: "{#VCInstallDir}\redist\x64\Microsoft.VC140.CRT\*.dll"; DestDir: "{app}\
 ; 32/64 bits install
 ;NOTE: FGPanel has no 64 bits equivalent, so we are using the 32 bits binary for 32&64 bits OS
 Source: "{#InstallDir32}\bin\fgpanel.exe"; DestDir: "{app}\bin"; Flags: ignoreversion
-;Source: "X:\3rdParty\bin\oalinst.exe"; DestDir: "{app}\bin"; Flags: ignoreversion skipifsourcedoesntexist
+Source: "{#ThirdPartyDir}\..\oalinst.exe"; DestDir: "{app}\bin"; Flags: ignoreversion skipifsourcedoesntexist
 
 ; Include the base package
 #if IncludeData == "TRUE"
@@ -202,11 +204,10 @@ Name: "{userdocs}\FlightGear\Custom Scenery"; Permissions: everyone-modify; Chec
 
 [Icons]
 Name: "{userdesktop}\FlightGear {#FGVersion}"; Filename: "{app}\bin\fgfs.exe"; Parameters: "--launcher"; WorkingDir: "{app}\bin"; Tasks: desktopicon;
-Name: "{group}\FlightGear Launcher"; Filename: "{app}\bin\fgfs.exe"; Parameters: "--launcher"; WorkingDir: "{app}\bin";
+Name: "{group}\FlightGear"; Filename: "{app}\bin\fgfs.exe"; Parameters: "--launcher"; WorkingDir: "{app}\bin";
 Name: "{group}\FlightGear Manual"; Filename: "{app}\data\Docs\getstart.pdf"
 Name: "{group}\FlightGear Documentation"; Filename: "{app}\data\Docs\index.html"
 Name: "{group}\Flightgear Wiki"; Filename: "http://wiki.flightgear.org"
-Name: "{group}\Tools\FGRun"; Filename: "{app}\bin\fgrun.exe"; WorkingDir: "{app}";
 Name: "{group}\Tools\Uninstall FlightGear"; Filename: "{uninstallexe}"
 Name: "{group}\Tools\fgjs"; Filename: "cmd"; Parameters: "/k fgjs.exe ""--fg-root={app}\data"""; WorkingDir: "{app}\bin"
 Name: "{group}\Tools\yasim"; Filename: "cmd"; Parameters: "/k ""{app}\bin\yasim.exe"" -h"; WorkingDir: "{app}\bin"
@@ -216,9 +217,7 @@ Name: "{group}\Tools\FGCom-testing"; Filename: "{app}\bin\fgcom.exe"; Parameters
 Name: "{group}\Tools\Explore Documentation Folder"; Filename: "{app}\data\Docs"
 
 [Run]
-; filename: "{app}\bin\oalinst.exe"; WorkingDir: "{app}\bin"; Description: "Installing OpenAL"; Check: IsTaskSelected('insoal') and FileExists(ExpandConstant('{app}\bin\oalinst.exe'))
-; Put installation directory into the fgrun.prefs
-filename: "{app}\bin\fgrun.exe"; WorkingDir: "{app}\bin"; Parameters: "--silent ""--fg-exe={app}\bin\fgfs.exe"" ""--fg-root={app}\data"" ""--fg-scenery={userdocs}\FlightGear\Custom Scenery;{app}\data\Scenery;{userdocs}\FlightGear\TerraSync"" ""--fg-aircraft={userdocs}\FlightGear\Aircraft"" ""--terrasync-dir={userdocs}\FlightGear\TerraSync"" --version={#FGVersion}"
+filename: "{app}\bin\oalinst.exe"; WorkingDir: "{app}\bin"; Description: "Installing OpenAL"; Check: IsTaskSelected('insoal') and FileExists(ExpandConstant('{app}\bin\oalinst.exe'))
 
 [Code]
 const

build_release_windows.bat

@@ -13,7 +13,6 @@ SET OSG64=%WORKSPACE%\install\msvc140-64\OpenSceneGraph
 REM 32bits
 md build-sg32
 md build-fg32
-md build-fgrun32
 cd build-sg32
 cmake ..\simgear -G "Visual Studio 14" ^
                  -DMSVC_3RDPARTY_ROOT=%WORKSPACE%/windows-3rd-party/msvc140 ^
@@ -31,20 +30,12 @@ cmake ..\flightgear -G "Visual Studio 14" ^
                     -DCMAKE_PREFIX_PATH=%QT5SDK32%;%OSG32%
 cmake --build . --config Release --target INSTALL
 
-cd ..\build-fgrun32
-cmake ..\fgrun -G "Visual Studio 14" ^
-               -DMSVC_3RDPARTY_ROOT:PATH=%WORKSPACE%/windows-3rd-party/msvc140 ^
-               -DBOOST_ROOT=%WORKSPACE%/windows-3rd-party ^
-               -DCMAKE_PREFIX_PATH:PATH=%OSG32% ^
-               -DCMAKE_INSTALL_PREFIX:PATH=%WORKSPACE%/install/msvc140
-cmake --build . --config Release --target INSTALL
-
 cd ..
 
 REM 64 bits
 md build-sg64
 md build-fg64
-md build-fgrun64
+
 cd build-sg64
 cmake ..\SimGear -G "Visual Studio 14 Win64" ^
                  -DMSVC_3RDPARTY_ROOT=%WORKSPACE%/windows-3rd-party/msvc140 ^
@@ -61,15 +52,6 @@ cmake ..\flightgear -G "Visual Studio 14 Win64" ^
                     -DCMAKE_PREFIX_PATH=%QT5SDK64%;%OSG64%
 cmake --build . --config Release --target INSTALL
 
-cd ..\build-fgrun64
-cmake ..\fgrun -G "Visual Studio 14 Win64" ^
-               -DMSVC_3RDPARTY_ROOT=%WORKSPACE%/windows-3rd-party/msvc140 ^
-               -DBOOST_ROOT=%WORKSPACE%/windows-3rd-party ^
-               -DCMAKE_PREFIX_PATH:PATH=%OSG64% ^
-               -DCMAKE_INSTALL_PREFIX:PATH=%WORKSPACE%/install/msvc140-64
-
-cmake --build . --config Release --target INSTALL
-
 cd ..
 
 REM Qt5 deployment

download_and_compile.sh

@@ -17,7 +17,7 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-VERSION="2.33"
+VERSION="2.34"
 FGVERSION="release/$(git ls-remote --heads git://git.code.sf.net/p/flightgear/flightgear|grep '\/release\/'|cut -f4 -d'/'|sort -t . -k 1,1n -k2,2n -k3,3n|tail -1)"
 
 #######################################################
@@ -32,7 +32,7 @@ FGVERSION="release/$(git ls-remote --heads git://git.code.sf.net/p/flightgear/fl
 
 LOGFILE=compilation_log.txt
 WHATTOBUILD=
-#AVAILABLE VALUES: PLIB OPENRTI OSG SIMGEAR FGFS DATA FGRUN FGO FGX OPENRADAR ATCPIE TERRAGEAR TERRAGEARGUI
+#AVAILABLE VALUES: CMAKE PLIB OPENRTI OSG SIMGEAR FGFS DATA FGRUN FGO FGX OPENRADAR ATCPIE TERRAGEAR TERRAGEARGUI
 WHATTOBUILDALL=(SIMGEAR FGFS DATA)
 STABLE=
 APT_GET_UPDATE="y"
@@ -42,11 +42,11 @@ RECONFIGURE="y"
 DOWNLOAD="y"
 JOPTION=""
 OOPTION=""
-DEBUG=""
+BUILD_TYPE="RelWithDebInfo"
 SG_CMAKEARGS=""
-FG_CMAKEARGE=""
+FG_CMAKEARGS=""
 
-while getopts "shc:p:a:d:r:j:O:i" OPTION; do
+while getopts "shc:p:a:d:r:j:O:ib:" OPTION; do
   case $OPTION in
     s) STABLE="STABLE" ;;
     h) HELP="HELP" ;;
@@ -58,6 +58,7 @@ while getopts "shc:p:a:d:r:j:O:i" OPTION; do
     j) JOPTION=" -j"$OPTARG" " ;;
     O) OOPTION=" -O"$OPTARG" " ;;
     i) OPENRTI="OPENRTI" ;;
+    b) BUILD_TYPE="$OPTARG" ;;
     ?) HELP="HELP" ;;
   esac
 done
@@ -85,8 +86,8 @@ fi
 
 
 if [ "$OPENRTI" = "OPENRTI" ]; then
-  SG_CMAKEARGS="$SG_CMAKEARGS-DENABLE_RTI=ON;"
-  FG_CMAKEARGS="$FG_CMAKEARGS-DENABLE_RTI=ON;"
+  SG_CMAKEARGS="$SG_CMAKEARGS -DENABLE_RTI=ON;"
+  FG_CMAKEARGS="$FG_CMAKEARGS -DENABLE_RTI=ON;"
   WHATTOBUILD=( "${WHATTOBUILD[@]}" OPENRTI )
 fi
 
@@ -108,13 +109,13 @@ function _gitUpdate(){
   git diff --exit-code 2>&1 > /dev/null
   if [ $? != 1 ]; then
     set -e
-    git checkout -f $branch
     git pull -r
+    git checkout -f $branch
   else
     set -e
     git stash save -u -q
-    git checkout -f $branch
     git pull -r
+    git checkout -f $branch
     git stash pop -q
   fi
 }
@@ -124,7 +125,7 @@ function _gitDownload(){
     return
   fi
   repo=$1
-  if [ -f "README" -o -f "README.txt" ]; then
+  if [ -f "README" -o -f "README.txt" -o -f "README.rst" ]; then
     echo "$repo exists already"
   else
     git clone $repo .
@@ -149,14 +150,14 @@ set -e
 if [ "$HELP" = "HELP" ]; then
   echo "$0 Version $VERSION"
   echo "Usage:"
-  echo "./$0 [-h] [-s] [-e] [-f] [-i] [-g] [-a y|n] [-c y|n] [-p y|n] [-d y|n] [-r y|n] [ALL|PLIB|OPENRTI|SIMGEAR|FGFS|DATA|FGRUN|FGO|FGX|OPENRADAR|ATCPIE|TERRAGEAR|TERRAGEARGUI]"
+  echo "./$0 [-h] [-s] [-e] [-f] [-i] [-g] [-a y|n] [-c y|n] [-p y|n] [-d y|n] [-r y|n] [ALL|CMAKE|OSG|PLIB|OPENRTI|SIMGEAR|FGFS|DATA|FGRUN|FGO|FGX|OPENRADAR|ATCPIE|TERRAGEAR|TERRAGEARGUI]"
   echo "* without options or with ALL it recompiles the content of the WHATTOBUILDALL variable."
   echo "* Feel you free to customize the WHATTOBUILDALL variable available on the top of this script"
   echo "Switches:"
   echo "* -h  show this help"
   echo "* -e  compile FlightGear with --with-eventinput option (experimental)"
   echo "* -i  compile SimGear and FlightGear with -D ENABLE_RTI=ON option (experimental)"
-  echo "* -g  compile with debug info for gcc"
+  echo "* -b Release|RelWithDebInfo|Debug  set build type                  default=RelWithDebInfo"
   echo "* -a y|n  y=do an apt-get update n=skip apt-get update                          default=y"
   echo "* -p y|n  y=download packages n=skip download packages                          default=y"
   echo "* -c y|n  y=compile programs  n=do not compile programs                         default=y"
@@ -195,13 +196,15 @@ echo "RECONFIGURE=$RECONFIGURE" >> $LOGFILE
 echo "DOWNLOAD=$DOWNLOAD" >> $LOGFILE
 echo "JOPTION=$JOPTION" >> $LOGFILE
 echo "OOPTION=$OOPTION" >> $LOGFILE
-echo "DEBUG=$DEBUG" >> $LOGFILE
+echo "BUILD_TYPE=$BUILD_TYPE" >> $LOGFILE
 _logSep
 
 #######################################################
 #######################################################
 # Minimum
 PKG="build-essential cmake git"
+# cmake
+PKG="$PKG libarchive-dev libbz2-dev libcurl4-gnutls-dev libexpat1-dev libjsoncpp-dev liblzma-dev libncurses5-dev procps zlib1g-dev"
 # TG
 PKG="$PKG libcgal-dev libgdal-dev libtiff5-dev"
 # TGGUI/OpenRTI
@@ -265,6 +268,41 @@ if [ -d "$CBD"/fgfs/flightgear ]; then
   echo "Done"
 fi
 
+#######################################################
+# cmake
+#######################################################
+CMAKE_INSTALL_DIR=cmake
+INSTALL_DIR_CMAKE=$INSTALL_DIR/$CMAKE_INSTALL_DIR
+cd "$CBD"
+if [[ "$(declare -p WHATTOBUILD)" =~ '['([0-9]+)']="CMAKE"' ]]; then
+  echo "****************************************" | tee -a $LOGFILE
+  echo "*************** CMAKE ******************" | tee -a $LOGFILE
+  echo "****************************************" | tee -a $LOGFILE
+
+  mkdir -p "cmake"
+  cd "$CBD"/cmake
+  _gitDownload https://cmake.org/cmake.git
+  _gitUpdate master
+
+  if [ "$RECONFIGURE" = "y" ]; then
+    cd "$CBD"
+    mkdir -p build/cmake
+    echo "CONFIGURING cmake" >> $LOGFILE
+    cd "$CBD"/build/cmake
+    ../../cmake/configure --prefix="$INSTALL_DIR_CMAKE" \
+           2>&1 | tee -a $LOGFILE
+  fi
+
+  _make cmake
+  CMAKE="$INSTALL_DIR_CMAKE/bin/cmake"
+else
+  if [ -x "$INSTALL_DIR_CMAKE/bin/cmake" ]; then
+    CMAKE="$INSTALL_DIR_CMAKE/bin/cmake"
+  else
+    CMAKE=cmake
+  fi
+fi
+
 #######################################################
 # PLIB
 #######################################################
@@ -286,7 +324,8 @@ if [[ "$(declare -p WHATTOBUILD)" =~ '['([0-9]+)']="PLIB"' ]]; then
     mkdir -p build/plib
     echo "CONFIGURING plib" >> $LOGFILE
     cd "$CBD"/build/plib
-    cmake -DCMAKE_INSTALL_PREFIX:PATH="$INSTALL_DIR_PLIB" \
+    "$CMAKE" -DCMAKE_BUILD_TYPE="$BUILD_TYPE" \
+          -DCMAKE_INSTALL_PREFIX:PATH="$INSTALL_DIR_PLIB" \
           ../../plib 2>&1 | tee -a $LOGFILE
   fi
 
@@ -319,7 +358,7 @@ if [[ "$(declare -p WHATTOBUILD)" =~ '['([0-9]+)']="OPENRTI"' ]]; then
     mkdir -p build/openrti
     cd "$CBD"/build/openrti
     rm -f CMakeCache.txt
-    cmake -DCMAKE_BUILD_TYPE="Release" \
+    "$CMAKE" -DCMAKE_BUILD_TYPE="$BUILD_TYPE" \
           -DCMAKE_INSTALL_PREFIX:PATH="$INSTALL_DIR_OPENRTI" \
           ../../openrti 2>&1 | tee -a $LOGFILE
   fi
@@ -335,31 +374,36 @@ INSTALL_DIR_OSG=$INSTALL_DIR/$OSG_INSTALL_DIR
 cd "$CBD"
 mkdir -p "openscenegraph"
 if [[ "$(declare -p WHATTOBUILD)" =~ '['([0-9]+)']="OSG"' ]]; then
-echo "****************************************" | tee -a $LOGFILE
-echo "**************** OSG *******************" | tee -a $LOGFILE
-echo "****************************************" | tee -a $LOGFILE
-cd "$CBD"/openscenegraph
-_gitDownload http://github.com/openscenegraph/osg.git
-_gitUpdate OpenSceneGraph-3.2
-
-if [ "$RECONFIGURE" = "y" ]; then
-cd "$CBD"
-mkdir -p build/openscenegraph
-cd "$CBD"/build/openscenegraph
-rm -f CMakeCache.txt
-cmake -DCMAKE_BUILD_TYPE="Release" \
--DCMAKE_INSTALL_PREFIX:PATH="$INSTALL_DIR_OSG" ../../openscenegraph/ 2>&1 | tee -a $LOGFILE
-fi
-
-_make openscenegraph
-#FIX FOR 64 BIT COMPILATION
-if [ -d "$INSTALL_DIR_OSG/lib64" ]; then
-if [ -L "$INSTALL_DIR_OSG/lib" ]; then
-echo "link already done"
-else
-ln -s "$INSTALL_DIR_OSG/lib64" "$INSTALL_DIR_OSG/lib"
-fi
-fi
+  echo "****************************************" | tee -a $LOGFILE
+  echo "**************** OSG *******************" | tee -a $LOGFILE
+  echo "****************************************" | tee -a $LOGFILE
+  cd "$CBD"/openscenegraph
+  _gitDownload http://github.com/openscenegraph/osg.git
+  _gitUpdate OpenSceneGraph-3.2
+  
+  if [ "$RECONFIGURE" = "y" ]; then
+    cd "$CBD"
+    mkdir -p build/openscenegraph
+    cd "$CBD"/build/openscenegraph
+    rm -f CMakeCache.txt
+    if [ "$BUILD_TYPE" = "Debug" ]; then
+      OSG_BUILD_TYPE=Debug
+    else
+      OSG_BUILD_TYPE=Release
+    fi
+    "$CMAKE" -DCMAKE_BUILD_TYPE="$OSG_BUILD_TYPE" \
+         -DCMAKE_INSTALL_PREFIX:PATH="$INSTALL_DIR_OSG" ../../openscenegraph/ 2>&1 | tee -a $LOGFILE
+  fi
+  
+  _make openscenegraph
+  #FIX FOR 64 BIT COMPILATION
+  if [ -d "$INSTALL_DIR_OSG/lib64" ]; then
+    if [ -L "$INSTALL_DIR_OSG/lib" ]; then
+      echo "link already done"
+    else
+      ln -s "$INSTALL_DIR_OSG/lib64" "$INSTALL_DIR_OSG/lib"
+    fi
+  fi
 fi
 
 #######################################################
@@ -383,7 +427,7 @@ if [[ "$(declare -p WHATTOBUILD)" =~ '['([0-9]+)']="SIMGEAR"' ]]; then
     mkdir -p build/simgear
     cd "$CBD"/build/simgear
     rm -f CMakeCache.txt
-    cmake -DCMAKE_BUILD_TYPE="Release" \
+    "$CMAKE" -DCMAKE_BUILD_TYPE="$BUILD_TYPE" \
           -DCMAKE_INSTALL_PREFIX:PATH="$INSTALL_DIR_SIMGEAR" \
           -DCMAKE_PREFIX_PATH="$INSTALL_DIR_OSG;$INSTALL_DIR_OPENRTI" \
 	  $SG_CMAKEARGS \
@@ -416,7 +460,7 @@ if [[ "$(declare -p WHATTOBUILD)" =~ '['([0-9]+)']="FGFS"' || "$(declare -p WHAT
       mkdir -p build/flightgear
       cd "$CBD"/build/flightgear
       rm -f CMakeCache.txt
-      cmake -DCMAKE_BUILD_TYPE="Release" \
+      "$CMAKE" -DCMAKE_BUILD_TYPE="$BUILD_TYPE" \
             -DENABLE_FLITE=ON \
             -DCMAKE_INSTALL_PREFIX:PATH="$INSTALL_DIR_FGFS" \
             -DCMAKE_PREFIX_PATH="$INSTALL_DIR_SIMGEAR;$INSTALL_DIR_OSG;$INSTALL_DIR_OPENRTI;$INSTALL_DIR_PLIB" \
@@ -453,7 +497,7 @@ if [[ "$(declare -p WHATTOBUILD)" =~ '['([0-9]+)']="FGFS"' || "$(declare -p WHAT
   echo "cd \$(dirname \$0)" >> $SCRIPT
   echo "cd $SUB_INSTALL_DIR/$FGFS_INSTALL_DIR/bin" >> $SCRIPT
   echo "export LD_LIBRARY_PATH=../../$SIMGEAR_INSTALL_DIR/lib:../../$OSG_INSTALL_DIR/lib:../../$OPENRTI_INSTALL_DIR/lib:../../$PLIB_INSTALL_DIR/lib" >> $SCRIPT
-  echo "gdb  --directory="\$P1"/fgfs/source/src/ --args fgfs --fg-root=\$PWD/../fgdata/ \$@" >> $SCRIPT
+  echo "gdb  --directory=$CBD/flightgear/src --args fgfs --fg-root=\$PWD/../fgdata/ \$@" >> $SCRIPT
   chmod 755 $SCRIPT
 
   SCRIPT=run_fgcom.sh
@@ -485,7 +529,7 @@ if [[ "$(declare -p WHATTOBUILD)" =~ '['([0-9]+)']="FGRUN"' ]]; then
     mkdir -p build/fgrun
     cd "$CBD"/build/fgrun
     rm -f CMakeCache.txt
-    cmake -DCMAKE_BUILD_TYPE="Release" \
+    "$CMAKE" -DCMAKE_BUILD_TYPE="$BUILD_TYPE" \
           -DCMAKE_INSTALL_PREFIX:PATH="$INSTALL_DIR_FGRUN" \
           -DCMAKE_PREFIX_PATH="$INSTALL_DIR_SIMGEAR" \
           ../../fgrun/ 2>&1 | tee -a $LOGFILE
@@ -499,7 +543,7 @@ if [[ "$(declare -p WHATTOBUILD)" =~ '['([0-9]+)']="FGRUN"' ]]; then
   echo "#!/bin/sh" > $SCRIPT
   echo "cd \$(dirname \$0)" >> $SCRIPT
   echo "cd $SUB_INSTALL_DIR/$FGRUN_INSTALL_DIR/bin" >> $SCRIPT
-  echo "export LD_LIBRARY_PATH=$INSTALL_DIR_SIMGEAR/lib" >> $SCRIPT
+  echo "export LD_LIBRARY_PATH=../../$SIMGEAR_INSTALL_DIR/lib:../../$OSG_INSTALL_DIR/lib:../../$OPENRTI_INSTALL_DIR/lib:../../$PLIB_INSTALL_DIR/lib" >> $SCRIPT
   echo "./fgrun --fg-exe=\$PWD/../../$FGFS_INSTALL_DIR/bin/fgfs --fg-root=\$PWD/../../$FGFS_INSTALL_DIR/fgdata   \$@" >> $SCRIPT
   chmod 755 $SCRIPT
 fi
@@ -666,7 +710,7 @@ if [[ "$(declare -p WHATTOBUILD)" =~ '['([0-9]+)']="TERRAGEAR"' ]]; then
     mkdir -p build/terragear
     cd "$CBD"/build/terragear
     rm -f CMakeCache.txt
-    cmake -DCMAKE_BUILD_TYPE="Debug" \
+    "$CMAKE" -DCMAKE_BUILD_TYPE="Debug" \
           -DCMAKE_INSTALL_PREFIX:PATH="$INSTALL_DIR_TG" \
           -DCMAKE_PREFIX_PATH="$INSTALL_DIR_SIMGEAR;$INSTALL_DIR_CGAL" \
           ../../terragear/ 2>&1 | tee -a $LOGFILE
@@ -718,7 +762,7 @@ if [[ "$(declare -p WHATTOBUILD)" =~ '['([0-9]+)']="TERRAGEARGUI"' ]]; then
     mkdir -p build/terrageargui
     cd "$CBD"/build/terrageargui
     rm -f ../../terrageargui/CMakeCache.txt
-    cmake -DCMAKE_BUILD_TYPE="Release" \
+    "$CMAKE" -DCMAKE_BUILD_TYPE="Release" \
           -DCMAKE_INSTALL_PREFIX="$INSTALL_DIR_TGGUI" \
           ../../terrageargui 2>&1 | tee -a $LOGFILE
   fi

fgdata_checkers.py

@@ -476,8 +476,8 @@ Nasal (Canvas map) probably wouldn't break anything, but guessing it's a bad ide
         base_texture_files=[]
         for t in find_unused_textures(input_path,return_used_noregions=True):
             base_texture_files.extend([path_join("Textures",t),path_join("Textures.high",t)])
-    #no longer a significant problem with exclude_dirs: if os.path.exists(path_join(input_path,".git")):
-        #print(input_path,"appears to be a git clone; this will work, but the result will be larger than starting from a standard flightgear-data package.\nTo create this use (adjusting paths as necessary) rsync -av --filter=\"merge /home/rnpalmer/fs_dev/git/fgmeta/base-package.rules\" ~/fs_dev/git/fgdata ~/fs_dev/flightgear/data_full")
+    #no longer a significant problem with exclude_dirs, and no longer exists for new fgdata: if os.path.exists(path_join(input_path,".git")):
+        #print(input_path,"""appears to be a git clone; this will work, but the result will be larger than starting from a standard flightgear-data package.\nTo create this use (adjusting paths as necessary) rsync -av --filter="merge /home/rnpalmer/FlightGear/source/fgmeta/base-package.rules" ~/FlightGear/source/fgdata ~/FlightGear/data_full""")
     if os.path.exists(output_path.format("base")) and os.listdir(output_path.format("base")):
         print("output path",output_path,"non-empty, aborting to avoid data loss\nIf you did want to lose its previous contents, run:\nrm -r",output_path,"\nthen re-run this script")
         return

version

@@ -1 +1 @@
-2016.3.1
+2016.4.4