passenger 5.0.0.beta3 → 5.0.0.rc1

data/build/basics.rb

@@ -22,7 +22,7 @@
 #  THE SOFTWARE.
 
 begin
-	require 'rubygems'
+  require 'rubygems'
 rescue LoadError
 end
 require 'pathname'
@@ -50,83 +50,83 @@ require 'build/cplusplus_support'
 #################################################
 
 class TemplateRenderer
-	def initialize(filename)
-		require 'erb' if !defined?(ERB)
-		@erb = ERB.new(File.read(filename), nil, "-")
-		@erb.filename = filename
-	end
-
-	def render
-		return @erb.result(binding)
-	end
-
-	def render_to(filename)
-		puts "Creating #{filename}"
-		text = render
-		# When packaging, some timestamps may be modified. The user may not
-		# have write access to the source root (for example, when Passenger
-		# Standalone is compiling its runtime), so we only write to the file
-		# when necessary.
-		if !File.exist?(filename) || File.writable?(filename) || File.read(filename) != text
-			File.open(filename, 'w') do |f|
-				f.write(text)
-			end
-		end
-	end
+  def initialize(filename)
+    require 'erb' if !defined?(ERB)
+    @erb = ERB.new(File.read(filename), nil, "-")
+    @erb.filename = filename
+  end
+
+  def render
+    return @erb.result(binding)
+  end
+
+  def render_to(filename)
+    puts "Creating #{filename}"
+    text = render
+    # When packaging, some timestamps may be modified. The user may not
+    # have write access to the source root (for example, when Passenger
+    # Standalone is compiling its runtime), so we only write to the file
+    # when necessary.
+    if !File.exist?(filename) || File.writable?(filename) || File.read(filename) != text
+      File.open(filename, 'w') do |f|
+        f.write(text)
+      end
+    end
+  end
 end
 
 def string_option(name, default_value = nil)
-	value = ENV[name]
-	if value.nil? || value.empty?
-		return default_value
-	else
-		return value
-	end
+  value = ENV[name]
+  if value.nil? || value.empty?
+    return default_value
+  else
+    return value
+  end
 end
 
 def compiler_flag_option(name)
-	return string_option(name, '').gsub("\n", " ")
+  return string_option(name, '').gsub("\n", " ")
 end
 
 def boolean_option(name, default_value = false)
-	value = ENV[name]
-	if value.nil? || value.empty?
-		return default_value
-	else
-		return value == "yes" || value == "on" || value == "true" || value == "1"
-	end
+  value = ENV[name]
+  if value.nil? || value.empty?
+    return default_value
+  else
+    return value == "yes" || value == "on" || value == "true" || value == "1"
+  end
 end
 
 def maybe_wrap_in_ccache(command)
-	if boolean_option('USE_CCACHE', false) && command !~ /^ccache /
-		return "ccache #{command}"
-	else
-		return command
-	end
+  if boolean_option('USE_CCACHE', false) && command !~ /^ccache /
+    return "ccache #{command}"
+  else
+    return command
+  end
 end
 
 #################################################
 
 if string_option('OUTPUT_DIR')
-	OUTPUT_DIR = string_option('OUTPUT_DIR') + "/"
+  OUTPUT_DIR = string_option('OUTPUT_DIR') + "/"
 else
-	OUTPUT_DIR = "buildout/"
+  OUTPUT_DIR = "buildout/"
 end
 
 verbose true if !boolean_option('REALLY_QUIET')
 if boolean_option('STDERR_TO_STDOUT')
-	# Just redirecting the file descriptor isn't enough because
-	# data written to STDERR might arrive in an unexpected order
-	# compared to STDOUT.
-	STDERR.reopen(STDOUT)
-	Object.send(:remove_const, :STDERR)
-	STDERR = STDOUT
-	$stderr = $stdout
+  # Just redirecting the file descriptor isn't enough because
+  # data written to STDERR might arrive in an unexpected order
+  # compared to STDOUT.
+  STDERR.reopen(STDOUT)
+  Object.send(:remove_const, :STDERR)
+  STDERR = STDOUT
+  $stderr = $stdout
 end
 
 if boolean_option('CACHING', true) && !boolean_option('RELEASE')
-	PlatformInfo.cache_dir = OUTPUT_DIR + "cache"
-	FileUtils.mkdir_p(PlatformInfo.cache_dir)
+  PlatformInfo.cache_dir = OUTPUT_DIR + "cache"
+  FileUtils.mkdir_p(PlatformInfo.cache_dir)
 end
 
 # https://github.com/phusion/passenger/issues/672
@@ -174,21 +174,21 @@ EXTRA_CFLAGS << " " << compiler_flag_option('EXTRA_CFLAGS') if !compiler_flag_op
 EXTRA_CXXFLAGS = PlatformInfo.default_extra_cxxflags.dup
 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)
+  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.
 EXTRA_PRE_C_LDFLAGS   = compiler_flag_option('EXTRA_PRE_LDFLAGS') + " " +
-	compiler_flag_option('EXTRA_PRE_C_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')
+  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')
+  compiler_flag_option('EXTRA_C_LDFLAGS')
 EXTRA_CXX_LDFLAGS = compiler_flag_option('EXTRA_LDFLAGS') + " " +
-	compiler_flag_option('EXTRA_CXX_LDFLAGS')
+  compiler_flag_option('EXTRA_CXX_LDFLAGS')
 
 
 AGENT_OUTPUT_DIR          = string_option('AGENT_OUTPUT_DIR', OUTPUT_DIR + "support-binaries") + "/"
@@ -198,7 +198,7 @@ LIBEV_OUTPUT_DIR          = string_option('LIBEV_OUTPUT_DIR', OUTPUT_DIR + "libe
 LIBEIO_OUTPUT_DIR         = string_option('LIBEIO_OUTPUT_DIR', OUTPUT_DIR + "libeio") + "/"
 ruby_extension_archdir    = PlatformInfo.ruby_extension_binary_compatibility_id
 RUBY_EXTENSION_OUTPUT_DIR = string_option('RUBY_EXTENSION_OUTPUT_DIR',
-	OUTPUT_DIR + "ruby/" + ruby_extension_archdir) + "/"
+  OUTPUT_DIR + "ruby/" + ruby_extension_archdir) + "/"
 PKG_DIR                   = string_option('PKG_DIR', "pkg")
 
 

data/build/common_library.rb

@@ -33,130 +33,130 @@ PhusionPassenger.require_passenger_lib 'common_library'
 
 # Defines tasks for compiling a static library containing Boost and OXT.
 def define_libboost_oxt_task(namespace, output_dir, extra_compiler_flags = nil)
-	output_file = "#{output_dir}.a"
-	flags = "-Iext #{extra_compiler_flags} #{EXTRA_CXXFLAGS}"
-
-	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"
-		aggregate_object = "#{output_dir}/aggregate.o"
-		object_files     = [aggregate_object]
-
-		file(aggregate_object => sources) do
-			sh "mkdir -p #{output_dir}" if !File.directory?(output_dir)
-			aggregate_content = %Q{
-				#ifndef _GNU_SOURCE
-					#define _GNU_SOURCE
-				#endif
-			}
-			sources.each do |source_file|
-				name = source_file.sub(/^ext\//, '')
-				aggregate_content << "#include \"#{name}\"\n"
-			end
-			File.open(aggregate_source, 'w') do |f|
-				f.write(aggregate_content)
-			end
-			compile_cxx(aggregate_source, "#{flags} -o #{aggregate_object}")
-		end
-	else
-		# Define compilation targets for .cpp files in ext/boost/src/pthread.
-		boost_object_files = []
-		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}"
-			boost_object_files << object_file
-
-			file object_file => source_file do
-				sh "mkdir -p #{boost_output_dir}" if !File.directory?(boost_output_dir)
-				compile_cxx(source_file, "#{flags} -o #{object_file}")
-			end
-		end
-
-		# Define compilation targets for .cpp files in ext/oxt.
-		oxt_object_files = []
-		oxt_dependency_files = Dir["ext/oxt/*.hpp"] + Dir["ext/oxt/detail/*.hpp"]
-		Dir['ext/oxt/*.cpp'].each do |source_file|
-			object_name = File.basename(source_file.sub(/\.cpp$/, '.o'))
-			oxt_output_dir  = "#{output_dir}/oxt"
-			object_file = "#{oxt_output_dir}/#{object_name}"
-			oxt_object_files << object_file
-
-			file object_file => [source_file, *oxt_dependency_files] do
-				sh "mkdir -p #{oxt_output_dir}" if !File.directory?(oxt_output_dir)
-				compile_cxx(source_file, "-O2 #{flags} -o #{object_file}".strip)
-			end
-		end
-
-		object_files = boost_object_files + oxt_object_files
-	end
-
-	file(output_file => object_files) do
-		sh "mkdir -p #{output_dir}"
-		create_static_library(output_file, object_files.join(' '))
-	end
-
-	task "#{namespace}:clean" do
-		sh "rm -rf #{output_file} #{output_dir}"
-	end
-
-	return output_file
+  output_file = "#{output_dir}.a"
+  flags = "-Iext #{extra_compiler_flags} #{EXTRA_CXXFLAGS}"
+
+  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"
+    aggregate_object = "#{output_dir}/aggregate.o"
+    object_files     = [aggregate_object]
+
+    file(aggregate_object => sources) do
+      sh "mkdir -p #{output_dir}" if !File.directory?(output_dir)
+      aggregate_content = %Q{
+        #ifndef _GNU_SOURCE
+          #define _GNU_SOURCE
+        #endif
+      }
+      sources.each do |source_file|
+        name = source_file.sub(/^ext\//, '')
+        aggregate_content << "#include \"#{name}\"\n"
+      end
+      File.open(aggregate_source, 'w') do |f|
+        f.write(aggregate_content)
+      end
+      compile_cxx(aggregate_source, "#{flags} -o #{aggregate_object}")
+    end
+  else
+    # Define compilation targets for .cpp files in ext/boost/src/pthread.
+    boost_object_files = []
+    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}"
+      boost_object_files << object_file
+
+      file object_file => source_file do
+        sh "mkdir -p #{boost_output_dir}" if !File.directory?(boost_output_dir)
+        compile_cxx(source_file, "#{flags} -o #{object_file}")
+      end
+    end
+
+    # Define compilation targets for .cpp files in ext/oxt.
+    oxt_object_files = []
+    oxt_dependency_files = Dir["ext/oxt/*.hpp"] + Dir["ext/oxt/detail/*.hpp"]
+    Dir['ext/oxt/*.cpp'].each do |source_file|
+      object_name = File.basename(source_file.sub(/\.cpp$/, '.o'))
+      oxt_output_dir  = "#{output_dir}/oxt"
+      object_file = "#{oxt_output_dir}/#{object_name}"
+      oxt_object_files << object_file
+
+      file object_file => [source_file, *oxt_dependency_files] do
+        sh "mkdir -p #{oxt_output_dir}" if !File.directory?(oxt_output_dir)
+        compile_cxx(source_file, "-O2 #{flags} -o #{object_file}".strip)
+      end
+    end
+
+    object_files = boost_object_files + oxt_object_files
+  end
+
+  file(output_file => object_files) do
+    sh "mkdir -p #{output_dir}"
+    create_static_library(output_file, object_files.join(' '))
+  end
+
+  task "#{namespace}:clean" do
+    sh "rm -rf #{output_file} #{output_dir}"
+  end
+
+  return output_file
 end
 
 
 ########## libev ##########
 
 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_TARGET
-
-	dependencies = [
-		"ext/libev/configure",
-		"ext/libev/config.h.in",
-		"ext/libev/Makefile.am"
-	]
-	file LIBEV_OUTPUT_DIR + "Makefile" => dependencies do
-		cc = PlatformInfo.cc
-		cxx = PlatformInfo.cxx
-		# Disable all warnings: http://pod.tst.eu/http://cvs.schmorp.de/libev/ev.pod#COMPILER_WARNINGS
-		cflags = "#{EXTRA_CFLAGS} -w"
-		sh "mkdir -p #{LIBEV_OUTPUT_DIR}" if !File.directory?(LIBEV_OUTPUT_DIR)
-		sh "cd #{LIBEV_OUTPUT_DIR} && sh #{LIBEV_SOURCE_DIR}configure " +
-			"--disable-shared --enable-static " +
-			# libev's configure script may select a different default compiler than we
-			# do, so we force our compiler choice.
-			"CC='#{cc}' CXX='#{cxx}' CFLAGS='#{cflags}' orig_CFLAGS=1"
-	end
-
-	libev_sources = Dir["ext/libev/{*.c,*.h}"]
-	file LIBEV_OUTPUT_DIR + ".libs/libev.a" => [LIBEV_OUTPUT_DIR + "Makefile"] + libev_sources do
-		sh "rm -f #{LIBEV_OUTPUT_DIR}libev.la"
-		sh "cd #{LIBEV_OUTPUT_DIR} && make libev.la"
-	end
-
-	task 'libev:clean' do
-		patterns = %w(Makefile config.h config.log config.status libtool
-			stamp-h1 *.o *.lo *.la .libs .deps)
-		patterns.each do |pattern|
-			sh "rm -rf #{LIBEV_OUTPUT_DIR}#{pattern}"
-		end
-	end
-
-	task :clean => 'libev:clean'
+  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_TARGET
+
+  dependencies = [
+    "ext/libev/configure",
+    "ext/libev/config.h.in",
+    "ext/libev/Makefile.am"
+  ]
+  file LIBEV_OUTPUT_DIR + "Makefile" => dependencies do
+    cc = PlatformInfo.cc
+    cxx = PlatformInfo.cxx
+    # Disable all warnings: http://pod.tst.eu/http://cvs.schmorp.de/libev/ev.pod#COMPILER_WARNINGS
+    cflags = "#{EXTRA_CFLAGS} -w"
+    sh "mkdir -p #{LIBEV_OUTPUT_DIR}" if !File.directory?(LIBEV_OUTPUT_DIR)
+    sh "cd #{LIBEV_OUTPUT_DIR} && sh #{LIBEV_SOURCE_DIR}configure " +
+      "--disable-shared --enable-static " +
+      # libev's configure script may select a different default compiler than we
+      # do, so we force our compiler choice.
+      "CC='#{cc}' CXX='#{cxx}' CFLAGS='#{cflags}' orig_CFLAGS=1"
+  end
+
+  libev_sources = Dir["ext/libev/{*.c,*.h}"]
+  file LIBEV_OUTPUT_DIR + ".libs/libev.a" => [LIBEV_OUTPUT_DIR + "Makefile"] + libev_sources do
+    sh "rm -f #{LIBEV_OUTPUT_DIR}libev.la"
+    sh "cd #{LIBEV_OUTPUT_DIR} && make libev.la"
+  end
+
+  task 'libev:clean' do
+    patterns = %w(Makefile config.h config.log config.status libtool
+      stamp-h1 *.o *.lo *.la .libs .deps)
+    patterns.each do |pattern|
+      sh "rm -rf #{LIBEV_OUTPUT_DIR}#{pattern}"
+    end
+  end
+
+  task :clean => 'libev:clean'
 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
+  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
 
 # Apple Clang 4.2 complains about ambiguous member templates in ev++.h.
@@ -166,52 +166,52 @@ LIBEV_CFLAGS << " -Wno-ambiguous-member-template" if PlatformInfo.compiler_suppo
 ########## libeio ##########
 
 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_TARGET
-
-	dependencies = [
-		"ext/libeio/configure",
-		"ext/libeio/config.h.in",
-		"ext/libeio/Makefile.am"
-	]
-	file LIBEIO_OUTPUT_DIR + "Makefile" => dependencies do
-		cc = PlatformInfo.cc
-		cxx = PlatformInfo.cxx
-		# Disable all warnings. The author has a clear standpoint on that:
-		# http://pod.tst.eu/http://cvs.schmorp.de/libev/ev.pod#COMPILER_WARNINGS
-		cflags = "#{EXTRA_CFLAGS} -w"
-		sh "mkdir -p #{LIBEIO_OUTPUT_DIR}" if !File.directory?(LIBEIO_OUTPUT_DIR)
-		sh "cd #{LIBEIO_OUTPUT_DIR} && sh #{LIBEIO_SOURCE_DIR}configure " +
-			"--disable-shared --enable-static " +
-			# libeio's configure script may select a different default compiler than we
-			# do, so we force our compiler choice.
-			"CC='#{cc}' CXX='#{cxx}' CFLAGS='#{cflags}'"
-	end
-
-	libeio_sources = Dir["ext/libeio/{*.c,*.h}"]
-	file LIBEIO_OUTPUT_DIR + ".libs/libeio.a" => [LIBEIO_OUTPUT_DIR + "Makefile"] + libeio_sources do
-		sh "rm -f #{LIBEIO_OUTPUT_DIR}/libeio.la"
-		sh "cd #{LIBEIO_OUTPUT_DIR} && make libeio.la"
-	end
-
-	task 'libeio:clean' do
-		patterns = %w(Makefile config.h config.log config.status libtool
-			stamp-h1 *.o *.lo *.la .libs .deps)
-		patterns.each do |pattern|
-			sh "rm -rf #{LIBEIO_OUTPUT_DIR}#{pattern}"
-		end
-	end
-
-	task :clean => 'libeio:clean'
+  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_TARGET
+
+  dependencies = [
+    "ext/libeio/configure",
+    "ext/libeio/config.h.in",
+    "ext/libeio/Makefile.am"
+  ]
+  file LIBEIO_OUTPUT_DIR + "Makefile" => dependencies do
+    cc = PlatformInfo.cc
+    cxx = PlatformInfo.cxx
+    # Disable all warnings. The author has a clear standpoint on that:
+    # http://pod.tst.eu/http://cvs.schmorp.de/libev/ev.pod#COMPILER_WARNINGS
+    cflags = "#{EXTRA_CFLAGS} -w"
+    sh "mkdir -p #{LIBEIO_OUTPUT_DIR}" if !File.directory?(LIBEIO_OUTPUT_DIR)
+    sh "cd #{LIBEIO_OUTPUT_DIR} && sh #{LIBEIO_SOURCE_DIR}configure " +
+      "--disable-shared --enable-static " +
+      # libeio's configure script may select a different default compiler than we
+      # do, so we force our compiler choice.
+      "CC='#{cc}' CXX='#{cxx}' CFLAGS='#{cflags}'"
+  end
+
+  libeio_sources = Dir["ext/libeio/{*.c,*.h}"]
+  file LIBEIO_OUTPUT_DIR + ".libs/libeio.a" => [LIBEIO_OUTPUT_DIR + "Makefile"] + libeio_sources do
+    sh "rm -f #{LIBEIO_OUTPUT_DIR}/libeio.la"
+    sh "cd #{LIBEIO_OUTPUT_DIR} && make libeio.la"
+  end
+
+  task 'libeio:clean' do
+    patterns = %w(Makefile config.h config.log config.status libtool
+      stamp-h1 *.o *.lo *.la .libs .deps)
+    patterns.each do |pattern|
+      sh "rm -rf #{LIBEIO_OUTPUT_DIR}#{pattern}"
+    end
+  end
+
+  task :clean => 'libeio:clean'
 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
+  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
 
 
@@ -225,9 +225,9 @@ end
 
 dependencies = ['ext/common/Constants.h.erb', 'lib/phusion_passenger.rb', 'lib/phusion_passenger/constants.rb']
 file 'ext/common/Constants.h' => dependencies do
-	PhusionPassenger.require_passenger_lib 'constants'
-	template = TemplateRenderer.new('ext/common/Constants.h.erb')
-	template.render_to('ext/common/Constants.h')
+  PhusionPassenger.require_passenger_lib 'constants'
+  template = TemplateRenderer.new('ext/common/Constants.h.erb')
+  template.render_to('ext/common/Constants.h')
 end