Skip to content

Commit

Permalink
Fix bugs in the build system
Browse files Browse the repository at this point in the history
  • Loading branch information
FooBarWidget committed Jul 2, 2013
1 parent bffc6e1 commit 13d74d6
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 10 deletions.
1 change: 0 additions & 1 deletion Rakefile
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,6 @@ end

desc "Remove compiled files"
task :clean do
sh "rm -rf build/cache"
sh "rm -rf buildout"
end

Expand Down
5 changes: 1 addition & 4 deletions build/agents.rb
Original file line number Diff line number Diff line change
Expand Up @@ -177,8 +177,5 @@
end

task 'common:clean' do
['PassengerWatchdog', 'PassengerHelperAgent', 'PassengerLoggingAgent', 'SpawnPreparer', 'EnvPrinter'].each do |agent|
sh "rm -rf #{AGENT_OUTPUT_DIR}#{agent} #{AGENT_OUTPUT_DIR}#{agent}.o #{AGENT_OUTPUT_DIR}#{agent}.dSYM"
end
sh "rm -rf agents"
sh "rm -rf #{AGENT_OUTPUT_DIR}"
end
8 changes: 3 additions & 5 deletions build/basics.rb
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@

require 'rubygems'
require 'pathname'
require 'fileutils'
require 'phusion_passenger'
PhusionPassenger.locate_directories
require 'phusion_passenger/packaging'
Expand Down Expand Up @@ -110,11 +111,8 @@ def maybe_wrap_in_ccache(command)
end

if boolean_option('CACHING', true) && !boolean_option('RELEASE')
if OUTPUT_DIR.empty?
PlatformInfo.cache_dir = File.expand_path("cache", File.dirname(__FILE__))
else
PlatformInfo.cache_dir = OUTPUT_DIR + "cache"
end
PlatformInfo.cache_dir = OUTPUT_DIR + "cache"
FileUtils.mkdir_p(PlatformInfo.cache_dir)
end

#################################################
Expand Down

0 comments on commit 13d74d6

Please sign in to comment.