Skip to content

Commit 688d5a5

Browse files
xavierleroyxavierleroy
committed
Changed OCamlbuild's license to LGPL with static linking exception.
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@16294 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
1 parent 047749e commit 688d5a5

File tree

165 files changed

+329
-165
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

165 files changed

+329
-165
lines changed

Diff for: ‎Changes

+1
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,7 @@ OCamlbuild:
9797
(Jérémie Dimino, request by Peter Zotov)
9898
- GPR#208: add "asm" tag to ocamlbuild to enable flag -S
9999
(ygrek)
100+
- Changed OCamlbuild's license to LGPLv2 with static linking exception.
100101

101102
Bug fixes:
102103
* PR#4539: change exception string raised when comparing functional values

Diff for: ‎LICENSE

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
In the following, "the Library" refers to all files marked "Copyright
22
INRIA" in the following directories and their sub-directories:
33

4-
asmrun, byterun, config, otherlibs, stdlib, win32caml
4+
asmrun, byterun, config, ocamlbuild, otherlibs, stdlib, win32caml
55

66
and "the Compiler" refers to all files marked "Copyright INRIA" in the
77
following directories and their sub-directories:
88

99
asmcomp, boot, build, bytecomp, debugger, driver, lex, man,
10-
ocamlbuild, ocamldoc, parsing, testsuite, tools, toplevel, typing,
10+
ocamldoc, parsing, testsuite, tools, toplevel, typing,
1111
utils, yacc
1212

1313
The Compiler is distributed under the terms of the Q Public License

Diff for: ‎ocamlbuild/Makefile

+2-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@
66
# #
77
# Copyright 2007 Institut National de Recherche en Informatique et #
88
# en Automatique. All rights reserved. This file is distributed #
9-
# under the terms of the Q Public License version 1.0. #
9+
# under the terms of the GNU Library General Public License, with #
10+
# the special exception on linking described in file ../LICENSE. #
1011
# #
1112
#########################################################################
1213

Diff for: ‎ocamlbuild/_tags

+2-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@
66
# #
77
# Copyright 2007 Institut National de Recherche en Informatique et #
88
# en Automatique. All rights reserved. This file is distributed #
9-
# under the terms of the Q Public License version 1.0. #
9+
# under the terms of the GNU Library General Public License, with #
10+
# the special exception on linking described in file ../LICENSE. #
1011
# #
1112
#########################################################################
1213

Diff for: ‎ocamlbuild/bool.ml

+2-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@
66
(* *)
77
(* Copyright 2007 Institut National de Recherche en Informatique et *)
88
(* en Automatique. All rights reserved. This file is distributed *)
9-
(* under the terms of the Q Public License version 1.0. *)
9+
(* under the terms of the GNU Library General Public License, with *)
10+
(* the special exception on linking described in file ../LICENSE. *)
1011
(* *)
1112
(***********************************************************************)
1213

Diff for: ‎ocamlbuild/bool.mli

+2-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@
66
(* *)
77
(* Copyright 2007 Institut National de Recherche en Informatique et *)
88
(* en Automatique. All rights reserved. This file is distributed *)
9-
(* under the terms of the Q Public License version 1.0. *)
9+
(* under the terms of the GNU Library General Public License, with *)
10+
(* the special exception on linking described in file ../LICENSE. *)
1011
(* *)
1112
(***********************************************************************)
1213

Diff for: ‎ocamlbuild/command.ml

+2-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@
66
(* *)
77
(* Copyright 2007 Institut National de Recherche en Informatique et *)
88
(* en Automatique. All rights reserved. This file is distributed *)
9-
(* under the terms of the Q Public License version 1.0. *)
9+
(* under the terms of the GNU Library General Public License, with *)
10+
(* the special exception on linking described in file ../LICENSE. *)
1011
(* *)
1112
(***********************************************************************)
1213

Diff for: ‎ocamlbuild/command.mli

+2-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@
66
(* *)
77
(* Copyright 2007 Institut National de Recherche en Informatique et *)
88
(* en Automatique. All rights reserved. This file is distributed *)
9-
(* under the terms of the Q Public License version 1.0. *)
9+
(* under the terms of the GNU Library General Public License, with *)
10+
(* the special exception on linking described in file ../LICENSE. *)
1011
(* *)
1112
(***********************************************************************)
1213

Diff for: ‎ocamlbuild/configuration.ml

+2-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@
66
(* *)
77
(* Copyright 2007 Institut National de Recherche en Informatique et *)
88
(* en Automatique. All rights reserved. This file is distributed *)
9-
(* under the terms of the Q Public License version 1.0. *)
9+
(* under the terms of the GNU Library General Public License, with *)
10+
(* the special exception on linking described in file ../LICENSE. *)
1011
(* *)
1112
(***********************************************************************)
1213

Diff for: ‎ocamlbuild/configuration.mli

+2-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@
66
(* *)
77
(* Copyright 2007 Institut National de Recherche en Informatique et *)
88
(* en Automatique. All rights reserved. This file is distributed *)
9-
(* under the terms of the Q Public License version 1.0. *)
9+
(* under the terms of the GNU Library General Public License, with *)
10+
(* the special exception on linking described in file ../LICENSE. *)
1011
(* *)
1112
(***********************************************************************)
1213

Diff for: ‎ocamlbuild/digest_cache.ml

+2-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@
66
(* *)
77
(* Copyright 2007 Institut National de Recherche en Informatique et *)
88
(* en Automatique. All rights reserved. This file is distributed *)
9-
(* under the terms of the Q Public License version 1.0. *)
9+
(* under the terms of the GNU Library General Public License, with *)
10+
(* the special exception on linking described in file ../LICENSE. *)
1011
(* *)
1112
(***********************************************************************)
1213

Diff for: ‎ocamlbuild/digest_cache.mli

+2-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@
66
(* *)
77
(* Copyright 2007 Institut National de Recherche en Informatique et *)
88
(* en Automatique. All rights reserved. This file is distributed *)
9-
(* under the terms of the Q Public License version 1.0. *)
9+
(* under the terms of the GNU Library General Public License, with *)
10+
(* the special exception on linking described in file ../LICENSE. *)
1011
(* *)
1112
(***********************************************************************)
1213

Diff for: ‎ocamlbuild/discard_printf.ml

+2-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@
66
(* *)
77
(* Copyright 2007 Institut National de Recherche en Informatique et *)
88
(* en Automatique. All rights reserved. This file is distributed *)
9-
(* under the terms of the Q Public License version 1.0. *)
9+
(* under the terms of the GNU Library General Public License, with *)
10+
(* the special exception on linking described in file ../LICENSE. *)
1011
(* *)
1112
(***********************************************************************)
1213

Diff for: ‎ocamlbuild/discard_printf.mli

+2-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@
66
(* *)
77
(* Copyright 2007 Institut National de Recherche en Informatique et *)
88
(* en Automatique. All rights reserved. This file is distributed *)
9-
(* under the terms of the Q Public License version 1.0. *)
9+
(* under the terms of the GNU Library General Public License, with *)
10+
(* the special exception on linking described in file ../LICENSE. *)
1011
(* *)
1112
(***********************************************************************)
1213

Diff for: ‎ocamlbuild/display.ml

+2-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@
66
(* *)
77
(* Copyright 2007 Institut National de Recherche en Informatique et *)
88
(* en Automatique. All rights reserved. This file is distributed *)
9-
(* under the terms of the Q Public License version 1.0. *)
9+
(* under the terms of the GNU Library General Public License, with *)
10+
(* the special exception on linking described in file ../LICENSE. *)
1011
(* *)
1112
(***********************************************************************)
1213

Diff for: ‎ocamlbuild/display.mli

+2-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@
66
(* *)
77
(* Copyright 2007 Institut National de Recherche en Informatique et *)
88
(* en Automatique. All rights reserved. This file is distributed *)
9-
(* under the terms of the Q Public License version 1.0. *)
9+
(* under the terms of the GNU Library General Public License, with *)
10+
(* the special exception on linking described in file ../LICENSE. *)
1011
(* *)
1112
(***********************************************************************)
1213

Diff for: ‎ocamlbuild/examples/example1/hello.ml

+2-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@
66
(* *)
77
(* Copyright 2007 Institut National de Recherche en Informatique et *)
88
(* en Automatique. All rights reserved. This file is distributed *)
9-
(* under the terms of the Q Public License version 1.0. *)
9+
(* under the terms of the GNU Library General Public License, with *)
10+
(* the special exception on linking described in file ../LICENSE. *)
1011
(* *)
1112
(***********************************************************************)
1213

Diff for: ‎ocamlbuild/examples/example2/greet.ml

+2-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@
66
(* *)
77
(* Copyright 2007 Institut National de Recherche en Informatique et *)
88
(* en Automatique. All rights reserved. This file is distributed *)
9-
(* under the terms of the Q Public License version 1.0. *)
9+
(* under the terms of the GNU Library General Public License, with *)
10+
(* the special exception on linking described in file ../LICENSE. *)
1011
(* *)
1112
(***********************************************************************)
1213

Diff for: ‎ocamlbuild/examples/example2/hello.ml

+2-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@
66
(* *)
77
(* Copyright 2007 Institut National de Recherche en Informatique et *)
88
(* en Automatique. All rights reserved. This file is distributed *)
9-
(* under the terms of the Q Public License version 1.0. *)
9+
(* under the terms of the GNU Library General Public License, with *)
10+
(* the special exception on linking described in file ../LICENSE. *)
1011
(* *)
1112
(***********************************************************************)
1213

Diff for: ‎ocamlbuild/examples/example3/epoch.ml

+2-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@
66
(* *)
77
(* Copyright 2007 Institut National de Recherche en Informatique et *)
88
(* en Automatique. All rights reserved. This file is distributed *)
9-
(* under the terms of the Q Public License version 1.0. *)
9+
(* under the terms of the GNU Library General Public License, with *)
10+
(* the special exception on linking described in file ../LICENSE. *)
1011
(* *)
1112
(***********************************************************************)
1213

Diff for: ‎ocamlbuild/exit_codes.ml

+2-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@
66
(* *)
77
(* Copyright 2007 Institut National de Recherche en Informatique et *)
88
(* en Automatique. All rights reserved. This file is distributed *)
9-
(* under the terms of the Q Public License version 1.0. *)
9+
(* under the terms of the GNU Library General Public License, with *)
10+
(* the special exception on linking described in file ../LICENSE. *)
1011
(* *)
1112
(***********************************************************************)
1213

Diff for: ‎ocamlbuild/exit_codes.mli

+2-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@
66
(* *)
77
(* Copyright 2007 Institut National de Recherche en Informatique et *)
88
(* en Automatique. All rights reserved. This file is distributed *)
9-
(* under the terms of the Q Public License version 1.0. *)
9+
(* under the terms of the GNU Library General Public License, with *)
10+
(* the special exception on linking described in file ../LICENSE. *)
1011
(* *)
1112
(***********************************************************************)
1213

Diff for: ‎ocamlbuild/fda.ml

+2-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@
66
(* *)
77
(* Copyright 2007 Institut National de Recherche en Informatique et *)
88
(* en Automatique. All rights reserved. This file is distributed *)
9-
(* under the terms of the Q Public License version 1.0. *)
9+
(* under the terms of the GNU Library General Public License, with *)
10+
(* the special exception on linking described in file ../LICENSE. *)
1011
(* *)
1112
(***********************************************************************)
1213

Diff for: ‎ocamlbuild/fda.mli

+2-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@
66
(* *)
77
(* Copyright 2007 Institut National de Recherche en Informatique et *)
88
(* en Automatique. All rights reserved. This file is distributed *)
9-
(* under the terms of the Q Public License version 1.0. *)
9+
(* under the terms of the GNU Library General Public License, with *)
10+
(* the special exception on linking described in file ../LICENSE. *)
1011
(* *)
1112
(***********************************************************************)
1213

Diff for: ‎ocamlbuild/findlib.ml

+2-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@
66
(* *)
77
(* Copyright 2007 Institut National de Recherche en Informatique et *)
88
(* en Automatique. All rights reserved. This file is distributed *)
9-
(* under the terms of the Q Public License version 1.0. *)
9+
(* under the terms of the GNU Library General Public License, with *)
10+
(* the special exception on linking described in file ../LICENSE. *)
1011
(* *)
1112
(***********************************************************************)
1213

Diff for: ‎ocamlbuild/findlib.mli

+2-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@
66
(* *)
77
(* Copyright 2007 Institut National de Recherche en Informatique et *)
88
(* en Automatique. All rights reserved. This file is distributed *)
9-
(* under the terms of the Q Public License version 1.0. *)
9+
(* under the terms of the GNU Library General Public License, with *)
10+
(* the special exception on linking described in file ../LICENSE. *)
1011
(* *)
1112
(***********************************************************************)
1213

Diff for: ‎ocamlbuild/flags.ml

+2-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@
66
(* *)
77
(* Copyright 2007 Institut National de Recherche en Informatique et *)
88
(* en Automatique. All rights reserved. This file is distributed *)
9-
(* under the terms of the Q Public License version 1.0. *)
9+
(* under the terms of the GNU Library General Public License, with *)
10+
(* the special exception on linking described in file ../LICENSE. *)
1011
(* *)
1112
(***********************************************************************)
1213

Diff for: ‎ocamlbuild/flags.mli

+2-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@
66
(* *)
77
(* Copyright 2007 Institut National de Recherche en Informatique et *)
88
(* en Automatique. All rights reserved. This file is distributed *)
9-
(* under the terms of the Q Public License version 1.0. *)
9+
(* under the terms of the GNU Library General Public License, with *)
10+
(* the special exception on linking described in file ../LICENSE. *)
1011
(* *)
1112
(***********************************************************************)
1213

Diff for: ‎ocamlbuild/glob.ml

+2-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@
66
(* *)
77
(* Copyright 2007 Institut National de Recherche en Informatique et *)
88
(* en Automatique. All rights reserved. This file is distributed *)
9-
(* under the terms of the Q Public License version 1.0. *)
9+
(* under the terms of the GNU Library General Public License, with *)
10+
(* the special exception on linking described in file ../LICENSE. *)
1011
(* *)
1112
(***********************************************************************)
1213

Diff for: ‎ocamlbuild/glob.mli

+2-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@
66
(* *)
77
(* Copyright 2007 Institut National de Recherche en Informatique et *)
88
(* en Automatique. All rights reserved. This file is distributed *)
9-
(* under the terms of the Q Public License version 1.0. *)
9+
(* under the terms of the GNU Library General Public License, with *)
10+
(* the special exception on linking described in file ../LICENSE. *)
1011
(* *)
1112
(***********************************************************************)
1213

Diff for: ‎ocamlbuild/glob_ast.ml

+2-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@
66
(* *)
77
(* Copyright 2007 Institut National de Recherche en Informatique et *)
88
(* en Automatique. All rights reserved. This file is distributed *)
9-
(* under the terms of the Q Public License version 1.0. *)
9+
(* under the terms of the GNU Library General Public License, with *)
10+
(* the special exception on linking described in file ../LICENSE. *)
1011
(* *)
1112
(***********************************************************************)
1213

Diff for: ‎ocamlbuild/glob_ast.mli

+2-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@
66
(* *)
77
(* Copyright 2007 Institut National de Recherche en Informatique et *)
88
(* en Automatique. All rights reserved. This file is distributed *)
9-
(* under the terms of the Q Public License version 1.0. *)
9+
(* under the terms of the GNU Library General Public License, with *)
10+
(* the special exception on linking described in file ../LICENSE. *)
1011
(* *)
1112
(***********************************************************************)
1213

Diff for: ‎ocamlbuild/glob_lexer.mli

+2-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@
66
(* *)
77
(* Copyright 2007 Institut National de Recherche en Informatique et *)
88
(* en Automatique. All rights reserved. This file is distributed *)
9-
(* under the terms of the Q Public License version 1.0. *)
9+
(* under the terms of the GNU Library General Public License, with *)
10+
(* the special exception on linking described in file ../LICENSE. *)
1011
(* *)
1112
(***********************************************************************)
1213

0 commit comments

Comments
 (0)