Skip to content
Browse files

Removed shyouhei/mputs interpreter install as it is no longer necessa…

…ry or maintained given the official ruby github mirror.
  • Loading branch information...
1 parent 59b4f21 commit 05effeab4ca956181f479e25052e62d0e3c72fa8 @wayneeseguin wayneeseguin committed
Showing with 7 additions and 154 deletions.
  1. +0 −1 README
  2. +0 −2 binscripts/rvm-prompt
  3. +0 −1 config/db
  4. +0 −3 config/known
  5. +0 −3 docs/rvm.txt
  6. +1 −1 lib/rvm/install_command_dumper.rb
  7. +0 −5 man/man1/rvm.1
  8. +2 −2 scripts/cli
  9. +1 −1 scripts/install
  10. +1 −119 scripts/manage
  11. +1 −1 scripts/rubygems
  12. +1 −11 scripts/selector
  13. +0 −3 test/rubies/mput-head
  14. +0 −1 test/unit/selector_test
View
1 README
@@ -116,7 +116,6 @@ Implementation
macruby - MacRuby, insanely fast, can make real apps (Mac OS X Only).
maglev - GemStone Ruby, awesome persistent ruby object store.
ironruby - IronRuby, NOT supported yet. Looking for volunteers to help.
- mput - shyouhei(mput)'s github repository, popular in Japan :)
system - use the system ruby (eg. pre-rvm state)
default - use rvm set default ruby and system if it hasn't been set.
http://rvm.beginrescueend.com/rubies/default/
View
2 binscripts/rvm-prompt
@@ -148,8 +148,6 @@ if [[ -n "$ruby" && -n "$(echo "$ruby" | awk '/rvm/{print}')" ]] ; then
ironruby) unicode="" ;;
- mput) unicode="" ;;
-
system) unicode="" ;;
ruby)
View
1 config/db
@@ -52,7 +52,6 @@ macruby_nightly_url=http://www.macruby.org/files/nightlies/macruby_nightly-lates
maglev_version=24566
maglev_url=http://glass-downloads.gemstone.com/maglev
maglev_repo_url=git://github.com/MagLev/maglev.git
-shyouhei_repo_url=git://github.com/shyouhei/ruby.git
ironruby_version=1.0
ironruby_repo_url=git://github.com/ironruby/ironruby.git
ironruby_1.0_url=http://rubyforge.org/frs/download.php/70179/
View
3 config/known
@@ -41,9 +41,6 @@ ree-1.8.7-head
maglev[-24566]
maglev-head
-# Shyouhei head, the default mput
-mput[-head]
-
# Mac OS X Snow Leopard Only
macruby-0.6
macruby-[0.7.1] # the default macruby
View
3 docs/rvm.txt
@@ -235,9 +235,6 @@ IMPLEMENTATION
*ironruby*::
IronRuby, NOT supported yet. Looking for volunteers to help.
-*mput*::
- shyouhei(mput)'s github repository, popular in Japan :)
-
*system*::
Use the system ruby (eg. pre-rvm state).
View
2 lib/rvm/install_command_dumper.rb
@@ -21,7 +21,7 @@ def normalize_argument(arg)
end
def arguments_for_install
- if ruby?(:ruby, :mput, :ree)
+ if ruby?(:ruby, :ree)
begin
require 'rbconfig'
require 'shellwords'
View
5 man/man1/rvm.1
@@ -358,11 +358,6 @@ GemStone Ruby, awesome persistent ruby object store\&.
IronRuby, NOT supported yet\&. Looking for volunteers to help\&.
.RE
.PP
-\fBmput\fR
-.RS 4
-shyouhei(mput)\'s github repository, popular in Japan :)
-.RE
-.PP
\fBsystem\fR
.RS 4
Use the system ruby (eg\&. pre\-rvm state)\&.
View
4 scripts/cli
@@ -68,7 +68,7 @@ __rvm_parse_args()
;;
# Can likely remove this due to the *) case
- jruby*|ree*|macruby*|rbx*|rubinius*|mput*|shyouhei*|ironruby*|default*|maglev*|all)
+ jruby*|ree*|macruby*|rbx*|rubinius*|ironruby*|default*|maglev*|all)
if [[ "rubinius" = "$rvm_token" ]] ; then rvm_token="rbx"; fi
rvm_ruby_interpreter="$rvm_token"
rvm_ruby_string="$rvm_token"
@@ -241,7 +241,7 @@ __rvm_parse_args()
else
case "$next_token" in
- ruby|rbx|jruby|macruby|ree|rubinius|maglev|mput|shyouhei|ironruby)
+ ruby|rbx|jruby|macruby|ree|rubinius|maglev|ironruby)
rvm_ruby_strings=$next_token
rvm_ruby_interpreter=$next_token
if [[ $# -gt 0 ]] ; then next_token="$1" ; shift ; else next_token="" ; fi
View
2 scripts/install
@@ -464,7 +464,7 @@ fi
#
mkdir -p "${rvm_rubies_path:-"$rvm_path/rubies"}/"
-for ruby in $rvm_path/ruby-* $rvm_path/jruby-* $rvm_path/mput-* \
+for ruby in $rvm_path/ruby-* $rvm_path/jruby-* \
$rvm_path/rbx-* $rvm_path/maglev-* $rvm_path/ree-* ; do
if [[ -d "$ruby" ]] ; then
View
120 scripts/manage
@@ -1043,123 +1043,6 @@ RubyWrapper
"Installing $rvm_gem_name to $dir"
;;
- mput|shyouhei)
-
- if [[ ${rvm_make_flags_flag:-0} -eq 1 ]] ; then __rvm_make_flags ; fi
-
- unset GEM_HOME GEM_PATH MY_RUBY_HOME IRBRC
-
- __rvm_remove_rvm_from_path
-
- __rvm_conditionally_add_bin_path ; export PATH
-
- builtin hash -r
-
- rvm_ruby_home="$rvm_path/rubies/$rvm_ruby_interpreter-$rvm_ruby_version"
-
- __rvm_fetch_from_github "mput" "trunk"
-
- __rvm_apply_patches ; result=$?
-
- if [[ "$result" -gt 0 ]] ; then
- "$rvm_path/scripts/log" "error" \
- "There has been an error while trying to apply patches to mput. \
- \nHalting the installation."
- return $result
- fi
-
- if [[ ! -s "${rvm_src_path:-"$rvm_path/src"}/$rvm_ruby_string/configure" ]] ; then
-
- if command -v autoconf &> /dev/null ; then
-
- __rvm_run "autoconf" "autoconf" "Running autoconf"
-
- else
- "$rvm_path/scripts/log" "fail" \
- "rvm expects autoconf to install this ruby interpreter, autoconf was not found in PATH. \
- \nHalting installation."
- return $result
- fi
- fi
-
- if [[ -s ./Makefile && -z "$rvm_reconfigure_flag" ]] ; then
-
- if [[ ${rvm_debug_flag:-0} -gt 0 ]] ; then
- "$rvm_path/scripts/log" "debug" \
- "Skipping configure step, Makefile exists so configure must have already been run."
- fi
-
- elif [[ -n "$rvm_ruby_configure" ]] ; then
-
- __rvm_run "configure" "$rvm_ruby_configure"
- result=$?
-
- if [[ "$result" -gt 0 ]] ; then
- "$rvm_path/scripts/log" "error" \
- "There has been an error while trying to configure the source. \
- \nHalting the installation."
- return $result
- fi
-
- elif [[ -s ./configure ]] ; then
- local configure_command="./configure --prefix=$rvm_ruby_home $rvm_configure_flags"
-
- __rvm_run "configure" "" \
- "Configuring $rvm_ruby_string using $rvm_configure_flags, this may take a while depending on your cpu(s)..."
- result=$?
-
- if [[ "$result" -gt 0 ]] ; then
- "$rvm_path/scripts/log" "error" \
- "There has been an error while trying to configure the source.\
- \nHalting the installation."
- return $result
- fi
-
- else
- "$rvm_path/scripts/log" "error" \
- "Skipping configure step, 'configure' script does not exist, did autoconf not run successfully?"
- fi
-
- rvm_ruby_make=${rvm_ruby_make:-"make"}
-
- __rvm_run "make" "$rvm_ruby_make $rvm_make_flags" \
- "Compiling $rvm_ruby_string, this may take a while depending on your cpu(s)..."
- result=$?
-
- if [[ "$result" -gt 0 ]] ; then
- "$rvm_path/scripts/log" "error" \
- "There has been an error while trying to run make.\
- \nHalting the installation."
- return $result
- fi
-
- rvm_ruby_make_install=${rvm_ruby_make_install:-"make install"}
-
- __rvm_run "install" "$rvm_ruby_make_install" "Installing $rvm_ruby_string"
- result=$?
-
- if [[ "$result" -gt 0 ]] ; then
- "$rvm_path/scripts/log" "error" \
- "There has been an error while trying to run make install. \
- \nHalting the installation."
- return $result
- fi
-
- "$rvm_path/scripts/log" "info" \
- "Installation of $rvm_ruby_string is complete."
-
- export GEM_HOME="$rvm_ruby_gem_home"
- export GEM_PATH="$rvm_ruby_gem_path"
-
- __rvm_rubygems_setup
-
- __rvm_bin_script
-
- __rvm_run "chmod.bin" "chmod +x $rvm_ruby_home/bin/*"
-
- __rvm_post_install
- ;;
-
ruby)
__rvm_check_for_bison # && Run like hell...
@@ -1828,8 +1711,7 @@ __rvm_rubygems_setup()
{
local home path dir directory_name version_number ruby_lib_gem_path
- if [[ -n "$(echo "$rvm_ruby_version" | awk '/^1\.9/')" \
- || -n "$(echo "$rvm_ruby_interpreter" | awk '/^mput/')" ]] ; then
+ if [[ -n "$(echo "$rvm_ruby_version" | awk '/^1\.9/')" ]] ; then
install=0
elif [[ "$rvm_ruby_string" = "ruby-head" ]] ; then
View
2 scripts/rubygems
@@ -12,7 +12,7 @@ rubygems_setup()
unset RUBYOPT
- if [[ ! -z "$(echo "$rvm_ruby_version" | awk '/^1\.9/')" ]] || [[ ! -z "$(echo $rvm_ruby_interpreter | awk '/^mput/')" ]] ; then
+ if [[ -n "$(echo "$rvm_ruby_version" | awk '/^1\.9/')" ]] ; then
install=0
elif [[ "$rvm_ruby_string" = "ruby-head" ]] ; then
install=0
View
12 scripts/selector
@@ -162,16 +162,6 @@ __rvm_select()
fi
;;
- mput|shyouhei)
- rvm_ruby_interpreter="mput"
- rvm_ruby_version="head"
- rvm_ruby_string=$(echo $rvm_ruby_string | sed -e 's/shyouhei/mput/g')
- rvm_ruby_patch_level=""
- rvm_ruby_repo_url=${rvm_mput_repo_url:-"$(__rvm_db "shyouhei_repo_url")"}
- rvm_ruby_url=$rvm_ruby_repo_url
- rvm_ruby_configure="" ; rvm_ruby_make="" ; rvm_ruby_make_install=""
- ;;
-
ruby)
if [[ -z "${rvm_ruby_version:-""}" && ${rvm_head_flag:-0} -eq 0 ]]; then
"$rvm_path/scripts/log" "fail" "Ruby version was not specified!"
@@ -604,7 +594,7 @@ __rvm_ruby_string()
rvm_ruby_name="${string/n/}"
;;
- ruby|rbx|jruby|macruby|ree|rubinius|maglev|mput|shyouhei|ironruby)
+ ruby|rbx|jruby|macruby|ree|rubinius|maglev|ironruby)
rvm_ruby_interpreter="$string"
;;
View
3 test/rubies/mput-head
@@ -1,3 +0,0 @@
-ruby_version=^ruby 1\.9\.\ddev \(\d{4}-\d{2}-\d{2} trunk \d+\)
-gem_home=mput/head
-ruby_home=mput-head
View
1 test/unit/selector_test
@@ -40,7 +40,6 @@ rvm_ruby_string="ree-head" ; valid_string="ree-1.8.7-head" ; heat "rvm_
rvm_ruby_string="jruby-1.4.0" ; valid_string="jruby-1.4.0RC3" ; heat "rvm_ruby_string=$rvm_ruby_string ; __rvm_select" ; validate_select
rvm_ruby_string="jruby-1.3.1" ; valid_string="jruby-1.3.1" ; heat "rvm_ruby_string=$rvm_ruby_string ; __rvm_select" ; validate_select
rvm_ruby_string="jruby" ; valid_string="jruby-1.3.1" ; heat "rvm_ruby_string=$rvm_ruby_string ; __rvm_select" ; validate_select
-rvm_ruby_string="mput" ; valid_string="mput-head" ; heat "rvm_ruby_string=$rvm_ruby_string ; __rvm_select" ; validate_select
valid_string="ruby-1.8.6-p160" ; heat "rvm 1.8.7 -l 160 ; version=\$(ruby -v)"
assert "match" '^ruby 1.8.7 \(2009-04-08 patchlevel 160\)' "$version" ; unset version

0 comments on commit 05effea

Please sign in to comment.
Something went wrong with that request. Please try again.