Commit c152a226 authored by Sam Stephenson's avatar Sam Stephenson
Browse files

Merge branch 'master' into binary-packages

parents 7311e0dc 6b4e36ba

README.md

+11 −0
Original line number Diff line number Diff line
@@ -37,6 +37,17 @@ ruby-build provides an `rbenv-install` command that shortens this to: 


### Version History



#### 20110928



* ruby-build now uses the `--with-gcc` configure flag on OS X Lion.

* Added definitions for REE 1.8.7-2010.02 and 1.8.6-2009.06.

* Modified `rbenv-install` to run `rbenv rehash` after installation.

* Added a Ruby 1.9.3-rc1 definition.

* Updated the JRuby defintions to install the `jruby-launcher` gem.

* Updated the rbx-2.0.0 definition to point to the master branch.

* Added a jruby-1.7.0-dev definition.

* Added a Ruby 1.9.4-dev definition.



#### 20110914



* Added an rbx-2.0.0-dev definition for Rubinius 2.0.0 from git.

bin/ruby-build

+21 −2
Original line number Diff line number Diff line 
#!/usr/bin/env bash



RUBY_BUILD_VERSION="20110914"

RUBY_BUILD_VERSION="20110928"



set -E

exec 3<&2 # preserve original stderr at fd 3
@@ -147,6 +147,25 @@ build_package_rbx() { 
  } >&4 2>&1

}



build_package_jruby() {

  build_package_copy

  cd "${PREFIX_PATH}/bin"

  ln -fs jruby ruby

  install_jruby_launcher

  remove_windows_files

}



install_jruby_launcher() {

  cd "${PREFIX_PATH}/bin"

  { ./ruby gem install jruby-launcher

  } >&4 2>&1

}



remove_windows_files() {

  cd "$PREFIX_PATH"

  rm -f bin/*.exe bin/*.dll bin/*.bat bin/jruby.sh

}



build_package_copy() {

  cp -R . "$PREFIX_PATH"

}

share/ruby-build/1.9.4-dev

0 → 100644
+4 −0
Original line number Diff line number Diff line 
use_gcc42_on_lion

install_package "yaml-0.1.4" "http://pyyaml.org/download/libyaml/yaml-0.1.4.tar.gz"

install_git "ruby-1.9.4-dev" "https://github.com/ruby/ruby.git" "trunk" autoconf standard

install_package "rubygems-1.8.10" "http://production.cf.rubygems.org/rubygems/rubygems-1.8.10.tgz" ruby

share/ruby-build/jruby-1.6.3

+1 −17
Original line number Diff line number Diff line 
after_install_package() {

  shim_jruby

  remove_windows_files

}



shim_jruby() {

  cd "${PREFIX_PATH}/bin"

  sed -i "" 's/^#!\/bin\/bash/#!\/usr\/bin\/env bash/' jruby

  ln -fs jruby ruby

}



remove_windows_files() {

  cd "$PREFIX_PATH"

  rm -f bin/*.exe bin/*.dll bin/*.bat bin/jruby.sh

}



install_package "jruby-1.6.3" "http://jruby.org.s3.amazonaws.com/downloads/1.6.3/jruby-bin-1.6.3.tar.gz" copy

install_package "jruby-1.6.3" "http://jruby.org.s3.amazonaws.com/downloads/1.6.3/jruby-bin-1.6.3.tar.gz" jruby

install_package "rubygems-1.6.2" "http://production.cf.rubygems.org/rubygems/rubygems-1.6.2.tgz" ruby

share/ruby-build/jruby-1.6.4

+1 −17
Original line number Diff line number Diff line 
after_install_package() {

  shim_jruby

  remove_windows_files

}



shim_jruby() {

  cd "${PREFIX_PATH}/bin"

  sed -i "" 's/^#!\/bin\/bash/#!\/usr\/bin\/env bash/' jruby

  ln -fs jruby ruby

}



remove_windows_files() {

  cd "$PREFIX_PATH"

  rm -f bin/*.exe bin/*.dll bin/*.bat bin/jruby.sh

}



install_package "jruby-1.6.4" "http://jruby.org.s3.amazonaws.com/downloads/1.6.4/jruby-bin-1.6.4.tar.gz" copy

install_package "jruby-1.6.4" "http://jruby.org.s3.amazonaws.com/downloads/1.6.4/jruby-bin-1.6.4.tar.gz" jruby

install_package "rubygems-1.6.2" "http://production.cf.rubygems.org/rubygems/rubygems-1.6.2.tgz" ruby