libyajl2 0.1.16 → 0.1.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 701cf9abb802d677204fc78609ca886a73c36d8c
-  data.tar.gz: 092e2ee7f218d5be4b8fc9ca21f9ea9e16061c14
+  metadata.gz: 0222174194de7fe3d97647c4ae36f05291600292
+  data.tar.gz: aee3ce42d2dbea873ca1ebb679fe7257d898b249
 SHA512:
-  metadata.gz: bca24849619f450aea3f7dd63fbab3dd4a1f1d17ea0ae0a8110a524938360a3182e3a08fd55f89ef0fbfd460e238c2c055fcc994023277fb4b8c645b91051538
-  data.tar.gz: 1006169fe3fb826b79557d6a5a35b26d1201aa8df0180f74790964585a931dfc4e2951dc8f0f2366f40c40b58b3d0230dfb29e9276056751a2e31db931435487
+  metadata.gz: db3188ee1f24819652ffd52f796010765ff3c1ae6b7cbbfbe5e6146a7d4cf2b123da86cb54826034ee3a51d2d5314c8dc7c94137417188ef0adebb40c60fe6b0
+  data.tar.gz: 526218da5db57efc70c19853f42b3ce8773475703f83f12ca244fc28e8ee2a9d931d81bdc62a49977ef5d2e9672da9db550c8cfb3d41be5d92427c35f7fddec4

data/Gemfile

@@ -10,3 +10,9 @@ group :development_extras do
   gem 'kitchen-ec2'
   gem 'kitchen-vagrant'
 end
+
+platforms :rbx do
+  gem 'racc'
+  gem 'rubysl', '~> 2.0'
+  gem 'psych'
+end

data/Rakefile

@@ -84,12 +84,12 @@ task :prep do
   FileUtils.cp Dir["#{vendor_src_path}/*.h"], build_path
 
   # the *.c files need api/yajl_foo.h headers
-  Dir.mkdir "#{build_path}/api" unless Dir.exist?("#{build_path}/api")
+  Dir.mkdir "#{build_path}/api" unless File.exist?("#{build_path}/api")
   FileUtils.cp Dir["#{vendor_src_path}/api/*.h"], "#{build_path}/api"
 
   # the header files need yajl/yajl_foo.h headers (and windows symlinks
   # are a bit of a PITA so just copy them all)
-  Dir.mkdir "#{build_path}/yajl" unless Dir.exist?("#{build_path}/yajl")
+  Dir.mkdir "#{build_path}/yajl" unless File.exist?("#{build_path}/yajl")
   FileUtils.cp Dir["#{vendor_src_path}/api/*.h"], "#{build_path}/yajl"
 
   # apply patches that haven't yet been pushed upstream
@@ -102,6 +102,15 @@ task :prep do
   generate_yajl_version
 end
 
+desc "Deploy headers (for after compile)"
+task :headers do
+  include_path = File.expand_path("../lib/libyajl2/vendored-libyajl2/include/yajl", __FILE__)
+  build_path = File.expand_path("../ext/libyajl2", __FILE__)
+
+  FileUtils.mkdir_p(include_path)
+  FileUtils.cp Dir["#{build_path}/api/*.h"], include_path
+end
+
 #
 # FIXME: need a rake task to update the git submodule and need to do that before shipping
 #
@@ -205,9 +214,9 @@ desc 'Run all style checks'
 task :style => ['style:rubocop', 'style:reek']
 
 desc 'Run style + spec tests by default on travis'
-task :travis => ['prep', 'compile', 'spec', 'style']
+task :travis => ['spec', 'style']
 
 desc 'Run style, spec and test kichen on travis'
-task :travis_all => ['prep', 'compile', 'spec', 'integration:cloud', 'style']
+task :travis_all => ['spec', 'integration:cloud', 'style']
 
-task :default => ['prep', 'compile', 'spec', 'integration:vagrant', 'style']
+task :default => ['spec', 'integration:vagrant', 'style']

data/ext/libyajl2/extconf.rb

@@ -2,7 +2,6 @@ exit(0) if ENV["USE_SYSTEM_LIBYAJL2"]
 
 require 'rbconfig'
 require 'fileutils'
-require 'mkmf'
 
 module Libyajl2Build
   class BuildError < StandardError; end
@@ -23,6 +22,10 @@ module Libyajl2Build
     PREFIX
   end
 
+  def self.deps
+    require 'mkmf'
+  end
+
   def self.setup_env
     RbConfig::MAKEFILE_CONFIG['CC'] = ENV['CC'] if ENV['CC']
 
@@ -42,36 +45,65 @@ module Libyajl2Build
   end
 
   def self.makemakefiles
-    setup_env
-    dir_config("libyajl")
-    create_makefile("libyajl")
-
-    # on windows the Makefile will try to export Init_libyajl which is wrong because we aren't a ruby lib.
-    # i could not figure out how to tell mkmf.rb to stop being so helpful, so instead will just patch it here.
-    if windows?
-      makefile = IO.read("Makefile")
-      makefile.gsub!(/\$\(DEFFILE\)/, '')
-      File.open("Makefile", 'w+') {|f| f.write(makefile) }
-    end
+    if RUBY_PLATFORM == "java"
+      File.open("Makefile", "w+") do |f|
+        f.write <<EOF
+CC = gcc
+TARGET = libyajl
+DLLIB = $(TARGET).so
+CFLAGS =  -I. -I../../../../ext/libyajl2 -fPIC -O3 -fno-fast-math -ggdb3 -Wall -Wextra -Wno-unused-parameter -Wno-parentheses -Wno-long-long -Wno-missing-field-initializers -Wunused-variable -Wpointer-arith -Wwrite-strings -Wdeclaration-after-statement -Wimplicit-function-declaration  -fPIC -std=c99 -pedantic -Wpointer-arith -Wno-format-y2k -Wstrict-prototypes -Wmissing-declarations -Wnested-externs -Wextra  -Wundef -Wwrite-strings -Wold-style-definition -Wredundant-decls -Wno-unused-parameter -Wno-sign-compare -Wmissing-prototypes -O2 -DNDEBUG
+LDFLAGS = -L. -fstack-protector -rdynamic -Wl,-export-dynamic
+LIBS = -lpthread -ldl -lcrypt -lm -lc
+OBJS = yajl_alloc.o yajl_tree.o yajl_gen.o yajl_buf.o yajl.o yajl_encode.o yajl_lex.o yajl_parser.o yajl_version.o
 
-    # 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
+all: $(DLLIB)
 
-    # not sure why ruby windows produces .so's instead of .dll's
-    if windows?
-      FileUtils.mv "libyajl.so", "yajl.dll"
-    end
+$(DLLIB): $(OBJS)
+\t$(CC) -shared -o $(DLLIB) $(OBJS) $(LDFLAGS) $(LIBS)
+
+%.o: ../../../../ext/libyajl2/%.c
+\t$(COMPILE.c) $(OUTPUT_OPTION) $<
 
-    File.open("Makefile", "w+") do |f|
-      f.write <<EOF
+install:
+\tmkdir -p #{prefix}/lib
+\tcp $(DLLIB) #{prefix}/lib/$(DLLIB)
+\tmkdir -p #{prefix}/include/yajl
+\tcp yajl/*.h #{prefix}/include/yajl
+EOF
+      end
+    else
+      deps
+      setup_env
+      dir_config("libyajl")
+      create_makefile("libyajl")
+
+      # on windows the Makefile will try to export Init_libyajl which is wrong because we aren't a ruby lib.
+      # i could not figure out how to tell mkmf.rb to stop being so helpful, so instead will just patch it here.
+      if windows?
+        makefile = IO.read("Makefile")
+        makefile.gsub!(/\$\(DEFFILE\)/, '')
+        File.open("Makefile", 'w+') {|f| f.write(makefile) }
+      end
+
+      system("pwd")
+      # we cheat and build it right away...
+      system("make >make.out 2>&1") || raise # rubinius doesn't like the output this generates
+      # ...so we can hack up what install does later and copy over the include files
+
+      # not sure why ruby windows produces .so's instead of .dll's
+      if windows?
+        FileUtils.mv "libyajl.so", "yajl.dll"
+      end
+
+      File.open("Makefile", "w+") do |f|
+        f.write <<EOF
 TARGET = libyajl
 DLLIB = $(TARGET).#{RbConfig::MAKEFILE_CONFIG['DLEXT']}
 all:
 
 EOF
-      if windows?
-        f.write <<EOF
+        if windows?
+          f.write <<EOF
 install:
 \tmkdir -p #{prefix}/lib
 \tcp yajl.dll #{prefix}/lib/yajl.dll
@@ -80,14 +112,15 @@ install:
 \tmkdir -p #{prefix}/include/yajl
 \tcp yajl/*.h #{prefix}/include/yajl
 EOF
-      else
-        f.write <<EOF
+        else
+          f.write <<EOF
 install:
 \tmkdir -p #{prefix}/lib
 \tcp $(DLLIB) #{prefix}/lib/$(DLLIB)
 \tmkdir -p #{prefix}/include/yajl
 \tcp yajl/*.h #{prefix}/include/yajl
 EOF
+        end
       end
     end
   end

data/lib/libyajl2/version.rb

@@ -1,3 +1,3 @@
 module Libyajl2
-  VERSION = "0.1.16"
+  VERSION = "0.1.17"
 end

data/libyajl2.gemspec

@@ -24,7 +24,8 @@ Gem::Specification.new do |spec|
   # required for 'rake spec'
   spec.add_development_dependency "bundler"
   spec.add_development_dependency "rake"
-  spec.add_development_dependency "rake-compiler", "~> 0.8.3"
+  # rake-compiler 0.9.2 is required for rbx compiles, and in turn requires rubygems >= 1.8.25
+  spec.add_development_dependency "rake-compiler", "~> 0.9"
   # pin mime-types in order to work on ruby 1.8.7
   spec.add_development_dependency "mime-types", "~> 1.16"
   spec.add_development_dependency "rspec", "~> 2.14"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: libyajl2
 version: !ruby/object:Gem::Version
-  version: 0.1.16
+  version: 0.1.17
 platform: ruby
 authors:
 - lamont-granquist
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-21 00:00:00.000000000 Z
+date: 2014-06-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.3
+        version: '0.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.3
+        version: '0.9'
 - !ruby/object:Gem::Dependency
   name: mime-types
   requirement: !ruby/object:Gem::Requirement