[ocamlformat] Deploy using dotslash

Reviewed By: jvillard

Differential Revision: D18128557

fbshipit-source-id: 83028fb59
master
Josh Berdine 5 years ago committed by Facebook Github Bot
parent 5caa19990b
commit 4c6ae7d22d

@ -1 +0,0 @@
9006560863e9323b8ee3e4d78fd0e799fe10259c

@ -210,8 +210,6 @@ fb-setup:
$(QUIET)$(call silent_on_success,Facebook setup,\ $(QUIET)$(call silent_on_success,Facebook setup,\
$(MAKE) -C facebook setup) $(MAKE) -C facebook setup)
OCAMLFORMAT_EXE?=ocamlformat
.PHONY: fmt .PHONY: fmt
fmt: fmt:
parallel $(OCAMLFORMAT_EXE) -i ::: $$(git diff --name-only --diff-filter=ACMRU $$(git merge-base origin/master HEAD) | grep "\.mli\?$$") parallel $(OCAMLFORMAT_EXE) -i ::: $$(git diff --name-only --diff-filter=ACMRU $$(git merge-base origin/master HEAD) | grep "\.mli\?$$")
@ -810,7 +808,7 @@ endif
# This is a magical version number that doesn't reinstall the world when added on top of what we # This is a magical version number that doesn't reinstall the world when added on top of what we
# have in opam.locked. To upgrade this version number, manually try to install several utop versions # have in opam.locked. To upgrade this version number, manually try to install several utop versions
# until you find one that doesn't recompile the world. TODO(t20828442): get rid of magic # until you find one that doesn't recompile the world. TODO(t20828442): get rid of magic
OPAM_DEV_DEPS = ocamlformat.$$(grep version .ocamlformat | cut -d ' ' -f 3) ocp-indent merlin utop.2.4.0 webbrowser OPAM_DEV_DEPS = ocp-indent merlin utop.2.4.0 webbrowser
ifneq ($(EMACS),no) ifneq ($(EMACS),no)
OPAM_DEV_DEPS += tuareg OPAM_DEV_DEPS += tuareg

@ -62,6 +62,7 @@ NDKBUILD = @NDKBUILD@
OCAMLBUILD = @OCAMLBUILD@ OCAMLBUILD = @OCAMLBUILD@
OCAMLC = @OCAMLC@ OCAMLC = @OCAMLC@
OCAMLFIND = @OCAMLFIND@ OCAMLFIND = @OCAMLFIND@
OCAMLFORMAT_EXE = @OCAMLFORMAT@
OCAMLLEX = @OCAMLLEX@ OCAMLLEX = @OCAMLLEX@
OCAMLOPT = @OCAMLOPT@ OCAMLOPT = @OCAMLOPT@
OPAM = @OPAM@ OPAM = @OPAM@

@ -237,6 +237,13 @@ AC_ASSERT_OCAML_PKG([oUnit])
AC_CHECK_TOOL([UTOP], [utop], [no]) AC_CHECK_TOOL([UTOP], [utop], [no])
AC_ASSERT_OCAML_PKG([yojson]) AC_ASSERT_OCAML_PKG([yojson])
AC_MSG_CHECKING([which ocamlformat to use])
AS_IF([test x"$is_facebook_tree" = x"yes"],
[OCAMLFORMAT="$(pwd)"/facebook/dependencies/bin/ocamlformat],
[OCAMLFORMAT=ocamlformat])
AC_MSG_RESULT([$OCAMLFORMAT])
AC_SUBST([OCAMLFORMAT])
AC_ARG_VAR([CPATH], [Additional directories to search for C headers.]) AC_ARG_VAR([CPATH], [Additional directories to search for C headers.])
AC_ARG_VAR([LIBRARY_PATH], [Additional directories to search for C shared objects.]) AC_ARG_VAR([LIBRARY_PATH], [Additional directories to search for C shared objects.])
AC_ARG_VAR([CAML_LD_LIBRARY_PATH], AC_ARG_VAR([CAML_LD_LIBRARY_PATH],

Loading…
Cancel
Save