Merge pull request #315 from dtolnay/build

Make buck/bazel generated filepaths match source path with extension

Author: dtolnay

demo/BUCK

@@ -22,24 +22,22 @@ cxx_library(
 genrule(
     name = "gen-header",
     srcs = ["src/main.rs"],
-    out = "generated.h",
+    out = "src/main.rs.h",
     cmd = "$(exe //:codegen) --header ${SRCS} > ${OUT}",
     type = "cxxbridge",
 )
 
 genrule(
     name = "gen-source",
     srcs = ["src/main.rs"],
-    out = "generated.cc",
+    out = "src/main.rs.cc",
     cmd = "$(exe //:codegen) ${SRCS} > ${OUT}",
     type = "cxxbridge",
 )
 
 cxx_library(
     name = "include",
-    exported_headers = {
-        "src/main.rs.h": ":gen-header",
-    },
+    exported_headers = [":gen-header"],
 )
 
 cxx_library(

demo/BUILD

@@ -23,23 +23,22 @@ cc_library(
 genrule(
     name = "gen-header",
     srcs = ["src/main.rs"],
-    outs = ["main.rs.h"],
+    outs = ["src/main.rs.h"],
     cmd = "$(location //:codegen) --header $< > $@",
     tools = ["//:codegen"],
 )
 
 genrule(
     name = "gen-source",
     srcs = ["src/main.rs"],
-    outs = ["generated.cc"],
+    outs = ["src/main.rs.cc"],
     cmd = "$(location //:codegen) $< > $@",
     tools = ["//:codegen"],
 )
 
 cc_library(
     name = "include",
     hdrs = [":gen-header"],
-    include_prefix = "demo/src",
 )
 
 cc_library(

tests/BUCK

@@ -37,20 +37,20 @@ cxx_library(
 genrule(
     name = "gen-lib-header",
     srcs = ["ffi/lib.rs"],
-    out = "lib.rs.h",
+    out = "ffi/lib.rs.h",
     cmd = "$(exe //:codegen) --header ${SRCS} > ${OUT}",
 )
 
 genrule(
     name = "gen-lib-source",
     srcs = ["ffi/lib.rs"],
-    out = "lib.rs.cc",
+    out = "ffi/lib.rs.cc",
     cmd = "$(exe //:codegen) ${SRCS} > ${OUT}",
 )
 
 genrule(
     name = "gen-module-source",
     srcs = ["ffi/module.rs"],
-    out = "module.rs.cc",
+    out = "ffi/module.rs.cc",
     cmd = "$(exe //:codegen) ${SRCS} > ${OUT}",
 )

tests/BUILD

@@ -39,15 +39,15 @@ cc_library(
 genrule(
     name = "gen-lib-header",
     srcs = ["ffi/lib.rs"],
-    outs = ["lib.rs.h"],
+    outs = ["ffi/lib.rs.h"],
     cmd = "$(location //:codegen) --header $< > $@",
     tools = ["//:codegen"],
 )
 
 genrule(
     name = "gen-lib-source",
     srcs = ["ffi/lib.rs"],
-    outs = ["lib.rs.cc"],
+    outs = ["ffi/lib.rs.cc"],
     cmd = "$(location //:codegen) $< > $@",
     tools = ["//:codegen"],
 )
@@ -56,12 +56,13 @@ cc_library(
     name = "lib-include",
     hdrs = [":gen-lib-header"],
     include_prefix = "cxx-test-suite",
+    strip_include_prefix = "ffi",
 )
 
 genrule(
     name = "gen-module-source",
     srcs = ["ffi/module.rs"],
-    outs = ["module.rs.cc"],
+    outs = ["ffi/module.rs.cc"],
     cmd = "$(location //:codegen) $< > $@",
     tools = ["//:codegen"],
 )