Skip to content

Commit

Permalink
Give ruby1.8 one more chance.
Browse files Browse the repository at this point in the history
  • Loading branch information
majek committed Jul 4, 2011
1 parent f893b1d commit 7e9132e
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
6 changes: 3 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ test: prerequisites dotnet/.ok erlang/.ok java/.ok python/.ok php/.ok ruby/.ok

.PHONY: prerequisites
prerequisites:
dpkg -L python-virtualenv git-core php5-cli ruby1.9 ruby1.9-dev > /dev/null
dpkg -L python-virtualenv git-core php5-cli ruby1.8 ruby1.8-dev > /dev/null

R=http://www.rabbitmq.com/releases
dotnet/.ok:
Expand Down Expand Up @@ -82,10 +82,10 @@ ruby/.ok:
wget http://production.cf.rubygems.org/rubygems/rubygems-$(GEMSVER).tgz && \
tar xzf rubygems-$(GEMSVER).tgz && \
cd rubygems-$(GEMSVER) && \
ruby1.9 setup.rb --prefix=$(TOPDIR)/ruby/gems && \
ruby1.8 setup.rb --prefix=$(TOPDIR)/ruby/gems && \
cd .. && \
rm -r rubygems-$(GEMSVER).tgz rubygems-$(GEMSVER) && \
GEM_HOME=gems/gems RUBYLIB=gems/lib gem1.9 install amqp --version "0.8.0.rc13" && \
GEM_HOME=gems/gems RUBYLIB=gems/lib gems/bin/gem1.8 install amqp --version "0.8.0.rc13" && \
touch .ok)
clean::
(cd ruby && \
Expand Down
4 changes: 2 additions & 2 deletions test.py
Original file line number Diff line number Diff line change
Expand Up @@ -65,8 +65,8 @@ def gen(prog, arg="", **kwargs):
('java', 'java -cp .:commons-io-1.2.jar:commons-cli-1.1.jar:'
'rabbitmq-client.jar %(java)s %(arg)s' % ctx),
('dotnet', 'env MONO_PATH=lib/bin mono %(dotnet)s.exe %(arg)s' % ctx),
('ruby', 'env GEM_HOME=gems/gems RUBYLIB=gems/lib '
'ruby1.9 %(ruby)s.rb %(arg)s' % ctx),
('ruby', 'env RUBYOPT=-rubygems GEM_HOME=gems/gems RUBYLIB=gems/lib '
'ruby1.8 %(ruby)s.rb %(arg)s' % ctx),
('php', 'php %(php)s.php %(arg)s' % ctx),
]

Expand Down

0 comments on commit 7e9132e

Please sign in to comment.