v.io/jiri: move default value for --profiles out of core jiri packages.
MultiPart: 2/2
Change-Id: I36d7b39b37442a796e54022c44b5298951a94674
diff --git a/jiri-api/api.go b/jiri-api/api.go
index 340a65d..13a24a0 100644
--- a/jiri-api/api.go
+++ b/jiri-api/api.go
@@ -42,7 +42,7 @@
func init() {
cmdAPICheck.Flags.BoolVar(&detailedOutputFlag, "detailed", true, "If true, shows each API change in an expanded form. Otherwise, only a summary is shown.")
cmdAPI.Flags.StringVar(&gotoolsBinPathFlag, "gotools-bin", "", "The path to the gotools binary to use. If empty, gotools will be built if necessary.")
- profilescmdline.RegisterReaderFlags(&cmdAPI.Flags, &readerFlags, jiri.ProfilesDBDir)
+ profilescmdline.RegisterReaderFlags(&cmdAPI.Flags, &readerFlags, "v23:base", jiri.ProfilesDBDir)
tool.InitializeProjectFlags(&cmdAPI.Flags)
tool.InitializeRunFlags(&cmdAPI.Flags)
}
diff --git a/jiri-dockergo/go.go b/jiri-dockergo/go.go
index 8d30948..ba33e17 100644
--- a/jiri-dockergo/go.go
+++ b/jiri-dockergo/go.go
@@ -76,7 +76,7 @@
func init() {
tool.InitializeRunFlags(&cmd.Flags)
- profilescmdline.RegisterReaderFlags(&cmd.Flags, &readerFlags, jiri.ProfilesDBDir)
+ profilescmdline.RegisterReaderFlags(&cmd.Flags, &readerFlags, "v23:base", jiri.ProfilesDBDir)
flag.StringVar(&imageFlag, "image", "", "Name of the docker image to use. If empty, the tool will automatically select an image based on the environment variables, possibly edited by the profile")
flag.StringVar(&extraLDFlags, "extra-ldflags", "", golib.ExtraLDFlagsFlagDescription)
}
diff --git a/jiri-go/go.go b/jiri-go/go.go
index bfceb0d..aae42f1 100644
--- a/jiri-go/go.go
+++ b/jiri-go/go.go
@@ -47,7 +47,7 @@
)
func init() {
- profilescmdline.RegisterReaderFlags(&cmdGo.Flags, &readerFlags, jiri.ProfilesDBDir)
+ profilescmdline.RegisterReaderFlags(&cmdGo.Flags, &readerFlags, "v23:base", jiri.ProfilesDBDir)
flag.BoolVar(&systemGoFlag, "system-go", false, "use the version of go found in $PATH rather than that built by the go profile")
flag.StringVar(&extraLDFlags, "extra-ldflags", "", golib.ExtraLDFlagsFlagDescription)
flag.BoolVar(&envFlag, "print-run-env", false, "print detailed info on environment variables and the command line used")
diff --git a/jiri-goext/goext.go b/jiri-goext/goext.go
index 8e5a769..c4e926d 100644
--- a/jiri-goext/goext.go
+++ b/jiri-goext/goext.go
@@ -26,7 +26,7 @@
)
func init() {
- profilescmdline.RegisterReaderFlags(&cmdGoExt.Flags, &readerFlags, jiri.ProfilesDBDir)
+ profilescmdline.RegisterReaderFlags(&cmdGoExt.Flags, &readerFlags, "v23:base", jiri.ProfilesDBDir)
flag.BoolVar(&envFlag, "print-run-env", false, "print detailed info on environment variables and the command line used")
tool.InitializeRunFlags(&cmdGoExt.Flags)
}
diff --git a/jiri-run/run.go b/jiri-run/run.go
index bf3f4b2..ebc4e6a 100644
--- a/jiri-run/run.go
+++ b/jiri-run/run.go
@@ -28,7 +28,7 @@
func init() {
tool.InitializeRunFlags(&cmdRun.Flags)
- profilescmdline.RegisterReaderFlags(&cmdRun.Flags, &readerFlags, jiri.ProfilesDBDir)
+ profilescmdline.RegisterReaderFlags(&cmdRun.Flags, &readerFlags, "v23:base", jiri.ProfilesDBDir)
flag.BoolVar(&envFlag, "print-run-env", false, "print detailed info on environment variables and the command line used")
}
diff --git a/jiri-test/test.go b/jiri-test/test.go
index a844362..80e78ee 100644
--- a/jiri-test/test.go
+++ b/jiri-test/test.go
@@ -53,7 +53,7 @@
cmdTestRun.Flags.StringVar(&mockTestFileContents, "mock-file-contents", "", "Colon-separated file contents to check when testing presubmit test. This flag is only used when running presubmit end-to-end test.")
tool.InitializeRunFlags(&cmdTest.Flags)
tool.InitializeProjectFlags(&cmdProjectPoll.Flags)
- profilescmdline.RegisterReaderFlags(&cmdTest.Flags, &readerFlags, jiri.ProfilesDBDir)
+ profilescmdline.RegisterReaderFlags(&cmdTest.Flags, &readerFlags, "v23:base", jiri.ProfilesDBDir)
}
// cmdTest represents the "jiri test" command.
diff --git a/jiridoc/doc.go b/jiridoc/doc.go
index d2805ee..d8727da 100644
--- a/jiridoc/doc.go
+++ b/jiridoc/doc.go
@@ -295,7 +295,7 @@
Note: if no profiles are specified then the requested field will be displayed for all profiles.
-merge-policies=+CCFLAGS,+CGO_CFLAGS,+CGO_CXXFLAGS,+CGO_LDFLAGS,+CXXFLAGS,GOARCH,GOOS,GOPATH:,^GOROOT*,+LDFLAGS,:PATH,VDLPATH:
specify policies for merging environment variables
- -profiles=v23:base
+ -profiles=
a comma separated list of profiles to use
-profiles-db=$JIRI_ROOT/.jiri_root/profile_db
the path, relative to JIRI_ROOT, that contains the profiles database.
@@ -330,7 +330,7 @@
specify an environment variable in the form: <var>=[<val>],...
-merge-policies=+CCFLAGS,+CGO_CFLAGS,+CGO_CXXFLAGS,+CGO_LDFLAGS,+CXXFLAGS,GOARCH,GOOS,GOPATH:,^GOROOT*,+LDFLAGS,:PATH,VDLPATH:
specify policies for merging environment variables
- -profiles=v23:base
+ -profiles=
a comma separated list of profiles to use
-profiles-db=$JIRI_ROOT/.jiri_root/profile_db
the path, relative to JIRI_ROOT, that contains the profiles database.
@@ -788,7 +788,7 @@
-show-key-prefix or -collate-stdout.
-merge-policies=+CCFLAGS,+CGO_CFLAGS,+CGO_CXXFLAGS,+CGO_LDFLAGS,+CXXFLAGS,GOARCH,GOOS,GOPATH:,^GOROOT*,+LDFLAGS,:PATH,VDLPATH:
specify policies for merging environment variables
- -profiles=v23:base
+ -profiles=
a comma separated list of profiles to use
-profiles-db=$JIRI_ROOT/.jiri_root/profile_db
the path, relative to JIRI_ROOT, that contains the profiles database.
