@@ -1,4 +1,11 @@ #!/usr/bin/env ruby +ESSENTIALS = [ + "boost/detail/{limits,endian}.hpp", + "boost/config/*", + "boost/detail/sp_counted_*", + "boost/detail/atomic_count*", + "libs/thread/src/*" +] PROGRAM_SOURCE = %q{ #include <boost/shared_ptr.hpp> #include <boost/thread.hpp> @@ -6,13 +13,10 @@ PROGRAM_SOURCE = %q{ #include <boost/bind.hpp> #include <boost/date_time/posix_time/posix_time.hpp> } - -boost_dir = ARGV[0] +BOOST_DIR = ARGV[0] Dir.chdir(File.dirname(__FILE__) + "/../ext") -File.open("test.cpp", "w") do |f| - f.write(PROGRAM_SOURCE) -end +# Run the given command, and abort on error. def sh(*command) puts command.join(" ") if !system(*command) @@ -21,30 +25,78 @@ def sh(*command) end end -done = false -while !done - missing_headers = `g++ test.cpp -c -I. 2>&1`. - split("\n"). - grep(/error: .*: No such file/). - map do |line| - file = line.sub(/.*error: (.*): .*/, '\1') - if file =~ /^boost\// - file - else - line =~ /(.*?):/ - source = $1 - File.dirname(source) + "/" + file +def install(source_filename, target_filename) + command = ["install", "-D", "--mode=u+rw,g+r,o+r", source_filename, target_filename] + sh(*command) +end + +def copy_boost_files(*patterns) + patterns.each do |pattern| + Dir["#{BOOST_DIR}/#{pattern}"].each do |source| + if File.directory?(source) + source.slice!(0 .. BOOST_DIR.size) + copy_boost_files("#{source}/*") + else + target = source.slice(BOOST_DIR.size + 1 .. source.size - 1) + target.sub!(%r{^libs/thread/}, 'boost/') + if !File.exist?(target) + install(source, target) + end + end + end + end +end + +def copy_essential_files + copy_boost_files(*ESSENTIALS) +end + +def prepare + File.open("test.cpp", "w") do |f| + f.write(PROGRAM_SOURCE) + end +end + +def cleanup + File.unlink("test.cpp") rescue nil +end + +# Compile PROGRAM_SOURCE and copy whatever missing header files the compiler needs. +def copy_dependencies + done = false + while !done + missing_headers = `g++ test.cpp -c -I. 2>&1`. + split("\n"). + grep(/error: .*: No such file/). + map do |line| + file = line.sub(/.*error: (.*): .*/, '\1') + if file =~ /^boost\// + file + else + line =~ /(.*?):/ + source = $1 + File.dirname(source) + "/" + file + end end + missing_headers.each do |header| + install("#{BOOST_DIR}/#{header}", header) + end + done = missing_headers.empty? + end +end + +def start + if BOOST_DIR.nil? || BOOST_DIR.empty? + puts "Usage: copy_boost_headers.rb <boost source directory>" + exit 1 end - missing_headers.each do |header| - command = ["install", "-D", "--mode=u+rw,g+r,o+r", "#{boost_dir}/#{header}", header] - sh(*command) + begin + prepare + copy_essential_files + copy_dependencies + ensure + cleanup end - done = missing_headers.empty? end -sh "cp #{boost_dir}/boost/detail/{limits,endian}.hpp boost/detail/" -sh "cp -R #{boost_dir}/boost/config/* boost/config/" -sh "cp -R #{boost_dir}/boost/detail/sp_counted_* boost/detail/" -sh "cp -R #{boost_dir}/boost/detail/atomic_count* boost/detail/" -sh "mkdir -p boost/src && cp -R #{boost_dir}/libs/thread/src/* boost/src/" +start misc/copy_boost_headers.rb 8469c8c36e4331d7a7cf5f4f146290786eab2ddc Hongli Lai (Phusion) hongli@phusion.nl http://github.com/FooBarWidget/passenger/commit/e80e5c2f26280433019907f1aa28cd73dc69c7b5 e80e5c2f26280433019907f1aa28cd73dc69c7b5 2008-05-19T03:34:40-07:00 2008-05-19T03:34:40-07:00 Improve the Boost copying script: don't overwrite existing files, ever. b943d08c96a6be7cf32c8cb93ba45468856dee7a Hongli Lai (Phusion) hongli@phusion.nl