summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornagachika <nagachika@ruby-lang.org>2022-11-24 19:20:31 +0900
committernagachika <nagachika@ruby-lang.org>2022-11-24 19:20:31 +0900
commit1a6b16756e0ba6b95ab71a441357ed5484e33498 (patch)
tree3af5e7f75d95cf5a0e995bf329504da5d0adfbf0
parent9ca4b96f9e2a1ef0f6000f0a994bc76f7f03a86a (diff)
merge revision(s) 3071a727e081f754e71a9abed8dd19e36bacc785:v3_1_3
Add a comment about confusing code [ci skip] --- configure.ac | 1 + 1 file changed, 1 insertion(+)
-rw-r--r--configure.ac1
-rw-r--r--version.h4
2 files changed, 3 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac
index dac8907a64..fcae66f775 100644
--- a/configure.ac
+++ b/configure.ac
@@ -61,6 +61,7 @@ AC_ARG_WITH(baseruby,
[
AC_PATH_PROG([BASERUBY], [ruby], [false])
])
+# BASERUBY must be >= 2.2.0. Note that `"2.2.0" > "2.2"` is true.
AS_IF([test "$HAVE_BASERUBY" != no -a "`RUBYOPT=- $BASERUBY --disable=gems -e 'print 42 if RUBY_VERSION > "2.2"' 2>/dev/null`" = 42], [
AS_CASE(["$build_os"], [mingw*], [
# Can MSys shell run a command with a drive letter?
diff --git a/version.h b/version.h
index 59f900a601..b0c3e00f03 100644
--- a/version.h
+++ b/version.h
@@ -11,11 +11,11 @@
# define RUBY_VERSION_MINOR RUBY_API_VERSION_MINOR
#define RUBY_VERSION_TEENY 3
#define RUBY_RELEASE_DATE RUBY_RELEASE_YEAR_STR"-"RUBY_RELEASE_MONTH_STR"-"RUBY_RELEASE_DAY_STR
-#define RUBY_PATCHLEVEL 184
+#define RUBY_PATCHLEVEL 185
#define RUBY_RELEASE_YEAR 2022
#define RUBY_RELEASE_MONTH 11
-#define RUBY_RELEASE_DAY 23
+#define RUBY_RELEASE_DAY 24
#include "ruby/version.h"