Skip to content

Commit

Permalink
Merge pull request #57 from AestheticIntegration/feat-documentation-m…
Browse files Browse the repository at this point in the history
…akefile

Adding a doc target in the Makefile
  • Loading branch information
ignaden authored Sep 4, 2017
2 parents 90d7012 + 5d0d4a9 commit 87036ab
Show file tree
Hide file tree
Showing 6 changed files with 61 additions and 293 deletions.
48 changes: 48 additions & 0 deletions INSTALL.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
## OCaml compilation of the `fix-engine` model

Build all the `*.cma` libraries in each module subfolder:

```
make build
```

Build a FIX server, based on the model:

```
make server
```

Build a FIX client that runs the test suite:

```
make build_test
```

To run the test suite, you can launch the `run_tests.sh` bash script.

## Making and updating documentation in the `gh-pages`

To update the documentation in the `gh-pages` branch, you can do the following:

- checkout the `master` branch and call maketo generate the `doc` folder

```
git checkout master git status
make doc
```

- stash the changes in the `doc` folder

```
git add doc/*
git stash
```

- checkout gh-pages and apply the stash

```
git checkout gh-pages
git checkout stash -- doc
git commit -m "Update documentation"
git push origin gh-pages
```
14 changes: 13 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,17 @@ build_tests:
jbuilder build src-tests/test_runner.bc
rm jbuild-ignore

_build/default/_doc:
@echo "src-protocol-exts-pp-vg" > jbuild-ignore
@echo "src-protocol-exts-vg" >> jbuild-ignore
jbuilder build @doc
rm jbuild-ignore

doc: _build/default/_doc
rm -rf doc
mv _build/default/_doc doc
rm doc/odoc.css

module_graph.svg: _build/doc/all_modules.docdir/all_modules.dot
sed -e 's/rotate=90;//g' "$<" | dot -Tsvg -o $@

Expand All @@ -37,6 +48,7 @@ install-upgrade-deps:
opam pin -y add lwt 2.6.0
opam install -y jbuilder
opam install -y yojson
opam install -y odoc

# dev-setup is used by (human) developers
dev-setup: install-upgrade-deps
Expand All @@ -45,5 +57,5 @@ dev-setup: install-upgrade-deps
clean:
jbuilder clean

.PHONY: build build_vgs run run_server clean
.PHONY: build build_vgs run run_server clean doc

30 changes: 0 additions & 30 deletions doc/all_modules.odocl

This file was deleted.

46 changes: 0 additions & 46 deletions doc/api.odocl

This file was deleted.

23 changes: 0 additions & 23 deletions doc/fix-open.svg

This file was deleted.

193 changes: 0 additions & 193 deletions doc/style.css

This file was deleted.

0 comments on commit 87036ab

Please sign in to comment.