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

Update Build requirements documentation #521

Merged
merged 5 commits into from
Nov 1, 2023
Merged

Update Build requirements documentation #521

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
baf3efa
Remove mentions of lexer/parser tools from build requirements
MatthewFluet Nov 1, 2023
e4e5e19
Add Poly/ML and MLKit to bootstrap options
MatthewFluet Nov 1, 2023
0d7e31a
Remove `xargs` from misc. Unix utilities in build requirements
MatthewFluet Nov 1, 2023
2a0df24
Remove unused `POLYML_POLY` variable from `Makefile.config`
MatthewFluet Nov 1, 2023
bcfeeae
Rename `POLYML_POLYC` variable to `POLYC` in `Makefile`s
MatthewFluet Nov 1, 2023
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
5 changes: 2 additions & 3 deletions Makefile.config
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
## Copyright (C) 2009,2011,2013,2017-2022 Matthew Fluet.
## Copyright (C) 2009,2011,2013,2017-2023 Matthew Fluet.
# Copyright (C) 1999-2007 Henry Cejtin, Matthew Fluet, Suresh
# Jagannathan, and Stephen Weeks.
# Copyright (C) 1997-2000 NEC Research Institute.
Expand Down Expand Up @@ -225,8 +225,7 @@ MLTON_OUTPUT_SMLNJ_HEAP := $(MLTON_OUTPUT)-smlnj.$(SMLNJ_HEAP_SUFFIX)

######################################################################

POLYML_POLY := poly
POLYML_POLYC := polyc
POLYC := polyc

######################################################################

Expand Down
10 changes: 6 additions & 4 deletions README.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,10 +74,12 @@ a lexer generator, a parser generator, and a profiler.
* http://savannah.gnu.org/projects/make[GNU Make]
* http://www.gnu.org/software/bash/[GNU Bash]
* binutils (`ar`, `ranlib`, `strip`, ...)
* miscellaneous Unix utilities (`diff`, `find`, `grep`, `gzip`, `patch`, `sed`, `tar`, `xargs`, ...)
* Standard{nbsp}ML compiler and tools to bootstrap:
- http://mlton.org[MLton] (`mlton`, `mllex`, and `mlyacc`) recommended. Pre-built binary packages for MLton can be installed via an OS package manager or (for select platforms) obtained from `http://mlton.org`.
- http://www.smlnj.org[SML/NJ] (`sml`, `ml-lex`, `ml-yacc`) supported, but not recommended.
* miscellaneous Unix utilities (`diff`, `find`, `grep`, `gzip`, `patch`, `sed`, `tar`, ...)
* Standard{nbsp}ML compiler to bootstrap:
- http://mlton.org[MLton] (`mlton`) recommended. Pre-built binary packages for MLton can be installed via an OS package manager or (for select platforms) obtained from `http://mlton.org`.
- http://www.smlnj.org[SML/NJ] (`sml`) supported, but not recommended.
- https://polyml.org[Poly/ML] (`polyc`) supported, but not recommended.
- https://elsman.com/mlkit[MLKit] (`mlkit`) supported, but not recommended.
* (optional, for documentation only) https://ctan.org/tex/[TeX], http://asciidoctor.org/[AsciiDoctor], http://rouge.jneen.net/[Rouge], http://www.graphicsmagick.org/[GraphicsMagick] or https://www.imagemagick.org/[ImageMagick], ...

==== Hardware
Expand Down
2 changes: 1 addition & 1 deletion mlton/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -233,7 +233,7 @@ ifneq (,$(findstring polyml-mlton,$(MAKECMDGOALS)))
polyml-mlton: $(MLTON_OUTPUT)-polyml

$(MLTON_OUTPUT)-polyml: mlton-polyml.sml $(shell [ -e mlton-polyml.sml ] && $(CAT) mlton-polyml.sml | $(SED) -n 's/use "\(.*\)";/\1/p') $(MLTON_GEN_SOURCES)
$(POLYML_POLYC) -o $@ mlton-polyml.sml
$(POLYC) -o $@ mlton-polyml.sml

mlton-polyml.sml: ../lib/stubs/polyml/basis/sources.use ../lib/stubs/polyml/mlton/sources.use $(shell $(MLBDEPS) ../lib/stubs/mlton-stubs/sources.mlb | $(GREP) 'mlb$$' | $(GREP) -v '$$(SML_LIB)') $(shell $(MLBDEPS) mlton.mlb | $(GREP) 'mlb$$' | $(GREP) -v '$$(SML_LIB)')
( \
Expand Down