From 2913d287ff843c256f304a067d439934e3767974 Mon Sep 17 00:00:00 2001 From: Boris Kolpackov Date: Thu, 24 May 2018 06:24:46 +0200 Subject: Update for use with bdep --- .gitignore | 2 ++ build/.gitignore | 2 ++ odb/buildfile | 6 ++++++ 3 files changed, 10 insertions(+) diff --git a/.gitignore b/.gitignore index a3f04ca..d13669b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,5 @@ +.bdep/ + # Compiler/linker output. # *.d diff --git a/build/.gitignore b/build/.gitignore index 225c27f..4a730a3 100644 --- a/build/.gitignore +++ b/build/.gitignore @@ -1 +1,3 @@ config.build +root/ +bootstrap/ diff --git a/odb/buildfile b/odb/buildfile index f2b3354..117ab25 100644 --- a/odb/buildfile +++ b/odb/buildfile @@ -6,6 +6,7 @@ plugin_dir = $config.odb.plugin_dir define plugin: libs plugin{*}: bin.lib.prefix = # No lib prefix. +plugin{*}: backlink = true # Backlink in forwarded configs (next to exe). # On Windows we want the plugin (odb.dll) to go into bin/ (default), next to # the driver (odb.exe) since failed that we won't be able to find libraries we @@ -58,4 +59,9 @@ if $cli.configured # cli.cxx{*}: dist = true cli.cxx{*}: clean = ($src_root != $out_root) + + # We keep the generated code in the repository so copy it back to src in + # case of a forwarded configuration. + # + cli.cxx{*}: backlink = overwrite } -- cgit v1.1