summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorYukihiro "Matz" Matsumoto <[email protected]>2018-12-11 11:52:33 +0900
committerGitHub <[email protected]>2018-12-11 11:52:33 +0900
commit730b9253321f422a1423f42c81b06dc5ba7fb546 (patch)
tree454b5cd118d9dcccb5cb63611d85f7b9ba2ff691
parent60da293d5c4f4d00798f06ad955ea12311b6fd68 (diff)
parent1c09046c13fc0a763583c6da0f1d350f6c41c4ca (diff)
downloadmruby-730b9253321f422a1423f42c81b06dc5ba7fb546.tar.gz
mruby-730b9253321f422a1423f42c81b06dc5ba7fb546.zip
Merge pull request #4184 from mruby/stable
Release mruby 2.0.0
-rw-r--r--README.md2
-rw-r--r--doc/guides/debugger.md2
-rw-r--r--doc/limitations.md14
-rw-r--r--include/mruby/version.h4
-rw-r--r--mrbgems/mruby-bin-mirb/tools/mirb/mirb.c2
-rw-r--r--mrbgems/mruby-bin-mruby/tools/mruby/mruby.c2
-rw-r--r--mrbgems/mruby-socket/src/socket.c1
7 files changed, 14 insertions, 13 deletions
diff --git a/README.md b/README.md
index 529091bdc..e43510ebe 100644
--- a/README.md
+++ b/README.md
@@ -17,7 +17,7 @@ of the Ministry of Economy, Trade and Industry of Japan.
## How to get mruby
-The stable version 1.4.1 of mruby can be downloaded via the following URL: [https://github.com/mruby/mruby/archive/1.4.1.zip](https://github.com/mruby/mruby/archive/1.4.1.zip)
+The stable version 2.0.0 of mruby can be downloaded via the following URL: [https://github.com/mruby/mruby/archive/2.0.0.zip](https://github.com/mruby/mruby/archive/2.0.0.zip)
The latest development version of mruby can be downloaded via the following URL: [https://github.com/mruby/mruby/zipball/master](https://github.com/mruby/mruby/zipball/master)
diff --git a/doc/guides/debugger.md b/doc/guides/debugger.md
index 1cc7a9a39..b433a5ac5 100644
--- a/doc/guides/debugger.md
+++ b/doc/guides/debugger.md
@@ -38,7 +38,7 @@ To confirm mrdb was installed properly, run mrdb with the `--version` option:
```bash
$ mrdb --version
-mruby 1.4.1 (2018-4-27)
+mruby 2.0.0 (2018-12-11)
```
## 2.2 Basic Operation
diff --git a/doc/limitations.md b/doc/limitations.md
index 825435f01..23017ccbe 100644
--- a/doc/limitations.md
+++ b/doc/limitations.md
@@ -38,7 +38,7 @@ puts [1,2,3]
3
```
-#### mruby [1.4.1 (2018-4-27)]
+#### mruby [2.0.0 (2018-12-11)]
```
[1, 2, 3]
@@ -61,7 +61,7 @@ end
```ZeroDivisionError``` is raised.
-#### mruby [1.4.1 (2018-4-27)]
+#### mruby [2.0.0 (2018-12-11)]
No exception is raised.
@@ -119,7 +119,7 @@ false
true
```
-#### mruby [1.4.1 (2018-4-27)]
+#### mruby [2.0.0 (2018-12-11)]
```
true
@@ -142,7 +142,7 @@ defined?(Foo)
nil
```
-#### mruby [1.4.1 (2018-4-27)]
+#### mruby [2.0.0 (2018-12-11)]
```NameError``` is raised.
@@ -159,7 +159,7 @@ alias $a $__a__
``` nil ```
-#### mruby [1.4.1 (2018-4-27)]
+#### mruby [2.0.0 (2018-12-11)]
Syntax error
@@ -181,7 +181,7 @@ end
```ArgumentError``` is raised.
The re-defined ```+``` operator does not accept any arguments.
-#### mruby [1.4.1 (2018-4-27)]
+#### mruby [2.0.0 (2018-12-11)]
``` 'ab' ```
Behavior of the operator wasn't changed.
@@ -197,7 +197,7 @@ $ ruby -e 'puts Proc.new {}.binding'
#<Binding:0x00000e9deabb9950>
```
-#### mruby [1.4.1 (2018-4-27)]
+#### mruby [2.0.0 (2018-12-11)]
```
$ ./bin/mruby -e 'puts Proc.new {}.binding'
diff --git a/include/mruby/version.h b/include/mruby/version.h
index daeca4b75..680533ab4 100644
--- a/include/mruby/version.h
+++ b/include/mruby/version.h
@@ -67,12 +67,12 @@ MRB_BEGIN_DECL
/*
* Release month.
*/
-#define MRUBY_RELEASE_MONTH 4
+#define MRUBY_RELEASE_MONTH 12
/*
* Release day.
*/
-#define MRUBY_RELEASE_DAY 27
+#define MRUBY_RELEASE_DAY 11
/*
* Release date as a string.
diff --git a/mrbgems/mruby-bin-mirb/tools/mirb/mirb.c b/mrbgems/mruby-bin-mirb/tools/mirb/mirb.c
index 8d7c719d8..9519d88bb 100644
--- a/mrbgems/mruby-bin-mirb/tools/mirb/mirb.c
+++ b/mrbgems/mruby-bin-mirb/tools/mirb/mirb.c
@@ -230,7 +230,7 @@ usage(const char *name)
{
static const char *const usage_msg[] = {
"switches:",
- "-d set $DEBUG to true (same as `mruby -d`)"
+ "-d set $DEBUG to true (same as `mruby -d`)",
"-r library same as `mruby -r`",
"-v print version number, then run in verbose mode",
"--verbose run in verbose mode",
diff --git a/mrbgems/mruby-bin-mruby/tools/mruby/mruby.c b/mrbgems/mruby-bin-mruby/tools/mruby/mruby.c
index caf8e78c2..498bedef2 100644
--- a/mrbgems/mruby-bin-mruby/tools/mruby/mruby.c
+++ b/mrbgems/mruby-bin-mruby/tools/mruby/mruby.c
@@ -41,7 +41,7 @@ usage(const char *name)
"switches:",
"-b load and execute RiteBinary (mrb) file",
"-c check syntax only",
- "-d set debugging flags (set $DEBUG to true)"
+ "-d set debugging flags (set $DEBUG to true)",
"-e 'command' one line of script",
"-r library load the library before executing your script",
"-v print version number, then run in verbose mode",
diff --git a/mrbgems/mruby-socket/src/socket.c b/mrbgems/mruby-socket/src/socket.c
index b44371544..dff176778 100644
--- a/mrbgems/mruby-socket/src/socket.c
+++ b/mrbgems/mruby-socket/src/socket.c
@@ -10,6 +10,7 @@
#include <winsock2.h>
#include <ws2tcpip.h>
#include <windows.h>
+ #include <winerror.h>
#define SHUT_RDWR SD_BOTH
#ifndef _SSIZE_T_DEFINED