aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2015-07-02 07:08:57 +0200
committerBoris Kolpackov <boris@codesynthesis.com>2015-07-02 07:08:57 +0200
commitd236d61ee9821abc4e8d3e3928ac2dfa9cb57d98 (patch)
treebc8968a16c7fcd365554b867d8c7dd4da7a575e3
parent455ad2bf70eb0a6e29c8c7179e1c40c18bd8ee2f (diff)
Make few existing file searching optimizations
-rw-r--r--build/bin/target.cxx4
-rw-r--r--build/cli/target.cxx19
-rw-r--r--tests/cli/simple/buildfile7
3 files changed, 25 insertions, 5 deletions
diff --git a/build/bin/target.cxx b/build/bin/target.cxx
index 1190bfc..9dbcd83 100644
--- a/build/bin/target.cxx
+++ b/build/bin/target.cxx
@@ -29,7 +29,7 @@ namespace build
&file::static_type,
&obja_factory,
nullptr,
- &search_file,
+ &search_target, // Note: not _file(); don't look for an existing file.
false
};
@@ -52,7 +52,7 @@ namespace build
&file::static_type,
&objso_factory,
nullptr,
- &search_file,
+ &search_target, // Note: not _file(); don't look for an existing file.
false
};
diff --git a/build/cli/target.cxx b/build/cli/target.cxx
index 95198e1..b77252d 100644
--- a/build/cli/target.cxx
+++ b/build/cli/target.cxx
@@ -46,12 +46,29 @@ namespace build
return file_mtime (h->path ());
}
+ static target*
+ cli_cxx_factory (dir_path d, string n, const string* e)
+ {
+ tracer trace ("cli::cli_cxx::factory");
+
+ // Pre-enter (potential) members as targets. The main purpose
+ // of doing this is to avoid searching for existing files in
+ // src_base if the buildfile mentions one of them explicitly
+ // as a prerequisite.
+ //
+ targets.insert<cxx::hxx> (d, n, trace);
+ targets.insert<cxx::cxx> (d, n, trace);
+ targets.insert<cxx::ixx> (d, n, trace);
+
+ return new cli_cxx (move (d), move (n), e);
+ }
+
const target_type cli_cxx::static_type
{
typeid (cli_cxx),
"cli.cxx",
&mtime_target::static_type,
- &target_factory<cli_cxx>,
+ &cli_cxx_factory,
nullptr,
&search_target,
true // See through default semantics.
diff --git a/tests/cli/simple/buildfile b/tests/cli/simple/buildfile
index 5a940ce..a7e6e80 100644
--- a/tests/cli/simple/buildfile
+++ b/tests/cli/simple/buildfile
@@ -4,5 +4,8 @@ ixx.ext = ipp
cxx.poptions = -I$out_root
-exe{driver}: cxx{driver} cxx{test}
-cxx{test} hxx{test}: cli{test}
+#exe{driver}: cxx{driver} cxx{test}
+#cxx{test} hxx{test}: cli{test}
+
+exe{driver}: cxx{driver} cli.cxx{test}
+cli.cxx{test}: cli{test}