Merge "TBR v.io/x/ref/cmd/vdl: update vdl tool for the Java roadmap -> release move."
diff --git a/cmd/vdl/doc.go b/cmd/vdl/doc.go
index 098e9ed..ac3c87a 100644
--- a/cmd/vdl/doc.go
+++ b/cmd/vdl/doc.go
@@ -76,7 +76,7 @@
before the package path, and dst is the replacement for src. Use commas to
separate multiple rules; the first rule matching src is used. The special
dst SKIP indicates matching packages are skipped.
- -java-out-dir=release/go/src->roadmap/java/lib/generated-src/vdl,roadmap/go/src->roadmap/java/lib/generated-src/vdl
+ -java-out-dir=release/go/src->release/java/lib/generated-src/vdl,roadmap/go/src->release/java/lib/generated-src/vdl
Same semantics as --go-out-dir but applies to java code generation.
-java-out-pkg=v.io->io/v
Java output package translation rules. Must be of the form:
@@ -146,7 +146,7 @@
before the package path, and dst is the replacement for src. Use commas to
separate multiple rules; the first rule matching src is used. The special
dst SKIP indicates matching packages are skipped.
- -java-out-dir=release/go/src->roadmap/java/lib/generated-src/vdl,roadmap/go/src->roadmap/java/lib/generated-src/vdl
+ -java-out-dir=release/go/src->release/java/lib/generated-src/vdl,roadmap/go/src->release/java/lib/generated-src/vdl
Same semantics as --go-out-dir but applies to java code generation.
-java-out-pkg=v.io->io/v
Java output package translation rules. Must be of the form:
diff --git a/cmd/vdl/main.go b/cmd/vdl/main.go
index 57973c3..2810b55 100644
--- a/cmd/vdl/main.go
+++ b/cmd/vdl/main.go
@@ -334,8 +334,8 @@
optGenGoOutDir = genOutDir{}
optGenJavaOutDir = genOutDir{
rules: xlateRules{
- {"release/go/src", "roadmap/java/lib/generated-src/vdl"},
- {"roadmap/go/src", "roadmap/java/lib/generated-src/vdl"},
+ {"release/go/src", "release/java/lib/generated-src/vdl"},
+ {"roadmap/go/src", "release/java/lib/generated-src/vdl"},
},
}
optGenJavascriptOutDir = genOutDir{
