Commit d4eba824 authored by Guillaume Melquiond's avatar Guillaume Melquiond

Improve gallery generation.

parent e116e159
...@@ -639,13 +639,13 @@ gallery-simple:: ...@@ -639,13 +639,13 @@ gallery-simple::
@for x in examples/*/why3session.xml ; do \ @for x in examples/*/why3session.xml ; do \
d=`dirname $$x`; \ d=`dirname $$x`; \
f=`basename $$d`; \ f=`basename $$d`; \
why3 session html $$x; \
echo "exporting $$f"; \ echo "exporting $$f"; \
mkdir -p $(GALLERYDIR)/$$f; \ mkdir -p $(GALLERYDIR)/$$f; \
cp examples/$$f.mlw examples/$$f/why3session.html $(GALLERYDIR)/$$f/; \ WHY3CONFIG="" bin/why3session.@OCAMLBEST@ html $$x -o $(GALLERYDIR)/$$f; \
rm -f $(GALLERYDIR)/$$f/$$f.zip; \ cp examples/$$f.mlw $(GALLERYDIR)/$$f/; \
cd examples/; \ cd examples/; \
zip -r $(GALLERYDIR)/$$f/$$f.zip $$f.mlw $$f; \ rm -f $(GALLERYDIR)/$$f/$$f.zip; \
zip -q -r $(GALLERYDIR)/$$f/$$f.zip $$f.mlw $$f; \
cd ..; \ cd ..; \
done done
...@@ -657,11 +657,12 @@ gallery-subs:: ...@@ -657,11 +657,12 @@ gallery-subs::
@if test "$(GALLERYDIR)" = ""; then echo "set GALLERYDIR first"; exit 1; fi @if test "$(GALLERYDIR)" = ""; then echo "set GALLERYDIR first"; exit 1; fi
@for d in $(GALLERYSUBS) ; do \ @for d in $(GALLERYSUBS) ; do \
echo "exporting examples/$$d"; \ echo "exporting examples/$$d"; \
rm -f $(GALLERYDIR)/$$d/$$d.zip; \ mkdir -p $(GALLERYDIR)/$$d; \
cd examples/$$d; \ cd examples/$$d; \
why3 -L . doc --stdlib-url http://why3.lri.fr/stdlib/ *.mlw -o $(GALLERYDIR)/$$d; \ WHY3CONFIG="" ../../bin/why3doc.@OCAMLBEST@ -L ../../theories -L ../../modules -L . --stdlib-url http://why3.lri.fr/stdlib/ *.mlw -o $(GALLERYDIR)/$$d; \
cd ..; \ cd ..; \
zip -r $(GALLERYDIR)/$$d/$$d.zip $$d; \ rm -f $(GALLERYDIR)/$$d/$$d.zip; \
zip -q -r $(GALLERYDIR)/$$d/$$d.zip $$d; \
cd ..; \ cd ..; \
done done
...@@ -671,16 +672,15 @@ gallery-subs:: ...@@ -671,16 +672,15 @@ gallery-subs::
x=$*/why3session.xml; \ x=$*/why3session.xml; \
d=`dirname $$x`; \ d=`dirname $$x`; \
f=`basename $$d`; \ f=`basename $$d`; \
why3 session html $$d; \
rm $$d/*.bak; \
echo "exporting $$f"; \ echo "exporting $$f"; \
rm -f $$d/*.bak; \
mkdir -p $(GALLERYDIR)/$$f; \ mkdir -p $(GALLERYDIR)/$$f; \
WHY3CONFIG="" bin/why3session.@OCAMLBEST@ html $$d -o $(GALLERYDIR)/$$f; \
if test -f examples/$$f.mlw; then cp examples/$$f.mlw $(GALLERYDIR)/$$f/; fi; \ if test -f examples/$$f.mlw; then cp examples/$$f.mlw $(GALLERYDIR)/$$f/; fi; \
if test -f examples/$$f.why; then cp examples/$$f.why $(GALLERYDIR)/$$f/; fi; \ if test -f examples/$$f.why; then cp examples/$$f.why $(GALLERYDIR)/$$f/; fi; \
cp examples/$$f/why3session.html $(GALLERYDIR)/$$f/; \
rm -f $(GALLERYDIR)/$$f/$$f.zip; \
cd examples/; \ cd examples/; \
zip -r $(GALLERYDIR)/$$f/$$f.zip $$f.mlw $$f rm -f $(GALLERYDIR)/$$f/$$f.zip; \
zip -q -r $(GALLERYDIR)/$$f/$$f.zip $$f.mlw $$f
######## ########
# XML DTD validation # XML DTD validation
...@@ -1685,7 +1685,7 @@ test-runstrat.opt: lib/why3/why3.cmxa lib/why3/META ...@@ -1685,7 +1685,7 @@ test-runstrat.opt: lib/why3/why3.cmxa lib/why3/META
OCAMLPATH=$(PWD)/lib $(MAKE) -C examples/use_api/runstrat clean OCAMLPATH=$(PWD)/lib $(MAKE) -C examples/use_api/runstrat clean
OCAMLPATH=$(PWD)/lib $(MAKE) -C examples/use_api/runstrat opt OCAMLPATH=$(PWD)/lib $(MAKE) -C examples/use_api/runstrat opt
test-runstrat: test-runstrat.$(OCAMLBEST) test-runstrat: test-runstrat.@OCAMLBEST@
test-ocaml-extraction: bin/why3.opt bin/why3extract.opt lib/why3/why3extract.cmxa test-ocaml-extraction: bin/why3.opt bin/why3extract.opt lib/why3/why3extract.cmxa
@echo "driver ocaml32" @echo "driver ocaml32"
......
Markdown is supported
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