1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* ruby.c (proc_options): add --gem=enabled as an alias of

Browse Source 
--enable=gems and --gem=disabled as an alias of --disable=gems.
  Gem named "enabled" or "disabled" has already been reserved
  legitimately for this purpose.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@30844 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
yugui 2011-02-11 15:03:51 +00:00
parent 698960439d
commit f17b469860
2 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
Fri Feb 11 23:27:50 2011 Yuki Sonoda (Yugui) <yugui@yugui.jp>
* ruby.c (proc_options): add --gem=enabled as an alias of
--enable=gems and --gem=disabled as an alias of --disable=gems.
Gem named "enabled" or "disabled" has already been reserved
legitimately for this purpose.
Fri Feb 11 23:17:04 2011 Tanaka Akira <akr@fsij.org> Fri Feb 11 23:17:04 2011 Tanaka Akira <akr@fsij.org>
* ext/dl/cfunc.c: parenthesize macro arguments. * ext/dl/cfunc.c: parenthesize macro arguments.

8
ruby.c
View File

@ -1072,8 +1072,16 @@ proc_options(long argc, char **argv, struct cmdline_options *opt, int envopt)
add_modules(&opt->req_list, s); add_modules(&opt->req_list, s);
} }
else if (is_option_with_arg("gem", Qfalse, Qtrue)) { else if (is_option_with_arg("gem", Qfalse, Qtrue)) {
if (strcmp("disabled", s) == 0) {
opt->disable |= DISABLE_BIT(gems);
}
else if (strcmp("enabled", s) == 0) {
opt->disable &= ~DISABLE_BIT(gems);
}
else {
add_gems(&opt->req_list, s); add_gems(&opt->req_list, s);
} }
}
else if (strcmp("version", s) == 0) { else if (strcmp("version", s) == 0) {
if (envopt) goto noenvopt_long; if (envopt) goto noenvopt_long;
opt->dump |= DUMP_BIT(version); opt->dump |= DUMP_BIT(version);