Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[POC] MesonToolchain and GNU flags coming from dependencies (#11557)
* Added get_gnu_deps_flags. Added functional test * Trying Windows * Reversed * Fixed bad CL flags and created new MesonDeps (based on AutotoolsDeps) * Added new tests to check MesonDeps flags addtion * Extra assert * Fixed test. Changed variables names * Bad change
- Loading branch information
1 parent
5ae2626
commit ee28057
Showing
7 changed files
with
280 additions
and
12 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,4 @@ | ||
| from conan.tools.meson.toolchain import MesonToolchain | ||
| from conan.tools.meson.meson import Meson | ||
| from conan.tools.meson.mesondeps import MesonDeps | ||
| from conan.tools.meson.toolchain import MesonToolchain | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,105 @@ | ||
| import textwrap | ||
|
|
||
| from jinja2 import Template | ||
|
|
||
| from conan.tools.gnu.gnudeps_flags import GnuDepsFlags | ||
| from conan.tools.meson.helpers import to_meson_value | ||
| from conans.model.new_build_info import NewCppInfo | ||
| from conans.util.files import save | ||
|
|
||
|
|
||
| class MesonDeps(object): | ||
| """Generator that manages all the GNU flags from all the dependencies""" | ||
|
|
||
| filename = "conan_meson_deps_flags.ini" | ||
|
|
||
| _meson_file_template = textwrap.dedent(""" | ||
| [constants] | ||
| deps_c_args = {{c_args}} | ||
| deps_c_link_args = {{c_link_args}} | ||
| deps_cpp_args = {{cpp_args}} | ||
| deps_cpp_link_args = {{cpp_link_args}} | ||
| """) | ||
|
|
||
| def __init__(self, conanfile): | ||
| self._conanfile = conanfile | ||
| self._ordered_deps = [] | ||
| # constants | ||
| self.c_args = [] | ||
| self.c_link_args = [] | ||
| self.cpp_args = [] | ||
| self.cpp_link_args = [] | ||
|
|
||
| # TODO: Add all this logic to GnuDepsFlags? Distinguish between GnuFlags and GnuDepsFlags? | ||
| @property | ||
| def ordered_deps(self): | ||
| if not self._ordered_deps: | ||
| deps = self._conanfile.dependencies.host.topological_sort | ||
| self._ordered_deps = [dep for dep in reversed(deps.values())] | ||
| return self._ordered_deps | ||
|
|
||
| def _get_cpp_info(self): | ||
| ret = NewCppInfo() | ||
| for dep in self.ordered_deps: | ||
| dep_cppinfo = dep.cpp_info.aggregated_components() | ||
| # In case we have components, aggregate them, we do not support isolated | ||
| # "targets" with autotools | ||
| ret.merge(dep_cppinfo) | ||
| return ret | ||
|
|
||
| def _rpaths_flags(self): | ||
| flags = [] | ||
| for dep in self.ordered_deps: | ||
| flags.extend(["-Wl,-rpath -Wl,{}".format(libdir) for libdir in dep.cpp_info.libdirs | ||
| if dep.options.get_safe("shared", False)]) | ||
| return flags | ||
|
|
||
| def get_gnu_flags(self): | ||
| flags = GnuDepsFlags(self._conanfile, self._get_cpp_info()) | ||
|
|
||
| # cpp_flags | ||
| cpp_flags = [] | ||
| cpp_flags.extend(flags.include_paths) | ||
| cpp_flags.extend(flags.defines) | ||
|
|
||
| # Ldflags | ||
| ldflags = flags.sharedlinkflags | ||
| ldflags.extend(flags.exelinkflags) | ||
| ldflags.extend(flags.frameworks) | ||
| ldflags.extend(flags.framework_paths) | ||
| ldflags.extend(flags.lib_paths) | ||
|
|
||
| # set the rpath in Macos so that the library are found in the configure step | ||
| if self._conanfile.settings.get_safe("os") == "Macos": | ||
| ldflags.extend(self._rpaths_flags()) | ||
|
|
||
| # libs | ||
| libs = flags.libs | ||
| libs.extend(flags.system_libs) | ||
|
|
||
| # cflags | ||
| cflags = flags.cflags | ||
| cxxflags = flags.cxxflags | ||
| return cflags, cxxflags, cpp_flags, ldflags, libs | ||
|
|
||
| def _context(self): | ||
| cflags, cxxflags, cpp_flags, ldflags, _ = self.get_gnu_flags() | ||
| self.c_args.extend(cflags + cpp_flags) | ||
| self.cpp_args.extend(cxxflags + cpp_flags) | ||
| self.c_link_args.extend(ldflags) | ||
| self.cpp_link_args.extend(ldflags) | ||
|
|
||
| return { | ||
| "c_args": to_meson_value(self.c_args), | ||
| "c_link_args": to_meson_value(self.c_link_args), | ||
| "cpp_args": to_meson_value(self.cpp_args), | ||
| "cpp_link_args": to_meson_value(self.cpp_link_args), | ||
| } | ||
|
|
||
| def _content(self): | ||
| context = self._context() | ||
| content = Template(self._meson_file_template).render(context) | ||
| return content | ||
|
|
||
| def generate(self): | ||
| save(self.filename, self._content()) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
146 changes: 146 additions & 0 deletions
146
conans/test/functional/toolchains/meson/test_meson_and_gnu_deps_flags.py
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,146 @@ | ||
| import os | ||
| import platform | ||
| import textwrap | ||
|
|
||
| from conan.tools.files import load | ||
| from conans.test.assets.sources import gen_function_cpp | ||
| from conans.test.functional.toolchains.meson._base import TestMesonBase | ||
| from conans.test.utils.tools import TestClient | ||
|
|
||
|
|
||
| class TestMesonToolchainAndGnuFlags(TestMesonBase): | ||
|
|
||
| def test_mesondeps(self): | ||
| client = TestClient(path_with_spaces=False) | ||
| client.run("new hello/0.1 -s") | ||
| client.run("create . hello/0.1@ %s" % self._settings_str) | ||
| app = gen_function_cpp(name="main", includes=["hello"], calls=["hello"]) | ||
|
|
||
| conanfile_py = textwrap.dedent(""" | ||
| from conan import ConanFile | ||
| from conan.tools.meson import Meson | ||
| class App(ConanFile): | ||
| settings = "os", "arch", "compiler", "build_type" | ||
| requires = "hello/0.1" | ||
| generators = "MesonDeps", "MesonToolchain" | ||
| def layout(self): | ||
| self.folders.build = "build" | ||
| def build(self): | ||
| meson = Meson(self) | ||
| meson.configure() | ||
| meson.build() | ||
| """) | ||
|
|
||
| meson_build = textwrap.dedent(""" | ||
| project('tutorial', 'cpp') | ||
| cxx = meson.get_compiler('cpp') | ||
| hello = cxx.find_library('hello', required: true) | ||
| executable('demo', 'main.cpp', dependencies: hello) | ||
| """) | ||
|
|
||
| client.save({"conanfile.py": conanfile_py, | ||
| "meson.build": meson_build, | ||
| "main.cpp": app}, | ||
| clean_first=True) | ||
|
|
||
| client.run("install . %s" % self._settings_str) | ||
| client.run("build .") | ||
| assert "[2/2] Linking target demo" in client.out | ||
|
|
||
| def test_mesondeps_flags_are_being_appended_and_not_replacing_toolchain_ones(self): | ||
| """ | ||
| Test MesonDeps and MesonToolchain are keeping all the flags/definitions defined | ||
| from both generators and nothing is being messed up. | ||
| """ | ||
| client = TestClient(path_with_spaces=False) | ||
| if platform.system() == "Windows": | ||
| deps_flags = '"/GA", "/analyze:quiet"' | ||
| flags = '"/Wall", "/W4"' | ||
| else: | ||
| deps_flags = '"-Wpedantic", "-Werror"' | ||
| flags = '"-Wall", "-finline-functions"' | ||
| # Dependency - hello/0.1 | ||
| conanfile_py = textwrap.dedent(""" | ||
| from conan import ConanFile | ||
| class HelloConan(ConanFile): | ||
| name = "hello" | ||
| version = "0.1" | ||
| def package_info(self): | ||
| self.cpp_info.libs = ["hello"] | ||
| self.cpp_info.cxxflags = [{}] | ||
| self.cpp_info.defines = ['DEF1=one_string', 'DEF2=other_string'] | ||
| """.format(deps_flags)) | ||
| client.save({"conanfile.py": conanfile_py}) | ||
| client.run("create . %s" % self._settings_str) | ||
| # Dependency - other/0.1 | ||
| conanfile_py = textwrap.dedent(""" | ||
| from conan import ConanFile | ||
| class OtherConan(ConanFile): | ||
| name = "other" | ||
| version = "0.1" | ||
| def package_info(self): | ||
| self.cpp_info.libs = ["other"] | ||
| self.cpp_info.defines = ['DEF3=simple_string'] | ||
| """) | ||
| client.save({"conanfile.py": conanfile_py}, clean_first=True) | ||
| client.run("create . %s" % self._settings_str) | ||
|
|
||
| # Consumer using MesonDeps and MesonToolchain | ||
| conanfile_py = textwrap.dedent(""" | ||
| from conan import ConanFile | ||
| from conan.tools.meson import Meson, MesonDeps, MesonToolchain | ||
| class App(ConanFile): | ||
| settings = "os", "arch", "compiler", "build_type" | ||
| requires = "hello/0.1", "other/0.1" | ||
| def layout(self): | ||
| self.folders.build = "build" | ||
| def generate(self): | ||
| tc = MesonDeps(self) | ||
| tc.generate() | ||
| tc = MesonToolchain(self) | ||
| tc.preprocessor_definitions["VAR"] = "VALUE" | ||
| tc.preprocessor_definitions["VAR2"] = "VALUE2" | ||
| tc.generate() | ||
| def build(self): | ||
| meson = Meson(self) | ||
| meson.configure() | ||
| meson.build() | ||
| """) | ||
|
|
||
| meson_build = textwrap.dedent(""" | ||
| project('tutorial', 'cpp') | ||
| cxx = meson.get_compiler('cpp') | ||
| # It's not needed to declare "hello/0.1" as a dependency, only interested in flags | ||
| executable('demo', 'main.cpp') | ||
| """) | ||
| client.save({"conanfile.py": conanfile_py, | ||
| "meson.build": meson_build, | ||
| "main.cpp": "int main()\n{return 0;}\n"}, | ||
| clean_first=True) | ||
|
|
||
| client.run("install . %s -c 'tools.build:cxxflags=[%s]'" % (self._settings_str, flags)) | ||
| client.run("build .") | ||
| deps_flags = deps_flags.replace('"', "").replace(",", "") | ||
| flags = flags.replace('"', "").replace(",", "") | ||
| meson_log_path = os.path.join(client.current_folder, "build", "meson-logs", "meson-log.txt") | ||
| meson_log = load(None, meson_log_path) | ||
| meson_log = meson_log.replace("\\", "/") | ||
| assert "Build Options: " \ | ||
| "'--native-file {folder}/conan_meson_native.ini' " \ | ||
| "'--native-file {folder}/conan_meson_deps_flags.ini'" \ | ||
| "".format(folder=client.current_folder.replace("\\", "/")) in meson_log | ||
| # Flags/Defines from deps and consumer are appearing in meson-log.txt as part | ||
| # of the command-line | ||
| assert '%s -DVAR="VALUE" -DVAR2="VALUE2" %s' % (flags, deps_flags) in meson_log | ||
| assert '-DDEF3=simple_string -DDEF1=one_string -DDEF2=other_string' in meson_log |