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

Use absolute paths in conanbuild.sh #10653

Merged
merged 8 commits into from Feb 25, 2022

Conversation

czoido
Copy link
Contributor

@czoido czoido commented Feb 24, 2022

Changelog: Fix: Fix creation path of deactivate scripts.
Docs: omit

doing a conan install ... --install-folder=myfolder -g VirtualBuildEnv for example
generates a conanbuild.sh that when you source: source ./myfolder/conanbuild.sh
creates a deactivate_conanbuildenv-release-x86_64.sh not in myfolder but in the folder we are in.

This PR adds absolute paths to those files.

@czoido czoido marked this pull request as draft February 24, 2022 10:47
@czoido czoido added this to the 1.46 milestone Feb 24, 2022
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.

Looking good

conans/test/integration/environment/test_env.py Outdated Show resolved Hide resolved
@czoido czoido marked this pull request as ready for review February 24, 2022 16:18
@memsharded memsharded merged commit f817504 into conan-io:develop Feb 25, 2022
memsharded added a commit to memsharded/conan that referenced this pull request Feb 28, 2022
* use absolute path

* Update conans/test/integration/environment/test_env.py

Co-authored-by: James <james@conan.io>

* fix tests

* fix test

* fix win

* fix win

Co-authored-by: James <james@conan.io>
memsharded added a commit that referenced this pull request Mar 1, 2022
* proposing base_source_folder, and folders.root

* Update conans/model/layout.py

Co-authored-by: Luis Martinez <lasote@gmail.com>

* [feature] `ConfDefinition` and `Conf` enhancements. (#10537)

* first approach. Big changes in Conf

* Fixing errors

* Fixing more tests

* Deleted useless iteration

* All the tests passing

* Testing

* Added items method

* fixed rebased

* Keeping old functions for backward compatibility

* backward compatibility

* Keeping indentation

* Ordering methods and improved legacy logic

* Added fixme

* Reverted breaking changes

* Added more complete test

* Added more access Conf tests

* Added docstring

* Splitted string asserts

* Added get/pop functions

* Breaking refactor. Trying new structure

* fixing tests

* Changing tests

* Fixed tests

* Fixed Python 2.x problems

* Removed useless layer of types

* Fixed py2

* Fixed errors and added cast param to apply function to convert any type

* Added TODO

* Improved docstring

* Fixed error

* Update conans/model/conf.py

Co-authored-by: James <james@conan.io>

* Update conans/model/conf.py

Co-authored-by: James <james@conan.io>

* Added check_type and removed cast

* Changed main structure. Now simpler and more powerful

* Explicit default

* Fixed error

* Simplified compile options

* Changed all the legacy conf getitem built-ins

* Fixed test

* Fixed bad type

* Added more tests

* More tests

* Fix test for Python2

* Added more tests. Fixed corner-cases

* Added one cli test and improved boolean conf UX

* Moved str conveersion

* Added one more mechanism to other smart conversion. Added more tests

* Removed useless OR

Co-authored-by: James <james@conan.io>

* [PkgConfigDeps] Added new property `component_version` (#10633)

* Added custom versions and descriptions for components

* Changed property to component_version. Backported to legacy PkgConfig

* package_folder available when "conan install" consumer (#10655)

* WIP: Test failing

* output_folder absolute only when existing

* Fix test windows

* added a few conf checkers (#10656)

* Use absolute paths in conanbuild.sh (#10653)

* use absolute path

* Update conans/test/integration/environment/test_env.py

Co-authored-by: James <james@conan.io>

* fix tests

* fix test

* fix win

* fix win

Co-authored-by: James <james@conan.io>

* Cleanup tmpdirs (#10663)

* refactor toolchain (#10665)

* fix not finding the Premake executable (#10250)

Co-authored-by: James <james@conan.io>

* review

Co-authored-by: Luis Martinez <lasote@gmail.com>
Co-authored-by: Francisco Ramírez <franchuti688@gmail.com>
Co-authored-by: Carlos Zoido <mrgalleta@gmail.com>
Co-authored-by: Enhex <enhex0@gmail.com>
memsharded added a commit that referenced this pull request Mar 2, 2022
* introducing modern conan.tool.scm.Git helper

* skip Py2, change git config order

* wip

* wip

* wip

* wip

* let conandata_update create conandata.yml if not exist

* full SCM test

* adding monorepo case

* fix test

* fix test

* fix tests

* fix test

* add subfolder test

* proposing base_source_folder, and folders.root

* Update conans/model/layout.py

Co-authored-by: Luis Martinez <lasote@gmail.com>

* [feature] `ConfDefinition` and `Conf` enhancements. (#10537)

* first approach. Big changes in Conf

* Fixing errors

* Fixing more tests

* Deleted useless iteration

* All the tests passing

* Testing

* Added items method

* fixed rebased

* Keeping old functions for backward compatibility

* backward compatibility

* Keeping indentation

* Ordering methods and improved legacy logic

* Added fixme

* Reverted breaking changes

* Added more complete test

* Added more access Conf tests

* Added docstring

* Splitted string asserts

* Added get/pop functions

* Breaking refactor. Trying new structure

* fixing tests

* Changing tests

* Fixed tests

* Fixed Python 2.x problems

* Removed useless layer of types

* Fixed py2

* Fixed errors and added cast param to apply function to convert any type

* Added TODO

* Improved docstring

* Fixed error

* Update conans/model/conf.py

Co-authored-by: James <james@conan.io>

* Update conans/model/conf.py

Co-authored-by: James <james@conan.io>

* Added check_type and removed cast

* Changed main structure. Now simpler and more powerful

* Explicit default

* Fixed error

* Simplified compile options

* Changed all the legacy conf getitem built-ins

* Fixed test

* Fixed bad type

* Added more tests

* More tests

* Fix test for Python2

* Added more tests. Fixed corner-cases

* Added one cli test and improved boolean conf UX

* Moved str conveersion

* Added one more mechanism to other smart conversion. Added more tests

* Removed useless OR

Co-authored-by: James <james@conan.io>

* [PkgConfigDeps] Added new property `component_version` (#10633)

* Added custom versions and descriptions for components

* Changed property to component_version. Backported to legacy PkgConfig

* package_folder available when "conan install" consumer (#10655)

* WIP: Test failing

* output_folder absolute only when existing

* Fix test windows

* added a few conf checkers (#10656)

* Use absolute paths in conanbuild.sh (#10653)

* use absolute path

* Update conans/test/integration/environment/test_env.py

Co-authored-by: James <james@conan.io>

* fix tests

* fix test

* fix win

* fix win

Co-authored-by: James <james@conan.io>

* Cleanup tmpdirs (#10663)

* refactor toolchain (#10665)

* fix not finding the Premake executable (#10250)

Co-authored-by: James <james@conan.io>

* review

* wip

* simplified tests

* new branch test

* review

* fix test

Co-authored-by: Luis Martinez <lasote@gmail.com>
Co-authored-by: Francisco Ramírez <franchuti688@gmail.com>
Co-authored-by: Carlos Zoido <mrgalleta@gmail.com>
Co-authored-by: Enhex <enhex0@gmail.com>
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.

None yet

2 participants