pg 0.15.0.pre.432-x86-mingw32 → 0.15.0.pre.454-x86-mingw32

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)[0,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
 
 
@@ -131,7 +134,6 @@ end
 file 'ChangeLog' => '.hg/branch' do |task|
 	$stderr.puts "Updating the changelog..."
 	begin
-    include Hoe::MercurialHelpers
 		content = make_changelog()
 	rescue NameError
 		abort "Packaging tasks require the hoe-mercurial plugin (gem install hoe-mercurial)"

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