Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Loading…

Find OS more reliably with rbconfig. (Works with Jruby.) #221

Closed
wants to merge 1 commit into from

2 participants

@duelinmarkers

Currently if you build on JRuby, CapybaraWebkitBuilder will always fall back to assuming OS X because RUBY_PLATFORM returns 'jruby'. RbConfig::CONFIG['host_os'] should do the right thing everywhere.

@halogenandtoast

This has been merged into master.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Commits on Nov 29, 2011
  1. Choose platform more reliably. (Works with Jruby.)

    John Hume authored
This page is out of date. Refresh to see the latest.
Showing with 2 additions and 1 deletion.
  1. +2 −1  lib/capybara_webkit_builder.rb
View
3  lib/capybara_webkit_builder.rb
@@ -1,4 +1,5 @@
require "fileutils"
+require "rbconfig"
module CapybaraWebkitBuilder
extend self
@@ -11,7 +12,7 @@ def make_bin
def makefile
qmake_binaries = ['qmake', 'qmake-qt4']
qmake = qmake_binaries.detect { |qmake| system("which #{qmake}") }
- case RUBY_PLATFORM
+ case RbConfig::CONFIG['host_os']
when /linux/
system("#{qmake} -spec linux-g++")
when /freebsd/
Something went wrong with that request. Please try again.