Permalink
Browse files

Move from MIT to Modified BSD License (3-clause).

  • Loading branch information...
1 parent 5512865 commit 2d6e3631f47b4481204bd2cbc9b5e7f3c4d45da1 @jonforums jonforums committed Jul 2, 2011
View
@@ -8,6 +8,8 @@
* Upgraded OpenSSL to 1.0.0d on all versions of Ruby
* Build Ruby using GCC 4.5.2 (TDM-1 release)
* Enable unsupported builds with 32-bit MinGW-w64
+ * Change from MIT license to Modified BSD License (3-clause)
+ * Add support for Tcl/Tk 8.5.10 in recipes and installer
* Bugfixes:
* Be specific about version of RDoc and RDoc CHM required. GH-58
View
@@ -1,23 +1,25 @@
-Copyright (c) 2007-2010 RubyInstaller Team.
-All rights reserved. See CONTRIBUTORS for complete list.
+Copyright (c) 2007-2011, RubyInstaller Team
+All rights reserved.
-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:
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
+ * 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 the RubyInstaller Team 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 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.
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "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 THE RUBYINSTALLER TEAM BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF 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.
View
@@ -1,10 +1,11 @@
== MinGW RubyInstaller: Bootstrapping Build Recipes
-This project attempts to generate a development sandbox that can be used to
-compile Ruby and it's components using the freely available MinGW toolchain.
-Our goal is to offer a simplified way to boost your productivity when building
-Ruby from source code on your Windows system, and ease the path for anyone
-wishing to contribute to the RubyInstaller for Windows project.
+This project, licensed under the 3-clause Modified BSD License, attempts to
+generate a development sandbox that can be used to compile Ruby and it's
+components using the freely available MinGW toolchain. Our goal is to offer a
+simplified way to boost your productivity when building Ruby from source code
+on your Windows system, and ease the path for anyone wishing to contribute to
+the RubyInstaller for Windows project.
This project is a work-in-progress collection of Rake build recipes that download
and verify the MinGW utilities required to compile and build a Ruby interpreter
@@ -1,4 +1,5 @@
Copyright (c) 2007-2011 RubyInstaller Team.
+All rights reserved.
Except:
@@ -10,11 +11,17 @@ Except:
3rd party libraries (OpenSSL, ZLib, etc.)
+This software is distributed under the terms of the Modified BSD License.
-This software is distributed under the terms of MIT license.
+Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
-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:
+ * 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 the RubyInstaller Team nor the names of its
+ contributors may be used to endorse or promote products derived
+ from this software without specific prior written permission.
-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.
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "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 THE RUBYINSTALLER TEAM BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF 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.
@@ -2,7 +2,7 @@
; This script is used to build fake RubyInstallers for Windows for testing purposes
; Copyright (c) 2009-2011 Jon Maken
; Revision: 01/29/2011 2:31:03 PM
-; License: MIT
+; License: Modified BSD License
; PRE-CHECK
; Verify that RubyPath, RubyVersion, and RubyPath are defined by ISCC using
@@ -1,8 +1,8 @@
// RubyInstaller Inno Setup GUI Customizations
//
// Copyright (c) 2009-2011 Jon Maken
-// Revision: 05/19/2011 2:47:50 PM
-// License: MIT
+// Revision: 07/02/2011 2:22:39 PM
+// License: Modified BSD License
const
ChkBoxBaseY = 95;
@@ -3,7 +3,8 @@
; Copyright (c) 2009-2011 Jon Maken
; Copyright (c) 2009-2011 Gordon Thiesfeld
; Copyright (c) 2009-2011 Luis Lavena
-; Revision: 06/17/2011 10:02:54 PM
+; Revision: 07/02/2011 2:25:30 PM
+; License: Modified BSD License
; PRE-CHECK
; Verify that RubyPath, RubyVersion, and RubyPath are defined by ISCC using
@@ -1,7 +1,7 @@
; RubyInstaller Tcl/Tk extension InnoSetup support
; Copyright (c) 2011 Jon Maken
-; License: MIT
-; Revision: 06/08/2011 4:22:20 PM
+; License: Modified BSD License
+; Revision: 07/02/2011 2:22:05 PM
[Files]
Source: {#RubyPath}\lib\ruby\{#RubyLibVersion}\tk*.rb; DestDir: {app}\lib\ruby\{#RubyLibVersion}; Check: IsTclTk
@@ -1,8 +1,8 @@
// Inno Setup utilities
//
// Copyright (c) 2009 Jon Maken
-// Revision: 11/03/2009 8:04:17 PM
-// License: MIT
+// Revision: 07/02/2011 2:23:34 PM
+// License: Modified BSD License
// forward declarations
function MungePathish(const SrcList: TStringList; NewData: Array of String; RegValue: String; IsUninstalling: Boolean): Boolean; forward;

0 comments on commit 2d6e363

Please sign in to comment.