summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authormimaki <[email protected]>2015-11-17 00:26:53 +0900
committerYukihiro "Matz" Matsumoto <[email protected]>2015-11-17 18:02:30 +0900
commit22464fe5a0a10f2b077eaba109ce1e912e4a77de (patch)
treea1048a97e635b9aa9661334c828c409b79417bcb
parent547a29d2cafcfe62e65290154f87371d190a501c (diff)
downloadmruby-1.2.0.tar.gz
mruby-1.2.0.zip
mruby-1.2.01.2.0
-rw-r--r--AUTHORS2
-rw-r--r--README.md2
-rw-r--r--doc/guides/debugger.md2
-rw-r--r--include/mruby/version.h8
-rw-r--r--test/t/syntax.rb4
5 files changed, 9 insertions, 9 deletions
diff --git a/AUTHORS b/AUTHORS
index cd36a1775..180fd752e 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,6 +1,6 @@
Original Authors "mruby developers" are:
Yukihiro Matsumoto
- FUKUOKA CSK CORPORATION
+ SCSK KYUSHU CORPORATION
Kyushu Institute of Technology
Network Applied Communication Laboratory, Inc.
Daniel Bovensiepen
diff --git a/README.md b/README.md
index 62eca18c9..e57b79bff 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.1.0 of mruby can be downloaded via the following URL: [https://github.com/mruby/mruby/archive/1.1.0.zip](https://github.com/mruby/mruby/archive/1.1.0.zip)
+The stable version 1.2.0 of mruby can be downloaded via the following URL: [https://github.com/mruby/mruby/archive/1.2.0.zip](https://github.com/mruby/mruby/archive/1.2.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 a13e91cec..366701c88 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.1.0 (2014-11-19)
+mruby 1.2.0 (2014-11-17)
```
## 2.2 Basic Operation
diff --git a/include/mruby/version.h b/include/mruby/version.h
index 733863511..ffe81060a 100644
--- a/include/mruby/version.h
+++ b/include/mruby/version.h
@@ -42,12 +42,12 @@ MRB_BEGIN_DECL
/*
* Minor release version number.
*/
-#define MRUBY_RELEASE_MINOR 1
+#define MRUBY_RELEASE_MINOR 2
/*
* Tiny release version number.
*/
-#define MRUBY_RELEASE_TEENY 1
+#define MRUBY_RELEASE_TEENY 0
/*
* The mruby version.
@@ -62,7 +62,7 @@ MRB_BEGIN_DECL
/*
* Release year.
*/
-#define MRUBY_RELEASE_YEAR 2014
+#define MRUBY_RELEASE_YEAR 2015
/*
* Release month.
@@ -72,7 +72,7 @@ MRB_BEGIN_DECL
/*
* Release day.
*/
-#define MRUBY_RELEASE_DAY 19
+#define MRUBY_RELEASE_DAY 17
/*
* Release date as a string.
diff --git a/test/t/syntax.rb b/test/t/syntax.rb
index fb6ffe408..4ba171f9a 100644
--- a/test/t/syntax.rb
+++ b/test/t/syntax.rb
@@ -1,6 +1,6 @@
assert('__FILE__') do
- file = __FILE__.split('test/')[1]
- assert_true 't/syntax.rb' == file || 't\syntax.rb' == file
+ file = __FILE__[-9, 9]
+ assert_equal 'syntax.rb', file
end
assert('__LINE__') do