From 13137727b05f66ee8cd2e696e235d6d95f1c55aa Mon Sep 17 00:00:00 2001
From: James Turner <zakalawe@mac.com>
Date: Mon, 14 Nov 2016 22:29:04 +0100
Subject: [PATCH] Remove FGRun from Windows packaging.

---
 FlightGear.iss            |  5 +----
 build_release_windows.bat | 20 +-------------------
 2 files changed, 2 insertions(+), 23 deletions(-)

diff --git a/FlightGear.iss b/FlightGear.iss
index 00e4bee..009ffa4 100755
--- a/FlightGear.iss
+++ b/FlightGear.iss
@@ -202,11 +202,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"
@@ -217,8 +216,6 @@ 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}"
 
 [Code]
 const
diff --git a/build_release_windows.bat b/build_release_windows.bat
index 4db271a..7299d48 100755
--- a/build_release_windows.bat
+++ b/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