From 3cc94b1407a76c09e3f8ddb6c8e0a17e5b521798 Mon Sep 17 00:00:00 2001
From: Karen Arutyunov <karen@codesynthesis.com>
Date: Sat, 19 Dec 2020 21:56:24 +0300
Subject: Various cleanups

---
 cli-examples/build/root.build | 2 +-
 cli-examples/manifest         | 2 +-
 cli-tests/.gitignore          | 4 ++++
 cli-tests/build/root.build    | 2 +-
 cli-tests/manifest            | 2 +-
 cli/README                    | 2 +-
 cli/build/root.build          | 6 ------
 cli/buildfile                 | 3 +--
 cli/manifest                  | 2 +-
 9 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/cli-examples/build/root.build b/cli-examples/build/root.build
index 53bde39..5f4b348 100644
--- a/cli-examples/build/root.build
+++ b/cli-examples/build/root.build
@@ -18,7 +18,7 @@ if ($cxx.class == 'msvc')
 
 using cli
 
-# Every exe{} in this subproject is by default a test.
+# Every exe{} in this project is by default a test.
 #
 exe{*}: test = true
 
diff --git a/cli-examples/manifest b/cli-examples/manifest
index 60c9ab0..da9cc56 100644
--- a/cli-examples/manifest
+++ b/cli-examples/manifest
@@ -7,7 +7,7 @@ license: MIT
 description-file: README
 url: https://www.codesynthesis.com/projects/cli/
 doc-url: https://www.codesynthesis.com/projects/cli/doc/guide/
-src-url: https://git.codesynthesis.com/cgit/cli/cli/tree/cli-examples
+src-url: https://git.codesynthesis.com/cgit/cli/cli/tree/cli-examples/
 email: cli-users@codesynthesis.com ; Mailing list
 requires: c++14
 depends: * build2 >= 0.13.0
diff --git a/cli-tests/.gitignore b/cli-tests/.gitignore
index 0b99f39..ac76b6f 100644
--- a/cli-tests/.gitignore
+++ b/cli-tests/.gitignore
@@ -18,5 +18,9 @@
 *.exe.manifest
 *.pc
 
+# Note that these can be symlinks (so no trailing /).
+test
+test-*
+
 driver
 test.?xx
diff --git a/cli-tests/build/root.build b/cli-tests/build/root.build
index 53bde39..5f4b348 100644
--- a/cli-tests/build/root.build
+++ b/cli-tests/build/root.build
@@ -18,7 +18,7 @@ if ($cxx.class == 'msvc')
 
 using cli
 
-# Every exe{} in this subproject is by default a test.
+# Every exe{} in this project is by default a test.
 #
 exe{*}: test = true
 
diff --git a/cli-tests/manifest b/cli-tests/manifest
index 2c6acd4..0ff0825 100644
--- a/cli-tests/manifest
+++ b/cli-tests/manifest
@@ -7,7 +7,7 @@ license: MIT
 description-file: README
 url: https://www.codesynthesis.com/projects/cli/
 doc-url: https://www.codesynthesis.com/projects/cli/doc/guide/
-src-url: https://git.codesynthesis.com/cgit/cli/cli/tree/cli-tests
+src-url: https://git.codesynthesis.com/cgit/cli/cli/tree/cli-tests/
 email: cli-users@codesynthesis.com ; Mailing list
 requires: c++14
 depends: * build2 >= 0.13.0
diff --git a/cli/README b/cli/README
index d2c6a02..05d6476 100644
--- a/cli/README
+++ b/cli/README
@@ -9,7 +9,7 @@ See the INSTALL file for prerequisites and installation instructions.
 
 See the doc/ directory for documentation.
 
-The project page is at http://codesynthesis.com/projects/cli/.
+The project page is at https://www.codesynthesis.com/projects/cli/.
 
 Send questions, bug reports, or any other feedback to
 cli-users@codesynthesis.com.
diff --git a/cli/build/root.build b/cli/build/root.build
index c611c4f..476b192 100644
--- a/cli/build/root.build
+++ b/cli/build/root.build
@@ -49,12 +49,6 @@ cxx.poptions =+ "-I$out_root" "-I$src_root"
 if ($config.cli != [null] && $config.cli != false)
   using cli
 
-# All exe{} in unit-tests/ are, well, tests. Also don't link whole archives
-# by default there.
-#
-unit-tests/exe{*}: test = true
-unit-tests/{libue libul}{*}: bin.whole = false
-
 # Specify the test target for cross-testing.
 #
 test.target = $cxx.target
diff --git a/cli/buildfile b/cli/buildfile
index 3f0ccb0..5cbb37a 100644
--- a/cli/buildfile
+++ b/cli/buildfile
@@ -3,7 +3,6 @@
 
 ./: {*/ -build/} doc{INSTALL NEWS README} legal{LICENSE} manifest
 
-# Don't install unit tests or the INSTALL file.
+# Don't install the INSTALL file.
 #
-unit-tests/:     install = false
 doc{INSTALL}@./: install = false
diff --git a/cli/manifest b/cli/manifest
index 95300b4..7205efd 100644
--- a/cli/manifest
+++ b/cli/manifest
@@ -9,7 +9,7 @@ description-file: README
 changes-file: NEWS
 url: https://www.codesynthesis.com/projects/cli/
 doc-url: https://www.codesynthesis.com/projects/cli/doc/guide/
-src-url: https://git.codesynthesis.com/cgit/cli/cli/tree/cli
+src-url: https://git.codesynthesis.com/cgit/cli/cli/tree/cli/
 email: cli-users@codesynthesis.com ; Mailing list
 build-warning-email: builds@codesynthesis.com
 builds: all
-- 
cgit v1.1