From dc2c98ab4c01135bee7349bd364535f6d3d211e6 Mon Sep 17 00:00:00 2001 From: Hidetaka Takano Date: Fri, 20 Apr 2012 16:55:46 +0900 Subject: mod: mRuby -> mruby --- README | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) (limited to 'README') diff --git a/README b/README index d7d90580f..e9a7523d4 100644 --- a/README +++ b/README @@ -4,9 +4,9 @@ Any suggestion of the modification are welcome, but the response might be delayed. Sorry for that in advance. -* What's mRuby +* What's mruby -mRuby is the light-weight implementation of the Ruby language complied to the ISO +mruby is the light-weight implementation of the Ruby language complied to the ISO standard to execute various environments. It can run in 'interpreter form' or 'compile and execute on vm form' according to its module construction. @@ -14,7 +14,7 @@ This achievement is due to the Regional Innovation Creation R&D Programs of the Ministry of Economy, Trade and Industry of Japan. -* Features of mRuby +* Features of mruby |FIXME: | + Simple Syntax @@ -30,34 +30,34 @@ the Ministry of Economy, Trade and Industry of Japan. | cf. http://redmine.ruby-lang.org/wiki/ruby-19/SupportedPlatforms -* How to get mRuby +* How to get mruby -The mRuby distribution files can be found in the following site: +The mruby distribution files can be found in the following site: https://github.com/mruby/mruby/zipball/master -The trunk of the mRuby source tree can be checked out with the +The trunk of the mruby source tree can be checked out with the following command: - $ git ... + $ git .... There are some other branches under development. Try the following command and see the list of branches: - $ git ... + $ git .... -* mRuby home-page (sorry, it's not launched yet. we're working on this) +* mruby home-page (sorry, it's not launched yet. we're working on this) -The URL of the mRuby home-page is: +The URL of the mruby home-page is: http://www.mruby.org/ * Mailing list -There is a mailing list to talk about mRuby. -To subscribe this list.... +There is a mailing list to talk about mruby. +To subscribe this list....[T.B.D.] * How to compile and install @@ -71,15 +71,15 @@ See the file COPYING. * About Contribution -Thank you for considering of contribution for mRuby. -mRuby has chosen a MIT License as comparatively loose condition, +Thank you for considering of contribution for mruby. +mruby has chosen a MIT License as comparatively loose condition, to expect to apply into various environment such as embedded system. However, the license requires to display copyright notice and license sentenses, for example manual or so. Especially for the recent bigger system, it is comlecated or very troublesome. -So, mRuby has decided to display "mruby developers" as copyright name +So, mruby has decided to display "mruby developers" as copyright name to make it simple conventionally. -In the future, mRuby might ask you to distribute your new codes +In the future, mruby might ask you to distribute your new codes (that you will commit,) under MIT License as a member of "mruby developers" with keeping copyright of you. (We did not intend you to transfer or waive your copyright, -- cgit v1.2.3 From dbb4790c170830ec3a28b68140b07af0c53f6737 Mon Sep 17 00:00:00 2001 From: Hidetaka Takano Date: Fri, 20 Apr 2012 17:46:01 +0900 Subject: add: markdown README --- README | 48 +++++++++++++++------------- README.md | 108 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 133 insertions(+), 23 deletions(-) create mode 100644 README.md (limited to 'README') diff --git a/README b/README index e9a7523d4..12f8f5135 100644 --- a/README +++ b/README @@ -1,14 +1,15 @@ -!!Notice!! This is a preliminary release for internal team reviewing. - The URL and address discribed below are not available yet. - The official release will be announced later. Thanks. - Any suggestion of the modification are welcome, - but the response might be delayed. Sorry for that in advance. +!!Notice!! + This is a preliminary release for internal team reviewing. + The URL and address discribed below are not available yet. + The official release will be announced later. Thanks. + Any suggestion of the modification are welcome, + but the response might be delayed. Sorry for that in advance. * What's mruby -mruby is the light-weight implementation of the Ruby language complied to the ISO -standard to execute various environments. It can run in 'interpreter form' or -'compile and execute on vm form' according to its module construction. +mruby is the light-weight implementation of the Ruby language complied to +the ISO standard to execute various environments. It can run in 'interpreter +form' or 'compile and execute on vm form' according to its module construction. This achievement is due to the Regional Innovation Creation R&D Programs of the Ministry of Economy, Trade and Industry of Japan. @@ -16,18 +17,18 @@ the Ministry of Economy, Trade and Industry of Japan. * Features of mruby -|FIXME: -| + Simple Syntax -| + *Normal* Object-Oriented features(ex. class, method calls) -| + *Advanced* Object-Oriented features(ex. Mix-in, Singleton-method) -| + Operator Overloading -| + Exception Handling -| + Iterators and Closures -| + Garbage Collection -| + Dynamic Loading of Object files(on some architecture) -| + Highly Portable (works on many Unix-like/POSIX compatible platforms -| as well as Windows, Mac OS X, BeOS etc.) -| cf. http://redmine.ruby-lang.org/wiki/ruby-19/SupportedPlatforms + |FIXME: + | + Simple Syntax + | + *Normal* Object-Oriented features(ex. class, method calls) + | + *Advanced* Object-Oriented features(ex. Mix-in, Singleton-method) + | + Operator Overloading + | + Exception Handling + | + Iterators and Closures + | + Garbage Collection + | + Dynamic Loading of Object files(on some architecture) + | + Highly Portable (works on many Unix-like/POSIX compatible platforms + | as well as Windows, Mac OS X, BeOS etc.) + | cf. http://redmine.ruby-lang.org/wiki/ruby-19/SupportedPlatforms * How to get mruby @@ -39,19 +40,19 @@ The mruby distribution files can be found in the following site: The trunk of the mruby source tree can be checked out with the following command: - $ git .... + $ git .... There are some other branches under development. Try the following command and see the list of branches: - $ git .... + $ git .... * mruby home-page (sorry, it's not launched yet. we're working on this) The URL of the mruby home-page is: - http://www.mruby.org/ + http://www.mruby.org/ * Mailing list @@ -59,6 +60,7 @@ The URL of the mruby home-page is: There is a mailing list to talk about mruby. To subscribe this list....[T.B.D.] + * How to compile and install See the file INSTALL. diff --git a/README.md b/README.md new file mode 100644 index 000000000..a551c735b --- /dev/null +++ b/README.md @@ -0,0 +1,108 @@ +# !!Notice!! + This is a preliminary release for internal team reviewing. + The URL and address discribed below are not available yet. + The official release will be announced later. Thanks. + Any suggestion of the modification are welcome, + but the response might be delayed. Sorry for that in advance. + +# What's mruby + +mruby is the light-weight implementation of the Ruby language complied to +the ISO standard to execute various environments. It can run in 'interpreter +form' or 'compile and execute on vm form' according to its module construction. + +This achievement is due to the Regional Innovation Creation R&D Programs of +the Ministry of Economy, Trade and Industry of Japan. + + +# Features of mruby + + |FIXME: + | + Simple Syntax + | + *Normal* Object-Oriented features(ex. class, method calls) + | + *Advanced* Object-Oriented features(ex. Mix-in, Singleton-method) + | + Operator Overloading + | + Exception Handling + | + Iterators and Closures + | + Garbage Collection + | + Dynamic Loading of Object files(on some architecture) + | + Highly Portable (works on many Unix-like/POSIX compatible platforms + | as well as Windows, Mac OS X, BeOS etc.) + | cf. http://redmine.ruby-lang.org/wiki/ruby-19/SupportedPlatforms + + +# How to get mruby + +The mruby distribution files can be found in the following site: + + https://github.com/mruby/mruby/zipball/master + +The trunk of the mruby source tree can be checked out with the +following command: + + $ git .... + +There are some other branches under development. Try the following +command and see the list of branches: + + $ git .... + + +# mruby home-page (sorry, it's not launched yet. we're working on this) + +The URL of the mruby home-page is: + + http://www.mruby.org/ + + +# Mailing list + +There is a mailing list to talk about mruby. +To subscribe this list....[T.B.D.] + + +# How to compile and install + +See the file INSTALL. + + +# Copying + +See the file COPYING. + + +# About Contribution + +Thank you for considering of contribution for mruby. +mruby has chosen a MIT License as comparatively loose condition, +to expect to apply into various environment such as embedded system. +However, the license requires to display copyright notice and license +sentenses, for example manual or so. Especially for the recent bigger +system, it is comlecated or very troublesome. +So, mruby has decided to display "mruby developers" as copyright name +to make it simple conventionally. +In the future, mruby might ask you to distribute your new codes +(that you will commit,) under MIT License as a member of +"mruby developers" with keeping copyright of you. +(We did not intend you to transfer or waive your copyright, + Actual copyright holder name, you, will be listed in AUTHORS file.) + +Please ask us if you want to distribute your code under other license +or if your code is derived from GPL code. + + +# The Author + +See the file AUTHORS. + + +Feel free to send comments and bug reports to the author. Here is the +author's latest mail address: + + devel@mruby.org + +------------------------------------------------------- +created at: Fri Apr 20 11:57:36 JST 2012 +Local variables: +mode: indented-text +end: -- cgit v1.2.3 From f7f31188be83e937308ddd3abe7dec42ea48ba78 Mon Sep 17 00:00:00 2001 From: takahashim Date: Sat, 21 Apr 2012 00:15:39 +0900 Subject: fix git commands --- README | 4 ++-- README.ja | 4 ++-- README.ja.md | 4 ++-- README.md | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) (limited to 'README') diff --git a/README b/README index 12f8f5135..bfcd138cc 100644 --- a/README +++ b/README @@ -40,12 +40,12 @@ The mruby distribution files can be found in the following site: The trunk of the mruby source tree can be checked out with the following command: - $ git .... + $ git clone https://github.com/mruby/mruby.git There are some other branches under development. Try the following command and see the list of branches: - $ git .... + $ git branch -r * mruby home-page (sorry, it's not launched yet. we're working on this) diff --git a/README.ja b/README.ja index 22895a403..18ef16d13 100644 --- a/README.ja +++ b/README.ja @@ -44,11 +44,11 @@ mrubyはISO規格に準拠したRuby言語を様々な環境で動作可能と 開発先端のソースコードは次のコマンドで取得できます. - $ git .... + $ git clone https://github.com/mruby/mruby.git 他に開発中のブランチの一覧は次のコマンドで見られます. - $ git .... + $ git branch -r * ホームページ (まだ準備中です。ただいま鋭意製作中です。) diff --git a/README.ja.md b/README.ja.md index 0776226aa..aabad4c15 100644 --- a/README.ja.md +++ b/README.ja.md @@ -45,11 +45,11 @@ mrubyは[ISO規格](http://www.ipa.go.jp/about/press/20120402_2.html)に準拠 開発先端のソースコードは次のコマンドで取得できます。 - $ git .... + $ git clone https://github.com/mruby/mruby.git 他に開発中のブランチの一覧は次のコマンドで見られます。 - $ git .... + $ git branch -r ## ホームページ diff --git a/README.md b/README.md index 8fcbf44c7..f9a64ebb3 100644 --- a/README.md +++ b/README.md @@ -47,7 +47,7 @@ following command: There are some other branches under development. Try the following command and see the list of branches: - $ git .... + $ git branch -r ## mruby home-page -- cgit v1.2.3 From 984e188bbe17f0f4007fc9ab9b1c75a3cf0b09de Mon Sep 17 00:00:00 2001 From: Yukihiro Matsumoto Date: Sat, 21 Apr 2012 01:21:41 +0900 Subject: update licensing issue and how to contribute --- COPYING | 56 -------------------------------------------------------- COPYING.ja | 52 ---------------------------------------------------- LEGAL | 2 +- README | 2 +- README.ja | 2 +- README.md | 42 +++++++++++++++++++++++++----------------- 6 files changed, 28 insertions(+), 128 deletions(-) delete mode 100644 COPYING delete mode 100644 COPYING.ja (limited to 'README') diff --git a/COPYING b/COPYING deleted file mode 100644 index 0d14af350..000000000 --- a/COPYING +++ /dev/null @@ -1,56 +0,0 @@ -mruby is copyrighted free software by mruby developers . -You can redistribute it and/or modify it under either the terms of the -MIT license (see the file MITL), 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) give non-standard binaries non-standard names, with - instructions on where to get the original software distribution. - - d) make other distribution arrangements with the author. - - 3. You may distribute the software in object code or binary form, - provided that you do at least ONE of the following: - - a) distribute the binaries 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 binaries 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 these terms. - - For the list of those files and their copying conditions, see the - file LEGAL. - - 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. diff --git a/COPYING.ja b/COPYING.ja deleted file mode 100644 index 4210acb96..000000000 --- a/COPYING.ja +++ /dev/null @@ -1,52 +0,0 @@ -本プログラムはフリーソフトウェアです.MITライセンス -または以下に示す条件で本プログラムを再配布できます -MITライセンスについてはMTILファイル(参考訳:MITL.ja)を -参照して下さい. - - 1. 複製は制限なく自由です. - - 2. 以下の条件のいずれかを満たす時に本プログラムのソースを - 自由に変更できます. - - (a) ネットニューズにポストしたり,作者に変更を送付する - などの方法で,変更を公開する. - - (b) 変更した本プログラムを自分の所属する組織内部だけで - 使う. - - (c) 変更点を明示したうえ,ソフトウェアの名前を変更する. - そのソフトウェアを配布する時には変更前の本プログラ - ムも同時に配布する.または変更前の本プログラムのソー - スの入手法を明示する. - - (d) その他の変更条件を作者と合意する. - - 3. 以下の条件のいずれかを満たす時に本プログラムをコンパイ - ルしたオブジェクトコードや実行形式でも配布できます. - - (a) バイナリを受け取った人がソースを入手できるように, - ソースの入手法を明示する. - - (b) 機械可読なソースコードを添付する. - - (c) 変更を行ったバイナリは名前を変更したうえ,オリジナ - ルのソースコードの入手法を明示する. - - (d) その他の配布条件を作者と合意する. - - 4. 他のプログラムへの引用はいかなる目的であれ自由です.た - だし,本プログラムに含まれる他の作者によるコードは,そ - れぞれの作者の意向による制限が加えられる場合があります. - - それらファイルの一覧とそれぞれの配布条件などに付いては - LEGALファイルを参照してください. - - 5. 本プログラムへの入力となるスクリプトおよび,本プログラ - ムからの出力の権利は本プログラムの作者ではなく,それぞ - れの入出力を生成した人に属します.また,本プログラムに - 組み込まれるための拡張ライブラリについても同様です. - - 6. 本プログラムは無保証です.作者は本プログラムをサポート - する意志はありますが,プログラム自身のバグあるいは本プ - ログラムの実行などから発生するいかなる損害に対しても責 - 任を持ちません. diff --git a/LEGAL b/LEGAL index 7b072b0b8..036b35a95 100644 --- a/LEGAL +++ b/LEGAL @@ -2,7 +2,7 @@ LEGAL NOTICE INFORMATION ------------------------ All the files in this distribution are covered under the MIT license -(see the file COPYING) except some files mentioned below: +(see the file MITL) except some files mentioned below: (Currently no items are listed.) diff --git a/README b/README index bfcd138cc..d974e1716 100644 --- a/README +++ b/README @@ -68,7 +68,7 @@ See the file INSTALL. * Copying -See the file COPYING. +See the file MITL. * About Contribution diff --git a/README.ja b/README.ja index 18ef16d13..6332bde85 100644 --- a/README.ja +++ b/README.ja @@ -77,7 +77,7 @@ INSTALL.ja ファイルを参照してください。 * 配布条件 -COPYING.ja ファイルを参照してください。 +MITL.ja ファイルを参照してください。 * コントリビュートについて diff --git a/README.md b/README.md index 210c1502c..040be1ff3 100644 --- a/README.md +++ b/README.md @@ -69,14 +69,30 @@ To subscribe to the mruby mailing list....[T.B.D.] See the INSTALL file. -## Copying +## License -See the COPYING file. +Copyright (c) 2012 mruby developers +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: -## About Contribution +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. + +## Note for License -Thank you for considering contributing to mruby. mruby has chosen a MIT License due to its permissive license allowing developers to target various environments such as embedded systems. However, the license requires the display of the copyright notice and license @@ -90,18 +106,10 @@ In the future, mruby might ask you to distribute your new code (We did not intend for contributors to transfer or waive their copyrights, Actual copyright holder name (contributors) will be listed in the AUTHORS file.) -Please ask us if you want to distribute your code under another license -or if your code is derived from GPL code. - - -## The Author - -See the file AUTHORS. - - -Feel free to send comments and bug reports to the author. Here is the -author's latest mail address: - - devel@mruby.org +Please ask us if you want to distribute your code under another license. +## How to Contribute +Send pull request to . We consider you have granted +non-exclusive right to your contributed code under MIT license. If you want to be named +as one of mruby developers, include update to the AUTHORS file in your pull request. -- cgit v1.2.3 From 9718925f1308e99ef4fc44b20e502836e2a94be9 Mon Sep 17 00:00:00 2001 From: Yukihiro Matsumoto Date: Sat, 21 Apr 2012 01:32:19 +0900 Subject: remove plain README file --- README | 108 ----------------------------------------------------------------- 1 file changed, 108 deletions(-) delete mode 100644 README (limited to 'README') diff --git a/README b/README deleted file mode 100644 index d974e1716..000000000 --- a/README +++ /dev/null @@ -1,108 +0,0 @@ -!!Notice!! - This is a preliminary release for internal team reviewing. - The URL and address discribed below are not available yet. - The official release will be announced later. Thanks. - Any suggestion of the modification are welcome, - but the response might be delayed. Sorry for that in advance. - -* What's mruby - -mruby is the light-weight implementation of the Ruby language complied to -the ISO standard to execute various environments. It can run in 'interpreter -form' or 'compile and execute on vm form' according to its module construction. - -This achievement is due to the Regional Innovation Creation R&D Programs of -the Ministry of Economy, Trade and Industry of Japan. - - -* Features of mruby - - |FIXME: - | + Simple Syntax - | + *Normal* Object-Oriented features(ex. class, method calls) - | + *Advanced* Object-Oriented features(ex. Mix-in, Singleton-method) - | + Operator Overloading - | + Exception Handling - | + Iterators and Closures - | + Garbage Collection - | + Dynamic Loading of Object files(on some architecture) - | + Highly Portable (works on many Unix-like/POSIX compatible platforms - | as well as Windows, Mac OS X, BeOS etc.) - | cf. http://redmine.ruby-lang.org/wiki/ruby-19/SupportedPlatforms - - -* How to get mruby - -The mruby distribution files can be found in the following site: - - https://github.com/mruby/mruby/zipball/master - -The trunk of the mruby source tree can be checked out with the -following command: - - $ git clone https://github.com/mruby/mruby.git - -There are some other branches under development. Try the following -command and see the list of branches: - - $ git branch -r - - -* mruby home-page (sorry, it's not launched yet. we're working on this) - -The URL of the mruby home-page is: - - http://www.mruby.org/ - - -* Mailing list - -There is a mailing list to talk about mruby. -To subscribe this list....[T.B.D.] - - -* How to compile and install - -See the file INSTALL. - - -* Copying - -See the file MITL. - - -* About Contribution - -Thank you for considering of contribution for mruby. -mruby has chosen a MIT License as comparatively loose condition, -to expect to apply into various environment such as embedded system. -However, the license requires to display copyright notice and license -sentenses, for example manual or so. Especially for the recent bigger -system, it is comlecated or very troublesome. -So, mruby has decided to display "mruby developers" as copyright name -to make it simple conventionally. -In the future, mruby might ask you to distribute your new codes -(that you will commit,) under MIT License as a member of -"mruby developers" with keeping copyright of you. -(We did not intend you to transfer or waive your copyright, - Actual copyright holder name, you, will be listed in AUTHORS file.) - -Please ask us if you want to distribute your code under other license -or if your code is derived from GPL code. - - -* The Author - -See the file AUTHORS. - - -Feel free to send comments and bug reports to the author. Here is the -author's latest mail address: - - devel@mruby.org - -------------------------------------------------------- -created at: Fri Apr 20 11:57:36 JST 2012 -Local variables: -mode: indented-text -end: -- cgit v1.2.3