From b2d488cb7bd581efd99597c4f3f25669826e186b Mon Sep 17 00:00:00 2001 From: "Steven E. Harris" Date: Thu, 5 Mar 2020 14:00:21 -0500 Subject: [PATCH] Change default Jsonnet port from C++ to Go As threatened in #113 in mid-2019, change the default Jsonnet tool to the Go port, leaving the C++ port available for selection via the "--define" command-line flag to set the "jsonnet_port" build variable accordingly. --- README.md | 7 +++---- jsonnet/BUILD | 4 ++-- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 3d7154c..2cc5639 100644 --- a/README.md +++ b/README.md @@ -44,16 +44,15 @@ jsonnet_go_dependencies() ## Jsonnet Port Selection -By default, Bazel will use [the C++ port](https://github.com/google/jsonnet) of Jsonnet. To use [the Go port](https://github.com/google/go-jsonnet) of Jsonnet instead, invoke Bazel with the `--define jsonnet_port=go` command-line flag. To select the C++ port explicitly, invoke Bazel with the `--define jsonnet_port=cpp` command-line flag. +By default, Bazel will use [the Go port](https://github.com/google/go-jsonnet) of Jsonnet. To use [the C++ port](https://github.com/google/jsonnet) of Jsonnet instead, invoke Bazel with the `--define jsonnet_port=cpp` command-line flag. To select the Go port explicitly, invoke Bazel with the `--define jsonnet_port=go` command-line flag. _bazel_ Flag | Jsonnet Port ------------ | ------------ -(none) | C++ +(none) | Go `--define jsonnet_port=cpp`| C++ `--define jsonnet_port=go` | Go -Note that the primary development focus of the Jsonnet project is now with the Go port. This repository's support for using the C++ port is deprecated, and may be removed in a future release. Before then, its default port will likely change from C++ to Go in the next release. - +Note that the primary development focus of the Jsonnet project is now with the Go port. This repository's support for using the C++ port is deprecated, and may be removed in a future release. ## jsonnet_library diff --git a/jsonnet/BUILD b/jsonnet/BUILD index a762c6e..431fded 100644 --- a/jsonnet/BUILD +++ b/jsonnet/BUILD @@ -26,7 +26,7 @@ config_setting( alias( name = "jsonnet_tool", actual = select({ - "//jsonnet:port_go": "@jsonnet_go//cmd/jsonnet", - "//conditions:default": "@jsonnet//cmd:jsonnet", + "//jsonnet:port_cpp": "@jsonnet//cmd:jsonnet", + "//conditions:default": "@jsonnet_go//cmd/jsonnet", }), )