Skip to content

Commit

Permalink
Merge pull request #10169 from dra27/stdlib-file-casing
Browse files Browse the repository at this point in the history
Change the Standard Library prefixing to match Dune's
  • Loading branch information
dra27 committed Feb 10, 2021
2 parents 3d083ee + 53ba024 commit a0f1c39
Show file tree
Hide file tree
Showing 20 changed files with 739 additions and 715 deletions.
7 changes: 7 additions & 0 deletions Changes
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,13 @@ Working version
- #9582: Add Array.{find_opt,find_map,split,combine}.
(Nicolás Ojeda Bär, review by Daniel Bünzli and Gabriel Scherer)

* #10169: Use capitalized module names in the Standard Library prefixing scheme
to match Dune, e.g. Stdlib__String instead of Stdlib__string. This is a
breaking change only to code which attempted to use the internal names before.
The Standard Library generated by the Dune rules is now equivalent to the main
build (the Dune rules still do not generate a distributable compiler).
(David Allsopp and Mark Shinwell, review by Gabriel Scherer)

### Other libraries:

* #10084: Unix.open_process_args* functions now look up the program in the PATH.
Expand Down
2 changes: 2 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,8 @@ TOPLEVELSTART=toplevel/topstart.cmo

TOPLEVELINIT=toplevel/toploop.cmo

# This list is passed to expunge, which accepts both uncapitalized and
# capitalized module names.
PERVASIVES=$(STDLIB_MODULES) outcometree topdirs toploop

LIBFILES=stdlib.cma std_exit.cmo *.cmi camlheader
Expand Down
5 changes: 1 addition & 4 deletions api_docgen/Makefile.docfiles
Original file line number Diff line number Diff line change
Expand Up @@ -34,11 +34,8 @@ thread_MLIS := \
thread.mli condition.mli mutex.mli event.mli \
threadUnix.mli semaphore.mli

STDLIB=$(filter-out stdlib__pervasives, $(STDLIB_MODULES))

stdlib_UNPREFIXED=$(STDLIB:stdlib__%=%)
libref= \
$(stdlib_UNPREFIXED) \
$(filter-out pervasives,$(STDLIB_MODULE_BASENAMES)) \
$(str_MLIS:%.mli=%) \
$(unix_MLIS:%.mli=%) \
$(dynlink_MLIS:%.mli=%) \
Expand Down

0 comments on commit a0f1c39

Please sign in to comment.