ffi-yajl 0.1.3-universal-java → 0.1.4-universal-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f37a0fa2d3cfa8b3f49a374fcdf14bb25a359acc
-  data.tar.gz: 5503b294adb725c70a1f8645bde0269ea4892f9d
+  metadata.gz: e1c07f7b500797b2f488638ab670747a7c0d6ab3
+  data.tar.gz: 4caecdcbf02a3314588b909105c91c751799b9f1
 SHA512:
-  metadata.gz: d7652d8b270363502821344821e5a0e523c13064de383951525cc420101974dc38942a8d613e325b01773515b9bfc8a376639b0a20699bc16b7e1bb9a770ea53
-  data.tar.gz: b88476c6397cc61936ff10fa4c690ad0eabaf81e6f4ef9ef136611d75a476c0f18b66784f07df9e95e9f1a6d8fff3d42be1f209098ec379391ef62c0df0127a4
+  metadata.gz: bfe83ca8a9ffd8f101842020448cf8a6f168a7f0e6f16953dae53357713ee2b8c4b9a7440eb23ddd806cc9c493c998d36a2bd82d1d3ca49dec71868f3844b2cc
+  data.tar.gz: ecae48027baf478bcfbaa671e362ad30f7559900ebfa275584cde3a7b8bc28c22eb4c734ccae0ec2fda69768e4a46b1e110e8f996d925590422c695fe32fb800

data/ext/ffi_yajl/ext/encoder/extconf.rb

@@ -2,14 +2,11 @@ require 'mkmf'
 require 'rubygems'
 require 'libyajl2'
 
-# the customer is always right, ruby is always compiled to be stupid
-$CFLAGS = ENV['CFLAGS'] if ENV['CFLAGS']
-$LDFLAGS = ENV['LDFLAGS'] if ENV['LDFLAGS']
 RbConfig::MAKEFILE_CONFIG['CC'] = ENV['CC'] if ENV['CC']
 
 # pick up the vendored libyajl2 out of the libyajl2 gem
-$CFLAGS = "-I#{Libyajl2.include_path} -L#{Libyajl2.opt_path} #{$CFLAGS}"
-$LDFLAGS = "-L#{Libyajl2.opt_path} #{$LDFLAGS}"
+$CFLAGS = " -I#{Libyajl2.include_path} #{$CFLAGS}"
+$LDFLAGS = " -L#{Libyajl2.opt_path} #{$LDFLAGS}"
 
 puts $CFLAGS
 puts $LDFLAGS
@@ -22,7 +19,14 @@ if RbConfig::MAKEFILE_CONFIG['CC'] =~ /gcc|clang/
   $CFLAGS << " -Wall"
 end
 
-#$LDFLAGS << " -lyajl"
+def windows?
+  !!(RUBY_PLATFORM =~ /mswin|mingw|windows/)
+end
+
+if windows?
+  # include our libyajldll.a definitions on windows in the libyajl2 gem
+  $libs = "#{$libs} -lyajldll"
+end
 
 dir_config 'encoder'
 

data/ext/ffi_yajl/ext/parser/extconf.rb

@@ -2,13 +2,10 @@ require 'mkmf'
 require 'rubygems'
 require 'libyajl2'
 
-# the customer is always right, ruby is always compiled to be stupid
-$CFLAGS = ENV['CFLAGS'] if ENV['CFLAGS']
-$LDFLAGS = ENV['LDFLAGS'] if ENV['LDFLAGS']
 RbConfig::MAKEFILE_CONFIG['CC'] = ENV['CC'] if ENV['CC']
 
 # pick up the vendored libyajl2 out of the libyajl2 gem
-$CFLAGS = "-I#{Libyajl2.include_path} -L#{Libyajl2.opt_path} #{$CFLAGS}"
+$CFLAGS = "-I#{Libyajl2.include_path} #{$CFLAGS}"
 $LDFLAGS = "-L#{Libyajl2.opt_path} #{$LDFLAGS}"
 
 puts $CFLAGS
@@ -22,7 +19,14 @@ if RbConfig::MAKEFILE_CONFIG['CC'] =~ /gcc|clang/
   $CFLAGS << " -Wall"
 end
 
-#$LDFLAGS << " -lyajl"
+def windows?
+  !!(RUBY_PLATFORM =~ /mswin|mingw|windows/)
+end
+
+if windows?
+  # include our libyajldll.a definitions on windows in the libyajl2 gem
+  $libs = "#{$libs} -lyajldll"
+end
 
 dir_config 'parser'
 

data/lib/ffi_yajl/version.rb

@@ -1,3 +1,3 @@
 module FFI_Yajl
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ffi-yajl
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: universal-java
 authors:
 - Lamont Granquist
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-20 00:00:00.000000000 Z
+date: 2014-05-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake