passenger 3.0.21 → 3.9.1.beta

data/bin/passenger-memory-stats

@@ -22,9 +22,11 @@
 #  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 #  THE SOFTWARE.
 
-source_root = File.expand_path(File.dirname(__FILE__) + "/..")
+source_root = File.expand_path("..", File.dirname(__FILE__))
 $LOAD_PATH.unshift("#{source_root}/lib")
 require 'phusion_passenger'
+PhusionPassenger.locate_directories
+
 require 'phusion_passenger/platform_info'
 require 'phusion_passenger/admin_tools/memory_stats'
 

data/bin/passenger-status

@@ -22,59 +22,31 @@
 #  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 #  THE SOFTWARE.
 
-source_root = File.expand_path(File.dirname(__FILE__) + "/..")
+source_root = File.expand_path("..", File.dirname(__FILE__))
 $LOAD_PATH.unshift("#{source_root}/lib")
 require 'phusion_passenger'
+PhusionPassenger.locate_directories
+
 require 'phusion_passenger/platform_info'
 require 'phusion_passenger/admin_tools/server_instance'
+require 'phusion_passenger/utils/ansi_colors'
 require 'optparse'
 
 include PhusionPassenger::AdminTools
-
-# ANSI color codes
-RESET    = "\e[0m"
-BOLD     = "\e[1m"
-YELLOW   = "\e[33m"
-BLACK_BG = "\e[40m"
-BLUE_BG  = "\e[44m"
+include PhusionPassenger::Utils::AnsiColors
 
 def show_status(server_instance, options = {})
 	server_instance.connect(:passenger_status) do
 		case options[:show]
 		when 'pool'
 			begin
-				general_info = server_instance.status
+				puts server_instance.status(:verbose => options[:verbose], :colorize => true)
 			rescue SystemCallError => e
 				STDERR.puts "*** ERROR: Cannot query status for Phusion Passenger instance #{server_instance.pid}:"
 				STDERR.puts e.to_s
 				exit 2
 			end
-			
-			# Extract only the 'General information' section and colorize it.
-			general_info.sub!(/^(----)(.*)$/, YELLOW + BLUE_BG + BOLD + '\1\2' + RESET)
-			general_info.sub!(/^----.*/m, '')
-			general_info.strip!
-			puts general_info
-			puts
-			
-			puts "#{YELLOW}#{BLUE_BG}#{BOLD}----------- Application groups -----------#{RESET}"
-			server_instance.groups.each do |group|
-				puts "#{group.name}:"
-				if group.name !~ %r{^/} || true
-					puts "  App root: #{group.app_root}"
-				end
-				group.processes.each do |process|
-					printf "  * PID: %-5d   Sessions: %-2d   Processed: %-5d   Uptime: %s\n",
-						process.pid, process.sessions, process.processed,
-						process.uptime
-					if options[:verbose] && process.server_sockets[:http]
-						puts "      URL     : http://#{process.server_sockets[:http].address}"
-						puts "      Password: #{process.connect_password}"
-					end
-				end
-				puts
-			end
-		
+
 		when 'backtraces'
 			begin
 				text = server_instance.backtraces

data/build/agents.rb

@@ -1,5 +1,5 @@
 #  Phusion Passenger - http://www.modrails.com/
-#  Copyright (c) 2010 Phusion
+#  Copyright (c) 2010, 2011, 2012 Phusion
 #
 #  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
 #
@@ -21,51 +21,110 @@
 #  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 #  THE SOFTWARE.
 
+watchdog_libs = COMMON_LIBRARY.only(:base, 'AgentsBase.o', 'Utils/Base64.o')
 dependencies = [
-	'ext/common/Watchdog.cpp',
+	'ext/common/agents/Watchdog/Main.cpp',
 	'ext/common/ServerInstanceDir.h',
 	'ext/common/ResourceLocator.h',
 	'ext/common/Utils/VariantMap.h',
 	LIBBOOST_OXT,
-	LIBCOMMON
-]
+	watchdog_libs.link_objects
+].flatten
 file AGENT_OUTPUT_DIR + 'PassengerWatchdog' => dependencies do
 	sh "mkdir -p #{AGENT_OUTPUT_DIR}" if !File.directory?(AGENT_OUTPUT_DIR)
+	compile_cxx("ext/common/agents/Watchdog/Main.cpp",
+		"-o #{AGENT_OUTPUT_DIR}PassengerWatchdog.o " <<
+		"-Iext -Iext/common " <<
+		"#{PlatformInfo.portability_cflags} #{AGENT_CFLAGS} #{EXTRA_CXXFLAGS}")
 	create_executable(AGENT_OUTPUT_DIR + 'PassengerWatchdog',
-		'ext/common/Watchdog.cpp',
-		"-Iext -Iext/common #{PlatformInfo.portability_cflags} #{EXTRA_CXXFLAGS} " <<
-		"#{LIBCOMMON} " <<
+		"#{AGENT_OUTPUT_DIR}PassengerWatchdog.o " <<
+		"#{watchdog_libs.link_objects_as_string} " <<
 		"#{LIBBOOST_OXT} " <<
 		"#{PlatformInfo.portability_ldflags} " <<
 		"#{AGENT_LDFLAGS} " <<
 		"#{EXTRA_LDFLAGS}")
 end
 
+helper_agent_libs = COMMON_LIBRARY.
+	only(:base, :other).
+	exclude('AgentsStarter.o')
 dependencies = [
-	'ext/common/LoggingAgent/Main.cpp',
-	'ext/common/LoggingAgent/LoggingServer.h',
-	'ext/common/LoggingAgent/RemoteSender.h',
-	'ext/common/LoggingAgent/DataStoreId.h',
-	'ext/common/LoggingAgent/FilterSupport.h',
+	'ext/common/agents/HelperAgent/Main.cpp',
+	'ext/common/agents/HelperAgent/RequestHandler.h',
+	'ext/common/agents/HelperAgent/RequestHandler.cpp',
+	'ext/common/agents/HelperAgent/ScgiRequestParser.h',
+	'ext/common/agents/HelperAgent/BacktracesServer.h',
+	'ext/common/StaticString.h',
+	'ext/common/Account.h',
+	'ext/common/AccountsDatabase.h',
+	'ext/common/MessageServer.h',
+	'ext/common/FileDescriptor.h',
+	'ext/common/Logging.h',
+	'ext/common/ResourceLocator.h',
+	'ext/common/Utils/ProcessMetricsCollector.h',
+	'ext/common/Utils/VariantMap.h',
+	'ext/common/ApplicationPool2/Pool.h',
+	'ext/common/ApplicationPool2/Common.h',
+	'ext/common/ApplicationPool2/SuperGroup.h',
+	'ext/common/ApplicationPool2/Group.h',
+	'ext/common/ApplicationPool2/Process.h',
+	'ext/common/ApplicationPool2/Session.h',
+	'ext/common/ApplicationPool2/Options.h',
+	'ext/common/ApplicationPool2/PipeWatcher.h',
+	LIBBOOST_OXT,
+	helper_agent_libs.link_objects,
+	:libev,
+	:libeio
+].flatten
+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",
+		"-o #{AGENT_OUTPUT_DIR}PassengerHelperAgent.o " <<
+		"-Iext -Iext/common " <<
+		"#{AGENT_CFLAGS} #{LIBEV_CFLAGS} #{LIBEIO_CFLAGS} " <<
+		"#{PlatformInfo.portability_cflags} " <<
+		"#{EXTRA_CXXFLAGS}")
+	create_executable("#{AGENT_OUTPUT_DIR}PassengerHelperAgent",
+		"#{AGENT_OUTPUT_DIR}PassengerHelperAgent.o",
+		"#{helper_agent_libs.link_objects_as_string} " <<
+		"#{LIBBOOST_OXT} " <<
+		"#{LIBEV_LIBS} " <<
+		"#{LIBEIO_LIBS} " <<
+		"#{PlatformInfo.portability_ldflags} " <<
+		"#{AGENT_LDFLAGS} " <<
+		"#{EXTRA_LDFLAGS}")
+end
+
+logging_agent_libs = COMMON_LIBRARY.only(:base, :logging_agent, 'AgentsBase.o',
+	'Utils/Base64.o', 'Utils/MD5.o')
+dependencies = [
+	'ext/common/agents/LoggingAgent/Main.cpp',
+	'ext/common/agents/LoggingAgent/LoggingServer.h',
+	'ext/common/agents/LoggingAgent/RemoteSender.h',
+	'ext/common/agents/LoggingAgent/DataStoreId.h',
+	'ext/common/agents/LoggingAgent/FilterSupport.h',
 	'ext/common/ServerInstanceDir.h',
 	'ext/common/Logging.h',
 	'ext/common/EventedServer.h',
 	'ext/common/EventedClient.h',
 	'ext/common/Utils/VariantMap.h',
 	'ext/common/Utils/BlockingQueue.h',
-	LIBCOMMON,
+	logging_agent_libs.link_objects,
 	LIBBOOST_OXT,
 	:libev
-]
+].flatten
 file AGENT_OUTPUT_DIR + 'PassengerLoggingAgent' => dependencies do
 	sh "mkdir -p #{AGENT_OUTPUT_DIR}" if !File.directory?(AGENT_OUTPUT_DIR)
-	create_executable(AGENT_OUTPUT_DIR + 'PassengerLoggingAgent',
-		'ext/common/LoggingAgent/Main.cpp',
-		"-Iext -Iext/common #{LIBEV_CFLAGS} " <<
+	compile_cxx("ext/common/agents/LoggingAgent/Main.cpp",
+		"-o #{AGENT_OUTPUT_DIR}PassengerLoggingAgent.o " <<
+		"-Iext -Iext/common " <<
+		"#{AGENT_CFLAGS} #{LIBEV_CFLAGS} " <<
 		"#{PlatformInfo.curl_flags} " <<
 		"#{PlatformInfo.zlib_flags} " <<
-		"#{PlatformInfo.portability_cflags} #{EXTRA_CXXFLAGS} " <<
-		"#{LIBCOMMON} " <<
+		"#{PlatformInfo.portability_cflags} #{EXTRA_CXXFLAGS}")
+	create_executable("#{AGENT_OUTPUT_DIR}PassengerLoggingAgent",
+		"#{AGENT_OUTPUT_DIR}PassengerLoggingAgent.o",
+		"#{logging_agent_libs.link_objects_as_string} " <<
 		"#{LIBBOOST_OXT} " <<
 		"#{LIBEV_LIBS} " <<
 		"#{PlatformInfo.curl_libs} " <<
@@ -75,6 +134,33 @@ file AGENT_OUTPUT_DIR + 'PassengerLoggingAgent' => dependencies do
 		"#{EXTRA_LDFLAGS}")
 end
 
+spawn_preparer_libs = COMMON_LIBRARY.only('Utils/Base64.o')
+dependencies = [
+	'ext/common/agents/SpawnPreparer.cpp',
+	spawn_preparer_libs.link_objects,
+	LIBBOOST_OXT
+].flatten
+file AGENT_OUTPUT_DIR + 'SpawnPreparer' => dependencies do
+	sh "mkdir -p #{AGENT_OUTPUT_DIR}" if !File.directory?(AGENT_OUTPUT_DIR)
+	create_executable(AGENT_OUTPUT_DIR + 'SpawnPreparer',
+		'ext/common/agents/SpawnPreparer.cpp',
+		"-Iext -Iext/common " <<
+		"#{AGENT_CFLAGS} #{PlatformInfo.portability_cflags} #{EXTRA_CXXFLAGS} " <<
+		"#{spawn_preparer_libs.link_objects_as_string} " <<
+		"#{LIBBOOST_OXT} " <<
+		"#{PlatformInfo.portability_ldflags} " <<
+		"#{EXTRA_LDFLAGS}")
+end
+
+file AGENT_OUTPUT_DIR + 'EnvPrinter' => 'ext/common/agents/EnvPrinter.c' do
+	sh "mkdir -p #{AGENT_OUTPUT_DIR}" if !File.directory?(AGENT_OUTPUT_DIR)
+	create_c_executable(AGENT_OUTPUT_DIR + 'EnvPrinter',
+		'ext/common/agents/EnvPrinter.c')
+end
+
 task 'common:clean' do
-	sh "rm -f #{AGENT_OUTPUT_DIR}PassengerWatchdog #{AGENT_OUTPUT_DIR}PassengerLoggingAgent"
-end
+	['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"
+end

data/build/apache2.rb

@@ -36,7 +36,7 @@ APACHE2_MODULE_INPUT_FILES = {
 		ext/apache2/Configuration.h
 		ext/apache2/Configuration.hpp
 		ext/common/Constants.h
-		ext/common/LoggingAgent/FilterSupport.h),
+		ext/common/agents/LoggingAgent/FilterSupport.h),
 	APACHE2_OUTPUT_DIR + 'Bucket.o' => %w(
 		ext/apache2/Bucket.cpp
 		ext/apache2/Bucket.h),
@@ -48,17 +48,10 @@ APACHE2_MODULE_INPUT_FILES = {
 		ext/apache2/Bucket.h
 		ext/apache2/DirectoryMapper.h
 		ext/common/AgentsStarter.hpp
-		ext/common/ApplicationPool/Client.h
-		ext/common/SpawnManager.h
 		ext/common/Exceptions.h
-		ext/common/Process.h
-		ext/common/Session.h
 		ext/common/Logging.h
 		ext/common/RandomGenerator.h
-		ext/common/MessageChannel.h
 		ext/common/ServerInstanceDir.h
-		ext/common/PoolOptions.h
-		ext/common/StringListCreator.h
 		ext/common/Constants.h
 		ext/common/Utils.h
 		ext/common/Utils/Timer.h)
@@ -68,22 +61,25 @@ APACHE2_MOD_PASSENGER_O = APACHE2_OUTPUT_DIR + "mod_passenger.o"
 
 APACHE2_MODULE_CXXFLAGS = "-Iext -Iext/common #{PlatformInfo.apache2_module_cflags} " <<
 	"#{PlatformInfo.portability_cflags} #{EXTRA_CXXFLAGS}"
-APACHE2_HELPER_CXXFLAGS = "-Iext -Iext/common #{PlatformInfo.portability_cflags} #{EXTRA_CXXFLAGS}"
 
 APACHE2_MODULE_BOOST_OXT_LIBRARY = define_libboost_oxt_task("apache2",
 	APACHE2_OUTPUT_DIR + "module_libboost_oxt",
 	PlatformInfo.apache2_module_cflags)
-APACHE2_MODULE_COMMON_LIBRARY    = define_common_library_task("apache2",
-	APACHE2_OUTPUT_DIR + "module_libpassenger_common",
-	PlatformInfo.apache2_module_cflags)
+APACHE2_MODULE_COMMON_LIBRARIES  = COMMON_LIBRARY.
+	only(:base, 'Utils/Base64.o', 'Utils/MD5.o').
+	set_namespace("apache2").
+	set_output_dir(APACHE2_OUTPUT_DIR + "module_libpassenger_common").
+	define_tasks(PlatformInfo.apache2_module_cflags).
+	link_objects
 
 
 desc "Build Apache 2 module"
 task :apache2 => [
 	APACHE2_MODULE,
-	AGENT_OUTPUT_DIR + 'apache2/PassengerHelperAgent',
+	AGENT_OUTPUT_DIR + 'PassengerHelperAgent',
 	AGENT_OUTPUT_DIR + 'PassengerWatchdog',
 	AGENT_OUTPUT_DIR + 'PassengerLoggingAgent',
+	AGENT_OUTPUT_DIR + 'SpawnPreparer',
 	:native_support
 ]
 
@@ -99,7 +95,7 @@ end
 
 
 dependencies = [
-	APACHE2_MODULE_COMMON_LIBRARY,
+	APACHE2_MODULE_COMMON_LIBRARIES,
 	APACHE2_MODULE_BOOST_OXT_LIBRARY,
 	APACHE2_MOD_PASSENGER_O,
 	APACHE2_MODULE_OBJECTS
@@ -114,7 +110,7 @@ file APACHE2_MODULE => dependencies do
 		"#{PlatformInfo.apache2_module_cflags} " <<
 		"#{PlatformInfo.portability_cflags} " <<
 		"#{EXTRA_CXXFLAGS} " <<
-		"#{APACHE2_MODULE_COMMON_LIBRARY} " <<
+		"#{APACHE2_MODULE_COMMON_LIBRARIES.join(' ')} " <<
 		"#{APACHE2_MODULE_BOOST_OXT_LIBRARY} " <<
 		"#{PlatformInfo.apache2_module_ldflags} " <<
 		"#{PlatformInfo.portability_ldflags} " <<
@@ -128,42 +124,11 @@ file APACHE2_MOD_PASSENGER_O => ['ext/apache2/mod_passenger.c'] do
 		"#{APACHE2_MODULE_CXXFLAGS} -o #{APACHE2_MOD_PASSENGER_O}")
 end
 
-dependencies = [
-	'ext/apache2/HelperAgent.cpp',
-	'ext/common/ServerInstanceDir.h',
-	'ext/common/MessageServer.h',
-	'ext/common/Logging.h',
-	'ext/common/SpawnManager.h',
-	'ext/common/Account.h',
-	'ext/common/ResourceLocator.h',
-	'ext/common/Utils.h',
-	'ext/common/Utils/Timer.h',
-	'ext/common/Utils/ProcessMetricsCollector.h',
-	'ext/common/ApplicationPool/Interface.h',
-	'ext/common/ApplicationPool/Pool.h',
-	'ext/common/ApplicationPool/Server.h',
-	LIBCOMMON,
-	LIBBOOST_OXT
-]
-file AGENT_OUTPUT_DIR + 'apache2/PassengerHelperAgent' => dependencies do
-	dir = "#{AGENT_OUTPUT_DIR}apache2"
-	sh "mkdir -p #{dir}" if !File.directory?(dir)
-	create_executable("#{dir}/PassengerHelperAgent",
-		'ext/apache2/HelperAgent.cpp',
-		"#{APACHE2_HELPER_CXXFLAGS} " <<
-		"#{LIBCOMMON} " <<
-		"#{LIBBOOST_OXT} " <<
-		"#{PlatformInfo.portability_ldflags} " <<
-		"#{AGENT_LDFLAGS} " <<
-		"#{EXTRA_LDFLAGS}")
-end
-
 task :clean => 'apache2:clean'
 desc "Clean all compiled Apache 2 files"
 task 'apache2:clean' => 'common:clean' do
 	files = APACHE2_MODULE_OBJECTS.dup
 	files << APACHE2_MOD_PASSENGER_O
 	files << APACHE2_MODULE
-	files << AGENT_OUTPUT_DIR + "PassengerHelperAgent"
 	sh("rm", "-rf", *files)
 end

data/build/basics.rb

@@ -1,5 +1,5 @@
 #  Phusion Passenger - http://www.modrails.com/
-#  Copyright (c) 2010 Phusion
+#  Copyright (c) 2010, 2011, 2012 Phusion
 #
 #  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
 #
@@ -24,6 +24,7 @@
 require 'rubygems'
 require 'pathname'
 require 'phusion_passenger'
+PhusionPassenger.locate_directories
 require 'phusion_passenger/packaging'
 require 'phusion_passenger/platform_info'
 require 'phusion_passenger/platform_info/operating_system'
@@ -64,23 +65,74 @@ end
 
 #################################################
 
+OPTIMIZE = boolean_option("OPTIMIZE")
+CC       = string_option("CC", "gcc")
+CXX      = string_option("CXX", "g++")
+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 << " -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? &&
+	PlatformInfo.compiler_supports_wno_attributes_flag?
+OPTIMIZATION_FLAGS << " -fno-omit-frame-pointers" if USE_ASAN
+
+# Agent-specific compiler flags.
+AGENT_CFLAGS  = ""
+AGENT_CFLAGS << " -faddress-sanitizer" if USE_ASAN
+AGENT_CFLAGS.strip!
+
+# Agent-specific linker flags.
+AGENT_LDFLAGS = ""
+AGENT_LDFLAGS << " #{PlatformInfo.dmalloc_ldflags}" if USE_DMALLOC
+AGENT_LDFLAGS << " #{PlatformInfo.electric_fence_ldflags}" if USE_EFENCE
+AGENT_LDFLAGS << " -faddress-sanitizer" if USE_ASAN
+# Extra linker flags for backtrace_symbols() to generate useful output (see AgentsBase.cpp).
+AGENT_LDFLAGS << " #{PlatformInfo.export_dynamic_flags}"
+# Enable dead symbol elimination on OS X.
+AGENT_LDFLAGS << " -Wl,-dead_strip" if RUBY_PLATFORM =~ /darwin/
+AGENT_LDFLAGS.strip!
+
+# Extra compiler flags that should always be passed to the C/C++ compiler.
+# Should be included last in the command string, even after PlatformInfo.portability_cflags.
+EXTRA_CXXFLAGS = "-Wall -Wextra -Wno-unused-parameter -Wno-parentheses -Wpointer-arith -Wwrite-strings -Wno-long-long"
+EXTRA_CXXFLAGS << " -Wno-missing-field-initializers" if PlatformInfo.compiler_supports_wno_missing_field_initializers_flag?
+EXTRA_CXXFLAGS << " -mno-tls-direct-seg-refs" if PlatformInfo.requires_no_tls_direct_seg_refs? && PlatformInfo.compiler_supports_no_tls_direct_seg_refs_option?
+# Work around Clang warnings in ev++.h.
+EXTRA_CXXFLAGS << " -Wno-ambiguous-member-template" if PlatformInfo.cxx_is_clang?
+EXTRA_CXXFLAGS << " #{OPTIMIZATION_FLAGS}" if !OPTIMIZATION_FLAGS.empty?
+
+# Extra linker flags that should always be passed to the linker.
+# Should be included last in the command string, even after PlatformInfo.portability_ldflags.
+EXTRA_LDFLAGS  = ""
+
+
 if string_option('OUTPUT_DIR')
 	OUTPUT_DIR = string_option('OUTPUT_DIR') + "/"
 else
 	OUTPUT_DIR = ""
 end
 AGENT_OUTPUT_DIR          = string_option('AGENT_OUTPUT_DIR', OUTPUT_DIR + "agents") + "/"
-COMMON_OUTPUT_DIR         = string_option('COMMON_OUTPUT_DIR', OUTPUT_DIR + "ext/common") + "/"
-APACHE2_OUTPUT_DIR        = string_option('APACHE2_OUTPUT_DIR', OUTPUT_DIR + "ext/apache2") + "/"
-LIBEV_OUTPUT_DIR          = string_option('LIBEV_OUTPUT_DIR', OUTPUT_DIR + "ext/libev") + "/"
-ruby_extension_archdir = PlatformInfo.ruby_extension_binary_compatibility_ids.join("-")
+COMMON_OUTPUT_DIR         = string_option('COMMON_OUTPUT_DIR', OUTPUT_DIR + "libout/common") + "/"
+APACHE2_OUTPUT_DIR        = string_option('APACHE2_OUTPUT_DIR', OUTPUT_DIR + "libout/apache2") + "/"
+LIBEV_OUTPUT_DIR          = string_option('LIBEV_OUTPUT_DIR', OUTPUT_DIR + "libout/libev") + "/"
+LIBEIO_OUTPUT_DIR         = string_option('LIBEIO_OUTPUT_DIR', OUTPUT_DIR + "libout/libeio") + "/"
+ruby_extension_archdir    = PlatformInfo.ruby_extension_binary_compatibility_id
 RUBY_EXTENSION_OUTPUT_DIR = string_option('RUBY_EXTENSION_OUTPUT_DIR',
-	OUTPUT_DIR + "ext/ruby/" + ruby_extension_archdir) + "/"
+	OUTPUT_DIR + "libout/ruby/" + ruby_extension_archdir) + "/"
 
-LIBEXT = PlatformInfo.library_extension
 
-# Extra linker flags for backtrace_symbols() to generate useful output (see AgentsBase.cpp).
-AGENT_LDFLAGS = PlatformInfo.export_dynamic_flags
+# Whether to use the vendored libev or the system one.
+USE_VENDORED_LIBEV = boolean_option("USE_VENDORED_LIBEV", true)
+# Whether to use the vendored libeio or the system one.
+USE_VENDORED_LIBEIO = boolean_option("USE_VENDORED_LIBEIO", true)
 
 
 verbose true if !boolean_option('REALLY_QUIET')