diff options
| author |  Kristina Chodorow <kchodorow@google.com> | 2016-04-19 13:55:24 +0000 |
|---|---|---|
| committer |  Damien Martin-Guillerez <dmarting@google.com> | 2016-04-20 11:12:35 +0000 |
| commit | 857cda2c45a5cc68c3fa398311c48c571a64915d (patch) | |
| tree | 8a2ad9cd0c92752b1b6105c27d9995dcaf3d24a4 /src/main/java/com/google/devtools/build/lib/bazel/rules/python/stub_template.txt | |
| parent | 0b26f446f8312d1c43d162fe706467ef458c4db8 (diff) | |
Move the runfiles for external repositories to under the x.runfiles/ directory
This also sets the Bazel workspace name to io_bazel_source.
Fixes #848.
Relevant to #1116, #1124,
RELNOTES[INC]: All repositories are now directly under the x.runfiles directory in the runfiles tree (previously, external repositories were at x.runfiles/main-repo/external/other-repo. This simplifies handling remote repository runfiles considerably, but will break existing references to external repository runfiles.
---
Furthermore, if a Bazel project does not provide a workspace name in the WORKSPACE file, Bazel will now default to using __main__ as the workspace name (instead of "", as previously). The repository's runfiles will appear under x.runfiles/__main__/.
--
MOS_MIGRATED_REVID=120224534
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/bazel/rules/python/stub_template.txt')
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/bazel/rules/python/stub_template.txt | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/bazel/rules/python/stub_template.txt b/src/main/java/com/google/devtools/build/lib/bazel/rules/python/stub_template.txt index bdce83eebe..29e373c2ac 100644 --- a/src/main/java/com/google/devtools/build/lib/bazel/rules/python/stub_template.txt +++ b/src/main/java/com/google/devtools/build/lib/bazel/rules/python/stub_template.txt @@ -73,18 +73,11 @@ def Main(): sys.argv[0]) python_imports = '%imports%' - module_space_with_workspace_name = module_space - if '%workspace_name%' != '': - module_space_with_workspace_name = os.path.join(module_space, '%workspace_name%') - - python_path_entries = CreatePythonPathEntries( - python_imports, module_space_with_workspace_name) - - external_dir = os.path.join(module_space_with_workspace_name, 'external') - if os.path.isdir(external_dir): - external_entries = [os.path.join(external_dir, d) for d in os.listdir(external_dir)] - repositories = [d for d in external_entries if os.path.isdir(d)] - python_path_entries += repositories + python_path_entries = CreatePythonPathEntries(python_imports, module_space) + + repo_dirs = [os.path.join(module_space, d) for d in os.listdir(module_space)] + repositories = [d for d in repo_dirs if os.path.isdir(d)] + python_path_entries += repositories old_python_path = os.environ.get('PYTHONPATH') separator = ';' if IsWindows() else ':' |