Allow . in c_names and cxx_names

Signed-off-by: Rudi Grinberg <[email protected]>
ocaml · Apr 9, 2019 · 2cb6a98 · 2cb6a98
1 parent 5ac44ec
commit 2cb6a98
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 9 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -37,6 +37,8 @@ unreleased
 - Do not exit dune if some source directories are unreadable. Instead, warn the
   user that such directories need to be ignored (#2004, fix #310, @rgrinberg)
 
+- Allow "." in `c_names` and `cxx_names` (#2036, fix #2033, @rgrinberg)
+
 1.8.2 (10/03/2019)
 ------------------
 

diff --git a/src/c.ml b/src/c.ml
@@ -17,7 +17,7 @@ module Kind = struct
     | Recognized of string * t
 
   let split_extension fn ~dune_version =
-    match String.lsplit2 fn ~on:'.' with
+    match String.rsplit2 fn ~on:'.' with
     | Some (obj, "c") -> Recognized (obj, C)
     | Some (obj, "cpp") -> Recognized (obj, Cxx)
     | Some (obj, "cxx") ->

diff --git a/test/blackbox-tests/test-cases/github2033/dune-project b/test/blackbox-tests/test-cases/github2033/dune-project
@@ -0,0 +1 @@
+(lang dune 1.8)
diff --git a/test/blackbox-tests/test-cases/github2033/run.t b/test/blackbox-tests/test-cases/github2033/run.t
@@ -1,10 +1,2 @@
 . should be allowed in c names
   $ dune build
-  Info: creating file dune-project with this contents:
-  | (lang dune 1.9)
-
-  File "dune", line 3, characters 10-17:
-  3 |  (c_names file.xx))
-                ^^^^^^^
-  Error: file.xx does not exist as a C source. file.xx.c must be present
-  [1]