aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKaren Arutyunov <karen@codesynthesis.com>2019-07-04 19:12:15 +0300
committerKaren Arutyunov <karen@codesynthesis.com>2019-07-05 14:24:43 +0300
commit57b10c06925d0bdf6ffb38488ee908f085109e95 (patch)
treef2103684d319650c3302aef9d7a70dd64ff2a347
parent30b4eda196e090aa820d312e6a9435a4ae84c303 (diff)
Move config, dist, test, and install modules into library
-rw-r--r--build2/b.cxx23
-rw-r--r--build2/bash/init.cxx2
-rw-r--r--build2/bash/rule.hxx3
-rw-r--r--build2/bin/init.cxx8
-rw-r--r--build2/cc/compile-rule.cxx3
-rw-r--r--build2/cc/init.cxx2
-rw-r--r--build2/cc/install-rule.hxx2
-rw-r--r--build2/cc/module.cxx4
-rw-r--r--build2/cc/pkgconfig.cxx2
-rw-r--r--build2/cli/init.cxx4
-rw-r--r--build2/version/init.cxx4
-rw-r--r--build2/version/rule.hxx3
-rw-r--r--libbuild2/buildfile4
-rw-r--r--libbuild2/config/init.cxx (renamed from build2/config/init.cxx)21
-rw-r--r--libbuild2/config/init.hxx (renamed from build2/config/init.hxx)13
-rw-r--r--libbuild2/config/module.cxx (renamed from build2/config/module.cxx)4
-rw-r--r--libbuild2/config/module.hxx (renamed from build2/config/module.hxx)8
-rw-r--r--libbuild2/config/operation.cxx (renamed from build2/config/operation.cxx)8
-rw-r--r--libbuild2/config/operation.hxx (renamed from build2/config/operation.hxx)8
-rw-r--r--libbuild2/config/utility.cxx (renamed from build2/config/utility.cxx)6
-rw-r--r--libbuild2/config/utility.hxx (renamed from build2/config/utility.hxx)28
-rw-r--r--libbuild2/config/utility.txx (renamed from build2/config/utility.txx)2
-rw-r--r--libbuild2/dist/init.cxx (renamed from build2/dist/init.cxx)18
-rw-r--r--libbuild2/dist/init.hxx (renamed from build2/dist/init.hxx)13
-rw-r--r--libbuild2/dist/module.cxx (renamed from build2/dist/module.cxx)4
-rw-r--r--libbuild2/dist/module.hxx (renamed from build2/dist/module.hxx)12
-rw-r--r--libbuild2/dist/operation.cxx (renamed from build2/dist/operation.cxx)6
-rw-r--r--libbuild2/dist/operation.hxx (renamed from build2/dist/operation.hxx)8
-rw-r--r--libbuild2/dist/rule.cxx (renamed from build2/dist/rule.cxx)4
-rw-r--r--libbuild2/dist/rule.hxx (renamed from build2/dist/rule.hxx)8
-rw-r--r--libbuild2/install/functions.cxx (renamed from build2/install/functions.cxx)4
-rw-r--r--libbuild2/install/init.cxx (renamed from build2/install/init.cxx)18
-rw-r--r--libbuild2/install/init.hxx (renamed from build2/install/init.hxx)13
-rw-r--r--libbuild2/install/operation.cxx (renamed from build2/install/operation.cxx)4
-rw-r--r--libbuild2/install/operation.hxx (renamed from build2/install/operation.hxx)8
-rw-r--r--libbuild2/install/rule.cxx (renamed from build2/install/rule.cxx)5
-rw-r--r--libbuild2/install/rule.hxx (renamed from build2/install/rule.hxx)16
-rw-r--r--libbuild2/install/utility.hxx (renamed from build2/install/utility.hxx)16
-rw-r--r--libbuild2/test/common.cxx (renamed from build2/test/common.cxx)4
-rw-r--r--libbuild2/test/common.hxx (renamed from build2/test/common.hxx)8
-rw-r--r--libbuild2/test/init.cxx (renamed from build2/test/init.cxx)14
-rw-r--r--libbuild2/test/init.hxx (renamed from build2/test/init.hxx)12
-rw-r--r--libbuild2/test/module.hxx (renamed from build2/test/module.hxx)12
-rw-r--r--libbuild2/test/operation.cxx (renamed from build2/test/operation.cxx)4
-rw-r--r--libbuild2/test/operation.hxx (renamed from build2/test/operation.hxx)8
-rw-r--r--libbuild2/test/rule.cxx (renamed from build2/test/rule.cxx)12
-rw-r--r--libbuild2/test/rule.hxx (renamed from build2/test/rule.hxx)10
-rw-r--r--libbuild2/test/script/builtin.cxx (renamed from build2/test/script/builtin.cxx)6
-rw-r--r--libbuild2/test/script/builtin.hxx (renamed from build2/test/script/builtin.hxx)8
-rw-r--r--libbuild2/test/script/lexer+command-expansion.test.testscript (renamed from build2/test/script/lexer+command-expansion.test.testscript)2
-rw-r--r--libbuild2/test/script/lexer+command-line.test.testscript (renamed from build2/test/script/lexer+command-line.test.testscript)2
-rw-r--r--libbuild2/test/script/lexer+description-line.test.testscript (renamed from build2/test/script/lexer+description-line.test.testscript)2
-rw-r--r--libbuild2/test/script/lexer+first-token.test.testscript (renamed from build2/test/script/lexer+first-token.test.testscript)2
-rw-r--r--libbuild2/test/script/lexer+second-token.test.testscript (renamed from build2/test/script/lexer+second-token.test.testscript)2
-rw-r--r--libbuild2/test/script/lexer+variable-line.test.testscript (renamed from build2/test/script/lexer+variable-line.test.testscript)2
-rw-r--r--libbuild2/test/script/lexer+variable.test.testscript (renamed from build2/test/script/lexer+variable.test.testscript)2
-rw-r--r--libbuild2/test/script/lexer.cxx (renamed from build2/test/script/lexer.cxx)4
-rw-r--r--libbuild2/test/script/lexer.hxx (renamed from build2/test/script/lexer.hxx)10
-rw-r--r--libbuild2/test/script/lexer.test.cxx (renamed from build2/test/script/lexer.test.cxx)6
-rw-r--r--libbuild2/test/script/parser+cleanup.test.testscript (renamed from build2/test/script/parser+cleanup.test.testscript)2
-rw-r--r--libbuild2/test/script/parser+command-if.test.testscript (renamed from build2/test/script/parser+command-if.test.testscript)2
-rw-r--r--libbuild2/test/script/parser+command-re-parse.test.testscript (renamed from build2/test/script/parser+command-re-parse.test.testscript)2
-rw-r--r--libbuild2/test/script/parser+description.test.testscript (renamed from build2/test/script/parser+description.test.testscript)2
-rw-r--r--libbuild2/test/script/parser+directive.test.testscript (renamed from build2/test/script/parser+directive.test.testscript)2
-rw-r--r--libbuild2/test/script/parser+exit.test.testscript (renamed from build2/test/script/parser+exit.test.testscript)2
-rw-r--r--libbuild2/test/script/parser+expansion.test.testscript (renamed from build2/test/script/parser+expansion.test.testscript)2
-rw-r--r--libbuild2/test/script/parser+here-document.test.testscript (renamed from build2/test/script/parser+here-document.test.testscript)2
-rw-r--r--libbuild2/test/script/parser+here-string.test.testscript (renamed from build2/test/script/parser+here-string.test.testscript)2
-rw-r--r--libbuild2/test/script/parser+include.test.testscript (renamed from build2/test/script/parser+include.test.testscript)2
-rw-r--r--libbuild2/test/script/parser+pipe-expr.test.testscript (renamed from build2/test/script/parser+pipe-expr.test.testscript)2
-rw-r--r--libbuild2/test/script/parser+pre-parse.test.testscript (renamed from build2/test/script/parser+pre-parse.test.testscript)2
-rw-r--r--libbuild2/test/script/parser+redirect.test.testscript (renamed from build2/test/script/parser+redirect.test.testscript)2
-rw-r--r--libbuild2/test/script/parser+regex.test.testscript (renamed from build2/test/script/parser+regex.test.testscript)2
-rw-r--r--libbuild2/test/script/parser+scope-if.test.testscript (renamed from build2/test/script/parser+scope-if.test.testscript)2
-rw-r--r--libbuild2/test/script/parser+scope.test.testscript (renamed from build2/test/script/parser+scope.test.testscript)2
-rw-r--r--libbuild2/test/script/parser+setup-teardown.test.testscript (renamed from build2/test/script/parser+setup-teardown.test.testscript)2
-rw-r--r--libbuild2/test/script/parser.cxx (renamed from build2/test/script/parser.cxx)8
-rw-r--r--libbuild2/test/script/parser.hxx (renamed from build2/test/script/parser.hxx)12
-rw-r--r--libbuild2/test/script/parser.test.cxx (renamed from build2/test/script/parser.test.cxx)10
-rw-r--r--libbuild2/test/script/regex.cxx (renamed from build2/test/script/regex.cxx)12
-rw-r--r--libbuild2/test/script/regex.hxx (renamed from build2/test/script/regex.hxx)10
-rw-r--r--libbuild2/test/script/regex.ixx (renamed from build2/test/script/regex.ixx)2
-rw-r--r--libbuild2/test/script/regex.test.cxx (renamed from build2/test/script/regex.test.cxx)4
-rw-r--r--libbuild2/test/script/runner.cxx (renamed from build2/test/script/runner.cxx)12
-rw-r--r--libbuild2/test/script/runner.hxx (renamed from build2/test/script/runner.hxx)10
-rw-r--r--libbuild2/test/script/script.cxx (renamed from build2/test/script/script.cxx)4
-rw-r--r--libbuild2/test/script/script.hxx (renamed from build2/test/script/script.hxx)14
-rw-r--r--libbuild2/test/script/script.ixx (renamed from build2/test/script/script.ixx)2
-rw-r--r--libbuild2/test/script/token.cxx (renamed from build2/test/script/token.cxx)4
-rw-r--r--libbuild2/test/script/token.hxx (renamed from build2/test/script/token.hxx)8
-rw-r--r--libbuild2/test/target.cxx (renamed from build2/test/target.cxx)4
-rw-r--r--libbuild2/test/target.hxx (renamed from build2/test/target.hxx)12
92 files changed, 333 insertions, 280 deletions
diff --git a/build2/b.cxx b/build2/b.cxx
index 4a446ac..a76a8e4 100644
--- a/build2/b.cxx
+++ b/build2/b.cxx
@@ -42,19 +42,17 @@
#include <libbuild2/parser.hxx>
-#include <build2/b-options.hxx>
+#include <libbuild2/dist/init.hxx>
+#include <libbuild2/test/init.hxx>
+#include <libbuild2/config/init.hxx>
+#include <libbuild2/install/init.hxx>
-#include <build2/config/utility.hxx> // config::save_variable()
-#include <build2/config/operation.hxx> // config::preprocess_create()
+#include <build2/b-options.hxx>
using namespace butl;
using namespace std;
-#include <build2/config/init.hxx>
#include <build2/version/init.hxx>
-#include <build2/test/init.hxx>
-#include <build2/dist/init.hxx>
-#include <build2/install/init.hxx>
#include <build2/in/init.hxx>
@@ -439,14 +437,11 @@ main (int argc, char* argv[])
using mf = module_functions;
auto& bm (builtin_modules);
- bm["config"] = mf {&config::boot, &config::init};
-
- config_save_variable = &config::save_variable;
- config_preprocess_create = &config::preprocess_create;
-
- bm["dist"] = mf {&dist::boot, &dist::init};
+ bm["config"] = config::build2_config_load ();
+ bm["dist"] = dist::build2_dist_load ();
bm["test"] = test::build2_test_load ();
- bm["install"] = mf {&install::boot, &install::init};
+ bm["install"] = install::build2_install_load ();
+
bm["version"] = mf {&version::boot, &version::init};
bm["in.base"] = mf {nullptr, &in::base_init};
diff --git a/build2/bash/init.cxx b/build2/bash/init.cxx
index 83bfdb9..a23bc61 100644
--- a/build2/bash/init.cxx
+++ b/build2/bash/init.cxx
@@ -9,7 +9,7 @@
#include <libbuild2/variable.hxx>
#include <libbuild2/diagnostics.hxx>
-#include <build2/install/utility.hxx>
+#include <libbuild2/install/utility.hxx>
#include <build2/bash/rule.hxx>
#include <build2/bash/target.hxx>
diff --git a/build2/bash/rule.hxx b/build2/bash/rule.hxx
index 6430947..a6ec235 100644
--- a/build2/bash/rule.hxx
+++ b/build2/bash/rule.hxx
@@ -8,8 +8,9 @@
#include <libbuild2/types.hxx>
#include <libbuild2/utility.hxx>
+#include <libbuild2/install/rule.hxx>
+
#include <build2/in/rule.hxx>
-#include <build2/install/rule.hxx>
namespace build2
{
diff --git a/build2/bin/init.cxx b/build2/bin/init.cxx
index 5932b29..2df0572 100644
--- a/build2/bin/init.cxx
+++ b/build2/bin/init.cxx
@@ -10,12 +10,12 @@
#include <libbuild2/variable.hxx>
#include <libbuild2/diagnostics.hxx>
-#include <build2/config/utility.hxx>
+#include <libbuild2/config/utility.hxx>
-#include <build2/test/module.hxx>
+#include <libbuild2/test/module.hxx>
-#include <build2/install/rule.hxx>
-#include <build2/install/utility.hxx>
+#include <libbuild2/install/rule.hxx>
+#include <libbuild2/install/utility.hxx>
#include <build2/bin/rule.hxx>
#include <build2/bin/guess.hxx>
diff --git a/build2/cc/compile-rule.cxx b/build2/cc/compile-rule.cxx
index c0c7eb3..7490517 100644
--- a/build2/cc/compile-rule.cxx
+++ b/build2/cc/compile-rule.cxx
@@ -16,8 +16,9 @@
#include <libbuild2/filesystem.hxx> // mtime()
#include <libbuild2/diagnostics.hxx>
+#include <libbuild2/config/utility.hxx> // create_project()
+
#include <build2/bin/target.hxx>
-#include <build2/config/utility.hxx> // create_project()
#include <build2/cc/parser.hxx>
#include <build2/cc/target.hxx> // h
diff --git a/build2/cc/init.cxx b/build2/cc/init.cxx
index 18fba20..e095b08 100644
--- a/build2/cc/init.cxx
+++ b/build2/cc/init.cxx
@@ -10,7 +10,7 @@
#include <libbuild2/filesystem.hxx>
#include <libbuild2/diagnostics.hxx>
-#include <build2/config/utility.hxx>
+#include <libbuild2/config/utility.hxx>
#include <build2/cc/target.hxx>
#include <build2/cc/utility.hxx>
diff --git a/build2/cc/install-rule.hxx b/build2/cc/install-rule.hxx
index ea966b8..55f6d2f 100644
--- a/build2/cc/install-rule.hxx
+++ b/build2/cc/install-rule.hxx
@@ -8,7 +8,7 @@
#include <libbuild2/types.hxx>
#include <libbuild2/utility.hxx>
-#include <build2/install/rule.hxx>
+#include <libbuild2/install/rule.hxx>
#include <build2/cc/types.hxx>
#include <build2/cc/common.hxx>
diff --git a/build2/cc/module.cxx b/build2/cc/module.cxx
index ec35444..0fe9459 100644
--- a/build2/cc/module.cxx
+++ b/build2/cc/module.cxx
@@ -14,8 +14,8 @@
#include <build2/cc/target.hxx> // pc*
-#include <build2/config/utility.hxx>
-#include <build2/install/utility.hxx>
+#include <libbuild2/config/utility.hxx>
+#include <libbuild2/install/utility.hxx>
#include <build2/cc/guess.hxx>
diff --git a/build2/cc/pkgconfig.cxx b/build2/cc/pkgconfig.cxx
index 99715be..c23b746 100644
--- a/build2/cc/pkgconfig.cxx
+++ b/build2/cc/pkgconfig.cxx
@@ -17,7 +17,7 @@
#include <libbuild2/filesystem.hxx>
#include <libbuild2/diagnostics.hxx>
-#include <build2/install/utility.hxx>
+#include <libbuild2/install/utility.hxx>
#include <build2/bin/target.hxx>
diff --git a/build2/cli/init.cxx b/build2/cli/init.cxx
index 24266ca..6d20aa0 100644
--- a/build2/cli/init.cxx
+++ b/build2/cli/init.cxx
@@ -9,9 +9,9 @@
#include <libbuild2/variable.hxx>
#include <libbuild2/diagnostics.hxx>
-#include <build2/cxx/target.hxx>
+#include <libbuild2/config/utility.hxx>
-#include <build2/config/utility.hxx>
+#include <build2/cxx/target.hxx>
#include <build2/cli/target.hxx>
#include <build2/cli/rule.hxx>
diff --git a/build2/version/init.cxx b/build2/version/init.cxx
index 8c9cd42..30f0f45 100644
--- a/build2/version/init.cxx
+++ b/build2/version/init.cxx
@@ -11,9 +11,9 @@
#include <libbuild2/variable.hxx>
#include <libbuild2/diagnostics.hxx>
-#include <build2/config/utility.hxx>
+#include <libbuild2/config/utility.hxx>
-#include <build2/dist/module.hxx>
+#include <libbuild2/dist/module.hxx>
#include <build2/version/rule.hxx>
#include <build2/version/module.hxx>
diff --git a/build2/version/rule.hxx b/build2/version/rule.hxx
index 8eb4830..6d841df 100644
--- a/build2/version/rule.hxx
+++ b/build2/version/rule.hxx
@@ -8,8 +8,9 @@
#include <libbuild2/types.hxx>
#include <libbuild2/utility.hxx>
+#include <libbuild2/install/rule.hxx>
+
#include <build2/in/rule.hxx>
-#include <build2/install/rule.hxx>
namespace build2
{
diff --git a/libbuild2/buildfile b/libbuild2/buildfile
index 99f616c..f23f023 100644
--- a/libbuild2/buildfile
+++ b/libbuild2/buildfile
@@ -4,6 +4,10 @@
import int_libs = libbutl%lib{butl}
+# The config, test, install, and dist are "core modules" that come bundled
+# with libbuild2. Note that the core can still function without them or with
+# their alternative implementations.
+#
./: lib{build2}: libul{build2}: {hxx ixx txx cxx}{** -config \
-version \
-**.test...} \
diff --git a/build2/config/init.cxx b/libbuild2/config/init.cxx
index bd2d573..73275c6 100644
--- a/build2/config/init.cxx
+++ b/libbuild2/config/init.cxx
@@ -1,8 +1,8 @@
-// file : build2/config/init.cxx -*- C++ -*-
+// file : libbuild2/config/init.cxx -*- C++ -*-
// copyright : Copyright (c) 2014-2019 Code Synthesis Ltd
// license : MIT; see accompanying LICENSE file
-#include <build2/config/init.hxx>
+#include <libbuild2/config/init.hxx>
#include <libbuild2/file.hxx>
#include <libbuild2/rule.hxx>
@@ -11,9 +11,9 @@
#include <libbuild2/filesystem.hxx> // exists()
#include <libbuild2/diagnostics.hxx>
-#include <build2/config/module.hxx>
-#include <build2/config/utility.hxx>
-#include <build2/config/operation.hxx>
+#include <libbuild2/config/module.hxx>
+#include <libbuild2/config/utility.hxx>
+#include <libbuild2/config/operation.hxx>
using namespace std;
using namespace butl;
@@ -144,5 +144,16 @@ namespace build2
return true;
}
+
+ module_functions
+ build2_config_load ()
+ {
+ // Initialize the config entry points in the build system core.
+ //
+ config_save_variable = &config::save_variable;
+ config_preprocess_create = &config::preprocess_create;
+
+ return module_functions {&boot, &init};
+ }
}
}
diff --git a/build2/config/init.hxx b/libbuild2/config/init.hxx
index 5a9b66d..ff5e923 100644
--- a/build2/config/init.hxx
+++ b/libbuild2/config/init.hxx
@@ -1,15 +1,17 @@
-// file : build2/config/init.hxx -*- C++ -*-
+// file : libbuild2/config/init.hxx -*- C++ -*-
// copyright : Copyright (c) 2014-2019 Code Synthesis Ltd
// license : MIT; see accompanying LICENSE file
-#ifndef BUILD2_CONFIG_INIT_HXX
-#define BUILD2_CONFIG_INIT_HXX
+#ifndef LIBBUILD2_CONFIG_INIT_HXX
+#define LIBBUILD2_CONFIG_INIT_HXX
#include <libbuild2/types.hxx>
#include <libbuild2/utility.hxx>
#include <libbuild2/module.hxx>
+#include <libbuild2/export.hxx>
+
namespace build2
{
namespace config
@@ -25,7 +27,10 @@ namespace build2
bool,
bool,
const variable_map&);
+
+ extern "C" LIBBUILD2_SYMEXPORT module_functions
+ build2_config_load ();
}
}
-#endif // BUILD2_CONFIG_INIT_HXX
+#endif // LIBBUILD2_CONFIG_INIT_HXX
diff --git a/build2/config/module.cxx b/libbuild2/config/module.cxx
index 7c3aae4..7e9b765 100644
--- a/build2/config/module.cxx
+++ b/libbuild2/config/module.cxx
@@ -1,8 +1,8 @@
-// file : build2/config/module.cxx -*- C++ -*-
+// file : libbuild2/config/module.cxx -*- C++ -*-
// copyright : Copyright (c) 2014-2019 Code Synthesis Ltd
// license : MIT; see accompanying LICENSE file
-#include <build2/config/module.hxx>
+#include <libbuild2/config/module.hxx>
using namespace std;
diff --git a/build2/config/module.hxx b/libbuild2/config/module.hxx
index 0c78b18..6222319 100644
--- a/build2/config/module.hxx
+++ b/libbuild2/config/module.hxx
@@ -1,9 +1,9 @@
-// file : build2/config/module.hxx -*- C++ -*-
+// file : libbuild2/config/module.hxx -*- C++ -*-
// copyright : Copyright (c) 2014-2019 Code Synthesis Ltd
// license : MIT; see accompanying LICENSE file
-#ifndef BUILD2_CONFIG_MODULE_HXX
-#define BUILD2_CONFIG_MODULE_HXX
+#ifndef LIBBUILD2_CONFIG_MODULE_HXX
+#define LIBBUILD2_CONFIG_MODULE_HXX
#include <map>
@@ -90,4 +90,4 @@ namespace build2
}
}
-#endif // BUILD2_CONFIG_MODULE_HXX
+#endif // LIBBUILD2_CONFIG_MODULE_HXX
diff --git a/build2/config/operation.cxx b/libbuild2/config/operation.cxx
index ff5b44a..c3ce4b7 100644
--- a/build2/config/operation.cxx
+++ b/libbuild2/config/operation.cxx
@@ -1,8 +1,8 @@
-// file : build2/config/operation.cxx -*- C++ -*-
+// file : libbuild2/config/operation.cxx -*- C++ -*-
// copyright : Copyright (c) 2014-2019 Code Synthesis Ltd
// license : MIT; see accompanying LICENSE file
-#include <build2/config/operation.hxx>
+#include <libbuild2/config/operation.hxx>
#include <set>
@@ -15,8 +15,8 @@
#include <libbuild2/filesystem.hxx>
#include <libbuild2/diagnostics.hxx>
-#include <build2/config/module.hxx>
-#include <build2/config/utility.hxx>
+#include <libbuild2/config/module.hxx>
+#include <libbuild2/config/utility.hxx>
using namespace std;
using namespace butl;
diff --git a/build2/config/operation.hxx b/libbuild2/config/operation.hxx
index 9f426ca..0a88f96 100644
--- a/build2/config/operation.hxx
+++ b/libbuild2/config/operation.hxx
@@ -1,9 +1,9 @@
-// file : build2/config/operation.hxx -*- C++ -*-
+// file : libbuild2/config/operation.hxx -*- C++ -*-
// copyright : Copyright (c) 2014-2019 Code Synthesis Ltd
// license : MIT; see accompanying LICENSE file
-#ifndef BUILD2_CONFIG_OPERATION_HXX
-#define BUILD2_CONFIG_OPERATION_HXX
+#ifndef LIBBUILD2_CONFIG_OPERATION_HXX
+#define LIBBUILD2_CONFIG_OPERATION_HXX
#include <libbuild2/types.hxx>
#include <libbuild2/utility.hxx>
@@ -26,4 +26,4 @@ namespace build2
}
}
-#endif // BUILD2_CONFIG_OPERATION_HXX
+#endif // LIBBUILD2_CONFIG_OPERATION_HXX
diff --git a/build2/config/utility.cxx b/libbuild2/config/utility.cxx
index 1ce07f7..746639d 100644
--- a/build2/config/utility.cxx
+++ b/libbuild2/config/utility.cxx
@@ -1,15 +1,15 @@
-// file : build2/config/utility.cxx -*- C++ -*-
+// file : libbuild2/config/utility.cxx -*- C++ -*-
// copyright : Copyright (c) 2014-2019 Code Synthesis Ltd
// license : MIT; see accompanying LICENSE file
-#include <build2/config/utility.hxx>
+#include <libbuild2/config/utility.hxx>
#include <libbuild2/file.hxx>
#include <libbuild2/context.hxx>
#include <libbuild2/filesystem.hxx>
#include <libbuild2/diagnostics.hxx>
-#include <build2/config/module.hxx>
+#include <libbuild2/config/module.hxx>
using namespace std;
diff --git a/build2/config/utility.hxx b/libbuild2/config/utility.hxx
index 5e4eac2..e41aaa7 100644
--- a/build2/config/utility.hxx
+++ b/libbuild2/config/utility.hxx
@@ -1,9 +1,9 @@
-// file : build2/config/utility.hxx -*- C++ -*-
+// file : libbuild2/config/utility.hxx -*- C++ -*-
// copyright : Copyright (c) 2014-2019 Code Synthesis Ltd
// license : MIT; see accompanying LICENSE file
-#ifndef BUILD2_CONFIG_UTILITY_HXX
-#define BUILD2_CONFIG_UTILITY_HXX
+#ifndef LIBBUILD2_CONFIG_UTILITY_HXX
+#define LIBBUILD2_CONFIG_UTILITY_HXX
#include <libbuild2/types.hxx>
#include <libbuild2/utility.hxx>
@@ -12,6 +12,8 @@
#include <libbuild2/variable.hxx>
#include <libbuild2/diagnostics.hxx>
+#include <libbuild2/export.hxx>
+
namespace build2
{
class scope;
@@ -76,7 +78,7 @@ namespace build2
// This can be useful when we don't have a default value but may figure
// out some fallback. See config.bin.target for an example.
//
- pair<lookup, bool>
+ LIBBUILD2_SYMEXPORT pair<lookup, bool>
omitted (scope& root, const variable&);
// Note that the variable is expected to have already been registered.
@@ -95,7 +97,7 @@ namespace build2
//
// @@ Rename since clashes with the optional class template.
//
- lookup
+ LIBBUILD2_SYMEXPORT lookup
optional (scope& root, const variable&);
// Note that the variable is expected to have already been registered.
@@ -118,21 +120,21 @@ namespace build2
// "remember" that it is unconfigured (e.g., in order to avoid re-
// running the tests, etc).
//
- bool
+ LIBBUILD2_SYMEXPORT bool
specified (scope& root, const string& name);
// Check if there is a false config.*.configured value. This mechanism can
// be used to "remember" that the module is left unconfigured in order to
// avoid re-running the tests, etc.
//
- bool
+ LIBBUILD2_SYMEXPORT bool
unconfigured (scope& root, const string& name);
// Set the config.*.configured value. Note that you only need to set it to
// false. It will be automatically ignored if there are any other config.*
// values for this module. Return true if this sets a new value.
//
- bool
+ LIBBUILD2_SYMEXPORT bool
unconfigured (scope& root, const string& name, bool);
// Enter the variable so that it is saved during configuration. See
@@ -140,17 +142,17 @@ namespace build2
//
const uint64_t save_commented = 0x01; // Save default value as commented.
- void
+ LIBBUILD2_SYMEXPORT void
save_variable (scope& root, const variable&, uint64_t flags = 0);
// Establish module order/priority. See config::module for details.
//
- void
+ LIBBUILD2_SYMEXPORT void
save_module (scope& root, const char* name, int prio = 0);
// Create a project in the specified directory.
//
- void
+ LIBBUILD2_SYMEXPORT void
create_project (const dir_path& d,
const build2::optional<dir_path>& amalgamation,
const strings& boot_modules, // Bootstrap modules.
@@ -172,6 +174,6 @@ namespace build2
}
}
-#include <build2/config/utility.txx>
+#include <libbuild2/config/utility.txx>
-#endif // BUILD2_CONFIG_UTILITY_HXX
+#endif // LIBBUILD2_CONFIG_UTILITY_HXX
diff --git a/build2/config/utility.txx b/libbuild2/config/utility.txx
index 84650d9..d2ffa69 100644
--- a/build2/config/utility.txx
+++ b/libbuild2/config/utility.txx
@@ -1,4 +1,4 @@
-// file : build2/config/utility.txx -*- C++ -*-
+// file : libbuild2/config/utility.txx -*- C++ -*-
// copyright : Copyright (c) 2014-2019 Code Synthesis Ltd
// license : MIT; see accompanying LICENSE file
diff --git a/build2/dist/init.cxx b/libbuild2/dist/init.cxx
index 8edbccb..959b2dd 100644
--- a/build2/dist/init.cxx
+++ b/libbuild2/dist/init.cxx
@@ -1,18 +1,18 @@
-// file : build2/dist/init.cxx -*- C++ -*-
+// file : libbuild2/dist/init.cxx -*- C++ -*-
// copyright : Copyright (c) 2014-2019 Code Synthesis Ltd
// license : MIT; see accompanying LICENSE file
-#include <build2/dist/init.hxx>
+#include <libbuild2/dist/init.hxx>
#include <libbuild2/scope.hxx>
#include <libbuild2/file.hxx>
#include <libbuild2/diagnostics.hxx>
-#include <build2/config/utility.hxx>
+#include <libbuild2/config/utility.hxx>
-#include <build2/dist/rule.hxx>
-#include <build2/dist/module.hxx>
-#include <build2/dist/operation.hxx>
+#include <libbuild2/dist/rule.hxx>
+#include <libbuild2/dist/module.hxx>
+#include <libbuild2/dist/operation.hxx>
using namespace std;
using namespace butl;
@@ -182,5 +182,11 @@ namespace build2
return true;
}
+
+ module_functions
+ build2_dist_load ()
+ {
+ return module_functions {&boot, &init};
+ }
}
}
diff --git a/build2/dist/init.hxx b/libbuild2/dist/init.hxx
index 0449a99..41c82a7 100644
--- a/build2/dist/init.hxx
+++ b/libbuild2/dist/init.hxx
@@ -1,15 +1,17 @@
-// file : build2/dist/init.hxx -*- C++ -*-
+// file : libbuild2/dist/init.hxx -*- C++ -*-
// copyright : Copyright (c) 2014-2019 Code Synthesis Ltd
// license : MIT; see accompanying LICENSE file
-#ifndef BUILD2_DIST_INIT_HXX
-#define BUILD2_DIST_INIT_HXX
+#ifndef LIBBUILD2_DIST_INIT_HXX
+#define LIBBUILD2_DIST_INIT_HXX
#include <libbuild2/types.hxx>
#include <libbuild2/utility.hxx>
#include <libbuild2/module.hxx>
+#include <libbuild2/export.hxx>
+
namespace build2
{
namespace dist
@@ -25,7 +27,10 @@ namespace build2
bool,
bool,
const variable_map&);
+
+ extern "C" LIBBUILD2_SYMEXPORT module_functions
+ build2_dist_load ();
}
}
-#endif // BUILD2_DIST_INIT_HXX
+#endif // LIBBUILD2_DIST_INIT_HXX
diff --git a/build2/dist/module.cxx b/libbuild2/dist/module.cxx
index 2d619f4..e9b9955 100644
--- a/build2/dist/module.cxx
+++ b/libbuild2/dist/module.cxx
@@ -1,8 +1,8 @@
-// file : build2/dist/module.cxx -*- C++ -*-
+// file : libbuild2/dist/module.cxx -*- C++ -*-
// copyright : Copyright (c) 2014-2019 Code Synthesis Ltd
// license : MIT; see accompanying LICENSE file
-#include <build2/dist/module.hxx>
+#include <libbuild2/dist/module.hxx>
using namespace std;
diff --git a/build2/dist/module.hxx b/libbuild2/dist/module.hxx
index cd0d9a3..abc1400 100644
--- a/build2/dist/module.hxx
+++ b/libbuild2/dist/module.hxx
@@ -1,9 +1,9 @@
-// file : build2/dist/module.hxx -*- C++ -*-
+// file : libbuild2/dist/module.hxx -*- C++ -*-
// copyright : Copyright (c) 2014-2019 Code Synthesis Ltd
// license : MIT; see accompanying LICENSE file
-#ifndef BUILD2_DIST_MODULE_HXX
-#define BUILD2_DIST_MODULE_HXX
+#ifndef LIBBUILD2_DIST_MODULE_HXX
+#define LIBBUILD2_DIST_MODULE_HXX
#include <libbuild2/types.hxx>
#include <libbuild2/utility.hxx>
@@ -11,11 +11,13 @@
#include <libbuild2/module.hxx>
#include <libbuild2/variable.hxx>
+#include <libbuild2/export.hxx>
+
namespace build2
{
namespace dist
{
- struct module: module_base
+ struct LIBBUILD2_SYMEXPORT module: module_base
{
static const string name;
@@ -66,4 +68,4 @@ namespace build2
}
}
-#endif // BUILD2_DIST_MODULE_HXX
+#endif // LIBBUILD2_DIST_MODULE_HXX
diff --git a/build2/dist/operation.cxx b/libbuild2/dist/operation.cxx
index ca90b50..ac3912e 100644
--- a/build2/dist/operation.cxx
+++ b/libbuild2/dist/operation.cxx
@@ -1,8 +1,8 @@
-// file : build2/dist/operation.cxx -*- C++ -*-
+// file : libbuild2/dist/operation.cxx -*- C++ -*-
// copyright : Copyright (c) 2014-2019 Code Synthesis Ltd
// license : MIT; see accompanying LICENSE file
-#include <build2/dist/operation.hxx>
+#include <libbuild2/dist/operation.hxx>
#include <libbutl/sha1.mxx>
#include <libbutl/sha256.mxx>
@@ -18,7 +18,7 @@
#include <libbuild2/filesystem.hxx>
#include <libbuild2/diagnostics.hxx>
-#include <build2/dist/module.hxx>
+#include <libbuild2/dist/module.hxx>
using namespace std;
using namespace butl;
diff --git a/build2/dist/operation.hxx b/libbuild2/dist/operation.hxx
index 00d8664..aa59c36 100644
--- a/build2/dist/operation.hxx
+++ b/libbuild2/dist/operation.hxx
@@ -1,9 +1,9 @@
-// file : build2/dist/operation.hxx -*- C++ -*-
+// file : libbuild2/dist/operation.hxx -*- C++ -*-
// copyright : Copyright (c) 2014-2019 Code Synthesis Ltd
// license : MIT; see accompanying LICENSE file
-#ifndef BUILD2_DIST_OPERATION_HXX
-#define BUILD2_DIST_OPERATION_HXX
+#ifndef LIBBUILD2_DIST_OPERATION_HXX
+#define LIBBUILD2_DIST_OPERATION_HXX
#include <libbuild2/types.hxx>
#include <libbuild2/utility.hxx>
@@ -18,4 +18,4 @@ namespace build2
}
}
-#endif // BUILD2_DIST_OPERATION_HXX
+#endif // LIBBUILD2_DIST_OPERATION_HXX
diff --git a/build2/dist/rule.cxx b/libbuild2/dist/rule.cxx
index c877abc..357d70e 100644
--- a/build2/dist/rule.cxx
+++ b/libbuild2/dist/rule.cxx
@@ -1,8 +1,8 @@
-// file : build2/dist/rule.cxx -*- C++ -*-
+// file : libbuild2/dist/rule.cxx -*- C++ -*-
// copyright : Copyright (c) 2014-2019 Code Synthesis Ltd
// license : MIT; see accompanying LICENSE file
-#include <build2/dist/rule.hxx>
+#include <libbuild2/dist/rule.hxx>
#include <libbuild2/scope.hxx>
#include <libbuild2/target.hxx>
diff --git a/build2/dist/rule.hxx b/libbuild2/dist/rule.hxx
index accce4c..df32de5 100644
--- a/build2/dist/rule.hxx
+++ b/libbuild2/dist/rule.hxx
@@ -1,9 +1,9 @@
-// file : build2/dist/rule.hxx -*- C++ -*-
+// file : libbuild2/dist/rule.hxx -*- C++ -*-
// copyright : Copyright (c) 2014-2019 Code Synthesis Ltd
// license : MIT; see accompanying LICENSE file
-#ifndef BUILD2_DIST_RULE_HXX
-#define BUILD2_DIST_RULE_HXX
+#ifndef LIBBUILD2_DIST_RULE_HXX
+#define LIBBUILD2_DIST_RULE_HXX
#include <libbuild2/types.hxx>
#include <libbuild2/utility.hxx>
@@ -36,4 +36,4 @@ namespace build2
}
}
-#endif // BUILD2_DIST_RULE_HXX
+#endif // LIBBUILD2_DIST_RULE_HXX
diff --git a/build2/install/functions.cxx b/libbuild2/install/functions.cxx
index 5780fd8..f067918 100644
--- a/build2/install/functions.cxx
+++ b/libbuild2/install/functions.cxx
@@ -1,11 +1,11 @@
-// file : build2/install/functions.cxx -*- C++ -*-
+// file : libbuild2/install/functions.cxx -*- C++ -*-
// copyright : Copyright (c) 2014-2019 Code Synthesis Ltd
// license : MIT; see accompanying LICENSE file
#include <libbuild2/function.hxx>
#include <libbuild2/variable.hxx>
-#include <build2/install/utility.hxx>
+#include <libbuild2/install/utility.hxx>
using namespace std;
diff --git a/build2/install/init.cxx b/libbuild2/install/init.cxx
index 055b8b1..fb3d9ea 100644
--- a/build2/install/init.cxx
+++ b/libbuild2/install/init.cxx
@@ -1,8 +1,8 @@
-// file : build2/install/init.cxx -*- C++ -*-
+// file : libbuild2/install/init.cxx -*- C++ -*-
// copyright : Copyright (c) 2014-2019 Code Synthesis Ltd
// license : MIT; see accompanying LICENSE file
-#include <build2/install/init.hxx>
+#include <libbuild2/install/init.hxx>
#include <libbuild2/scope.hxx>
#include <libbuild2/target.hxx>
@@ -11,11 +11,11 @@
#include <libbuild2/operation.hxx>
#include <libbuild2/diagnostics.hxx>
-#include <build2/config/utility.hxx>
+#include <libbuild2/config/utility.hxx>
-#include <build2/install/rule.hxx>
-#include <build2/install/utility.hxx>
-#include <build2/install/operation.hxx>
+#include <libbuild2/install/rule.hxx>
+#include <libbuild2/install/utility.hxx>
+#include <libbuild2/install/operation.hxx>
using namespace std;
using namespace butl;
@@ -299,5 +299,11 @@ namespace build2
return true;
}
+
+ module_functions
+ build2_install_load ()
+ {
+ return module_functions {&boot, &init};
+ }
}
}
diff --git a/build2/install/init.hxx b/libbuild2/install/init.hxx
index 579c03e..fa0a1e1 100644
--- a/build2/install/init.hxx
+++ b/libbuild2/install/init.hxx
@@ -1,15 +1,17 @@
-// file : build2/install/init.hxx -*- C++ -*-
+// file : libbuild2/install/init.hxx -*- C++ -*-
// copyright : Copyright (c) 2014-2019 Code Synthesis Ltd
// license : MIT; see accompanying LICENSE file
-#ifndef BUILD2_INSTALL_INIT_HXX
-#define BUILD2_INSTALL_INIT_HXX
+#ifndef LIBBUILD2_INSTALL_INIT_HXX
+#define LIBBUILD2_INSTALL_INIT_HXX
#include <libbuild2/types.hxx>
#include <libbuild2/utility.hxx>
#include <libbuild2/module.hxx>
+#include <libbuild2/export.hxx>
+
namespace build2
{
namespace install
@@ -25,7 +27,10 @@ namespace build2
bool,
bool,
const variable_map&);
+
+ extern "C" LIBBUILD2_SYMEXPORT module_functions
+ build2_install_load ();
}
}
-#endif // BUILD2_INSTALL_INIT_HXX
+#endif // LIBBUILD2_INSTALL_INIT_HXX
diff --git a/build2/install/operation.cxx b/libbuild2/install/operation.cxx
index 6ad1899..1135ad6 100644
--- a/build2/install/operation.cxx
+++ b/libbuild2/install/operation.cxx
@@ -1,8 +1,8 @@
-// file : build2/install/operation.cxx -*- C++ -*-
+// file : libbuild2/install/operation.cxx -*- C++ -*-
// copyright : Copyright (c) 2014-2019 Code Synthesis Ltd
// license : MIT; see accompanying LICENSE file
-#include <build2/install/operation.hxx>
+#include <libbuild2/install/operation.hxx>
using namespace std;
using namespace butl;
diff --git a/build2/install/operation.hxx b/libbuild2/install/operation.hxx
index 7de0225..40cf25d 100644
--- a/build2/install/operation.hxx
+++ b/libbuild2/install/operation.hxx
@@ -1,9 +1,9 @@
-// file : build2/install/operation.hxx -*- C++ -*-
+// file : libbuild2/install/operation.hxx -*- C++ -*-
// copyright : Copyright (c) 2014-2019 Code Synthesis Ltd
// license : MIT; see accompanying LICENSE file
-#ifndef BUILD2_INSTALL_OPERATION_HXX
-#define BUILD2_INSTALL_OPERATION_HXX
+#ifndef LIBBUILD2_INSTALL_OPERATION_HXX
+#define LIBBUILD2_INSTALL_OPERATION_HXX
#include <libbuild2/types.hxx>
#include <libbuild2/utility.hxx>
@@ -20,4 +20,4 @@ namespace build2
}
}
-#endif // BUILD2_INSTALL_OPERATION_HXX
+#endif // LIBBUILD2_INSTALL_OPERATION_HXX
diff --git a/build2/install/rule.cxx b/libbuild2/install/rule.cxx
index faa7c3f..0b34832 100644
--- a/build2/install/rule.cxx
+++ b/libbuild2/install/rule.cxx
@@ -1,8 +1,9 @@
-// file : build2/install/rule.cxx -*- C++ -*-
+// file : libbuild2/install/rule.cxx -*- C++ -*-
// copyright : Copyright (c) 2014-2019 Code Synthesis Ltd
// license : MIT; see accompanying LICENSE file
-#include <build2/install/rule.hxx>
+#include <libbuild2/install/rule.hxx>
+#include <libbuild2/install/utility.hxx> // resolve_dir() declaration
#include <libbutl/filesystem.mxx> // dir_exists(), file_exists()
diff --git a/build2/install/rule.hxx b/libbuild2/install/rule.hxx
index 09dd1b5..ff99c6e 100644
--- a/build2/install/rule.hxx
+++ b/libbuild2/install/rule.hxx
@@ -1,9 +1,9 @@
-// file : build2/install/rule.hxx -*- C++ -*-
+// file : libbuild2/install/rule.hxx -*- C++ -*-
// copyright : Copyright (c) 2014-2019 Code Synthesis Ltd
// license : MIT; see accompanying LICENSE file
-#ifndef BUILD2_INSTALL_RULE_HXX
-#define BUILD2_INSTALL_RULE_HXX
+#ifndef LIBBUILD2_INSTALL_RULE_HXX
+#define LIBBUILD2_INSTALL_RULE_HXX
#include <libbuild2/types.hxx>
#include <libbuild2/utility.hxx>
@@ -13,11 +13,13 @@
#include <libbuild2/target.hxx>
#include <libbuild2/filesystem.hxx>
+#include <libbuild2/export.hxx>
+
namespace build2
{
namespace install
{
- class alias_rule: public rule
+ class LIBBUILD2_SYMEXPORT alias_rule: public rule
{
public:
virtual bool
@@ -70,7 +72,7 @@ namespace build2
// We also register (for all targets) another instance of this rule that
// only matches see-through groups.
//
- class group_rule: public alias_rule
+ class LIBBUILD2_SYMEXPORT group_rule: public alias_rule
{
public:
virtual bool
@@ -95,7 +97,7 @@ namespace build2
struct install_dir;
- class file_rule: public rule
+ class LIBBUILD2_SYMEXPORT file_rule: public rule
{
public:
virtual bool
@@ -192,4 +194,4 @@ namespace build2
}
}
-#endif // BUILD2_INSTALL_RULE_HXX
+#endif // LIBBUILD2_INSTALL_RULE_HXX
diff --git a/build2/install/utility.hxx b/libbuild2/install/utility.hxx
index 29c6db0..13fcceb 100644
--- a/build2/install/utility.hxx
+++ b/libbuild2/install/utility.hxx
@@ -1,9 +1,9 @@
-// file : build2/install/utility.hxx -*- C++ -*-
+// file : libbuild2/install/utility.hxx -*- C++ -*-
// copyright : Copyright (c) 2014-2019 Code Synthesis Ltd
// license : MIT; see accompanying LICENSE file
-#ifndef BUILD2_INSTALL_UTILITY_HXX
-#define BUILD2_INSTALL_UTILITY_HXX
+#ifndef LIBBUILD2_INSTALL_UTILITY_HXX
+#define LIBBUILD2_INSTALL_UTILITY_HXX
#include <libbuild2/types.hxx>
#include <libbuild2/utility.hxx>
@@ -11,6 +11,8 @@
#include <libbuild2/scope.hxx>
#include <libbuild2/target.hxx>
+#include <libbuild2/export.hxx>
+
namespace build2
{
namespace install
@@ -60,17 +62,17 @@ namespace build2
//
// Note: implemented in rule.cxx.
//
- dir_path
+ LIBBUILD2_SYMEXPORT dir_path
resolve_dir (const target&, dir_path, bool fail_unknown = true);
- dir_path
+ LIBBUILD2_SYMEXPORT dir_path
resolve_dir (const scope&, dir_path, bool fail_unknown = true);
// Resolve file installation path returning empty path if not installable.
//
- path
+ LIBBUILD2_SYMEXPORT path
resolve_file (const file&); // rule.cxx
}
}
-#endif // BUILD2_INSTALL_UTILITY_HXX
+#endif // LIBBUILD2_INSTALL_UTILITY_HXX
diff --git a/build2/test/common.cxx b/libbuild2/test/common.cxx
index bbfd489..11c5d90 100644
--- a/build2/test/common.cxx
+++ b/libbuild2/test/common.cxx
@@ -1,8 +1,8 @@
-// file : build2/test/common.cxx -*- C++ -*-
+// file : libbuild2/test/common.cxx -*- C++ -*-
// copyright : Copyright (c) 2014-2019 Code Synthesis Ltd
// license : MIT; see accompanying LICENSE file
-#include <build2/test/common.hxx>
+#include <libbuild2/test/common.hxx>
#include <libbuild2/target.hxx>
#include <libbuild2/algorithm.hxx>
diff --git a/build2/test/common.hxx b/libbuild2/test/common.hxx
index 7ee72bd..5bb78ee 100644
--- a/build2/test/common.hxx
+++ b/libbuild2/test/common.hxx
@@ -1,9 +1,9 @@
-// file : build2/test/common.hxx -*- C++ -*-
+// file : libbuild2/test/common.hxx -*- C++ -*-
// copyright : Copyright (c) 2014-2019 Code Synthesis Ltd
// license : MIT; see accompanying LICENSE file
-#ifndef BUILD2_TEST_COMMON_HXX
-#define BUILD2_TEST_COMMON_HXX
+#ifndef LIBBUILD2_TEST_COMMON_HXX
+#define LIBBUILD2_TEST_COMMON_HXX
#include <libbuild2/types.hxx>
#include <libbuild2/utility.hxx>
@@ -69,4 +69,4 @@ namespace build2
}
}
-#endif // BUILD2_TEST_COMMON_HXX
+#endif // LIBBUILD2_TEST_COMMON_HXX
diff --git a/build2/test/init.cxx b/libbuild2/test/init.cxx
index 1f5a3ae..3d13acc 100644
--- a/build2/test/init.cxx
+++ b/libbuild2/test/init.cxx
@@ -1,21 +1,21 @@
-// file : build2/test/init.cxx -*- C++ -*-
+// file : libbuild2/test/init.cxx -*- C++ -*-
// copyright : Copyright (c) 2014-2019 Code Synthesis Ltd
// license : MIT; see accompanying LICENSE file
-#include <build2/test/init.hxx>
+#include <libbuild2/test/init.hxx>
#include <libbuild2/scope.hxx>
#include <libbuild2/target.hxx>
#include <libbuild2/rule.hxx>
#include <libbuild2/diagnostics.hxx>
-#include <build2/config/utility.hxx>
+#include <libbuild2/config/utility.hxx>
-#include <build2/test/module.hxx>
-#include <build2/test/target.hxx>
-#include <build2/test/operation.hxx>
+#include <libbuild2/test/module.hxx>
+#include <libbuild2/test/target.hxx>
+#include <libbuild2/test/operation.hxx>
-#include <build2/test/script/regex.hxx> // script::regex::init()
+#include <libbuild2/test/script/regex.hxx> // script::regex::init()
using namespace std;
using namespace butl;
diff --git a/build2/test/init.hxx b/libbuild2/test/init.hxx
index 5272a4d..a76b720 100644
--- a/build2/test/init.hxx
+++ b/libbuild2/test/init.hxx
@@ -1,15 +1,17 @@
-// file : build2/test/init.hxx -*- C++ -*-
+// file : libbuild2/test/init.hxx -*- C++ -*-
// copyright : Copyright (c) 2014-2019 Code Synthesis Ltd
// license : MIT; see accompanying LICENSE file
-#ifndef BUILD2_TEST_INIT_HXX
-#define BUILD2_TEST_INIT_HXX
+#ifndef LIBBUILD2_TEST_INIT_HXX
+#define LIBBUILD2_TEST_INIT_HXX
#include <libbuild2/types.hxx>
#include <libbuild2/utility.hxx>
#include <libbuild2/module.hxx>
+#include <libbuild2/export.hxx>
+
namespace build2
{
namespace test
@@ -26,9 +28,9 @@ namespace build2
bool,
const variable_map&);
- extern "C" module_functions
+ extern "C" LIBBUILD2_SYMEXPORT module_functions
build2_test_load ();
}
}
-#endif // BUILD2_TEST_INIT_HXX
+#endif // LIBBUILD2_TEST_INIT_HXX
diff --git a/build2/test/module.hxx b/libbuild2/test/module.hxx
index 0c32fb9..584cb84 100644
--- a/build2/test/module.hxx
+++ b/libbuild2/test/module.hxx
@@ -1,17 +1,17 @@
-// file : build2/test/module.hxx -*- C++ -*-
+// file : libbuild2/test/module.hxx -*- C++ -*-
// copyright : Copyright (c) 2014-2019 Code Synthesis Ltd
// license : MIT; see accompanying LICENSE file
-#ifndef BUILD2_TEST_MODULE_HXX
-#define BUILD2_TEST_MODULE_HXX
+#ifndef LIBBUILD2_TEST_MODULE_HXX
+#define LIBBUILD2_TEST_MODULE_HXX
#include <libbuild2/types.hxx>
#include <libbuild2/utility.hxx>
#include <libbuild2/module.hxx>
-#include <build2/test/rule.hxx>
-#include <build2/test/common.hxx>
+#include <libbuild2/test/rule.hxx>
+#include <libbuild2/test/common.hxx>
namespace build2
{
@@ -34,4 +34,4 @@ namespace build2
}
}
-#endif // BUILD2_TEST_MODULE_HXX
+#endif // LIBBUILD2_TEST_MODULE_HXX
diff --git a/build2/test/operation.cxx b/libbuild2/test/operation.cxx
index 8b6c73f..3ff7702 100644
--- a/build2/test/operation.cxx
+++ b/libbuild2/test/operation.cxx
@@ -1,8 +1,8 @@
-// file : build2/test/operation.cxx -*- C++ -*-
+// file : libbuild2/test/operation.cxx -*- C++ -*-
// copyright : Copyright (c) 2014-2019 Code Synthesis Ltd
// license : MIT; see accompanying LICENSE file
-#include <build2/test/operation.hxx>
+#include <libbuild2/test/operation.hxx>
using namespace std;
using namespace butl;
diff --git a/build2/test/operation.hxx b/libbuild2/test/operation.hxx
index 09b954e..8a9aed7 100644
--- a/build2/test/operation.hxx
+++ b/libbuild2/test/operation.hxx
@@ -1,9 +1,9 @@
-// file : build2/test/operation.hxx -*- C++ -*-
+// file : libbuild2/test/operation.hxx -*- C++ -*-
// copyright : Copyright (c) 2014-2019 Code Synthesis Ltd
// license : MIT; see accompanying LICENSE file
-#ifndef BUILD2_TEST_OPERATION_HXX
-#define BUILD2_TEST_OPERATION_HXX
+#ifndef LIBBUILD2_TEST_OPERATION_HXX
+#define LIBBUILD2_TEST_OPERATION_HXX
#include <libbuild2/types.hxx>
#include <libbuild2/utility.hxx>
@@ -19,4 +19,4 @@ namespace build2
}
}
-#endif // BUILD2_TEST_OPERATION_HXX
+#endif // LIBBUILD2_TEST_OPERATION_HXX
diff --git a/build2/test/rule.cxx b/libbuild2/test/rule.cxx
index 7cb830c..a6796b4 100644
--- a/build2/test/rule.cxx
+++ b/libbuild2/test/rule.cxx
@@ -1,8 +1,8 @@
-// file : build2/test/rule.cxx -*- C++ -*-
+// file : libbuild2/test/rule.cxx -*- C++ -*-
// copyright : Copyright (c) 2014-2019 Code Synthesis Ltd
// license : MIT; see accompanying LICENSE file
-#include <build2/test/rule.hxx>
+#include <libbuild2/test/rule.hxx>
#include <libbuild2/scope.hxx>
#include <libbuild2/target.hxx>
@@ -10,11 +10,11 @@
#include <libbuild2/filesystem.hxx>
#include <libbuild2/diagnostics.hxx>
-#include <build2/test/target.hxx>
+#include <libbuild2/test/target.hxx>
-#include <build2/test/script/parser.hxx>
-#include <build2/test/script/runner.hxx>
-#include <build2/test/script/script.hxx>
+#include <libbuild2/test/script/parser.hxx>
+#include <libbuild2/test/script/runner.hxx>
+#include <libbuild2/test/script/script.hxx>
using namespace std;
using namespace butl;
diff --git a/build2/test/rule.hxx b/libbuild2/test/rule.hxx
index 2f0ef53..7837074 100644
--- a/build2/test/rule.hxx
+++ b/libbuild2/test/rule.hxx
@@ -1,9 +1,9 @@
-// file : build2/test/rule.hxx -*- C++ -*-
+// file : libbuild2/test/rule.hxx -*- C++ -*-
// copyright : Copyright (c) 2014-2019 Code Synthesis Ltd
// license : MIT; see accompanying LICENSE file
-#ifndef BUILD2_TEST_RULE_HXX
-#define BUILD2_TEST_RULE_HXX
+#ifndef LIBBUILD2_TEST_RULE_HXX
+#define LIBBUILD2_TEST_RULE_HXX
#include <libbuild2/types.hxx>
#include <libbuild2/utility.hxx>
@@ -11,7 +11,7 @@
#include <libbuild2/rule.hxx>
#include <libbuild2/action.hxx>
-#include <build2/test/common.hxx>
+#include <libbuild2/test/common.hxx>
namespace build2
{
@@ -64,4 +64,4 @@ namespace build2
}
}
-#endif // BUILD2_TEST_RULE_HXX
+#endif // LIBBUILD2_TEST_RULE_HXX
diff --git a/build2/test/script/builtin.cxx b/libbuild2/test/script/builtin.cxx
index 14ea267..ab57d4f 100644
--- a/build2/test/script/builtin.cxx
+++ b/libbuild2/test/script/builtin.cxx
@@ -1,8 +1,8 @@
-// file : build2/test/script/builtin.cxx -*- C++ -*-
+// file : libbuild2/test/script/builtin.cxx -*- C++ -*-
// copyright : Copyright (c) 2014-2019 Code Synthesis Ltd
// license : MIT; see accompanying LICENSE file
-#include <build2/test/script/builtin.hxx>
+#include <libbuild2/test/script/builtin.hxx>
#include <chrono>
#include <locale>
@@ -17,7 +17,7 @@
#include <libbuild2/context.hxx> // sched
-#include <build2/test/script/script.hxx>
+#include <libbuild2/test/script/script.hxx>
// Strictly speaking a builtin which reads/writes from/to standard streams
// must be asynchronous so that the caller can communicate with it through
diff --git a/build2/test/script/builtin.hxx b/libbuild2/test/script/builtin.hxx
index af7c809..b340335 100644
--- a/build2/test/script/builtin.hxx
+++ b/libbuild2/test/script/builtin.hxx
@@ -1,9 +1,9 @@
-// file : build2/test/script/builtin.hxx -*- C++ -*-
+// file : libbuild2/test/script/builtin.hxx -*- C++ -*-
// copyright : Copyright (c) 2014-2019 Code Synthesis Ltd
// license : MIT; see accompanying LICENSE file
-#ifndef BUILD2_TEST_SCRIPT_BUILTIN_HXX
-#define BUILD2_TEST_SCRIPT_BUILTIN_HXX
+#ifndef LIBBUILD2_TEST_SCRIPT_BUILTIN_HXX
+#define LIBBUILD2_TEST_SCRIPT_BUILTIN_HXX
#include <map>
@@ -71,4 +71,4 @@ namespace build2
}
}
-#endif // BUILD2_TEST_SCRIPT_BUILTIN_HXX
+#endif // LIBBUILD2_TEST_SCRIPT_BUILTIN_HXX
diff --git a/build2/test/script/lexer+command-expansion.test.testscript b/libbuild2/test/script/lexer+command-expansion.test.testscript
index 03e3366..1ddc246 100644
--- a/build2/test/script/lexer+command-expansion.test.testscript
+++ b/libbuild2/test/script/lexer+command-expansion.test.testscript
@@ -1,4 +1,4 @@
-# file : build2/test/script/lexer+command-expansion.test.testscript
+# file : libbuild2/test/script/lexer+command-expansion.test.testscript
# copyright : Copyright (c) 2014-2019 Code Synthesis Ltd
# license : MIT; see accompanying LICENSE file
diff --git a/build2/test/script/lexer+command-line.test.testscript b/libbuild2/test/script/lexer+command-line.test.testscript
index 65be837..eedb46f 100644
--- a/build2/test/script/lexer+command-line.test.testscript
+++ b/libbuild2/test/script/lexer+command-line.test.testscript
@@ -1,4 +1,4 @@
-# file : build2/test/script/lexer+command-line.test.testscript
+# file : libbuild2/test/script/lexer+command-line.test.testscript
# copyright : Copyright (c) 2014-2019 Code Synthesis Ltd
# license : MIT; see accompanying LICENSE file
diff --git a/build2/test/script/lexer+description-line.test.testscript b/libbuild2/test/script/lexer+description-line.test.testscript
index 2d87d24..bb5948a 100644
--- a/build2/test/script/lexer+description-line.test.testscript
+++ b/libbuild2/test/script/lexer+description-line.test.testscript
@@ -1,4 +1,4 @@
-# file : build2/test/script/lexer+description-line.test.testscript
+# file : libbuild2/test/script/lexer+description-line.test.testscript
# copyright : Copyright (c) 2014-2019 Code Synthesis Ltd
# license : MIT; see accompanying LICENSE file
diff --git a/build2/test/script/lexer+first-token.test.testscript b/libbuild2/test/script/lexer+first-token.test.testscript
index f20f261..3eaf976 100644
--- a/build2/test/script/lexer+first-token.test.testscript
+++ b/libbuild2/test/script/lexer+first-token.test.testscript
@@ -1,4 +1,4 @@
-# file : build2/test/script/lexer+first-token.test.testscript
+# file : libbuild2/test/script/lexer+first-token.test.testscript
# copyright : Copyright (c) 2014-2019 Code Synthesis Ltd
# license : MIT; see accompanying LICENSE file
diff --git a/build2/test/script/lexer+second-token.test.testscript b/libbuild2/test/script/lexer+second-token.test.testscript
index 8fdee23..c494796 100644
--- a/build2/test/script/lexer+second-token.test.testscript
+++ b/libbuild2/test/script/lexer+second-token.test.testscript
@@ -1,4 +1,4 @@
-# file : build2/test/script/lexer+second-token.test.testscript
+# file : libbuild2/test/script/lexer+second-token.test.testscript
# copyright : Copyright (c) 2014-2019 Code Synthesis Ltd
# license : MIT; see accompanying LICENSE file
diff --git a/build2/test/script/lexer+variable-line.test.testscript b/libbuild2/test/script/lexer+variable-line.test.testscript
index b9c558d..bac4f16 100644
--- a/build2/test/script/lexer+variable-line.test.testscript
+++ b/libbuild2/test/script/lexer+variable-line.test.testscript
@@ -1,4 +1,4 @@
-# file : build2/test/script/lexer+variable-line.test.testscript
+# file : libbuild2/test/script/lexer+variable-line.test.testscript
# copyright : Copyright (c) 2014-2019 Code Synthesis Ltd
# license : MIT; see accompanying LICENSE file
diff --git a/build2/test/script/lexer+variable.test.testscript b/libbuild2/test/script/lexer+variable.test.testscript
index 0ec323b..64b2bee 100644
--- a/build2/test/script/lexer+variable.test.testscript
+++ b/libbuild2/test/script/lexer+variable.test.testscript
@@ -1,4 +1,4 @@
-# file : build2/test/script/lexer+variable.test.testscript
+# file : libbuild2/test/script/lexer+variable.test.testscript
# copyright : Copyright (c) 2014-2019 Code Synthesis Ltd
# license : MIT; see accompanying LICENSE file
diff --git a/build2/test/script/lexer.cxx b/libbuild2/test/script/lexer.cxx
index 2470fcc..75c04c8 100644
--- a/build2/test/script/lexer.cxx
+++ b/libbuild2/test/script/lexer.cxx
@@ -1,8 +1,8 @@
-// file : build2/test/script/lexer.cxx -*- C++ -*-
+// file : libbuild2/test/script/lexer.cxx -*- C++ -*-
// copyright : Copyright (c) 2014-2019 Code Synthesis Ltd
// license : MIT; see accompanying LICENSE file
-#include <build2/test/script/lexer.hxx>
+#include <libbuild2/test/script/lexer.hxx>
#include <cstring> // strchr()
diff --git a/build2/test/script/lexer.hxx b/libbuild2/test/script/lexer.hxx
index ad1c386..d96e91b 100644
--- a/build2/test/script/lexer.hxx
+++ b/libbuild2/test/script/lexer.hxx
@@ -1,16 +1,16 @@
-// file : build2/test/script/lexer.hxx -*- C++ -*-
+// file : libbuild2/test/script/lexer.hxx -*- C++ -*-
// copyright : Copyright (c) 2014-2019 Code Synthesis Ltd
// license : MIT; see accompanying LICENSE file
-#ifndef BUILD2_TEST_SCRIPT_LEXER_HXX
-#define BUILD2_TEST_SCRIPT_LEXER_HXX
+#ifndef LIBBUILD2_TEST_SCRIPT_LEXER_HXX
+#define LIBBUILD2_TEST_SCRIPT_LEXER_HXX
#include <libbuild2/types.hxx>
#include <libbuild2/utility.hxx>
#include <libbuild2/lexer.hxx>
-#include <build2/test/script/token.hxx>
+#include <libbuild2/test/script/token.hxx>
namespace build2
{
@@ -91,4 +91,4 @@ namespace build2
}
}
-#endif // BUILD2_TEST_SCRIPT_LEXER_HXX
+#endif // LIBBUILD2_TEST_SCRIPT_LEXER_HXX
diff --git a/build2/test/script/lexer.test.cxx b/libbuild2/test/script/lexer.test.cxx
index c9905ec..5a421b8 100644
--- a/build2/test/script/lexer.test.cxx
+++ b/libbuild2/test/script/lexer.test.cxx
@@ -1,4 +1,4 @@
-// file : build2/test/script/lexer.test.cxx -*- C++ -*-
+// file : libbuild2/test/script/lexer.test.cxx -*- C++ -*-
// copyright : Copyright (c) 2014-2019 Code Synthesis Ltd
// license : MIT; see accompanying LICENSE file
@@ -8,8 +8,8 @@
#include <libbuild2/types.hxx>
#include <libbuild2/utility.hxx>
-#include <build2/test/script/token.hxx>
-#include <build2/test/script/lexer.hxx>
+#include <libbuild2/test/script/token.hxx>
+#include <libbuild2/test/script/lexer.hxx>
using namespace std;
diff --git a/build2/test/script/parser+cleanup.test.testscript b/libbuild2/test/script/parser+cleanup.test.testscript
index 2c94afc..321664c 100644
--- a/build2/test/script/parser+cleanup.test.testscript
+++ b/libbuild2/test/script/parser+cleanup.test.testscript
@@ -1,4 +1,4 @@
-# file : build2/test/script/parser+cleanup.test.testscript
+# file : libbuild2/test/script/parser+cleanup.test.testscript
# copyright : Copyright (c) 2014-2019 Code Synthesis Ltd
# license : MIT; see accompanying LICENSE file
diff --git a/build2/test/script/parser+command-if.test.testscript b/libbuild2/test/script/parser+command-if.test.testscript
index ab6e6d5..7425da2 100644
--- a/build2/test/script/parser+command-if.test.testscript
+++ b/libbuild2/test/script/parser+command-if.test.testscript
@@ -1,4 +1,4 @@
-# file : build2/test/script/parser+command-if.test.testscript
+# file : libbuild2/test/script/parser+command-if.test.testscript
# copyright : Copyright (c) 2014-2019 Code Synthesis Ltd
# license : MIT; see accompanying LICENSE file
diff --git a/build2/test/script/parser+command-re-parse.test.testscript b/libbuild2/test/script/parser+command-re-parse.test.testscript
index ef030de..f5a67f3 100644
--- a/build2/test/script/parser+command-re-parse.test.testscript
+++ b/libbuild2/test/script/parser+command-re-parse.test.testscript
@@ -1,4 +1,4 @@
-# file : build2/test/script/parser+command-re-parse.test.testscript
+# file : libbuild2/test/script/parser+command-re-parse.test.testscript
# copyright : Copyright (c) 2014-2019 Code Synthesis Ltd
# license : MIT; see accompanying LICENSE file
diff --git a/build2/test/script/parser+description.test.testscript b/libbuild2/test/script/parser+description.test.testscript
index f38c8d2..d17a69f 100644
--- a/build2/test/script/parser+description.test.testscript
+++ b/libbuild2/test/script/parser+description.test.testscript
@@ -1,4 +1,4 @@
-# file : build2/test/script/parser+description.test.testscript
+# file : libbuild2/test/script/parser+description.test.testscript
# copyright : Copyright (c) 2014-2019 Code Synthesis Ltd
# license : MIT; see accompanying LICENSE file
diff --git a/build2/test/script/parser+directive.test.testscript b/libbuild2/test/script/parser+directive.test.testscript
index addd874..9d04ce7 100644
--- a/build2/test/script/parser+directive.test.testscript
+++ b/libbuild2/test/script/parser+directive.test.testscript
@@ -1,4 +1,4 @@
-# file : build2/test/script/parser+directive.test.testscript
+# file : libbuild2/test/script/parser+directive.test.testscript
# copyright : Copyright (c) 2014-2019 Code Synthesis Ltd
# license : MIT; see accompanying LICENSE file
diff --git a/build2/test/script/parser+exit.test.testscript b/libbuild2/test/script/parser+exit.test.testscript
index 014afa4..284e9a7 100644
--- a/build2/test/script/parser+exit.test.testscript
+++ b/libbuild2/test/script/parser+exit.test.testscript
@@ -1,4 +1,4 @@
-# file : build2/test/script/parser+exit.test.testscript
+# file : libbuild2/test/script/parser+exit.test.testscript
# copyright : Copyright (c) 2014-2019 Code Synthesis Ltd
# license : MIT; see accompanying LICENSE file
diff --git a/build2/test/script/parser+expansion.test.testscript b/libbuild2/test/script/parser+expansion.test.testscript
index 71a21b3..7ea92f9 100644
--- a/build2/test/script/parser+expansion.test.testscript
+++ b/libbuild2/test/script/parser+expansion.test.testscript
@@ -1,4 +1,4 @@
-# file : build2/test/script/parser+expansion.test.testscript
+# file : libbuild2/test/script/parser+expansion.test.testscript
# copyright : Copyright (c) 2014-2019 Code Synthesis Ltd
# license : MIT; see accompanying LICENSE file
diff --git a/build2/test/script/parser+here-document.test.testscript b/libbuild2/test/script/parser+here-document.test.testscript
index 9f82a80..00f3fbd 100644
--- a/build2/test/script/parser+here-document.test.testscript
+++ b/libbuild2/test/script/parser+here-document.test.testscript
@@ -1,4 +1,4 @@
-# file : build2/test/script/parser+here-document.test.testscript
+# file : libbuild2/test/script/parser+here-document.test.testscript
# copyright : Copyright (c) 2014-2019 Code Synthesis Ltd
# license : MIT; see accompanying LICENSE file
diff --git a/build2/test/script/parser+here-string.test.testscript b/libbuild2/test/script/parser+here-string.test.testscript
index 16544df..785951d 100644
--- a/build2/test/script/parser+here-string.test.testscript
+++ b/libbuild2/test/script/parser+here-string.test.testscript
@@ -1,4 +1,4 @@
-# file : build2/test/script/parser+here-string.test.testscript
+# file : libbuild2/test/script/parser+here-string.test.testscript
# copyright : Copyright (c) 2014-2019 Code Synthesis Ltd
# license : MIT; see accompanying LICENSE file
diff --git a/build2/test/script/parser+include.test.testscript b/libbuild2/test/script/parser+include.test.testscript
index 65be149..c86b583 100644
--- a/build2/test/script/parser+include.test.testscript
+++ b/libbuild2/test/script/parser+include.test.testscript
@@ -1,4 +1,4 @@
-# file : build2/test/script/parser+include.test.testscript
+# file : libbuild2/test/script/parser+include.test.testscript
# copyright : Copyright (c) 2014-2019 Code Synthesis Ltd
# license : MIT; see accompanying LICENSE file
diff --git a/build2/test/script/parser+pipe-expr.test.testscript b/libbuild2/test/script/parser+pipe-expr.test.testscript
index 18eb660..8b6b4f9 100644
--- a/build2/test/script/parser+pipe-expr.test.testscript
+++ b/libbuild2/test/script/parser+pipe-expr.test.testscript
@@ -1,4 +1,4 @@
-# file : build2/test/script/parser+pipe-expr.test.testscript
+# file : libbuild2/test/script/parser+pipe-expr.test.testscript
# copyright : Copyright (c) 2014-2019 Code Synthesis Ltd
# license : MIT; see accompanying LICENSE file
diff --git a/build2/test/script/parser+pre-parse.test.testscript b/libbuild2/test/script/parser+pre-parse.test.testscript
index 7d9eb6c..f98512a 100644
--- a/build2/test/script/parser+pre-parse.test.testscript
+++ b/libbuild2/test/script/parser+pre-parse.test.testscript
@@ -1,4 +1,4 @@
-# file : build2/test/script/parser+pre-parse.test.testscript
+# file : libbuild2/test/script/parser+pre-parse.test.testscript
# copyright : Copyright (c) 2014-2019 Code Synthesis Ltd
# license : MIT; see accompanying LICENSE file
diff --git a/build2/test/script/parser+redirect.test.testscript b/libbuild2/test/script/parser+redirect.test.testscript
index b0b967a..a8691da 100644
--- a/build2/test/script/parser+redirect.test.testscript
+++ b/libbuild2/test/script/parser+redirect.test.testscript
@@ -1,4 +1,4 @@
-# file : build2/test/script/parser+redirect.test.testscript
+# file : libbuild2/test/script/parser+redirect.test.testscript
# copyright : Copyright (c) 2014-2019 Code Synthesis Ltd
# license : MIT; see accompanying LICENSE file
diff --git a/build2/test/script/parser+regex.test.testscript b/libbuild2/test/script/parser+regex.test.testscript
index 031492e..d5f899a 100644
--- a/build2/test/script/parser+regex.test.testscript
+++ b/libbuild2/test/script/parser+regex.test.testscript
@@ -1,4 +1,4 @@
-# file : build2/test/script/parser+regex.test.testscript
+# file : libbuild2/test/script/parser+regex.test.testscript
# copyright : Copyright (c) 2014-2019 Code Synthesis Ltd
# license : MIT; see accompanying LICENSE file
diff --git a/build2/test/script/parser+scope-if.test.testscript b/libbuild2/test/script/parser+scope-if.test.testscript
index faae297..aad3f37 100644
--- a/build2/test/script/parser+scope-if.test.testscript
+++ b/libbuild2/test/script/parser+scope-if.test.testscript
@@ -1,4 +1,4 @@
-# file : build2/test/script/parser+scope-if.test.testscript
+# file : libbuild2/test/script/parser+scope-if.test.testscript
# copyright : Copyright (c) 2014-2019 Code Synthesis Ltd
# license : MIT; see accompanying LICENSE file
diff --git a/build2/test/script/parser+scope.test.testscript b/libbuild2/test/script/parser+scope.test.testscript
index 9147161..bfb1a59 100644
--- a/build2/test/script/parser+scope.test.testscript
+++ b/libbuild2/test/script/parser+scope.test.testscript
@@ -1,4 +1,4 @@
-# file : build2/test/script/parser+scope.test.testscript
+# file : libbuild2/test/script/parser+scope.test.testscript
# copyright : Copyright (c) 2014-2019 Code Synthesis Ltd
# license : MIT; see accompanying LICENSE file
diff --git a/build2/test/script/parser+setup-teardown.test.testscript b/libbuild2/test/script/parser+setup-teardown.test.testscript
index 9d67309..5f1418a 100644
--- a/build2/test/script/parser+setup-teardown.test.testscript
+++ b/libbuild2/test/script/parser+setup-teardown.test.testscript
@@ -1,4 +1,4 @@
-# file : build2/test/script/parser+setup-teardown.test.testscript
+# file : libbuild2/test/script/parser+setup-teardown.test.testscript
# copyright : Copyright (c) 2014-2019 Code Synthesis Ltd
# license : MIT; see accompanying LICENSE file
diff --git a/build2/test/script/parser.cxx b/libbuild2/test/script/parser.cxx
index 59b950f..260bc88 100644
--- a/build2/test/script/parser.cxx
+++ b/libbuild2/test/script/parser.cxx
@@ -1,15 +1,15 @@
-// file : build2/test/script/parser.cxx -*- C++ -*-
+// file : libbuild2/test/script/parser.cxx -*- C++ -*-
// copyright : Copyright (c) 2014-2019 Code Synthesis Ltd
// license : MIT; see accompanying LICENSE file
-#include <build2/test/script/parser.hxx>
+#include <libbuild2/test/script/parser.hxx>
#include <sstream>
#include <libbuild2/context.hxx> // sched, keep_going
-#include <build2/test/script/lexer.hxx>
-#include <build2/test/script/runner.hxx>
+#include <libbuild2/test/script/lexer.hxx>
+#include <libbuild2/test/script/runner.hxx>
using namespace std;
diff --git a/build2/test/script/parser.hxx b/libbuild2/test/script/parser.hxx
index dfa1126..1beee49 100644
--- a/build2/test/script/parser.hxx
+++ b/libbuild2/test/script/parser.hxx
@@ -1,9 +1,9 @@
-// file : build2/test/script/parser.hxx -*- C++ -*-
+// file : libbuild2/test/script/parser.hxx -*- C++ -*-
// copyright : Copyright (c) 2014-2019 Code Synthesis Ltd
// license : MIT; see accompanying LICENSE file
-#ifndef BUILD2_TEST_SCRIPT_PARSER_HXX
-#define BUILD2_TEST_SCRIPT_PARSER_HXX
+#ifndef LIBBUILD2_TEST_SCRIPT_PARSER_HXX
+#define LIBBUILD2_TEST_SCRIPT_PARSER_HXX
#include <libbuild2/types.hxx>
#include <libbuild2/utility.hxx>
@@ -11,8 +11,8 @@
#include <libbuild2/parser.hxx>
#include <libbuild2/diagnostics.hxx>
-#include <build2/test/script/token.hxx>
-#include <build2/test/script/script.hxx>
+#include <libbuild2/test/script/token.hxx>
+#include <libbuild2/test/script/script.hxx>
namespace build2
{
@@ -247,4 +247,4 @@ namespace build2
}
}
-#endif // BUILD2_TEST_SCRIPT_PARSER_HXX
+#endif // LIBBUILD2_TEST_SCRIPT_PARSER_HXX
diff --git a/build2/test/script/parser.test.cxx b/libbuild2/test/script/parser.test.cxx
index 352941a..8702e18 100644
--- a/build2/test/script/parser.test.cxx
+++ b/libbuild2/test/script/parser.test.cxx
@@ -1,4 +1,4 @@
-// file : build2/test/script/parser.test.cxx -*- C++ -*-
+// file : libbuild2/test/script/parser.test.cxx -*- C++ -*-
// copyright : Copyright (c) 2014-2019 Code Synthesis Ltd
// license : MIT; see accompanying LICENSE file
@@ -12,11 +12,11 @@
#include <libbuild2/context.hxx> // reset()
#include <libbuild2/scheduler.hxx>
-#include <build2/test/target.hxx>
+#include <libbuild2/test/target.hxx>
-#include <build2/test/script/token.hxx>
-#include <build2/test/script/parser.hxx>
-#include <build2/test/script/runner.hxx>
+#include <libbuild2/test/script/token.hxx>
+#include <libbuild2/test/script/parser.hxx>
+#include <libbuild2/test/script/runner.hxx>
using namespace std;
diff --git a/build2/test/script/regex.cxx b/libbuild2/test/script/regex.cxx
index bbd1738..20dfaa6 100644
--- a/build2/test/script/regex.cxx
+++ b/libbuild2/test/script/regex.cxx
@@ -1,10 +1,10 @@
-// file : build2/test/script/regex.cxx -*- C++ -*-
+// file : libbuild2/test/script/regex.cxx -*- C++ -*-
// copyright : Copyright (c) 2014-2019 Code Synthesis Ltd
// license : MIT; see accompanying LICENSE file
#include <locale>
-#include <build2/test/script/regex.hxx>
+#include <libbuild2/test/script/regex.hxx>
using namespace std;
@@ -166,10 +166,10 @@ namespace build2
// line_char_locale
//
- // An exemplar locale with the std::ctype<line_char> facet. It is
- // used for the subsequent line char locale objects creation (see
- // below) which normally ends up with a shallow copy of a reference-
- // counted object.
+ // An exemplar locale with the std::ctype<line_char> facet. It is used
+ // for the subsequent line char locale objects creation (see below)
+ // which normally ends up with a shallow copy of a reference-counted
+ // object.
//
// Note that creating the line char locales from the exemplar is not
// merely an optimization: there is a data race in the libstdc++ (at
diff --git a/build2/test/script/regex.hxx b/libbuild2/test/script/regex.hxx
index 33a4cba..faec1fc 100644
--- a/build2/test/script/regex.hxx
+++ b/libbuild2/test/script/regex.hxx
@@ -1,9 +1,9 @@
-// file : build2/test/script/regex.hxx -*- C++ -*-
+// file : libbuild2/test/script/regex.hxx -*- C++ -*-
// copyright : Copyright (c) 2014-2019 Code Synthesis Ltd
// license : MIT; see accompanying LICENSE file
-#ifndef BUILD2_TEST_SCRIPT_REGEX_HXX
-#define BUILD2_TEST_SCRIPT_REGEX_HXX
+#ifndef LIBBUILD2_TEST_SCRIPT_REGEX_HXX
+#define LIBBUILD2_TEST_SCRIPT_REGEX_HXX
#include <list>
#include <regex>
@@ -698,6 +698,6 @@ namespace build2
}
}
-#include <build2/test/script/regex.ixx>
+#include <libbuild2/test/script/regex.ixx>
-#endif // BUILD2_TEST_SCRIPT_REGEX_HXX
+#endif // LIBBUILD2_TEST_SCRIPT_REGEX_HXX
diff --git a/build2/test/script/regex.ixx b/libbuild2/test/script/regex.ixx
index a83f58f..c5b638e 100644
--- a/build2/test/script/regex.ixx
+++ b/libbuild2/test/script/regex.ixx
@@ -1,4 +1,4 @@
-// file : build2/test/script/regex.ixx -*- C++ -*-
+// file : libbuild2/test/script/regex.ixx -*- C++ -*-
// copyright : Copyright (c) 2014-2019 Code Synthesis Ltd
// license : MIT; see accompanying LICENSE file
diff --git a/build2/test/script/regex.test.cxx b/libbuild2/test/script/regex.test.cxx
index 1e48f97..f205154 100644
--- a/build2/test/script/regex.test.cxx
+++ b/libbuild2/test/script/regex.test.cxx
@@ -1,11 +1,11 @@
-// file : build2/test/script/regex.test.cxx -*- C++ -*-
+// file : libbuild2/test/script/regex.test.cxx -*- C++ -*-
// copyright : Copyright (c) 2014-2019 Code Synthesis Ltd
// license : MIT; see accompanying LICENSE file
#include <regex>
#include <type_traits> // is_pod, is_array
-#include <build2/test/script/regex.hxx>
+#include <libbuild2/test/script/regex.hxx>
using namespace std;
using namespace build2::test::script::regex;
diff --git a/build2/test/script/runner.cxx b/libbuild2/test/script/runner.cxx
index 9031211..6c1becd 100644
--- a/build2/test/script/runner.cxx
+++ b/libbuild2/test/script/runner.cxx
@@ -1,8 +1,8 @@
-// file : build2/test/script/runner.cxx -*- C++ -*-
+// file : libbuild2/test/script/runner.cxx -*- C++ -*-
// copyright : Copyright (c) 2014-2019 Code Synthesis Ltd
// license : MIT; see accompanying LICENSE file
-#include <build2/test/script/runner.hxx>
+#include <libbuild2/test/script/runner.hxx>
#include <set>
#include <ios> // streamsize
@@ -14,11 +14,11 @@
#include <libbuild2/filesystem.hxx>
#include <libbuild2/diagnostics.hxx>
-#include <build2/test/common.hxx>
+#include <libbuild2/test/common.hxx>
-#include <build2/test/script/regex.hxx>
-#include <build2/test/script/parser.hxx>
-#include <build2/test/script/builtin.hxx>
+#include <libbuild2/test/script/regex.hxx>
+#include <libbuild2/test/script/parser.hxx>
+#include <libbuild2/test/script/builtin.hxx>
using namespace std;
using namespace butl;
diff --git a/build2/test/script/runner.hxx b/libbuild2/test/script/runner.hxx
index 5f70dcc..9a3f91f 100644
--- a/build2/test/script/runner.hxx
+++ b/libbuild2/test/script/runner.hxx
@@ -1,14 +1,14 @@
-// file : build2/test/script/runner.hxx -*- C++ -*-
+// file : libbuild2/test/script/runner.hxx -*- C++ -*-
// copyright : Copyright (c) 2014-2019 Code Synthesis Ltd
// license : MIT; see accompanying LICENSE file
-#ifndef BUILD2_TEST_SCRIPT_RUNNER_HXX
-#define BUILD2_TEST_SCRIPT_RUNNER_HXX
+#ifndef LIBBUILD2_TEST_SCRIPT_RUNNER_HXX
+#define LIBBUILD2_TEST_SCRIPT_RUNNER_HXX
#include <libbuild2/types.hxx>
#include <libbuild2/utility.hxx>
-#include <build2/test/script/script.hxx>
+#include <libbuild2/test/script/script.hxx>
namespace build2
{
@@ -98,4 +98,4 @@ namespace build2
}
}
-#endif // BUILD2_TEST_SCRIPT_RUNNER_HXX
+#endif // LIBBUILD2_TEST_SCRIPT_RUNNER_HXX
diff --git a/build2/test/script/script.cxx b/libbuild2/test/script/script.cxx
index 8e6351f..b879eb4 100644
--- a/build2/test/script/script.cxx
+++ b/libbuild2/test/script/script.cxx
@@ -1,8 +1,8 @@
-// file : build2/test/script/script.cxx -*- C++ -*-
+// file : libbuild2/test/script/script.cxx -*- C++ -*-
// copyright : Copyright (c) 2014-2019 Code Synthesis Ltd
// license : MIT; see accompanying LICENSE file
-#include <build2/test/script/script.hxx>
+#include <libbuild2/test/script/script.hxx>
#include <sstream>
diff --git a/build2/test/script/script.hxx b/libbuild2/test/script/script.hxx
index cc162cb..e3f8251 100644
--- a/build2/test/script/script.hxx
+++ b/libbuild2/test/script/script.hxx
@@ -1,9 +1,9 @@
-// file : build2/test/script/script.hxx -*- C++ -*-
+// file : libbuild2/test/script/script.hxx -*- C++ -*-
// copyright : Copyright (c) 2014-2019 Code Synthesis Ltd
// license : MIT; see accompanying LICENSE file
-#ifndef BUILD2_TEST_SCRIPT_SCRIPT_HXX
-#define BUILD2_TEST_SCRIPT_SCRIPT_HXX
+#ifndef LIBBUILD2_TEST_SCRIPT_SCRIPT_HXX
+#define LIBBUILD2_TEST_SCRIPT_SCRIPT_HXX
#include <set>
@@ -12,9 +12,9 @@
#include <libbuild2/variable.hxx>
-#include <build2/test/target.hxx>
+#include <libbuild2/test/target.hxx>
-#include <build2/test/script/token.hxx> // replay_tokens
+#include <libbuild2/test/script/token.hxx> // replay_tokens
namespace build2
{
@@ -554,6 +554,6 @@ namespace build2
}
}
-#include <build2/test/script/script.ixx>
+#include <libbuild2/test/script/script.ixx>
-#endif // BUILD2_TEST_SCRIPT_SCRIPT_HXX
+#endif // LIBBUILD2_TEST_SCRIPT_SCRIPT_HXX
diff --git a/build2/test/script/script.ixx b/libbuild2/test/script/script.ixx
index 80fbcb0..d4a216a 100644
--- a/build2/test/script/script.ixx
+++ b/libbuild2/test/script/script.ixx
@@ -1,4 +1,4 @@
-// file : build2/test/script/script.ixx -*- C++ -*-
+// file : libbuild2/test/script/script.ixx -*- C++ -*-
// copyright : Copyright (c) 2014-2019 Code Synthesis Ltd
// license : MIT; see accompanying LICENSE file
diff --git a/build2/test/script/token.cxx b/libbuild2/test/script/token.cxx
index 2d14701..e38e227 100644
--- a/build2/test/script/token.cxx
+++ b/libbuild2/test/script/token.cxx
@@ -1,8 +1,8 @@
-// file : build2/test/script/token.cxx -*- C++ -*-
+// file : libbuild2/test/script/token.cxx -*- C++ -*-
// copyright : Copyright (c) 2014-2019 Code Synthesis Ltd
// license : MIT; see accompanying LICENSE file
-#include <build2/test/script/token.hxx>
+#include <libbuild2/test/script/token.hxx>
using namespace std;
diff --git a/build2/test/script/token.hxx b/libbuild2/test/script/token.hxx
index c79ef1b..4abe617 100644
--- a/build2/test/script/token.hxx
+++ b/libbuild2/test/script/token.hxx
@@ -1,9 +1,9 @@
-// file : build2/test/script/token.hxx -*- C++ -*-
+// file : libbuild2/test/script/token.hxx -*- C++ -*-
// copyright : Copyright (c) 2014-2019 Code Synthesis Ltd
// license : MIT; see accompanying LICENSE file
-#ifndef BUILD2_TEST_SCRIPT_TOKEN_HXX
-#define BUILD2_TEST_SCRIPT_TOKEN_HXX
+#ifndef LIBBUILD2_TEST_SCRIPT_TOKEN_HXX
+#define LIBBUILD2_TEST_SCRIPT_TOKEN_HXX
#include <libbuild2/types.hxx>
#include <libbuild2/utility.hxx>
@@ -62,4 +62,4 @@ namespace build2
}
}
-#endif // BUILD2_TEST_SCRIPT_TOKEN_HXX
+#endif // LIBBUILD2_TEST_SCRIPT_TOKEN_HXX
diff --git a/build2/test/target.cxx b/libbuild2/test/target.cxx
index f75b556..2707a89 100644
--- a/build2/test/target.cxx
+++ b/libbuild2/test/target.cxx
@@ -1,8 +1,8 @@
-// file : build2/test/target.cxx -*- C++ -*-
+// file : libbuild2/test/target.cxx -*- C++ -*-
// copyright : Copyright (c) 2014-2019 Code Synthesis Ltd
// license : MIT; see accompanying LICENSE file
-#include <build2/test/target.hxx>
+#include <libbuild2/test/target.hxx>
using namespace std;
using namespace butl;
diff --git a/build2/test/target.hxx b/libbuild2/test/target.hxx
index 6cd07b9..f633adf 100644
--- a/build2/test/target.hxx
+++ b/libbuild2/test/target.hxx
@@ -1,20 +1,22 @@
-// file : build2/test/target.hxx -*- C++ -*-
+// file : libbuild2/test/target.hxx -*- C++ -*-
// copyright : Copyright (c) 2014-2019 Code Synthesis Ltd
// license : MIT; see accompanying LICENSE file
-#ifndef BUILD2_TEST_TARGET_HXX
-#define BUILD2_TEST_TARGET_HXX
+#ifndef LIBBUILD2_TEST_TARGET_HXX
+#define LIBBUILD2_TEST_TARGET_HXX
#include <libbuild2/types.hxx>
#include <libbuild2/utility.hxx>
#include <libbuild2/target.hxx>
+#include <libbuild2/export.hxx>
+
namespace build2
{
namespace test
{
- class testscript: public file
+ class LIBBUILD2_SYMEXPORT testscript: public file
{
public:
using file::file;
@@ -26,4 +28,4 @@ namespace build2
}
}
-#endif // BUILD2_TEST_TARGET_HXX
+#endif // LIBBUILD2_TEST_TARGET_HXX