couchbase 1.3.13-x86-mingw32 → 1.3.14-x86-mingw32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1a42be3450f346c5bf0ef0613e9b8761c60484b0
-  data.tar.gz: 467db678c578fc516253e296094e47212ddf4bfe
+  metadata.gz: 5d30afb95ed40c595f302204969fefbe6d01d1da
+  data.tar.gz: 653f63e827b25d001df6a3e01e1ac0c0302ab675
 SHA512:
-  metadata.gz: 633e432942be56849abbc72eaaebad2f6611b2a3a12be14b061bd1f2ab2262321dd8aa444c40d6572e5439969b5072ebaac14e1221e3b74c2433d957375912c9
-  data.tar.gz: 2ce060317cdd88abd99bb682a2654d60663644e85ade45bbeb2d8738f09f81014992d3c32bbc0712967b2be75f789be2052994bc75e25ffab89c69f3067197ab
+  metadata.gz: 5c42b5664fae4fab3e4ba1318d7bb75dd77ee44512501d44d6388dcec18a6611a2e75cd799356249682e170309000c72d34e12758d682099d1f866a0b11d1807
+  data.tar.gz: 194a05df4372ff72257da152e82bb95e895556bc82c426cdf48893603b40597243c9cd18fa6b96f0c1593c8161e21fc160be1078ef5260b0701278e0a991580d

data/ext/couchbase_ext/bucket.c

@@ -750,11 +750,9 @@ cb_bucket_quiet_get(VALUE self)
 cb_bucket_quiet_set(VALUE self, VALUE val)
 {
     struct cb_bucket_st *bucket = DATA_PTR(self);
-    VALUE new;
 
     bucket->quiet = RTEST(val);
-    new = bucket->quiet ? Qtrue : Qfalse;
-    return new;
+    return bucket->quiet ? Qtrue : Qfalse;
 }
 
     VALUE

data/ext/couchbase_ext/couchbase_ext.c

@@ -228,6 +228,9 @@ cb_libcouchbase_version(VALUE self)
 }
 
 /* Ruby Extension initializer */
+#ifdef __cplusplus
+extern "C"
+#endif
     void
 Init_couchbase_ext(void)
 {

data/ext/couchbase_ext/couchbase_ext.h

@@ -30,6 +30,10 @@
 #if defined(HAVE_RB_FIBER_YIELD) && !defined(_WIN32)
 #define BUILD_EVENTMACHINE_PLUGIN
 #endif
+#if defined(_WIN32) && defined(__cplusplus)
+#define __STDC_LIMIT_MACROS
+#include <cstdint>
+#endif
 #ifdef HAVE_STDINT_H
 #include <stdint.h>
 #endif

data/ext/couchbase_ext/extconf.rb

@@ -43,18 +43,18 @@ end
 ($LDFLAGS ||= '') << " #{ENV['LDFLAGS']}"
 ($LIBS    ||= '') << " #{ENV['LIBS']}"
 
-$CFLAGS << ' -std=c99 -Wall -Wextra '
-if ENV['DEBUG']
-  $CFLAGS << ' -O0 -ggdb3 -pedantic '
-else
-  $CFLAGS << ' -O2'
-  $LDFLAGS << ' -Wl,--strip-debug' if RbConfig::CONFIG['target_os'] =~ /mingw32/
-end
-
 if RbConfig::CONFIG['target_os'] =~ /mingw32/
-  $LDFLAGS << ' -static-libgcc'
+  CONFIG['CC'] = CONFIG['CXX']
+  $LDFLAGS << ' -static-libgcc -static-libstdc++ -Wl,--strip-debug'
+  $CFLAGS << ' -fpermissive -std=c++11'
   dir_config('libcouchbase')
 else
+  $CFLAGS << ' -std=c99 -Wall -Wextra '
+  if ENV['DEBUG']
+    $CFLAGS << ' -O0 -ggdb3 -pedantic '
+  else
+    $CFLAGS << ' -O2'
+  end
   LIBDIR = RbConfig::CONFIG['libdir']
   INCLUDEDIR = RbConfig::CONFIG['includedir']
 
@@ -130,7 +130,7 @@ def die(message)
   abort
 end
 
-install_notice = "You must install libcouchbase >= 2.4.0\nSee http://www.couchbase.com/communities/c/ for more details"
+install_notice = "You must install libcouchbase >= 2.4.5\nSee http://www.couchbase.com/communities/c/ for more details"
 
 unless try_compile(<<-SRC)
   #include <libcouchbase/couchbase.h>

data/ext/couchbase_ext/multithread_plugin.c

@@ -558,6 +558,7 @@ ls_arg_free(void *p) {
     if (args) {
         rb_fd_term(&args->in);
         rb_fd_term(&args->out);
+        rb_fd_term(&args->exc);
         xfree(args);
     }
 }

data/lib/couchbase/version.rb

@@ -17,5 +17,5 @@
 
 # Couchbase ruby client
 module Couchbase
-  VERSION = '1.3.13'
+  VERSION = '1.3.14'
 end

data/tasks/compile.rake

@@ -57,7 +57,7 @@ end
 recent = '2.0.0-p353'
 CROSS_PLATFORMS = [
   Platform.new(:name => 'x64-mingw32', :host => 'x86_64-w64-mingw32', :versions => %w(1.9.3-p484 2.0.0-p353 2.1.0)),
-  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))
+  Platform.new(:name => 'x86-mingw32', :host => 'i686-w64-mingw32', :versions => %w(1.9.3-p484 2.0.0-p353 2.1.0))
 ]
 
 # Setup compile tasks.  Configuration can be passed via ENV.
@@ -131,13 +131,13 @@ task 'package:windows' => ['package', 'lib/couchbase_ext.rb'] do
     h[v] = ENV[v]
     h
   end
-  ENV['LDFLAGS'] = '-static-libgcc'
+  ENV['LDFLAGS'] = '-static-libgcc -static-libstdc++'
 
   CROSS_PLATFORMS.each do |platform|
     ENV['TARGET'] = platform.name
     rm_rf('tmp/ ports/')
     mkdir_p('ports')
-    recipe = MiniPortile.new('libcouchbase', '2.5.0')
+    recipe = MiniPortile.new('libcouchbase', '2.5.3')
     recipe.host = platform.host
     recipe.files << "http://packages.couchbase.com/clients/c/libcouchbase-#{recipe.version}.tar.gz"
     recipe.configure_options.push('--disable-cxx',

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: couchbase
 version: !ruby/object:Gem::Version
-  version: 1.3.13
+  version: 1.3.14
 platform: x86-mingw32
 authors:
 - Couchbase
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-16 00:00:00.000000000 Z
+date: 2015-09-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: yaji
@@ -257,7 +257,6 @@ files:
 - lib/action_dispatch/middleware/session/couchbase_store.rb
 - lib/active_support/cache/couchbase_store.rb
 - lib/couchbase.rb
-- lib/couchbase/1.8/couchbase_ext.so
 - lib/couchbase/1.9/couchbase_ext.so
 - lib/couchbase/2.0/couchbase_ext.so
 - lib/couchbase/2.1/couchbase_ext.so