aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--LICENSE19
-rw-r--r--bbot/agent2
-rw-r--r--bbot/agent.cli2
-rw-r--r--bbot/agent.cxx4
-rw-r--r--bbot/bootstrap-manifest2
-rw-r--r--bbot/bootstrap-manifest.cxx2
-rw-r--r--bbot/buildfile2
-rw-r--r--bbot/common.cli2
-rw-r--r--bbot/diagnostics2
-rw-r--r--bbot/diagnostics.cxx2
-rw-r--r--bbot/machine2
-rw-r--r--bbot/machine-manifest2
-rw-r--r--bbot/machine-manifest.cxx2
-rw-r--r--bbot/machine.cxx2
-rw-r--r--bbot/tftp2
-rw-r--r--bbot/tftp.cxx2
-rw-r--r--bbot/types2
-rw-r--r--bbot/types-parsers2
-rw-r--r--bbot/types-parsers.cxx2
-rw-r--r--bbot/utility2
-rw-r--r--bbot/utility.cxx2
-rw-r--r--bbot/utility.txx2
-rw-r--r--bbot/version-impl2
-rw-r--r--bbot/worker.cli2
-rw-r--r--bbot/worker.cxx4
-rw-r--r--build/bootstrap.build2
-rw-r--r--build/root.build2
-rw-r--r--buildfile2
-rw-r--r--manifest2
-rw-r--r--tests/agent/buildfile2
-rw-r--r--tests/agent/testscript2
-rw-r--r--unit-tests/bootstrap-manifest/buildfile2
-rw-r--r--unit-tests/bootstrap-manifest/driver.cxx2
-rw-r--r--unit-tests/bootstrap-manifest/testscript2
34 files changed, 37 insertions, 52 deletions
diff --git a/LICENSE b/LICENSE
index 91c0877..41ea2a3 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,20 +1,5 @@
Copyright (c) 2014-2017 Code Synthesis Ltd
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
+TBC; All rights reserved
-The above copyright notice and this permission notice shall be included
-in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+@@ Keep manual under MIT? Also man pages.
diff --git a/bbot/agent b/bbot/agent
index 619fb36..c53c5c9 100644
--- a/bbot/agent
+++ b/bbot/agent
@@ -1,6 +1,6 @@
// file : bbot/agent -*- C++ -*-
// copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
-// license : MIT; see accompanying LICENSE file
+// license : TBC; see accompanying LICENSE file
#ifndef BBOT_AGENT
#define BBOT_AGENT
diff --git a/bbot/agent.cli b/bbot/agent.cli
index 7a6c201..a10889e 100644
--- a/bbot/agent.cli
+++ b/bbot/agent.cli
@@ -1,6 +1,6 @@
// file : bbot/agent.cli
// copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
-// license : MIT; see accompanying LICENSE file
+// license : TBC; see accompanying LICENSE file
include <bbot/common.cli>;
diff --git a/bbot/agent.cxx b/bbot/agent.cxx
index 2489ce4..8a47483 100644
--- a/bbot/agent.cxx
+++ b/bbot/agent.cxx
@@ -1,6 +1,6 @@
// file : bbot/agent.cxx -*- C++ -*-
// copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
-// license : MIT; see accompanying LICENSE file
+// license : TBC; see accompanying LICENSE file
#include <bbot/agent>
@@ -519,7 +519,7 @@ try
<< "libbbot " << LIBBBOT_VERSION_STR << endl
<< "libbutl " << LIBBUTL_VERSION_STR << endl
<< "Copyright (c) 2014-2017 Code Synthesis Ltd" << endl
- << "MIT; see accompanying LICENSE file" << endl;
+ << "TBC; All rights reserved" << endl;
return 0;
}
diff --git a/bbot/bootstrap-manifest b/bbot/bootstrap-manifest
index 48139ad..35feaba 100644
--- a/bbot/bootstrap-manifest
+++ b/bbot/bootstrap-manifest
@@ -1,6 +1,6 @@
// file : bbot/bootstrap-manifest -*- C++ -*-
// copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
-// license : MIT; see accompanying LICENSE file
+// license : TBC; see accompanying LICENSE file
#ifndef BBOT_BOOTSTRAP_MANIFEST
#define BBOT_BOOTSTRAP_MANIFEST
diff --git a/bbot/bootstrap-manifest.cxx b/bbot/bootstrap-manifest.cxx
index 231e56a..d08322a 100644
--- a/bbot/bootstrap-manifest.cxx
+++ b/bbot/bootstrap-manifest.cxx
@@ -1,6 +1,6 @@
// file : bbot/bootstrap-manifest.cxx -*- C++ -*-
// copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
-// license : MIT; see accompanying LICENSE file
+// license : TBC; see accompanying LICENSE file
#include <bbot/bootstrap-manifest>
diff --git a/bbot/buildfile b/bbot/buildfile
index 7e35a29..5498458 100644
--- a/bbot/buildfile
+++ b/bbot/buildfile
@@ -1,6 +1,6 @@
# file : bbot/buildfile
# copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
-# license : MIT; see accompanying LICENSE file
+# license : TBC; see accompanying LICENSE file
# Systemd .service file.
#
diff --git a/bbot/common.cli b/bbot/common.cli
index 3b9f5bd..6bbd48b 100644
--- a/bbot/common.cli
+++ b/bbot/common.cli
@@ -1,6 +1,6 @@
// file : bbot/common.cli
// copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
-// license : MIT; see accompanying LICENSE file
+// license : TBC; see accompanying LICENSE file
include <bbot/types>;
diff --git a/bbot/diagnostics b/bbot/diagnostics
index ebf658d..81cedcd 100644
--- a/bbot/diagnostics
+++ b/bbot/diagnostics
@@ -1,6 +1,6 @@
// file : bbot/diagnostics -*- C++ -*-
// copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
-// license : MIT; see accompanying LICENSE file
+// license : TBC; see accompanying LICENSE file
#ifndef BBOT_DIAGNOSTICS
#define BBOT_DIAGNOSTICS
diff --git a/bbot/diagnostics.cxx b/bbot/diagnostics.cxx
index 2779770..6ad2151 100644
--- a/bbot/diagnostics.cxx
+++ b/bbot/diagnostics.cxx
@@ -1,6 +1,6 @@
// file : bbot/diagnostics.cxx -*- C++ -*-
// copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
-// license : MIT; see accompanying LICENSE file
+// license : TBC; see accompanying LICENSE file
#include <bbot/diagnostics>
diff --git a/bbot/machine b/bbot/machine
index ecdce22..c2942ac 100644
--- a/bbot/machine
+++ b/bbot/machine
@@ -1,6 +1,6 @@
// file : bbot/machine -*- C++ -*-
// copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
-// license : MIT; see accompanying LICENSE file
+// license : TBC; see accompanying LICENSE file
#ifndef BBOT_MACHINE
#define BBOT_MACHINE
diff --git a/bbot/machine-manifest b/bbot/machine-manifest
index 0d71bd7..77f1c78 100644
--- a/bbot/machine-manifest
+++ b/bbot/machine-manifest
@@ -1,6 +1,6 @@
// file : bbot/machine-manifest -*- C++ -*-
// copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
-// license : MIT; see accompanying LICENSE file
+// license : TBC; see accompanying LICENSE file
#ifndef BBOT_MACHINE_MANIFEST
#define BBOT_MACHINE_MANIFEST
diff --git a/bbot/machine-manifest.cxx b/bbot/machine-manifest.cxx
index 9145ed4..8e5100c 100644
--- a/bbot/machine-manifest.cxx
+++ b/bbot/machine-manifest.cxx
@@ -1,6 +1,6 @@
// file : bbot/machine-manifest.cxx -*- C++ -*-
// copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
-// license : MIT; see accompanying LICENSE file
+// license : TBC; see accompanying LICENSE file
#include <bbot/machine-manifest>
diff --git a/bbot/machine.cxx b/bbot/machine.cxx
index 6677de5..94a81ab 100644
--- a/bbot/machine.cxx
+++ b/bbot/machine.cxx
@@ -1,6 +1,6 @@
// file : bbot/machine.cxx -*- C++ -*-
// copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
-// license : MIT; see accompanying LICENSE file
+// license : TBC; see accompanying LICENSE file
#include <bbot/machine>
diff --git a/bbot/tftp b/bbot/tftp
index cc39419..cdcbfe0 100644
--- a/bbot/tftp
+++ b/bbot/tftp
@@ -1,6 +1,6 @@
// file : bbot/tftp -*- C++ -*-
// copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
-// license : MIT; see accompanying LICENSE file
+// license : TBC; see accompanying LICENSE file
#ifndef BBOT_TFTP
#define BBOT_TFTP
diff --git a/bbot/tftp.cxx b/bbot/tftp.cxx
index a7398be..b47eef4 100644
--- a/bbot/tftp.cxx
+++ b/bbot/tftp.cxx
@@ -1,6 +1,6 @@
// file : bbot/tftp.cxx -*- C++ -*-
// copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
-// license : MIT; see accompanying LICENSE file
+// license : TBC; see accompanying LICENSE file
#include <bbot/tftp>
diff --git a/bbot/types b/bbot/types
index bd052aa..e6ad1fb 100644
--- a/bbot/types
+++ b/bbot/types
@@ -1,6 +1,6 @@
// file : bbot/types -*- C++ -*-
// copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
-// license : MIT; see accompanying LICENSE file
+// license : TBC; see accompanying LICENSE file
#ifndef BBOT_TYPES
#define BBOT_TYPES
diff --git a/bbot/types-parsers b/bbot/types-parsers
index 1cb78f7..de3deb8 100644
--- a/bbot/types-parsers
+++ b/bbot/types-parsers
@@ -1,6 +1,6 @@
// file : bbot/types-parsers -*- C++ -*-
// copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
-// license : MIT; see accompanying LICENSE file
+// license : TBC; see accompanying LICENSE file
// CLI parsers, included into the generated source files.
//
diff --git a/bbot/types-parsers.cxx b/bbot/types-parsers.cxx
index 6a0e899..83a67d6 100644
--- a/bbot/types-parsers.cxx
+++ b/bbot/types-parsers.cxx
@@ -1,6 +1,6 @@
// file : bbot/types-parsers.cxx -*- C++ -*-
// copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
-// license : MIT; see accompanying LICENSE file
+// license : TBC; see accompanying LICENSE file
#include <bbot/types-parsers>
diff --git a/bbot/utility b/bbot/utility
index 4abb5a2..91bce64 100644
--- a/bbot/utility
+++ b/bbot/utility
@@ -1,6 +1,6 @@
// file : bbot/utility -*- C++ -*-
// copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
-// license : MIT; see accompanying LICENSE file
+// license : TBC; see accompanying LICENSE file
#ifndef BBOT_UTILITY
#define BBOT_UTILITY
diff --git a/bbot/utility.cxx b/bbot/utility.cxx
index 95c31e9..6b7a8ca 100644
--- a/bbot/utility.cxx
+++ b/bbot/utility.cxx
@@ -1,6 +1,6 @@
// file : bbot/utility.cxx -*- C++ -*-
// copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
-// license : MIT; see accompanying LICENSE file
+// license : TBC; see accompanying LICENSE file
#include <bbot/utility>
diff --git a/bbot/utility.txx b/bbot/utility.txx
index 383db74..a613b11 100644
--- a/bbot/utility.txx
+++ b/bbot/utility.txx
@@ -1,6 +1,6 @@
// file : bbot/utility.txx -*- C++ -*-
// copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
-// license : MIT; see accompanying LICENSE file
+// license : TBC; see accompanying LICENSE file
#include <butl/fdstream>
diff --git a/bbot/version-impl b/bbot/version-impl
index 0205167..8139bb4 100644
--- a/bbot/version-impl
+++ b/bbot/version-impl
@@ -1,6 +1,6 @@
// file : bbot/version-impl -*- C++ -*-
// copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
-// license : MIT; see accompanying LICENSE file
+// license : TBC; see accompanying LICENSE file
#ifndef BBOT_VERSION // Note: using the version macro itself.
diff --git a/bbot/worker.cli b/bbot/worker.cli
index 7457790..3691b2d 100644
--- a/bbot/worker.cli
+++ b/bbot/worker.cli
@@ -1,6 +1,6 @@
// file : bbot/worker.cli
// copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
-// license : MIT; see accompanying LICENSE file
+// license : TBC; see accompanying LICENSE file
include <bbot/common.cli>;
diff --git a/bbot/worker.cxx b/bbot/worker.cxx
index a1d81f5..07d92c3 100644
--- a/bbot/worker.cxx
+++ b/bbot/worker.cxx
@@ -1,6 +1,6 @@
// file : bbot/worker.cxx -*- C++ -*-
// copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
-// license : MIT; see accompanying LICENSE file
+// license : TBC; see accompanying LICENSE file
#ifndef _WIN32
# include <signal.h> // signal()
@@ -72,7 +72,7 @@ try
<< "libbbot " << LIBBBOT_VERSION_STR << endl
<< "libbutl " << LIBBUTL_VERSION_STR << endl
<< "Copyright (c) 2014-2017 Code Synthesis Ltd" << endl
- << "MIT; see accompanying LICENSE file" << endl;
+ << "TBC; All rights reserved" << endl;
return 0;
}
diff --git a/build/bootstrap.build b/build/bootstrap.build
index 8bc749f..fc1f91c 100644
--- a/build/bootstrap.build
+++ b/build/bootstrap.build
@@ -1,6 +1,6 @@
# file : build/bootstrap.build
# copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
-# license : MIT; see accompanying LICENSE file
+# license : TBC; see accompanying LICENSE file
project = bbot
diff --git a/build/root.build b/build/root.build
index e36af49..b299a5d 100644
--- a/build/root.build
+++ b/build/root.build
@@ -1,6 +1,6 @@
# file : build/root.build
# copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
-# license : MIT; see accompanying LICENSE file
+# license : TBC; see accompanying LICENSE file
cxx.std = latest
diff --git a/buildfile b/buildfile
index 513c4aa..49305bf 100644
--- a/buildfile
+++ b/buildfile
@@ -1,6 +1,6 @@
# file : buildfile
# copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
-# license : MIT; see accompanying LICENSE file
+# license : TBC; see accompanying LICENSE file
./: bbot/ unit-tests/ doc{INSTALL LICENSE NEWS README version} file{manifest}
diff --git a/manifest b/manifest
index 45c54c5..2765091 100644
--- a/manifest
+++ b/manifest
@@ -2,7 +2,7 @@
name: bbot
version: 0.5.0-a1
summary: build2 build bot
-license: MIT
+license: TBC ; All rights reserved
tags: build2, c++, build, bot, server, ci, continuous, integration, testing
description-file: README
changes-file: NEWS
diff --git a/tests/agent/buildfile b/tests/agent/buildfile
index 1c6d59b..7e93da0 100644
--- a/tests/agent/buildfile
+++ b/tests/agent/buildfile
@@ -1,6 +1,6 @@
# file : tests/agent/buildfile
# copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
-# license : MIT; see accompanying LICENSE file
+# license : TBC; see accompanying LICENSE file
./: ../../bbot/exe{bbot-agent} test{testscript} file{btrfs-cpdir btrfs-rmdir}
dir{./}: test = ../../bbot/exe{bbot-agent}
diff --git a/tests/agent/testscript b/tests/agent/testscript
index 4671950..9198460 100644
--- a/tests/agent/testscript
+++ b/tests/agent/testscript
@@ -1,6 +1,6 @@
# file : tests/agent/testscript
# copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
-# license : MIT; see accompanying LICENSE file
+# license : TBC; see accompanying LICENSE file
# The /build/machines directory should be on a btrfs filesystem and have the
# following layout and contents:
diff --git a/unit-tests/bootstrap-manifest/buildfile b/unit-tests/bootstrap-manifest/buildfile
index ff85794..c00465c 100644
--- a/unit-tests/bootstrap-manifest/buildfile
+++ b/unit-tests/bootstrap-manifest/buildfile
@@ -1,6 +1,6 @@
# file : unit-tests/bootstrap-manifest/buildfile
# copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
-# license : MIT; see accompanying LICENSE file
+# license : TBC; see accompanying LICENSE file
import libs = libbutl%lib{butl}
import libs += libbbot%lib{bbot}
diff --git a/unit-tests/bootstrap-manifest/driver.cxx b/unit-tests/bootstrap-manifest/driver.cxx
index 3531383..18bf7b6 100644
--- a/unit-tests/bootstrap-manifest/driver.cxx
+++ b/unit-tests/bootstrap-manifest/driver.cxx
@@ -1,6 +1,6 @@
// file : unit-tests/bootstrap-manifest/driver.cxx -*- C++ -*-
// copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
-// license : MIT; see accompanying LICENSE file
+// license : TBC; see accompanying LICENSE file
#include <ios> // ios_base::failbit, ios_base::badbit
#include <iostream>
diff --git a/unit-tests/bootstrap-manifest/testscript b/unit-tests/bootstrap-manifest/testscript
index 74b4992..8e1fbcf 100644
--- a/unit-tests/bootstrap-manifest/testscript
+++ b/unit-tests/bootstrap-manifest/testscript
@@ -1,6 +1,6 @@
# file : unit-tests/bootstrap-manifest/testscript
# copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
-# license : MIT; see accompanying LICENSE file
+# license : TBC; see accompanying LICENSE file
: toolchain-manifest
: