Add a jbuilder transition package (#796)
Signed-off-by: Jeremie Dimino <jeremie@dimino.org>
This commit is contained in:
parent
d2b66279f6
commit
1860438605
|
@ -79,20 +79,9 @@ case "$TARGET" in
|
||||||
fi
|
fi
|
||||||
opam list
|
opam list
|
||||||
echo "version: \"1.0+dev$DATE\"" >> dune.opam
|
echo "version: \"1.0+dev$DATE\"" >> dune.opam
|
||||||
mkdir -p ../jbuilder
|
echo "depends: [\"dune\"]" >> jbuilder.opam
|
||||||
cat > ../jbuilder/jbuilder.opam <<EOF
|
opam pin add dune . --no-action --yes
|
||||||
version: "1.0+dev$DATE"
|
opam pin add jbuilder . --no-action --yes
|
||||||
opam-version: "1.2"
|
|
||||||
maintainer: "opensource@janestreet.com"
|
|
||||||
authors: ["Jane Street Group, LLC <opensource@janestreet.com>"]
|
|
||||||
homepage: "https://github.com/ocaml/dune"
|
|
||||||
bug-reports: "https://github.com/ocaml/dune/issues"
|
|
||||||
dev-repo: "https://github.com/ocaml/dune.git"
|
|
||||||
license: "Apache-2.0"
|
|
||||||
depends: [ "dune" ]
|
|
||||||
EOF
|
|
||||||
opam pin add dune . --no-action --yes
|
|
||||||
opam pin add jbuilder ../jbuilder --no-action --yes
|
|
||||||
opam install utop ppx_driver odoc ocaml-migrate-parsetree js_of_ocaml-ppx js_of_ocaml-compiler --yes
|
opam install utop ppx_driver odoc ocaml-migrate-parsetree js_of_ocaml-ppx js_of_ocaml-compiler --yes
|
||||||
echo -en "travis_fold:end:opam.deps\r"
|
echo -en "travis_fold:end:opam.deps\r"
|
||||||
fi
|
fi
|
||||||
|
|
2
bin/dune
2
bin/dune
|
@ -1,9 +1,11 @@
|
||||||
(executable
|
(executable
|
||||||
((name main)
|
((name main)
|
||||||
(public_name dune)
|
(public_name dune)
|
||||||
|
(package dune)
|
||||||
(libraries (unix dune cmdliner))
|
(libraries (unix dune cmdliner))
|
||||||
(preprocess no_preprocessing)))
|
(preprocess no_preprocessing)))
|
||||||
|
|
||||||
(install
|
(install
|
||||||
((section bin)
|
((section bin)
|
||||||
|
(package dune)
|
||||||
(files ((main.exe as jbuilder)))))
|
(files ((main.exe as jbuilder)))))
|
||||||
|
|
2
doc/dune
2
doc/dune
|
@ -7,6 +7,7 @@
|
||||||
|
|
||||||
(install
|
(install
|
||||||
((section man)
|
((section man)
|
||||||
|
(package dune)
|
||||||
(files (dune.1))))
|
(files (dune.1))))
|
||||||
|
|
||||||
(rule
|
(rule
|
||||||
|
@ -16,6 +17,7 @@
|
||||||
|
|
||||||
(install
|
(install
|
||||||
((section man)
|
((section man)
|
||||||
|
(package dune)
|
||||||
(files (dune-config.5))))
|
(files (dune-config.5))))
|
||||||
|
|
||||||
(include dune.inc)
|
(include dune.inc)
|
||||||
|
|
14
doc/dune.inc
14
doc/dune.inc
|
@ -6,6 +6,7 @@
|
||||||
|
|
||||||
(install
|
(install
|
||||||
((section man)
|
((section man)
|
||||||
|
(package dune)
|
||||||
(files (dune-build.1))))
|
(files (dune-build.1))))
|
||||||
|
|
||||||
(rule
|
(rule
|
||||||
|
@ -15,6 +16,7 @@
|
||||||
|
|
||||||
(install
|
(install
|
||||||
((section man)
|
((section man)
|
||||||
|
(package dune)
|
||||||
(files (dune-clean.1))))
|
(files (dune-clean.1))))
|
||||||
|
|
||||||
(rule
|
(rule
|
||||||
|
@ -24,6 +26,7 @@
|
||||||
|
|
||||||
(install
|
(install
|
||||||
((section man)
|
((section man)
|
||||||
|
(package dune)
|
||||||
(files (dune-exec.1))))
|
(files (dune-exec.1))))
|
||||||
|
|
||||||
(rule
|
(rule
|
||||||
|
@ -33,6 +36,7 @@
|
||||||
|
|
||||||
(install
|
(install
|
||||||
((section man)
|
((section man)
|
||||||
|
(package dune)
|
||||||
(files (dune-external-lib-deps.1))))
|
(files (dune-external-lib-deps.1))))
|
||||||
|
|
||||||
(rule
|
(rule
|
||||||
|
@ -42,6 +46,7 @@
|
||||||
|
|
||||||
(install
|
(install
|
||||||
((section man)
|
((section man)
|
||||||
|
(package dune)
|
||||||
(files (dune-help.1))))
|
(files (dune-help.1))))
|
||||||
|
|
||||||
(rule
|
(rule
|
||||||
|
@ -51,6 +56,7 @@
|
||||||
|
|
||||||
(install
|
(install
|
||||||
((section man)
|
((section man)
|
||||||
|
(package dune)
|
||||||
(files (dune-install.1))))
|
(files (dune-install.1))))
|
||||||
|
|
||||||
(rule
|
(rule
|
||||||
|
@ -60,6 +66,7 @@
|
||||||
|
|
||||||
(install
|
(install
|
||||||
((section man)
|
((section man)
|
||||||
|
(package dune)
|
||||||
(files (dune-installed-libraries.1))))
|
(files (dune-installed-libraries.1))))
|
||||||
|
|
||||||
(rule
|
(rule
|
||||||
|
@ -69,6 +76,7 @@
|
||||||
|
|
||||||
(install
|
(install
|
||||||
((section man)
|
((section man)
|
||||||
|
(package dune)
|
||||||
(files (dune-printenv.1))))
|
(files (dune-printenv.1))))
|
||||||
|
|
||||||
(rule
|
(rule
|
||||||
|
@ -78,6 +86,7 @@
|
||||||
|
|
||||||
(install
|
(install
|
||||||
((section man)
|
((section man)
|
||||||
|
(package dune)
|
||||||
(files (dune-promote.1))))
|
(files (dune-promote.1))))
|
||||||
|
|
||||||
(rule
|
(rule
|
||||||
|
@ -87,6 +96,7 @@
|
||||||
|
|
||||||
(install
|
(install
|
||||||
((section man)
|
((section man)
|
||||||
|
(package dune)
|
||||||
(files (dune-rules.1))))
|
(files (dune-rules.1))))
|
||||||
|
|
||||||
(rule
|
(rule
|
||||||
|
@ -96,6 +106,7 @@
|
||||||
|
|
||||||
(install
|
(install
|
||||||
((section man)
|
((section man)
|
||||||
|
(package dune)
|
||||||
(files (dune-runtest.1))))
|
(files (dune-runtest.1))))
|
||||||
|
|
||||||
(rule
|
(rule
|
||||||
|
@ -105,6 +116,7 @@
|
||||||
|
|
||||||
(install
|
(install
|
||||||
((section man)
|
((section man)
|
||||||
|
(package dune)
|
||||||
(files (dune-subst.1))))
|
(files (dune-subst.1))))
|
||||||
|
|
||||||
(rule
|
(rule
|
||||||
|
@ -114,6 +126,7 @@
|
||||||
|
|
||||||
(install
|
(install
|
||||||
((section man)
|
((section man)
|
||||||
|
(package dune)
|
||||||
(files (dune-uninstall.1))))
|
(files (dune-uninstall.1))))
|
||||||
|
|
||||||
(rule
|
(rule
|
||||||
|
@ -123,5 +136,6 @@
|
||||||
|
|
||||||
(install
|
(install
|
||||||
((section man)
|
((section man)
|
||||||
|
(package dune)
|
||||||
(files (dune-utop.1))))
|
(files (dune-utop.1))))
|
||||||
|
|
||||||
|
|
|
@ -17,6 +17,7 @@ for cmd in $CMDS; do
|
||||||
|
|
||||||
(install
|
(install
|
||||||
((section man)
|
((section man)
|
||||||
|
(package dune)
|
||||||
(files (dune-$cmd.1))))
|
(files (dune-$cmd.1))))
|
||||||
EOF
|
EOF
|
||||||
done
|
done
|
||||||
|
|
|
@ -12,3 +12,4 @@ build: [
|
||||||
["./boot.exe" "-j" jobs]
|
["./boot.exe" "-j" jobs]
|
||||||
]
|
]
|
||||||
available: [ ocaml-version >= "4.02.3" ]
|
available: [ ocaml-version >= "4.02.3" ]
|
||||||
|
conflicts: [ "jbuilder" {!= "transition"} ]
|
||||||
|
|
|
@ -0,0 +1,2 @@
|
||||||
|
This is a transition package, jbuilder is now named dune. Use the dune
|
||||||
|
package instead.
|
|
@ -0,0 +1,22 @@
|
||||||
|
opam-version: "1.2"
|
||||||
|
version: "transition"
|
||||||
|
maintainer: "opensource@janestreet.com"
|
||||||
|
authors: ["Jane Street Group, LLC <opensource@janestreet.com>"]
|
||||||
|
homepage: "https://github.com/ocaml/dune"
|
||||||
|
bug-reports: "https://github.com/ocaml/dune/issues"
|
||||||
|
dev-repo: "https://github.com/ocaml/dune.git"
|
||||||
|
license: "MIT"
|
||||||
|
build: ["dune" "--version"]
|
||||||
|
# CR-soon diml: uncomment this once we have a dune package in opam.
|
||||||
|
# We have to wait otherwise "opam pin add jbuilder --dev" fails with
|
||||||
|
# an error that is hard to understand.
|
||||||
|
# depends: ["dune"]
|
||||||
|
post-messages: [
|
||||||
|
"Jbuilder has been renamed and the jbuilder package is now a transition"
|
||||||
|
"package. Use the dune package instead."
|
||||||
|
""
|
||||||
|
"If you want to try the development version of Dune before the 1.0.0 is"
|
||||||
|
"released, run the following command:"
|
||||||
|
""
|
||||||
|
"$ opam pin add dune https://github.com/ocaml/dune.git"
|
||||||
|
]
|
|
@ -1,6 +1,6 @@
|
||||||
open OpamParserTypes
|
open OpamParserTypes
|
||||||
let main _lex _lexbuf fn =
|
let main _lex _lexbuf fn =
|
||||||
assert (fn = "dune.opam");
|
assert (fn = "dune.opam" || fn = "jbuilder.opam");
|
||||||
{ file_contents = []
|
{ file_contents = []
|
||||||
; file_name = fn
|
; file_name = fn
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue