-
Notifications
You must be signed in to change notification settings - Fork 21
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #229 from Ninjapouet/fix#224
Fixed #224: added sites managment.
- Loading branch information
Showing
38 changed files
with
1,243 additions
and
72 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -25,7 +25,7 @@ jobs: | |
|
|
||
| include: | ||
| - os: ubuntu-latest | ||
| ocaml-compiler: 4.07.0 | ||
| ocaml-compiler: 4.08.0 | ||
| skip_test: true | ||
|
|
||
|
|
||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -2,7 +2,6 @@ | |
| *~ | ||
| _build | ||
| .merlin | ||
| .vscode | ||
| /_drom | ||
| /_opam | ||
| /_build | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,83 @@ | ||
| # Maintained by "drom project" | ||
| .PHONY: $(DROMNS)build $(DROMNS)build-deps $(DROMNS)fmt $(DROMNS)fmt-check | ||
| .PHONY: $(DROMNS)install $(DROMNS)dev-deps $(DROMNS)test | ||
| .PHONY: $(DROMNS)clean $(DROMNS)distclean | ||
|
|
||
| DROM_DEV_DEPS := merlin ocamlformat odoc ppx_expect ppx_inline_test $(DEV_DEPS) | ||
|
|
||
|
|
||
| SPHINX_TARGET:=_drom/docs/sphinx | ||
|
|
||
| ODOC_TARGET:=_drom/docs/doc/. | ||
|
|
||
|
|
||
| $(DROMNS)build: | ||
| ./scripts/before.sh build | ||
| opam exec -- dune build @install | ||
| ./scripts/copy-bin.sh drom drom_lib drom_toml | ||
| ./scripts/after.sh build | ||
|
|
||
| $(DROMNS)build-deps: | ||
| if ! [ -e _opam ]; then \ | ||
| opam switch create . 4.14.1 ; \ | ||
| fi | ||
| opam install ./opam/*.opam --deps-only | ||
|
|
||
|
|
||
| .PHONY: $(DROMNS)doc-common $(DROMNS)odoc $(DROMNS)view | ||
| .PHONY: $(DROMNS)sphinx | ||
| $(DROMNS)doc-common: $(DROMNS)build | ||
| mkdir -p _drom/docs | ||
| rsync -auv docs/. _drom/docs/. | ||
|
|
||
| $(DROMNS)sphinx: $(DROMNS)doc-common | ||
| ./scripts/before.sh sphinx ${SPHINX_TARGET} | ||
| sphinx-build sphinx ${SPHINX_TARGET} | ||
| ./scripts/after.sh sphinx ${SPHINX_TARGET} | ||
|
|
||
| $(DROMNS)odoc: $(DROMNS)doc-common | ||
| mkdir -p ${ODOC_TARGET} | ||
| ./scripts/before.sh odoc ${ODOC_TARGET} | ||
| opam exec -- dune build @doc | ||
| rsync -auv --delete _build/default/_doc/_html/. ${ODOC_TARGET} | ||
| ./scripts/after.sh odoc ${ODOC_TARGET} | ||
|
|
||
| $(DROMNS)doc: $(DROMNS)doc-common $(DROMNS)odoc $(DROMNS)sphinx | ||
|
|
||
| $(DROMNS)view: | ||
| xdg-open file://$$(pwd)/_drom/docs/index.html | ||
|
|
||
| $(DROMNS)fmt: | ||
| opam exec -- dune build @fmt --auto-promote | ||
|
|
||
| $(DROMNS)fmt-check: | ||
| opam exec -- dune build @fmt | ||
|
|
||
| $(DROMNS)install: | ||
| opam pin -y --no-action -k path . | ||
| opam install -y . | ||
|
|
||
| $(DROMNS)opam: | ||
| opam pin -k path . | ||
|
|
||
| $(DROMNS)uninstall: | ||
| opam uninstall . | ||
|
|
||
| $(DROMNS)dev-deps: | ||
| opam install ./opam/*.opam --deps-only --with-doc --with-test | ||
|
|
||
| $(DROMNS)test: | ||
| ./scripts/before.sh test | ||
| opam exec -- dune build @runtest | ||
| ./scripts/after.sh test | ||
|
|
||
| $(DROMNS)clean: | ||
| rm -rf _build | ||
| rm -f *.exe *~ | ||
| ./scripts/after.sh clean | ||
|
|
||
| $(DROMNS)distclean: $(DROMNS)clean | ||
| rm -rf _opam _drom | ||
| ./scripts/after.sh distclean | ||
|
|
||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,8 +1,8 @@ | ||
| [project] | ||
| create-project = false | ||
| drom-version = "0.1" | ||
| drom-version = "0.9.2" | ||
| share-repo = "https://github.com/OCamlPro/drom-share" | ||
| share-version = "0.9.0" | ||
| share-version = "branch:ninjapouet:prepare_sites" | ||
|
|
||
| [project] | ||
| authors = ["Fabrice Le Fessant <[email protected]>", "Léo Andrès <[email protected]>"] | ||
|
|
@@ -11,7 +11,7 @@ copyright = "OCamlPro SAS" | |
| edition = "4.14.1" | ||
| github-organization = "ocamlpro" | ||
| license = "LGPL2" | ||
| min-edition = "4.07.0" | ||
| min-edition = "4.08.0" | ||
| name = "drom" | ||
| skeleton = "program" | ||
| synopsis = "The drom tool is a wrapper over opam/dune in an attempt to provide a cargo-like user experience" | ||
|
|
@@ -42,6 +42,8 @@ skip = ["sphinx/about.rst", "src/drom_lib/main.ml", "sphinx/index.rst", "CHANGES | |
| [dependencies] | ||
|
|
||
| # project-wide tools dependencies (not for package-specific deps) | ||
| [tools] | ||
| dune = ">=2.8" | ||
| [tools.ocamlformat] | ||
| for-test = true | ||
| [tools.odoc] | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.