Commit 9c3ce3bb authored by POTTIER Francois's avatar POTTIER Francois
Browse files

Merge branch 'francois' of git+ssh://scm.gforge.inria.fr//gitroot/menhir/menhir into francois

parents dcecdd3d 374ded7d
...@@ -148,6 +148,7 @@ check: ...@@ -148,6 +148,7 @@ check:
RSYNC := scp -p -C RSYNC := scp -p -C
TARGET := yquem.inria.fr:public_html/menhir/ TARGET := yquem.inria.fr:public_html/menhir/
PAGE := /home/fpottier/dev/page PAGE := /home/fpottier/dev/page
API := convert.mli.html IncrementalEngine.ml.html
export: export:
# Copier l'archive et la doc vers yquem. # Copier l'archive et la doc vers yquem.
...@@ -155,7 +156,7 @@ export: ...@@ -155,7 +156,7 @@ export:
$(RSYNC) $(PACKAGE)/manual.pdf $(TARGET) $(RSYNC) $(PACKAGE)/manual.pdf $(TARGET)
$(RSYNC) CHANGES $(TARGET) $(RSYNC) CHANGES $(TARGET)
# Copier l'API vers la page Web. # Copier l'API vers la page Web.
cd src && $(RSYNC) convert.mli.html $(TARGET) cd src && $(RSYNC) $(API) $(TARGET)
# Mettre jour la page Web de Menhir avec le nouveau numro de version. # Mettre jour la page Web de Menhir avec le nouveau numro de version.
cd $(PAGE) && \ cd $(PAGE) && \
sed --in-place=.bak "s/menhir-[0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9]/$(PACKAGE)/" menhir.xml && \ sed --in-place=.bak "s/menhir-[0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9]/$(PACKAGE)/" menhir.xml && \
......
...@@ -4,3 +4,5 @@ _stage1 ...@@ -4,3 +4,5 @@ _stage1
_stage2 _stage2
_stage3 _stage3
installation.ml installation.ml
*.ml.html
*.mli.html
...@@ -15,11 +15,14 @@ installation.ml: ...@@ -15,11 +15,14 @@ installation.ml:
# ---------------------------------------------------------------------------- # ----------------------------------------------------------------------------
# Pretty-printing the MenhirLib.Convert API. # Pretty-printing the MenhirLib.Convert API.
api: convert.mli.html api: convert.mli.html IncrementalEngine.ml.html
%.mli.html: %.mli %.mli.html: %.mli
caml2html -nf $< caml2html -nf $<
%.ml.html: %.ml
caml2html -nf $<
clean:: clean::
rm -f *.mli.html rm -f *.mli.html
...@@ -72,7 +72,7 @@ let table_interface = ...@@ -72,7 +72,7 @@ let table_interface =
ttoken ttoken
) )
); );
IIComment "The entry points to the incremental API."; IIComment "The entry point(s) to the incremental API.";
IIValDecls ( IIValDecls (
StringSet.fold (fun symbol decls -> StringSet.fold (fun symbol decls ->
(incremental symbol, entrytypescheme_incremental symbol) :: decls (incremental symbol, entrytypescheme_incremental symbol) :: decls
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment