Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 2 additions & 0 deletions .git-blame-ignore-revs
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
# Automatizes the source code formatting with ocamlformat.
af1c1d546b59029c4790238da3d4a7f7104040ed
3 changes: 3 additions & 0 deletions .ocamlformat
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
profile = default
sequence-style = terminator
field-space = loose
10 changes: 8 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,19 @@ all: static build
DUNE = dune
DUNE_ARGS = --profile=release

FORMATER = ocamlformat
SRC = src/**/*.ml

build-deps:
opam install . --deps-only --locked

.PHONY: build
build:
.PHONY: build format
build: format
@${DUNE} build ${DUNE_ARGS}

format:
@${FORMATER} -i $(SRC) $(SRC:.ml=.mli)

.PHONY: static
static:
@${MAKE} -C static
Expand Down
6 changes: 4 additions & 2 deletions learn-ocaml-client.opam
Original file line number Diff line number Diff line change
Expand Up @@ -30,15 +30,17 @@ depends: [
"lwt" {>= "4.0.0"}
"lwt_ssl"
"ocaml" {= "4.05.0"}
"ocamlformat" {= "0.8"}
"ocamlfind" {build}
"ocamlformat" {= "0.8"}
"ocp-indent-nlfork"
"ocp-ocamlres" {>= "0.4"}
"ocplib-json-typed" {= "0.6"}
"ipaddr" {= "2.8.0" }
"cstruct" {>= "3.3.0"}
"ppx_tools"
"ppx_sexp_conv" {= "v0.9.0"}
"ppx_fields_conv" {= "v0.9.0"}
"ppx_sexp_conv" {= "v0.11.1"}
"ppx_fields_conv" {= "v0.11.0"}
]
build: [
["dune" "build" "@install" "-p" name "-j" jobs]
Expand Down
1 change: 1 addition & 0 deletions learn-ocaml.opam
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ depends: [
"markup-lwt"
"ocaml" {= "4.05.0"}
"ocamlfind" {build}
"ocamlformat" {= "0.8"}
"ocp-indent-nlfork"
"ocp-ocamlres" {>= "0.4"}
"ocplib-json-typed" {= "0.6"}
Expand Down
73 changes: 36 additions & 37 deletions learn-ocaml.opam.locked
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@ homepage: "https://github.com/ocaml-sf/learn-ocaml"
bug-reports: "https://github.com/ocaml-sf/learn-ocaml/issues"
dev-repo: "git+https://github.com/ocaml-sf/learn-ocaml"
depends: [
"asak" {= "0.2"}
"astring" {= "0.8.4"}
"base" {= "v0.9.4"}
"asak" {= "0.3"}
"astring" {= "0.8.5"}
"base" {= "v0.11.1"}
"base-bigarray" {= "base"}
"base-bytes" {= "base"}
"base-num" {= "base"}
Expand All @@ -27,92 +27,91 @@ depends: [
"biniou" {= "1.2.1"}
"checkseum" {= "0.1.0"}
"cmdliner" {= "1.0.4"}
"cohttp" {= "1.1.1"}
"cohttp-lwt" {= "1.1.1"}
"cohttp-lwt-unix" {= "1.1.1"}
"cohttp" {= "1.2.0"}
"cohttp-lwt" {= "1.2.0"}
"cohttp-lwt-unix" {= "1.2.0"}
"conduit" {= "1.3.0"}
"conduit-lwt" {= "1.3.0"}
"conduit-lwt-unix" {= "1.3.0"}
"conf-git" {= "1.0"}
"conf-libssl" {= "1"}
"conf-git" {= "1.1"}
"conf-libssl" {= "3"}
"conf-m4" {= "1"}
"conf-pkg-config" {= "1.2"}
"conf-pkg-config" {= "2"}
"conf-which" {= "1"}
"cppo" {= "1.6.6"}
"cppo" {= "1.6.7"}
"cstruct" {= "5.0.0"}
"decompress" {= "0.8.1"}
"digestif" {= "0.8.0-1"}
"dune" {= "2.0.1"}
"easy-format" {= "1.3.2"}
"eqaf" {= "0.7"}
"ezjsonm" {= "1.1.0"}
"fieldslib" {= "v0.9.0"}
"fmt" {= "0.8.8"}
"fpath" {= "0.7.2"}
"ezjsonm" {= "1.2.0"}
"fieldslib" {= "v0.11.0"}
"fmt" {= "0.8.9"}
"fpath" {= "0.7.3"}
"gg" {= "0.9.3"}
"hex" {= "1.4.0"}
"ipaddr" {= "2.8.0"}
"jbuilder" {= "1.0+beta20.2"}
"js_of_ocaml" {= "3.3.0"}
"js_of_ocaml-compiler" {= "3.3.0"}
"js_of_ocaml-lwt" {= "3.3.0"}
"js_of_ocaml-ocamlbuild" {= "3.5.2"}
"js_of_ocaml-ppx" {= "3.3.0"}
"js_of_ocaml-toplevel" {= "3.3.0"}
"js_of_ocaml-tyxml" {= "3.3.0"}
"jsonm" {= "1.0.1"}
"markup-lwt" {= "0.5.0"}
"logs" {= "0.7.0"}
"lwt" {= "4.2.1"}
"lwt_react" {= "1.1.3"}
"lwt" {= "4.2.1-1"}
"lwt_react" {= "1.1.4"}
"lwt_ssl" {= "1.1.3"}
"magic-mime" {= "1.1.2"}
"magic-mime" {= "1.2.0"}
"markup" {= "0.8.2"}
"markup-lwt" {= "0.5.0"}
"mmap" {= "1.1.0"}
"num" {= "0"}
"ocaml" {= "4.05.0"}
"ocaml-compiler-libs" {= "v0.9.0"}
"ocaml-migrate-parsetree" {= "1.7.3"}
"ocaml-compiler-libs" {= "v0.12.3"}
"ocaml-migrate-parsetree" {= "1.8.0"}
"ocaml-secondary-compiler" {= "4.08.1-1"}
"ocamlbuild" {= "0.14.0"}
"ocamlfind" {= "1.8.1"}
"ocamlfind-secondary" {= "1.8.1"}
"ocamlformat" {= "0.8"}
"ocp-indent-nlfork" {= "1.5.4"}
"ocp-ocamlres" {= "0.4"}
"ocplib-json-typed" {= "0.6"}
"odoc" {= "1.5.1"}
"odoc" {= "1.5.3"}
"omd" {= "1.3.1"}
"optint" {= "0.0.2"}
"parsexp" {= "v0.11.0"}
"pprint" {= "20200410"}
"ppx_ast" {= "v0.9.1"}
"ppx_core" {= "v0.9.3"}
"ppx_cstruct" {= "5.0.0"}
"ppx_derivers" {= "1.2.1"}
"ppx_driver" {= "v0.9.2"}
"ppx_fields_conv" {= "v0.9.0"}
"ppx_metaquot" {= "v0.9.0"}
"ppx_optcomp" {= "v0.9.0"}
"ppx_sexp_conv" {= "v0.9.0"}
"ppx_fields_conv" {= "v0.11.0"}
"ppx_sexp_conv" {= "v0.11.1"}
"ppx_tools" {= "5.0+4.05.0"}
"ppx_tools_versioned" {= "5.4.0"}
"ppx_traverse_builtins" {= "v0.9.0"}
"ppx_type_conv" {= "v0.9.1"}
"ppxlib" {= "0.2.2"}
"re" {= "1.9.0"}
"react" {= "1.2.1"}
"reactiveData" {= "0.2.1"}
"result" {= "1.5"}
"rresult" {= "0.6.0"}
"seq" {= "0.2.2"}
"sexplib" {= "v0.9.3"}
"sexplib" {= "v0.11.0"}
"sexplib0" {= "v0.11.0"}
"ssl" {= "0.5.5"}
"stdio" {= "v0.9.1"}
"stdlib-shims" {= "0.1.0"}
"stdio" {= "v0.11.0"}
"stdlib-shims" {= "0.3.0"}
"stringext" {= "1.6.0"}
"topkg" {= "1.0.1"}
"tyxml" {= "4.4.0"}
"topkg" {= "1.0.3"}
"tyxml" {= "4.5.0"}
"uchar" {= "0.0.2"}
"uri" {= "1.9.7"}
"uri" {= "2.2.1"}
"uutf" {= "1.0.2"}
"yojson" {= "1.7.0"}
"vg" {= "0.9.3"}
"yojson" {= "1.7.0"}
]
build: [
[make "static"]
Expand Down
Loading