diff --git a/Makefile b/Makefile index b88a12f832d..9a3a169ce20 100644 --- a/Makefile +++ b/Makefile @@ -38,9 +38,9 @@ endif src_ext/dune-local/dune.exe: src_ext/dune-local.stamp $(DUNE_SECONDARY) ifeq ($(DUNE_SECONDARY),) - cd src_ext/dune-local && ocaml bootstrap.ml + cd src_ext/dune-local && ocaml boot/bootstrap.ml else - cd src_ext/dune-local && ( unset OCAMLLIB ; unset CAML_LD_LIBRARY_PATH ; PATH="$(dir $(realpath $(DUNE_SECONDARY))):$$PATH" ../../$(DUNE_SECONDARY) bootstrap.ml ) + cd src_ext/dune-local && ( unset OCAMLLIB ; unset CAML_LD_LIBRARY_PATH ; PATH="$(dir $(realpath $(DUNE_SECONDARY))):$$PATH" ../../$(DUNE_SECONDARY) boot/bootstrap.ml ) endif src_ext/dune-local.stamp: diff --git a/master_changes.md b/master_changes.md index 25081faac79..f26168075f1 100644 --- a/master_changes.md +++ b/master_changes.md @@ -66,6 +66,10 @@ New option/command/subcommand are prefixed with ◈. * Upgrade to dose3 >= 6.1 and vendor dose3 7.0.0 [#4760 @kit-ty-kate] * Change minimum required OCaml to 4.03.0 [#4770 @dra27] * Change minimum required Dune to 2.0 [#4770 @dra27] + * Do not check for cppo in the configure script (not used directly anymore since #5498) [#5794 @kit-ty-kate] + * Upgrade vendored cmdliner to 1.2.0 [#5797 @kit-ty-kate] + * Add winsymlinks:native to the CYGWIN environment variable when installing a package on Windows [#5793 @kit-ty-kate - fix #5782] + * Upgrade the vendored dune to 3.14.0 [#5869 @kit-ty-kate] ## Infrastructure * diff --git a/src_ext/Makefile b/src_ext/Makefile index 780403247a8..8e2558d6857 100644 --- a/src_ext/Makefile +++ b/src_ext/Makefile @@ -108,7 +108,7 @@ DUNE_CLONE= endif dune-local/_boot/install/default/bin/dune$(EXE): $(DUNE_CLONE) - cd dune-local && ocaml bootstrap.ml && ./boot.exe --release + cd dune-local && ocaml boot/bootstrap.ml && ./boot.exe --release build-pkg: clone-pkg $(PKG_EXTS:=.pkgbuild) @ diff --git a/src_ext/Makefile.packages b/src_ext/Makefile.packages index 599dbbc8068..1306b17545f 100644 --- a/src_ext/Makefile.packages +++ b/src_ext/Makefile.packages @@ -107,7 +107,7 @@ dose3-pkg-build: dune install "--prefix=$(OCAMLROOT)" -p dose3 dose3 dune-local-pkg-build: - ocaml bootstrap.ml + ocaml boot/bootstrap.ml cp dune.exe $(OCAMLBIN)/dune$(EXT_EXE) mccs-pkg-build: diff --git a/src_ext/Makefile.sources b/src_ext/Makefile.sources index 4213ec67567..4def6681f04 100644 --- a/src_ext/Makefile.sources +++ b/src_ext/Makefile.sources @@ -64,9 +64,8 @@ MD5_result = 1b82dec78849680b49ae9a8a365b831b $(call PKG_SAME,result) # NB If minimum OCaml version for Dune changes, update DUNE_SECONDARY in configure.ac -URL_dune-local = https://github.com/ocaml/dune/releases/download/3.5.0/dune-3.5.0.tbz -MD5_dune-local = 46d1bde258ef60f60f053e88fe9d937b - +URL_dune-local = https://github.com/ocaml/dune/releases/download/3.14.0/dune-3.14.0.tbz +MD5_dune-local = bff778fff4996b890e5af3da7ecf5baa $(call PKG_SAME,dune-local) URL_PKG_findlib = http://download.camlcity.org/download/findlib-1.9.1.tar.gz