From b11dab8c30ffe4d19d983eedf2e3c84003efac2f Mon Sep 17 00:00:00 2001
From: Automatic Release Builder <build@flightgear.org>
Date: Mon, 16 Nov 2020 18:35:04 +0000
Subject: [PATCH] Windows: remove compositor from build script

---
 FlightGear.iss            |  3 ---
 build_release_windows.bat | 15 ---------------
 2 files changed, 18 deletions(-)

diff --git a/FlightGear.iss b/FlightGear.iss
index 734096a..9f12dec 100755
--- a/FlightGear.iss
+++ b/FlightGear.iss
@@ -21,7 +21,6 @@
 #include "InstallConfig.iss"
 
 #define InstallDir64 "X:\install\msvc140-64"
-#define InstallCompositor64 "X:\install\msvc140-64\compositor"
 #define OSG64InstallDir InstallDir64 + "\OpenSceneGraph"
 #define OSG64PluginsDir OSG64InstallDir + "\bin\osgPlugins-" + OSGVersion
 
@@ -72,7 +71,6 @@ Name: "desktopicon"; Description: "Create a &desktop icon"; GroupDescription: "A
 
 ; 64 bits install
 Source: "{#InstallDir64}\bin\*.*"; DestDir: "{app}\bin"; Excludes: "{#ExcludedBinaries}"; Flags: ignoreversion recursesubdirs; Check: Is64BitInstallMode
-Source: "{#InstallCompositor64}\bin\fgfs.exe"; DestDir: "{app}\bin"; DestName: "fgfs-compositor.exe"; Excludes: "{#ExcludedBinaries}"; 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
 
@@ -139,7 +137,6 @@ 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"; Filename: "{app}\bin\fgfs.exe"; Parameters: "--launcher"; WorkingDir: "{app}\bin";
-Name: "{group}\FlightGear - Compositor"; Filename: "{app}\bin\fgfs-compositor.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"
diff --git a/build_release_windows.bat b/build_release_windows.bat
index f6878aa..a712a5c 100755
--- a/build_release_windows.bat
+++ b/build_release_windows.bat
@@ -21,7 +21,6 @@ SET VSGEN="Visual Studio 16 2019"
 
 md build-sg64
 md build-fg64
-md build-fg64-compositor
 
 cd build-sg64
 cmake ..\SimGear -G %VSGEN% -A x64 ^
@@ -41,27 +40,14 @@ cmake ..\flightgear -G %VSGEN%  -A x64 ^
                     -DOSG_FSTREAM_EXPORT_FIXED=1 ^
                     -DFG_BUILD_TYPE=%FGBUILDTYPE% ^
                     -DENABLE_SWIFT:BOOL=ON ^
-                    -DENABLE_COMPOSITOR:BOOL=OFF
 cmake --build . --config RelWithDebInfo --target INSTALL
 
-cd ..\build-fg64-compositor
-cmake ..\flightgear -G %VSGEN% -A x64 ^
-                    -DMSVC_3RDPARTY_ROOT=%WORKSPACE%/windows-3rd-party/msvc140 ^
-                    -DBOOST_ROOT=%WORKSPACE%/windows-3rd-party ^
-                    -DCMAKE_INSTALL_PREFIX:PATH=%WORKSPACE%/install/msvc140-64/compositor ^
-                    -DCMAKE_PREFIX_PATH=%QT5SDK64%;%OSG64%;%WORKSPACE%/install/msvc140-64/ ^
-                    -DOSG_FSTREAM_EXPORT_FIXED=1 ^
-                    -DFG_BUILD_TYPE=%FGBUILDTYPE% ^
-                    -DENABLE_SWIFT:BOOL=ON ^
-                    -DENABLE_COMPOSITOR:BOOL=ON
-cmake --build . --config RelWithDebInfo --target INSTALL
 cd ..
 
 REM Qt5 deployment
 SET QMLDIR=%WORKSPACE%/flightgear/src/GUI/qml
 
 %QT5SDK64%\bin\windeployqt --release --list target --qmldir %QMLDIR% %WORKSPACE%/install/msvc140-64/bin/fgfs.exe
-%QT5SDK64%\bin\windeployqt --release --list target --qmldir %QMLDIR% %WORKSPACE%/install/msvc140-64/compositor/bin/fgfs.exe
 
 REM build setup
 ECHO Packaging root is %WORKSPACE%
@@ -79,7 +65,6 @@ SET SENTRY_PROJECT=flightgear
 REM ensure SENTRY_AUTH_TOKEN is set in the environment
 
 sentry-cli upload-dif --include-sources %WORKSPACE%\build-fg64\%FGFS_PDB%
-sentry-cli upload-dif --include-sources %WORKSPACE%\build-fg64-compositor\%FGFS_PDB%
 
 REM indirect way to get command output into an environment variable
 set PATH=%OSG32%\bin;%PATH%