Skip to content

Updated conanfile.py and example test to reflect changes made to the tutorial documentation #119

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

Merged
merged 3 commits into from
Oct 30, 2023
Merged

Updated conanfile.py and example test to reflect changes made to the tutorial documentation #119

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1021428
changes to reflect new tutorial modification
juansblanco Oct 25, 2023
a787036
Update tutorial/consuming_packages/conanfile_py/run_example.py
juansblanco Oct 27, 2023
4e2d7a2
added build path for multi-config too
juansblanco Oct 27, 2023
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
3 changes: 3 additions & 0 deletions tutorial/consuming_packages/conanfile_py/complete_conanfile.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,5 +25,8 @@ def layout(self):
multi = True if self.settings.get_safe("compiler") == "msvc" else False
if multi:
self.folders.generators = os.path.join("build", "generators")
Copy link
Contributor

@czoido czoido Oct 27, 2023

Choose a reason for hiding this comment

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

We should also have the build folder defined here to "build"

Copy link
Contributor

@czoido czoido Oct 27, 2023

Choose a reason for hiding this comment

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

Please, don't forget to do the corresponding change here: https://github.com/conan-io/docs/pull/3429/files

Copy link
Contributor Author

@juansblanco juansblanco Oct 27, 2023

Choose a reason for hiding this comment

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

Done!

self.folders.build = "build"
Copy link
Member

@memsharded memsharded Oct 27, 2023

Choose a reason for hiding this comment

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

For reference the whole can be simplified to:

self.folders.build = "build" if multi else os.path.join("build", str(self.settings.build_type))
self.folders.generators = os.path.join(self.folders.build, "generators")

I am not saying to change it, it is more "classic" and educational as-is, better for non-python experts. Just saying how it would be in production code.

else:
self.folders.generators = os.path.join("build", str(self.settings.build_type), "generators")
self.folders.build = os.path.join("build", str(self.settings.build_type))

8 changes: 5 additions & 3 deletions tutorial/consuming_packages/conanfile_py/run_example.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,14 @@ def run_example(output_folder=""):
run(" && ".join(command))
cmd_out = run("Release\\compressor.exe")
else:
with chdir("build"):
gen_folder = "" if output_folder else "Release/generators/"
build_path = "build" if output_folder else "build/Release"
gen_folder = "" if output_folder else "generators/"
cmakelists_path = ".." if output_folder else "../.."
with chdir(build_path):
command = []
# in the conanfile.py we only add CMake as tool_require in Linux
command.append(f". ./{gen_folder}conanbuild.sh")
command.append(f"cmake .. -DCMAKE_TOOLCHAIN_FILE={gen_folder}conan_toolchain.cmake -DCMAKE_BUILD_TYPE=Release")
command.append(f"cmake {cmakelists_path} -DCMAKE_TOOLCHAIN_FILE={gen_folder}conan_toolchain.cmake -DCMAKE_BUILD_TYPE=Release")
command.append("cmake --build .")
command.append(f". ./{gen_folder}deactivate_conanbuild.sh")
run(" && ".join(command))
Expand Down