-
Notifications
You must be signed in to change notification settings - Fork 57
add check root dir #383
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
Closed
Closed
add check root dir #383
Changes from 12 commits
Commits
Show all changes
13 commits
Select commit
Hold shift + click to select a range
24de2b5
add check root dir
claireyywang 2cbc216
add warning msg
claireyywang 7615574
add import fn to test.py
claireyywang 6517968
fix style
claireyywang a8f23b5
remove blank space and bad quotes
claireyywang 4017d12
address review comment
claireyywang a2b7cf7
remove pycache
claireyywang 8a3f68e
address review comments
claireyywang 1414381
remove debug line
claireyywang 2bb4250
move default_start_path
claireyywang a928198
modify start_path
claireyywang 4b65b68
Merge branch 'master' into claire/check-root-dir
claireyywang fe56301
change marker file name and remove cli args
claireyywang File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or 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 hidden or 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 |
|---|---|---|
|
|
@@ -26,6 +26,8 @@ | |
| from colcon_core.task import TaskContext | ||
| from colcon_core.verb import check_and_mark_build_tool | ||
| from colcon_core.verb import check_and_mark_install_layout | ||
| from colcon_core.verb import check_and_mark_root_dir | ||
| from colcon_core.verb import DEFAULT_START_PATH | ||
| from colcon_core.verb import logger | ||
| from colcon_core.verb import update_object | ||
| from colcon_core.verb import VerbExtensionPoint | ||
|
|
@@ -49,7 +51,8 @@ def __init__(self, pkg, args, *, additional_destinations=None): | |
| self.build_base = os.path.abspath(os.path.join( | ||
| os.getcwd(), args.build_base, pkg.name)) | ||
| self.install_base = os.path.abspath(os.path.join( | ||
| os.getcwd(), args.install_base)) | ||
| os.getcwd())) | ||
| self.start_path = DEFAULT_START_PATH | ||
| self.merge_install = args.merge_install | ||
| if not args.merge_install: | ||
| self.install_base = os.path.join( | ||
|
|
@@ -89,6 +92,10 @@ def add_arguments(self, *, parser): # noqa: D102 | |
| '--install-base', | ||
| default='install', | ||
| help='The base path for all install prefixes (default: install)') | ||
| parser.add_argument( | ||
| '--start_path', | ||
| default=DEFAULT_START_PATH, | ||
| help='The directory where build verb is invoked in') | ||
|
claireyywang marked this conversation as resolved.
Outdated
|
||
| parser.add_argument( | ||
| '--merge-install', | ||
| action='store_true', | ||
|
|
@@ -116,6 +123,7 @@ def add_arguments(self, *, parser): # noqa: D102 | |
| self.task_argument_destinations = decorated_parser.get_destinations() | ||
|
|
||
| def main(self, *, context): # noqa: D102 | ||
| check_and_mark_root_dir(context.args.start_path) | ||
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I think the invocation here in the verb is too late since e.g. the |
||
| check_and_mark_build_tool(context.args.build_base) | ||
| check_and_mark_install_layout( | ||
| context.args.install_base, | ||
|
|
||
This file contains hidden or 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
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.