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.

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

MSBuildDeps: map armv8 to ARM64 platform (#11504) #11505

Merged
merged 7 commits into from Jun 28, 2022

Conversation

markferry
Copy link
Contributor

@markferry markferry commented Jun 22, 2022

Changelog: Feature: map armv8 arch to ARM64 MSBuild platform in MSBuildDeps generator.

Docs: Omit

  • Refer to the issue that supports this Pull Request.
  • If the issue has missing info, explain the purpose/use case/pain/need that covers this Pull Request.
  • I've read the Contributing guide.
  • I've followed the PEP8 style guides for Python code.
  • I've opened another PR in the Conan docs repo to the develop branch, documenting this one.

Note: By default this PR will skip the slower tests and will use a limited set of python versions. Check here how to increase the testing level by writing some tags in the current PR body text.

@CLAassistant
Copy link

CLAassistant commented Jun 22, 2022

CLA assistant check
All committers have signed the CLA.

@markferry
Copy link
Contributor Author

Needs a testcase...

Copy link
Member

@memsharded memsharded left a comment

Choose a reason for hiding this comment

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

Thanks for contributing.

Better please add the full one:

{"x86": "Win32",
                    "x86_64": "x64",
                    "armv7": "ARM",
                    "armv8": "ARM64"}.get(...)

There is an instance of this in CMakeToolchain, maybe we should factorize it (but that can be done later, just focus on getting this right).

For tests, it is enough to add an integration test, don't hesitate to ask for guidance if you need it.

@franramirez688 franramirez688 added this to the 1.50 milestone Jun 22, 2022
@franramirez688 franramirez688 linked an issue Jun 22, 2022 that may be closed by this pull request
1 task
@markferry
Copy link
Contributor Author

There is an instance of this in CMakeToolchain, maybe we should factorize it (but that can be done later, just focus on getting this right).

Yup, seems beyond a reasonable refactoring threshold:

conan/tools/cmake/toolchain/blocks.py :747 col 31| "armv8": "ARM64"}.get(arch)
conan/tools/microsoft/msbuild.py:16 col 23| 'armv8': 'ARM64'}.get(str(arch))
conans/client/build/cmake_flags.py:104 col 27| "armv8": "ARM64"}.get(arch)
conans/client/build/msbuild.py:61 col 79| msvc_arch = {'x86': 'x86', 'x86_64': 'x64', 'armv7': 'ARM', 'armv8': 'ARM64'}
conans/client/build/msbuild.py:136 col 32| 'armv8': 'ARM64'}
conans/test/functional/layout/test_build_system_layout_helpers.py:38 col 46| subfolders_arch = {"armv7": "ARM", "armv8": "ARM64", "x86": None, "x86_64": "x64"}

@@ -12,6 +12,13 @@
VALID_LIB_EXTENSIONS = (".so", ".lib", ".a", ".dylib", ".bc")


def msbuild_arch(arch):
return {'x86': 'x86',
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
return {'x86': 'x86',
return {'x86': 'Win32',

I think this is the right one, and the reason the unit test is failing

Copy link
Contributor Author

Choose a reason for hiding this comment

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

🤦

Copy link
Member

Choose a reason for hiding this comment

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

You also need to check the CLA signing above, please

@markferry
Copy link
Contributor Author

Testcase to follow.

@markferry markferry marked this pull request as draft June 23, 2022 16:56
@markferry
Copy link
Contributor Author

Testcase to follow.

Will pick this up again on Monday

@markferry
Copy link
Contributor Author

markferry commented Jun 27, 2022

For tests, it is enough to add an integration test, don't hesitate to ask for guidance if you need it.

Something like this fd48992?

@memsharded
Copy link
Member

For tests, it is enough to add an integration test, don't hesitate to ask for guidance if you need it.

Something like this fd48992?

Yes, looks good!

@memsharded memsharded marked this pull request as ready for review June 27, 2022 21:16
@markferry
Copy link
Contributor Author

@memsharded memsharded merged commit fa52c51 into conan-io:develop Jun 28, 2022
@memsharded
Copy link
Member

Yes, don't worry, already merged, it will be in 1.50.
Thanks very much for contributing to Conan!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[feature] Add armv8 support to MSBuildDeps generator
4 participants