From 90f951a899d8b617994627152cf51f676b7bce9c Mon Sep 17 00:00:00 2001 From: Automatic Release Builder Date: Thu, 15 Oct 2020 12:18:55 +0100 Subject: [PATCH] Update VS version for nightly Windows builds Disable 32-bit builds for the moment. --- FlightGear.iss | 60 +-------------------------------------- build_release_windows.bat | 56 +++++------------------------------- 2 files changed, 8 insertions(+), 108 deletions(-) diff --git a/FlightGear.iss b/FlightGear.iss index f2ab6e5..5a848f1 100755 --- a/FlightGear.iss +++ b/FlightGear.iss @@ -20,11 +20,6 @@ #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" @@ -60,7 +55,7 @@ WizardSmallImageFile=X:\flightgear\package\windows\setupsmall.bmp VersionInfoCompany=The FlightGear Team UninstallDisplayIcon={app}\bin\fgfs.exe ArchitecturesInstallIn64BitMode=x64 -ArchitecturesAllowed=x86 x64 +ArchitecturesAllowed=x64 ; Sign tool must be defined in the Inno Setup GUI, to avoid ; exposing the certificate password @@ -73,22 +68,7 @@ Name: "desktopicon"; Description: "Create a &desktop icon"; GroupDescription: "A [Files] ; NOTE: run subst X: F:\ (or whatever path the expanded tree resides at) ;Source: "X:\*.txt"; DestDir: "{app}"; Flags: ignoreversion -; 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 - -Source: "{#ThirdPartyDir}\3rdParty\bin\zlib.dll"; DestDir: "{app}\bin"; Check: not Is64BitInstallMode -Source: "{#ThirdPartyDir}\3rdParty\bin\OpenAL32.dll"; DestDir: "{app}\bin"; Check: not Is64BitInstallMode -Source: "{#ThirdPartyDir}\3rdParty\bin\libpng.dll"; DestDir: "{app}\bin"; Check: not Is64BitInstallMode -Source: "{#ThirdPartyDir}\3rdParty\bin\libcurl.dll"; DestDir: "{app}\bin"; Check: not Is64BitInstallMode -Source: "{#ThirdPartyDir}\3rdParty\bin\libintl-8.dll"; DestDir: "{app}\bin"; Check: not Is64BitInstallMode -Source: "{#ThirdPartyDir}\3rdParty\bin\sentry.dll"; DestDir: "{app}\bin"; Check: not Is64BitInstallMode -Source: "{#ThirdPartyDir}\3rdParty\bin\crashpad_handler.exe"; DestDir: "{app}\bin"; Check: not Is64BitInstallMode -Source: "{#ThirdPartyDir}\3rdParty\bin\dbus-1-3.dll"; DestDir: "{app}\bin"; Check: not Is64BitInstallMode -Source: "{#ThirdPartyDir}\3rdParty\bin\event_core.dll"; DestDir: "{app}\bin"; Check: not Is64BitInstallMode ; 64 bits install Source: "{#InstallDir64}\bin\*.*"; DestDir: "{app}\bin"; Excludes: "{#ExcludedBinaries}"; Flags: ignoreversion recursesubdirs; Check: Is64BitInstallMode @@ -111,44 +91,6 @@ Source: "{#ThirdPartyDir}\3rdParty.x64\bin\event_core.dll"; DestDir: "{app}\bin" Source: "X:\fgdata\*.*"; DestDir: "{app}\data"; Flags: ignoreversion recursesubdirs skipifsourcedoesntexist #endif -; 32 bits install -Source: "{#OSGInstallDir}\bin\osg{#OSGSoNumber}-osg.dll"; DestDir: "{app}\bin"; Check: not Is64BitInstallMode -Source: "{#OSGInstallDir}\bin\osg{#OSGSoNumber}-osgDB.dll"; DestDir: "{app}\bin"; Check: not Is64BitInstallMode -Source: "{#OSGInstallDir}\bin\osg{#OSGSoNumber}-osgGA.dll"; DestDir: "{app}\bin"; Check: not Is64BitInstallMode -Source: "{#OSGInstallDir}\bin\osg{#OSGSoNumber}-osgParticle.dll"; DestDir: "{app}\bin"; Check: not Is64BitInstallMode -Source: "{#OSGInstallDir}\bin\osg{#OSGSoNumber}-osgText.dll"; DestDir: "{app}\bin"; Check: not Is64BitInstallMode -Source: "{#OSGInstallDir}\bin\osg{#OSGSoNumber}-osgUtil.dll"; DestDir: "{app}\bin"; Check: not Is64BitInstallMode -Source: "{#OSGInstallDir}\bin\osg{#OSGSoNumber}-osgViewer.dll"; DestDir: "{app}\bin"; Check: not Is64BitInstallMode -Source: "{#OSGInstallDir}\bin\osg{#OSGSoNumber}-osgSim.dll"; DestDir: "{app}\bin"; Check: not Is64BitInstallMode -Source: "{#OSGInstallDir}\bin\osg{#OSGSoNumber}-osgFX.dll"; DestDir: "{app}\bin"; Check: not Is64BitInstallMode -Source: "{#OSGInstallDir}\bin\ot{#OTSoNumber}-OpenThreads.dll"; DestDir: "{app}\bin"; Check: not Is64BitInstallMode - -Source: "{#OSGPluginsDir}\osgdb_ac.dll"; DestDir: "{app}\bin\osgPlugins-{#OSGVersion}"; Check: not Is64BitInstallMode -Source: "{#OSGPluginsDir}\osgdb_osg.dll"; DestDir: "{app}\bin\osgPlugins-{#OSGVersion}"; Check: not Is64BitInstallMode -Source: "{#OSGPluginsDir}\osgdb_osga.dll"; DestDir: "{app}\bin\osgPlugins-{#OSGVersion}"; Check: not Is64BitInstallMode -Source: "{#OSGPluginsDir}\osgdb_3ds.dll"; DestDir: "{app}\bin\osgPlugins-{#OSGVersion}"; Check: not Is64BitInstallMode -Source: "{#OSGPluginsDir}\osgdb_mdl.dll"; DestDir: "{app}\bin\osgPlugins-{#OSGVersion}"; Check: not Is64BitInstallMode -Source: "{#OSGPluginsDir}\osgdb_jpeg.dll"; DestDir: "{app}\bin\osgPlugins-{#OSGVersion}"; Check: not Is64BitInstallMode -Source: "{#OSGPluginsDir}\osgdb_rgb.dll"; DestDir: "{app}\bin\osgPlugins-{#OSGVersion}"; Check: not Is64BitInstallMode -Source: "{#OSGPluginsDir}\osgdb_png.dll"; DestDir: "{app}\bin\osgPlugins-{#OSGVersion}"; Check: not Is64BitInstallMode -Source: "{#OSGPluginsDir}\osgdb_dds.dll"; DestDir: "{app}\bin\osgPlugins-{#OSGVersion}"; Check: not Is64BitInstallMode -Source: "{#OSGPluginsDir}\osgdb_txf.dll"; DestDir: "{app}\bin\osgPlugins-{#OSGVersion}"; Check: not Is64BitInstallMode -Source: "{#OSGPluginsDir}\osgdb_tiff.dll"; DestDir: "{app}\bin\osgPlugins-{#OSGVersion}"; Check: not Is64BitInstallMode -Source: "{#OSGPluginsDir}\osgdb_freetype.dll"; DestDir: "{app}\bin\osgPlugins-{#OSGVersion}"; Check: not Is64BitInstallMode - -;Source: "{#OSGPluginsDir}\osgdb_serializers_osg.dll"; DestDir: "{app}\bin\osgPlugins-{#OSGVersion}"; Check: not Is64BitInstallMode -;Source: "{#OSGPluginsDir}\osgdb_serializers_osganimation.dll"; DestDir: "{app}\bin\osgPlugins-{#OSGVersion}"; Check: not Is64BitInstallMode -;Source: "{#OSGPluginsDir}\osgdb_serializers_osgfx.dll"; DestDir: "{app}\bin\osgPlugins-{#OSGVersion}"; Check: not Is64BitInstallMode -;Source: "{#OSGPluginsDir}\osgdb_serializers_osgmanipulator.dll"; DestDir: "{app}\bin\osgPlugins-{#OSGVersion}"; Check: not Is64BitInstallMode -;Source: "{#OSGPluginsDir}\osgdb_serializers_osgparticle.dll"; DestDir: "{app}\bin\osgPlugins-{#OSGVersion}"; Check: not Is64BitInstallMode -;Source: "{#OSGPluginsDir}\osgdb_serializers_osgshadow.dll"; DestDir: "{app}\bin\osgPlugins-{#OSGVersion}"; Check: not Is64BitInstallMode -;Source: "{#OSGPluginsDir}\osgdb_serializers_osgsim.dll"; DestDir: "{app}\bin\osgPlugins-{#OSGVersion}"; Check: not Is64BitInstallMode -;Source: "{#OSGPluginsDir}\osgdb_serializers_osgterrain.dll"; DestDir: "{app}\bin\osgPlugins-{#OSGVersion}"; Check: not Is64BitInstallMode -;Source: "{#OSGPluginsDir}\osgdb_serializers_osgtext.dll"; DestDir: "{app}\bin\osgPlugins-{#OSGVersion}"; Check: not Is64BitInstallMode -;Source: "{#OSGPluginsDir}\osgdb_serializers_osgvolume.dll"; DestDir: "{app}\bin\osgPlugins-{#OSGVersion}"; Check: not Is64BitInstallMode -;Source: "{#OSGPluginsDir}\osgdb_deprecated_osg.dll"; DestDir: "{app}\bin\osgPlugins-{#OSGVersion}"; Check: not Is64BitInstallMode -;Source: "{#OSGPluginsDir}\osgdb_deprecated_osgparticle.dll"; DestDir: "{app}\bin\osgPlugins-{#OSGVersion}"; Check: not Is64BitInstallMode - ; 64 bits install Source: "{#OSG64InstallDir}\bin\osg{#OSGSoNumber}-osg.dll"; DestDir: "{app}\bin"; Check: Is64BitInstallMode Source: "{#OSG64InstallDir}\bin\osg{#OSGSoNumber}-osgDB.dll"; DestDir: "{app}\bin"; Check: Is64BitInstallMode diff --git a/build_release_windows.bat b/build_release_windows.bat index 9d5bb4a..f6878aa 100755 --- a/build_release_windows.bat +++ b/build_release_windows.bat @@ -17,53 +17,14 @@ REM SET IS_NIGHTLY_BUILD=1 SET OSG32=%WORKSPACE%\install\msvc140\OpenSceneGraph SET OSG64=%WORKSPACE%\install\msvc140-64\OpenSceneGraph -REM 32bits -md build-sg32 -md build-fg32 -md build-fg32-compositor +SET VSGEN="Visual Studio 16 2019" -cd build-sg32 -cmake ..\simgear -G "Visual Studio 14" ^ - -DMSVC_3RDPARTY_ROOT=%WORKSPACE%/windows-3rd-party/msvc140 ^ - -DBOOST_ROOT=%WORKSPACE%/windows-3rd-party ^ - -DOSG_FSTREAM_EXPORT_FIXED=1 ^ - -DCMAKE_PREFIX_PATH:PATH=%OSG32% ^ - -DCMAKE_INSTALL_PREFIX:PATH=%WORKSPACE%/install/msvc140 -cmake --build . --config RelWithDebInfo --target INSTALL - -cd ..\build-fg32 -cmake ..\flightgear -G "Visual Studio 14" ^ - -DMSVC_3RDPARTY_ROOT=%WORKSPACE%/windows-3rd-party/msvc140 ^ - -DCMAKE_INSTALL_PREFIX:PATH=%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=OFF -cmake --build . --config RelWithDebInfo --target INSTALL - -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=%QT5SDK32%;%OSG32%;%WORKSPACE%/install/msvc140/ ^ - -DBOOST_ROOT=%WORKSPACE%/windows-3rd-party ^ - -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 64 bits md build-sg64 md build-fg64 md build-fg64-compositor cd build-sg64 -cmake ..\SimGear -G "Visual Studio 14 Win64" ^ +cmake ..\SimGear -G %VSGEN% -A x64 ^ -DMSVC_3RDPARTY_ROOT=%WORKSPACE%/windows-3rd-party/msvc140 ^ -DBOOST_ROOT=%WORKSPACE%/windows-3rd-party ^ -DOSG_FSTREAM_EXPORT_FIXED=1 ^ @@ -72,7 +33,7 @@ cmake ..\SimGear -G "Visual Studio 14 Win64" ^ cmake --build . --config RelWithDebInfo --target INSTALL cd ..\build-fg64 -cmake ..\flightgear -G "Visual Studio 14 Win64" ^ +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 ^ @@ -84,7 +45,7 @@ cmake ..\flightgear -G "Visual Studio 14 Win64" ^ cmake --build . --config RelWithDebInfo --target INSTALL cd ..\build-fg64-compositor -cmake ..\flightgear -G "Visual Studio 14 Win64" ^ +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 ^ @@ -98,8 +59,7 @@ 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 @@ -118,10 +78,8 @@ 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% +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%