Merge pull request #124 in VIPROMA/coral from ~LARKY/coral:mpl to master

* commit '6cd288105b8421f14f0098052e1c9278cf4ace33':
  Increase version number to 0.7
  Switch to Mozilla Public License v. 2.0

Author: mrindar

LICENCE.txt

@@ -9,7 +9,7 @@ domains and modelling tools, to simulate complex marine systems and operations.
 The VPF is currently under development as part of the KMB ViProMa project.
 
 Coral is a C++ library and a set of applications for performing distributed
-cos-simulations, and it is a fundamental software component of the VPF.
+co-simulations, and it is a fundamental software component of the VPF.
 Its job is to connect the various subsystems involved in a simulation.
 More precisely, it takes care of:
 
@@ -28,6 +28,11 @@ The subsystems can be simulation tools (such as Simulink, Modelica
 implementations, etc.), hardware interfaces, control systems, visualisation
 tools, data loggers, and so on.
 
+Terms of use
+------------
+Coral is free and open-source software released under the terms of the
+[Mozilla Public License v. 2.0](http://mozilla.org/MPL/2.0/). For more
+information, see the [MPL 2.0 FAQ](https://www.mozilla.org/en-US/MPL/2.0/FAQ/).
 
 Requirements
 ------------

README.md

@@ -2,6 +2,11 @@
 \file
 \brief  Defines the coral::bus::VariablePublisher and coral::bus::VariableSubscriber
         classes.
+\copyright
+    Copyright 2013-2017, SINTEF Ocean and the Coral contributors.
+    This Source Code Form is subject to the terms of the Mozilla Public
+    License, v. 2.0. If a copy of the MPL was not distributed with this
+    file, You can obtain one at http://mozilla.org/MPL/2.0/.
 */
 #ifndef CORAL_BUS_VARIABLE_IO_HPP_INCLUDED
 #define CORAL_BUS_VARIABLE_IO_HPP_INCLUDED

include/coral/bus/variable_io.hpp

@@ -1,9 +1,15 @@
 /*
+Copyright 2013-2017, SINTEF Ocean and the Coral contributors.
+This Source Code Form is subject to the terms of the Mozilla Public
+License, v. 2.0. If a copy of the MPL was not distributed with this
+file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+NOTE TO USERS:
 This header file is meant for internal use in this library, and should
 normally not be included directly by client code.  Its purpose is to
 aid in maintaining a cross-platform code base.
 
-Note to contributors:
+NOTE TO CONTRIBUTORS:
 This file intentionally has a ".h" extension, as it is supposed to
 be a valid C header.  C++-specific code should therefore be placed in
 #ifdef __cplusplus blocks.
@@ -15,7 +21,7 @@ be a valid C header.  C++-specific code should therefore be placed in
 #define CORAL_PROGRAM_NAME "Coral"
 
 #define CORAL_VERSION_MAJOR 0
-#define CORAL_VERSION_MINOR 6
+#define CORAL_VERSION_MINOR 7
 #define CORAL_VERSION_PATCH 0
 
 #define CORAL_VERSION_STRINGIFY(a, b, c) #a "." #b "." #c

include/coral/config.h

@@ -1,6 +1,11 @@
 /**
 \file
 \brief Main module header for coral::fmi. Includes all headers in `coral/fmi/`.
+\copyright
+    Copyright 2013-2017, SINTEF Ocean and the Coral contributors.
+    This Source Code Form is subject to the terms of the Mozilla Public
+    License, v. 2.0. If a copy of the MPL was not distributed with this
+    file, You can obtain one at http://mozilla.org/MPL/2.0/.
 */
 #ifndef CORAL_FMI_HPP_INCLUDED
 #define CORAL_FMI_HPP_INCLUDED

include/coral/fmi.hpp

@@ -1,6 +1,11 @@
 /**
 \file
 \brief Defines a version-independent FMU interface.
+\copyright
+    Copyright 2013-2017, SINTEF Ocean and the Coral contributors.
+    This Source Code Form is subject to the terms of the Mozilla Public
+    License, v. 2.0. If a copy of the MPL was not distributed with this
+    file, You can obtain one at http://mozilla.org/MPL/2.0/.
 */
 #ifndef CORAL_FMI_FMU_HPP
 #define CORAL_FMI_FMU_HPP

include/coral/fmi/fmu.hpp

@@ -1,6 +1,11 @@
 /**
 \file
 \brief Classes for dealing with FMI 1.0 FMUs.
+\copyright
+    Copyright 2013-2017, SINTEF Ocean and the Coral contributors.
+    This Source Code Form is subject to the terms of the Mozilla Public
+    License, v. 2.0. If a copy of the MPL was not distributed with this
+    file, You can obtain one at http://mozilla.org/MPL/2.0/.
 */
 #ifndef CORAL_FMI_FMU1_HPP
 #define CORAL_FMI_FMU1_HPP

include/coral/fmi/fmu1.hpp

@@ -1,6 +1,11 @@
 /**
 \file
 \brief FMU import functionality.
+\copyright
+    Copyright 2013-2017, SINTEF Ocean and the Coral contributors.
+    This Source Code Form is subject to the terms of the Mozilla Public
+    License, v. 2.0. If a copy of the MPL was not distributed with this
+    file, You can obtain one at http://mozilla.org/MPL/2.0/.
 */
 #ifndef CORAL_FMI_IMPORTER_HPP
 #define CORAL_FMI_IMPORTER_HPP

include/coral/fmi/importer.hpp

@@ -1,6 +1,11 @@
 /**
 \file
 \brief  Main header file for coral::log (but also contains a few macros).
+\copyright
+    Copyright 2013-2017, SINTEF Ocean and the Coral contributors.
+    This Source Code Form is subject to the terms of the Mozilla Public
+    License, v. 2.0. If a copy of the MPL was not distributed with this
+    file, You can obtain one at http://mozilla.org/MPL/2.0/.
 */
 #ifndef CORAL_LOG_HPP
 #define CORAL_LOG_HPP

include/coral/log.hpp

@@ -1,6 +1,11 @@
 /**
 \file
 \brief Main module header for coral::master. Includes all headers in `coral/master/`.
+\copyright
+    Copyright 2013-2017, SINTEF Ocean and the Coral contributors.
+    This Source Code Form is subject to the terms of the Mozilla Public
+    License, v. 2.0. If a copy of the MPL was not distributed with this
+    file, You can obtain one at http://mozilla.org/MPL/2.0/.
 */
 #ifndef CORAL_MASTER_HPP_INCLUDED
 #define CORAL_MASTER_HPP_INCLUDED