Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump src_ext Dune to 1.6.3 #3887

Merged
merged 1 commit into from
Jun 27, 2019
Merged

Bump src_ext Dune to 1.6.3 #3887

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ all: opam opam-installer
@

ifeq ($(DUNE),)
DUNE_EXE = src_ext/dune-local/_build/install/default/bin/dune$(EXE)
DUNE_EXE = src_ext/dune-local/_build_bootstrap/install/default/bin/dune$(EXE)
ifeq ($(shell command -v cygpath 2>/dev/null),)
DUNE := $(DUNE_EXE)
else
Expand All @@ -26,7 +26,7 @@ JBUILDER_ARGS ?=
DUNE_ARGS ?= $(JBUILDER_ARGS)
DUNE_PROFILE ?= release

src_ext/dune-local/_build/install/default/bin/dune$(EXE): src_ext/dune-local.stamp
src_ext/dune-local/_build_bootstrap/install/default/bin/dune$(EXE): src_ext/dune-local.stamp
cd src_ext/dune-local && ocaml bootstrap.ml && ./boot.exe --release

src_ext/dune-local.stamp:
Expand Down
2 changes: 1 addition & 1 deletion doc/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
-include ../Makefile.config

ifeq ($(DUNE),)
DUNE_EXE = ../src_ext/dune-local/_build/install/default/bin/dune$(EXE)
DUNE_EXE = ../src_ext/dune-local/_build_bootstrap/install/default/bin/dune$(EXE)
ifeq ($(shell command -v cygpath 2>/dev/null),)
DUNE := $(DUNE_EXE)
else
Expand Down
4 changes: 2 additions & 2 deletions src_ext/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ reset-lib-pkg:
@rm -rf ../bootstrap/ocaml/lib/ocaml/site-lib ../bootstrap/ocaml/etc *.pkgbuild

ifeq ($(DUNE),)
DUNE_DEP=dune-local/_build/install/default/bin/dune$(EXE)
DUNE_DEP=dune-local/_build_bootstrap/install/default/bin/dune$(EXE)
DUNE_CLONE=dune-local.stamp
ifeq ($(shell command -v cygpath 2>/dev/null),)
DUNE:=$(DUNE_DEP)
Expand All @@ -91,7 +91,7 @@ DUNE_DEP=
DUNE_CLONE=
endif

dune-local/_build/install/default/bin/dune$(EXE): $(DUNE_CLONE)
dune-local/_build_bootstrap/install/default/bin/dune$(EXE): $(DUNE_CLONE)
cd dune-local && ocaml bootstrap.ml && ./boot.exe --release

build-pkg: clone-pkg $(PKG_EXTS:=.pkgbuild)
Expand Down
2 changes: 1 addition & 1 deletion src_ext/Makefile.packages
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ dose3-pkg-build:
dune-local-pkg-build:
ocaml bootstrap.ml
./boot.exe --release
cp _build/default/bin/main_dune.exe $(OCAMLBIN)/dune$(EXT_EXE)
cp _build_bootstrap/default/bin/main_dune.exe $(OCAMLBIN)/dune$(EXT_EXE)

mccs-pkg-build:
dune build @install --root=.
Expand Down
4 changes: 2 additions & 2 deletions src_ext/Makefile.sources
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,8 @@ MD5_result = 4beebefd41f7f899b6eeba7414e7ae01

$(call PKG_SAME,result)

URL_dune-local = https://github.com/ocaml/dune/releases/download/1.2.1/dune-1.2.1.tbz
MD5_dune-local = f96bdf1a893a2178c2ad9c388439bd18
URL_dune-local = https://github.com/ocaml/dune/releases/download/1.6.3/dune-1.6.3.tbz
MD5_dune-local = 1212a36547d25269675d767c38fecf5f

$(call PKG_SAME,dune-local)

Expand Down