aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2017-05-03 11:02:46 +0200
committerBoris Kolpackov <boris@codesynthesis.com>2017-05-03 11:02:46 +0200
commite0da5d736d52d71fa4894de8442160565d0b5aa9 (patch)
treeec631a1d590418898224fe26fa9b0e91cc95f760
parent6cfdf7e46444884fb8e20a916d6d5fce3f05d767 (diff)
Use VERSION_ID instead of VERSION_STR where appropriate
-rw-r--r--load/load.cxx12
-rw-r--r--migrate/migrate.cxx12
-rw-r--r--mod/mod-package-search.cxx2
-rw-r--r--mod/mod-repository-root.cxx10
4 files changed, 18 insertions, 18 deletions
diff --git a/load/load.cxx b/load/load.cxx
index 23f365a..f2c33e2 100644
--- a/load/load.cxx
+++ b/load/load.cxx
@@ -957,13 +957,13 @@ try
//
if (ops.version ())
{
- cout << "brep-load " << BREP_VERSION_STR << endl
- << "libbrep " << LIBBREP_VERSION_STR << endl
- << "libbbot " << LIBBBOT_VERSION_STR << endl
- << "libbpkg " << LIBBPKG_VERSION_STR << endl
- << "libbutl " << LIBBUTL_VERSION_STR << endl
+ cout << "brep-load " << BREP_VERSION_ID << endl
+ << "libbrep " << LIBBREP_VERSION_ID << endl
+ << "libbbot " << LIBBBOT_VERSION_ID << endl
+ << "libbpkg " << LIBBPKG_VERSION_ID << endl
+ << "libbutl " << LIBBUTL_VERSION_ID << endl
<< "Copyright (c) 2014-2017 Code Synthesis Ltd" << endl
- << "MIT; see accompanying LICENSE file" << endl;
+ << "This is free software released under the MIT license." << endl;
return 0;
}
diff --git a/migrate/migrate.cxx b/migrate/migrate.cxx
index dac74d5..56e2c83 100644
--- a/migrate/migrate.cxx
+++ b/migrate/migrate.cxx
@@ -204,13 +204,13 @@ try
//
if (ops.version ())
{
- cout << "brep-migrate " << BREP_VERSION_STR << endl
- << "libbrep " << LIBBREP_VERSION_STR << endl
- << "libbbot " << LIBBBOT_VERSION_STR << endl
- << "libbpkg " << LIBBPKG_VERSION_STR << endl
- << "libbutl " << LIBBUTL_VERSION_STR << endl
+ cout << "brep-migrate " << BREP_VERSION_ID << endl
+ << "libbrep " << LIBBREP_VERSION_ID << endl
+ << "libbbot " << LIBBBOT_VERSION_ID << endl
+ << "libbpkg " << LIBBPKG_VERSION_ID << endl
+ << "libbutl " << LIBBUTL_VERSION_ID << endl
<< "Copyright (c) 2014-2017 Code Synthesis Ltd" << endl
- << "MIT; see accompanying LICENSE file" << endl;
+ << "This is free software released under the MIT license." << endl;
return 0;
}
diff --git a/mod/mod-package-search.cxx b/mod/mod-package-search.cxx
index 23db29a..e1cd03f 100644
--- a/mod/mod-package-search.cxx
+++ b/mod/mod-package-search.cxx
@@ -62,7 +62,7 @@ init (scanner& s)
if (schema_catalog::current_version (*package_db_, ds) !=
package_db_->schema_version (ds))
fail << "database 'package' schema differs from the current one (module "
- << BREP_VERSION_STR << ")";
+ << BREP_VERSION_ID << ")";
}
template <typename T>
diff --git a/mod/mod-repository-root.cxx b/mod/mod-repository-root.cxx
index bac63ca..00cdea4 100644
--- a/mod/mod-repository-root.cxx
+++ b/mod/mod-repository-root.cxx
@@ -364,10 +364,10 @@ namespace brep
{
MODULE_DIAG;
- info << "module " << BREP_VERSION_STR
- << ", libbrep " << LIBBREP_VERSION_STR
- << ", libbbot " << LIBBBOT_VERSION_STR
- << ", libbpkg " << LIBBPKG_VERSION_STR
- << ", libbutl " << LIBBUTL_VERSION_STR;
+ info << "module " << BREP_VERSION_ID
+ << ", libbrep " << LIBBREP_VERSION_ID
+ << ", libbbot " << LIBBBOT_VERSION_ID
+ << ", libbpkg " << LIBBPKG_VERSION_ID
+ << ", libbutl " << LIBBUTL_VERSION_ID;
}
}