From 3f38a3cf182b9704c3d802482670a7477ff56838 Mon Sep 17 00:00:00 2001 From: legoboyvdlp R Date: Mon, 6 Apr 2020 23:15:29 +0100 Subject: [PATCH] Add support for compositor to windows builds --- FlightGear.iss | 5 +++++ build_release_windows.bat | 45 ++++++++++++++++++++++++++++++++++++--- 2 files changed, 47 insertions(+), 3 deletions(-) diff --git a/FlightGear.iss b/FlightGear.iss index 94cf43e..76ffabf 100755 --- a/FlightGear.iss +++ b/FlightGear.iss @@ -21,10 +21,12 @@ #include "InstallConfig.iss" #define InstallDir32 "X:\install\msvc140" +#define InstallCompositor32 "X:\install\msvc140\compositor" #define OSGInstallDir InstallDir32 + "\OpenSceneGraph" #define OSGPluginsDir OSGInstallDir + "\bin\osgPlugins-" + OSGVersion #define InstallDir64 "X:\install\msvc140-64" +#define InstallCompositor64 "X:\install\msvc140-64\compositor" #define OSG64InstallDir InstallDir64 + "\OpenSceneGraph" #define OSG64PluginsDir OSG64InstallDir + "\bin\osgPlugins-" + OSGVersion @@ -74,6 +76,7 @@ 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: "{#InstallCompositor32}\bin\fgfs.exe"; DestDir: "{app}\bin"; DestName: "fgfs-compositor.exe"; Excludes: "{#ExcludedBinaries}"; 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 @@ -89,6 +92,7 @@ Source: "{#ThirdPartyDir}\3rdParty\bin\event_core.dll"; DestDir: "{app}\bin"; Ch ; 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 @@ -192,6 +196,7 @@ 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 0ec0806..ce970fe 100755 --- a/build_release_windows.bat +++ b/build_release_windows.bat @@ -20,6 +20,8 @@ SET OSG64=%WORKSPACE%\install\msvc140-64\OpenSceneGraph REM 32bits md build-sg32 md build-fg32 +md build-fg32-compositor + cd build-sg32 cmake ..\simgear -G "Visual Studio 14" ^ -DMSVC_3RDPARTY_ROOT=%WORKSPACE%/windows-3rd-party/msvc140 ^ @@ -33,12 +35,28 @@ cd ..\build-fg32 cmake ..\flightgear -G "Visual Studio 14" ^ -DMSVC_3RDPARTY_ROOT=%WORKSPACE%/windows-3rd-party/msvc140 ^ -DCMAKE_INSTALL_PREFIX:PATH=%WORKSPACE%/install/msvc140 ^ - -DCMAKE_PREFIX_PATH:PATH=%WORKSPACE%/install/msvc140/OpenSceneGraph ^ + -DCMAKE_PREFIX_PATH:PATH=%OSG32% ^ -DBOOST_ROOT=%WORKSPACE%/windows-3rd-party ^ -DOSG_FSTREAM_EXPORT_FIXED=1 ^ -DCMAKE_PREFIX_PATH=%QT5SDK32%;%OSG32% ^ -DFG_BUILD_TYPE=%FGBUILDTYPE% ^ - -DENABLE_SWIFT:BOOL=ON + -DENABLE_SWIFT:BOOL=ON ^ + -DENABLE_COMPOSITOR:BOOL=OFF +cmake --build . --config RelWithDebInfo --target INSTALL + +md %WORKSPACE%/install/msvc140/compositor + +cd ..\build-fg32-compositor +cmake ..\flightgear -G "Visual Studio 14" ^ + -DMSVC_3RDPARTY_ROOT=%WORKSPACE%/windows-3rd-party/msvc140 ^ + -DCMAKE_INSTALL_PREFIX:PATH=%WORKSPACE%/install/msvc140/compositor ^ + -DCMAKE_PREFIX_PATH:PATH=%OSG32%; %WORKSPACE%/install/msvc140/ ^ + -DBOOST_ROOT=%WORKSPACE%/windows-3rd-party ^ + -DOSG_FSTREAM_EXPORT_FIXED=1 ^ + -DCMAKE_PREFIX_PATH=%QT5SDK32%;%OSG32% ^ + -DFG_BUILD_TYPE=%FGBUILDTYPE% ^ + -DENABLE_SWIFT:BOOL=ON ^ + -DENABLE_COMPOSITOR:BOOL=ON cmake --build . --config RelWithDebInfo --target INSTALL cd .. @@ -46,6 +64,7 @@ cd .. REM 64 bits md build-sg64 md build-fg64 +md build-fg64-compositor cd build-sg64 cmake ..\SimGear -G "Visual Studio 14 Win64" ^ @@ -64,15 +83,32 @@ cmake ..\flightgear -G "Visual Studio 14 Win64" ^ -DCMAKE_PREFIX_PATH=%QT5SDK64%;%OSG64% ^ -DOSG_FSTREAM_EXPORT_FIXED=1 ^ -DFG_BUILD_TYPE=%FGBUILDTYPE% ^ - -DENABLE_SWIFT:BOOL=ON + -DENABLE_SWIFT:BOOL=ON ^ + -DENABLE_COMPOSITOR:BOOL=OFF cmake --build . --config RelWithDebInfo --target INSTALL +md %WORKSPACE%/install/msvc140-64/compositor + + +cd ..\build-fg64-compositor +cmake ..\flightgear -G "Visual Studio 14 Win64" ^ + -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 %QT5SDK32%\bin\windeployqt --release --list target --qmldir %QMLDIR% %WORKSPACE%/install/msvc140/bin/fgfs.exe +%QT5SDK32%\bin\windeployqt --release --list target --qmldir %QMLDIR% %WORKSPACE%/install/msvc140/compositor/bin/fgfs.exe %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% @@ -84,12 +120,15 @@ REM ensure output dir is clean since we upload the entirety of it rmdir /S /Q output SET FGFS_PDB=src\Main\RelWithDebInfo\fgfs.pdb + SET SENTRY_ORG=flightgear SET SENTRY_PROJECT=flightgear REM ensure SENTRY_AUTH_TOKEN is set in the environment sentry-cli upload-dif %WORKSPACE%\build-fg32\%FGFS_PDB% sentry-cli upload-dif %WORKSPACE%\build-fg64\%FGFS_PDB% +sentry-cli upload-dif %WORKSPACE%\build-fg32-compositor\%FGFS_PDB% +sentry-cli upload-dif %WORKSPACE%\build-fg64-compositor\%FGFS_PDB% REM indirect way to get command output into an environment variable set PATH=%OSG32%\bin;%PATH%