pg 0.15.0.pre.432 → 0.15.0.pre.454

data/ChangeLog

@@ -1,3 +1,141 @@
+2013-03-16  Lars Kanis  <kanis@comcard.de>
+
+	* ext/extconf.rb, ext/pg_connection.c, lib/pg/connection.rb,
+	spec/lib/helpers.rb, spec/pg/connection_spec.rb:
+	Add working Connection#socket_io for Windows and remove this method
+	for platforms that don't support it.
+
+	This also requires to move the code from Ruby to C.
+
+	Use different excudes for :unix and :socket_io.
+	[79d6ab5cf45a] [tip]
+
+2013-03-14  Lars Kanis  <kanis@comcard.de>
+
+	* ext/pg_connection.c:
+	Use #async_exec as alias to #exec on platforms with native threads.
+
+	Since we release the GVL for all blocking function calls, now, #exec
+	has the same behaviour as #async_exec.
+
+	Discussed on: https://groups.google.com/d/msg/ruby-
+	pg/OVVO7XjH7Aw/7UIwi6g10PsJ
+	[ca09386c2aac]
+
+	* ext/pg_connection.c:
+	Test case 'can wait for NOTIFY events' failed before this fix.
+	[266d915dfb86]
+
+2013-03-13  Lars Kanis  <kanis@comcard.de>
+
+	* spec/pg/connection_spec.rb:
+	Mark tests to #socket_io as UNIX-only - they fail on Windows.
+	[1f23c39fb8c8]
+
+	* Rakefile.cross:
+	Print proper message in case that cross compilation is not usable.
+	[307438918863]
+
+	* Rakefile, Rakefile.cross:
+	Merge with https://bitbucket.org/ged/ruby-pg
+	[3230e6c245e0]
+
+	* Rakefile, Rakefile.cross:
+	Add support for cross build for multiple platforms (i386-mingw32 and
+	x64-mingw32).
+
+	Update OpenSSL for cross build to 1.0.1e Update PostgreSQL for cross
+	build to 9.2.3
+
+	Remove -lws2_32 for PostgreSQL build. It fails to compile for
+	x64-mingw32 elsewise.
+	[6a2a1a53dedc]
+
+2013-03-12  Michael Granger  <ged@FaerieMUD.org>
+
+	* Rakefile.cross:
+	Bump PostgreSQL/OpenSSL versions for the binary gem
+	[b6f885cd57f7]
+
+	* spec/pg/connection_spec.rb:
+	Re-enable application_name setting with corrected guard
+	[5b2e5992bb78]
+
+	* .rvm.gems, Rakefile, Rakefile.cross:
+	Bump versions of dev dependencies
+	[cba92fb4b89e]
+
+2013-03-06  Michael Granger  <ged@FaerieMUD.org>
+
+	* README.rdoc:
+	Add a hint about installing with Bundler to the README.
+
+	Thanks to StackExchange user 'darnumbrella' for this hint.
+	http://stackoverflow.com/questions/15234810/cannot-install-pg-gem
+	[93bacacab796]
+
+	* History.rdoc:
+	Update History
+	[0ab4e5cf47e9]
+
+2013-03-03  Michael Granger  <ged@FaerieMUD.org>
+
+	* spec/pg/connection_spec.rb:
+	Remove application_name setting for PG < 8.3
+	[130d50d246fb]
+
+	* spec/pg/connection_spec.rb:
+	Fix tests under Postgres 8.3.
+
+	Ugh. I need an 8.3 testing box.
+	[bda5c1c794f1]
+
+	* spec/pg/connection_spec.rb:
+	Don't set the application_name for versions of PG less than 9.0
+	[9daa5a0012d8]
+
+	* spec/lib/helpers.rb:
+	Remove reference comment
+	[edc642a94aa6]
+
+	* ext/pg_connection.c, spec/lib/helpers.rb,
+	spec/pg/connection_spec.rb:
+	Clean up the #socket_io if it exists on #finish and #reset.
+	[fc290848221b]
+
+2013-02-27  Michael Granger  <ged@FaerieMUD.org>
+
+	* README.ja.rdoc, README.rdoc:
+	Update READMEs
+
+	* Update relevant versions
+	* Move the badge to a status section
+	* Add link list to the header
+	* Add a (hopefully) more-lucid description to README.ja.rdoc.
+	[ac1c999e8514]
+
+2013-02-26  Michael Granger  <ged@FaerieMUD.org>
+
+	* .travis.yml:
+	Add Ruby 2 to the Travis matrix
+	[d8c0be8a00fa]
+
+2013-02-25  Michael Granger  <ged@FaerieMUD.org>
+
+	* .rvmrc:
+	Test under Ruby 2.0.0 by default
+	[c7919322ac00]
+
+	* Merge with rpath_ldflag
+	[a249c3b79f82]
+
+2013-02-04  Lars Kanis  <kanis@comcard.de>
+
+	* ext/pg_connection.c:
+	Avoid warning about DWORD to int mapping in rb_raise() format
+	string.
+	[b1d3a145bef5]
+
 2013-02-03  Michael Granger  <ged@FaerieMUD.org>
 
 	* ext/pg_connection.c, spec/pg/connection_spec.rb:
@@ -8,13 +146,13 @@
 	PQexecParams() itself.
 
 	Thanks to Aaron Patterson for the idea.
-	[7c313c2355b7] [github/exec_params, tip]
+	[7c313c2355b7]
 
 2013-01-31  Michael Granger  <ged@FaerieMUD.org>
 
 	* ext/extconf.rb:
 	Add experimental -rpath to the LDFLAGS
-	[8496c624dffd] [github/rpath_ldflag]
+	[8496c624dffd]
 
 2013-01-30  Michael Granger  <ged@FaerieMUD.org>
 
@@ -27,7 +165,7 @@
 	This keeps the IO in scope until the Connection is garbage-
 	collected, preventing Ruby from auto-closing the connection to
 	PostgreSQL.
-	[c1e35a055da6] [github/master]
+	[c1e35a055da6]
 
 2013-01-30  Michael Granger  <ged@faeriemud.org>
 
@@ -178,6 +316,61 @@
 	Make source settings override TM2 defaults
 	[c5706b3f73af]
 
+2012-12-26  Lars Kanis  <kanis@comcard.de>
+
+	* ext/extconf.rb, ext/pg_connection.c, spec/pg/connection_spec.rb:
+	merge in default branch
+	[ca39e311d1eb] <use_gvl_for_blocking_functions>
+
+	* ext/gvl_wrappers.h:
+	Add some documentation to gvl_wrappers
+	[ffeb6a0afd1f] <use_gvl_for_blocking_functions>
+
+	* spec/pg/connection_spec.rb:
+	Add test case for threading with Connection#exec in ruby 1.9
+	[73b9aa38e8c0] <use_gvl_for_blocking_functions>
+
+	* ext/extconf.rb, ext/gvl_wrappers.c, ext/gvl_wrappers.h, ext/pg.h,
+	ext/pg_connection.c:
+	Add wrappers to blocking functions and callbacks in order to release
+	the GVL of ruby 1.9 as long as not in ruby code
+	[2f2c681424ed] <use_gvl_for_blocking_functions>
+
+2012-07-02  Lars Kanis  <kanis@comcard.de>
+
+	* ext/pg_connection.c, spec/pg/connection_spec.rb:
+	Fix encoding of values delivered to the row processor and add specs
+	for binary and text data.
+	[bb9c6625fbc9] <row_processor>
+
+	* ext/pg_connection.c:
+	Polish the documentation a little bit
+	[b7633be3c941] <row_processor>
+
+2012-07-01  Lars Kanis  <kanis@comcard.de>
+
+	* ext/pg_connection.c:
+	Get rid of gcc warning about (non-)const PGresult to
+	pg_new_result_for_callback()
+	[1a25786ed8f3] <row_processor>
+
+	* ext/pg_connection.c, spec/pg/connection_spec.rb:
+	Fix wrong encoding for Result object passed to a notice-receiver
+	block. Add proper specs for #set_notice_receiver.
+	[4280826bb9b9] <row_processor>
+
+	* ext/extconf.rb, ext/pg.h, ext/pg_connection.c, ext/pg_result.c,
+	spec/lib/helpers.rb, spec/pg/connection_spec.rb:
+	Implement PostgreSQL-9.2 functions PG::Connection#set_row_processor,
+	get_row_processor, skip_result
+	[b7ce4843f4d1] <row_processor>
+
+2012-06-28  Lars Kanis  <kanis@comcard.de>
+
+	* ext/pg_result.c:
+	Add PGRES_COPY_BOTH to documentation of PG::Result#result_status
+	[63998b47da6e] <copy_both_docu>
+
 2013-01-29  Aaron Patterson  <aaron.patterson@gmail.com>
 
 	* ext/pg_result.c, lib/pg/result.rb, spec/pg/result_spec.rb:
@@ -208,14 +401,6 @@
 
 2012-12-26  Lars Kanis  <kanis@comcard.de>
 
-	* ext/extconf.rb, ext/pg_connection.c, spec/pg/connection_spec.rb:
-	merge in default branch
-	[ca39e311d1eb] <use_gvl_for_blocking_functions>
-
-	* ext/gvl_wrappers.h:
-	Add some documentation to gvl_wrappers
-	[ffeb6a0afd1f] <use_gvl_for_blocking_functions>
-
 	* ext/pg.c:
 	Use proper const check instead of implicit relation
 	[d0c5d5f7f1e8]
@@ -235,18 +420,6 @@
 	single row mode of PostgreSQL 9.2)
 	[49e3fe1dafdf]
 
-2012-12-26  Lars Kanis  <kanis@comcard.de>
-
-	* spec/pg/connection_spec.rb:
-	Add test case for threading with Connection#exec in ruby 1.9
-	[73b9aa38e8c0] <use_gvl_for_blocking_functions>
-
-	* ext/extconf.rb, ext/gvl_wrappers.c, ext/gvl_wrappers.h, ext/pg.h,
-	ext/pg_connection.c:
-	Add wrappers to blocking functions and callbacks in order to release
-	the GVL of ruby 1.9 as long as not in ruby code
-	[2f2c681424ed] <use_gvl_for_blocking_functions>
-
 2012-12-19  Lars Kanis  <kanis@comcard.de>
 
 	* ext/extconf.rb, ext/pg.c, ext/pg_connection.c,
@@ -254,41 +427,6 @@
 	Add single row mode of PostgreSQL 9.2
 	[5cf348b75c1c] <single_row_mode>
 
-2012-07-02  Lars Kanis  <kanis@comcard.de>
-
-	* ext/pg_connection.c, spec/pg/connection_spec.rb:
-	Fix encoding of values delivered to the row processor and add specs
-	for binary and text data.
-	[bb9c6625fbc9] <row_processor>
-
-	* ext/pg_connection.c:
-	Polish the documentation a little bit
-	[b7633be3c941] <row_processor>
-
-2012-07-01  Lars Kanis  <kanis@comcard.de>
-
-	* ext/pg_connection.c:
-	Get rid of gcc warning about (non-)const PGresult to
-	pg_new_result_for_callback()
-	[1a25786ed8f3] <row_processor>
-
-	* ext/pg_connection.c, spec/pg/connection_spec.rb:
-	Fix wrong encoding for Result object passed to a notice-receiver
-	block. Add proper specs for #set_notice_receiver.
-	[4280826bb9b9] <row_processor>
-
-	* ext/extconf.rb, ext/pg.h, ext/pg_connection.c, ext/pg_result.c,
-	spec/lib/helpers.rb, spec/pg/connection_spec.rb:
-	Implement PostgreSQL-9.2 functions PG::Connection#set_row_processor,
-	get_row_processor, skip_result
-	[b7ce4843f4d1] <row_processor>
-
-2012-06-28  Lars Kanis  <kanis@comcard.de>
-
-	* ext/pg_result.c:
-	Add PGRES_COPY_BOTH to documentation of PG::Result#result_status
-	[63998b47da6e] <copy_both_docu>
-
 2012-12-19  Michael Granger  <ged@FaerieMUD.org>
 
 	* lib/pg/connection.rb:
@@ -596,7 +734,7 @@
 
 	* ext/pg_result.c:
 	Merged in larskanis/ruby-pg (pull request #7)
-	[4050c3412bd7] [github/master@default]
+	[4050c3412bd7]
 
 2012-03-10  Lars Kanis  <kanis@comcard.de>
 

data/History.rdoc

@@ -1,4 +1,4 @@
-== v0.15.0 [YYYY-MM-DD] Michael Granger <ged@FaerieMUD.org>
+== v0.15.0 [2013-03-03] Michael Granger <ged@FaerieMUD.org>
 
 Bugfixes:
 
@@ -14,6 +14,7 @@ Documentation fixes:
 
 Enhancements:
 
+- Tested under Ruby 2.0.0p0.
 - Add single row mode of PostgreSQL 9.2.
 - Set fallback_application_name to programm name $0. Thanks to Will Leinweber
   for the patch.
@@ -24,8 +25,10 @@ Enhancements:
   rb_thread_select().
 - Add an example of how to insert array data using a prepared statement (#145).
 - Add continous integration tests on travis-ci.org.
-- Add PG::Result#each_value for looping over result sets by row. Thanks to
+- Add PG::Result#each_row for iterative over result sets by row. Thanks to
   Aaron Patterson for the patch.
+- Add a PG::Connection#socket_io method for fetching a (non-autoclosing) IO
+  object for the connection's socket.
 
 Specs:
 

data/README.ja.rdoc

@@ -1,7 +1,14 @@
 = pg
 
-* https://bitbucket.org/ged/ruby-pg
+home :: https://bitbucket.org/ged/ruby-pg
+mirror :: https://github.com/ged/ruby-pg
+docs :: http://deveiate.org/code/pg
 
-This file needs translation. Anyone who is willing to volunteer, please
-mail <ged@FaerieMUD.org>.
+
+== Description
+
+This file needs a translation of the English README. Pull requests, patches, or
+volunteers gladly accepted.
+
+Until such time, please accept my sincere apologies for not knowing Japanese.
 

data/README.rdoc

@@ -1,8 +1,9 @@
-{<img src="https://travis-ci.org/ged/ruby-pg.png?branch=master" alt="Build Status" />}[https://travis-ci.org/ged/ruby-pg]
-
 = pg
 
-* https://bitbucket.org/ged/ruby-pg
+home :: https://bitbucket.org/ged/ruby-pg
+mirror :: https://github.com/ged/ruby-pg
+docs :: http://deveiate.org/code/pg
+
 
 == Description
 
@@ -26,10 +27,14 @@ A small example usage:
     end
   end
 
+== Build Status
+
+{<img src="https://travis-ci.org/ged/ruby-pg.png?branch=master" alt="Build Status" />}[https://travis-ci.org/ged/ruby-pg]
+
 
 == Requirements
 
-* Ruby 1.8.7-p249 or 1.9.3-p0.
+* Ruby 1.8.7-p371, 1.9.3-p392, or 2.0.0-p0.
 * PostgreSQL 8.3.x (with headers, -dev packages, etc).
 
 It may work with earlier versions of Ruby as well, but those are not regularly tested.
@@ -46,6 +51,10 @@ Postgres:
 
     gem install pg -- --with-pg-config=<path to pg_config>
 
+If you're installing via Bundler, you can provide compile hints like so:
+
+    bundle config build.pg --with-pg-config=<path to pg_config>
+
 See README-OS_X.rdoc for more information about installing under MacOS X, and
 README-Windows.rdoc for Windows build/installation instructions.
 

data/Rakefile

@@ -55,8 +55,8 @@ $hoespec = Hoe.spec 'pg' do
 
 	self.developer 'Michael Granger', 'ged@FaerieMUD.org'
 
-	self.dependency 'rake-compiler', '~> 0.7', :developer
-	self.dependency	'hoe-deveiate', '~> 0.1', :developer
+	self.dependency 'rake-compiler', '~> 0.8', :developer
+	self.dependency	'hoe-deveiate', '~> 0.2', :developer
 
 	self.spec_extras[:licenses] = ['BSD', 'Ruby', 'GPL']
 	self.spec_extras[:extensions] = [ 'ext/extconf.rb' ]
@@ -102,7 +102,7 @@ task :maint do
 	ENV['MAINTAINER_MODE'] = 'yes'
 end
 
-ENV['RUBY_CC_VERSION'] ||= '1.8.7:1.9.2'
+ENV['RUBY_CC_VERSION'] ||= '1.8.7:1.9.2:2.0.0'
 
 # Rake-compiler task
 Rake::ExtensionTask.new do |ext|
@@ -112,15 +112,18 @@ Rake::ExtensionTask.new do |ext|
 	ext.lib_dir        = 'lib'
 	ext.source_pattern = "*.{c,h}"
 	ext.cross_compile  = true
-	ext.cross_platform = %w[i386-mingw32]
-
-	# 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}",
-	]
+	ext.cross_platform = CrossLibraries.map(&:for_platform)[1,1]
+
+  ext.cross_config_options += CrossLibraries.map do |lib|
+    {
+      lib.for_platform => [
+        "--with-pg-include=#{lib.static_postgresql_libdir}",
+        "--with-opt-include=#{lib.static_postgresql_incdir}",
+        "--with-pg-lib=#{lib.static_postgresql_libdir}",
+        "--with-opt-lib=#{lib.static_openssl_builddir}",
+      ]
+    }
+  end
 end
 
 

data/Rakefile.cross

@@ -6,6 +6,7 @@ require 'rbconfig'
 require 'rake/clean'
 require 'rake/extensiontask'
 require 'rake/extensioncompiler'
+require 'ostruct'
 
 MISCDIR = BASEDIR + 'misc'
 
@@ -17,218 +18,242 @@ else
 	1
 end
 
-# Cross-compilation constants
-OPENSSL_VERSION            = ENV['OPENSSL_VERSION'] || '1.0.1c'
-POSTGRESQL_VERSION         = ENV['POSTGRESQL_VERSION'] || '9.2.2'
+class CrossLibrary < OpenStruct
+	include Rake::DSL
 
-COMPILE_HOME               = Pathname( "./build" ).expand_path
-STATIC_SOURCESDIR          = COMPILE_HOME + 'sources'
-STATIC_BUILDDIR            = COMPILE_HOME + 'builds'
+	def initialize(for_platform, openssl_config)
+		super()
 
-# Static OpenSSL build vars
-STATIC_OPENSSL_BUILDDIR    = STATIC_BUILDDIR + "openssl-#{OPENSSL_VERSION}"
+		self.for_platform               = for_platform
+		self.openssl_config             = openssl_config
 
-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'
+		# Cross-compilation constants
+		self.openssl_version            = ENV['OPENSSL_VERSION'] || '1.0.1e'
+		self.postgresql_version         = ENV['POSTGRESQL_VERSION'] || '9.2.3'
 
-LIBSSLEAY32                = STATIC_OPENSSL_BUILDDIR + 'libssleay32.a'
-LIBEAY32                   = STATIC_OPENSSL_BUILDDIR + 'libeay32.a'
+		self.compile_home               = Pathname( "./build" ).expand_path
+		self.static_sourcesdir          = compile_home + 'sources'
+		self.static_builddir            = compile_home + 'builds' + for_platform
 
-OPENSSL_PATCHES            = Rake::FileList[ (MISCDIR + "openssl-#{OPENSSL_VERSION}.*.patch").to_s ]
+		# Static OpenSSL build vars
+		self.static_openssl_builddir    = static_builddir + "openssl-#{openssl_version}"
 
-# Static PostgreSQL build vars
-STATIC_POSTGRESQL_BUILDDIR = STATIC_BUILDDIR + "postgresql-#{POSTGRESQL_VERSION}"
-POSTGRESQL_SOURCE_URI      = begin
-	uristring = "http://ftp.postgresql.org/pub/source/v%s/postgresql-%s.tar.bz2" %
-		[ 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'
-POSTGRESQL_PATCHES         = Rake::FileList[ (MISCDIR + "postgresql-#{POSTGRESQL_VERSION}.*.patch").to_s ]
-
-CROSS_PREFIX = begin
-	Rake::ExtensionCompiler.mingw_host
-rescue => err
-	$stderr.puts "Cross-compilation disabled -- %s" % [ err.message ]
-	'unknown'
-end
+		self.openssl_source_uri         =
+			URI( "http://www.openssl.org/source/openssl-#{openssl_version}.tar.gz" )
+		self.openssl_tarball            = static_sourcesdir + File.basename( openssl_source_uri.path )
+		self.openssl_makefile           = static_openssl_builddir + 'Makefile'
 
+		self.libssleay32                = static_openssl_builddir + 'libssleay32.a'
+		self.libeay32                   = static_openssl_builddir + 'libeay32.a'
 
-# clean intermediate files and folders
-CLEAN.include( STATIC_BUILDDIR.to_s )
+		self.openssl_patches            = Rake::FileList[ (MISCDIR + "openssl-#{openssl_version}.*.patch").to_s ]
 
+		# Static PostgreSQL build vars
+		self.static_postgresql_builddir = static_builddir + "postgresql-#{postgresql_version}"
+		self.postgresql_source_uri      = begin
+			uristring = "http://ftp.postgresql.org/pub/source/v%s/postgresql-%s.tar.bz2" %
+				[ postgresql_version, postgresql_version ]
+			URI( uristring )
+		end
+		self.postgresql_tarball         = static_sourcesdir + File.basename( postgresql_source_uri.path )
+
+		self.static_postgresql_srcdir   = static_postgresql_builddir + 'src'
+		self.static_postgresql_libdir   = static_postgresql_srcdir + 'interfaces/libpq'
+		self.static_postgresql_incdir   = static_postgresql_srcdir + 'include'
+
+		self.postgresql_global_makefile = static_postgresql_srcdir + 'Makefile.global'
+		self.postgresql_shlib_makefile  = static_postgresql_srcdir + 'Makefile.shlib'
+		self.postgresql_shlib_mf_orig   = static_postgresql_srcdir + 'Makefile.shlib.orig'
+		self.postgresql_lib             = static_postgresql_libdir + 'libpq.a'
+		self.postgresql_patches         = Rake::FileList[ (MISCDIR + "postgresql-#{postgresql_version}.*.patch").to_s ]
+
+		# Use rake-compilers config.yml to determine the toolchain that was used
+		# to build Ruby for this platform.
+		self.host_platform = begin
+			config_file = YAML.load_file(File.expand_path("~/.rake-compiler/config.yml"))
+			_, rbfile = config_file.find{|key, fname| key.start_with?("rbconfig-#{for_platform}-") }
+			IO.read(rbfile).match(/CONFIG\["host"\] = "(.*)"/)[1]
+		end
 
-ENV['RUBY_CC_VERSION'] ||= '1.8.7:1.9.3'
 
-def download(url, save_to)
-	part = save_to+".part"
-	sh "wget #{url.to_s.inspect} -O #{part.inspect} || curl #{url.to_s.inspect} -o #{part.inspect}"
-	FileUtils.mv part, save_to
-end
+		# clean intermediate files and folders
+		CLEAN.include( static_builddir.to_s )
 
-def run(*args)
-	sh *args
-end
 
-#####################################################################
-### C R O S S - C O M P I L A T I O N - T A S K S
-#####################################################################
+		ENV['RUBY_CC_VERSION'] ||= '1.8.7:1.9.3:2.0.0'
 
+		def download(url, save_to)
+			part = save_to+".part"
+			sh "wget #{url.to_s.inspect} -O #{part.inspect} || curl #{url.to_s.inspect} -o #{part.inspect}"
+			FileUtils.mv part, save_to
+		end
 
-directory STATIC_SOURCESDIR.to_s
+		def run(*args)
+			sh *args
+		end
 
-#
-# Static OpenSSL build tasks
-#
-directory STATIC_OPENSSL_BUILDDIR.to_s
+		#####################################################################
+		### C R O S S - C O M P I L A T I O N - T A S K S
+		#####################################################################
 
-# openssl source file should be stored there
-file OPENSSL_TARBALL => STATIC_SOURCESDIR do |t|
-	download( OPENSSL_SOURCE_URI, t.name )
-end
 
-# Extract the openssl builds
-file STATIC_OPENSSL_BUILDDIR => OPENSSL_TARBALL do |t|
-	puts "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|
-		puts "  applying patch #{patchfile}..."
-		run 'patch', '-Np1', '-d', STATIC_OPENSSL_BUILDDIR.to_s,
-		'-i', File.expand_path( patchfile, BASEDIR )
-	end
-end
+		directory static_sourcesdir.to_s
 
-CMD_PRELUDE = [
-	'env',
-	"CC=#{CROSS_PREFIX}-gcc",
-	"CFLAGS=-DDSO_WIN32",
-	"AR=#{CROSS_PREFIX}-ar",
-	"RANLIB=#{CROSS_PREFIX}-ranlib"
-]
+		#
+		# Static OpenSSL build tasks
+		#
+		directory static_openssl_builddir.to_s
 
+		# openssl source file should be stored there
+		file openssl_tarball => static_sourcesdir do |t|
+			download( openssl_source_uri, t.name )
+		end
 
-# 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'
+		# Extract the openssl builds
+		file static_openssl_builddir => openssl_tarball do |t|
+			puts "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|
+				puts "  applying patch #{patchfile}..."
+				run 'patch', '-Np1', '-d', static_openssl_builddir.to_s,
+				'-i', File.expand_path( patchfile, BASEDIR )
+			end
+		end
 
-		run( *cmd )
-	end
-end
+		self.cmd_prelude = [
+			'env',
+			"CC=#{host_platform}-gcc",
+			"CFLAGS=-DDSO_WIN32",
+			"AR=#{host_platform}-ar",
+			"RANLIB=#{host_platform}-ranlib"
+		]
 
-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'
+		# 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" << openssl_config
 
-		run( *cmd )
-	end
-end
+				run( *cmd )
+			end
+		end
 
-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 openssl libraries"
+		task :openssl_libs => [ libssleay32, libeay32 ]
 
-desc "compile static #{LIBSSLEAY32}"
-file LIBSSLEAY32 => :compile_static_openssl do |t|
-	FileUtils.cp( STATIC_OPENSSL_BUILDDIR + 'libssl.a', LIBSSLEAY32.to_s )
-end
+		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
 
+		desc "compile static #{libeay32}"
+		file libeay32 => :compile_static_openssl do |t|
+			FileUtils.cp( static_openssl_builddir + 'libcrypto.a', libeay32.to_s )
+		end
 
-#
-# Static PostgreSQL build tasks
-#
-directory STATIC_POSTGRESQL_BUILDDIR.to_s
+		desc "compile static #{libssleay32}"
+		file libssleay32 => :compile_static_openssl do |t|
+			FileUtils.cp( static_openssl_builddir + 'libssl.a', libssleay32.to_s )
+		end
 
 
-# postgresql source file should be stored there
-file POSTGRESQL_TARBALL => STATIC_SOURCESDIR do |t|
-	download( POSTGRESQL_SOURCE_URI, t.name )
-end
 
-# Extract the postgresql sources
-file STATIC_POSTGRESQL_BUILDDIR => POSTGRESQL_TARBALL do |t|
-	puts "extracting %s to %s" % [ POSTGRESQL_TARBALL, STATIC_POSTGRESQL_BUILDDIR.parent ]
-	STATIC_POSTGRESQL_BUILDDIR.mkpath
-	run 'tar', '-xjf', POSTGRESQL_TARBALL.to_s, '-C', STATIC_POSTGRESQL_BUILDDIR.parent.to_s
-	mv POSTGRESQL_SHLIB_MAKEFILE, POSTGRESQL_SHLIB_MF_ORIG
-
-	POSTGRESQL_PATCHES.each do |patchfile|
-		puts "  applying patch #{patchfile}..."
-		run 'patch', '-Np1', '-d', STATIC_POSTGRESQL_BUILDDIR.to_s,
-		'-i', File.expand_path( patchfile, BASEDIR )
-	end
-end
+		#
+		# Static PostgreSQL build tasks
+		#
+		directory static_postgresql_builddir.to_s
 
-# 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
 
+		# postgresql source file should be stored there
+		file postgresql_tarball => static_sourcesdir do |t|
+			download( postgresql_source_uri, t.name )
+		end
 
-# 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.to_s )
-	POSTGRESQL_SHLIB_MF_ORIG.open( File::RDONLY ) do |ifh|
-		ifh.each_line do |line|
-			tf.print( line.sub(/^(\s*haslibarule\s*=\s*yes)/, "# \\1 ") )
+		# Extract the postgresql sources
+		file static_postgresql_builddir => postgresql_tarball do |t|
+			puts "extracting %s to %s" % [ postgresql_tarball, static_postgresql_builddir.parent ]
+			static_postgresql_builddir.mkpath
+			run 'tar', '-xjf', postgresql_tarball.to_s, '-C', static_postgresql_builddir.parent.to_s
+			mv postgresql_shlib_makefile, postgresql_shlib_mf_orig
+
+			postgresql_patches.each do |patchfile|
+				puts "  applying patch #{patchfile}..."
+				run 'patch', '-Np1', '-d', static_postgresql_builddir.to_s,
+				'-i', File.expand_path( patchfile, BASEDIR )
+			end
+		end
+
+		# generate the makefile in a clean build location
+		file postgresql_global_makefile => [ static_postgresql_builddir, :openssl_libs ] do |t|
+			options = [
+				"--target=#{host_platform}",
+				"--host=#{host_platform}",
+				'--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
-	tf.close
 
-	FileUtils.mv( tf.path, t.name, :verbose => $puts )
-end
 
+		# 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.to_s )
+			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
 
-# 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'
+			FileUtils.mv( tf.path, t.name, :verbose => $puts )
+		end
+
+
+		# 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
+
+
+		#desc 'compile static libpg.a'
+		task :static_libpq => postgresql_lib
 	end
 end
 
-
-#desc 'compile static libpg.a'
-task :static_libpq => POSTGRESQL_LIB
+if File.exist?(File.expand_path("~/.rake-compiler/config.yml"))
+	CrossLibraries = [
+		['i386-mingw32', 'mingw'],
+		['x64-mingw32', 'mingw64'],
+	].map do |platform, openssl_config|
+		CrossLibrary.new platform, openssl_config
+	end
+else
+	$stderr.puts "Cross-compilation disabled -- rake-compiler not properly installed"
+	CrossLibraries = []
+end
 
 desc 'cross compile pg for win32'
 task :cross do