memcached 1.2.3 → 1.2.4.pre

data/CHANGELOG

@@ -1,3 +1,5 @@
+v1.2.4.pre. Compile properly on JRuby.
+
 v1.2.3. Don't keep the server strings around forever.
 
 v1.2.2. Work around tcmalloc bug on OS X. Avoid circular reference in memcached_server_by_key().

data/Manifest

@@ -28,7 +28,6 @@ lib/memcached/exceptions.rb
 lib/memcached/experimental.rb
 lib/memcached/memcached.rb
 lib/memcached/rails.rb
-lib/rlibmemcached.bundle.dSYM/Contents/Info.plist
 test/profile/benchmark.rb
 test/profile/c_profiler.rb
 test/profile/exercise.rb

data/Rakefile

@@ -5,7 +5,7 @@ Echoe.new("memcached") do |p|
   p.project = "fauna"
   p.summary = "An interface to the libmemcached C client."
   p.rdoc_pattern = /README|TODO|LICENSE|CHANGELOG|BENCH|COMPAT|exceptions|experimental.rb|behaviors|rails.rb|memcached.rb/
-  p.clean_pattern += ["ext/lib", "ext/include", "ext/share", "ext/libmemcached-?.??", "ext/bin", "ext/conftest.dSYM"]
+  p.clean_pattern += ["ext/lib", "ext/include", "ext/share", "ext/libmemcached-?.??", "ext/bin", "ext/conftest.dSYM", "lib/rlibmemcached.bundle.dSYM"]
 end
 
 task :exceptions do

data/ext/extconf.rb

@@ -11,9 +11,13 @@ $CFLAGS = "#{RbConfig::CONFIG['CFLAGS']} #{$CFLAGS}".gsub("$(cflags)", "").gsub(
 $CFLAGS << " -std=gnu99" if SOLARIS_32
 $EXTRA_CONF = " --disable-64bit" if SOLARIS_32
 $LDFLAGS = "#{RbConfig::CONFIG['LDFLAGS']} #{$LDFLAGS} -L#{RbConfig::CONFIG['libdir']}".gsub("$(ldflags)", "").gsub("-fno-common", "")
-$CXXFLAGS = " -std=gnu++98 #{$CFLAGS}"
+$CXXFLAGS = " -std=gnu++98"
 $CPPFLAGS = $ARCH_FLAG = $DLDFLAGS = ""
 
+# JRuby's default configure options can't build libmemcached properly
+LIBM_CFLAGS = defined?(JRUBY_VERSION) ? "-fPIC -g -O2" : $CFLAGS
+LIBM_LDFLAGS = defined?(JRUBY_VERSION) ? "-fPIC -lsasl2 -lm" : $LDFLAGS
+
 GMAKE_CMD = Config::CONFIG['host_os'].downcase =~ /bsd|solaris/ ? "gmake" : "make"
 TAR_CMD = SOLARIS_32 ? 'gtar' : 'tar'
 PATCH_CMD = SOLARIS_32 ? 'gpatch' : 'patch'
@@ -65,17 +69,17 @@ def check_libmemcached
       patch("libmemcached-9", "don't clone server_st by reference server_by_key()")
 
       run("touch -r #{BUNDLE_PATH}/m4/visibility.m4 #{BUNDLE_PATH}/configure.ac #{BUNDLE_PATH}/m4/pandora_have_sasl.m4", "Touching aclocal.m4 in libmemcached.")
-    end
 
-    Dir.chdir(BUNDLE_PATH) do
-      run("env CFLAGS='-fPIC #{$CFLAGS}' LDFLAGS='-fPIC #{$LDFLAGS}' ./configure --prefix=#{HERE} --without-memcached --disable-shared --disable-utils --disable-dependency-tracking #{$EXTRA_CONF} 2>&1", "Configuring libmemcached.")
-    end
+      Dir.chdir(BUNDLE_PATH) do
+        run("env CFLAGS='-fPIC #{LIBM_CFLAGS}' LDFLAGS='-fPIC #{LIBM_LDFLAGS}' ./configure --prefix=#{HERE} --without-memcached --disable-shared --disable-utils --disable-dependency-tracking #{$EXTRA_CONF} 2>&1", "Configuring libmemcached.")
+      end
 
-    Dir.chdir(BUNDLE_PATH) do
-      #Running the make command in another script invoked by another shell command solves the "cd ." issue on FreeBSD 6+
-      run("GMAKE_CMD='#{GMAKE_CMD}' CXXFLAGS='#{$CXXFLAGS}' SOURCE_DIR='#{BUNDLE_PATH}' HERE='#{HERE}' ruby ../extconf-make.rb", "Making libmemcached.")
+      Dir.chdir(BUNDLE_PATH) do
+        #Running the make command in another script invoked by another shell command solves the "cd ." issue on FreeBSD 6+
+        run("GMAKE_CMD='#{GMAKE_CMD}' CXXFLAGS='#{$CXXFLAGS} #{LIBM_CFLAGS}' SOURCE_DIR='#{BUNDLE_PATH}' HERE='#{HERE}' ruby ../extconf-make.rb", "Making libmemcached.")
+      end
     end
- end
+  end
 
   # Absolutely prevent the linker from picking up any other libmemcached
   Dir.chdir("#{HERE}/lib") do
@@ -92,6 +96,7 @@ if ENV['SWIG']
   run("swig #{$defines} #{$includes} -ruby -autorename rlibmemcached.i", "Running SWIG.")
   run("sed -i '' 's/STR2CSTR/StringValuePtr/' rlibmemcached_wrap.c", "Patching SWIG output for Ruby 1.9.")
   run("sed -i '' 's/\"swig_runtime_data\"/\"SwigRuntimeData\"/' rlibmemcached_wrap.c", "Patching SWIG output for Ruby 1.9.")
+  run("sed -i '' 's/#ifndef RUBY_INIT_STACK/#ifdef __NEVER__/g' rlibmemcached_wrap.c", "Patching SWIG output for JRuby.")
 end
 
 $CFLAGS << " -Os"

data/ext/rlibmemcached_wrap.c

@@ -1324,7 +1324,7 @@ SWIG_Ruby_AppendOutput(VALUE target, VALUE o) {
 }
 
 /* For ruby1.8.4 and earlier. */
-#ifndef RUBY_INIT_STACK
+#ifdef __NEVER__
    RUBY_EXTERN void Init_stack(VALUE* addr);
 #  define RUBY_INIT_STACK \
    VALUE variable_in_this_stack_frame; \

data/memcached.gemspec

@@ -2,17 +2,17 @@
 
 Gem::Specification.new do |s|
   s.name = %q{memcached}
-  s.version = "1.2.3"
+  s.version = "1.2.4.pre"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Evan Weaver"]
   s.cert_chain = ["/Users/eweaver/p/configuration/gem_certificates/evan_weaver-original-public_cert.pem"]
-  s.date = %q{2011-03-23}
+  s.date = %q{2011-03-28}
   s.description = %q{An interface to the libmemcached C client.}
   s.email = %q{}
   s.extensions = ["ext/extconf.rb"]
   s.extra_rdoc_files = ["BENCHMARKS", "CHANGELOG", "LICENSE", "README", "TODO", "lib/memcached.rb", "lib/memcached/behaviors.rb", "lib/memcached/exceptions.rb", "lib/memcached/experimental.rb", "lib/memcached/memcached.rb", "lib/memcached/rails.rb"]
-  s.files = ["BENCHMARKS", "BUG", "CHANGELOG", "LICENSE", "Manifest", "README", "Rakefile", "TODO", "ext/extconf-make.rb", "ext/extconf.rb", "ext/libmemcached-0.32.tar.gz", "ext/libmemcached-1.patch", "ext/libmemcached-2.patch", "ext/libmemcached-3.patch", "ext/libmemcached-4.patch", "ext/libmemcached-5.patch", "ext/libmemcached-6.patch", "ext/libmemcached-7.patch", "ext/libmemcached-8.patch", "ext/libmemcached-9.patch", "ext/rlibmemcached.i", "ext/rlibmemcached_wrap.c", "ext/sasl.patch", "lib/memcached.rb", "lib/memcached/auth.rb", "lib/memcached/behaviors.rb", "lib/memcached/exceptions.rb", "lib/memcached/experimental.rb", "lib/memcached/memcached.rb", "lib/memcached/rails.rb", "lib/rlibmemcached.bundle.dSYM/Contents/Info.plist", "test/profile/benchmark.rb", "test/profile/c_profiler.rb", "test/profile/exercise.rb", "test/profile/rb_profiler.rb", "test/profile/valgrind.rb", "test/setup.rb", "test/teardown.rb", "test/test_helper.rb", "test/unit/binding_test.rb", "test/unit/memcached_experimental_test.rb", "test/unit/memcached_test.rb", "test/unit/rails_test.rb", "memcached.gemspec"]
+  s.files = ["BENCHMARKS", "BUG", "CHANGELOG", "LICENSE", "Manifest", "README", "Rakefile", "TODO", "ext/extconf-make.rb", "ext/extconf.rb", "ext/libmemcached-0.32.tar.gz", "ext/libmemcached-1.patch", "ext/libmemcached-2.patch", "ext/libmemcached-3.patch", "ext/libmemcached-4.patch", "ext/libmemcached-5.patch", "ext/libmemcached-6.patch", "ext/libmemcached-7.patch", "ext/libmemcached-8.patch", "ext/libmemcached-9.patch", "ext/rlibmemcached.i", "ext/rlibmemcached_wrap.c", "ext/sasl.patch", "lib/memcached.rb", "lib/memcached/auth.rb", "lib/memcached/behaviors.rb", "lib/memcached/exceptions.rb", "lib/memcached/experimental.rb", "lib/memcached/memcached.rb", "lib/memcached/rails.rb", "test/profile/benchmark.rb", "test/profile/c_profiler.rb", "test/profile/exercise.rb", "test/profile/rb_profiler.rb", "test/profile/valgrind.rb", "test/setup.rb", "test/teardown.rb", "test/test_helper.rb", "test/unit/binding_test.rb", "test/unit/memcached_experimental_test.rb", "test/unit/memcached_test.rb", "test/unit/rails_test.rb", "memcached.gemspec"]
   s.homepage = %q{http://fauna.github.com/fauna/memcached/}
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Memcached", "--main", "README"]
   s.require_paths = ["lib", "ext"]

metadata

@@ -1,13 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: memcached
 version: !ruby/object:Gem::Version 
-  hash: 25
-  prerelease: 
+  hash: 961915988
+  prerelease: 6
   segments: 
   - 1
   - 2
-  - 3
-  version: 1.2.3
+  - 4
+  - pre
+  version: 1.2.4.pre
 platform: ruby
 authors: 
 - Evan Weaver
@@ -36,7 +37,7 @@ cert_chain:
   yZ0=
   -----END CERTIFICATE-----
 
-date: 2011-03-23 00:00:00 -07:00
+date: 2011-03-28 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -89,7 +90,6 @@ files:
 - lib/memcached/experimental.rb
 - lib/memcached/memcached.rb
 - lib/memcached/rails.rb
-- lib/rlibmemcached.bundle.dSYM/Contents/Info.plist
 - test/profile/benchmark.rb
 - test/profile/c_profiler.rb
 - test/profile/exercise.rb

metadata.gz.sig

@@ -1,3 +1 @@
-��f���
��������SS�{u�>r����gDP��"���
�)4���t@Li���.��*���x$�
-W����L��٩�-���^��.A\�|�_���Ț��d0�<q��Tl
-_5�)0�
+�

data/lib/rlibmemcached.bundle.dSYM/Contents/Info.plist

@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-	<dict>
-		<key>CFBundleDevelopmentRegion</key>
-		<string>English</string>
-		<key>CFBundleIdentifier</key>
-		<string>com.apple.xcode.dsym.rlibmemcached.bundle</string>
-		<key>CFBundleInfoDictionaryVersion</key>
-		<string>6.0</string>
-		<key>CFBundlePackageType</key>
-		<string>dSYM</string>
-		<key>CFBundleSignature</key>
-		<string>????</string>
-		<key>CFBundleShortVersionString</key>
-		<string>1.0</string>
-		<key>CFBundleVersion</key>
-		<string>1</string>
-	</dict>
-</plist>