Skip to content
Browse files

corrected license texts (EPL 1.1)

  • Loading branch information...
1 parent f84867a commit 0ec1da744e0c7b42994c729ffaedae696993bfa3 @uwiger uwiger committed
Showing with 45 additions and 53 deletions.
  1. +1 −1 doc/overview.edoc
  2. +5 −5 include/codegen.hrl
  3. +4 −4 include/exprecs.hrl
  4. +4 −4 src/ct_expand.erl
  5. +4 −4 src/exprecs.erl
  6. +19 −26 src/parse_trans.app.src
  7. +4 −4 src/parse_trans.erl
  8. +2 −2 src/parse_trans_codegen.erl
  9. +2 −2 src/parse_trans_pp.erl
  10. +0 −1 vsn.mk
View
2 doc/overview.edoc
@@ -1,4 +1,4 @@
-@author Ulf Wiger <ulf.wiger@erlang-consulting.com>
+@author Ulf Wiger <ulf@feuerlabs.com>
@doc A generic parse transform library
This library is intended to simplify the task of writing parse transform
modules for Erlang.
View
10 include/codegen.hrl
@@ -1,14 +1,14 @@
-%% The contents of this file are subject to the Erlang Public License,
-%% Version 1.0, (the "License"); you may not use this file except in
-%% compliance with the License. You may obtain a copy of the License at
-%% http://www.erlang.org/license/EPL1_0.txt
+%%% The contents of this file are subject to the Erlang Public License,
+%%% Version 1.1, (the "License"); you may not use this file except in
+%%% compliance with the License. You may obtain a copy of the License at
+%%% http://www.erlang.org/EPLICENSE
%%
%% Software distributed under the License is distributed on an "AS IS"
%% basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
%% the License for the specific language governing rights and limitations
%% under the License.
%%
-%% The Original Code is exprecs-0.2.
+%% The Original Code is parse_trans-2.0.
%%
%% Copyright (c) 2010 Erlang Solutions Ltd.
%%
View
8 include/exprecs.hrl
@@ -1,7 +1,7 @@
-%% The contents of this file are subject to the Erlang Public License,
-%% Version 1.0, (the "License"); you may not use this file except in
-%% compliance with the License. You may obtain a copy of the License at
-%% http://www.erlang.org/license/EPL1_0.txt
+%%% The contents of this file are subject to the Erlang Public License,
+%%% Version 1.1, (the "License"); you may not use this file except in
+%%% compliance with the License. You may obtain a copy of the License at
+%%% http://www.erlang.org/EPLICENSE
%%
%% Software distributed under the License is distributed on an "AS IS"
%% basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
View
8 src/ct_expand.erl
@@ -1,7 +1,7 @@
-%% The contents of this file are subject to the Erlang Public License,
-%% Version 1.0, (the "License"); you may not use this file except in
-%% compliance with the License. You may obtain a copy of the License at
-%% http://www.erlang.org/license/EPL1_0.txt
+%%% The contents of this file are subject to the Erlang Public License,
+%%% Version 1.1, (the "License"); you may not use this file except in
+%%% compliance with the License. You may obtain a copy of the License at
+%%% http://www.erlang.org/EPLICENSE
%%
%% Software distributed under the License is distributed on an "AS IS"
%% basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
View
8 src/exprecs.erl
@@ -1,7 +1,7 @@
-%% The contents of this file are subject to the Erlang Public License,
-%% Version 1.0, (the "License"); you may not use this file except in
-%% compliance with the License. You may obtain a copy of the License at
-%% http://www.erlang.org/license/EPL1_0.txt
+%%% The contents of this file are subject to the Erlang Public License,
+%%% Version 1.1, (the "License"); you may not use this file except in
+%%% compliance with the License. You may obtain a copy of the License at
+%%% http://www.erlang.org/EPLICENSE
%%
%% Software distributed under the License is distributed on an "AS IS"
%% basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
View
45 src/parse_trans.app.src
@@ -1,30 +1,23 @@
-%%% ----------------------------------------------------------------------------
-%%% Copyright (c) 2009, Erlang Training and Consulting Ltd.
-%%% All rights reserved.
-%%%
-%%% Redistribution and use in source and binary forms, with or without
-%%% modification, are permitted provided that the following conditions are met:
-%%% * Redistributions of source code must retain the above copyright
-%%% notice, this list of conditions and the following disclaimer.
-%%% * Redistributions in binary form must reproduce the above copyright
-%%% notice, this list of conditions and the following disclaimer in the
-%%% documentation and/or other materials provided with the distribution.
-%%% * Neither the name of Erlang Training and Consulting Ltd. nor the
-%%% names of its contributors may be used to endorse or promote products
-%%% derived from this software without specific prior written permission.
-%%%
-%%% THIS SOFTWARE IS PROVIDED BY Erlang Training and Consulting Ltd. ''AS IS''
-%%% AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-%%% IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-%%% ARE DISCLAIMED. IN NO EVENT SHALL Erlang Training and Consulting Ltd. BE
-%%% LIABLE SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-%%% BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-%%% WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-%%% OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-%%% ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-%%% ----------------------------------------------------------------------------
+%%% -*- erlang -*-
+%%% The contents of this file are subject to the Erlang Public License,
+%%% Version 1.1, (the "License"); you may not use this file except in
+%%% compliance with the License. You may obtain a copy of the License at
+%%% http://www.erlang.org/EPLICENSE
+%%%
+%%% Software distributed under the License is distributed on an "AS IS"
+%%% basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
+%%% the License for the specific language governing rights and limitations
+%%% under the License.
+%%%
+%%% The Original Code is exprecs-0.2.
+%%%
+%%% The Initial Developer of the Original Code is Ericsson AB.
+%%% Portions created by Ericsson are Copyright (C), 2006, Ericsson AB.
+%%% All Rights Reserved.
+%%%
+%%% Contributor(s): ______________________________________.
-%%% @author Ulf Wiger <ulf.wiger@erlang-consulting.com>
+%%% @author Ulf Wiger <ulf.wiger@feuerlabs.com>
%%% @doc This is a container for parse_trans modules.
%%% @end
{application, parse_trans,
View
8 src/parse_trans.erl
@@ -1,7 +1,7 @@
%%% The contents of this file are subject to the Erlang Public License,
-%%% Version 1.0, (the "License"); you may not use this file except in
+%%% Version 1.1, (the "License"); you may not use this file except in
%%% compliance with the License. You may obtain a copy of the License at
-%%% http://www.erlang.org/license/EPL1_0.txt
+%%% http://www.erlang.org/EPLICENSE
%%%
%%% Software distributed under the License is distributed on an "AS IS"
%%% basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
@@ -18,11 +18,11 @@
%%%-------------------------------------------------------------------
%%% File : parse_trans.erl
-%%% @author : Ulf Wiger <ulf.wiger@erlang-consulting.com>
+%%% @author : Ulf Wiger <ulf.wiger@feuerlabs.com>
%%% @end
%%% Description :
%%%
-%%% Created : 13 Feb 2006 by Ulf Wiger <ulf.wiger@erlang-consulting.com>
+%%% Created : 13 Feb 2006 by Ulf Wiger <ulf.wiger@feuerlabs.com> (then Ericsson)
%%%-------------------------------------------------------------------
%%% @doc Generic parse transform library for Erlang.
View
4 src/parse_trans_codegen.erl
@@ -1,7 +1,7 @@
%%% The contents of this file are subject to the Erlang Public License,
-%%% Version 1.0, (the "License"); you may not use this file except in
+%%% Version 1.1, (the "License"); you may not use this file except in
%%% compliance with the License. You may obtain a copy of the License at
-%%% http://www.erlang.org/license/EPL1_0.txt
+%%% http://www.erlang.org/EPLICENSE
%%%
%%% Software distributed under the License is distributed on an "AS IS"
%%% basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
View
4 src/parse_trans_pp.erl
@@ -1,7 +1,7 @@
%%% The contents of this file are subject to the Erlang Public License,
-%%% Version 1.0, (the "License"); you may not use this file except in
+%%% Version 1.1, (the "License"); you may not use this file except in
%%% compliance with the License. You may obtain a copy of the License at
-%%% http://www.erlang.org/license/EPL1_0.txt
+%%% http://www.erlang.org/EPLICENSE
%%%
%%% Software distributed under the License is distributed on an "AS IS"
%%% basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
View
1 vsn.mk
@@ -1 +0,0 @@
-VSN=0.1

0 comments on commit 0ec1da7

Please sign in to comment.
Something went wrong with that request. Please try again.