Skip to content
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

Jump to bottom

Enable using the Ninja generator instead of Visual Studio on Windows builds. #41897

Merged
merged 65 commits into from
Nov 2, 2020
Merged

Enable using the Ninja generator instead of Visual Studio on Windows builds. #41897

merged 65 commits into from
Nov 2, 2020

Commits on Jan 9, 2020

  1. Move DacTableGen out of the CMake build and into tools-local.

    @jkoritzinsky
    jkoritzinsky committed Jan 9, 2020
    Configuration menu
    Copy the full SHA
    cad3f29 View commit details
    Browse the repository at this point in the history

Commits on Mar 12, 2020

  1. Merge branch 'master' of https://github.com/dotnet/runtime into dacta… 

    …blegen-csproj
    @jkoritzinsky
    jkoritzinsky committed Mar 12, 2020
    Configuration menu
    Copy the full SHA
    e921ecc View commit details
    Browse the repository at this point in the history

Commits on Mar 17, 2020

  1. Attempt: usenmakefiles means ninja.

    @jkoritzinsky
    jkoritzinsky committed Mar 17, 2020
    Configuration menu
    Copy the full SHA
    a69c346 View commit details
    Browse the repository at this point in the history

Commits on Mar 18, 2020

  1. Make changes to Windows build to support non-VS generators like ninja.

    @jkoritzinsky
    jkoritzinsky committed Mar 18, 2020
    Configuration menu
    Copy the full SHA
    d1b12b5 View commit details
    Browse the repository at this point in the history

  2. Use CMake 3.16 PCHs.

    @jkoritzinsky
    jkoritzinsky committed Mar 18, 2020
    Configuration menu
    Copy the full SHA
    df589ef View commit details
    Browse the repository at this point in the history

  3. Remove explicit process count.

    @jkoritzinsky
    jkoritzinsky committed Mar 18, 2020
    Configuration menu
    Copy the full SHA
    0524739 View commit details
    Browse the repository at this point in the history

Commits on Aug 24, 2020

  1. Build and run DacTableGen via the .NET CLI we pull down for the build… 

    … instead of via CMake.
    @jkoritzinsky
    jkoritzinsky committed Aug 24, 2020
    Configuration menu
    Copy the full SHA
    e99246f View commit details
    Browse the repository at this point in the history

  2. Update configurecompiler.cmake to specify language (needed for Ninja). 

    Signed-off-by: Jeremy Koritzinsky <jekoritz@microsoft.com>
    @jkoritzinsky
    jkoritzinsky committed Aug 24, 2020
    Configuration menu
    Copy the full SHA
    03140d8 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'ninja-windows' of github.com:jkoritzinsky/runtime into … 

    …ninja-windows
    @jkoritzinsky
    jkoritzinsky committed Aug 24, 2020
    Configuration menu
    Copy the full SHA
    9bdf0f1 View commit details
    Browse the repository at this point in the history

  4. Get Ninja build working again.

    @jkoritzinsky
    jkoritzinsky committed Aug 24, 2020
    Configuration menu
    Copy the full SHA
    417b07a View commit details
    Browse the repository at this point in the history

  5. Merge branch 'master' of https://github.com/dotnet/runtime into ninja… 

    …-windows
    @jkoritzinsky
    jkoritzinsky committed Aug 24, 2020
    Configuration menu
    Copy the full SHA
    db7454a View commit details
    Browse the repository at this point in the history

Commits on Aug 31, 2020

  1. Pass configuration to cmake configure step for Ninja build.

    @jkoritzinsky
    jkoritzinsky committed Aug 31, 2020
    Configuration menu
    Copy the full SHA
    b70eeca View commit details
    Browse the repository at this point in the history

  2. Rename flag

    @jkoritzinsky
    jkoritzinsky committed Aug 31, 2020
    Configuration menu
    Copy the full SHA
    36cc91e View commit details
    Browse the repository at this point in the history

  3. Fix configure step for cross-arch native build 

    Signed-off-by: Jeremy Koritzinsky <jekoritz@microsoft.com>
    @jkoritzinsky
    jkoritzinsky committed Aug 31, 2020
    Configuration menu
    Copy the full SHA
    fe484c9 View commit details
    Browse the repository at this point in the history

  4. Support building via Ninja for coreclr via an MSBuild property 

    Signed-off-by: Jeremy Koritzinsky <jekoritz@microsoft.com>
    @jkoritzinsky
    jkoritzinsky committed Aug 31, 2020
    Configuration menu
    Copy the full SHA
    cba81df View commit details
    Browse the repository at this point in the history

Commits on Sep 1, 2020

  1. Implement support for opening the CoreCLR solution in VS via the -vs … 

    …flag.
    @jkoritzinsky
    jkoritzinsky committed Sep 1, 2020
    Configuration menu
    Copy the full SHA
    c20b356 View commit details
    Browse the repository at this point in the history

  2. Fix setting generator to Ninja.

    @jkoritzinsky
    jkoritzinsky committed Sep 1, 2020
    Configuration menu
    Copy the full SHA
    86f5f90 View commit details
    Browse the repository at this point in the history

Commits on Sep 3, 2020

  1. Merge libraries gen-buildsys-win.bat with runtime gen-buildsys.cmd to… 

    … share windows cmake configure infra.
    @jkoritzinsky
    jkoritzinsky committed Sep 3, 2020
    Configuration menu
    Copy the full SHA
    a2478cc View commit details
    Browse the repository at this point in the history

  2. Enable building libraries native build with ninja.

    @jkoritzinsky
    jkoritzinsky committed Sep 3, 2020
    Configuration menu
    Copy the full SHA
    ca84dd2 View commit details
    Browse the repository at this point in the history

  3. Centralize setting CMAKE_SYSTEM_VERSION for windows builds. 

    Signed-off-by: Jeremy Koritzinsky <jekoritz@microsoft.com>
    @jkoritzinsky
    jkoritzinsky committed Sep 3, 2020
    Configuration menu
    Copy the full SHA
    3b17211 View commit details
    Browse the repository at this point in the history

  4. Update host build to use shared gen-buildsys.cmd

    @jkoritzinsky
    jkoritzinsky committed Sep 3, 2020
    Configuration menu
    Copy the full SHA
    8422b09 View commit details
    Browse the repository at this point in the history

Commits on Sep 4, 2020

  1. Fix multi-config generator detection. 

    Signed-off-by: Jeremy Koritzinsky <jekoritz@microsoft.com>
    @jkoritzinsky
    jkoritzinsky committed Sep 4, 2020
    Configuration menu
    Copy the full SHA
    885974e View commit details
    Browse the repository at this point in the history

  2. Exit with success when we build successfully. 

    Signed-off-by: Jeremy Koritzinsky <jekoritz@microsoft.com>
    @jkoritzinsky
    jkoritzinsky committed Sep 4, 2020
    Configuration menu
    Copy the full SHA
    a8feb74 View commit details
    Browse the repository at this point in the history

  3. Enable and fix up Ninja build for hosts. 

    Signed-off-by: Jeremy Koritzinsky <jekoritz@microsoft.com>
    @jkoritzinsky
    jkoritzinsky committed Sep 4, 2020
    Configuration menu
    Copy the full SHA
    e7b9280 View commit details
    Browse the repository at this point in the history

  4. Only link delayimp.lib on Windows 

    Signed-off-by: Jeremy Koritzinsky <jekoritz@microsoft.com>
    @jkoritzinsky
    jkoritzinsky committed Sep 4, 2020
    Configuration menu
    Copy the full SHA
    6bcaec4 View commit details
    Browse the repository at this point in the history

  5. Remove "overriding /W3 with /W1" warning in Ninja build of hosts by t… 

    …urning on /W3 and disabling any new warnings we hit.
    @jkoritzinsky
    jkoritzinsky committed Sep 4, 2020
    Configuration menu
    Copy the full SHA
    cb1f6a1 View commit details
    Browse the repository at this point in the history

  6. Reduce command line override warnings by adopting the MSVC_RUNTIME_LI… 

    …BRARY abstraction feature in CMake 3.14+ (below the minimum requirement on Windows).
    @jkoritzinsky
    jkoritzinsky committed Sep 4, 2020
    Configuration menu
    Copy the full SHA
    03c4cc9 View commit details
    Browse the repository at this point in the history

Commits on Sep 8, 2020

  1. Use the delayed expansion syntax to correctly pass in the config to c… 

    …make.
    @jkoritzinsky
    jkoritzinsky committed Sep 8, 2020
    Configuration menu
    Copy the full SHA
    0378122 View commit details
    Browse the repository at this point in the history

  2. Move all usages of MSVC runtime library selection to the CMake abstra… 

    …ction to reduce console spew about overridden flags.

Signed-off-by: Jeremy Koritzinsky <jekoritz@microsoft.com>
    @jkoritzinsky
    jkoritzinsky committed Sep 8, 2020
    Configuration menu
    Copy the full SHA
    195fa3e View commit details
    Browse the repository at this point in the history

  3. Condition the rest of the compiler options correctly so they don't sh… 

    …ow up as invalid parameter warnings for assembly builds.
    @jkoritzinsky
    jkoritzinsky committed Sep 8, 2020
    Configuration menu
    Copy the full SHA
    7c7c168 View commit details
    Browse the repository at this point in the history

Commits on Sep 9, 2020

  1. Correctly build DIALib and DacTableGen as AnyCPU

    @jkoritzinsky
    jkoritzinsky committed Sep 9, 2020
    Configuration menu
    Copy the full SHA
    5dc02c0 View commit details
    Browse the repository at this point in the history

  2. Fix WRITE_BARRIER_CHECK define 

    Signed-off-by: Jeremy Koritzinsky <jekoritz@microsoft.com>
    @jkoritzinsky
    jkoritzinsky committed Sep 9, 2020
    Configuration menu
    Copy the full SHA
    86019b9 View commit details
    Browse the repository at this point in the history

  3. Fix passing arch for MSBuild build. 

    Signed-off-by: Jeremy Koritzinsky <jekoritz@microsoft.com>
    @jkoritzinsky
    jkoritzinsky committed Sep 9, 2020
    Configuration menu
    Copy the full SHA
    823cef9 View commit details
    Browse the repository at this point in the history

  4. Configure ASM compiler command line format in configurecompiler.cmake… 

    … and use CMake's assembly compilation step to build ASM files for ARM/ARM64 instead of manually building them and adding the generated files as additional sources.
    @jkoritzinsky
    jkoritzinsky committed Sep 9, 2020
    Configuration menu
    Copy the full SHA
    3e60c98 View commit details
    Browse the repository at this point in the history

  5. Cleanup after fixing ARM/ARM64 support.

    @jkoritzinsky
    jkoritzinsky committed Sep 9, 2020
    Configuration menu
    Copy the full SHA
    4d81fe8 View commit details
    Browse the repository at this point in the history

  6. Rename variable

    @jkoritzinsky
    jkoritzinsky committed Sep 9, 2020
    Configuration menu
    Copy the full SHA
    8286fba View commit details
    Browse the repository at this point in the history

  7. Merge branch 'master' into ninja-windows

    @jkoritzinsky
    jkoritzinsky committed Sep 9, 2020
    Configuration menu
    Copy the full SHA
    0d9205a View commit details
    Browse the repository at this point in the history

Commits on Sep 10, 2020

  1. Condition PCH's for C++-only as needed to fix using them on non-Windo… 

    …ws (where we compile C as C instead of as C++).
    @jkoritzinsky
    jkoritzinsky committed Sep 10, 2020
    Configuration menu
    Copy the full SHA
    82f0491 View commit details
    Browse the repository at this point in the history

  2. Fix CoreCLR native test build on windows to point to new gen-buildsys… 

    … location.
    @jkoritzinsky
    jkoritzinsky committed Sep 10, 2020
    Configuration menu
    Copy the full SHA
    6541aeb View commit details
    Browse the repository at this point in the history

Commits on Sep 14, 2020

  1. Add missing compilation options in Ninja build that are implicitly de… 

    …fined in the MSBuild build.
    @jkoritzinsky
    jkoritzinsky committed Sep 14, 2020
    Configuration menu
    Copy the full SHA
    ca101e9 View commit details
    Browse the repository at this point in the history

Commits on Sep 29, 2020

  1. Merge branch 'master' into ninja-windows

    @jkoritzinsky
    jkoritzinsky committed Sep 29, 2020
    Configuration menu
    Copy the full SHA
    78fd252 View commit details
    Browse the repository at this point in the history

Commits on Sep 30, 2020

  1. Disable analyzers for DacTableGen. Remove /MAP linker flag (that's fo… 

    …r local testing).
    @jkoritzinsky
    jkoritzinsky committed Sep 30, 2020
    Configuration menu
    Copy the full SHA
    18acb6f View commit details
    Browse the repository at this point in the history

Commits on Oct 7, 2020

  1. Upgrade to CMake 3.16.4

    @jkoritzinsky
    jkoritzinsky authored Oct 7, 2020
    Configuration menu
    Copy the full SHA
    d38ae03 View commit details
    Browse the repository at this point in the history

Commits on Oct 19, 2020

  1. Merge branch 'master' of github.com:dotnet/runtime into ninja-windows

    @jkoritzinsky
    jkoritzinsky committed Oct 19, 2020
    Configuration menu
    Copy the full SHA
    5051f71 View commit details
    Browse the repository at this point in the history

  2. Don't warn on unused variables in CMake (these usually vary on platfo… 

    …rm/config)

Signed-off-by: Jeremy Koritzinsky <jekoritz@microsoft.com>
    @jkoritzinsky
    jkoritzinsky committed Oct 19, 2020
    Configuration menu
    Copy the full SHA
    43e8a7b View commit details
    Browse the repository at this point in the history

Commits on Oct 20, 2020

  1. Manually compile ARM and ARM64 asm files when using the VS generator … 

    …since it doesn't support emitting MARMASM item types in projects (and as a result cannot compile ARM or ARM64 asm without assistance).
    @jkoritzinsky
    jkoritzinsky committed Oct 20, 2020
    Configuration menu
    Copy the full SHA
    a34284e View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' of github.com:dotnet/runtime into ninja-windows

    @jkoritzinsky
    jkoritzinsky committed Oct 20, 2020
    Configuration menu
    Copy the full SHA
    ccd66f5 View commit details
    Browse the repository at this point in the history

  3. Enable CMake policy in test build to use CMAKE_MSVC_RUNTIME_LIBRARY v… 

    …ariable.
    @jkoritzinsky
    jkoritzinsky committed Oct 20, 2020
    Configuration menu
    Copy the full SHA
    992817d View commit details
    Browse the repository at this point in the history

  4. Merge branch 'ninja-windows' of github.com:jkoritzinsky/runtime; bran… 

    …ch 'master' of github.com:dotnet/runtime into ninja-windows
    @jkoritzinsky
    jkoritzinsky committed Oct 20, 2020
    Configuration menu
    Copy the full SHA
    7db1ecb View commit details
    Browse the repository at this point in the history

Commits on Oct 21, 2020

  1. Update initially disabled warnings in host.

    @jkoritzinsky
    jkoritzinsky committed Oct 21, 2020
    Configuration menu
    Copy the full SHA
    aa79e4f View commit details
    Browse the repository at this point in the history

  2. Add -ninja arg to root scripts to enable using Ninja.

    @jkoritzinsky
    jkoritzinsky committed Oct 21, 2020
    Configuration menu
    Copy the full SHA
    327b002 View commit details
    Browse the repository at this point in the history

  3. Enable using Ninja in CoreCLR CI.

    @jkoritzinsky
    jkoritzinsky committed Oct 21, 2020
    Configuration menu
    Copy the full SHA
    bc701d1 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'master' of github.com:dotnet/runtime into ninja-windows

    @jkoritzinsky
    jkoritzinsky committed Oct 21, 2020
    Configuration menu
    Copy the full SHA
    d95091e View commit details
    Browse the repository at this point in the history

  5. Try to fix passing the -ninja arg in yaml. 

    Signed-off-by: Jeremy Koritzinsky <jekoritz@microsoft.com>
    @jkoritzinsky
    jkoritzinsky committed Oct 21, 2020
    Configuration menu
    Copy the full SHA
    334293c View commit details
    Browse the repository at this point in the history

  6. Add ninja to the Windows invocation

    @jkoritzinsky
    jkoritzinsky committed Oct 21, 2020
    Configuration menu
    Copy the full SHA
    c1b3676 View commit details
    Browse the repository at this point in the history

  7. Merge branch 'master' of github.com:dotnet/runtime into ninja-windows

    @jkoritzinsky
    jkoritzinsky committed Oct 21, 2020
    Configuration menu
    Copy the full SHA
    2945f4d View commit details
    Browse the repository at this point in the history

  8. Fix 2-phase cross targeting to do one phase at a time and initialize … 

    …the VC++ environment for the correct build tools each time instead of interleaving them and relying on Visual Studio to handle the differing targets.
    @jkoritzinsky
    jkoritzinsky committed Oct 21, 2020
    Configuration menu
    Copy the full SHA
    cfc26f5 View commit details
    Browse the repository at this point in the history

Commits on Oct 22, 2020

  1. Restore old /Ox optimization setting for Release.

    @jkoritzinsky
    jkoritzinsky committed Oct 22, 2020
    Configuration menu
    Copy the full SHA
    343690e View commit details
    Browse the repository at this point in the history

  2. Fix typos, don't pass exception flags to C files.

    @jkoritzinsky
    jkoritzinsky committed Oct 22, 2020
    Configuration menu
    Copy the full SHA
    9af32b3 View commit details
    Browse the repository at this point in the history

  3. Remove unneeded pragma.

    @jkoritzinsky
    jkoritzinsky committed Oct 22, 2020
    Configuration menu
    Copy the full SHA
    61e4c81 View commit details
    Browse the repository at this point in the history

Commits on Oct 27, 2020

  1. Merge branch 'master' of github.com:dotnet/runtime into ninja-windows

    @jkoritzinsky
    jkoritzinsky committed Oct 27, 2020
    Configuration menu
    Copy the full SHA
    a437115 View commit details
    Browse the repository at this point in the history

  2. Fix .pgd file installation. 

    Signed-off-by: Jeremy Koritzinsky <jekoritz@microsoft.com>
    @jkoritzinsky
    jkoritzinsky committed Oct 27, 2020
    Configuration menu
    Copy the full SHA
    83939c6 View commit details
    Browse the repository at this point in the history

  3. Add mention of the -ninja flag in the Building CoreCLR documentation. 

    Signed-off-by: Jeremy Koritzinsky <jekoritz@microsoft.com>
    @jkoritzinsky
    jkoritzinsky committed Oct 27, 2020
    Configuration menu
    Copy the full SHA
    f95c8f6 View commit details
    Browse the repository at this point in the history

Commits on Oct 28, 2020

  1. Mention installation locations for Ninja and warn while building if C… 

    …Make is older than 3.16.0.
    @jkoritzinsky
    jkoritzinsky committed Oct 28, 2020
    Configuration menu
    Copy the full SHA
    ff80bab View commit details
    Browse the repository at this point in the history

  2. Update docs/workflow/requirements/windows-requirements.md

    @jkoritzinsky
    jkoritzinsky authored Oct 28, 2020
    Configuration menu
    Copy the full SHA
    4db3105 View commit details
    Browse the repository at this point in the history