passenger 4.0.30 → 4.0.31

data/bin/passenger-memory-stats

@@ -22,16 +22,17 @@
 #  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 #  THE SOFTWARE.
 
-## Magic comment: set locations.ini ##
-
+## Magic comment: begin bootstrap ##
 source_root = File.expand_path("..", File.dirname(__FILE__))
 $LOAD_PATH.unshift("#{source_root}/lib")
+require 'rubygems' rescue nil
 require 'phusion_passenger'
-PhusionPassenger.locate_directories
+## Magic comment: end bootstrap ##
 
-require 'phusion_passenger/platform_info'
-require 'phusion_passenger/platform_info/ruby'
-require 'phusion_passenger/admin_tools/memory_stats'
+PhusionPassenger.locate_directories
+PhusionPassenger.require_passenger_lib 'platform_info'
+PhusionPassenger.require_passenger_lib 'platform_info/ruby'
+PhusionPassenger.require_passenger_lib 'admin_tools/memory_stats'
 
 include PhusionPassenger
 

data/bin/passenger-status

@@ -22,16 +22,17 @@
 #  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 #  THE SOFTWARE.
 
-## Magic comment: set locations.ini ##
-
+## Magic comment: begin bootstrap ##
 source_root = File.expand_path("..", File.dirname(__FILE__))
 $LOAD_PATH.unshift("#{source_root}/lib")
+require 'rubygems' rescue nil
 require 'phusion_passenger'
-PhusionPassenger.locate_directories
+## Magic comment: end bootstrap ##
 
-require 'phusion_passenger/platform_info'
-require 'phusion_passenger/admin_tools/server_instance'
-require 'phusion_passenger/utils/ansi_colors'
+PhusionPassenger.locate_directories
+PhusionPassenger.require_passenger_lib 'platform_info'
+PhusionPassenger.require_passenger_lib 'admin_tools/server_instance'
+PhusionPassenger.require_passenger_lib 'utils/ansi_colors'
 require 'optparse'
 
 include PhusionPassenger::AdminTools
@@ -80,9 +81,11 @@ def find_server_instance_on_pid(pid)
 end
 
 def show_status(server_instance, options)
-	puts "Version : #{PhusionPassenger::VERSION_STRING}"
-	puts "Date    : #{Time.now}"
-	puts "Instance: #{server_instance.pid}"
+	if options[:show] != 'xml'
+		puts "Version : #{PhusionPassenger::VERSION_STRING}"
+		puts "Date    : #{Time.now}"
+		puts "Instance: #{server_instance.pid}"
+	end
 	case options[:show]
 	when 'pool'
 		client = server_instance.connect(:role => :passenger_status)
@@ -151,7 +154,7 @@ def show_status(server_instance, options)
 		puts response
 	end
 rescue ServerInstance::RoleDeniedError
-	require 'phusion_passenger/platform_info/ruby'
+	PhusionPassenger.require_passenger_lib 'platform_info/ruby'
 	STDERR.puts "*** ERROR: You are not authorized to query the status for this Phusion " <<
 		"Passenger instance. Please try again with '#{PhusionPassenger::PlatformInfo.ruby_sudo_command}'."
 	exit 2

data/build/agents.rb

@@ -46,10 +46,9 @@ file AGENT_OUTPUT_DIR + 'PassengerWatchdog' => dependencies do
 		"#{AGENT_OUTPUT_DIR}PassengerWatchdog.o " <<
 		"#{watchdog_libs.link_objects_as_string} " <<
 		"#{LIBBOOST_OXT} " <<
-		"#{EXTRA_PRE_LDFLAGS} " <<
-		"#{PlatformInfo.portability_ldflags} " <<
+		"#{EXTRA_PRE_CXX_LDFLAGS} " <<
+		"#{PlatformInfo.portability_cxx_ldflags} " <<
 		"#{AGENT_LDFLAGS} " <<
-		"#{EXTRA_LDFLAGS} " <<
 		"#{EXTRA_CXX_LDFLAGS}")
 end
 
@@ -100,12 +99,11 @@ file AGENT_OUTPUT_DIR + 'PassengerHelperAgent' => dependencies do
 		"#{AGENT_OUTPUT_DIR}PassengerHelperAgent.o",
 		"#{helper_agent_libs.link_objects_as_string} " <<
 		"#{LIBBOOST_OXT} " <<
-		"#{EXTRA_PRE_LDFLAGS} " <<
+		"#{EXTRA_PRE_CXX_LDFLAGS} " <<
 		"#{LIBEV_LIBS} " <<
 		"#{LIBEIO_LIBS} " <<
-		"#{PlatformInfo.portability_ldflags} " <<
+		"#{PlatformInfo.portability_cxx_ldflags} " <<
 		"#{AGENT_LDFLAGS} " <<
-		"#{EXTRA_LDFLAGS} " <<
 		"#{EXTRA_CXX_LDFLAGS}")
 end
 
@@ -143,13 +141,12 @@ file AGENT_OUTPUT_DIR + 'PassengerLoggingAgent' => dependencies do
 		"#{AGENT_OUTPUT_DIR}PassengerLoggingAgent.o",
 		"#{logging_agent_libs.link_objects_as_string} " <<
 		"#{LIBBOOST_OXT} " <<
-		"#{EXTRA_PRE_LDFLAGS} " <<
+		"#{EXTRA_PRE_CXX_LDFLAGS} " <<
 		"#{LIBEV_LIBS} " <<
 		"#{PlatformInfo.curl_libs} " <<
 		"#{PlatformInfo.zlib_libs} " <<
-		"#{PlatformInfo.portability_ldflags} " <<
+		"#{PlatformInfo.portability_cxx_ldflags} " <<
 		"#{AGENT_LDFLAGS} " <<
-		"#{EXTRA_LDFLAGS} " <<
 		"#{EXTRA_CXX_LDFLAGS}")
 end
 
@@ -163,13 +160,12 @@ 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',
-		"#{EXTRA_PRE_CXXFLAGS} #{EXTRA_PRE_LDFLAGS} " <<
+		"#{EXTRA_PRE_CXXFLAGS} #{EXTRA_PRE_CXX_LDFLAGS} " <<
 		"-Iext -Iext/common " <<
 		"#{AGENT_CFLAGS} #{EXTRA_CXXFLAGS} " <<
 		"#{spawn_preparer_libs.link_objects_as_string} " <<
 		"#{LIBBOOST_OXT} " <<
-		"#{PlatformInfo.portability_ldflags} " <<
-		"#{EXTRA_LDFLAGS} " <<
+		"#{PlatformInfo.portability_cxx_ldflags} " <<
 		"#{EXTRA_CXX_LDFLAGS}")
 end
 

data/build/apache2.rb

@@ -105,7 +105,11 @@ APACHE2_MODULE_INPUT_FILES.each_pair do |target, sources|
 	file(target => sources + extra_deps) do
 		object_basename = File.basename(target)
 		object_filename = APACHE2_OUTPUT_DIR + object_basename
-		compile_cxx(sources[0], "#{APACHE2_MODULE_CXXFLAGS} -o #{object_filename}")
+		compile_cxx(sources[0],
+			"#{EXTRA_PRE_CXXFLAGS} " <<
+			"#{APACHE2_MODULE_CXXFLAGS} " <<
+			"-o #{object_filename} " <<
+			"#{EXTRA_CXXFLAGS}")
 	end
 end
 
@@ -124,21 +128,22 @@ file APACHE2_MODULE => dependencies do
 	
 	sources = (APACHE2_MODULE_OBJECTS + [APACHE2_MOD_PASSENGER_O]).join(' ')
 	linkflags =
-		"#{EXTRA_PRE_CXXFLAGS} #{EXTRA_PRE_LDFLAGS} " <<
-		"#{PlatformInfo.apache2_module_cflags} " <<
-		"#{EXTRA_CXXFLAGS} " <<
+		"#{EXTRA_PRE_CXX_LDFLAGS} " <<
 		"#{APACHE2_MODULE_COMMON_LIBRARIES.join(' ')} " <<
 		"#{APACHE2_MODULE_BOOST_OXT_LIBRARY} " <<
 		"#{PlatformInfo.apache2_module_ldflags} " <<
-		"#{PlatformInfo.portability_ldflags} " <<
-		"#{EXTRA_LDFLAGS} #{EXTRA_CXX_LDFLAGS} "
+		"#{PlatformInfo.portability_cxx_ldflags} " <<
+		"#{EXTRA_CXX_LDFLAGS} "
 	
 	create_shared_library(APACHE2_MODULE, sources, linkflags)
 end
 
 file APACHE2_MOD_PASSENGER_O => ['ext/apache2/mod_passenger.c'] do
 	compile_c('ext/apache2/mod_passenger.c',
-		"#{APACHE2_MODULE_CFLAGS} -o #{APACHE2_MOD_PASSENGER_O}")
+		"#{EXTRA_PRE_CFLAGS} " <<
+		"#{APACHE2_MODULE_CFLAGS} " <<
+		"-o #{APACHE2_MOD_PASSENGER_O} " <<
+		"#{EXTRA_CFLAGS}")
 end
 
 task :clean => 'apache2:clean'

data/build/basics.rb

@@ -29,16 +29,16 @@ require 'pathname'
 require 'fileutils'
 require 'phusion_passenger'
 PhusionPassenger.locate_directories
-require 'phusion_passenger/packaging'
-require 'phusion_passenger/platform_info'
-require 'phusion_passenger/platform_info/operating_system'
-require 'phusion_passenger/platform_info/binary_compatibility'
-require 'phusion_passenger/platform_info/ruby'
-require 'phusion_passenger/platform_info/apache'
-require 'phusion_passenger/platform_info/curl'
-require 'phusion_passenger/platform_info/zlib'
-require 'phusion_passenger/platform_info/compiler'
-require 'phusion_passenger/platform_info/cxx_portability'
+PhusionPassenger.require_passenger_lib 'packaging'
+PhusionPassenger.require_passenger_lib 'platform_info'
+PhusionPassenger.require_passenger_lib 'platform_info/operating_system'
+PhusionPassenger.require_passenger_lib 'platform_info/binary_compatibility'
+PhusionPassenger.require_passenger_lib 'platform_info/ruby'
+PhusionPassenger.require_passenger_lib 'platform_info/apache'
+PhusionPassenger.require_passenger_lib 'platform_info/curl'
+PhusionPassenger.require_passenger_lib 'platform_info/zlib'
+PhusionPassenger.require_passenger_lib 'platform_info/compiler'
+PhusionPassenger.require_passenger_lib 'platform_info/cxx_portability'
 
 include PhusionPassenger
 include PhusionPassenger::PlatformInfo
@@ -83,6 +83,10 @@ def string_option(name, default_value = nil)
 	end
 end
 
+def compiler_flag_option(name)
+	return string_option(name, '').gsub("\n", " ")
+end
+
 def boolean_option(name, default_value = false)
 	value = ENV[name]
 	if value.nil? || value.empty?
@@ -157,25 +161,29 @@ AGENT_LDFLAGS.strip!
 
 # Extra compiler flags that should always be passed to the C/C++ compiler.
 # These should be included first in the command string, before anything else.
-EXTRA_PRE_CFLAGS = string_option('EXTRA_PRE_CFLAGS', '').gsub("\n", " ")
-EXTRA_PRE_CXXFLAGS = string_option('EXTRA_PRE_CXXFLAGS', '').gsub("\n", " ")
+EXTRA_PRE_CFLAGS = compiler_flag_option('EXTRA_PRE_CFLAGS')
+EXTRA_PRE_CXXFLAGS = compiler_flag_option('EXTRA_PRE_CXXFLAGS')
 # These should be included last in the command string.
 EXTRA_CFLAGS = PlatformInfo.default_extra_cflags.dup
-EXTRA_CFLAGS << " " << string_option('EXTRA_CFLAGS').gsub("\n", " ") if string_option('EXTRA_CFLAGS')
+EXTRA_CFLAGS << " " << compiler_flag_option('EXTRA_CFLAGS') if !compiler_flag_option('EXTRA_CFLAGS').empty?
 EXTRA_CXXFLAGS = PlatformInfo.default_extra_cxxflags.dup
-EXTRA_CXXFLAGS << " " << string_option('EXTRA_CXXFLAGS').gsub("\n", " ") if string_option('EXTRA_CXXFLAGS')
+EXTRA_CXXFLAGS << " " << compiler_flag_option('EXTRA_CXXFLAGS') if !compiler_flag_option('EXTRA_CXXFLAGS').empty?
 [EXTRA_CFLAGS, EXTRA_CXXFLAGS].each do |flags|
 	flags << " -fno-omit-frame-pointers" if USE_ASAN
 	flags << " -DPASSENGER_DISABLE_THREAD_LOCAL_STORAGE" if !boolean_option('PASSENGER_THREAD_LOCAL_STORAGE', true)
 end
 
 # Extra linker flags that should always be passed to the linker.
-# These should be included first in the command string, before anything else.
-EXTRA_PRE_LDFLAGS  = string_option('EXTRA_PRE_LDFLAGS', '').gsub("\n", " ")
-# These should be included last in the command string, even after PlatformInfo.portability_ldflags.
-EXTRA_LDFLAGS     = string_option('EXTRA_LDFLAGS', '').gsub("\n", " ")
-EXTRA_C_LDFLAGS   = string_option('EXTRA_C_LDFLAGS', '').gsub("\n", " ")
-EXTRA_CXX_LDFLAGS = string_option('EXTRA_CXX_LDFLAGS', '').gsub("\n", " ")
+# These should be included first in the command string.
+EXTRA_PRE_C_LDFLAGS   = compiler_flag_option('EXTRA_PRE_LDFLAGS') + " " +
+	compiler_flag_option('EXTRA_PRE_C_LDFLAGS')
+EXTRA_PRE_CXX_LDFLAGS = compiler_flag_option('EXTRA_PRE_LDFLAGS') + " " +
+	compiler_flag_option('EXTRA_PRE_CXX_LDFLAGS')
+# These should be included last in the command string, even after portability_*_ldflags.
+EXTRA_C_LDFLAGS   = compiler_flag_option('EXTRA_LDFLAGS') + " " +
+	compiler_flag_option('EXTRA_C_LDFLAGS')
+EXTRA_CXX_LDFLAGS = compiler_flag_option('EXTRA_LDFLAGS') + " " +
+	compiler_flag_option('EXTRA_CXX_LDFLAGS')
 
 
 AGENT_OUTPUT_DIR          = string_option('AGENT_OUTPUT_DIR', OUTPUT_DIR + "agents") + "/"

data/build/common_library.rb

@@ -21,12 +21,12 @@
 #  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 #  THE SOFTWARE.
 
-require 'phusion_passenger/platform_info/compiler'
-require 'phusion_passenger/platform_info/cxx_portability'
+PhusionPassenger.require_passenger_lib 'platform_info/compiler'
+PhusionPassenger.require_passenger_lib 'platform_info/cxx_portability'
 
 ########## Phusion Passenger common library ##########
 
-require 'phusion_passenger/common_library'
+PhusionPassenger.require_passenger_lib 'common_library'
 
 
 ########## libboost_oxt ##########
@@ -219,7 +219,7 @@ end
 
 dependencies = ['ext/common/Constants.h.erb', 'lib/phusion_passenger.rb', 'lib/phusion_passenger/constants.rb']
 file 'ext/common/Constants.h' => dependencies do
-	require 'phusion_passenger/constants'
+	PhusionPassenger.require_passenger_lib 'constants'
 	template = TemplateRenderer.new('ext/common/Constants.h.erb')
 	template.render_to('ext/common/Constants.h')
 end

data/build/cplusplus_support.rb

@@ -24,7 +24,7 @@
 # Rake functions for compiling/linking C++ stuff.
 
 def run_compiler(*command)
-	require 'phusion_passenger/utils/ansi_colors' if !defined?(PhusionPassenger::Utils::AnsiColors)
+	PhusionPassenger.require_passenger_lib 'utils/ansi_colors' if !defined?(PhusionPassenger::Utils::AnsiColors)
 	show_command = command.join(' ')
 	puts show_command
 	if !system(*command)
@@ -73,15 +73,15 @@ def create_static_library(target, sources)
 	sh "ranlib #{target}"
 end
 
-def create_executable(target, sources, linkflags = "#{EXTRA_PRE_CXXFLAGS} #{EXTRA_PRE_LDFLAGS} #{EXTRA_CXXFLAGS} #{PlatformInfo.portability_ldflags} #{EXTRA_LDFLAGS} #{EXTRA_CXX_LDFLAGS}")
+def create_executable(target, sources, linkflags = "#{EXTRA_PRE_CXXFLAGS} #{EXTRA_PRE_C_LDFLAGS} #{EXTRA_CXXFLAGS} #{PlatformInfo.portability_cxx_ldflags} #{EXTRA_CXX_LDFLAGS}")
 	run_compiler "#{CXX} #{sources} -o #{target} #{linkflags}"
 end
 
-def create_c_executable(target, sources, linkflags = "#{EXTRA_PRE_CFLAGS} #{EXTRA_PRE_LDFLAGS}#{EXTRA_CFLAGS} #{PlatformInfo.portability_ldflags} #{EXTRA_LDFLAGS} #{EXTRA_C_LDFLAGS}")
+def create_c_executable(target, sources, linkflags = "#{EXTRA_PRE_CFLAGS} #{EXTRA_PRE_CXX_LDFLAGS}#{EXTRA_CFLAGS} #{PlatformInfo.portability_c_ldflags} #{EXTRA_C_LDFLAGS}")
 	run_compiler "#{CC} #{sources} -o #{target} #{linkflags}"
 end
 
-def create_shared_library(target, sources, flags = "#{EXTRA_PRE_CXXFLAGS} #{EXTRA_PRE_LDFLAGS} #{EXTRA_CXXFLAGS} #{PlatformInfo.portability_ldflags} #{EXTRA_LDFLAGS} #{EXTRA_CXX_LDFLAGS}")
+def create_shared_library(target, sources, flags = "#{EXTRA_PRE_CXXFLAGS} #{EXTRA_PRE_CXX_LDFLAGS} #{EXTRA_CXXFLAGS} #{PlatformInfo.portability_cxx_ldflags} #{EXTRA_CXX_LDFLAGS}")
 	if PlatformInfo.os_name == "macosx"
 		shlib_flag = "-flat_namespace -bundle -undefined dynamic_lookup"
 	else

data/build/cxx_tests.rb

@@ -24,17 +24,19 @@
 ### C++ components tests ###
 
 TEST_CXX_CFLAGS = "-Iext -Iext/common " <<
+	"#{EXTRA_PRE_CXXFLAGS} " <<
 	"#{LIBEV_CFLAGS} #{LIBEIO_CFLAGS} #{PlatformInfo.curl_flags} -Itest/cxx -Itest/support " <<
 	"#{TEST_COMMON_CFLAGS}"
 TEST_CXX_CFLAGS << " #{PlatformInfo.adress_sanitizer_flag}" if USE_ASAN
-TEST_CXX_LDFLAGS = "#{TEST_COMMON_LIBRARY.link_objects_as_string} " <<
+TEST_CXX_LDFLAGS = "#{EXTRA_PRE_CXX_LDFLAGS} " <<
+	"#{TEST_COMMON_LIBRARY.link_objects_as_string} " <<
 	"#{TEST_BOOST_OXT_LIBRARY} #{LIBEV_LIBS} #{LIBEIO_LIBS} " <<
 	"#{PlatformInfo.curl_libs} " <<
 	"#{PlatformInfo.zlib_libs} " <<
-	"#{PlatformInfo.portability_ldflags}"
+	"#{PlatformInfo.portability_cxx_ldflags}"
 TEST_CXX_LDFLAGS << " #{PlatformInfo.dmalloc_ldflags}" if USE_DMALLOC
 TEST_CXX_LDFLAGS << " #{PlatformInfo.adress_sanitizer_flag}" if USE_ASAN
-TEST_CXX_LDFLAGS << " #{EXTRA_LDFLAGS} #{EXTRA_CXX_LDFLAGS}"
+TEST_CXX_LDFLAGS << " #{EXTRA_CXX_LDFLAGS}"
 TEST_CXX_LDFLAGS.strip!
 TEST_CXX_OBJECTS = {
 	'test/cxx/CxxTestMain.o' => %w(

data/build/debian.rb

@@ -22,7 +22,7 @@
 #  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 #  THE SOFTWARE.
 
-require 'phusion_passenger/constants'
+PhusionPassenger.require_passenger_lib 'constants'
 require 'build/preprocessor'
 
 # If you change the default distribution list, don't forget to update the configuration
@@ -70,7 +70,6 @@ task 'debian:orig_tarball' => Packaging::PREGENERATED_FILES do
 			"It will not be regenerated. If you are sure that the orig tarball is outdated, please delete it " +
 			"and rerun this task."
 	else
-		require 'phusion_passenger/constants'
 		sh "mkdir -p #{PKG_DIR}"
 		nginx_version = PhusionPassenger::PREFERRED_NGINX_VERSION
 		local_nginx_tarball = File.expand_path("#{PKG_DIR}/nginx-#{nginx_version}.tar.gz")

data/build/integration_tests.rb

@@ -37,6 +37,10 @@ task 'test:integration:apache2' => dependencies do
 		if boolean_option('SUDO')
 			command = "#{PlatformInfo.ruby_sudo_command} -E #{command}"
 		end
+		if grep = string_option('E')
+			require 'shellwords'
+			command << " -e #{Shellwords.escape(grep)}"
+		end
 		sh "cd test && #{command}"
 	end
 end
@@ -51,6 +55,10 @@ task 'test:integration:nginx' => dependencies do
 		if boolean_option('SUDO')
 			command = "#{PlatformInfo.ruby_sudo_command} -E #{command}"
 		end
+		if grep = string_option('E')
+			require 'shellwords'
+			command << " -e #{Shellwords.escape(grep)}"
+		end
 		sh "cd test && #{command}"
 	end
 end
@@ -61,8 +69,13 @@ task 'test:integration:standalone' => dependencies do
 	if PlatformInfo.rspec.nil?
 		abort "RSpec is not installed for Ruby interpreter '#{PlatformInfo.ruby_command}'. Please install it."
 	else
+		command = "#{PlatformInfo.rspec} -c -f s integration_tests/standalone_tests.rb"
+		if grep = string_option('E')
+			require 'shellwords'
+			command << " -e #{Shellwords.escape(grep)}"
+		end
 		Dir.chdir("test") do
-			#ruby "#{PlatformInfo.rspec} -c -f s integration_tests/standalone_tests.rb"
+			ruby command
 		end
 	end
 end
@@ -83,14 +96,17 @@ end
 dependencies = [:apache2, NATIVE_SUPPORT_TARGET].compact
 desc "Run the 'apache2' integration test infinitely, and abort if/when it fails"
 task 'test:restart' => dependencies do
-	Dir.chdir("test") do
-		color_code_start = "\e[33m\e[44m\e[1m"
-		color_code_end = "\e[0m"
-		i = 1
-		while true do
-			puts "#{color_code_start}Test run #{i} (press Ctrl-C multiple times to abort)#{color_code_end}"
-			sh "spec -c -f s integration_tests/apache2.rb -e 'mod_passenger running in Apache 2 : MyCook(tm) beta running on root URI should support restarting via restart.txt'"
-			i += 1
+	require 'shellwords'
+	color_code_start = "\e[33m\e[44m\e[1m"
+	color_code_end = "\e[0m"
+	i = 1
+	while true do
+		puts "#{color_code_start}Test run #{i} (press Ctrl-C multiple times to abort)#{color_code_end}"
+		command = "cd test && rspec -c -f s integration_tests/apache2_tests.rb"
+		if grep = string_option('E')
+			command << " -e #{Shellwords.escape(grep)}"
 		end
+		sh(command)
+		i += 1
 	end
 end

data/build/misc.rb

@@ -173,8 +173,8 @@ task :compile_app => dependencies do
 			"#{LIBBOOST_OXT} " <<
 			"#{LIBEV_LIBS} " <<
 			"#{LIBEIO_LIBS} " <<
-			"#{PlatformInfo.portability_ldflags} " <<
-			"#{EXTRA_LDFLAGS}")
+			"#{PlatformInfo.portability_cxx_ldflags} " <<
+			"#{EXTRA_CXX_LDFLAGS}")
 	ensure
 		File.unlink('_source.cpp') rescue nil
 	end

data/build/oxt_tests.rb

@@ -23,8 +23,8 @@
 
 ### OXT library tests ###
 
-TEST_OXT_CFLAGS = "-I../../ext -I../support #{TEST_COMMON_CFLAGS}"
-TEST_OXT_LDFLAGS = "#{TEST_BOOST_OXT_LIBRARY} #{PlatformInfo.portability_ldflags} #{EXTRA_LDFLAGS}"
+TEST_OXT_CFLAGS = "#{EXTRA_PRE_CXXFLAGS} -Iext -Itest/support #{TEST_COMMON_CFLAGS}"
+TEST_OXT_LDFLAGS = "#{TEST_BOOST_OXT_LIBRARY} #{PlatformInfo.portability_cxx_ldflags} #{EXTRA_CXX_LDFLAGS}"
 TEST_OXT_LDFLAGS << " #{PlatformInfo.adress_sanitizer_flag}" if USE_ASAN
 TEST_OXT_OBJECTS = {
 	'oxt_test_main.o' => %w(oxt_test_main.cpp),
@@ -52,9 +52,8 @@ end
 # Define tasks for each OXT test source file.
 TEST_OXT_OBJECTS.each_pair do |target, sources|
 	file "test/oxt/#{target}" => sources.map{ |x| "test/oxt/#{x}" } do
-		Dir.chdir('test/oxt') do
-			puts "### In test/oxt:"
-			compile_cxx sources[0], TEST_OXT_CFLAGS
-		end
+		source = "test/oxt/#{sources[0]}"
+		object = source.sub(/\.cpp$/, '.o')
+		compile_cxx source, "#{TEST_OXT_CFLAGS} -o #{object}"
 	end
 end

data/build/packaging.rb

@@ -80,8 +80,7 @@ end
 
 desc "Build, sign & upload gem & tarball"
 task 'package:release' => ['package:set_official', 'package:gem', 'package:tarball', 'package:sign'] do
-	require 'phusion_passenger'
-	require 'phusion_passenger/platform_info'
+	PhusionPassenger.require_passenger_lib 'platform_info'
 	require 'yaml'
 	require 'uri'
 	require 'net/http'
@@ -150,9 +149,9 @@ task 'package:release' => ['package:set_official', 'package:gem', 'package:tarba
 			homebrew_dir = "/tmp/homebrew"
 			sh "rm -rf #{homebrew_dir}"
 			sh "git clone git@github.com:phusion/homebrew.git #{homebrew_dir}"
-			sh "cd #{homebrew_dir} && git remote add mxcl https://github.com/mxcl/homebrew.git"
-			sh "cd #{homebrew_dir} && git fetch mxcl"
-			sh "cd #{homebrew_dir} && git reset --hard mxcl/master"
+			sh "cd #{homebrew_dir} && git remote add Homebrew https://github.com/Homebrew/homebrew.git"
+			sh "cd #{homebrew_dir} && git fetch Homebrew"
+			sh "cd #{homebrew_dir} && git reset --hard Homebrew/master"
 			formula = File.read("/tmp/homebrew/Library/Formula/passenger.rb")
 			formula.gsub!(/passenger-.+?\.tar\.gz/, "passenger-#{version}.tar.gz") ||
 				abort("Unable to substitute Homebrew formula tarball filename")
@@ -169,7 +168,7 @@ task 'package:release' => ['package:set_official', 'package:gem', 'package:tarba
 			end
 			sh "cd #{homebrew_dir} && git commit -a -m 'passenger #{version}'"
 			sh "cd #{homebrew_dir} && git push -f"
-			sh "cd #{homebrew_dir} && hub pull-request 'Update passenger to version #{version}' -b mxcl:master"
+			sh "cd #{homebrew_dir} && hub pull-request 'Update passenger to version #{version}' -b Homebrew:master"
 
 			puts "Initiating building of Debian packages"
 			Rake::Task['package:initiate_debian_building'].invoke
@@ -187,8 +186,17 @@ task 'package:release' => ['package:set_official', 'package:gem', 'package:tarba
 
 			sh "scp #{PKG_DIR}/#{basename}.{gem,tar.gz,gem.asc,tar.gz.asc} app@shell.phusion.nl:#{dir}/"
 			sh "ssh app@shell.phusion.nl 'mkdir -p \"#{dir}/assets/#{subdir}\" && mv #{dir}/#{basename}.{gem,tar.gz,gem.asc,tar.gz.asc} \"#{dir}/assets/#{subdir}/\"'"
-			sh "curl -F file=@#{PKG_DIR}/#{basename}.gem --user admin:#{website_config['admin_password']} " +
+			command = "curl -F file=@#{PKG_DIR}/#{basename}.gem --user admin:#{website_config['admin_password']} " +
+				"--output /dev/stderr --write-out '%{http_code}' --silent " +
 				"https://www.phusionpassenger.com/enterprise_gems/upload"
+			puts command
+			if `#{command}` != "200\n"
+				abort "Gem upload failed"
+			else
+				# The response body does not contain a newline,
+				# so fix terminal output.
+				puts
+			end
 
 			puts "Initiating building of binaries"
 			command = "cd /srv/passenger_autobuilder/app && " +
@@ -326,26 +334,49 @@ task :fakeroot => [:apache2, :nginx, :doc] do
 	require 'rbconfig'
 	require 'fileutils'
 	include RbConfig
-	fakeroot = "pkg/fakeroot"
-	
+
+	fs_prefix  = ENV['FS_PREFIX']  || "/usr"
+	fs_bindir  = ENV['FS_BINDIR']  || "#{fs_prefix}/bin"
+	fs_sbindir = ENV['FS_SBINDIR'] || "#{fs_prefix}/sbin"
+	fs_datadir = ENV['FS_DATADIR'] || "#{fs_prefix}/share"
+	fs_docdir  = ENV['FS_DOCDIR']  || "#{fs_datadir}/doc"
+	fs_libdir  = ENV['FS_LIBDIR']  || "#{fs_prefix}/lib"
+
 	# We don't use CONFIG['archdir'] and the like because we want
 	# the files to be installed to /usr, and the Ruby interpreter
 	# on the packaging machine might be in /usr/local.
-	fake_rubylibdir = "#{fakeroot}/usr/lib/ruby/vendor_ruby"
-	fake_nodelibdir = "#{fakeroot}/usr/share/#{GLOBAL_NAMESPACE_DIRNAME}/node"
-	fake_libdir = "#{fakeroot}/usr/lib/#{GLOBAL_NAMESPACE_DIRNAME}"
-	fake_native_support_dir = "#{fakeroot}/usr/lib/ruby/#{CONFIG['ruby_version']}/#{CONFIG['arch']}"
-	fake_agents_dir = "#{fakeroot}/usr/lib/#{GLOBAL_NAMESPACE_DIRNAME}/agents"
-	fake_helper_scripts_dir = "#{fakeroot}/usr/share/#{GLOBAL_NAMESPACE_DIRNAME}/helper-scripts"
-	fake_resources_dir = "#{fakeroot}/usr/share/#{GLOBAL_NAMESPACE_DIRNAME}"
-	fake_include_dir = "#{fakeroot}/usr/share/#{GLOBAL_NAMESPACE_DIRNAME}/include"
-	fake_docdir = "#{fakeroot}/usr/share/doc/#{GLOBAL_NAMESPACE_DIRNAME}"
-	fake_bindir = "#{fakeroot}/usr/bin"
-	fake_sbindir = "#{fakeroot}/usr/sbin"
-	fake_apache2_module_dir = "#{fakeroot}/usr/lib/apache2/modules"
-	fake_apache2_module = "#{fake_apache2_module_dir}/mod_passenger.so"
-	fake_ruby_extension_source_dir = "#{fakeroot}/usr/share/#{GLOBAL_NAMESPACE_DIRNAME}/ruby_extension_source"
-	fake_nginx_module_source_dir = "#{fakeroot}/usr/share/#{GLOBAL_NAMESPACE_DIRNAME}/ngx_http_passenger_module"
+	psg_rubylibdir = ENV['RUBYLIBDIR'] || "#{fs_libdir}/ruby/vendor_ruby"
+	psg_nodelibdir = "#{fs_datadir}/#{GLOBAL_NAMESPACE_DIRNAME}/node"
+	psg_libdir     = "#{fs_libdir}/#{GLOBAL_NAMESPACE_DIRNAME}"
+	psg_native_support_dir = ENV["RUBYARCHDIR"] || "#{fs_libdir}/ruby/#{CONFIG['ruby_version']}/#{CONFIG['arch']}"
+	psg_agents_dir = "#{fs_libdir}/#{GLOBAL_NAMESPACE_DIRNAME}/agents"
+	psg_helper_scripts_dir = "#{fs_datadir}/#{GLOBAL_NAMESPACE_DIRNAME}/helper-scripts"
+	psg_resources_dir      = "#{fs_datadir}/#{GLOBAL_NAMESPACE_DIRNAME}"
+	psg_include_dir        = "#{fs_datadir}/#{GLOBAL_NAMESPACE_DIRNAME}/include"
+	psg_docdir     = "#{fs_docdir}/#{GLOBAL_NAMESPACE_DIRNAME}"
+	psg_bindir     = "#{fs_bindir}"
+	psg_sbindir    = "#{fs_sbindir}"
+	psg_apache2_module_path       = ENV['APACHE2_MODULE_PATH'] || "#{fs_libdir}/apache2/modules/mod_passenger.so"
+	psg_ruby_extension_source_dir = "#{fs_datadir}/#{GLOBAL_NAMESPACE_DIRNAME}/ruby_extension_source"
+	psg_nginx_module_source_dir   = "#{fs_datadir}/#{GLOBAL_NAMESPACE_DIRNAME}/ngx_http_passenger_module"
+	
+	fakeroot = "pkg/fakeroot"
+	fake_rubylibdir = "#{fakeroot}#{psg_rubylibdir}"
+	fake_nodelibdir = "#{fakeroot}#{psg_nodelibdir}"
+	fake_libdir     = "#{fakeroot}#{psg_libdir}"
+	fake_native_support_dir = "#{fakeroot}#{psg_native_support_dir}"
+	fake_agents_dir = "#{fakeroot}#{psg_agents_dir}"
+	fake_helper_scripts_dir = "#{fakeroot}#{psg_helper_scripts_dir}"
+	fake_resources_dir = "#{fakeroot}#{psg_resources_dir}"
+	fake_include_dir   = "#{fakeroot}#{psg_include_dir}"
+	fake_docdir     = "#{fakeroot}#{psg_docdir}"
+	fake_bindir     = "#{fakeroot}#{psg_bindir}"
+	fake_sbindir    = "#{fakeroot}#{psg_sbindir}"
+	fake_apache2_module_path       = "#{fakeroot}#{psg_apache2_module_path}"
+	fake_ruby_extension_source_dir = "#{fakeroot}#{psg_ruby_extension_source_dir}"
+	fake_nginx_module_source_dir   = "#{fakeroot}#{psg_nginx_module_source_dir}"
+
+	native_packaging_method = ENV['NATIVE_PACKAGING_METHOD'] || "deb"
 	
 	sh "rm -rf #{fakeroot}"
 	sh "mkdir -p #{fakeroot}"
@@ -419,7 +450,7 @@ task :fakeroot => [:apache2, :nginx, :doc] do
 	Packaging::USER_EXECUTABLES.each do |exe|
 		sh "cp bin/#{exe} #{fake_bindir}/"
 		if !Packaging::EXECUTABLES_WITH_FREE_RUBY.include?(exe)
-			change_shebang("#{fake_bindir}/#{exe}", "/usr/bin/ruby")
+			change_shebang("#{fake_bindir}/#{exe}", "#{fs_bindir}/ruby")
 		end
 	end
 	
@@ -428,13 +459,13 @@ task :fakeroot => [:apache2, :nginx, :doc] do
 	Packaging::SUPER_USER_EXECUTABLES.each do |exe|
 		sh "cp bin/#{exe} #{fake_sbindir}/"
 		if !Packaging::EXECUTABLES_WITH_FREE_RUBY.include?(exe)
-			change_shebang("#{fake_sbindir}/#{exe}", "/usr/bin/ruby")
+			change_shebang("#{fake_sbindir}/#{exe}", "#{fs_bindir}/ruby")
 		end
 	end
 	
 	# Apache 2 module
-	sh "mkdir -p #{fake_apache2_module_dir}"
-	sh "cp #{APACHE2_MODULE} #{fake_apache2_module_dir}/"
+	sh "mkdir -p #{File.dirname(fake_apache2_module_path)}"
+	sh "cp #{APACHE2_MODULE} #{fake_apache2_module_path}"
 
 	# Ruby extension sources
 	sh "mkdir -p #{fake_ruby_extension_source_dir}"
@@ -444,18 +475,19 @@ task :fakeroot => [:apache2, :nginx, :doc] do
 	File.open("#{fake_rubylibdir}/phusion_passenger/locations.ini", "w") do |f|
 		f.puts "[locations]"
 		f.puts "natively_packaged=true"
-		f.puts "bin_dir=/usr/bin"
-		f.puts "agents_dir=/usr/lib/#{GLOBAL_NAMESPACE_DIRNAME}/agents"
-		f.puts "lib_dir=/usr/lib/#{GLOBAL_NAMESPACE_DIRNAME}"
-		f.puts "helper_scripts_dir=/usr/share/#{GLOBAL_NAMESPACE_DIRNAME}/helper-scripts"
-		f.puts "resources_dir=/usr/share/#{GLOBAL_NAMESPACE_DIRNAME}"
-		f.puts "include_dir=/usr/share/#{GLOBAL_NAMESPACE_DIRNAME}/include"
-		f.puts "doc_dir=/usr/share/doc/#{GLOBAL_NAMESPACE_DIRNAME}"
-		f.puts "ruby_libdir=/usr/lib/ruby/vendor_ruby"
-		f.puts "node_libdir=/usr/share/#{GLOBAL_NAMESPACE_DIRNAME}/node"
-		f.puts "apache2_module_path=/usr/lib/apache2/modules/mod_passenger.so"
-		f.puts "ruby_extension_source_dir=/usr/share/#{GLOBAL_NAMESPACE_DIRNAME}/ruby_extension_source"
-		f.puts "nginx_module_source_dir=/usr/share/#{GLOBAL_NAMESPACE_DIRNAME}/ngx_http_passenger_module"
+		f.puts "native_packaging_method=#{native_packaging_method}"
+		f.puts "bin_dir=#{psg_bindir}"
+		f.puts "agents_dir=#{psg_agents_dir}"
+		f.puts "lib_dir=#{psg_libdir}"
+		f.puts "helper_scripts_dir=#{psg_helper_scripts_dir}"
+		f.puts "resources_dir=#{psg_resources_dir}"
+		f.puts "include_dir=#{psg_include_dir}"
+		f.puts "doc_dir=#{psg_docdir}"
+		f.puts "ruby_libdir=#{psg_rubylibdir}"
+		f.puts "node_libdir=#{psg_nodelibdir}"
+		f.puts "apache2_module_path=#{psg_apache2_module_path}"
+		f.puts "ruby_extension_source_dir=#{psg_ruby_extension_source_dir}"
+		f.puts "nginx_module_source_dir=#{psg_nginx_module_source_dir}"
 	end
 
 	# Sanity check the locations.ini file