pg 0.11.0pre220 → 0.11.0pre229
Sign up to get free protection for your applications and to get access to all the features.
- data.tar.gz.sig +0 -0
- data/ChangeLog +38 -11
- data/README.windows +7 -4
- data/Rakefile.local +5 -5
- data/ext/extconf.rb +11 -0
- data/ext/pg.c +7 -1
- metadata +5 -5
- metadata.gz.sig +0 -0
data.tar.gz.sig
CHANGED
Binary file
|
data/ChangeLog
CHANGED
@@ -1,10 +1,37 @@
|
|
1
|
-
|
1
|
+
229[master,tip]:228,222 b477174160c8 2011-03-30 06:13 -0700 ged
|
2
|
+
Automated merge with ssh://bitbucket.org/larskanis/ruby-pg
|
3
|
+
|
4
|
+
228 cc3a7476465c 2011-03-15 13:21 +0100 kanis
|
5
|
+
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
|
6
|
+
|
7
|
+
227 b90f74cb11a5 2011-03-12 21:40 +0100 kanis
|
8
|
+
Update readme for cross compile
|
9
|
+
|
10
|
+
226 780650f201e3 2011-03-12 21:38 +0100 kanis
|
11
|
+
Use RUBY_CC_VERSION from command line, if set
|
12
|
+
|
13
|
+
225 31089d6c9dde 2011-03-11 22:14 +0100 kanis
|
14
|
+
update PG and OpenSSL version for cross compile
|
15
|
+
|
16
|
+
224 dfe3e7c1ea27 2011-03-11 21:58 +0100 kanis
|
17
|
+
always run "make libpq.a" for cross compilation
|
18
|
+
|
19
|
+
223:221 06e17573b133 2011-03-11 21:54 +0100 kanis
|
20
|
+
re-add required libs for cross compilation
|
21
|
+
|
22
|
+
222 56098b479a23 2011-03-30 05:52 -0700 ged
|
23
|
+
Comment the WIN32 console FD stuff so I remember what it does.
|
24
|
+
|
25
|
+
221 1baa7a8e673e 2011-02-23 14:11 -0800 ged
|
26
|
+
Whitespace/line-ending fixes
|
27
|
+
|
28
|
+
220:217,219 fb7d22101adf 2011-02-23 11:40 -0800 ged
|
2
29
|
Merged with 1c3a1ca9f0cd
|
3
30
|
|
4
31
|
219 1c3a1ca9f0cd 2011-01-22 04:41 +0800 ghazel
|
5
32
|
for windows support, duplicate the sockets from libpq and create temporary CRT fds
|
6
33
|
|
7
|
-
218:214 c3f163bf1ecd 2011-01-22 22:11 -0800 ged
|
34
|
+
218[github/master]:214 c3f163bf1ecd 2011-01-22 22:11 -0800 ged
|
8
35
|
Pulling fixes for Windows from ghazel on Github
|
9
36
|
|
10
37
|
217 18f413081e0c 2011-02-10 16:19 -0800 ged
|
@@ -136,27 +163,27 @@
|
|
136
163
|
175 37835e3b8701 2010-07-21 18:39 -0700 ged
|
137
164
|
Removed spec for issue #22, as the library is behaving the same as the underlying library; closes #22
|
138
165
|
|
139
|
-
174:
|
166
|
+
174:173,172 86f238c12fa3 2010-07-21 18:36 -0700 ged
|
140
167
|
Merged with 168:dfaa59767b2e
|
141
168
|
|
142
|
-
173:
|
169
|
+
173:167 dfaa59767b2e 2010-07-21 18:35 -0700 ged
|
170
|
+
Reworded an example's description and added a specific transaction-abort spec
|
171
|
+
|
172
|
+
172:171,168 e756f8fb15d8 2010-06-22 16:23 -0700 ged
|
143
173
|
Merged with 170:5418a1d86d91
|
144
174
|
|
145
|
-
|
175
|
+
171 8922f0a8ee44 2010-06-22 16:22 -0700 ged
|
146
176
|
Adding example of invalid binary data issue (refs #22), fixing EXT_SO path
|
147
177
|
|
148
|
-
|
178
|
+
170 cb92aa4b6599 2010-02-25 10:39 -0800 ged
|
149
179
|
Adding a spec to test bug #12
|
150
180
|
|
151
|
-
|
181
|
+
169:158 86026f5ecf70 2010-02-25 10:39 -0800 ged
|
152
182
|
Adding rake-compiler to the dev dependencies
|
153
183
|
|
154
|
-
|
184
|
+
168 5418a1d86d91 2010-06-22 15:54 -0700 ged
|
155
185
|
Cross-compile tasks cleanup, extconf diagnostic improvement.
|
156
186
|
|
157
|
-
168 dfaa59767b2e 2010-07-21 18:35 -0700 ged
|
158
|
-
Reworded an example's description and added a specific transaction-abort spec
|
159
|
-
|
160
187
|
167 07502a793f3a 2010-06-22 10:44 -0700 ged
|
161
188
|
Adding some more stuff to the ignorefile
|
162
189
|
|
data/README.windows
CHANGED
@@ -39,7 +39,7 @@ There are no runtime dependencies to any but the standard Windows DLLs.
|
|
39
39
|
|
40
40
|
Install mingw32. On a debian based system this should work:
|
41
41
|
|
42
|
-
|
42
|
+
apt-get install mingw32
|
43
43
|
|
44
44
|
On MacOS X, if you have MacPorts installed:
|
45
45
|
|
@@ -49,13 +49,16 @@ Install the rake-compiler:
|
|
49
49
|
|
50
50
|
gem install rake-compiler
|
51
51
|
|
52
|
-
Download and cross compile ruby for win32:
|
52
|
+
Download and cross compile ruby 1.8 and 1.9 for win32:
|
53
53
|
|
54
|
-
rake-compiler cross-ruby VERSION=1.8.
|
54
|
+
rake-compiler cross-ruby VERSION=1.8.7-p334
|
55
|
+
rake-compiler cross-ruby VERSION=1.9.2-p180
|
55
56
|
|
56
57
|
Download and cross compile pg for win32:
|
57
58
|
|
58
|
-
rake cross native gem
|
59
|
+
rake cross native gem
|
60
|
+
or with custom versions:
|
61
|
+
rake cross native gem RUBY_CC_VERSION=1.8.7:1.9.2 OPENSSL_VERSION=1.0.0d POSTGRESQL_VERSION=9.0.3
|
59
62
|
|
60
63
|
If everything works, there should be pg-VERSION-x86-mswin32.gem in the pkg
|
61
64
|
directory.
|
data/Rakefile.local
CHANGED
@@ -19,8 +19,8 @@ else
|
|
19
19
|
end
|
20
20
|
|
21
21
|
# Cross-compilation constants
|
22
|
-
OPENSSL_VERSION = ENV['OPENSSL_VERSION'] || '1.0.
|
23
|
-
POSTGRESQL_VERSION = ENV['POSTGRESQL_VERSION'] || '9.0.
|
22
|
+
OPENSSL_VERSION = ENV['OPENSSL_VERSION'] || '1.0.0d'
|
23
|
+
POSTGRESQL_VERSION = ENV['POSTGRESQL_VERSION'] || '9.0.3'
|
24
24
|
|
25
25
|
COMPILE_HOME = Pathname( "~/.rake-compiler" ).expand_path
|
26
26
|
STATIC_SOURCESDIR = COMPILE_HOME + 'sources'
|
@@ -89,7 +89,7 @@ namespace :spec do
|
|
89
89
|
task :text => [ :compile ]
|
90
90
|
end
|
91
91
|
|
92
|
-
ENV['RUBY_CC_VERSION']
|
92
|
+
ENV['RUBY_CC_VERSION'] ||= '1.8.7:1.9.2'
|
93
93
|
|
94
94
|
begin
|
95
95
|
require 'rake/clean'
|
@@ -240,7 +240,7 @@ begin
|
|
240
240
|
cmd << "CFLAGS=-L#{STATIC_OPENSSL_BUILDDIR}"
|
241
241
|
cmd << "LDFLAGS=-L#{STATIC_OPENSSL_BUILDDIR}"
|
242
242
|
cmd << "LDFLAGS_SL=-L#{STATIC_OPENSSL_BUILDDIR}"
|
243
|
-
cmd << "LIBS=-lwsock32 -lgdi32"
|
243
|
+
cmd << "LIBS=-lwsock32 -lws2_32 -lgdi32"
|
244
244
|
cmd << "CPPFLAGS=-I#{STATIC_OPENSSL_BUILDDIR}/include"
|
245
245
|
|
246
246
|
run( *cmd )
|
@@ -264,7 +264,7 @@ begin
|
|
264
264
|
|
265
265
|
|
266
266
|
# make libpq.a
|
267
|
-
|
267
|
+
task POSTGRESQL_LIB => [ POSTGRESQL_GLOBAL_MAKEFILE, POSTGRESQL_SHLIB_MAKEFILE ] do |t|
|
268
268
|
Dir.chdir( POSTGRESQL_LIB.dirname ) do
|
269
269
|
sh 'make', "-j#{NUM_CPUS}", POSTGRESQL_LIB.basename.to_s, 'PORTNAME=win32'
|
270
270
|
end
|
data/ext/extconf.rb
CHANGED
@@ -6,6 +6,17 @@ if pgdir = with_config( 'pg' )
|
|
6
6
|
ENV['PATH'] = "#{pgdir}/bin" + File::PATH_SEPARATOR + ENV['PATH']
|
7
7
|
end
|
8
8
|
|
9
|
+
if ENV['CROSS_COMPILING']
|
10
|
+
$LDFLAGS << " -L#{CONFIG['libdir']}"
|
11
|
+
|
12
|
+
# Link against all required libraries for static build, if they are available
|
13
|
+
have_library( 'gdi32', 'CreateDC' ) && append_library( $libs, 'gdi32' )
|
14
|
+
have_library( 'secur32' ) && append_library( $libs, 'secur32' )
|
15
|
+
have_library( 'ws2_32', 'WSASocket') && append_library( $libs, 'ws2_32' )
|
16
|
+
have_library( 'crypto', 'BIO_new' ) && append_library( $libs, 'crypto' )
|
17
|
+
have_library( 'ssl', 'SSL_new' ) && append_library( $libs, 'ssl' )
|
18
|
+
end
|
19
|
+
|
9
20
|
dir_config 'pg'
|
10
21
|
|
11
22
|
if pgconfig = ( with_config('pg-config') || with_config('pg_config') || find_executable('pg_config') )
|
data/ext/pg.c
CHANGED
@@ -9,7 +9,7 @@
|
|
9
9
|
modified at: Wed Jan 20 16:41:51 1999
|
10
10
|
|
11
11
|
$Author: ged $
|
12
|
-
$Date: 2011/
|
12
|
+
$Date: 2011/03/30 13:13:47 $
|
13
13
|
************************************************/
|
14
14
|
|
15
15
|
#include "pg.h"
|
@@ -2123,6 +2123,9 @@ pgconn_notifies(VALUE self)
|
|
2123
2123
|
|
2124
2124
|
|
2125
2125
|
#ifdef _WIN32
|
2126
|
+
/*
|
2127
|
+
* Duplicate the sockets from libpq and create temporary CRT FDs
|
2128
|
+
*/
|
2126
2129
|
void create_crt_fd(fd_set *os_set, fd_set *crt_set)
|
2127
2130
|
{
|
2128
2131
|
int i;
|
@@ -2139,6 +2142,9 @@ void create_crt_fd(fd_set *os_set, fd_set *crt_set)
|
|
2139
2142
|
}
|
2140
2143
|
}
|
2141
2144
|
|
2145
|
+
/*
|
2146
|
+
* Clean up the CRT FDs from create_crt_fd()
|
2147
|
+
*/
|
2142
2148
|
void cleanup_crt_fd(fd_set *os_set, fd_set *crt_set)
|
2143
2149
|
{
|
2144
2150
|
int i;
|
metadata
CHANGED
@@ -1,15 +1,15 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: pg
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
hash:
|
4
|
+
hash: 1923832275
|
5
5
|
prerelease:
|
6
6
|
segments:
|
7
7
|
- 0
|
8
8
|
- 11
|
9
9
|
- 0
|
10
10
|
- pre
|
11
|
-
-
|
12
|
-
version: 0.11.
|
11
|
+
- 229
|
12
|
+
version: 0.11.0pre229
|
13
13
|
platform: ruby
|
14
14
|
authors:
|
15
15
|
- Jeff Davis
|
@@ -38,7 +38,7 @@ cert_chain:
|
|
38
38
|
cmlhXe46pZNJgWKbxZah85jIjx95hR8vOI+NAM5iH9kOqK13DrxacTKPhqj5PjwF
|
39
39
|
-----END CERTIFICATE-----
|
40
40
|
|
41
|
-
date: 2011-
|
41
|
+
date: 2011-03-31 00:00:00 -07:00
|
42
42
|
default_executable:
|
43
43
|
dependencies: []
|
44
44
|
|
@@ -138,7 +138,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
138
138
|
requirements:
|
139
139
|
- PostgreSQL >=7.4
|
140
140
|
rubyforge_project:
|
141
|
-
rubygems_version: 1.
|
141
|
+
rubygems_version: 1.6.2
|
142
142
|
signing_key:
|
143
143
|
specification_version: 3
|
144
144
|
summary: A Ruby interface to the PostgreSQL RDBMS
|
metadata.gz.sig
CHANGED
Binary file
|