summaryrefslogtreecommitdiff
path: root/version.c
diff options
context:
space:
mode:
Diffstat (limited to 'version.c')
-rw-r--r--version.c131
1 files changed, 103 insertions, 28 deletions
diff --git a/version.c b/version.c
index 49738211a4..e719a59da2 100644
--- a/version.c
+++ b/version.c
@@ -9,16 +9,36 @@
**********************************************************************/
+#include "internal/cmdlineopt.h"
#include "ruby/ruby.h"
#include "version.h"
#include "vm_core.h"
-#include "mjit.h"
+#include "rjit.h"
+#include "yjit.h"
#include <stdio.h>
#ifndef EXIT_SUCCESS
#define EXIT_SUCCESS 0
#endif
+#ifdef RUBY_REVISION
+# if RUBY_PATCHLEVEL == -1
+# ifndef RUBY_BRANCH_NAME
+# define RUBY_BRANCH_NAME "master"
+# endif
+# define RUBY_REVISION_STR " "RUBY_BRANCH_NAME" "RUBY_REVISION
+# else
+# define RUBY_REVISION_STR " revision "RUBY_REVISION
+# endif
+#else
+# define RUBY_REVISION "HEAD"
+# define RUBY_REVISION_STR ""
+#endif
+#if !defined RUBY_RELEASE_DATETIME || RUBY_PATCHLEVEL != -1
+# undef RUBY_RELEASE_DATETIME
+# define RUBY_RELEASE_DATETIME RUBY_RELEASE_DATE
+#endif
+
#define PRINT(type) puts(ruby_##type)
#define MKSTR(type) rb_obj_freeze(rb_usascii_str_new_static(ruby_##type, sizeof(ruby_##type)-1))
#define MKINT(name) INT2FIX(ruby_##name)
@@ -35,27 +55,44 @@ const int ruby_api_version[] = {
#ifndef RUBY_FULL_REVISION
# define RUBY_FULL_REVISION RUBY_REVISION
#endif
+#ifdef YJIT_SUPPORT
+#define YJIT_DESCRIPTION " +YJIT " STRINGIZE(YJIT_SUPPORT)
+#else
+#define YJIT_DESCRIPTION " +YJIT"
+#endif
const char ruby_version[] = RUBY_VERSION;
const char ruby_revision[] = RUBY_FULL_REVISION;
const char ruby_release_date[] = RUBY_RELEASE_DATE;
const char ruby_platform[] = RUBY_PLATFORM;
const int ruby_patchlevel = RUBY_PATCHLEVEL;
-const char ruby_description[] = RUBY_DESCRIPTION_WITH("");
-static const char ruby_description_with_jit[] = RUBY_DESCRIPTION_WITH(" +JIT");
-const char ruby_copyright[] = RUBY_COPYRIGHT;
+const char ruby_description[] =
+ "ruby " RUBY_VERSION RUBY_PATCHLEVEL_STR " "
+ "(" RUBY_RELEASE_DATETIME RUBY_REVISION_STR ") "
+ "[" RUBY_PLATFORM "]";
+static const int ruby_description_opt_point =
+ (int)(sizeof(ruby_description) - sizeof(" [" RUBY_PLATFORM "]"));
+
+const char ruby_copyright[] = "ruby - Copyright (C) "
+ RUBY_BIRTH_YEAR_STR "-" RUBY_RELEASE_YEAR_STR " "
+ RUBY_AUTHOR;
const char ruby_engine[] = "ruby";
+// Might change after initialization
+const char *rb_dynamic_description = ruby_description;
+
/*! Defines platform-depended Ruby-level constants */
void
Init_version(void)
{
enum {ruby_patchlevel = RUBY_PATCHLEVEL};
- VALUE version;
- VALUE ruby_engine_name;
+ VALUE version = MKSTR(version);
+ VALUE ruby_engine_name = MKSTR(engine);
+ // MKSTR macro is a marker for fake.rb
+
/*
* The running version of ruby
*/
- rb_define_global_const("RUBY_VERSION", (version = MKSTR(version)));
+ rb_define_global_const("RUBY_VERSION", /* MKSTR(version) */ version);
/*
* The date this ruby was released
*/
@@ -80,33 +117,58 @@ Init_version(void)
/*
* The engine or interpreter this ruby uses.
*/
- rb_define_global_const("RUBY_ENGINE", ruby_engine_name = MKSTR(engine));
+ rb_define_global_const("RUBY_ENGINE", /* MKSTR(engine) */ ruby_engine_name);
ruby_set_script_name(ruby_engine_name);
/*
* The version of the engine or interpreter this ruby uses.
*/
- rb_define_global_const("RUBY_ENGINE_VERSION", (1 ? version : MKSTR(version)));
+ rb_define_global_const("RUBY_ENGINE_VERSION", /* MKSTR(version) */ version);
rb_provide("ruby2_keywords.rb");
}
-#if USE_MJIT
-#define MJIT_OPTS_ON mjit_opts.on
+#if USE_RJIT
+#define RJIT_OPTS_ON opt->rjit.on
#else
-#define MJIT_OPTS_ON 0
+#define RJIT_OPTS_ON 0
#endif
-void
-Init_ruby_description(void)
-{
- VALUE description;
+#if USE_YJIT
+#define YJIT_OPTS_ON opt->yjit
+#else
+#define YJIT_OPTS_ON 0
+#endif
- if (MJIT_OPTS_ON) {
- description = MKSTR(description_with_jit);
- }
- else {
- description = MKSTR(description);
- }
+int ruby_mn_threads_enabled;
+
+bool * rb_ruby_prism_ptr(void);
+
+static void
+define_ruby_description(const char *const jit_opt)
+{
+ static char desc[
+ sizeof(ruby_description)
+ + rb_strlen_lit(YJIT_DESCRIPTION)
+ + rb_strlen_lit(" +MN")
+ ];
+
+ const char *const threads_opt = ruby_mn_threads_enabled ? " +MN" : "";
+ const char *const parser_opt = (*rb_ruby_prism_ptr()) ? " +PRISM" : "";
+
+ int n = snprintf(desc, sizeof(desc),
+ "%.*s"
+ "%s" // jit_opt
+ "%s" // threads_opts
+ "%s" // parser_opt
+ "%s",
+ ruby_description_opt_point, ruby_description,
+ jit_opt,
+ threads_opt,
+ parser_opt,
+ ruby_description + ruby_description_opt_point);
+
+ VALUE description = rb_obj_freeze(rb_usascii_str_new_static(desc, n));
+ rb_dynamic_description = desc;
/*
* The full ruby version string, like <tt>ruby -v</tt> prints
@@ -115,14 +177,27 @@ Init_ruby_description(void)
}
void
+Init_ruby_description(ruby_cmdline_options_t *opt)
+{
+ const char *const jit_opt =
+ RJIT_OPTS_ON ? " +RJIT" :
+ YJIT_OPTS_ON ? YJIT_DESCRIPTION :
+ "";
+ define_ruby_description(jit_opt);
+}
+
+void
+ruby_set_yjit_description(void)
+{
+ rb_const_remove(rb_cObject, rb_intern("RUBY_DESCRIPTION"));
+ define_ruby_description(YJIT_DESCRIPTION);
+}
+
+void
ruby_show_version(void)
{
- if (MJIT_OPTS_ON) {
- PRINT(description_with_jit);
- }
- else {
- PRINT(description);
- }
+ puts(rb_dynamic_description);
+
#ifdef RUBY_LAST_COMMIT_TITLE
fputs("last_commit=" RUBY_LAST_COMMIT_TITLE, stdout);
#endif