Split the package into a lib and the line commands

kicadsch.opam

@@ -0,0 +1,21 @@
+opam-version: "1.2"
+maintainer: "Jean-Noel Avila <jn.avila@free.fr>"
+author: "Jean-Noel Avila <jn.avila@free.fr>"
+homepage: "https://jnavila.github.io/plotkicadsch/"
+bug-reports: "https://github.com/jnavila/plotkicadsch/issues"
+license: "ISC"
+dev-repo: "https://github.com/jnavila/plotkicadsch.git"
+doc: ""
+build: [
+  [ "jbuilder" "subst" ] {pinned}
+  [ "jbuilder" "build" "-p" name "-j" jobs ]
+]
+build-test: [["jbuilder" "runtest" "-p" name "-j" jobs]]
+depends: [
+  "jbuilder" {build}
+  "oUnit" {test}
+  "pcre"
+  "tyxml" {>= "4.0.0"}
+  "base64"
+]
+available: [ ocaml-version >= "4.03" ]

kicadsch/src/jbuild

@@ -0,0 +1,16 @@
+(jbuild_version 1)
+
+(library
+ ((name        kicadsch)
+  (public_name kicadsch)
+  (synopsis "Library to plotting KiCAD schematics")
+  (libraries
+   (
+    pcre
+    tyxml
+    base64
+    str
+    )
+   )
+  (flags (:standard -w -3 -safe-string))
+  ))

src/kicadsch.ml → kicadsch/src/kicadsch.ml

@@ -1,4 +1,6 @@
 open KicadSch_sigs
+module SvgPainter = SvgPainter
+module Sigs=KicadSch_sigs
 module MakeSchPainter (P: Painter): (SchPainter with type painterContext := P.t) =
 struct
   module CPainter = Kicadlib.MakePainter(P)
@@ -57,7 +59,7 @@ struct
     | "I"| "Input" -> InputPort
     | "B"| "BiDi" -> BiDiPort
     | "~" -> NoPort
-    |   _ as s -> ignore (Lwt_io.eprintf "unknown port type %s\n" s); NoPort
+    |   _ as s -> ignore (Printf.printf "unknown port type %s\n" s); NoPort
 
   let justify_of_string s =
     match String.get s 0 with
@@ -254,7 +256,7 @@ struct
                 (Printf.printf "cannot plot component with missing definitions !";
                  comp, canevas)
            else comp,canevas)
-    | _ -> (ignore(Lwt_io.eprintf "ignored %s\n" line);
+    | _ -> (ignore(Printf.printf "ignored %s\n" line);
           comp, canevas)
 
   let parse_wire_wire =

kicadsch/test/jbuild

@@ -0,0 +1,17 @@
+
+(executable
+ ((name        test)
+  (libraries
+   (
+    oUnit
+    kicadsch
+    )
+   )
+  (flags (:standard -w -27 ))
+
+  ))
+
+(alias
+ ((name    runtest)
+  (deps    (test.exe))
+  (action  (run ${<}))))

test/stubPainter.ml → kicadsch/test/stubPainter.ml

@@ -1,4 +1,4 @@
-open KicadSch_sigs
+open Kicadsch.Sigs
 
 type t = string list
 
@@ -46,7 +46,7 @@ let paint_image co s b c =
   c
 let get_context () = []
 
-let result: string list ref = ref []
+let set_canevas_size _ _ c =
+  c
 
-let write oc c =
-  result := c; Lwt.return_unit
+let write c = c

test/test.ml → kicadsch/test/test.ml

@@ -1,18 +1,15 @@
 open OUnit
-open Lwt.Infix
 
 module MUT = Kicadsch.MakeSchPainter(StubPainter)
 
-let toto = Lwt_io.open_file Lwt_io.Output "/tmp/toto"
 
 let init () = MUT.initial_context ()
 
 let test_printable_F_line () =
   let line = "F 0 \"Y1\" V 10004 3631 50  0000 L CNN" in
   let u = MUT.parse_line "$Comp" (init ())  in
   let v = MUT.parse_line line u in
-  Lwt_main.run (toto >>= fun t -> MUT.output_context v t);
-  match !StubPainter.result with
+  match StubPainter.write (MUT.output_context v) with
   | [] -> failwith "Field should have been printed"
   | [v] -> assert true
   | u::v::w -> failwith "Only one line should be printed"
@@ -22,17 +19,15 @@ let test_notprintable_F_line () =
   let u = MUT.parse_line "$Comp" (init ())  in
   let u' = MUT.parse_line line u in
   let v = MUT.parse_line "$EndComp" u' in
-  Lwt_main.run (toto >>= fun t -> MUT.output_context v t);
-  match !StubPainter.result with
+  match StubPainter.write (MUT.output_context v) with
   | [] -> ()
   | _ -> failwith "Field should not have been printed"
 
 let match_wire_line () =
   let line = "	5500 1700 5500 2200" in
   let u = MUT.parse_line "Wire Wire Line" (init ())  in
   let v = MUT.parse_line line u in
-  Lwt_main.run (toto >>= fun t -> MUT.output_context v t);
-  match !StubPainter.result with
+  match StubPainter.write (MUT.output_context v) with
   | [v] -> ()
   | _ -> failwith "Wire line should have matched"
 

plotkicadsch.opam

@@ -10,14 +10,9 @@ build: [
   [ "jbuilder" "build" "-p" name "-j" jobs ]
 ]
 depends: [
-  "ocamlfind" {build}
   "jbuilder" {build}
- "pcre"
- "tyxml" {>= "4.0.0"}
- "lwt"
- "base64"
- "sha"
- "git"
- "git-unix"
+  "lwt"
+  "sha"
+  "git"
+  "git-unix"
 ]
-available: [ ocaml-version >= "4.03" ]

src/jbuild → plotkicadsch/src/jbuild

@@ -7,20 +7,18 @@
   (package plotkicadsch)
  (libraries
   (
+   kicadsch
    git-unix
    lwt
    lwt.unix
    sha
-   pcre
-   tyxml
-   base64
    str
    )
   )
- (flags (:standard -w -3 -safe-string))
  ))
 
 (install
-  ((section bin)
+ ((package plotkicadsch)
+  (section bin)
    (files   (git-imgdiff))
   ))

src/plotgitsch.ml → plotkicadsch/src/plotgitsch.ml

@@ -2,7 +2,7 @@ open Lwt.Infix
 open Git_unix
 module Search = Git.Search.Make(FS)
 
-module SvgSchPainter = Kicadsch.MakeSchPainter(SvgPainter)
+module SvgSchPainter = Kicadsch.MakeSchPainter(Kicadsch.SvgPainter)
 open SvgSchPainter
 
 module type Simple_FS = sig
@@ -97,7 +97,7 @@ let process_file initctx svg_name content =
   initctx >>= fun init ->
   content >|= Str.split (Str.regexp "\n") >>= fun lines ->
   Lwt_stream.fold parse_line (Lwt_stream.of_list lines) init >>= fun endcontext ->
-  Lwt_io.with_file ~mode:Lwt_io.Output svg_name (fun o -> Lwt_io.write o (SvgPainter.write @@ output_context endcontext))
+  Lwt_io.with_file ~mode:Lwt_io.Output svg_name (fun o -> Lwt_io.write o (Kicadsch.SvgPainter.write @@ output_context endcontext))
 
 let rev_parse r =
   let open Lwt_process in

src/plotkicadsch.ml → plotkicadsch/src/plotkicadsch.ml

@@ -1,4 +1,5 @@
-module SvgSchPainter = Kicadsch.MakeSchPainter(SvgPainter)
+open Kicadsch
+module SvgSchPainter = MakeSchPainter(SvgPainter)
 open Lwt
 open SvgSchPainter