Skip to content

Commit

Permalink
Remove extensions (Eliom_{atom,openid})
Browse files Browse the repository at this point in the history
  • Loading branch information
vasilisp committed Oct 31, 2016
1 parent dd847d8 commit 2fbad4d
Show file tree
Hide file tree
Showing 12 changed files with 1 addition and 1,789 deletions.
9 changes: 0 additions & 9 deletions pkg/META
Original file line number Diff line number Diff line change
Expand Up @@ -20,15 +20,6 @@ package "server" (
archive(byte) = "server.cma"
archive(native) = "server.cmxa"

package "ext" (
directory = "extensions"
description = "Eliom: server-side extensions"
version = "[distributed with Eliom]"
require = "eliom.server"
archive(byte) = "extensions.cma"
archive(native) = "extensions.cmxa"
)

package "monitor" (
directory = "monitor"
description = "Eliom: monitoring"
Expand Down
6 changes: 0 additions & 6 deletions pkg/build.ml
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,6 @@ let _ =

list_to_file "src/lib/server/server.mllib" server_mllib;
list_to_file "src/lib/server/server.mldylib" server_mllib;
list_to_file "src/lib/server/extensions/extensions.mllib" server_ext_mllib;
list_to_file "src/lib/server/extensions/extensions.mldylib" server_ext_mllib;
list_to_file "src/lib/server/api.odocl" server_api;

list_to_file "src/ocamlbuild/ocamlbuild.mllib" ocamlbuild_mllib;
Expand Down Expand Up @@ -107,10 +105,6 @@ let () =
Pkg.lib ~dst:"server/monitor/eliom_monitor_main" ~exts:Exts.module_library "src/lib/server/monitor/eliom_monitor_main" ::
Pkg.lib ~dst:"server/server" ~exts:exts_lib "src/lib/server/server" ::
List.map (fun x -> Pkg.lib ~dst:(spf "server/%s" x) (spf "src/lib/server/%s" x)) server_extra
) @ (
(* SERVER EXTENSIONS *)
Pkg.lib ~dst:"server/extensions/extensions" ~exts:exts_lib "src/lib/server/extensions/extensions" ::
List.map (fun x -> Pkg.lib ~dst:(spf "server/extensions/%s" x) (spf "src/lib/server/extensions/%s" x)) server_ext_extra
) @ [
(* MISC *)

Expand Down
8 changes: 1 addition & 7 deletions pkg/filelist.ml
Original file line number Diff line number Diff line change
Expand Up @@ -185,13 +185,7 @@ let server_extra =
exts ["cmx"] (server.interface @ server.internal)

let server_api =
let names =
server.interface_only @
server.interface @
List.map (fun e -> "extensions/" ^ e)
(server_ext.interface_only @ server_ext.interface)
in
names
server.interface_only @ server.interface

let server_ext_mllib = server_ext.interface @ server_ext.internal
let server_ext_extra =
Expand Down
7 changes: 0 additions & 7 deletions src/_tags
Original file line number Diff line number Diff line change
Expand Up @@ -28,13 +28,6 @@ true:keep_locs

<lib/client/*.ml{,i}>:package(js_of_ocaml.deriving.ppx)

<lib/server/extensions/*.ml>:package(js_of_ocaml.deriving.ppx,lwt.ppx)

<lib/server/extensions/*.ml{,i}>:thread
<lib/server/extensions/*.ml{,i}>:package(lwt,ocsigenserver,ocsigenserver.ext,tyxml,calendar)
<lib/server/extensions/*.ml{,i}>:package(js_of_ocaml.deriving.ppx)
<lib/server/extensions/*.ml{,i}>:I(src/lib/server)

<lib/server/monitor/*.ml>:package(lwt.ppx)
<lib/server/monitor/*.ml{,i}>:thread
<lib/server/monitor/*.ml{,i}>:package(lwt,ocsigenserver,ocsigenserver.ext,tyxml,calendar)
Expand Down
299 changes: 0 additions & 299 deletions src/lib/server/extensions/atom_feed.ml

This file was deleted.

Loading

0 comments on commit 2fbad4d

Please sign in to comment.