X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/5374152e5cef13c6afb99bf83095505235d5e466..fe398f4c3070e3b379357d45bef674cd6d1817df:/COPYING

diff --git a/COPYING b/COPYING
index a158d6240b..ae29638321 100644
--- a/COPYING
+++ b/COPYING
@@ -3,8 +3,8 @@ Upstream-Name: SimGrid
 Source: https://simgrid.org/
 
 Files: *
-Copyright: 2003-2020. The SimGrid team. All rights reserved.
-License: LGPL-2.1
+Copyright: 2003-2022. The SimGrid team. All rights reserved.
+License: LGPL-2.1-only
 
 Files: src/xbt/snprintf.c
 Copyright: 1999, Mark Martinec <mark.martinec@ijs.si.
@@ -12,18 +12,18 @@ License: Artistic
 Comment: Heavily adapted by the SimGrid team but remains under the original license
 
 Files: src/xbt/mmalloc/* src/include/xbt/mmalloc.h
-Copyright: 
+Copyright:
   Copyright (C) 1991, 1992 Free Software Foundation, Inc.
-  Copyright (C) 2003-2020. The SimGrid team.
-License: LGPL-2.1
+  Copyright (C) 2003-2022. The SimGrid team.
+License: LGPL-2.1-only
 Comment: these files used to be part of gdb, but were removed there
 
-Files: 
+Files:
  teshsuite/smpi/mpich3-test/*
-Copyright: 
+Copyright:
  (C) 2001-2014 by Argonne National Laboratory.
  (C) 2008 by University of Illinois.
- (C) 2011-2012 Intel Corporation. 
+ (C) 2011-2012 Intel Corporation.
 License: other
                                   COPYRIGHT
  .
@@ -65,16 +65,16 @@ License: other
  privately owned rights.
 
 Files:
- src/simdag/dax_dtd.c
- src/simdag/dax_dtd.h
+ src/dag/dax_dtd.c
+ src/dag/dax_dtd.h
  src/surf/xml/simgrid_dtd.c
  src/surf/xml/simgrid_dtd.h
 Copyright:
  FleXML is Copyright (C) 1999-2005 Kristoffer Rose.  All rights reserved.
  FleXML is Copyright (C) 2003-2013 Martin Quinson.  All rights reserved.
- Copyright (C) 2003-2020. The SimGrid team.
-License: GPL-2+ and LGPL-2.1
-Comment: Generated with the FleXML XML processor generator (which is GPL-2+) using SimGrid configuration files (that are LGPL-2.1)
+ Copyright (C) 2003-2022. The SimGrid team.
+License: GPL-2+ and LGPL-2.1-only
+Comment: Generated with the FleXML XML processor generator (which is GPL-2+) using SimGrid configuration files (that are LGPL-2.1-only)
 
 Files:
  src/smpi/colls/allgather/allgather-2dmesh.cpp
@@ -176,15 +176,27 @@ License: other-reduce-rab
 Files: src/xbt/automaton/parserPromela.tab.cacc
 Copyright:
  Copyright (C) 1984, 1989-1990, 2000-2015 Free Software Foundation, Inc.
- Copyright (C) 2003-2020. The SimGrid team.
-License: GPL-3+ and LGPL-2.1
-Comment: Generated with the Bison processor generator (which is GPL-3+) using SimGrid configuration files (that are LGPL-2.1) 
+ Copyright (C) 2003-2022. The SimGrid team.
+License: GPL-3+ and LGPL-2.1-only
+Comment: Generated with the Bison processor generator (which is GPL-3+) using SimGrid configuration files (that are LGPL-2.1-only)
 
 Files: src/include/catch.hpp
 Copyright:
-  Copyright (c) 2018 Two Blue Cubes Ltd. 
+  Copyright (c) 2018 Two Blue Cubes Ltd.
 License: BSL-1.0
 
+Files: teshsuite/smpi/MBI/*
+Copyright:
+  Copyright (C) 2021-2022, The MBI project.
+Comment: The MBI.py script was written for SimGrid while the other files are kept in sync with the MBI source tree.
+License: GPL-3
+
+Files: src/include/xxhash.hpp
+Copyright:
+  Copyright (C) 2012-2018, Yann Collet.
+  Copyright (C) 2017-2018, Piotr Pliszka.
+License: BSD 2-Clause
+
 License: BSL-1.0
  Permission is hereby granted, free of charge, to any person or organization
  obtaining a copy of the software and accompanying documentation covered by
@@ -207,53 +219,3 @@ License: BSL-1.0
  FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
  ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  DEALINGS IN THE SOFTWARE.
-
-Files: teshsuite/smpi/isp/umpire/*
-Copyright: 2000-2003, Bronis R. de Supinski
-Comment: this licensing info was provided by the author per email
-License: NON COMMERCIAL
- NOTICE
- .
- This work was produced at the University of California, Lawrence
- Livermore National Laboratory (UC LLNL) under contract
- no. W-7405-ENG-48 (Contract 48) between the U.S. Department of Energy
- (DOE) and The Regents of the University of California (University) for
- the operation of UC LLNL. The rights of the Federal Government are
- reserved under Contract 48 subject to the restrictions agreed upon by
- the DOE and University as allowed under DOE Acquisition Letter 97-1.
- The only additional restriction is that redistribution of this work
- without the written consent of either the Univeristy or its primary
- author, Bronis R. de Supinski, is prohibited.
- .
- .
- DISCLAIMER
- .
- This work was prepared as an account of work sponsored by an agency of
- the United States Government. Neither the United States Government nor
- the University of California nor any of their employees, makes any
- warranty, express or implied, or assumes any liability or
- responsibility for the accuracy, completeness, or usefulness of any
- information, apparatus, product, or process disclosed, or represents
- that its use would not infringe privately-owned rights.  Reference
- herein to any specific commercial products, process, or service by
- trade name, trademark, manufacturer or otherwise does not necessarily
- constitute or imply its endorsement, recommendation, or favoring by
- the United States Government or the University of California. The
- views and opinions of authors expressed herein do not necessarily
- state or reflect those of the United States Government or the
- University of California, and shall not be used for advertising or
- product endorsement purposes.
- .
- .
- .
- NOTIFICATION OF COMMERCIAL USE
- .
- Commercialization of this product is prohibited without notifying the
- Department of Energy (DOE) or Lawrence Livermore National Laboratory
- (LLNL).
-
-Files: src/include/xxhash.hpp
-Copyright:
-  Copyright (C) 2012-2018, Yann Collet.
-  Copyright (C) 2017-2018, Piotr Pliszka.
-License: BSD 2-Clause