8000 msvc compiler: Re-sort sources to compile Message Compiler files (`.mc`) first by Avasam · Pull Request #370 · pypa/distutils · GitHub
[go: up one dir, main page]
Skip to content

msvc compiler: Re-sort sources to compile Message Compiler files (.mc) first #370

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

msvc compiler: Re-sort sources to compile Message Compiler files (.mc) first #370

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
14 changes: 11 additions & 3 deletions distutils/compilers/C/msvc.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,8 @@
import subprocess
import unittest.mock as mock
import warnings
from collections.abc import Iterable
from collections.abc import Iterable, Sequence
from pathlib import Path

with contextlib.suppress(ImportError):
import winreg
Expand Down Expand Up @@ -371,17 +372,24 @@ def out_extensions(self) -> dict[str, str]:

def compile( # noqa: C901
self,
sources,
sources: Sequence[st 8000 r | os.PathLike[str]],
output_dir=None,
macros=None,
include_dirs=None,
debug=False,
extra_preargs=None,
extra_postargs=None,
depends=None,
):
) -> list[str]:
if not self.initialized:
self.initialize()

# Move .mc files to the start of the list, otherwise keep the same order
# See pypa/setuptools#4986
sources = sorted(
sources, key=lambda source: Path(source).suffix not in self._mc_extensions
)

compile_info = self._setup_compile(
output_dir, macros, include_dirs, sources, depends, extra_postargs
)
Expand Down
18 changes: 18 additions & 0 deletions distutils/compilers/C/tests/test_msvc.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
from distutils.errors import DistutilsPlatformError
from distutils.tests import support
from distutils.util import get_platform
from pathlib import Path

import pytest

Expand Down Expand Up @@ -53,6 +54,23 @@ def _get_vcvars_spec(host_platform, platform):
monkeypatch.setattr(msvc, '_get_vcvars_spec', _get_vcvars_spec)
compiler.initialize(plat_name)

@pytest.mark.skipif(
not sysconfig.get_platform().startswith("win"),
reason="Only run test for non-mingw Windows platforms",
)
def test_sources_compilation_order(self, tmp_path: Path) -> None:
# We expect the the mc files to be compiled first, but otherwise keep the same order
test_sources = [tmp_path / file for file in ("b.cpp", "y.mc", "a.c", "z.mc")]
expected_objects = [
str(tmp_path / obj) for obj in ("y.res", "z.res", "b.obj", "a.obj")
]
for source in test_sources:
source.write_text("")

compiler = msvc.Compiler()
objects = compiler.compile(test_sources)
assert objects == expected_objects

@needs_winreg
def test_get_vc_env_unicode(self):
test_var = 'ṰḖṤṪ┅ṼẨṜ'
Expand Down
Loading
0