summaryrefslogtreecommitdiff
path: root/HACKING.adoc
diff options
context:
space:
mode:
authorDaniel Bünzli <daniel.buenzli@erratique.ch>2020-02-11 15:13:54 +0100
committerDaniel Bünzli <daniel.buenzli@erratique.ch>2020-02-11 15:52:21 +0100
commit3facb4f09cf3f329229043c2c2a56e898b27a344 (patch)
tree64350dec59d1fac9ce44ca0387a38a6cd8c4cdbe /HACKING.adoc
parentedabf2008cdf2e9130d42e9d34433eaca300e3e8 (diff)
downloadocaml-3facb4f09cf3f329229043c2c2a56e898b27a344.tar.gz
HACKING.adoc: update opam instructions for testing.
Diffstat (limited to 'HACKING.adoc')
-rw-r--r--HACKING.adoc25
1 files changed, 11 insertions, 14 deletions
diff --git a/HACKING.adoc b/HACKING.adoc
index 56353e8e6f..4033f6d2c9 100644
--- a/HACKING.adoc
+++ b/HACKING.adoc
@@ -38,14 +38,8 @@ make runtop
make tests
----
-6. Install in a new opam switch to try things out:
-+
-----
-opam compiler-conf install
-----
-+
-With opam 2, create a local opam switch with the compiler installed from
-the current source directory:
+6. Install in a new opam switch to try things out. With `opam` v2, create a local
+opam switch with the compiler installed from the current source directory:
+
----
opam switch create . --empty
@@ -222,13 +216,16 @@ the original commit in the commit message.
git cherry-pick -x -m 1 <merge-commit-hash>
----
-=== opam compiler script
+=== Testing with `opam`
+
+To test a particular branch `branch` of a public git repository
+`$REPO` of the compiler in an `opam` v2 switch issue:
-The separately-distributed script
-https://github.com/gasche/opam-compiler-conf[`opam-compiler-conf`] can
-be used to easily build opam switches out of a git branch of the
-compiler distribution. This lets you easily install and test opam
-packages from an under-modification compiler version.
+---
+opam switch create ocaml-branch --empty
+# Replace $VERSION by the trunk version
+opam pin add ocaml-variants.$VERSION+branch git+https://$REPO#branch
+---
=== Useful Makefile targets