Skip to content

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
...
Checking mergeability… Don’t worry, you can still create the pull request.
  • 1 commit
  • 1 file changed
  • 0 commit comments
  • 1 contributor
Showing with 7 additions and 3 deletions.
  1. +7 −3 lib/capybara_webkit_builder.rb
View
10 lib/capybara_webkit_builder.rb
@@ -4,7 +4,12 @@ module CapybaraWebkitBuilder
extend self
def makefile
- system("qmake -spec macx-g++")
+ case RUBY_PLATFORM
+ when /linux/
+ system("qmake -spec linux-g++")
+ else
+ system("qmake -spec macx-g++")
+ end
end
def qmake
@@ -15,8 +20,7 @@ def build
system("make") or return false
FileUtils.mkdir("bin") unless File.directory?("bin")
-
- if File.exist?("src/webkit_server.app")
+ if !(RUBY_PLATFORM =~ /linux/) && File.exist?("src/webkit_server.app")
FileUtils.cp("src/webkit_server.app/Contents/MacOS/webkit_server", "bin", :preserve => true)
else
FileUtils.cp("src/webkit_server", "bin", :preserve => true)

No commit comments for this range

Something went wrong with that request. Please try again.