summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOliver Reiche <oliver.reiche@huawei.com>2023-11-29 17:24:00 +0100
committerOliver Reiche <oliver.reiche@huawei.com>2023-11-29 19:01:50 +0100
commit9f9fba8bf21b4614c96b67ab8b93bd6c69051fc1 (patch)
tree0d52a2859b93bc2dcf679f2601f0c100c450a2b8
parent8bc7e05b5c775c8c01d56ec0b3c7d879b79ceac5 (diff)
downloadjustbuild-9f9fba8bf21b4614c96b67ab8b93bd6c69051fc1.tar.gz
Update install section about just-mr
-rw-r--r--INSTALL.md37
1 files changed, 19 insertions, 18 deletions
diff --git a/INSTALL.md b/INSTALL.md
index 3e93f085..e9d4209d 100644
--- a/INSTALL.md
+++ b/INSTALL.md
@@ -121,7 +121,7 @@ predictable location on where to pick up the resulting binary, you
almost certainly want to set the scratch directory.
```sh
-env PACKAGE=YES LOCALBASE=/usr python3 ${WRKSRC}/bin/bootstrap.py ${WRKSRC} ${WRKDIR}/just-work
+env PACKAGE=YES LOCALBASE=/usr python3 ${SRCDIR}/bin/bootstrap.py ${SRCDIR} ${BUILDDIR}
```
If some dependencies should nevertheless be built from source (typically
@@ -131,20 +131,21 @@ a JSON list.
# Installing `just-mr`
-In order to set up multi-repository configurations, usually the tools `just-mr`
-is used. It also a useful launcher for `just`.
-
-This tool is Python3 script located at `bin/just-mr.py` and can simply be put
-into an appropriate location in `PATH`.
-
-There is also a compiled version of `just-mr`, which is faster,
-works in parallel, and has additional features. It can be obtained
-by building the target `["", "installed just-mr"]`. That target
-can be built using the bootstrapped `just` and the Python3 script
-`bin/just-mr.py`. Alternatively, the bootstrapping process leaves
-in its work directory a file `repo-conf.json` with the repository
-configuration and a file `build-conf.json` with the build configuration
-used. Those can be used to build `just-mr` using the bootstrapped
-`just`. This approach is preferable for package building, as the
-same dependencies (typically the ones provided by the system) are
-used as for building `just.
+In order to set up multi-repository configurations, usually the tool `just-mr`
+is used. It is also a useful launcher for `just`.
+
+This tool can be obtained by building the target `["", "installed just-mr"]`.
+That target can be built using the previously bootstrapped `just` together with
+the cache directory `.just`, the repository configuration `repo-conf.json`, and
+the build configuration `build-conf.json` left by the bootstrapping process in
+its build directory. This makes use of already existing cache entries and the
+same dependencies (typically the ones provided by the system for package builds)
+as for building `just`.
+
+```sh
+${BUILDDIR}/out/bin/just install \
+ --local-build-root ${BUILDDIR}/.just \
+ -C ${BUILDDIR}/repo-conf.json \
+ -c ${BUILDDIR}/build-conf.json \
+ -o ${BUILDDIR}/out/ 'installed just-mr'
+```