From 9ccb6a24541b3a06b600a70791950eecd46d1806 Mon Sep 17 00:00:00 2001 From: Xavier Leroy Date: Fri, 5 Jan 2018 09:50:10 +0100 Subject: Resynchronize the LICENSE file and the license headers in individual files (#45) Some files are dual-licensed (GPL + noncommercial license), as marked redundantly in the license headers of those files, and in the LICENSE file. OVer the years those two markings got inconsistent. This commit updates the LICENSE file and the license headers of some files so that they agree on which files are dual-licensed. Some build-related files were dual-licensed but some others were not. Fixed by dual-licensing configure, Makefile.menhir, extraction/extraction.v, */extractionMachdep.v Moved lib/Json* to backend/ because there is no need to dual-license those files, yet lib/* is dual-licensed. Plus: JsonAST did not really belong in lib/ anyway, as it depends on AST which is not in lib/ --- LICENSE | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) (limited to 'LICENSE') diff --git a/LICENSE b/LICENSE index 2353de49..5c7d7294 100644 --- a/LICENSE +++ b/LICENSE @@ -26,26 +26,35 @@ option) any later version: all files in the common/ directory + cfrontend/C2C.ml cfrontend/Clight.v cfrontend/ClightBigstep.v cfrontend/Cop.v + cfrontend/CPragmas.ml cfrontend/Csem.v cfrontend/Cstrategy.v cfrontend/Csyntax.v cfrontend/Ctypes.v cfrontend/Ctyping.v + cfrontend/PrintClight.ml + cfrontend/PrintCsyntax.ml backend/Cminor.v - - arm/Archi.v - ia32/Archi.v - powerpc/Archi.v + backend/PrintCminor.ml all files in the cparser/ directory all files in the exportclight/ directory + the Archi.v, CBuiltins.ml, and extractionMachdep.v files + in directories arm, powerpc, riscV, x86, x86_32, x86_64 + + extraction/extraction.v + + configure Makefile + Makefile.extr + Makefile.menhir A copy of the GNU General Public License version 2 is included below. The choice between the two licenses for the files listed above is left @@ -56,13 +65,13 @@ Public License. The files contained in the flocq/ directory and its subdirectories are taken from the Flocq project, http://flocq.gforge.inria.fr/ -These files are Copyright 2010-2013 INRIA and distributed under the +These files are Copyright 2010-2017 INRIA and distributed under the terms of the GNU Lesser General Public Licence, either version 3 of the licence, or (at your option) any later version. A copy of the GNU Lesser General Public Licence version 3 is included below. The files contained in the runtime/ directory and its subdirectories -are Copyright 2013-2014 INRIA and distributed under the terms of the BSD +are Copyright 2013-2017 INRIA and distributed under the terms of the BSD 3-clause license, included below. ---------------------------------------------------------------------- -- cgit