Merge pull request #1375 from nojb/self_stubs_build_error_msg

Better error message when (self_build_stubs_archive ...) and (c_names ...) or (cxx_names ...) used simultaneously

Author: nojb

CHANGES.md

@@ -17,6 +17,10 @@ next
 
 - Integration with automatic formatters (#1252, fix #1201, @emillon)
 
+- Better error message when using `(self_build_stubs_archive ...)` and
+  `(c_names ...)` or `(cxx_names ...)` simultaneously.
+  (#1375, fix #1306, @nojb)
+
 1.3.0 (23/09/2018)
 ------------------
 

src/dune_file.ml

@@ -1002,7 +1002,7 @@ module Library = struct
        and wrapped = Wrapped.field
        and optional = field_b "optional"
        and self_build_stubs_archive =
-         field "self_build_stubs_archive" (option string) ~default:None
+         located (field "self_build_stubs_archive" (option string) ~default:None)
        and no_dynlink = field_b "no_dynlink"
        and no_keep_locs = field_b "no_keep_locs"
        and sub_systems =
@@ -1069,6 +1069,23 @@ module Library = struct
             It is inherited from the virtual library."
        | _, _, _ -> ()
        end;
+       let self_build_stubs_archive =
+         let loc, self_build_stubs_archive = self_build_stubs_archive in
+         let err =
+           match c_names, cxx_names, self_build_stubs_archive with
+           | _, _, None -> None
+           | (_ :: _), _, Some _ -> Some "c_names"
+           | _, (_ :: _), Some _ -> Some "cxx_names"
+           | [], [], _ -> None
+         in
+         match err with
+         | None ->
+           self_build_stubs_archive
+         | Some name ->
+           of_sexp_errorf loc
+             "A library cannot use (self_build_stubs_archive ...) \
+              and (%s ...) simultaneously." name
+       in
        { name
        ; public
        ; synopsis

test/blackbox-tests/dune.inc

@@ -287,6 +287,14 @@
    test-cases/github1231
    (progn (run %{exe:cram.exe} -test run.t) (diff? run.t run.t.corrected)))))
 
+(alias
+ (name github1306)
+ (deps (package dune) (source_tree test-cases/github1306))
+ (action
+  (chdir
+   test-cases/github1306
+   (progn (run %{exe:cram.exe} -test run.t) (diff? run.t run.t.corrected)))))
+
 (alias
  (name github1342)
  (deps (package dune) (source_tree test-cases/github1342))
@@ -1002,6 +1010,7 @@
   (alias github1019)
   (alias github1099)
   (alias github1231)
+  (alias github1306)
   (alias github1342)
   (alias github1372)
   (alias github20)
@@ -1120,6 +1129,7 @@
   (alias github1019)
   (alias github1099)
   (alias github1231)
+  (alias github1306)
   (alias github1342)
   (alias github1372)
   (alias github20)

test/blackbox-tests/test-cases/github1306/dune

@@ -0,0 +1,4 @@
+(library
+ (name foo)
+ (c_names foo)
+ (self_build_stubs_archive (bar)))

test/blackbox-tests/test-cases/github1306/dune-project

@@ -0,0 +1 @@
+(lang dune 1.0)

test/blackbox-tests/test-cases/github1306/run.t

@@ -0,0 +1,6 @@
+  $ dune build
+  File "dune", line 4, characters 1-33:
+  4 |  (self_build_stubs_archive (bar)))
+       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+  Error: A library cannot use (self_build_stubs_archive ...) and (c_names ...) simultaneously.
+  [1]