admin/mruby-mruby
1
0
Fork 0
mirror of https://github.com/mruby/mruby synced 2026-06-08 16:11:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

move version info from gems to core; ref #576 #1684

Browse Source
This commit is contained in:
Yukihiro "Matz" Matsumoto
2014-02-07 12:18:55 +09:00
parent c3f02afa21
commit 3ff9aad22f
7 changed files with 6 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mrbgems/default.gembox
-3
View File
@@ -58,7 +58,4 @@ MRuby::GemBox.new do |conf|
# Generate mruby command
conf.gem :core => "mruby-bin-mruby"
# Use mruby verison
conf.gem :core => "mruby-version"
end
mrbgems/mruby-version/mrbgem.rake
-4
View File
@@ -1,4 +0,0 @@
MRuby::Gem::Specification.new('mruby-version') do |spec|
spec.license = 'MIT'
spec.author = 'mruby developers'
end
mrbgems/mruby-version/src/version.c
-18
View File
@@ -1,18 +0,0 @@
#include "mruby.h"
#include "mruby/variable.h"
#include "version.h"
void
mrb_mruby_version_gem_init(mrb_state* mrb)
{
mrb_define_global_const(mrb, "MRUBY_VERSION", mrb_str_new_lit(mrb, MRUBY_VERSION));
mrb_define_global_const(mrb, "MRUBY_RELEASE_DATE", mrb_str_new_lit(mrb, MRUBY_RELEASE_DATE));
mrb_define_global_const(mrb, "MRUBY_DESCRIPTION", mrb_str_new_lit(mrb, MRUBY_DESCRIPTION));
mrb_define_global_const(mrb, "MRUBY_COPYRIGHT", mrb_str_new_lit(mrb, MRUBY_COPYRIGHT));
}
void
mrb_mruby_version_gem_final(mrb_state* mrb)
{
}
mrbgems/mruby-version/src/version.h
-25
View File
@@ -1,25 +0,0 @@
#define MRUBY_VERSION "v1.0.0"
#define MRUBY_PATCHLEVEL 0
#define MRUBY_REVISION 0
#define MRUBY_RELEASE_DATE "2014-01-10"
#define MRUBY_RELEASE_YEAR 2014
#define MRUBY_RELEASE_MONTH 1
#define MRUBY_RELEASE_DAY 10
#define MRUBY_BIRTH_YEAR 2010
#define MRUBY_AUTHOR "mruby developers"
#define STRINGIZE0(expr) #expr
#define STRINGIZE(expr) STRINGIZE0(expr)
#define MRUBY_DESCRIPTION \
"mruby "MRUBY_VERSION \
" ("MRUBY_RELEASE_DATE") "
#define MRUBY_COPYRIGHT \
"mruby - Copyright (c) " \
STRINGIZE(MRUBY_BIRTH_YEAR)"-" \
STRINGIZE(MRUBY_RELEASE_YEAR)" " \
MRUBY_AUTHOR
mrblib/kernel.rb
-2
View File
@@ -49,5 +49,3 @@ module Kernel
!(self =~ y)
end
end
RUBY_VERSION = "1.9"
src/init.c
+2
View File
@@ -22,6 +22,7 @@ void mrb_init_numeric(mrb_state*);
void mrb_init_range(mrb_state*);
void mrb_init_gc(mrb_state*);
void mrb_init_math(mrb_state*);
void mrb_init_version(mrb_state*);
void mrb_init_mrblib(mrb_state*);
void mrb_init_mrbgems(mrb_state*);
void mrb_final_mrbgems(mrb_state*);
@@ -47,6 +48,7 @@ mrb_init_core(mrb_state *mrb)
mrb_init_numeric(mrb); DONE;
mrb_init_range(mrb); DONE;
mrb_init_gc(mrb); DONE;
mrb_init_version(mrb); DONE;
mrb_init_mrblib(mrb); DONE;
#ifndef DISABLE_GEMS
mrb_init_mrbgems(mrb); DONE;
src/print.c
+4 -16
View File
@@ -54,31 +54,19 @@ mrb_print_error(mrb_state *mrb)
void
mrb_show_version(mrb_state *mrb)
{
static const char version_msg[] = "mruby - Embeddable Ruby Copyright (c) 2010-2014 mruby developers\n";
mrb_value msg;
if (mrb_const_defined(mrb, mrb_obj_value(mrb->object_class), mrb_intern_lit(mrb, "MRUBY_DESCRIPTION"))) {
msg = mrb_const_get(mrb, mrb_obj_value(mrb->object_class), mrb_intern_lit(mrb, "MRUBY_DESCRIPTION"));
msg = mrb_funcall(mrb, msg, "+", 1, mrb_str_new_lit(mrb, "\n"));
}
else {
msg = mrb_str_new_lit(mrb, version_msg);
}
msg = mrb_const_get(mrb, mrb_obj_value(mrb->object_class), mrb_intern_lit(mrb, "MRUBY_DESCRIPTION"));
printstr(mrb, msg);
printstr(mrb, mrb_str_new_lit(mrb, "\n"));
}
void
mrb_show_copyright(mrb_state *mrb)
{
static const char copyright_msg[] = "mruby - Copyright (c) 2010-2014 mruby developers\n";
mrb_value msg;
if (mrb_const_defined(mrb, mrb_obj_value(mrb->object_class), mrb_intern_lit(mrb, "MRUBY_COPYRIGHT"))) {
msg = mrb_const_get(mrb, mrb_obj_value(mrb->object_class), mrb_intern_lit(mrb, "MRUBY_COPYRIGHT"));
msg = mrb_funcall(mrb, msg, "+", 1, mrb_str_new_lit(mrb, "\n"));
}
else {
msg = mrb_str_new_lit(mrb, copyright_msg);
}
msg = mrb_const_get(mrb, mrb_obj_value(mrb->object_class), mrb_intern_lit(mrb, "MRUBY_COPYRIGHT"));
printstr(mrb, msg);
printstr(mrb, mrb_str_new_lit(mrb, "\n"));
}