pg 0.11.0pre220 → 0.11.0pre229

data/ChangeLog

@@ -1,10 +1,37 @@
-220[github/master,master,tip]:217,219   fb7d22101adf   2011-02-23 11:40 -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:214   c3f163bf1ecd   2011-01-22 22:11 -0800   ged
+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
@@ -136,27 +163,27 @@
 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:168,173   86f238c12fa3   2010-07-21 18:36 -0700   ged
+174:173,172   86f238c12fa3   2010-07-21 18:36 -0700   ged
   Merged with 168:dfaa59767b2e
 
-173:172,169   e756f8fb15d8   2010-06-22 16:23 -0700   ged
+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
 
-172   8922f0a8ee44   2010-06-22 16:22 -0700   ged
+171   8922f0a8ee44   2010-06-22 16:22 -0700   ged
   Adding example of invalid binary data issue (refs #22), fixing EXT_SO path
 
-171   cb92aa4b6599   2010-02-25 10:39 -0800   ged
+170   cb92aa4b6599   2010-02-25 10:39 -0800   ged
   Adding a spec to test bug #12
 
-170:158   86026f5ecf70   2010-02-25 10:39 -0800   ged
+169:158   86026f5ecf70   2010-02-25 10:39 -0800   ged
   Adding rake-compiler to the dev dependencies
 
-169:167   5418a1d86d91   2010-06-22 15:54 -0700   ged
+168   5418a1d86d91   2010-06-22 15:54 -0700   ged
   Cross-compile tasks cleanup, extconf diagnostic improvement.
 
-168   dfaa59767b2e   2010-07-21 18:35 -0700   ged
-  Reworded an example's description and added a specific transaction-abort spec
-
 167   07502a793f3a   2010-06-22 10:44 -0700   ged
   Adding some more stuff to the ignorefile
 

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.local

@@ -19,8 +19,8 @@ else
 end
 
 # Cross-compilation constants
-OPENSSL_VERSION            = ENV['OPENSSL_VERSION'] || '1.0.0a'
-POSTGRESQL_VERSION         = ENV['POSTGRESQL_VERSION'] || '9.0.1'
+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'
@@ -89,7 +89,7 @@ namespace :spec do
 	task :text  => [ :compile ]
 end
 
-ENV['RUBY_CC_VERSION'] = '1.8.6:1.9.2'
+ENV['RUBY_CC_VERSION'] ||= '1.8.7:1.9.2'
 
 begin
 	require 'rake/clean'
@@ -240,7 +240,7 @@ begin
 			cmd << "CFLAGS=-L#{STATIC_OPENSSL_BUILDDIR}"
 			cmd << "LDFLAGS=-L#{STATIC_OPENSSL_BUILDDIR}"
 			cmd << "LDFLAGS_SL=-L#{STATIC_OPENSSL_BUILDDIR}"
-			cmd << "LIBS=-lwsock32 -lgdi32"
+			cmd << "LIBS=-lwsock32 -lws2_32 -lgdi32"
 			cmd << "CPPFLAGS=-I#{STATIC_OPENSSL_BUILDDIR}/include"
 
 			run( *cmd )
@@ -264,7 +264,7 @@ begin
 
 
 	# make libpq.a
-	file POSTGRESQL_LIB => [ POSTGRESQL_GLOBAL_MAKEFILE, POSTGRESQL_SHLIB_MAKEFILE ] do |t|
+	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

data/ext/extconf.rb

@@ -6,6 +6,17 @@ if pgdir = with_config( 'pg' )
 	ENV['PATH'] = "#{pgdir}/bin" + File::PATH_SEPARATOR + ENV['PATH']
 end
 
+if ENV['CROSS_COMPILING']
+	$LDFLAGS << " -L#{CONFIG['libdir']}"
+
+	# Link against all required libraries for static build, if they are available
+	have_library( 'gdi32', 'CreateDC' ) && append_library( $libs, 'gdi32' )
+	have_library( 'secur32' ) && append_library( $libs, 'secur32' )
+	have_library( 'ws2_32', 'WSASocket') && append_library( $libs, 'ws2_32' )
+	have_library( 'crypto', 'BIO_new' ) && append_library( $libs, 'crypto' )
+	have_library( 'ssl', 'SSL_new' ) && append_library( $libs, 'ssl' )
+end
+
 dir_config 'pg'
 
 if pgconfig = ( with_config('pg-config') || with_config('pg_config') || find_executable('pg_config') )

data/ext/pg.c

@@ -9,7 +9,7 @@
   modified at: Wed Jan 20 16:41:51 1999
 
   $Author: ged $
-  $Date: 2011/02/23 19:40:51 $
+  $Date: 2011/03/30 13:13:47 $
 ************************************************/
 
 #include "pg.h"
@@ -2123,6 +2123,9 @@ pgconn_notifies(VALUE self)
 
 
 #ifdef _WIN32
+/* 
+ * Duplicate the sockets from libpq and create temporary CRT FDs
+ */
 void create_crt_fd(fd_set *os_set, fd_set *crt_set)
 {
 	int i;
@@ -2139,6 +2142,9 @@ void create_crt_fd(fd_set *os_set, fd_set *crt_set)
 	}
 }
 
+/*
+ * Clean up the CRT FDs from create_crt_fd()
+ */
 void cleanup_crt_fd(fd_set *os_set, fd_set *crt_set)
 {
 	int i;

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: pg
 version: !ruby/object:Gem::Version 
-  hash: 1923832225
+  hash: 1923832275
   prerelease: 
   segments: 
   - 0
   - 11
   - 0
   - pre
-  - 220
-  version: 0.11.0pre220
+  - 229
+  version: 0.11.0pre229
 platform: ruby
 authors: 
 - Jeff Davis
@@ -38,7 +38,7 @@ cert_chain:
   cmlhXe46pZNJgWKbxZah85jIjx95hR8vOI+NAM5iH9kOqK13DrxacTKPhqj5PjwF
   -----END CERTIFICATE-----
 
-date: 2011-02-23 00:00:00 -08:00
+date: 2011-03-31 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -138,7 +138,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: 
 - PostgreSQL >=7.4
 rubyforge_project: 
-rubygems_version: 1.5.2
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: A Ruby interface to the PostgreSQL RDBMS