pg 0.9.0-x86-mswin32 → 0.11.0pre229-x86-mswin32

data/ChangeLog

@@ -1,4 +1,217 @@
-158[tip]   872063e42b12   2010-02-19 08:02 -0800   ged
+229[master,tip]:228,222   b477174160c8   2011-03-30 06:13 -0700   ged
+  Automated merge with ssh://bitbucket.org/larskanis/ruby-pg
+
+228   cc3a7476465c   2011-03-15 13:21 +0100   kanis
+  Update cross compilation tasks to use Ruby 1.8.7 instead of 1.8.6, since pg.gem requires at least 1.8.7 to get installed
+
+227   b90f74cb11a5   2011-03-12 21:40 +0100   kanis
+  Update readme for cross compile
+
+226   780650f201e3   2011-03-12 21:38 +0100   kanis
+  Use RUBY_CC_VERSION from command line, if set
+
+225   31089d6c9dde   2011-03-11 22:14 +0100   kanis
+  update PG and OpenSSL version for cross compile
+
+224   dfe3e7c1ea27   2011-03-11 21:58 +0100   kanis
+  always run "make libpq.a" for cross compilation
+
+223:221   06e17573b133   2011-03-11 21:54 +0100   kanis
+  re-add required libs for cross compilation
+
+222   56098b479a23   2011-03-30 05:52 -0700   ged
+  Comment the WIN32 console FD stuff so I remember what it does.
+
+221   1baa7a8e673e   2011-02-23 14:11 -0800   ged
+  Whitespace/line-ending fixes
+
+220:217,219   fb7d22101adf   2011-02-23 11:40 -0800   ged
+  Merged with 1c3a1ca9f0cd
+
+219   1c3a1ca9f0cd   2011-01-22 04:41 +0800   ghazel
+  for windows support, duplicate the sockets from libpq and create temporary CRT fds
+
+218[github/master]:214   c3f163bf1ecd   2011-01-22 22:11 -0800   ged
+  Pulling fixes for Windows from ghazel on Github
+
+217   18f413081e0c   2011-02-10 16:19 -0800   ged
+  Bump minor version.
+
+216   739692aa8dd1   2011-01-31 17:10 -0800   ged
+  Reformatting fixes for PGresult#[] and PGresult#values
+
+215   59679aee98ee   2011-01-31 11:30 -0600   me-bitbucket
+  added PGresult#values to get an array of arrays
+
+214   8ab3dd3c757b   2011-01-19 08:00 -0800   ged
+  Added tag v0.10.1 for changeset de10b5d8e442
+
+213[v0.10.1]   de10b5d8e442   2011-01-19 08:00 -0800   ged
+  Added signature for changeset 230ea3e68db2
+
+212   230ea3e68db2   2011-01-19 07:54 -0800   ged
+  Add an include guard for pg.h
+
+211   f877d2d399cc   2011-01-19 07:53 -0800   ged
+  Simplify the common case require of the ext
+
+210   8e1707a90330   2011-01-19 07:52 -0800   ged
+  Include the extconf header
+
+209   89348c8bb6d1   2010-12-06 12:00 -0800   ged
+  Experimenting with a greatly-simplified extconf, since the complex one isn't solving any problems
+
+208   aea173eec98a   2010-12-06 08:45 -0800   ged
+  Bumping version to 0.10.1.
+
+207   d61e3310ea3d   2010-12-06 08:41 -0800   ged
+  Fixing compatibility with versions of PostgreSQL without PQgetCancel. (fixes #36)
+
+206   89979f184b22   2010-12-06 07:44 -0800   ged
+  Fix require for natively-compiled extension under Windows. (fixes #55)
+
+205   9e11be78bfe4   2010-12-06 07:32 -0800   ged
+  Change rb_yield_splat() to rb_yield_values() for compatibility with Rubinius. (fixes #54)
+
+204   eb0d4b1df418   2010-12-01 18:54 -0800   ged
+  Removed tag 0.10.0
+
+203   78a63dce1491   2010-12-01 18:52 -0800   ged
+  Added tag v0.10.0 for changeset 1822a169c4fe
+
+202   469211f606ea   2010-12-01 18:52 -0800   ged
+  Fix deprecated expectation.
+
+201:197,200   857722663a6f   2010-12-01 18:47 -0800   ged
+  Merged in Mahlon's wait_for_notify update for PostgreSQL 9's notification payload
+
+200   8ffb67a23f45   2010-12-01 18:30 -0800   ged
+  Closing pg90_notify_payload pbranch for merge into default
+
+199   de86dca00ad2   2010-12-01 18:24 -0800   ged
+  Finished the merge of default; fixed specs under 1.9.2.
+
+198:197,188   60664b2495cf   2010-12-01 16:39 -0800   ged
+  merge of default
+
+197   148d0cc3db4a   2010-12-01 14:19 -0800   ged
+  Added tag 0.10.0 for changeset 1822a169c4fe
+
+196[v0.10.0]   1822a169c4fe   2010-12-01 14:19 -0800   ged
+  Added signature for changeset 3993015a841e
+
+195   3993015a841e   2010-12-01 12:20 -0800   ged
+  Ignore the yard cache, handle missing rake-compiler for non-compile-related tasks.
+
+194   71786704391b   2010-11-11 21:39 -0600   ged
+  Build/gem updates
+
+193   899329ce1b4e   2010-11-11 21:09 -0600   ged
+  Added a spec for collapsed notifications.
+
+192   413f9e81e3ea   2010-11-01 09:01 -0700   ged
+  More work trying to get the Windows-native gem to compile. No luck, but it's closer.
+
+191   3402babf2cdf   2010-10-31 16:29 -0700   ged
+  Fixed issue with PGconn#wait_for_notify that caused it to miss notifications that happened after the LISTEN but before the wait_for_notify.
+
+190   9d8f82721f69   2010-10-29 08:09 -0700   ged
+  Updated to RSpec 2.0
+
+189:186   b2df89600d95   2010-10-11 09:24 -0700   ged
+  Fixes for windows static build.
+
+188   193043bf2244   2010-10-08 09:40 -0700   ged
+  Added support for the payload of NOTIFY events (w/Mahlon E. Smith)
+
+187   ce9b893ff824   2010-10-08 07:25 -0700   ged
+  start new patch on default
+
+186   49ff3442c2ee   2010-10-08 07:23 -0700   ged
+  Fixes to get the static windows build to work with PostgreSQL 9.0 and OpenSSL 1.0.0a
+
+185   1fa5cd6851e3   2010-09-28 09:10 -0700   ged
+  More work trying to get the native windows gem to compile under PostgreSQL 9.0
+
+184   c9fb855a7d50   2010-09-28 09:09 -0700   ged
+  Adding a sample of how to use COPY FROM
+
+183   d85ff87e5949   2010-09-24 10:34 -0700   ged
+  Fixes for Ruby 1.9.2.
+
+182   5dbc24f596c8   2010-09-24 10:18 -0700   ged
+  Version bump, updates for PostgreSQL 9.
+
+181   1f8dd92ca16c   2010-08-03 10:31 -0700   ged
+  Merged JRuby fix into the build system, pulled down other build-system updates. Thanks to timfel for the fix.
+
+180   4f705f605e51   2010-08-03 17:56 +0200   timfelgentreff
+  Fix to allow Rakefile to work on JRuby
+
+179   92cc211ef553   2010-08-02 09:28 -0700   ged
+  Honor Ruby's default_internal encoding when connecting via the synchronous interface; fixes #33
+
+178   a2237e39d399   2010-08-02 09:23 -0700   ged
+  Don't treat the installed pg_config not having archflags as an error; fixes #39
+
+177   14b882b7b88c   2010-08-02 09:21 -0700   ged
+  Install extension under arch-specific directory (RPS fix)
+
+176   b0a5ae858569   2010-07-26 19:46 -0700   ged
+  Adding rake tasklibs as a sub-repo
+
+175   37835e3b8701   2010-07-21 18:39 -0700   ged
+  Removed spec for issue #22, as the library is behaving the same as the underlying library; closes #22
+
+174:173,172   86f238c12fa3   2010-07-21 18:36 -0700   ged
+  Merged with 168:dfaa59767b2e
+
+173:167   dfaa59767b2e   2010-07-21 18:35 -0700   ged
+  Reworded an example's description and added a specific transaction-abort spec
+
+172:171,168   e756f8fb15d8   2010-06-22 16:23 -0700   ged
+  Merged with 170:5418a1d86d91
+
+171   8922f0a8ee44   2010-06-22 16:22 -0700   ged
+  Adding example of invalid binary data issue (refs #22), fixing EXT_SO path
+
+170   cb92aa4b6599   2010-02-25 10:39 -0800   ged
+  Adding a spec to test bug #12
+
+169:158   86026f5ecf70   2010-02-25 10:39 -0800   ged
+  Adding rake-compiler to the dev dependencies
+
+168   5418a1d86d91   2010-06-22 15:54 -0700   ged
+  Cross-compile tasks cleanup, extconf diagnostic improvement.
+
+167   07502a793f3a   2010-06-22 10:44 -0700   ged
+  Adding some more stuff to the ignorefile
+
+166   873867122e80   2010-06-22 10:43 -0700   ged
+  Modified the large-object sample script to reflect the pg library's API (refs #35)
+
+165   ea6eae59e917   2010-06-21 11:08 -0700   ged
+  Updating build system, adding .orig files to ignore list.
+
+164   bb8a3baad96e   2010-06-14 13:57 -0700   ged
+  Whitespace fix
+
+163   45e6518b780d   2010-05-26 09:33 -0700   ged
+  Actually, just use the cflags from pg_config, which should resolve both the -Wall and the -lsocket issue (refs #30)
+
+162   730fb885ce08   2010-05-26 09:27 -0700   ged
+  Fixing compilation for non-GCC platforms (fixes #30)
+
+161   a47ffe890970   2010-03-16 07:36 -0700   ged
+  Fixed typo in ext/extconf.rb -- thanks to Keith Cascio for spotting this. Closes #27.
+
+160   9a296096f7e9   2010-02-28 08:56 -0800   ged
+  Added tag 0.9.0 for changeset da726282493c
+
+159[0.9.0]   da726282493c   2010-02-28 08:56 -0800   ged
+  Added signature for changeset 872063e42b12
+
+158   872063e42b12   2010-02-19 08:02 -0800   ged
   Adding "fat gem" compatible loader, set the default RUBY_CC_VERSION.
 
 157   ab525ca90531   2010-02-19 06:27 -0800   ged

data/Contributors

@@ -28,3 +28,5 @@ Jeff Davis <ruby@j-davis.com>
 Bertram Scharpf <software@bertram-scharpf.de>
 Michael Granger <ged@FaerieMUD.org>
 Mahlon E. Smith <mahlon@martini.nu>
+Jason Yanowitz <me-bitbucket@jasonyanowitz.com>
+

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/README.windows

@@ -39,7 +39,7 @@ There are no runtime dependencies to any but the standard Windows DLLs.
 
 Install mingw32. On a debian based system this should work:
 
-   apt-get install mingw32
+  apt-get install mingw32
 
 On MacOS X, if you have MacPorts installed:
 
@@ -49,13 +49,16 @@ Install the rake-compiler:
 
   gem install rake-compiler
 
-Download and cross compile ruby for win32:
+Download and cross compile ruby 1.8 and 1.9 for win32:
 
-  rake-compiler cross-ruby VERSION=1.8.6-p287
+  rake-compiler cross-ruby VERSION=1.8.7-p334
+  rake-compiler cross-ruby VERSION=1.9.2-p180
 
 Download and cross compile pg for win32:
 
-  rake cross native gem RUBY_CC_VERSION=1.8.6 OPENSSL_VERSION=0.9.8l POSTGRESQL_VERSION=8.4.2
+  rake cross native gem
+or with custom versions:
+  rake cross native gem RUBY_CC_VERSION=1.8.7:1.9.2 OPENSSL_VERSION=1.0.0d POSTGRESQL_VERSION=9.0.3
 
 If everything works, there should be pg-VERSION-x86-mswin32.gem in the pkg
 directory.

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.0d'
+POSTGRESQL_VERSION         = ENV['POSTGRESQL_VERSION'] || '9.0.3'
+
+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.7: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 -lws2_32 -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
+	task 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
+
+