From c3db005fd7e7933cb6d31b1b94d14409e75172b8 Mon Sep 17 00:00:00 2001 From: Jeff Norman Date: Thu, 30 Mar 2023 14:23:51 -0400 Subject: [PATCH] new Win batch files for Qt 515 added buildall-515.bat added deploy-515.bat --- Building/Windows/buildall-515.bat | 66 ++++++++++++++++++++ Building/Windows/deploy-515.bat | 100 ++++++++++++++++++++++++++++++ 2 files changed, 166 insertions(+) create mode 100644 Building/Windows/buildall-515.bat create mode 100644 Building/Windows/deploy-515.bat diff --git a/Building/Windows/buildall-515.bat b/Building/Windows/buildall-515.bat new file mode 100644 index 00000000..bb6443dc --- /dev/null +++ b/Building/Windows/buildall-515.bat @@ -0,0 +1,66 @@ +setlocal +:::@echo off +::: You must set these paths to your QT configuration +set qtpath=C:\Qt +set qtVersion=5.15.2 + +::: This file has been updated to work with Qt 5.15.2 and mingw 8.1.0 +::: +::: Build 32- and 64-bit versions of OSCAR for Windows. +::: Includes code to build BrokenGL (LegacyGFX) versions, but that option is not currently used +::: Uses Timer 4.0 - Command Line Timer - www.Gammadyne.com - to show time it takes to compile. This could be removed. +::: timer /nologo + +:::call :buildone 32 brokengl + +call :buildone 64 + +call :buildone 32 + +:::call :buildone 64 brokengl +::: timer /s /nologo +goto :eof + +::: Subroutine to build one version +:buildone +setlocal +::: timer /nologo + +set QTDIR=%qtpath%\%qtversion%\mingw81_%1 +echo QTDIR is %qtdir% + +set PATH=%qtpath%\Tools\mingw810_%1\bin;%qtpath%\%qtVersion%\mingw81_%1\bin;%PATH% +::: echo %PATH% + +set savedir=%cd% + +: Construct name of our build directory +set dirname=build-oscar-win_%1_bit +if "%2"=="brokengl" ( + set dirname=%dirname%-LegacyGFX + set extraparams=DEFINES+=BrokenGL +) +echo Build directory is %dirname% + +set basedir=..\.. +if exist %basedir%\%dirname%\nul rmdir /s /q %basedir%\%dirname% +mkdir %basedir%\%dirname% +cd %basedir%\%dirname% + +%qtpath%\%qtVersion%\mingw81_%1\bin\qmake.exe ..\oscar\oscar.pro -spec win32-g++ %extraparams% >qmake.log 2>&1 && %qtpath%\Tools\mingw810_%1\bin\mingw32-make.exe qmake_all >>qmake.log 2>&1 +%qtpath%\Tools\mingw810_%1\bin\mingw32-make.exe -j8 >make.log 2>&1 || goto :makefail + +call ..\Building\Windows\deploy.bat + +::: timer /s /nologo +echo === MAKE %1 %2 SUCCESSFUL === +cd %savedir% +endlocal +exit /b + +:makefail +endlocal +::: timer /s /nologo +echo *** MAKE %1 %2 FAILED *** +pause +exit /b \ No newline at end of file diff --git a/Building/Windows/deploy-515.bat b/Building/Windows/deploy-515.bat new file mode 100644 index 00000000..ce079c57 --- /dev/null +++ b/Building/Windows/deploy-515.bat @@ -0,0 +1,100 @@ +::: +::: Build Release and Installer subdirectories of the current shadow build directory. +::: The Release directory contains everything needed to run OSCAR. +::: The Installer directory contains a single executable -- the OSCAR installer. +::: +::: DEPLOY.BAT should be run as the last step of a QT Build Release kit. +::: QT Shadow build should be specified (this is the QT default). +::: A command line parameter is optional. Any text on the command line will be appended +::: to the file name of the installer. +::: +::: Requirements: +::: Inno Setup 6 - http://www.jrsoftware.org/isinfo.php, installed to default Program Files (x86) location +::: gawk - somewhere in the PATH or in Git for Windows installed in its default lolcation +::: +::: Deploy.bat resides in .../OSCAR-code/Nuilding/Windows, along with +::: buildinstall.iss -- script for Inno Setup to create installer +::: getBuildInfo.awk -- gawk script for extracting version fields from various files +::: setup.ico -- Icon to be used for the installer. +::: +::: When building a release version in QT, QT will start this batch file which will prepare +::: additional files, run WinDeployQt, and create an installer. +::: +@echo off +setlocal + +::: toolDir is where the Windows install/deploy tools are located +set toolDir=%~dp0 +:::echo tooldir is %toolDir% + +::: Set shadowBuildDir and sourceDir for oscar_qt.pro vs oscar\oscar.pro projects +if exist ..\oscar-code\oscar\oscar.pro ( + ::: oscar_QT.pro + set sourceDir=..\oscar-code\oscar + set shadowBuildDir=%cd%\oscar +) else ( + ::: oscar\oscar.pro + set sourceDir=..\oscar + set shadowBuildDir=%cd% +) +echo sourceDir is %sourceDir% +echo shadowBuildDir is %shadowBuildDir% + +::: Now copy the base installation control file + +copy %toolDir%buildInstall.iss %shadowBuildDir% || exit 45 +copy %toolDir%setup.ico %shadowBuildDir% || exit 46 +:::copy %toolDir%use*.reg %shadowBuildDir% || exit 47 + +::: +::: If gawk.exe is in the PATH, use it. If not, add Git mingw tools (awk) to path. They cannot +::: be added to global path as they break CMD.exe (find etc.) +where /q gawk.exe || set PATH=%PATH%;%ProgramW6432%\Git\usr\bin + +::: Create and copy installer control files +::: Create file with all version numbers etc. ready for use by buildinstall.iss +::: Extract the version info from various header files using gawk and +::: #define fields for each data item in buildinfo.iss which will be +::: used by the installer script. +where /q gawk.exe || set PATH=%PATH%;%ProgramW6432%\Git\usr\bin +echo ; This script auto-generated by DEPLOY.BAT >%shadowBuildDir%\buildinfo.iss +gawk -f %toolDir%getBuildInfo.awk %sourcedir%\VERSION >>%shadowBuildDir%\buildInfo.iss || exit 60 +gawk -f %toolDir%getBuildInfo.awk %sourcedir%\git_info.h >>%shadowBuildDir%\buildInfo.iss || exit 62 +echo %shadowBuildDir% | gawk -f %toolDir%getBuildInfo.awk >>%shadowBuildDir%\buildInfo.iss || exit 63 +echo #define MySuffix "%1" >>%shadowBuildDir%\buildinfo.iss || exit 64 +:::echo #define MySourceDir "%sourcedir%" >>%shadowBuildDir%\buildinfo.iss + +::: Create Release directory and subdirectories +if exist %shadowBuildDir%\Release\*.* rmdir /s /q %shadowBuildDir%\Release +mkdir %shadowBuildDir%\Release +cd %shadowBuildDir%\Release +copy %shadowBuildDir%\oscar.exe . || exit 71 +:::copy %shadowBuildDir%\use*.reg . || exit 72 + +::: Now in Release subdirectory +::: If QT created a help directory, copy it. But it might not have if "helpless" option was set +if exist Help\*.* rmdir /s /q Help +mkdir Help +if exist ..\help\*.qch copy ..\help Help + +if exist Html\*.* rmdir /s /q Html +mkdir Html +copy ..\html html || exit 80 + +if exist Translations\*.* rmdir /s /q Translations +mkdir Translations +copy ..\translations Translations || exit 84 + +::: Run deployment tool +windeployqt.exe --force --compiler-runtime --no-translations --verbose 1 OSCAR.exe || exit 87 + +::: Clean up unwanted translation files +:::For unknown reasons, Win64 build copies the .ts files into the release directory, while Win32 does not +if exist Translations\*.ts del /q Translations\*.ts + +::: Create installer +cd .. +:::"%ProgramFiles(x86)%\Inno Setup 6\compil32" /cc BuildInstall.iss +"%ProgramFiles(x86)%\Inno Setup 6\iscc" /Q BuildInstall.iss + +endlocal \ No newline at end of file