[llvm-commits] CVS: llvm/LICENSE.TXT

[John Criswell]

Changes in directory llvm:

LICENSE.TXT updated: 1.1 -> 1.2

---
Log message:

Added new license information in preparation for LLVM 1.0.


---
Diffs of the changes:  (+65 -1)

Index: llvm/LICENSE.TXT
diff -u llvm/LICENSE.TXT:1.1 llvm/LICENSE.TXT:1.2
--- llvm/LICENSE.TXT:1.1	Wed Jun  4 14:46:36 2003
+++ llvm/LICENSE.TXT	Thu Oct 23 10:57:59 2003
@@ -1,4 +1,17 @@
-LLVM pre-release license:
+NOTICE:
+=======
+All distributions of LLVM prior to the 1.0 Release will be licensed to you
+under the LLVM pre-release license.  The 1.0 Release will be announced on the
+LLVM Announcements Mailing List.
+
+After the 1.0 Release of LLVM, the LLVM code will be licensed to you under the
+LLVM Release License (aka the Illinois Open Source License).
+
+The main point is that you cannot re-distribute LLVM until the 1.0 Release.
+
+==============================================================================
+LLVM pre-release license
+==============================================================================
 
 This is a pre-release distribution of the LLVM software and is provided for
 evaluation only.  This version of the LLVM software or modifications thereof
@@ -17,3 +30,54 @@
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS WITH THE
 SOFTWARE.
+
+==============================================================================
+LLVM Release License
+==============================================================================
+University of Illinois/NCSA
+Open Source License
+
+Copyright © 2003, University of Illinois at Urbana-Champaign.  All rights reserved.
+
+Developed by:
+
+    LLVM Team
+
+    University of Illinois at Urbana-Champaign
+
+    http://llvm.cs.uiuc.edu
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal with
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+of the Software, and to permit persons to whom the Software is furnished to do
+so, subject to the following conditions:
+
+    * Redistributions of source code must retain the above copyright notice,
+      this list of conditions and the following disclaimers.
+
+    * Redistributions in binary form must reproduce the above copyright notice,
+      this list of conditions and the following disclaimers in the
+      documentation and/or other materials provided with the distribution.
+
+    * Neither the names of the LLVM Team, University of Illinois at
+      Urbana-Champaign, nor the names of its contributors may be used to
+      endorse or promote products derived from this Software without specific
+      prior written permission.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+CONTRIBUTORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS WITH THE
+SOFTWARE.
+
+==============================================================================
+Copyrights and Licenses for Third Party Software Distributed with LLVM:
+==============================================================================
+The LLVM software contains code written by third parties.  Such software will
+have its own individual LICENSE.TXT file in the directory in which it appears.
+This file will describe the copyrights, license, and restrictions which apply
+to that code.