Skip to content

Build: Use jom to parallelize Windows builds #2445

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
hoffie merged 1 commit into from
Mar 2, 2022
Merged

Build: Use jom to parallelize Windows builds #2445

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions autobuild/windows/autobuild_windowsinstaller_1_prepare.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ $AqtinstallVersion = "2.0.5"
$JackVersion = "1.9.17"
$Msvc32Version = "win32_msvc2019"
$Msvc64Version = "win64_msvc2019_64"
$JomVersion = "1.1.2"
Copy link
Copy Markdown
Collaborator

@pljones pljones Mar 2, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we have a documented process in place to review pinned versions from time to time?

(Don't I love coming up with unconnected issues...)

Copy link
Copy Markdown
Member Author

@hoffie hoffie Mar 2, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we have a documented process in place to review pinned versions from time to time?

Not yet, but there's at least one reminder: #2346


if ( Test-Path -Path $QtDir )
{
Expand All @@ -68,15 +69,16 @@ else
Install-Qt ${Qt32Version} ${Msvc32Version} ${QtDir}
}

choco config set cacheLocation $ChocoCacheDir
choco install --no-progress -y jom --version "${JomVersion}"


#################################
### ONLY ADD JACK IF NEEDED ###
#################################

if ($BuildOption -Eq "jackonwindows")
{
choco config set cacheLocation $ChocoCacheDir

echo "Install JACK2 64-bit..."
# Install JACK2 64-bit
choco install --no-progress -y jack --version "${JackVersion}"
Expand Down
11 changes: 10 additions & 1 deletion windows/deploy_windows.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -234,7 +234,16 @@ Function Build-App
"-o", "$BuildPath\Makefile")

Set-Location -Path $BuildPath
Invoke-Native-Command -Command "nmake" -Arguments ("$BuildConfig")
if (Get-Command "jom.exe" -ErrorAction SilentlyContinue)
{
echo "Building with jom /J ${Env:NUMBER_OF_PROCESSORS}"
Invoke-Native-Command -Command "jom" -Arguments ("/J", "${Env:NUMBER_OF_PROCESSORS}", "$BuildConfig")
}
else
{
echo "Building with nmake (install Qt jom if you want parallel builds)"
Invoke-Native-Command -Command "nmake" -Arguments ("$BuildConfig")
Comment thread
hoffie marked this conversation as resolved.
}
Invoke-Native-Command -Command "$Env:QtWinDeployPath" `
-Arguments ("--$BuildConfig", "--compiler-runtime", "--dir=$DeployPath\$BuildArch",
"$BuildPath\$BuildConfig\$AppName.exe")
Expand Down