pg 0.9.0 → 0.10.0

data/README

@@ -5,8 +5,8 @@ library works with PostgreSQL 7.4 and later.
 
 == Requirements
 
-* Ruby 1.8.6 or later.
-* PostgreSQL 7.3 or later installed.
+* Ruby 1.8.7-p174 or later.
+* PostgreSQL 7.4 or later installed.
 
 It may work with earlier versions as well, but those are not regularly tested.
 

data/Rakefile

@@ -11,12 +11,14 @@
 #
 
 BEGIN {
+	require 'rbconfig'
 	require 'pathname'
 	basedir = Pathname.new( __FILE__ ).dirname
 
 	libdir = basedir + "lib"
-	extdir = basedir + "ext"
+	extdir = libdir + Config::CONFIG['sitearch']
 
+	$LOAD_PATH.unshift( basedir.to_s ) unless $LOAD_PATH.include?( basedir.to_s )
 	$LOAD_PATH.unshift( libdir.to_s ) unless $LOAD_PATH.include?( libdir.to_s )
 	$LOAD_PATH.unshift( extdir.to_s ) unless $LOAD_PATH.include?( extdir.to_s )
 }
@@ -75,7 +77,7 @@ elsif VERSION_FILE.exist?
 	PKG_VERSION = VERSION_FILE.read[ /VERSION\s*=\s*['"](\d+\.\d+\.\d+)['"]/, 1 ]
 end
 
-PKG_VERSION ||= '0.0.0'
+PKG_VERSION = '0.0.0' unless defined?( PKG_VERSION ) && !PKG_VERSION.nil?
 
 PKG_FILE_NAME = "#{PKG_NAME.downcase}-#{PKG_VERSION}"
 GEM_FILE_NAME = "#{PKG_FILE_NAME}.gem"
@@ -90,7 +92,7 @@ EXTCONF       = EXTDIR + 'extconf.rb'
 
 ARTIFACTS_DIR = Pathname.new( CC_BUILD_ARTIFACTS )
 
-TEXT_FILES    = Rake::FileList.new( %w[Rakefile ChangeLog README LICENSE] )
+TEXT_FILES    = Rake::FileList.new( %w[Rakefile ChangeLog README* LICENSE] )
 BIN_FILES     = Rake::FileList.new( "#{BINDIR}/*" )
 LIB_FILES     = Rake::FileList.new( "#{LIBDIR}/**/*.rb" )
 EXT_FILES     = Rake::FileList.new( "#{EXTDIR}/**/*.{c,h,rb}" )
@@ -167,26 +169,36 @@ if !RAKE_TASKDIR.exist?
 end
 
 require RAKE_TASKDIR + 'helpers.rb'
+include RakefileHelpers
 
 # Set the build ID if the mercurial executable is available
 if hg = which( 'hg' )
-	id = IO.read('|-') or exec hg.to_s, 'id', '-n'
-	PKG_BUILD = 'pre' + (id.chomp[ /^[[:xdigit:]]+/ ] || '1')
+	id = `#{hg} id -n`.chomp
+	PKG_BUILD = (id.chomp[ /^[[:xdigit:]]+/ ] || '1')
 else
-	PKG_BUILD = 'pre0'
+	PKG_BUILD = '0'
 end
 SNAPSHOT_PKG_NAME = "#{PKG_FILE_NAME}.#{PKG_BUILD}"
 SNAPSHOT_GEM_NAME = "#{SNAPSHOT_PKG_NAME}.gem"
 
 # Documentation constants
-RDOCDIR = DOCSDIR + 'api'
+API_DOCSDIR = DOCSDIR + 'api'
+README_FILE = TEXT_FILES.find {|path| path =~ /^README/ } || 'README'
 RDOC_OPTIONS = [
-	'-w', '4',
-	'-HN',
-	'-i', '.',
-	'-m', 'README',
-	'-t', PKG_NAME,
-	'-W', 'http://bitbucket.org/ged/ruby-pg/browser/'
+	'--tab-width=4',
+	'--show-hash',
+	'--include', BASEDIR.to_s,
+	"--main=#{README_FILE}",
+	"--title=#{PKG_NAME}",
+  ]
+YARD_OPTIONS = [
+	'--use-cache',
+	'--protected',
+	'-r', README_FILE,
+	'--exclude', 'extconf\\.rb',
+	'--files', 'ChangeLog,LICENSE',
+	'--output-dir', API_DOCSDIR.to_s,
+	'--title', "#{PKG_NAME} #{PKG_VERSION}",
   ]
 
 # Release constants
@@ -194,28 +206,30 @@ SMTP_HOST = "mail.faeriemud.org"
 SMTP_PORT = 465 # SMTP + SSL
 
 # Project constants
-PROJECT_HOST = 'bitbucket.org'
-PROJECT_PUBDIR = '/ged/ruby-pg/downloads/'
+PROJECT_HOST = 'deveiate.org'
+PROJECT_PUBDIR = '/usr/local/www/public/code/'
 PROJECT_DOCDIR = "#{PROJECT_PUBDIR}/#{PKG_NAME}"
 PROJECT_SCPPUBURL = "#{PROJECT_HOST}:#{PROJECT_PUBDIR}"
 PROJECT_SCPDOCURL = "#{PROJECT_HOST}:#{PROJECT_DOCDIR}"
 
+GEM_PUBHOST = 'rubygems.org'
+
 # Gem dependencies: gemname => version
 DEPENDENCIES = {
 }
 
 # Developer Gem dependencies: gemname => version
 DEVELOPMENT_DEPENDENCIES = {
-	'rake'        => '>= 0.8.7',
-	'rcodetools'  => '>= 0.7.0.0',
-	'rcov'        => '>= 0.8.1.2.0',
-	'rdoc'        => '>= 2.4.3',
-	'RedCloth'    => '>= 4.0.3',
-	'rspec'       => '>= 1.2.6',
-	'termios'     => '>= 0',
-	'text-format' => '>= 1.0.0',
-	'tmail'       => '>= 1.2.3.1',
-	'diff-lcs'    => '>= 1.1.2',
+	'rake'          => '~> 0.8.7',
+	'rcodetools'    => '~> 0.7.0.0',
+	'rcov'          => '~> 0.8.1.2.0',
+	'yard'          => '~> 0.6.1',
+	'RedCloth'      => '~> 4.2.3',
+	'rspec'         => '~> 2.0.1',
+	'ruby-termios'  => '~> 0.9.6',
+	'text-format'   => '~> 1.0.0',
+	'tmail'         => '~> 1.2.3.1',
+	'rake-compiler' => '~>0.7.0',
 }
 
 # Non-gem requirements: packagename => version
@@ -234,13 +248,14 @@ GEMSPEC   = Gem::Specification.new do |gem|
 		"This library works with PostgreSQL 7.4 and later.",
   	  ].join( "\n" )
 
-	gem.authors           = "Michael Granger"
-	gem.email             = ["ged@FaerieMUD.org"]
+	gem.authors           = ["Jeff Davis", "Michael Granger"]
+	gem.email             = ["ruby-pg@j-davis.com", "ged@FaerieMUD.org"]
 	gem.homepage          = 'http://bitbucket.org/ged/ruby-pg/'
+	gem.licenses          = ["Ruby", "GPL", "BSD"]
 
 	gem.has_rdoc          = true
 	gem.rdoc_options      = RDOC_OPTIONS
-	gem.extra_rdoc_files  = %w[ChangeLog README LICENSE]
+	gem.extra_rdoc_files  = TEXT_FILES - [ 'Rakefile' ]
 
 	gem.bindir            = BINDIR.relative_path_from(BASEDIR).to_s
 	gem.executables       = BIN_FILES.select {|pn| File.executable?(pn) }.
@@ -254,6 +269,13 @@ GEMSPEC   = Gem::Specification.new do |gem|
 	gem.files             = RELEASE_FILES
 	gem.test_files        = SPEC_FILES
 
+	# signing key and certificate chain
+	gem.signing_key       = '/Volumes/Keys/ged-private_gem_key.pem'
+	gem.cert_chain        = [File.expand_path('~/.gem/ged-public_gem_cert.pem')]
+
+
+	gem.required_ruby_version = '>=1.8.7'
+
 	DEPENDENCIES.each do |name, version|
 		version = '>= 0' if version.length.zero?
 		gem.add_runtime_dependency( name, version )
@@ -294,7 +316,7 @@ import LOCAL_RAKEFILE if LOCAL_RAKEFILE.exist?
 #####################################################################
 
 ### Default task
-task :default  => [:clean, :local, :spec, :rdoc, :package]
+task :default  => [:clean, :local, :spec, :apidocs, :package]
 
 ### Task the local Rakefile can append to -- no-op by default
 task :local

data/Rakefile.local

@@ -1,26 +1,61 @@
 #!rake
 
-require 'rake/extensiontask'
-require 'rake/extensioncompiler'
+require 'uri'
+require 'tempfile'
 require 'rbconfig'
 
-# C extension constants
+MISCDIR = BASEDIR + 'misc'
+
 EXT_MAKEFILE  = EXTDIR + 'Makefile'
 EXT_SOURCES   = FileList[ EXTDIR + '*.c' ]
-EXT_SO        = EXTDIR + "pg.#{CONFIG['DLEXT']}"
-
-SITEARCH_DIR  = LIBDIR + Config::CONFIG['sitearch']
+EXT_SO        = EXTDIR + "pg_ext.#{CONFIG['DLEXT']}"
 
 NUM_CPUS = if File.exist?('/proc/cpuinfo')
 	File.read('/proc/cpuinfo').scan('processor').length
+elsif RUBY_PLATFORM.include?( 'darwin' )
+	`system_profiler SPHardwareDataType | grep 'Cores' | awk '{print $5}'`.chomp
 else
 	1
 end
 
 # Cross-compilation constants
-COMPILE_HOME = File.expand_path("~/.rake-compiler")
-OPENSSL_VERSION = ENV['OPENSSL_VERSION'] || '0.9.8l'
-POSTGRESQL_VERSION = ENV['POSTGRESQL_VERSION'] || '8.4.2'
+OPENSSL_VERSION            = ENV['OPENSSL_VERSION'] || '1.0.0a'
+POSTGRESQL_VERSION         = ENV['POSTGRESQL_VERSION'] || '9.0.1'
+
+COMPILE_HOME               = Pathname( "~/.rake-compiler" ).expand_path
+STATIC_SOURCESDIR          = COMPILE_HOME + 'sources'
+STATIC_BUILDDIR            = COMPILE_HOME + 'builds'
+
+# Static OpenSSL build vars
+STATIC_OPENSSL_BUILDDIR    = STATIC_BUILDDIR + "openssl-#{OPENSSL_VERSION}"
+
+OPENSSL_SOURCE_URI         =
+	URI( "http://www.openssl.org/source/openssl-#{OPENSSL_VERSION}.tar.gz" )
+OPENSSL_TARBALL            = STATIC_SOURCESDIR + File.basename( OPENSSL_SOURCE_URI.path )
+OPENSSL_MAKEFILE           = STATIC_OPENSSL_BUILDDIR + 'Makefile'
+
+LIBSSLEAY32                = STATIC_OPENSSL_BUILDDIR + 'libssleay32.a'
+LIBEAY32                   = STATIC_OPENSSL_BUILDDIR + 'libeay32.a'
+
+OPENSSL_PATCHES            = Rake::FileList[ MISCDIR + "openssl-#{OPENSSL_VERSION}.*.patch" ]
+
+# Static PostgreSQL build vars
+STATIC_POSTGRESQL_BUILDDIR = STATIC_BUILDDIR + "postgresql-#{POSTGRESQL_VERSION}"
+POSTGRESQL_SOURCE_URI      = begin
+	uristring = "http://ftp9.us.postgresql.org/pub/mirrors/postgresql/source/" +
+		"v%s/postgresql-%s.tar.gz" % [ POSTGRESQL_VERSION, POSTGRESQL_VERSION ]
+	URI( uristring )
+end
+POSTGRESQL_TARBALL         = STATIC_SOURCESDIR + File.basename( POSTGRESQL_SOURCE_URI.path )
+
+STATIC_POSTGRESQL_SRCDIR   = STATIC_POSTGRESQL_BUILDDIR + 'src'
+STATIC_POSTGRESQL_LIBDIR   = STATIC_POSTGRESQL_SRCDIR + 'interfaces/libpq'
+STATIC_POSTGRESQL_INCDIR   = STATIC_POSTGRESQL_SRCDIR + 'include'
+
+POSTGRESQL_GLOBAL_MAKEFILE = STATIC_POSTGRESQL_SRCDIR + 'Makefile.global'
+POSTGRESQL_SHLIB_MAKEFILE  = STATIC_POSTGRESQL_SRCDIR + 'Makefile.shlib'
+POSTGRESQL_SHLIB_MF_ORIG   = STATIC_POSTGRESQL_SRCDIR + 'Makefile.shlib.orig'
+POSTGRESQL_LIB             = STATIC_POSTGRESQL_LIBDIR + 'libpq.a'
 
 CROSS_PREFIX = if RUBY_PLATFORM.include?( 'darwin' )
 	'i386-mingw32'
@@ -32,6 +67,13 @@ end
 SPEC_DATA = Rake::FileList[ SPECDIR + 'data/*' ]
 GEMSPEC.test_files += SPEC_DATA.to_a
 
+# Clean up any testing database directories
+TESTING_TMPDIRS = Rake::FileList[ "#{BASEDIR}/tmp_test_*" ]
+CLOBBER.include( STATIC_SOURCESDIR.to_s, *TESTING_TMPDIRS )
+
+# clean intermediate files and folders
+CLEAN.include( STATIC_BUILDDIR.to_s )
+
 
 #####################################################################
 ###	T A S K S
@@ -47,197 +89,224 @@ namespace :spec do
 	task :text  => [ :compile ]
 end
 
-ENV['RUBY_CC_VERSION'] = '1.8.6:1.9.1'
-
-Rake::ExtensionTask.new do |ext|
-	ext.name = 'pg_ext'
-	ext.gem_spec = GEMSPEC
-	ext.ext_dir = 'ext'
-	ext.lib_dir = 'lib'
-	ext.source_pattern = "*.{c,h}"
-
-	# If there's an explicit 'compile' argument, use everything after it as options.
-	if offset = ARGV.index( 'compile' )
-		trace "config options = %p" % [ ARGV[(offset + 1)..-1] ]
-		ext.config_options = ARGV[ (offset + 1)..-1 ]
-	# Otherwise, just grab everything from the first option onward
-	elsif offset = ARGV.index( ARGV.find {|arg| arg =~ /^--/ } )
-		trace "config options = %p" % [ ARGV[offset..-1] ]
-		ext.config_options = ARGV[ offset..-1 ]
-	else
-		trace "No config options (ARGV = %p)" % [ ARGV ]
-	end
+ENV['RUBY_CC_VERSION'] = '1.8.6:1.9.2'
+
+begin
+	require 'rake/clean'
+	require 'rake/extensiontask'
+	require 'rake/extensioncompiler'
+
+	Rake::ExtensionTask.new do |ext|
+		ext.name = 'pg_ext'
+		ext.gem_spec = GEMSPEC
+		ext.ext_dir = EXTDIR.to_s
+		ext.lib_dir = LIBDIR.to_s
+		ext.source_pattern = "*.{c,h}"
+
+		# If there's an explicit 'compile' argument, use everything after it as options.
+		if offset = ARGV.index( 'compile' )
+			trace "config options = %p" % [ ARGV[(offset + 1)..-1] ]
+			ext.config_options = ARGV[ (offset + 1)..-1 ]
+		# Otherwise, just grab everything from the first option onward
+		elsif offset = ARGV.index( ARGV.find {|arg| arg =~ /^--/ } )
+			trace "config options = %p" % [ ARGV[offset..-1] ]
+			ext.config_options = ARGV[ offset..-1 ]
+		else
+			trace "No config options (ARGV = %p)" % [ ARGV ]
+		end
 
-	ext.cross_compile = true                # enable cross compilation (requires cross compile toolchain)
-	ext.cross_platform = %w[i386-mswin32 i386-mingw32]     # forces the Windows platform instead of the default one
+		ext.cross_compile = true
+		ext.cross_platform = %w[i386-mswin32 i386-mingw32]
 
-	# configure options only for cross compile
-	ext.cross_config_options += [
-		"--with-pg-include=#{COMPILE_HOME}/builds/postgresql-#{POSTGRESQL_VERSION}/src/interfaces/libpq",
-		"--with-opt-include=#{COMPILE_HOME}/builds/postgresql-#{POSTGRESQL_VERSION}/src/include",
-		"--with-pg-lib=#{COMPILE_HOME}/builds/postgresql-#{POSTGRESQL_VERSION}/src/interfaces/libpq",
-		"--with-opt-lib=#{COMPILE_HOME}/builds/openssl-#{OPENSSL_VERSION}",
-		"--enable-static-build",
-	]
+		# configure options only for cross compile
+		ext.cross_config_options += [
+			"--with-pg-include=#{STATIC_POSTGRESQL_LIBDIR}",
+			"--with-opt-include=#{STATIC_POSTGRESQL_INCDIR}",
+			"--with-pg-lib=#{STATIC_POSTGRESQL_LIBDIR}",
+			"--with-opt-lib=#{STATIC_OPENSSL_BUILDDIR}",
+			"--enable-static-build",
+		]
 
-end
+	end
 
 
-desc "Stop any Postmaster instances that remain after testing."
-task :cleanup_testing_dbs do
-    require 'spec/lib/helpers'
-    PgTestingHelpers.stop_existing_postmasters()
-    Rake::Task[:clean].invoke
-end
 
+	#####################################################################
+	###	C R O S S - C O M P I L A T I O N - T A S K S
+	#####################################################################
 
-#####################################################################
-###	C R O S S - C O M P I L A T I O N - T A S K S
-#####################################################################
 
+	directory STATIC_SOURCESDIR.to_s
 
-# define a location where sources will be stored
-directory "#{COMPILE_HOME}/sources"
-directory "#{COMPILE_HOME}/builds/openssl-#{OPENSSL_VERSION}"
+	#
+	# Static OpenSSL build tasks
+	#
+	directory STATIC_OPENSSL_BUILDDIR.to_s
 
-# clean intermediate files and folders
-CLEAN.include("#{COMPILE_HOME}/builds/openssl-#{OPENSSL_VERSION}")
-
-# openssl source file should be stored there
-file "#{COMPILE_HOME}/sources/openssl-#{OPENSSL_VERSION}.tar.gz" => ["#{COMPILE_HOME}/sources"] do |t|
-	# download the source file using wget or curl
-	chdir File.dirname(t.name) do
-		#http://www.openssl.org/source/openssl-0.9.8k.tar.gz
-		url = "http://www.openssl.org/source/#{File.basename(t.name)}"
-		sh "wget #{url} || curl -O #{url}"
+	# openssl source file should be stored there
+	file OPENSSL_TARBALL => STATIC_SOURCESDIR do |t|
+		download( OPENSSL_SOURCE_URI, t.name )
 	end
-end
 
-# Extract the openssl builds
-file "#{COMPILE_HOME}/builds/openssl-#{OPENSSL_VERSION}" => ["#{COMPILE_HOME}/sources/openssl-#{OPENSSL_VERSION}.tar.gz"] do |t|
-	chdir File.dirname(t.name) do
-		t.prerequisites.each { |f| sh "tar xfz ../sources/#{File.basename(f)}" }
+	# Extract the openssl builds
+	file STATIC_OPENSSL_BUILDDIR => OPENSSL_TARBALL do |t|
+		trace "extracting %s to %s" % [ OPENSSL_TARBALL, STATIC_OPENSSL_BUILDDIR.parent ]
+		STATIC_OPENSSL_BUILDDIR.mkpath
+		run 'tar', '-xzf', OPENSSL_TARBALL.to_s, '-C', STATIC_OPENSSL_BUILDDIR.parent.to_s
+		OPENSSL_MAKEFILE.unlink if OPENSSL_MAKEFILE.exist?
+
+		OPENSSL_PATCHES.each do |patchfile|
+			trace "  applying patch #{patchfile}..."
+			run 'patch', '-Np1', '-d', STATIC_OPENSSL_BUILDDIR.to_s,
+				'-i', File.expand_path( patchfile, BASEDIR )
+		end
 	end
-end
 
-# generate the makefile in a clean build location
-file "#{COMPILE_HOME}/builds/openssl-#{OPENSSL_VERSION}/Makefile" =>
-		["#{COMPILE_HOME}/builds/openssl-#{OPENSSL_VERSION}"] do |t|
+	CMD_PRELUDE = [
+		'env',
+		"CC=#{CROSS_PREFIX}-gcc",
+		"CFLAGS=-DDSO_WIN32",
+		"AR=#{CROSS_PREFIX}-ar",
+		"RANLIB=#{CROSS_PREFIX}-ranlib"
+	]
 
-	chdir File.dirname(t.name) do
-		sh File.expand_path("Configure"), 'mingw'
+
+	# generate the makefile in a clean build location
+	file OPENSSL_MAKEFILE => STATIC_OPENSSL_BUILDDIR do |t|
+		Dir.chdir( STATIC_OPENSSL_BUILDDIR ) do
+			cmd = CMD_PRELUDE.dup
+			cmd << "./Configure" << 'mingw'
+
+			run( *cmd )
+		end
 	end
-end
 
-# make
-file "#{COMPILE_HOME}/builds/openssl-#{OPENSSL_VERSION}/libssleay32.a" => ["#{COMPILE_HOME}/builds/openssl-#{OPENSSL_VERSION}/Makefile"] do |t|
-	chdir File.dirname(t.prerequisites.first) do
-		sh <<-EOT
-			export cross=#{CROSS_PREFIX}- &&
-			make -j#{NUM_CPUS} CC="${cross}gcc -DDSO_WIN32" AR="${cross}ar r" RANLIB="${cross}ranlib" build_libs &&
-			cp libcrypto.a libeay32.a &&
-			cp libssl.a libssleay32.a
-		EOT
+	desc "compile static openssl libraries"
+	task :openssl_libs => [ LIBSSLEAY32, LIBEAY32 ]
+
+	task :compile_static_openssl => OPENSSL_MAKEFILE do |t|
+		Dir.chdir( STATIC_OPENSSL_BUILDDIR ) do
+			cmd = CMD_PRELUDE.dup
+			cmd << 'make' << "-j#{NUM_CPUS}" << 'build_libs'
+
+			run( *cmd )
+		end
 	end
-end
 
-#desc 'compile static libssl.a'
-task 'openssl-make' => ["#{COMPILE_HOME}/builds/openssl-#{OPENSSL_VERSION}/libssleay32.a"]
+	desc "compile static #{LIBEAY32}"
+	file LIBEAY32 => :compile_static_openssl do |t|
+		FileUtils.cp( STATIC_OPENSSL_BUILDDIR + 'libcrypto.a', LIBEAY32.to_s )
+	end
 
+	desc "compile static #{LIBSSLEAY32}"
+	file LIBSSLEAY32 => :compile_static_openssl do |t|
+		FileUtils.cp( STATIC_OPENSSL_BUILDDIR + 'libssl.a', LIBSSLEAY32.to_s )
+	end
 
-# define a location where sources will be stored
-directory "#{COMPILE_HOME}/builds/postgresql-#{POSTGRESQL_VERSION}"
 
-# clean intermediate files and folders
-CLEAN.include("#{COMPILE_HOME}/builds/postgresql-#{POSTGRESQL_VERSION}")
 
+	#
+	# Static PostgreSQL build tasks
+	#
+	directory STATIC_POSTGRESQL_BUILDDIR.to_s
 
-# postgresql source file should be stored there
-file "#{COMPILE_HOME}/sources/postgresql-#{POSTGRESQL_VERSION}.tar.bz2" => ["#{COMPILE_HOME}/sources"] do |t|
-	# download the source file using wget or curl
-	chdir File.dirname(t.name) do
-		#http://wwwmaster.postgresql.org/redir/53/h/source/v8.4.0/postgresql-8.4.0.tar.bz2
-		url = "http://wwwmaster.postgresql.org/redir/53/h/source/v#{POSTGRESQL_VERSION}/#{File.basename(t.name)}"
-		sh "wget #{url} || curl -O #{url}"
-	end
-end
 
-# Extract the postgresql sources
-file "#{COMPILE_HOME}/builds/postgresql-#{POSTGRESQL_VERSION}" => ["#{COMPILE_HOME}/sources/postgresql-#{POSTGRESQL_VERSION}.tar.bz2"] do |t|
-	chdir File.dirname(t.name) do
-		t.prerequisites.each { |f| sh "tar xfj ../sources/#{File.basename(f)}" }
+	# postgresql source file should be stored there
+	file POSTGRESQL_TARBALL => STATIC_SOURCESDIR do |t|
+		download( POSTGRESQL_SOURCE_URI, t.name )
 	end
-end
 
-# generate the makefile in a clean build location
-file "#{COMPILE_HOME}/builds/postgresql-#{POSTGRESQL_VERSION}/src/Makefile.global" =>
-		["#{COMPILE_HOME}/builds/postgresql-#{POSTGRESQL_VERSION}",
-		"#{COMPILE_HOME}/builds/openssl-#{OPENSSL_VERSION}/libssleay32.a"] do |t|
-
-	options = [
-		'--target=i386-mingw32',
-		"--host=#{Rake::ExtensionCompiler.mingw_host}",
-		'--with-openssl',
-		'--without-zlib',
-		'--disable-shared',
-	]
+	# Extract the postgresql sources
+	file STATIC_POSTGRESQL_BUILDDIR => POSTGRESQL_TARBALL do |t|
+		trace "extracting %s to %s" % [ POSTGRESQL_TARBALL, STATIC_POSTGRESQL_BUILDDIR.parent ]
+		STATIC_POSTGRESQL_BUILDDIR.mkpath
+		run 'tar', '-xzf', POSTGRESQL_TARBALL.to_s, '-C', STATIC_POSTGRESQL_BUILDDIR.parent.to_s
+		mv POSTGRESQL_SHLIB_MAKEFILE, POSTGRESQL_SHLIB_MF_ORIG
+	end
 
-	chdir "#{COMPILE_HOME}/builds/postgresql-#{POSTGRESQL_VERSION}" do
-		configure_path = File.expand_path("#{COMPILE_HOME}/builds/postgresql-#{POSTGRESQL_VERSION}/configure")
-		sh <<-EOT
-			export CFLAGS=-L#{COMPILE_HOME}/builds/openssl-#{OPENSSL_VERSION} &&
-			export LDFLAGS=-L#{COMPILE_HOME}/builds/openssl-#{OPENSSL_VERSION} &&
-			export LDFLAGS_SL=-L#{COMPILE_HOME}/builds/openssl-#{OPENSSL_VERSION} &&
-			export "LIBS=-lwsock32 -lgdi32" &&
-			export CPPFLAGS=-I#{COMPILE_HOME}/builds/openssl-#{OPENSSL_VERSION}/include &&
-			#{configure_path} #{options.join(" ")}
-		EOT
+	# generate the makefile in a clean build location
+	file POSTGRESQL_GLOBAL_MAKEFILE => [ STATIC_POSTGRESQL_BUILDDIR, :openssl_libs ] do |t|
+		options = [
+			'--target=i386-mingw32',
+			"--host=#{Rake::ExtensionCompiler.mingw_host}",
+			'--with-openssl',
+			'--without-zlib',
+			'--disable-shared',
+		]
+
+		Dir.chdir( STATIC_POSTGRESQL_BUILDDIR ) do
+			configure_path = STATIC_POSTGRESQL_BUILDDIR + 'configure'
+			cmd = [ configure_path.to_s, *options ]
+			cmd << "CFLAGS=-L#{STATIC_OPENSSL_BUILDDIR}"
+			cmd << "LDFLAGS=-L#{STATIC_OPENSSL_BUILDDIR}"
+			cmd << "LDFLAGS_SL=-L#{STATIC_OPENSSL_BUILDDIR}"
+			cmd << "LIBS=-lwsock32 -lgdi32"
+			cmd << "CPPFLAGS=-I#{STATIC_OPENSSL_BUILDDIR}/include"
+
+			run( *cmd )
+		end
 	end
-end
 
-# backup Makefile.shlib
-file "#{COMPILE_HOME}/builds/postgresql-#{POSTGRESQL_VERSION}/src/Makefile.shlib.bak" => ["#{COMPILE_HOME}/builds/postgresql-#{POSTGRESQL_VERSION}/src/Makefile.global"] do |t|
-	cp "#{COMPILE_HOME}/builds/postgresql-#{POSTGRESQL_VERSION}/src/Makefile.shlib", t.name
-end
 
-# patch the Makefile.shlib
-file "#{COMPILE_HOME}/builds/postgresql-#{POSTGRESQL_VERSION}/src/Makefile.shlib" => ["#{COMPILE_HOME}/builds/postgresql-#{POSTGRESQL_VERSION}/src/Makefile.shlib.bak"] do |t|
-	content = File.open(t.name, 'rb') { |f| f.read }
+	# patch the Makefile.shlib -- depend on the build dir so it's only
+	# rewritten if the tarball is re-extracted.
+	file POSTGRESQL_SHLIB_MAKEFILE => POSTGRESQL_SHLIB_MF_ORIG do |t|
+		tf = Tempfile.new( POSTGRESQL_SHLIB_MAKEFILE.basename )
+		POSTGRESQL_SHLIB_MF_ORIG.open( File::RDONLY ) do |ifh|
+			ifh.each_line do |line|
+				tf.print( line.sub(/^(\s*haslibarule\s*=\s*yes)/, "# \\1 ") )
+			end
+		end
+		tf.close
 
-	out = ""
+		FileUtils.mv( tf.path, t.name, :verbose => $trace )
+	end
 
-	content.each_line do |line|
-		if line =~ /^(\s*haslibarule\s*=\s*yes)/
-			out << "##{$1}\n"
-		else
-			out << line
+
+	# make libpq.a
+	file POSTGRESQL_LIB => [ POSTGRESQL_GLOBAL_MAKEFILE, POSTGRESQL_SHLIB_MAKEFILE ] do |t|
+		Dir.chdir( POSTGRESQL_LIB.dirname ) do
+			sh 'make', "-j#{NUM_CPUS}", POSTGRESQL_LIB.basename.to_s, 'PORTNAME=win32'
 		end
 	end
 
-	when_writing("Patching Makefile.shlib") {
-		File.open(t.name, 'wb') { |f| f.write(out) }
-	}
-end
 
+	#desc 'compile static libpg.a'
+	task :static_libpq => POSTGRESQL_LIB
 
-# make libpq.a
-file "#{COMPILE_HOME}/builds/postgresql-#{POSTGRESQL_VERSION}/src/interfaces/libpq/libpq.a" => ["#{COMPILE_HOME}/builds/postgresql-#{POSTGRESQL_VERSION}/src/Makefile.global", "#{COMPILE_HOME}/builds/postgresql-#{POSTGRESQL_VERSION}/src/Makefile.shlib"] do |t|
-	chdir File.dirname(t.name) do
-		sh "make -j#{NUM_CPUS} libpq.a PORTNAME=win32"
+	desc 'cross compile pg for win32'
+	task :cross do
+		ENV['CROSS_COMPILING'] = 'yes'
+	end
+	task :cross => [ :mingw32, :static_libpq ]
+
+	task :mingw32 do
+		# Use Rake::ExtensionCompiler helpers to find the proper host
+		unless Rake::ExtensionCompiler.mingw_host then
+			warn "You need to install mingw32 cross compile functionality to be able to continue."
+			warn "Please refer to your distribution/package manager documentation about installation."
+			fail
+		end
 	end
-end
-
-#desc 'compile static libpg.a'
-task 'postgresql-make' => ['openssl-make', "#{COMPILE_HOME}/builds/postgresql-#{POSTGRESQL_VERSION}/src/interfaces/libpq/libpq.a"]
-
-desc 'cross compile pg for win32'
-task 'cross' => [:mingw32, 'postgresql-make']
 
-task :mingw32 do
-	# Use Rake::ExtensionCompiler helpers to find the proper host
-	unless Rake::ExtensionCompiler.mingw_host then
-		warn "You need to install mingw32 cross compile functionality to be able to continue."
-		warn "Please refer to your distribution/package manager documentation about installation."
+rescue LoadError => err
+	task :no_rake_compiler do
+		log "You'll need to install rake-compiler to compile this."
 		fail
 	end
+
+	task :compile => :no_rake_compiler
+	task :cross => :no_rake_compiler
+	task :mingw32 => :no_rake_compiler
+	task :static_libpq => :no_rake_compiler
+end
+
+
+desc "Stop any Postmaster instances that remain after testing."
+task :cleanup_testing_dbs do
+    require 'spec/lib/helpers'
+    PgTestingHelpers.stop_existing_postmasters()
+    Rake::Task[:clean].invoke
 end
+
+