When not in a git repository look for .mx_vcs_root file #221
Conversation
zakkak
force-pushed
the
mx-without-git
branch
2 times, most recently
from
ed4876e
to
b0398cc
Compare
|
@gilles-duboscq I have pushed a first attempt of fixing cases where |
zakkak
force-pushed
the
mx-without-git
branch
2 times, most recently
from
1eb2b0a
to
8bafd80
Compare
zakkak
force-pushed
the
mx-without-git
branch
2 times, most recently
from
3111e11
to
73d65ce
Compare
mx.py
Outdated
| @@ -1518,7 +1519,7 @@ class Suite(object): | |||
| """ | |||
| def __init__(self, mxDir, primary, internal, importing_suite, load, vc, vc_dir, dynamicallyImported=False): | |||
| if primary is True and vc_dir is None: | |||
| abort("The primary suite must be in a vcs repository") | |||
| abort("The primary suite must be in a vcs repository or under a directory containing a file called '.mx_vcs_root'") | |||
There was a problem hiding this comment.
@gilles-duboscq I also added this to reflect the .mx_vcs_root file support
|
|
|
I think this looks good. I will take it for further testing. One thing though: just like OpenJDK, I don't think we want to add a copyright line for each contributor outside of the case where the whole file comes from a contribution. |
Thanks @gilles-duboscq !
Correct, I volunteer to work on them as well after this gets merged.
Noted. I removed the copyright changes. |
|
Thank you. |
| # at the root of a repo that contains multiple suites. | ||
| hocon = join(suite_parent, 'ci.hocon') | ||
| if exists(hocon): | ||
| mx_vcs_root = join(suite_parent, '.mx_vcs_root') |
There was a problem hiding this comment.
during internal review, it came up that we should rather check for both files (ci.hocon or .mx_vcs_root) to avoid any breaking change to thing that might have relied on the existing ci.hocon heuristic.
There was a problem hiding this comment.
Thanks @gilles-duboscq !
This should now be resolved.
When primary suite is not in a git repository look for the top most directory containing a .mx_vcs_root file and use that directory as the sources root. Closes graalvm#217
When primary suite is not in a git repository look for the top most
directory containing a .mx_vcs_root file and use that directory as the
sources root.
Closes #217