Skip to content
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
4 changes: 2 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -52,9 +52,9 @@ jobs:
token: ${{ github.token }}

# Eliom 13 and ocsigen-ppx-rpc 2.0 are merged but unreleased;
# ocsigen-dune-rules is still on its development branch.
# ocsigen-dune-rules is unreleased.
- run: opam pin -yn git+https://github.com/ocsigen/eliom#master
- run: opam pin -yn git+https://github.com/ocsigen/ocsigen-dune-rules#modernize
- run: opam pin -yn git+https://github.com/ocsigen/ocsigen-dune-rules#main
- run: opam pin -yn git+https://github.com/ocsigen/ocsigen-ppx-rpc#main

- run: opam install . --deps-only
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/doc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ jobs:
# Same pins as build.yml: the unreleased modernized stack on its
# branches.
opam pin -yn git+https://github.com/ocsigen/eliom#master
opam pin -yn git+https://github.com/ocsigen/ocsigen-dune-rules#modernize
opam pin -yn git+https://github.com/ocsigen/ocsigen-dune-rules#main
opam pin -yn git+https://github.com/ocsigen/ocsigen-ppx-rpc#main
opam install . --deps-only --with-doc
# wodoc themes the pages. Its opam pin-depends pulls odoc / odoc-driver
Expand Down
5 changes: 5 additions & 0 deletions dune
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,8 @@
(section share)
(files
(glob_files css/*.css)))

(env
(_
(flags
(:standard -w +A-4-9-16-27-32-33-39-44-48-60-70))))
3 changes: 2 additions & 1 deletion dune-project
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,8 @@
(>= "2.0.0"))
lwt_ppx
ocsigen-dune-rules
(ocsigen-ppx-rpc (>= "2.0~"))))
(ocsigen-ppx-rpc
(>= "2.0~"))))

(package
(name ocsigen-toolkit-compat)
Expand Down
93 changes: 93 additions & 0 deletions src/widgets/Ot/dune
Original file line number Diff line number Diff line change
@@ -0,0 +1,93 @@
(rule
(with-stdout-to
dune.corrected
(run
ocsigen-dune-rules
gen-library
ot
--wrapped
true
--public-name
ocsigen-toolkit
--libraries
calendar
--server-libraries
js_of_ocaml
--preprocess
lwt_ppx
--dune
%{dep:dune})))

; [ocsigen-dune-rules] Do not remove this line.
; Below this line, any changes will be overwritten.
;
; To update the rules below, modify the invocation of ocsigen-dune-rules above
; and run:
;
; dune runtest --auto-promote
;

(rule
(alias runtest)
(action
(diff dune dune.corrected)))

(library
(public_name ocsigen-toolkit.server)
(name ot)
(modes byte native)
(wrapped true)
(library_flags
(:standard -linkall))
(preprocess
(pps
eliom.ppx.server
ocsigen-ppx-rpc
js_of_ocaml-ppx_deriving_json
--rpc-raw
lwt_ppx))
(libraries eliom.server js_of_ocaml calendar))

(subdir
client
(library
(public_name ocsigen-toolkit.client)
(name ot)
(modes byte)
(wrapped true)
(library_flags
(:standard -linkall))
(libraries eliom.client js_of_ocaml js_of_ocaml-lwt calendar))
(dynamic_include ../dune.client))

(subdir
client/ppx
(rule
(write-file main.ml "let () = Ppxlib.Driver.standalone ()"))
(executable
(name main)
(libraries
ppxlib
eliom.ppx.client
ocsigen-ppx-rpc
js_of_ocaml-ppx
js_of_ocaml-ppx_deriving_json
lwt_ppx)))

(rule
(deps
(glob_files *.eliom)
(glob_files *.eliomi))
(action
(with-stdout-to
dune.client
(run
ocsigen-dune-rules
gen-client-modules
--internal-prefix
ot
--server-objs-dir
../.ot.objs/byte
.
--
--rpc-raw))))
30 changes: 0 additions & 30 deletions src/widgets/client/dune

This file was deleted.

Loading
Loading