diff options
| author |  Googler <noreply@google.com> | 2017-03-08 19:05:50 +0000 |
|---|---|---|
| committer |  Vladimir Moskva <vladmos@google.com> | 2017-03-09 10:28:45 +0000 |
| commit | f2d8aff43584eeb1dcaa10f8e32087d193efdc4b (patch) | |
| tree | 8a8e8f98f3c3cd0e77aa2280fa513488321e3ba6 /src | |
| parent | 9da77a1b8597feff9b68b88c6e440798f73fa781 (diff) | |
Make external workspace handling forwards and backwards compatible.
Add a field to the IntelliJ aspect proto which handles both current and future
formats.
--
PiperOrigin-RevId: 149559228
MOS_MIGRATED_REVID=149559228
Diffstat (limited to 'src')
| -rw-r--r-- | src/main/protobuf/intellij_ide_info.proto | 8 | ||||
| -rw-r--r-- | src/main/protobuf/package_manifest.proto | 8 |
2 files changed, 14 insertions, 2 deletions
diff --git a/src/main/protobuf/intellij_ide_info.proto b/src/main/protobuf/intellij_ide_info.proto index a20759039b..730b0bf2d9 100644 --- a/src/main/protobuf/intellij_ide_info.proto +++ b/src/main/protobuf/intellij_ide_info.proto @@ -23,10 +23,16 @@ message ArtifactLocation { string relative_path = 2; bool is_source = 3; - // set for derived artifacts (is_source = false) + // path from the execution root to the actual root: + // exec_root + root_execution_path_fragment + relative_path = absolute_path string root_execution_path_fragment = 4; // whether this artifact comes from an external repository (bazel only) bool is_external = 5; + + // The contents of relative_path and root_execution_path_fragment have changed + // for external workspaces. This is a temporary field to distinguish between + // the two versions. + bool is_new_external_version = 6; } message LibraryArtifact { diff --git a/src/main/protobuf/package_manifest.proto b/src/main/protobuf/package_manifest.proto index 0c9c40def6..d5106a2bad 100644 --- a/src/main/protobuf/package_manifest.proto +++ b/src/main/protobuf/package_manifest.proto @@ -25,10 +25,16 @@ message ArtifactLocation { string relative_path = 2; bool is_source = 3; - // set for derived artifacts (is_source = false) + // path from the execution root to the actual root: + // exec_root + root_execution_path_fragment + relative_path = absolute_path string root_execution_path_fragment = 4; // whether this artifact comes from an external repository (bazel only) bool is_external = 5; + + // The contents of relative_path and root_execution_path_fragment have changed + // for external workspaces. This is a temporary field to distinguish between + // the two versions. + bool is_new_external_version = 6; } message JavaSourcePackage { |