Move preview to src/ood-preview

ocaml · Jun 2, 2021 · 8725b28 · 8725b28
1 parent f762514
commit 8725b28
Show file tree

Hide file tree

Showing 48 changed files with 16 additions and 9 deletions.
diff --git a/Makefile b/Makefile
@@ -37,7 +37,7 @@ install: all ## Install the packages on the system
 
 .PHONY: preview
 preview: all ## Run the produced executable
-	opam exec -- ./preview/script/watch.sh
+	cd src/ood-preview/ && opam exec -- script/watch.sh
 
 .PHONY: test
 test: ## Run the unit tests

diff --git a/dune-project b/dune-project
@@ -36,11 +36,14 @@
   yaml
   ppx_import
   ppx_deriving_yaml
-  netlify-cms
   fmt
   cmdliner
   bos
-  alcotest))
+  alcotest
+  (netlify-cms
+   (= :version))
+  (ood
+   (= :version))))
 
 (package
  (name ood-preview)
@@ -56,6 +59,8 @@
   dream-livereload
   yaml
   omd
+  (ood
+   (= :version))
   (alcotest :with-test)
   (odoc :with-doc)))
 

diff --git a/ood-cli.opam b/ood-cli.opam
@@ -15,11 +15,12 @@ depends: [
   "yaml"
   "ppx_import"
   "ppx_deriving_yaml"
-  "netlify-cms"
   "fmt"
   "cmdliner"
   "bos"
   "alcotest"
+  "netlify-cms" {= version}
+  "ood" {= version}
   "odoc" {with-doc}
 ]
 build: [

diff --git a/ood-preview.opam b/ood-preview.opam
@@ -16,6 +16,7 @@ depends: [
   "dream-livereload"
   "yaml"
   "omd"
+  "ood" {= version}
   "alcotest" {with-test}
   "odoc" {with-doc}
 ]

diff --git a/preview/.ocamlformat → src/ood-preview/.ocamlformat b/preview/.ocamlformat → src/ood-preview/.ocamlformat
diff --git a/preview/.ocamlformat-ignore → src/ood-preview/.ocamlformat-ignore b/preview/.ocamlformat-ignore → src/ood-preview/.ocamlformat-ignore
diff --git a/preview/asset/default.png → src/ood-preview/asset/default.png b/preview/asset/default.png → src/ood-preview/asset/default.png
diff --git a/preview/asset/dune → src/ood-preview/asset/dune b/preview/asset/dune → src/ood-preview/asset/dune
@@ -16,6 +16,6 @@
     node_modules/tailwindcss/lib/cli.js
     build
     -c
-    preview/config/tailwind.config.js
+    src/ood-preview/config/tailwind.config.js
     -o
     %{target}))))
diff --git a/preview/asset/favicon.ico → src/ood-preview/asset/favicon.ico b/preview/asset/favicon.ico → src/ood-preview/asset/favicon.ico
diff --git a/preview/asset/logo1.jpeg → src/ood-preview/asset/logo1.jpeg b/preview/asset/logo1.jpeg → src/ood-preview/asset/logo1.jpeg
diff --git a/preview/asset/manifest.json → src/ood-preview/asset/manifest.json b/preview/asset/manifest.json → src/ood-preview/asset/manifest.json
diff --git a/preview/asset/robots.txt → src/ood-preview/asset/robots.txt b/preview/asset/robots.txt → src/ood-preview/asset/robots.txt
diff --git a/preview/bin/dune → src/ood-preview/bin/dune b/preview/bin/dune → src/ood-preview/bin/dune
diff --git a/preview/bin/server.ml → src/ood-preview/bin/server.ml b/preview/bin/server.ml → src/ood-preview/bin/server.ml
diff --git a/preview/bin/server.mli → src/ood-preview/bin/server.mli b/preview/bin/server.mli → src/ood-preview/bin/server.mli
diff --git a/preview/config/tailwind.config.js → src/ood-preview/config/tailwind.config.js b/preview/config/tailwind.config.js → src/ood-preview/config/tailwind.config.js
diff --git a/preview/dune → src/ood-preview/dune b/preview/dune → src/ood-preview/dune
diff --git a/preview/lib/ood_preview/book.ml → src/ood-preview/lib/ood_preview/book.ml b/preview/lib/ood_preview/book.ml → src/ood-preview/lib/ood_preview/book.ml
diff --git a/preview/lib/ood_preview/dune → src/ood-preview/lib/ood_preview/dune b/preview/lib/ood_preview/dune → src/ood-preview/lib/ood_preview/dune
@@ -7,8 +7,8 @@
 (rule
  (targets data.ml)
  (deps
-  (source_tree ../../../data/))
+  (source_tree %{workspace_root}/data/))
  (action
   (with-stdout-to
    %{null}
-   (run %{bin:ocaml-crunch} -m plain ../../../data -o %{targets}))))
+   (run %{bin:ocaml-crunch} -m plain %{workspace_root}/data -o %{targets}))))
diff --git a/preview/lib/ood_preview/event.ml → src/ood-preview/lib/ood_preview/event.ml b/preview/lib/ood_preview/event.ml → src/ood-preview/lib/ood_preview/event.ml
diff --git a/preview/lib/ood_preview/exn.ml → src/ood-preview/lib/ood_preview/exn.ml b/preview/lib/ood_preview/exn.ml → src/ood-preview/lib/ood_preview/exn.ml
diff --git a/preview/lib/ood_preview/import.ml → src/ood-preview/lib/ood_preview/import.ml b/preview/lib/ood_preview/import.ml → src/ood-preview/lib/ood_preview/import.ml
diff --git a/preview/lib/ood_preview/media.ml → src/ood-preview/lib/ood_preview/media.ml b/preview/lib/ood_preview/media.ml → src/ood-preview/lib/ood_preview/media.ml
diff --git a/preview/lib/ood_preview/ood_preview.ml → ...od-preview/lib/ood_preview/ood_preview.ml b/preview/lib/ood_preview/ood_preview.ml → ...od-preview/lib/ood_preview/ood_preview.ml
diff --git a/preview/lib/ood_preview/paper.ml → src/ood-preview/lib/ood_preview/paper.ml b/preview/lib/ood_preview/paper.ml → src/ood-preview/lib/ood_preview/paper.ml
diff --git a/preview/lib/ood_preview/success_story.ml → ...-preview/lib/ood_preview/success_story.ml b/preview/lib/ood_preview/success_story.ml → ...-preview/lib/ood_preview/success_story.ml
diff --git a/preview/lib/ood_preview/tutorial.ml → src/ood-preview/lib/ood_preview/tutorial.ml b/preview/lib/ood_preview/tutorial.ml → src/ood-preview/lib/ood_preview/tutorial.ml
diff --git a/preview/lib/ood_preview/utils.ml → src/ood-preview/lib/ood_preview/utils.ml b/preview/lib/ood_preview/utils.ml → src/ood-preview/lib/ood_preview/utils.ml
diff --git a/preview/lib/ood_preview/video.ml → src/ood-preview/lib/ood_preview/video.ml b/preview/lib/ood_preview/video.ml → src/ood-preview/lib/ood_preview/video.ml
diff --git a/preview/lib/ood_preview_web/dune → src/ood-preview/lib/ood_preview_web/dune b/preview/lib/ood_preview_web/dune → src/ood-preview/lib/ood_preview_web/dune
diff --git a/.../ood_preview_web/handlers/page_handler.ml → .../ood_preview_web/handlers/page_handler.ml b/.../ood_preview_web/handlers/page_handler.ml → .../ood_preview_web/handlers/page_handler.ml
diff --git a/preview/lib/ood_preview_web/navigation.ml → ...preview/lib/ood_preview_web/navigation.ml b/preview/lib/ood_preview_web/navigation.ml → ...preview/lib/ood_preview_web/navigation.ml
diff --git a/...ew/lib/ood_preview_web/ood_preview_web.ml → ...ew/lib/ood_preview_web/ood_preview_web.ml b/...ew/lib/ood_preview_web/ood_preview_web.ml → ...ew/lib/ood_preview_web/ood_preview_web.ml
diff --git a/preview/lib/ood_preview_web/router.ml → ...ood-preview/lib/ood_preview_web/router.ml b/preview/lib/ood_preview_web/router.ml → ...ood-preview/lib/ood_preview_web/router.ml
diff --git a/..._preview_web/templates/books_template.eml → ..._preview_web/templates/books_template.eml b/..._preview_web/templates/books_template.eml → ..._preview_web/templates/books_template.eml
diff --git a/preview/lib/ood_preview_web/templates/dune → ...review/lib/ood_preview_web/templates/dune b/preview/lib/ood_preview_web/templates/dune → ...review/lib/ood_preview_web/templates/dune
diff --git a/...preview_web/templates/events_template.eml → ...preview_web/templates/events_template.eml b/...preview_web/templates/events_template.eml → ...preview_web/templates/events_template.eml
diff --git a/...web/templates/header_section_template.eml → ...web/templates/header_section_template.eml b/...web/templates/header_section_template.eml → ...web/templates/header_section_template.eml
diff --git a/...preview_web/templates/header_template.eml → ...preview_web/templates/header_template.eml b/...preview_web/templates/header_template.eml → ...preview_web/templates/header_template.eml
diff --git a/..._preview_web/templates/index_template.eml → ..._preview_web/templates/index_template.eml b/..._preview_web/templates/index_template.eml → ..._preview_web/templates/index_template.eml
diff --git a/...preview_web/templates/layout_template.eml → ...preview_web/templates/layout_template.eml b/...preview_web/templates/layout_template.eml → ...preview_web/templates/layout_template.eml
diff --git a/...preview_web/templates/papers_template.eml → ...preview_web/templates/papers_template.eml b/...preview_web/templates/papers_template.eml → ...preview_web/templates/papers_template.eml
diff --git a/...eb/templates/success_stories_template.eml → ...eb/templates/success_stories_template.eml b/...eb/templates/success_stories_template.eml → ...eb/templates/success_stories_template.eml
diff --git a/...eview_web/templates/tutorial_template.eml → ...eview_web/templates/tutorial_template.eml b/...eview_web/templates/tutorial_template.eml → ...eview_web/templates/tutorial_template.eml
diff --git a/...preview_web/templates/videos_template.eml → ...preview_web/templates/videos_template.eml b/...preview_web/templates/videos_template.eml → ...preview_web/templates/videos_template.eml
diff --git a/preview/script/watch.sh → src/ood-preview/script/watch.sh b/preview/script/watch.sh → src/ood-preview/script/watch.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
-source_dirs="preview/lib preview/bin preview/asset preview/config lib/ data/"
-args=${*:-"preview/bin/server.exe run"}
+source_dirs="lib bin asset config lib/ data/"
+args=${*:-"bin/server.exe run"}
 cmd="dune exec ${args}"
 
 function sigint_handler() {

diff --git a/preview/test/ood_preview_web/dune → src/ood-preview/test/ood_preview_web/dune b/preview/test/ood_preview_web/dune → src/ood-preview/test/ood_preview_web/dune
diff --git a/...test/ood_preview_web/page_handler_test.ml → ...test/ood_preview_web/page_handler_test.ml b/...test/ood_preview_web/page_handler_test.ml → ...test/ood_preview_web/page_handler_test.ml