Skip to content

Commit

Permalink
update licensing information
Browse files Browse the repository at this point in the history
  • Loading branch information
@let-def
let-def committed Feb 5, 2017
1 parent cbe856d commit f36f9f9
Show file tree
Hide file tree
Showing 27 changed files with 576 additions and 550 deletions.
224 changes: 203 additions & 21 deletions LICENSE
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion Makefile
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# This file is part of the migrate-parsetree package. It is released under the
# terms of the MIT license (see LICENSE file).
# terms of the LGPL 2.1 license (see LICENSE file).
# Copyright 2017 Frédéric Bour
#
# It is forked from ppx-tools package, which is copyright 2013
Expand Down
9 changes: 1 addition & 8 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -72,14 +72,7 @@ marshalling/unmarshalling.
It started from the work of Alain Frisch in
[ppx\_tools](https://github.com/alainfrisch/ppx_tools).

The library includes code from different versions of OCaml. The resulting
license is not yet clear. Other code is licensed under MIT.

OCaml is copyright INRIA:
- OCaml 4.02 is distributed under QPL 1 with exceptions.
- OCaml 4.03 is distributed under LGPL 2.1.
- OCaml 4.04 is distributed under LGPL 2.1.
- OCaml 4.05 is distributed under LGPL 2.1.
The library is distributed under LGPL 2.1 and is copyright INRIA.

## Adding a new OCaml version

Expand Down
2 changes: 1 addition & 1 deletion ocaml-migrate-parsetree.opam
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ authors: [
"Jérémie Dimino <[email protected]>"
"Alain Frisch <[email protected]>"
]
license: "MIT"
license: "LGPL-2.1"
homepage: "https://github.com/let-def/ocaml-migrate-parsetree"
bug-reports: "https://github.com/let-def/ocaml-migrate-parsetree/issues"
dev-repo: "git://github.com/let-def/ocaml-migrate-parsetree.git"
Expand Down
133 changes: 19 additions & 114 deletions src/ast_402.ml
View file
Original file line number Diff line number Diff line change
@@ -1,19 +1,26 @@
(**************************************************************************)
(* *)
(* OCaml Migrate Parsetree *)
(* *)
(* Frédéric Bour *)
(* Jérémie Dimino and Leo White, Jane Street Europe *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* Alain Frisch, LexiFi *)
(* Daniel de Rauglaudre, projet Cristal, INRIA Rocquencourt *)
(* *)
(* Copyright 2017 Institut National de Recherche en Informatique et *)
(* en Automatique (INRIA). *)
(* *)
(* All rights reserved. This file is distributed under the terms of *)
(* the GNU Lesser General Public License version 2.1, with the *)
(* special exception on linking described in the file LICENSE. *)
(* *)
(**************************************************************************)

module Location = Location
module Longident = Longident

module Asttypes = struct
(***********************************************************************)
(* *)
(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
(* Copyright 1996 Institut National de Recherche en Informatique et *)
(* en Automatique. All rights reserved. This file is distributed *)
(* under the terms of the Q Public License version 1.0. *)
(* *)
(***********************************************************************)

(* Auxiliary a.s.t. types used by parsetree and typedtree. *)

type constant (*IF_CURRENT = Asttypes.constant *) =
Expand Down Expand Up @@ -54,18 +61,6 @@ module Asttypes = struct
end

module Parsetree = struct
(***********************************************************************)
(* *)
(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
(* Copyright 1996 Institut National de Recherche en Informatique et *)
(* en Automatique. All rights reserved. This file is distributed *)
(* under the terms of the Q Public License version 1.0. *)
(* *)
(***********************************************************************)

(** Abstract syntax tree produced by parsing *)

open Asttypes
Expand Down Expand Up @@ -886,21 +881,6 @@ module Parsetree = struct
end

module Docstrings : sig
(**************************************************************************)
(* *)
(* OCaml *)
(* *)
(* Leo White *)
(* *)
(* Copyright 1996 Institut National de Recherche en Informatique et *)
(* en Automatique. *)
(* *)
(* All rights reserved. This file is distributed under the terms of *)
(* the GNU Lesser General Public License version 2.1, with the *)
(* special exception on linking described in the file LICENSE. *)
(* *)
(**************************************************************************)

(** {3 Docstrings} *)

(** Documentation comments *)
Expand Down Expand Up @@ -961,21 +941,6 @@ module Docstrings : sig
val add_text_attrs : text -> Parsetree.attributes -> Parsetree.attributes

end = struct
(**************************************************************************)
(* *)
(* OCaml *)
(* *)
(* Leo White *)
(* *)
(* Copyright 1996 Institut National de Recherche en Informatique et *)
(* en Automatique. *)
(* *)
(* All rights reserved. This file is distributed under the terms of *)
(* the GNU Lesser General Public License version 2.1, with the *)
(* special exception on linking described in the file LICENSE. *)
(* *)
(**************************************************************************)

open Location

(* Docstrings *)
Expand Down Expand Up @@ -1074,18 +1039,6 @@ end = struct
end

module Ast_helper : sig
(***********************************************************************)
(* *)
(* OCaml *)
(* *)
(* Alain Frisch, LexiFi *)
(* *)
(* Copyright 2012 Institut National de Recherche en Informatique et *)
(* en Automatique. All rights reserved. This file is distributed *)
(* under the terms of the Q Public License version 1.0. *)
(* *)
(***********************************************************************)

(** Helpers to produce Parsetree fragments *)

open Parsetree
Expand Down Expand Up @@ -1465,18 +1418,6 @@ module Ast_helper : sig
end

end = struct
(***********************************************************************)
(* *)
(* OCaml *)
(* *)
(* Alain Frisch, LexiFi *)
(* *)
(* Copyright 2012 Institut National de Recherche en Informatique et *)
(* en Automatique. All rights reserved. This file is distributed *)
(* under the terms of the Q Public License version 1.0. *)
(* *)
(***********************************************************************)

(** Helpers to produce Parsetree fragments *)

open Asttypes
Expand Down Expand Up @@ -1951,18 +1892,6 @@ end = struct
end

module Ast_mapper : sig
(***********************************************************************)
(* *)
(* OCaml *)
(* *)
(* Alain Frisch, LexiFi *)
(* *)
(* Copyright 2012 Institut National de Recherche en Informatique et *)
(* en Automatique. All rights reserved. This file is distributed *)
(* under the terms of the Q Public License version 1.0. *)
(* *)
(***********************************************************************)

(** The interface of a -ppx rewriter
A -ppx rewriter is a program that accepts a serialized abstract syntax
Expand Down Expand Up @@ -2147,18 +2076,6 @@ module Ast_mapper : sig
*)

end = struct
(***********************************************************************)
(* *)
(* OCaml *)
(* *)
(* Alain Frisch, LexiFi *)
(* *)
(* Copyright 2012 Institut National de Recherche en Informatique et *)
(* en Automatique. All rights reserved. This file is distributed *)
(* under the terms of the Q Public License version 1.0. *)
(* *)
(***********************************************************************)

(* A generic Parsetree mapping class *)

(*
Expand Down Expand Up @@ -3056,18 +2973,6 @@ end = struct
end

module Outcometree = struct
(***********************************************************************)
(* *)
(* OCaml *)
(* *)
(* Daniel de Rauglaudre, projet Cristal, INRIA Rocquencourt *)
(* *)
(* Copyright 2001 Institut National de Recherche en Informatique et *)
(* en Automatique. All rights reserved. This file is distributed *)
(* under the terms of the Q Public License version 1.0. *)
(* *)
(***********************************************************************)

(* Module [Outcometree]: results displayed by the toplevel *)

(* These types represent messages that the toplevel displays as normal
Expand Down
Loading

0 comments on commit f36f9f9

Please sign in to comment.