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

Inconsistent darwin/mac_os_x symbol bug

Browse Source 
It was causing:
lib/qt/qmake.rb:114:in `check_qmake!': undefined method `strip' for nil:NilClass (NoMethodError)
This commit is contained in:
Marc Peabody 2011-08-21 21:55:32 -04:00
parent 350db80eed
commit 9146041ce6
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/qt/qmake.rb
View File

@ -53,8 +53,8 @@ module Qt
case RbConfig::CONFIG['host_os'] case RbConfig::CONFIG['host_os']
when /linux/ when /linux/
:linux :linux
when /freebsd/i when /freebsd/i
:freebsd :freebsd
when /darwin/ when /darwin/
:mac_os_x :mac_os_x
end end
@ -95,7 +95,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
) )
@ -121,7 +121,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/