github-migration/jasmine-headless-webkit
1
0
Fork 0
Code Issues 39 Pull Requests 16 Packages Projects Releases Wiki Activity

fix qmake bug

Browse Source
This commit is contained in:
John Bintz 2011-08-23 18:47:15 -04:00
parent 4fb82c2e7c
commit 01b1fcce16
1 changed files with 24 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/qt/qmake.rb
View File

@ -3,7 +3,6 @@ require 'rubygems/version'
module Qt module Qt
class NotInstalledError < StandardError; end class NotInstalledError < StandardError; end
class Qmake class Qmake
class << self class << self
QMAKES = %w{qmake-qt4 qmake} QMAKES = %w{qmake-qt4 qmake}
@ -17,14 +16,13 @@ module Qt
end end
def command(project_file = nil) def command(project_file = nil)
spec = (case platform spec = (case platform
when :linux when :linux
"#{path} -spec linux-g++" "linux-g++"
when :freebsd when :freebsd
"#{path} -spec freebsd-g++" "freebsd-g++"
when :mac_os_x when :mac_os_x
"#{path} -spec macx-g++" "macx-g++"
end) end)
command = "#{path} -spec #{spec}" command = "#{path} -spec #{spec}"
@ -99,7 +97,7 @@ module Qt
%{sudo apt-get install make or sudo yum install make} %{sudo apt-get install make or sudo yum install make}
when :freebsd when :freebsd
%{install /usr/ports/devel/gmake} %{install /usr/ports/devel/gmake}
when :darwin when :mac_os_x
%{Install XCode, and/or sudo port install make} %{Install XCode, and/or sudo port install make}
end end
) )
@ -125,7 +123,7 @@ MSG
<<-MSG <<-MSG
Install /usr/ports/www/qt4-webkit and /usr/ports/devel/qmake4. Install /usr/ports/www/qt4-webkit and /usr/ports/devel/qmake4.
MSG MSG
when :darwin when :mac_os_x
<<-MSG <<-MSG
sudo port install qt4-mac (for the patient) or downloading Nokia's pre-built binary sudo port install qt4-mac (for the patient) or downloading Nokia's pre-built binary
at http://qt.nokia.com/downloads/ at http://qt.nokia.com/downloads/