passenger 3.9.1.beta → 3.9.2.beta

data/bin/passenger-status

@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
-#  Phusion Passenger - http://www.modrails.com/
+#  Phusion Passenger - https://www.phusionpassenger.com/
 #  Copyright (c) 2010 Phusion
 #
 #  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.

data/build/agents.rb

@@ -1,5 +1,5 @@
-#  Phusion Passenger - http://www.modrails.com/
-#  Copyright (c) 2010, 2011, 2012 Phusion
+#  Phusion Passenger - https://www.phusionpassenger.com/
+#  Copyright (c) 2010-2013 Phusion
 #
 #  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
 #
@@ -73,9 +73,9 @@ dependencies = [
 	'ext/common/ApplicationPool2/PipeWatcher.h',
 	LIBBOOST_OXT,
 	helper_agent_libs.link_objects,
-	:libev,
-	:libeio
-].flatten
+	LIBEV_TARGET,
+	LIBEIO_TARGET
+].flatten.compact
 file AGENT_OUTPUT_DIR + 'PassengerHelperAgent' => dependencies do
 	sh "mkdir -p #{AGENT_OUTPUT_DIR}" if !File.directory?(AGENT_OUTPUT_DIR)
 	compile_cxx("ext/common/agents/HelperAgent/Main.cpp",
@@ -111,8 +111,8 @@ dependencies = [
 	'ext/common/Utils/BlockingQueue.h',
 	logging_agent_libs.link_objects,
 	LIBBOOST_OXT,
-	:libev
-].flatten
+	LIBEV_TARGET
+].flatten.compact
 file AGENT_OUTPUT_DIR + 'PassengerLoggingAgent' => dependencies do
 	sh "mkdir -p #{AGENT_OUTPUT_DIR}" if !File.directory?(AGENT_OUTPUT_DIR)
 	compile_cxx("ext/common/agents/LoggingAgent/Main.cpp",

data/build/apache2.rb

@@ -1,4 +1,4 @@
-#  Phusion Passenger - http://www.modrails.com/
+#  Phusion Passenger - https://www.phusionpassenger.com/
 #  Copyright (c) 2010 Phusion
 #
 #  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
@@ -131,4 +131,4 @@ task 'apache2:clean' => 'common:clean' do
 	files << APACHE2_MOD_PASSENGER_O
 	files << APACHE2_MODULE
 	sh("rm", "-rf", *files)
-end
+end

data/build/basics.rb

@@ -1,4 +1,4 @@
-#  Phusion Passenger - http://www.modrails.com/
+#  Phusion Passenger - https://www.phusionpassenger.com/
 #  Copyright (c) 2010, 2011, 2012 Phusion
 #
 #  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
@@ -72,12 +72,8 @@ LIBEXT   = PlatformInfo.library_extension
 USE_DMALLOC = boolean_option('USE_DMALLOC')
 USE_EFENCE  = boolean_option('USE_EFENCE')
 USE_ASAN    = boolean_option('USE_ASAN')
-if OPTIMIZE
-	OPTIMIZATION_FLAGS = "#{PlatformInfo.debugging_cflags} -O2 -DBOOST_DISABLE_ASSERTS".strip
-else
-	OPTIMIZATION_FLAGS = "#{PlatformInfo.debugging_cflags} -DPASSENGER_DEBUG -DBOOST_DISABLE_ASSERTS".strip
-end
-OPTIMIZATION_FLAGS << " -fcommon"
+OPTIMIZATION_FLAGS = "#{PlatformInfo.debugging_cflags} -feliminate-unused-debug-symbols -feliminate-unused-debug-types -DPASSENGER_DEBUG -DBOOST_DISABLE_ASSERTS -fcommon".strip
+OPTIMIZATION_FLAGS << " -O" if OPTIMIZE
 OPTIMIZATION_FLAGS << " -fvisibility=hidden -DVISIBILITY_ATTRIBUTE_SUPPORTED" if PlatformInfo.compiler_supports_visibility_flag?
 OPTIMIZATION_FLAGS << " -Wno-attributes" if PlatformInfo.compiler_supports_visibility_flag? &&
 	PlatformInfo.compiler_visibility_flag_generates_warnings? &&

data/build/common_library.rb

@@ -1,5 +1,5 @@
-#  Phusion Passenger - http://www.modrails.com/
-#  Copyright (c) 2010, 2011, 2012 Phusion
+#  Phusion Passenger - https://www.phusionpassenger.com/
+#  Copyright (c) 2010-2013 Phusion
 #
 #  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
 #
@@ -33,8 +33,11 @@ def define_libboost_oxt_task(namespace, output_dir, extra_compiler_flags = nil)
 	output_file = "#{output_dir}.a"
 	flags = "-Iext #{extra_compiler_flags} #{PlatformInfo.portability_cflags} #{EXTRA_CXXFLAGS}"
 	
-	if boolean_option('RELEASE')
-		sources = Dir['ext/boost/src/pthread/*.cpp'] + Dir['ext/oxt/*.cpp']
+	if false && boolean_option('RELEASE')
+		# Disable RELEASE support. Passenger Standalone wants to link to the
+		# common library but does not know whether it was compiled with RELEASE
+		# or not. See http://code.google.com/p/phusion-passenger/issues/detail?id=808
+		sources = Dir['ext/boost/libs/**/*.cpp'] + Dir['ext/oxt/*.cpp']
 		sources.sort!
 		
 		aggregate_source = "#{output_dir}/aggregate.cpp"
@@ -60,7 +63,7 @@ def define_libboost_oxt_task(namespace, output_dir, extra_compiler_flags = nil)
 	else
 		# Define compilation targets for .cpp files in ext/boost/src/pthread.
 		boost_object_files = []
-		Dir['ext/boost/src/pthread/*.cpp'].each do |source_file|
+		Dir['ext/boost/libs/**/*.cpp'].each do |source_file|
 			object_name = File.basename(source_file.sub(/\.cpp$/, '.o'))
 			boost_output_dir  = "#{output_dir}/boost"
 			object_file = "#{boost_output_dir}/#{object_name}"
@@ -109,8 +112,9 @@ if USE_VENDORED_LIBEV
 	LIBEV_SOURCE_DIR = File.expand_path("../ext/libev", File.dirname(__FILE__)) + "/"
 	LIBEV_CFLAGS = "-Iext/libev"
 	LIBEV_LIBS = LIBEV_OUTPUT_DIR + ".libs/libev.a"
+	LIBEV_TARGET = LIBEV_LIBS
 	
-	task :libev => LIBEV_OUTPUT_DIR + ".libs/libev.a"
+	task :libev => LIBEV_TARGET
 	
 	dependencies = [
 		"ext/libev/configure",
@@ -141,6 +145,7 @@ if USE_VENDORED_LIBEV
 else
 	LIBEV_CFLAGS = string_option('LIBEV_CFLAGS', '-I/usr/include/libev')
 	LIBEV_LIBS   = string_option('LIBEV_LIBS', '-lev')
+	LIBEV_TARGET = nil
 	task :libev  # do nothing
 end
 
@@ -151,8 +156,9 @@ if USE_VENDORED_LIBEIO
 	LIBEIO_SOURCE_DIR = File.expand_path("../ext/libeio", File.dirname(__FILE__)) + "/"
 	LIBEIO_CFLAGS = "-Iext/libeio"
 	LIBEIO_LIBS = LIBEIO_OUTPUT_DIR + ".libs/libeio.a"
+	LIBEIO_TARGET = LIBEIO_LIBS
 	
-	task :libeio => LIBEIO_OUTPUT_DIR + ".libs/libeio.a"
+	task :libeio => LIBEIO_TARGET
 	
 	dependencies = [
 		"ext/libeio/configure",
@@ -182,6 +188,7 @@ if USE_VENDORED_LIBEIO
 else
 	LIBEIO_CFLAGS = string_option('LIBEIO_CFLAGS', '-I/usr/include/libeio')
 	LIBEIO_LIBS   = string_option('LIBEIO_LIBS', '-leio')
+	LIBEIO_TARGET = nil
 	task :libeio  # do nothing
 end
 

data/build/cplusplus_support.rb

@@ -1,4 +1,4 @@
-#  Phusion Passenger - http://www.modrails.com/
+#  Phusion Passenger - https://www.phusionpassenger.com/
 #  Copyright (c) 2010 Phusion
 #
 #  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.

data/build/cxx_tests.rb

@@ -1,5 +1,5 @@
-#  Phusion Passenger - http://www.modrails.com/
-#  Copyright (c) 2010, 2011, 2012 Phusion
+#  Phusion Passenger - https://www.phusionpassenger.com/
+#  Copyright (c) 2010-2013 Phusion
 #
 #  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
 #
@@ -26,6 +26,7 @@
 TEST_CXX_CFLAGS = "-Iext -Iext/common " <<
 	"#{LIBEV_CFLAGS} #{LIBEIO_CFLAGS} #{PlatformInfo.curl_flags} -Itest/cxx -Itest/support " <<
 	"#{TEST_COMMON_CFLAGS}"
+TEST_CXX_CFLAGS << " -faddress-sanitizer" if USE_ASAN
 TEST_CXX_LDFLAGS = "#{TEST_COMMON_LIBRARY.link_objects_as_string} " <<
 	"#{TEST_BOOST_OXT_LIBRARY} #{LIBEV_LIBS} #{LIBEIO_LIBS} " <<
 	"#{PlatformInfo.curl_libs} " <<
@@ -162,6 +163,9 @@ TEST_CXX_OBJECTS = {
 		test/cxx/MessageIOTest.cpp
 		ext/common/Utils/MessageIO.h
 		ext/common/Utils/IOUtils.h),
+	'test/cxx/MessagePassingTest.o' => %w(
+		test/cxx/MessagePassingTest.cpp
+		ext/common/Utils/MessagePassing.h),
 	'test/cxx/VariantMapTest.o' => %w(
 		test/cxx/VariantMapTest.cpp
 		ext/common/Utils/VariantMap.h),
@@ -198,17 +202,24 @@ task 'test:cxx' => dependencies do
 	elsif boolean_option('VALGRIND')
 		command = "valgrind --dsymutil=yes --db-attach=yes --child-silent-after-fork=yes #{command}"
 	end
-	sh "cd test && #{command}"
+	if boolean_option('REPEAT')
+		if boolean_option('GDB')
+			abort "You cannot set both REPEAT=1 and GDB=1."
+		end
+		sh "cd test && while #{command}; do echo -------------------------------------------; done"
+	else
+		sh "cd test && #{command}"
+	end
 end
 
 dependencies = [
 	TEST_CXX_OBJECTS.keys,
-	:libev,
-	:libeio,
+	LIBEV_TARGET,
+	LIBEIO_TARGET,
 	TEST_BOOST_OXT_LIBRARY,
 	TEST_COMMON_LIBRARY.link_objects,
 	'ext/common/MultiLibeio.cpp'
-].flatten
+].flatten.compact
 file 'test/cxx/CxxTestMain' => dependencies.flatten do
 	objects = TEST_CXX_OBJECTS.keys.join(' ')
 	create_executable("test/cxx/CxxTestMain", objects, TEST_CXX_LDFLAGS)
@@ -216,6 +227,7 @@ end
 
 deps = [
 	'test/cxx/TestSupport.h',
+	'test/tut/tut.h',
 	'ext/oxt/thread.hpp',
 	'ext/oxt/tracable_exception.hpp',
 	'ext/common/ServerInstanceDir.h',
@@ -232,4 +244,4 @@ TEST_CXX_OBJECTS.each_pair do |target, sources|
 		# To use precompiled headers in Clang, we must -include them on them command line.
 		compile_cxx sources[0], "-o #{target} -include test/cxx/TestSupport.h #{TEST_CXX_CFLAGS}"
 	end
-end
+end

data/build/documentation.rb

@@ -1,4 +1,4 @@
-#  Phusion Passenger - http://www.modrails.com/
+#  Phusion Passenger - https://www.phusionpassenger.com/
 #  Copyright (c) 2010, 2011, 2012 Phusion
 #
 #  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.

data/build/integration_tests.rb

@@ -1,4 +1,4 @@
-#  Phusion Passenger - http://www.modrails.com/
+#  Phusion Passenger - https://www.phusionpassenger.com/
 #  Copyright (c) 2010 Phusion
 #
 #  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
@@ -61,4 +61,4 @@ task 'test:restart' => [:apache2, :native_support] do
 			i += 1
 		end
 	end
-end
+end

data/build/misc.rb

@@ -1,5 +1,5 @@
-#  Phusion Passenger - http://www.modrails.com/
-#  Copyright (c) 2010, 2011, 2012 Phusion
+#  Phusion Passenger - https://www.phusionpassenger.com/
+#  Copyright (c) 2010-2013 Phusion
 #
 #  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
 #
@@ -137,9 +137,9 @@ end
 dependencies = [
 	COMMON_LIBRARY.link_objects,
 	LIBBOOST_OXT,
-	:libev,
-	:libeio
-].flatten
+	LIBEV_TARGET,
+	LIBEIO_TARGET
+].flatten.compact
 task :compile_app => dependencies do
 	source = ENV['SOURCE'] || ENV['FILE'] || ENV['F']
 	if !source
@@ -168,4 +168,4 @@ task :compile_app => dependencies do
 	ensure
 		File.unlink('_source.cpp') rescue nil
 	end
-end
+end

data/build/nginx.rb

@@ -1,4 +1,4 @@
-#  Phusion Passenger - http://www.modrails.com/
+#  Phusion Passenger - https://www.phusionpassenger.com/
 #  Copyright (c) 2010 Phusion
 #
 #  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.

data/build/oxt_tests.rb

@@ -1,4 +1,4 @@
-#  Phusion Passenger - http://www.modrails.com/
+#  Phusion Passenger - https://www.phusionpassenger.com/
 #  Copyright (c) 2010 Phusion
 #
 #  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.

data/build/packaging.rb

@@ -1,4 +1,4 @@
-#  Phusion Passenger - http://www.modrails.com/
+#  Phusion Passenger - https://www.phusionpassenger.com/
 #  Copyright (c) 2010, 2011, 2012 Phusion
 #
 #  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
@@ -32,7 +32,7 @@ end
 
 spec = Gem::Specification.new do |s|
 	s.platform = Gem::Platform::RUBY
-	s.homepage = "http://www.modrails.com/"
+	s.homepage = "https://www.phusionpassenger.com/"
 	s.summary = "Easy and robust Ruby web application deployment"
 	s.name = "passenger"
 	s.version = VERSION_STRING
@@ -42,7 +42,7 @@ spec = Gem::Specification.new do |s|
 	s.require_paths = ["lib"]
 	s.add_dependency 'rake', '>= 0.8.1'
 	s.add_dependency 'fastthread', '>= 1.0.1'
-	s.add_dependency 'daemon_controller', '>= 1.0.0'
+	s.add_dependency 'daemon_controller', '>= 1.1.0'
 	s.add_dependency 'rack'
 	s.files = FileList[*Packaging::GLOB] - FileList[*Packaging::EXCLUDE_GLOB]
 	s.executables = Packaging::USER_EXECUTABLES + Packaging::SUPER_USER_EXECUTABLES
@@ -108,10 +108,9 @@ task :fakeroot => [:apache2, :nginx] + Packaging::ASCII_DOCS do
 	fake_agents_dir = "#{fakeroot}#{NATIVELY_PACKAGED_AGENTS_DIR}"
 	fake_helper_scripts_dir = "#{fakeroot}#{NATIVELY_PACKAGED_HELPER_SCRIPTS_DIR}"
 	fake_resources_dir = "#{fakeroot}/usr/share/phusion-passenger"
-	fake_docdir = "#{fakeroot}#{NATIVELY_PACKAGED_DOCDIR}"
+	fake_docdir = "#{fakeroot}#{NATIVELY_PACKAGED_DOC_DIR}"
 	fake_bindir = "#{fakeroot}/usr/bin"
 	fake_sbindir = "#{fakeroot}/usr/sbin"
-	fake_source_root = "#{fakeroot}#{NATIVELY_PACKAGED_SOURCE_ROOT}"
 	fake_apache2_module = "#{fakeroot}#{NATIVELY_PACKAGED_APACHE2_MODULE}"
 	fake_apache2_module_dir = File.dirname(fake_apache2_module)
 	
@@ -119,24 +118,24 @@ task :fakeroot => [:apache2, :nginx] + Packaging::ASCII_DOCS do
 	sh "mkdir -p #{fakeroot}"
 	
 	sh "mkdir -p #{fake_libdir}"
-	sh "cp #{LIBDIR}/phusion_passenger.rb #{fake_libdir}/"
-	sh "cp -R #{LIBDIR}/phusion_passenger #{fake_libdir}/"
+	sh "cp #{PhusionPassenger.ruby_libdir}/phusion_passenger.rb #{fake_libdir}/"
+	sh "cp -R #{PhusionPassenger.ruby_libdir}/phusion_passenger #{fake_libdir}/"
 	
 	sh "mkdir -p #{fake_native_support_dir}"
-	native_support_archdir = PlatformInfo.ruby_extension_binary_compatibility_ids.join("-")
+	native_support_archdir = PlatformInfo.ruby_extension_binary_compatibility_id
 	sh "mkdir -p #{fake_native_support_dir}"
-	sh "cp -R ext/ruby/#{native_support_archdir}/*.#{LIBEXT} #{fake_native_support_dir}/"
+	sh "cp -R libout/ruby/#{native_support_archdir}/*.#{LIBEXT} #{fake_native_support_dir}/"
 	
 	sh "mkdir -p #{fake_agents_dir}"
-	sh "cp -R #{AGENTS_DIR}/* #{fake_agents_dir}/"
+	sh "cp -R #{PhusionPassenger.agents_dir}/* #{fake_agents_dir}/"
 	sh "rm -rf #{fake_agents_dir}/*.dSYM"
 	sh "rm -rf #{fake_agents_dir}/*/*.dSYM"
 	
 	sh "mkdir -p #{fake_helper_scripts_dir}"
-	sh "cp -R #{HELPER_SCRIPTS_DIR}/* #{fake_helper_scripts_dir}/"
+	sh "cp -R #{PhusionPassenger.helper_scripts_dir}/* #{fake_helper_scripts_dir}/"
 	
 	sh "mkdir -p #{fake_resources_dir}"
-	sh "cp resources/* #{fake_resources_dir}/"
+	sh "cp -R resources/* #{fake_resources_dir}/"
 	
 	sh "mkdir -p #{fake_docdir}"
 	Packaging::ASCII_DOCS.each do |docfile|
@@ -156,17 +155,8 @@ task :fakeroot => [:apache2, :nginx] + Packaging::ASCII_DOCS do
 	
 	sh "mkdir -p #{fake_apache2_module_dir}"
 	sh "cp #{APACHE2_MODULE} #{fake_apache2_module_dir}/"
-	
-	sh "mkdir -p #{fake_source_root}"
-	spec.files.each do |filename|
-		next if File.directory?(filename)
-		dirname = File.dirname(filename)
-		if !File.directory?("#{fake_source_root}/#{dirname}")
-			sh "mkdir -p '#{fake_source_root}/#{dirname}'"
-		end
-		puts "cp '#{filename}' '#{fake_source_root}/#{dirname}/'"
-		FileUtils.cp(filename, "#{fake_source_root}/#{dirname}/")
-	end
+
+	sh "find #{fakeroot} -name .DS_Store -print0 | xargs -0 rm -f"
 end
 
 desc "Create a Debian package"

data/build/rake_extensions.rb

@@ -1,4 +1,4 @@
-#  Phusion Passenger - http://www.modrails.com/
+#  Phusion Passenger - https://www.phusionpassenger.com/
 #  Copyright (c) 2010 Phusion
 #
 #  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.

data/build/rpm.rb

@@ -1,4 +1,4 @@
-#  Phusion Passenger - http://www.modrails.com/
+#  Phusion Passenger - https://www.phusionpassenger.com/
 #  Copyright (C) 2010  Phusion
 #
 #  This program is free software; you can redistribute it and/or modify

data/build/ruby_extension.rb

@@ -1,4 +1,4 @@
-#  Phusion Passenger - http://www.modrails.com/
+#  Phusion Passenger - https://www.phusionpassenger.com/
 #  Copyright (c) 2010 Phusion
 #
 #  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
@@ -45,4 +45,4 @@ end
 
 task 'native_support:clean' do
 	sh "echo rm -rf #{output_dir}"
-end
+end

data/build/ruby_tests.rb

@@ -1,5 +1,5 @@
-#  Phusion Passenger - http://www.modrails.com/
-#  Copyright (c) 2010 Phusion
+#  Phusion Passenger - https://www.phusionpassenger.com/
+#  Copyright (c) 2010-2013 Phusion
 #
 #  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
 #
@@ -29,7 +29,7 @@ task 'test:ruby' => [:native_support, AGENT_OUTPUT_DIR + 'PassengerLoggingAgent'
 		abort "RSpec is not installed for Ruby interpreter '#{PlatformInfo.ruby_command}'. Please install it."
 	else
 		Dir.chdir("test") do
-			ruby "#{PlatformInfo.rspec} -c -f s ruby/*_spec.rb ruby/*/*_spec.rb"
+			ruby "#{PlatformInfo.rspec} -c -f s -P 'dont-autoload-anything' ruby/*_spec.rb ruby/*/*_spec.rb"
 		end
 	end
 end
@@ -46,4 +46,4 @@ task 'test:rcov' => :native_support do
 				*Dir["ruby/*.rb", "ruby/*/*.rb", "integration_tests.rb"]
 		end
 	end
-end
+end

data/build/test_basics.rb

@@ -1,5 +1,5 @@
-#  Phusion Passenger - http://www.modrails.com/
-#  Copyright (c) 2010 Phusion
+#  Phusion Passenger - https://www.phusionpassenger.com/
+#  Copyright (c) 2010-2013 Phusion
 #
 #  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
 #
@@ -42,3 +42,16 @@ task :clean => 'test:clean'
 file 'test/support/allocate_memory' => 'test/support/allocate_memory.c' do
 	create_c_executable('test/support/allocate_memory', 'test/support/allocate_memory.c')
 end
+
+desc "Install developer dependencies"
+task 'test:install_deps' do
+	gem_install = PlatformInfo.gem_command + " install --no-rdoc --no-ri"
+	gem_install = "sudo #{gem_install}" if boolean_option('SUDO')
+	sh "#{gem_install} rails -v 2.3.15"
+	sh "#{gem_install} bundler rspec mime-types daemon_controller json"
+	if boolean_option('RAILS_BUNDLES', true)
+		sh "cd test/stub/rails3.0 && bundle install"
+		sh "cd test/stub/rails3.1 && bundle install"
+		sh "cd test/stub/rails3.2 && bundle install"
+	end
+end

data/dev/copy_boost_headers.rb

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
-#  Phusion Passenger - http://www.modrails.com/
-#  Copyright (c) 2010 Phusion
+#  Phusion Passenger - https://www.phusionpassenger.com/
+#  Copyright (c) 2010-2012 Phusion
 #
 #  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
 #
@@ -24,17 +24,20 @@
 
 ESSENTIALS = [
 	"boost/detail/{limits,endian}.hpp",
-	"boost/config/*",
+	"boost/config",
+	"boost/mpl",
+	"boost/preprocessor/stringize.hpp",
 	"boost/smart_ptr/detail/sp_counted_*",
 	"boost/smart_ptr/detail/atomic_count*",
 	"boost/smart_ptr/detail/spinlock*",
-	"boost/thread/*",
-	"boost/thread/*/*",
-	"libs/thread/src/*",
+	"boost/thread",
+	"libs/thread/src",
+	"libs/system/src",
 	"boost/date_time/gregorian/formatters_limited.hpp",
 	"boost/date_time/date_formatting_limited.hpp",
 	"boost/non_type.hpp",
 	"boost/detail/fenv.hpp",
+	"boost/foreach.hpp"
 ]
 EXCLUDE = [
 	"libs/thread/src/win32/*"
@@ -50,6 +53,8 @@ PROGRAM_SOURCE = %q{
 	#include <boost/function.hpp>
 	#include <boost/bind.hpp>
 	#include <boost/date_time/posix_time/posix_time.hpp>
+	#include <boost/foreach.hpp>
+	#include <boost/lambda/lambda.hpp>
 }
 
 require 'fileutils'
@@ -84,7 +89,9 @@ def copy_boost_files(patterns, exclude = nil)
 				copy_boost_files(["#{source}/*"], exclude)
 			else
 				target = source.slice(BOOST_DIR.size + 1 .. source.size - 1)
-				target.sub!(%r{^libs/thread/}, 'boost/')
+				if target =~ /^libs\//
+					target = "boost/#{target}"
+				end
 				if !File.exist?(target)
 					install(source, target)
 				end
@@ -112,6 +119,9 @@ def cleanup
 	FileUtils.rm_rf("boost/src/win32")
 	FileUtils.rm_rf("boost/asio/win32")
 	FileUtils.rm_rf("boost/smart_ptr/detail/spinlock_w32.hpp")
+	FileUtils.rm_rf("boost/smart_ptr/detail/sp_counted_base_w32.hpp")
+	FileUtils.rm_rf("boost/smart_ptr/detail/atomic_count_win32.hpp")
+	FileUtils.rm_rf("boost/config/platform/win32.hpp")
 	File.unlink("test.cpp") rescue nil
 end
 
@@ -119,7 +129,7 @@ end
 def copy_dependencies
 	done = false
 	while !done
-		missing_headers = `g++ test.cpp -c -I. 2>&1`.
+		missing_headers = `g++ -DBOOST_MPL_PREPROCESSING_MODE test.cpp -c -I. 2>&1`.
 		  split("\n").
 		  grep(/error: .*: No such file/).
 		  map do |line|