Permalink
Browse files

Added MIT-style license

  • Loading branch information...
1 parent d7bcd26 commit 9231340114fbd5c39f2ddc3cb272e2072d773988 @schmidt committed Apr 28, 2008
Showing with 102 additions and 64 deletions.
  1. 0 COPYING.txt → GPL.txt
  2. +5 −0 History.txt
  3. +2 −57 LICENSE.txt
  4. +24 −0 MIT.txt
  5. +2 −2 README.txt
  6. +59 −0 RUBY.txt
  7. +1 −1 lib/contextr/version.rb
  8. +9 −4 website/index.html
File renamed without changes.
View
@@ -1,3 +1,8 @@
+== 1.0.2 2008-04-01
+
+* 1 major change
+ * added MIT-style license (ContextR is now triple licensed)
+
== 1.0.1 2008-04-01
* minor changes
View
@@ -1,59 +1,4 @@
ContextR is copyrighted free software by Gregor Schmidt <ruby@schmidtwisser.de>,
Software-Architecture-Group, Hasso-Plattner-Institute, Potsdam, Germany.
-You can redistribute it and/or modify it under either the terms of the GPL
-(see COPYING file), or the conditions below:
-
- 1. You may make and give away verbatim copies of the source form of the
- software without restriction, provided that you duplicate all of the
- original copyright notices and associated disclaimers.
-
- 2. You may modify your copy of the software in any way, provided that
- you do at least ONE of the following:
-
- a) place your modifications in the Public Domain or otherwise
- make them Freely Available, such as by posting said
- modifications to Usenet or an equivalent medium, or by allowing
- the author to include your modifications in the software.
-
- b) use the modified software only within your corporation or
- organization.
-
- c) rename any non-standard executables so the names do not conflict
- with standard executables, which must also be provided.
-
- d) make other distribution arrangements with the author.
-
- 3. You may distribute the software in object code or executable
- form, provided that you do at least ONE of the following:
-
- a) distribute the executables and library files of the software,
- together with instructions (in the manual page or equivalent)
- on where to get the original distribution.
-
- b) accompany the distribution with the machine-readable source of
- the software.
-
- c) give non-standard executables non-standard names, with
- instructions on where to get the original software distribution.
-
- d) make other distribution arrangements with the author.
-
- 4. You may modify and include the part of the software into any other
- software (possibly commercial). But some files in the distribution
- are not written by the author, so that they are not under this terms.
-
- They are all files except those under benchmark, lib, spec, and test
- but including the lib/ext directory. See each file for the copying
- condition.
-
- 5. The scripts and library files supplied as input to or produced as
- output from the software do not automatically fall under the
- copyright of the software, but belong to whomever generated them,
- and may be sold commercially, and may be aggregated with this
- software.
-
- 6. THIS SOFTWARE IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR
- IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
- WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- PURPOSE.
-
+You can redistribute it and/or modify it under either the terms of an MIT-style
+license (see MIT.txt) or the same conditions as Ruby (see RUBY.txt).
View
@@ -0,0 +1,24 @@
+Copyright (c) 2007 - Gregor Schmidt <ruby@schmidtwisser.de>
+Software-Architecture-Group, Hasso-Plattner-Institute, Potsdam, Germany
+
+Permission is hereby granted, free of charge, to any person
+obtaining a copy of this software and associated documentation
+files (the "Software"), to deal in 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:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+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 AUTHORS 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 IN THE SOFTWARE.
+
View
@@ -9,8 +9,8 @@ For more information see
- http://www.contextr.org/ or
- http://www.swa.hpi.uni-potsdam.de/cop/
-This code is published under the same license as Ruby. See LICENSE.txt for more
-information.
+This code is published under an MIT-style license or the same terms as Ruby.
+See LICENSE.txt for more information.
(c) 2007 - Gregor Schmidt - Berlin, Germany
Software-Architecture-Group, Hasso-Plattner-Institute, Potsdam, Germany
View
@@ -0,0 +1,59 @@
+ContextR is copyrighted free software by Gregor Schmidt <ruby@schmidtwisser.de>,
+Software-Architecture-Group, Hasso-Plattner-Institute, Potsdam, Germany.
+You can redistribute it and/or modify it under either the terms of the GPL
+(see GPL.txt file), or the conditions below:
+
+ 1. You may make and give away verbatim copies of the source form of the
+ software without restriction, provided that you duplicate all of the
+ original copyright notices and associated disclaimers.
+
+ 2. You may modify your copy of the software in any way, provided that
+ you do at least ONE of the following:
+
+ a) place your modifications in the Public Domain or otherwise
+ make them Freely Available, such as by posting said
+ modifications to Usenet or an equivalent medium, or by allowing
+ the author to include your modifications in the software.
+
+ b) use the modified software only within your corporation or
+ organization.
+
+ c) rename any non-standard executables so the names do not conflict
+ with standard executables, which must also be provided.
+
+ d) make other distribution arrangements with the author.
+
+ 3. You may distribute the software in object code or executable
+ form, provided that you do at least ONE of the following:
+
+ a) distribute the executables and library files of the software,
+ together with instructions (in the manual page or equivalent)
+ on where to get the original distribution.
+
+ b) accompany the distribution with the machine-readable source of
+ the software.
+
+ c) give non-standard executables non-standard names, with
+ instructions on where to get the original software distribution.
+
+ d) make other distribution arrangements with the author.
+
+ 4. You may modify and include the part of the software into any other
+ software (possibly commercial). But some files in the distribution
+ are not written by the author, so that they are not under this terms.
+
+ They are all files except those under benchmark, lib, spec, and test
+ but including the lib/ext directory. See each file for the copying
+ condition.
+
+ 5. The scripts and library files supplied as input to or produced as
+ output from the software do not automatically fall under the
+ copyright of the software, but belong to whomever generated them,
+ and may be sold commercially, and may be aggregated with this
+ software.
+
+ 6. THIS SOFTWARE IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR
+ IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
+ WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ PURPOSE.
+
@@ -2,7 +2,7 @@ module ContextR #:nodoc:
module VERSION #:nodoc:
MAJOR = 1
MINOR = 0
- TINY = 1
+ TINY = 2
STRING = [MAJOR, MINOR, TINY].join('.')
end
View
@@ -33,15 +33,20 @@
<h1>contextr</h1>
<div id="version" class="clickable" onclick='document.location = "http://rubyforge.org/projects/contextr"; return false'>
<p>Get Version</p>
- <a href="http://rubyforge.org/projects/contextr" class="numbers">1.0.0</a>
+ <a href="http://rubyforge.org/projects/contextr" class="numbers">1.0.2</a>
</div>
- <h1>&#x2192; &#8216;contextr&#8217;</h1>
+ <h2>What</h2>
- <h2>What</h2>
+ <p>ContextR is a library supporting <a href="http://www.swa.hpi.uni-potsdam.de/cop/" title="COP">context-oriented programming</a>.</p>
- <p>ContextR is a library supporting <a href="http://www.swa.hpi.uni-potsdam.de/cop/" title="COP">context-oriented programming</a>.</p>
+ <h3>Version 1.0.1</h3>
+
+
+ <p>This version includes the latest changes, that were introduced when finishing
+the thesis. Nothing, that changes the usage, performance or <span class="caps">API</span>, just minor
+refactorings inside the library.</p>
<h3>Version 1.0.0</h3>

0 comments on commit 9231340

Please sign in to comment.