Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
C
CI Tooling
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
2
Merge Requests
2
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Sysadmin
CI Tooling
Commits
faf7b634
Commit
faf7b634
authored
Jan 27, 2020
by
Ben Cooksley
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Switch Windows builds to use Ninja instead of JOM - hopefully this will improve performance a bit
parent
4d96bd9a
Pipeline
#13947
skipped with stage
Changes
3
Pipelines
1
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
3 deletions
+3
-3
helpers/compile-build.py
helpers/compile-build.py
+1
-1
helpers/helperslib/BuildSystem.py
helpers/helperslib/BuildSystem.py
+1
-1
helpers/install-build.py
helpers/install-build.py
+1
-1
No files found.
helpers/compile-build.py
View file @
faf7b634
...
...
@@ -31,7 +31,7 @@ makeCommand = "make -j {cpuCount} -l {maximumLoad}"
# Windows is a bit special though
if
sys
.
platform
==
'win32'
:
# We use NMake on Windows at the moment
makeCommand
=
"
jom
"
makeCommand
=
"
ninja -j {cpuCount} -l {maximumLoad}
"
# FreeBSD also likes to do things slightly different
if
sys
.
platform
==
'freebsd12'
:
makeCommand
=
"gmake -j {cpuCount} -l {maximumLoad}"
...
...
helpers/helperslib/BuildSystem.py
View file @
faf7b634
...
...
@@ -77,7 +77,7 @@ class CMake(object):
# Are we on Windows?
if
sys
.
platform
==
'win32'
:
# We want a NMake based build, rather than the default MSBuild
cmakeCommand
.
append
(
'-G "N
Make Makefiles JOM
"'
)
cmakeCommand
.
append
(
'-G "N
inja
"'
)
# Are we building for Android?
if
'ANDROID_NDK'
in
buildEnvironment
and
sys
.
platform
==
'linux'
:
...
...
helpers/install-build.py
View file @
faf7b634
...
...
@@ -38,7 +38,7 @@ makeCommand = "make -j {cpuCount} -l {maximumLoad} install"
# Windows is a bit special though
if
sys
.
platform
==
'win32'
:
# We use NMake on Windows at the moment
makeCommand
=
"
jom
install"
makeCommand
=
"
ninja -j {cpuCount} -l {maximumLoad}
install"
# FreeBSD also likes to do things slightly different
if
sys
.
platform
==
'freebsd12'
:
makeCommand
=
"gmake -j {cpuCount} install"
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment