From 23ee82f7e0d39f6636b3643c3c480692a3dc4a0b Mon Sep 17 00:00:00 2001 From: John Bintz Date: Wed, 11 May 2011 09:04:31 -0400 Subject: [PATCH] simplify building on mac os x --- lib/capybara_webkit_builder.rb | 7 +------ src/webkit_server.pro | 1 + 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/lib/capybara_webkit_builder.rb b/lib/capybara_webkit_builder.rb index 8ee9f56..51d5ea9 100644 --- a/lib/capybara_webkit_builder.rb +++ b/lib/capybara_webkit_builder.rb @@ -17,12 +17,7 @@ module CapybaraWebkitBuilder system("make") or return false FileUtils.mkdir("bin") unless File.directory?("bin") - - if 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) - end + FileUtils.cp("src/webkit_server", "bin", :preserve => true) end def build_all diff --git a/src/webkit_server.pro b/src/webkit_server.pro index 26467dc..29090e5 100644 --- a/src/webkit_server.pro +++ b/src/webkit_server.pro @@ -6,4 +6,5 @@ SOURCES = main.cpp WebPage.cpp Server.cpp Connection.cpp Command.cpp Visit.cpp F RESOURCES = webkit_server.qrc QT += network webkit CONFIG += console +CONFIG -= app_bundle