Author: donaldp
Date: Fri May 20 01:23:29 2011
New Revision: 1125198
URL: http://svn.apache.org/viewvc?rev=1125198&view=rev
Log:
BUILDR-583 Update jruby install to use jruby version 1.6.1
Submitted By: Alexis Midon
Modified:
buildr/trunk/CHANGELOG
buildr/trunk/doc/installing.textile
buildr/trunk/doc/scripts/install-jruby.sh
Modified: buildr/trunk/CHANGELOG
URL:
http://svn.apache.org/viewvc/buildr/trunk/CHANGELOG?rev=1125198&r1=1125197&r2=1125198&view=diff
==============================================================================
--- buildr/trunk/CHANGELOG (original)
+++ buildr/trunk/CHANGELOG Fri May 20 01:23:29 2011
@@ -1,4 +1,5 @@
1.4.6 (Pending)
+* Fixed: BUILDR-583 Update jruby install to use jruby version 1.6.1 (Alexis
Midon)
* Fixed: BUILDR-582 Revert the name change for the task to generate Intellij
project files to 'idea'
* Change: BUILDR-579 Format generated IDEA project files to look more like what
Modified: buildr/trunk/doc/installing.textile
URL:
http://svn.apache.org/viewvc/buildr/trunk/doc/installing.textile?rev=1125198&r1=1125197&r2=1125198&view=diff
==============================================================================
--- buildr/trunk/doc/installing.textile (original)
+++ buildr/trunk/doc/installing.textile Fri May 20 01:23:29 2011
@@ -137,11 +137,11 @@ To upgrade to a new version or install a
h2(#jruby). Installing for JRuby
-*The easy way:* Use this bash script to "install Buildr on
JRuby":scripts/install-jruby.sh. This script will install the most recent
version of Buildr, or if already installed, upgrade to the most recent version.
If necessary, it will also install JRuby 1.1.6 in @/opt/jruby@ and update the
@PATH@ variable in @~/.bash_profile@ or @~/.profile@.
+*The easy way:* Use this bash script to "install Buildr on
JRuby":scripts/install-jruby.sh. This script will install the most recent
version of Buildr, or if already installed, upgrade to the most recent version.
If necessary, it will also install JRuby 1.6.1 in @/opt/jruby@ and update the
@PATH@ variable in @~/.bash_profile@ or @~/.profile@.
<br>
-*In details:* If you don't already have JRuby 1.1.6 or later installed, you
can download it from the "JRuby site":http://dist.codehaus.org/jruby/.
+*In details:* If you don't already have JRuby 1.5.1 or later installed, you
can download it from the "JRuby site":http://www.jruby.org/download.
After uncompressing JRuby, update your @PATH@ to include both @java@ and
@jruby@ executables.
Modified: buildr/trunk/doc/scripts/install-jruby.sh
URL:
http://svn.apache.org/viewvc/buildr/trunk/doc/scripts/install-jruby.sh?rev=1125198&r1=1125197&r2=1125198&view=diff
==============================================================================
--- buildr/trunk/doc/scripts/install-jruby.sh (original)
+++ buildr/trunk/doc/scripts/install-jruby.sh Fri May 20 01:23:29 2011
@@ -14,11 +14,11 @@
# License for the specific language governing permissions and limitations under
# the License.
if [ -z `which jruby` ] ; then
- version=1.1.6
+ version=1.6.1
target=/opt/jruby
echo "Installing JRuby ${version} in ${target}"
sudo mkdir -p $(dirname ${target})
- wget http://dist.codehaus.org/jruby/${version}/jruby-bin-${version}.tar.gz
+ wget
http://jruby.org.s3.amazonaws.com/downloads/${version}/jruby-bin-${version}.tar.gz
tar -xz < jruby-bin-${version}.tar.gz
sudo mv jruby-${version} ${target}
rm jruby-bin-${version}.tar.gz
