commit 2cffe03b6b19285c249f6321a07bb9c2e92fd468
author Han-Wen Nienhuys <hanwen@google.com> Mon Sep 21 15:28:40 2015 +0000
committer Damien Martin-Guillerez <dmarting@google.com> Mon Sep 21 15:34:48 2015 +0000
tree 077e1e1814dad11273473695f8f1f30092736a3e
parent e770467384f1e3f0a13adef6b8afb7e6603ed177

Serialize workspaceName.

--
MOS_MIGRATED_REVID=103547846

src/main/java/com/google/devtools/build/lib/packages/Package.java

diff --git a/src/main/java/com/google/devtools/build/lib/packages/Package.java b/src/main/java/com/google/devtools/build/lib/packages/Package.java
index 39a3de5..b3f75d9 100644
--- a/src/main/java/com/google/devtools/build/lib/packages/Package.java
+++ b/src/main/java/com/google/devtools/build/lib/packages/Package.java
@@ -910,7 +910,8 @@
     /**
      * Uses the workspace name from {@code //external} to set this package's workspace name.
      */
-    Builder setWorkspaceName(String workspaceName) {
+    @VisibleForTesting
+    public Builder setWorkspaceName(String workspaceName) {
       pkg.workspaceName = workspaceName;
       return this;
     }

src/main/java/com/google/devtools/build/lib/packages/PackageDeserializer.java

diff --git a/src/main/java/com/google/devtools/build/lib/packages/PackageDeserializer.java b/src/main/java/com/google/devtools/build/lib/packages/PackageDeserializer.java
index 1a75179..92a97e5 100644
--- a/src/main/java/com/google/devtools/build/lib/packages/PackageDeserializer.java
+++ b/src/main/java/com/google/devtools/build/lib/packages/PackageDeserializer.java
@@ -388,6 +388,8 @@
       builder.setContainsErrors();
     }
 
+    builder.setWorkspaceName(packagePb.getWorkspaceName());
+
     deserializeTargets(in, context);
   }
 

src/main/java/com/google/devtools/build/lib/packages/PackageSerializer.java

diff --git a/src/main/java/com/google/devtools/build/lib/packages/PackageSerializer.java b/src/main/java/com/google/devtools/build/lib/packages/PackageSerializer.java
index 21c5612..cfc90d5 100644
--- a/src/main/java/com/google/devtools/build/lib/packages/PackageSerializer.java
+++ b/src/main/java/com/google/devtools/build/lib/packages/PackageSerializer.java
@@ -166,6 +166,8 @@
 
     builder.setContainsErrors(pkg.containsErrors());
 
+    builder.setWorkspaceName(pkg.getWorkspaceName());
+
     builder.build().writeDelimitedTo(out);
 
     // Targets are emitted separately as individual protocol buffers as to prevent overwhelming

src/main/protobuf/build.proto

diff --git a/src/main/protobuf/build.proto b/src/main/protobuf/build.proto
index b77dd22..92728df 100644
--- a/src/main/protobuf/build.proto
+++ b/src/main/protobuf/build.proto
@@ -509,6 +509,7 @@
   optional bool contains_errors = 2008;
   optional bool contains_temporary_errors = 2009;
   repeated string skylark_label = 2010;
+  optional string workspace_name = 2011;
 
   // Targets
   repeated SourceFile source_file = 3001;