*: replace nxt -> monogon
These are hopefully the last leftovers from the nxt monorepo.
This change breaks existing build containers and IntelliJ setups, and
unfortunately thrashes developer workstation Bazel caches.
Running `scripts/bin/destroy_container.sh &&
scripts/bin/create_container.sh` and then following the IntelliJ setup
guide in //README.md should be enough to fix everything.
Did that locally and was able to set up a fully working IntelliJ
IDE against this change.
Change-Id: I090f4e4f2ea03998569a4ea3d1aa4cd4ec570f8a
Reviewed-on: https://review.monogon.dev/c/monogon/+/61
Reviewed-by: Leopold Schabel <leo@nexantic.com>
diff --git a/README.md b/README.md
index 6fb8def..6393910 100644
--- a/README.md
+++ b/README.md
@@ -29,10 +29,10 @@
- Install Google's [Bazel plugin](https://plugins.jetbrains.com/plugin/8609-bazel) in IntelliJ. On IntelliJ 2020.3 or later,
you need to install a [beta release](https://github.com/bazelbuild/intellij/issues/2102#issuecomment-801242977) of the plugin.
-- Add the absolute path to your `~/.cache/bazel-nxt` folder to your `idea64.vmoptions` (Help → Edit Custom VM Options)
+- Add the absolute path to your `~/.cache/bazel-monogon` folder to your `idea64.vmoptions` (Help → Edit Custom VM Options)
and restart IntelliJ:
- `-Dbazel.bep.path=/home/leopold/.cache/bazel-nxt`
+ `-Dbazel.bep.path=/home/leopold/.cache/bazel-monogon`
- Set "*Bazel Binary Location*" in Other Settings → Bazel Settings to the absolute path of `scripts/bin/bazel`.
This is a wrapper that will execute Bazel inside the container.
diff --git a/build/fietsje/README.md b/build/fietsje/README.md
index ff990a3..723813f 100644
--- a/build/fietsje/README.md
+++ b/build/fietsje/README.md
@@ -6,9 +6,9 @@
Introduction
------------
-Fietsje is a dependency management system for Go dependencies in nxt. It does
-not replace either gomods or Gazelle, but instead builds upon both on them in
-a way that makes sense for our particular usecase: pulling in a large set of
+Fietsje is a dependency management system for Go dependencies in monogon. It
+does not replace either gomods or Gazelle, but instead builds upon both on them
+in a way that makes sense for our particular usecase: pulling in a large set of
dependency trees from third\_party projects, and sticking to those as much as
possible.
@@ -57,7 +57,7 @@
In general, `.collect()`/`.collectOverride()` calls should be limited only to
dependencies 'we' (as developers) want. These 'high-level' dependencies are
-large projects like Kubernetes, or direct imports from nxt itself. Every
+large projects like Kubernetes, or direct imports from monogon itself. Every
transitive dependency of those should just be enabled by calling `.use()`,
instead of another `.collectOverride()` call that might pin it to a wrong
version.
@@ -125,7 +125,7 @@
- if the dependency has little transitive dependencies, use `.inject()` to
add transitive dependencies manually after your `.collect()` call
- otherwise, extend fietsje to allow for out-of-tree go.mod/go.sum files kept
- within nxt, or come up with some other solution.
+ within monogon, or come up with some other solution.
Your new dependency might conflict with existing dependencies, which usually
manifests in build failures due to incompatible types. If this happens, you
diff --git a/build/fietsje/shelf.go b/build/fietsje/shelf.go
index ea709be..99a06c5 100644
--- a/build/fietsje/shelf.go
+++ b/build/fietsje/shelf.go
@@ -32,7 +32,7 @@
// The Shelf is a combined cache and dependency lockfile, not unlike go.sum. It's implemented as a text proto file on
// disk, and currently stores a single mapping of shelfKeys to shelfValues, which are in order a (importpath, version)
// tuple and the `locked` structure of a dependency.
-// The resulting shelf file should be commited to the nxt repository. It can be freely deleted to force recreation from
+// The resulting shelf file should be commited to the monogon repository. It can be freely deleted to force recreation from
// scratch, which can be useful as there is no garbage collection implemented for it.
// The 'lockfile' aspect of the Shelf is counter-intuitive to what readers might be used to from other dependency
// management systems. It does not lock a third-party dependency to a particular version, but only locks a well defined
diff --git a/scripts/bin/bazel b/scripts/bin/bazel
index 1fda28c..3d4bea7 100755
--- a/scripts/bin/bazel
+++ b/scripts/bin/bazel
@@ -6,6 +6,6 @@
# The IntelliJ plugin sets the repository using a command line argument, which we need to replace:
# --override_repository=intellij_aspect=<...>/plugins/ijwb/aspect
#
-ARGS=$(echo $@ | sed "s%--override_repository=intellij_aspect=[^ ]*%--override_repository=intellij_aspect=${HOME}/.cache/bazel-nxt/ijwb_aspect%")
+ARGS=$(echo $@ | sed "s%--override_repository=intellij_aspect=[^ ]*%--override_repository=intellij_aspect=${HOME}/.cache/bazel-monogon/ijwb_aspect%")
-exec podman exec -it monogon-dev bazel --output_user_root ${HOME}/.cache/bazel-nxt $ARGS
+exec podman exec -it monogon-dev bazel --output_user_root ${HOME}/.cache/bazel-monogon $ARGS
diff --git a/scripts/create_container.sh b/scripts/create_container.sh
index 9ddaf7a..c5c97d9 100755
--- a/scripts/create_container.sh
+++ b/scripts/create_container.sh
@@ -24,7 +24,7 @@
# Mount bazel root to identical paths inside and outside the container.
# This caches build state even if the container is destroyed, and
-BAZEL_ROOT=${HOME}/.cache/bazel-nxt
+BAZEL_ROOT=${HOME}/.cache/bazel-monogon
mkdir -p ${BAZEL_ROOT}
# The Bazel plugin injects a Bazel repository into the sync command line,
diff --git a/third_party/go/README.md b/third_party/go/README.md
index 94cb0b1..7bcccca 100644
--- a/third_party/go/README.md
+++ b/third_party/go/README.md
@@ -3,4 +3,4 @@
Status: managed by fietsje
-See //build/fietsje/README.md to learn how to change/add Go dependencies to nxt.
+See //build/fietsje/README.md to learn how to change/add Go dependencies to monogon.