From 495fd1900ea9cb41c13c8b377deb4965337f9baf Mon Sep 17 00:00:00 2001 From: John Bintz Date: Thu, 10 Nov 2011 11:18:55 -0500 Subject: [PATCH] nuke the cpu detection --- lib/jasmine/headless/version.rb | 2 +- lib/qt/qmake.rb | 20 +------------------- spec/lib/qt/qmake_spec.rb | 11 ----------- 3 files changed, 2 insertions(+), 31 deletions(-) diff --git a/lib/jasmine/headless/version.rb b/lib/jasmine/headless/version.rb index 1844491..f611b97 100644 --- a/lib/jasmine/headless/version.rb +++ b/lib/jasmine/headless/version.rb @@ -1,5 +1,5 @@ module Jasmine module Headless - VERSION = "0.7.3" + VERSION = "0.8.0" end end diff --git a/lib/qt/qmake.rb b/lib/qt/qmake.rb index a0012f0..b4a3116 100644 --- a/lib/qt/qmake.rb +++ b/lib/qt/qmake.rb @@ -2,12 +2,6 @@ require 'rbconfig' require 'rubygems' require 'rubygems/version' -begin - require 'facter' -rescue LoadError - warn 'Including Facter allows for detection of # of cpus, resulting in faster compilations.' -end - module Qt class NotInstalledError < StandardError; end class Qmake @@ -45,11 +39,7 @@ module Qt system command(project_file) - system %{make #{make_options}} - end - - def make_options - "-j#{number_of_cpus}" + system %{make} end # @@ -103,14 +93,6 @@ module Qt end.compact.join(" ") end - def number_of_cpus - if defined?(Facter) - Facter.sp_number_processors rescue Facter.processorcount - else - 1 - end - end - def get_exe_path(command) path = %x{which #{command}}.strip path = nil if path == '' diff --git a/spec/lib/qt/qmake_spec.rb b/spec/lib/qt/qmake_spec.rb index 45b61c4..8b7c02f 100644 --- a/spec/lib/qt/qmake_spec.rb +++ b/spec/lib/qt/qmake_spec.rb @@ -138,16 +138,5 @@ describe Qt::Qmake do end end end - - describe '.make_options' do - let(:cpu_count) { 3 } - subject { Qt::Qmake.make_options } - - before do - Qt::Qmake.stubs(:number_of_cpus).returns(cpu_count) - end - - it { should == "-j#{cpu_count}" } - end end