Skip to content
This repository has been archived by the owner on Sep 15, 2021. It is now read-only.

Add preview web app #22

Merged
merged 14 commits into from
Jun 3, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 3 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,16 +37,16 @@ jobs:
run: opam install ocamlformat.0.15.0
if: ${{ matrix.os == 'ubuntu-latest' }}

- name: Install opam packages
- name: Install Opam packages
run: opam install . --deps-only --with-test

- name: Check formatting
run: make fmt
if: ${{ matrix.os == 'ubuntu-latest' && always() }}

- name: Run build
run: make build
run: opam exec -- dune build --root . --ignore-promoted-rules

- name: Run the unit tests
run: make test
run: opam exec -- dune runtest --root . --ignore-promoted-rules
timeout-minutes: 1
24 changes: 21 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,6 +1,24 @@
_build
_opam
# Dune generated files
_build/
*.install

# Local OPAM switch
_opam/

# Merlin configuration files
.merlin

# Normal npm stuff
npm-debug.log
yarn-error.log
node_modules/
.cache/
dist/
build/

# ReScript
/lib/bs
/lib/**/*.js
.vscode

# IDE related
.vscode*
27 changes: 19 additions & 8 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -7,24 +7,35 @@ $(eval $(ARGS):;@:)
all:
opam exec -- dune build --root . @install

.PHONY: dev
dev: ## Install development dependencies
opam switch create . --no-install -y
.PHONY: deps
deps: ## Install development dependencies
opam install -y dune-release ocamlformat utop ocaml-lsp-server
npm install
opam install --deps-only --with-test --with-doc -y .

.PHONY: create_switch
create_switch:
opam switch create . 4.10.2 --no-install

.PHONY: switch
switch: create_switch deps ## Create an opam switch and install development dependencies

.PHONY: lock
lock: ## Generate a lock file
opam lock -y .

.PHONY: build
build: ## Build the project, including non installable libraries and executables
opam exec -- dune build --root .

.PHONY: start
start: all ## Start the project
opam exec -- dune exec --root . src/bin/main.exe $(ARGS)

.PHONY: install
install: all ## Install the packages on the system
opam exec -- dune install --root .

.PHONY: preview
preview: all ## Run the produced executable
cd src/ood-preview/ && opam exec -- script/watch.sh

.PHONY: test
test: ## Run the unit tests
opam exec -- dune runtest --root .
Expand All @@ -43,7 +54,7 @@ servedoc: doc ## Open odoc documentation with default web browser

.PHONY: fmt
fmt: ## Format the codebase with ocamlformat
opam exec -- dune build --root . @fmt --auto-promote
opam exec -- dune build --root . --auto-promote @fmt

.PHONY: watch
watch: ## Watch for the filesystem and rebuild on every change
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ description: >
authors:
- Juergen Wolff von Gudenberg
published: "1996"
cover: ./img/wolff.gif
cover: books/wolff.gif
language: german
---

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ authors:
- Jean-Christophe Filliâtre
- Sylvain Conchon
published: "2014"
cover: ./img/apprendre_ocaml_cover.png
cover: books/apprendre_ocaml_cover.png
language: french
isbn: "2-21213-678-1"
---
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ authors:
- Catherine Dubois
- Valérie Ménissier Morain
published: "2004"
cover: ./img/dubois-menissier.gif
cover: books/dubois-menissier.gif
language: french
isbn: "2-7462-0819-9"
---
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ authors:
- Guy Cousineau
- Michel Mauny
published: "1995"
cover: ./img/cousineau-mauny-fr.gif
cover: books/cousineau-mauny-fr.gif
language: french
isbn: "2-84074-114-8"
---
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ authors:
- Thérèse Accart Hardin
- Véronique Donzeau-Gouge Viguié
published: "1992"
cover: ./img/hardin-donzeau-gouge.gif
cover: books/hardin-donzeau-gouge.gif
language: french
isbn: "2-7296-0419-7"
---
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ description: >
authors:
- Luc Albert
published: "1997"
cover: ./img/albert.gif
cover: books/albert.gif
language: french
isbn: "2-84180-106-3"
---
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ authors:
- Pascal Manoury
- Bruno Pagano
published: "2002"
cover: ./img/logocaml-oreilly.gif
cover: books/logocaml-oreilly.gif
language: english
---

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ authors:
- Pascal Manoury
- Bruno Pagano
published: "2000"
cover: ./img/chailloux-manoury-pagano.jpg
cover: books/chailloux-manoury-pagano.jpg
language: french
isbn: "2-84177-121-0"
---
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ description: >
authors:
- Mohammed-Said Habet
published: "2015"
cover: ./img/Initiation_a_la_programmation_fonctionnelle_en_OCaml.jpg
cover: books/Initiation_a_la_programmation_fonctionnelle_en_OCaml.jpg
language: french
isbn: "9782332978400"
---
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ description: >
authors:
- Jason Hickey
published: "2008"
cover: ./img/default.png
language: english
---

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ authors:
- Carla Limongelli
- Marta Cialdea
published: "2002"
cover: ./img/limongelli-cialdea.gif
cover: books/limongelli-cialdea.gif
language: italian
isbn: "88-7488-031-6"
---
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ authors:
- Xavier Leroy
- Pierre Weis
published: "1993"
cover: ./img/leroy-weis.jpg
cover: books/le-language-caml-cover.jpg
language: french
isbn: "2-10-004383-8"
---
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ authors:
- Xavier Leroy
- Pierre Weis
published: "1993"
cover: ./img/leroy-weis.jpg
cover: books/manuel-de-reference-du-langage-caml-cover.jpg
language: french
isbn: "2-7296-0492-8"
---
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ description: >
authors:
- John Whitington
published: 2014-08-26
cover: ./img/more-ocaml-300-376.png
cover: books/more-ocaml-300-376.png
language: english
---

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ description: >
authors:
- Michel Quercia
published: "2000"
cover: ./img/quercia.gif
cover: books/quercia.gif
language: french
isbn: "2-7117-8990"
---
Expand Down
1 change: 0 additions & 1 deletion data/books/ocaml-book.md → data/books/en/ocaml-book.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ description: >
authors:
- Hongbo Zhang
published: "2011"
cover: ./img/default.png
language: english
---

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ description: >
authors:
- "Jon D. Harrop"
published: "2005"
cover: ./img/more-ocaml-300-376.png
cover: books/harrop-book.gif
language: english
---

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ description: >
authors:
- John Whitington
published: 2013-06-07
cover: ./img/OCaml_from_beginning.png
cover: books/OCaml_from_beginning.png
language: english
---

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ description: >
authors:
- Andrei de Araújo Formiga
published: "2015"
cover: ./img/opfp.png
cover: books/opfp.png
language: portugese
---

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ authors:
- Jacques Garrigue
- Didier Rémy
- Jérôme Vouillon
cover: books/colour-icon-170x148.png
language: english
---

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ description: >
authors:
- Denis Monasse
published: "1997"
cover: ./img/monasse-2.jpg
cover: books/monasse-2.jpg
language: french
isbn: "2-7117-8839-3"
---
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ description: >
authors:
- Denis Monasse
published: "1996"
cover: ./img/monasse-1.gif
cover: books/monasse-1.gif
language: french
isbn: "2-7117-8831-8"
---
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ description: >
authors:
- Pascal Manoury
published: "2005"
cover: ./img/manoury.jpg
cover: books/manoury.png
language: french
isbn: "978-2-916466-05-7"
---
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ description: >
authors:
- Jacques Rouablé
published: "1997"
cover: ./img/rouable.jpg
cover: books/rouable.jpg
language: french
isbn: "2-212-08944-9"
---
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ description: >
authors:
- Philippe Narbel
published: "2005"
cover: ./img/narbel.jpg
cover: books/narbel.jpg
language: french
isbn: "2-7117-4843-X"
---
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ description: >
authors:
- Massimo Maria Ghisalberti
published: "2015"
cover: ./img/default.png
language: italian
---

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ authors:
- Anil Madhavapeddy
- Yaron Minsky
published: 2013-11-25
cover: ./img/real-world-ocaml.jpg
cover: books/real-world-ocaml.jpg
language: english
---

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ description: >
authors:
- Bruno Petazzoni
published: "2001"
cover: ./img/petazzoni.jpg
cover: books/petazzoni.jpg
language: french
isbn: "3-540-67387-3"
---
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ description: >
authors:
- Guy Cousineau
published: "1998"
cover: ./img/cousineau-mauny-en.gif
cover: books/cousineau-mauny-en.gif
language: english
isbn: "0-521-57681-4"
---
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ authors:
- Nicholas Monje
- Allen Downey
published: "2008"
cover: ./img/default.png
cover: books/thinkocaml_cover_web.png
language: english
---

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ authors:
- Xavier Leroy
- Didier Rémy
published: 2010-05-01
cover: ./img/default.png
language: english
---

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ description: >
authors:
- Didier Rémy
published: 2002-09-20
cover: ./img/default.png
language: english
---

Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added data/media/books/OCaml_from_beginning.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
File renamed without changes
Binary file added data/media/books/apprendre_ocaml_cover.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added data/media/books/colour-icon-170x148.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added data/media/books/harrop-book.gif
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added data/media/books/logocaml-oreilly.gif
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added data/media/books/more-ocaml-300-376.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
File renamed without changes
Binary file added data/media/books/opfp.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added data/media/books/real-world-ocaml.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added data/media/books/thinkocaml_cover_web.png
File renamed without changes
2 changes: 1 addition & 1 deletion data/success_stories/en/astree.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
title: The ASTRÉE Static Analyzer
image: astree-thumb.gif
image: success-stories/astree-thumb.gif
url: http://www.astree.ens.fr/
---

Expand Down
2 changes: 1 addition & 1 deletion data/success_stories/en/coq.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
title: Coq
image: coq-thumb.jpg
image: success-stories/coq-thumb.jpg
url: http://coq.inria.fr/
---

Expand Down
Loading