libyajl2 0.1.8 → 0.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8028bb72d9eda5086ef18768f4444a3dc299aa82
-  data.tar.gz: 8c7317e5cc2435faef7f4e26769f25c3ad12f74c
+  metadata.gz: 47a29269f0f6fe28123a2d647ec6dd6921f728f1
+  data.tar.gz: f953d9cd19d856c4d0ef56e0bae79d8ee14572e3
 SHA512:
-  metadata.gz: 3de59bac81dfd143dd84c48718f42412bd0dcb4fe34c2a6dc9f402cd1adaca0e0eef20422fa03437ee21b0ef47edeb991ba97a8ddccbd60099e5c6d67820f090
-  data.tar.gz: c06bdfc24eab3de0a4800e59b73d48e96c607f84937ff022a3fd2f942aa32eaeca5288677bef1e6624df87d4447183ccb073a9aefa60ee8721657b12d406f61b
+  metadata.gz: 6d73f4d3b669da8e16589359d9e5de815258d41c37b48a1979e65781070745d658bff014ea821cdbffee96a2e0dde0b3c5603d89d44fc788b31438306bdd1d65
+  data.tar.gz: ef13acbbeb0a20cee3e0ee85c553ab727788ba910d17746cee719992ccf1900b6563acc395b401068b88e2d2abba5d5d5772057b50fac82df1d0d6ed201f4685

data/Rakefile

@@ -102,9 +102,14 @@ task :prep do
   generate_yajl_version
 end
 
+#
 # FIXME: need a rake task to update the git submodule and need to do that before shipping
-desc "Build it and ship it"
-#task :ship => [:clean, :prep, :gem] do
+#
+# to ship, update lib/libyajl2/version.rb and commit that, then:
+#
+#  git push && rake clean && rake prep && rake gem && rake ship
+#
+desc "Ship it"
 task :ship do
   sh("git tag #{Libyajl2::VERSION}")
   sh("git push --tags")

data/ext/libyajl2/extconf.rb

@@ -44,6 +44,12 @@ module Libyajl2Build
     # ENV vars can override everything
     $CFLAGS = ENV['CFLAGS'] if ENV['CFLAGS']
     $LDFLAGS = ENV['LDFLAGS'] if ENV['LDFLAGS']
+
+    if windows?
+      # on windows this will try to spit out a *.def that exports Init_libyajl which is wrong, we aren't a ruby lib, so we
+      # will never export that.
+      RbConfig::MAKEFILE_CONFIG['EXTDLDFLAGS'] = ''
+    end
   end
 
   def self.makemakefiles
@@ -51,11 +57,6 @@ module Libyajl2Build
     dir_config("libyajl")
     create_makefile("libyajl")
 
-    # ruby on windows helpfully drops a *.def file to export Init_libyajl which we don't need because this isn't really a ruby extension
-    FileUtils.rm_f(Dir["*.def"])
-    # and we need to surgically remove it from the LDFLAGS
-    $LDFLAGS.gsub!(/\S+.def/, ' ')
-
     # we cheat and build it right away...
     system("make V=1")
     # ...so we can hack up what install does later and copy over the include files

data/lib/libyajl2/version.rb

@@ -1,3 +1,3 @@
 module Libyajl2
-  VERSION = "0.1.8"
+  VERSION = "0.1.9"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: libyajl2
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.1.9
 platform: ruby
 authors:
 - lamont-granquist