couchbase 1.3.13-x64-mingw32 → 1.3.14-x64-mingw32

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 5a284a80d11c2b0db6f9a4086e51b37637155ee1
4
- data.tar.gz: 9d9c294f75687d405b8b7ee0fb71abadfabcdb48
3
+ metadata.gz: cdf9e2ad32ba5d9f37734dfebc5c89923c1c4f76
4
+ data.tar.gz: 377dda3d524110315ef8b706bab1eede42f5cf8e
5
5
  SHA512:
6
- metadata.gz: 070c9b2cba52436c62370149eae8bbe2dfed5e45c5819682c924dacde86362083be988cf9223357407ce9791458aa87a83b65aed10e8d8c1937875ab921e1302
7
- data.tar.gz: 386ee94c1546e14e78ab14fb6d6349a6267a58afc6b9df352bbcc0d4dfddaf515099257e71ccd19a5dba25d9a9d39d5e292b0a02b9017acdbfdec0468d03473f
6
+ metadata.gz: b07997601caca0edbe7652f312ad1a3848ae57c979f83b2f4aeb6d3a12974ad92d27d6c73c75b48d848f11dae8c65a9b27cf0173a287c77ec190a176cf82c143
7
+ data.tar.gz: 9441f922efacb372228295d3ff32228e1b8ada9a22cbbee957c82e2856a60dea153d40089a55a83f4993025c76263766b85a23cf6e9067887d1fb9ee3ecbc076
@@ -750,11 +750,9 @@ cb_bucket_quiet_get(VALUE self)
750
750
  cb_bucket_quiet_set(VALUE self, VALUE val)
751
751
  {
752
752
  struct cb_bucket_st *bucket = DATA_PTR(self);
753
- VALUE new;
754
753
 
755
754
  bucket->quiet = RTEST(val);
756
- new = bucket->quiet ? Qtrue : Qfalse;
757
- return new;
755
+ return bucket->quiet ? Qtrue : Qfalse;
758
756
  }
759
757
 
760
758
  VALUE
@@ -228,6 +228,9 @@ cb_libcouchbase_version(VALUE self)
228
228
  }
229
229
 
230
230
  /* Ruby Extension initializer */
231
+ #ifdef __cplusplus
232
+ extern "C"
233
+ #endif
231
234
  void
232
235
  Init_couchbase_ext(void)
233
236
  {
@@ -30,6 +30,10 @@
30
30
  #if defined(HAVE_RB_FIBER_YIELD) && !defined(_WIN32)
31
31
  #define BUILD_EVENTMACHINE_PLUGIN
32
32
  #endif
33
+ #if defined(_WIN32) && defined(__cplusplus)
34
+ #define __STDC_LIMIT_MACROS
35
+ #include <cstdint>
36
+ #endif
33
37
  #ifdef HAVE_STDINT_H
34
38
  #include <stdint.h>
35
39
  #endif
@@ -43,18 +43,18 @@ end
43
43
  ($LDFLAGS ||= '') << " #{ENV['LDFLAGS']}"
44
44
  ($LIBS ||= '') << " #{ENV['LIBS']}"
45
45
 
46
- $CFLAGS << ' -std=c99 -Wall -Wextra '
47
- if ENV['DEBUG']
48
- $CFLAGS << ' -O0 -ggdb3 -pedantic '
49
- else
50
- $CFLAGS << ' -O2'
51
- $LDFLAGS << ' -Wl,--strip-debug' if RbConfig::CONFIG['target_os'] =~ /mingw32/
52
- end
53
-
54
46
  if RbConfig::CONFIG['target_os'] =~ /mingw32/
55
- $LDFLAGS << ' -static-libgcc'
47
+ CONFIG['CC'] = CONFIG['CXX']
48
+ $LDFLAGS << ' -static-libgcc -static-libstdc++ -Wl,--strip-debug'
49
+ $CFLAGS << ' -fpermissive -std=c++11'
56
50
  dir_config('libcouchbase')
57
51
  else
52
+ $CFLAGS << ' -std=c99 -Wall -Wextra '
53
+ if ENV['DEBUG']
54
+ $CFLAGS << ' -O0 -ggdb3 -pedantic '
55
+ else
56
+ $CFLAGS << ' -O2'
57
+ end
58
58
  LIBDIR = RbConfig::CONFIG['libdir']
59
59
  INCLUDEDIR = RbConfig::CONFIG['includedir']
60
60
 
@@ -130,7 +130,7 @@ def die(message)
130
130
  abort
131
131
  end
132
132
 
133
- install_notice = "You must install libcouchbase >= 2.4.0\nSee http://www.couchbase.com/communities/c/ for more details"
133
+ install_notice = "You must install libcouchbase >= 2.4.5\nSee http://www.couchbase.com/communities/c/ for more details"
134
134
 
135
135
  unless try_compile(<<-SRC)
136
136
  #include <libcouchbase/couchbase.h>
@@ -558,6 +558,7 @@ ls_arg_free(void *p) {
558
558
  if (args) {
559
559
  rb_fd_term(&args->in);
560
560
  rb_fd_term(&args->out);
561
+ rb_fd_term(&args->exc);
561
562
  xfree(args);
562
563
  }
563
564
  }
@@ -17,5 +17,5 @@
17
17
 
18
18
  # Couchbase ruby client
19
19
  module Couchbase
20
- VERSION = '1.3.13'
20
+ VERSION = '1.3.14'
21
21
  end
data/tasks/compile.rake CHANGED
@@ -57,7 +57,7 @@ end
57
57
  recent = '2.0.0-p353'
58
58
  CROSS_PLATFORMS = [
59
59
  Platform.new(:name => 'x64-mingw32', :host => 'x86_64-w64-mingw32', :versions => %w(1.9.3-p484 2.0.0-p353 2.1.0)),
60
- Platform.new(:name => 'x86-mingw32', :host => 'i686-w64-mingw32', :versions => %w(1.8.7-p374 1.9.3-p484 2.0.0-p353 2.1.0))
60
+ Platform.new(:name => 'x86-mingw32', :host => 'i686-w64-mingw32', :versions => %w(1.9.3-p484 2.0.0-p353 2.1.0))
61
61
  ]
62
62
 
63
63
  # Setup compile tasks. Configuration can be passed via ENV.
@@ -131,13 +131,13 @@ task 'package:windows' => ['package', 'lib/couchbase_ext.rb'] do
131
131
  h[v] = ENV[v]
132
132
  h
133
133
  end
134
- ENV['LDFLAGS'] = '-static-libgcc'
134
+ ENV['LDFLAGS'] = '-static-libgcc -static-libstdc++'
135
135
 
136
136
  CROSS_PLATFORMS.each do |platform|
137
137
  ENV['TARGET'] = platform.name
138
138
  rm_rf('tmp/ ports/')
139
139
  mkdir_p('ports')
140
- recipe = MiniPortile.new('libcouchbase', '2.5.0')
140
+ recipe = MiniPortile.new('libcouchbase', '2.5.3')
141
141
  recipe.host = platform.host
142
142
  recipe.files << "http://packages.couchbase.com/clients/c/libcouchbase-#{recipe.version}.tar.gz"
143
143
  recipe.configure_options.push('--disable-cxx',
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: couchbase
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.3.13
4
+ version: 1.3.14
5
5
  platform: x64-mingw32
6
6
  authors:
7
7
  - Couchbase
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2015-05-16 00:00:00.000000000 Z
11
+ date: 2015-09-09 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: yaji