From bc9566eb64b2506378d7987c3e2a61ae409bfa60 Mon Sep 17 00:00:00 2001
From: mimaki <hiroshi.mimaki@gmail.com>
Date: Sun, 1 Nov 2020 13:42:35 +0900
Subject: Add `preview` to version.

---
 include/mruby/version.h | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/include/mruby/version.h b/include/mruby/version.h
index 490a6f456..3385fce4e 100644
--- a/include/mruby/version.h
+++ b/include/mruby/version.h
@@ -49,6 +49,24 @@ MRB_BEGIN_DECL
  */
 #define MRUBY_RELEASE_TEENY 0
 
+/*
+ * Patch level.
+ */
+#define MRUBY_PATCHLEVEL -1
+
+/*
+ * Patch level string. (optional)
+ */
+#define MRUBY_PATCHLEVEL_STR "preview"
+
+#ifndef MRUBY_PATCHLEVEL_STR
+# if MRUBY_PATCHLEVEL < 0
+#   define MRUBY_PATCHLEVEL_STR "dev"
+# else
+#   define MRUBY_PATCHLEVEL_STR "p"MRB_STRINGIZE(MRUBY_PATCHLEVEL)
+# endif
+#endif
+
 /*
  * The mruby version.
  */
@@ -108,6 +126,7 @@ MRB_BEGIN_DECL
  */
 #define MRUBY_DESCRIPTION     \
   "mruby " MRUBY_VERSION      \
+  MRUBY_PATCHLEVEL_STR        \
   " (" MRUBY_RELEASE_DATE ")" \
 
 /*
-- 
cgit v1.2.3


From 943029954fea3d14d720b5a9f5412e55c7ba704b Mon Sep 17 00:00:00 2001
From: mimaki <hiroshi.mimaki@gmail.com>
Date: Sun, 1 Nov 2020 14:19:19 +0900
Subject: Fix `mruby -v option` test.

---
 mrbgems/mruby-bin-mruby/bintest/mruby.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mrbgems/mruby-bin-mruby/bintest/mruby.rb b/mrbgems/mruby-bin-mruby/bintest/mruby.rb
index a04093529..e8b4c6d0f 100644
--- a/mrbgems/mruby-bin-mruby/bintest/mruby.rb
+++ b/mrbgems/mruby-bin-mruby/bintest/mruby.rb
@@ -129,7 +129,7 @@ assert('mruby -r option (file not found)') do
 end
 
 assert('mruby -v option') do
-  ver_re = '\Amruby \d+\.\d+\.\d+ \(\d+-\d+-\d+\)\n'
+  ver_re = '\Amruby \d+\.\d+\.\d+.* \(\d+-\d+-\d+\)\n'
   assert_mruby(/#{ver_re}\z/, "", true, %w[-v])
   assert_mruby(/#{ver_re}^[^\n]*NODE.*\n:end\n\z/m, "", true, %w[-v -e p(:end)])
 end
-- 
cgit v1.2.3