ffi-yajl 0.1.3-universal-java → 0.1.4-universal-java
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/ext/ffi_yajl/ext/encoder/extconf.rb +10 -6
- data/ext/ffi_yajl/ext/parser/extconf.rb +9 -5
- data/lib/ffi_yajl/version.rb +1 -1
- metadata +2 -2
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: e1c07f7b500797b2f488638ab670747a7c0d6ab3
|
|
4
|
+
data.tar.gz: 4caecdcbf02a3314588b909105c91c751799b9f1
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: bfe83ca8a9ffd8f101842020448cf8a6f168a7f0e6f16953dae53357713ee2b8c4b9a7440eb23ddd806cc9c493c998d36a2bd82d1d3ca49dec71868f3844b2cc
|
|
7
|
+
data.tar.gz: ecae48027baf478bcfbaa671e362ad30f7559900ebfa275584cde3a7b8bc28c22eb4c734ccae0ec2fda69768e4a46b1e110e8f996d925590422c695fe32fb800
|
|
@@ -2,14 +2,11 @@ require 'mkmf'
|
|
|
2
2
|
require 'rubygems'
|
|
3
3
|
require 'libyajl2'
|
|
4
4
|
|
|
5
|
-
# the customer is always right, ruby is always compiled to be stupid
|
|
6
|
-
$CFLAGS = ENV['CFLAGS'] if ENV['CFLAGS']
|
|
7
|
-
$LDFLAGS = ENV['LDFLAGS'] if ENV['LDFLAGS']
|
|
8
5
|
RbConfig::MAKEFILE_CONFIG['CC'] = ENV['CC'] if ENV['CC']
|
|
9
6
|
|
|
10
7
|
# pick up the vendored libyajl2 out of the libyajl2 gem
|
|
11
|
-
$CFLAGS = "-I#{Libyajl2.include_path}
|
|
12
|
-
$LDFLAGS = "-L#{Libyajl2.opt_path} #{$LDFLAGS}"
|
|
8
|
+
$CFLAGS = " -I#{Libyajl2.include_path} #{$CFLAGS}"
|
|
9
|
+
$LDFLAGS = " -L#{Libyajl2.opt_path} #{$LDFLAGS}"
|
|
13
10
|
|
|
14
11
|
puts $CFLAGS
|
|
15
12
|
puts $LDFLAGS
|
|
@@ -22,7 +19,14 @@ if RbConfig::MAKEFILE_CONFIG['CC'] =~ /gcc|clang/
|
|
|
22
19
|
$CFLAGS << " -Wall"
|
|
23
20
|
end
|
|
24
21
|
|
|
25
|
-
|
|
22
|
+
def windows?
|
|
23
|
+
!!(RUBY_PLATFORM =~ /mswin|mingw|windows/)
|
|
24
|
+
end
|
|
25
|
+
|
|
26
|
+
if windows?
|
|
27
|
+
# include our libyajldll.a definitions on windows in the libyajl2 gem
|
|
28
|
+
$libs = "#{$libs} -lyajldll"
|
|
29
|
+
end
|
|
26
30
|
|
|
27
31
|
dir_config 'encoder'
|
|
28
32
|
|
|
@@ -2,13 +2,10 @@ require 'mkmf'
|
|
|
2
2
|
require 'rubygems'
|
|
3
3
|
require 'libyajl2'
|
|
4
4
|
|
|
5
|
-
# the customer is always right, ruby is always compiled to be stupid
|
|
6
|
-
$CFLAGS = ENV['CFLAGS'] if ENV['CFLAGS']
|
|
7
|
-
$LDFLAGS = ENV['LDFLAGS'] if ENV['LDFLAGS']
|
|
8
5
|
RbConfig::MAKEFILE_CONFIG['CC'] = ENV['CC'] if ENV['CC']
|
|
9
6
|
|
|
10
7
|
# pick up the vendored libyajl2 out of the libyajl2 gem
|
|
11
|
-
$CFLAGS = "-I#{Libyajl2.include_path}
|
|
8
|
+
$CFLAGS = "-I#{Libyajl2.include_path} #{$CFLAGS}"
|
|
12
9
|
$LDFLAGS = "-L#{Libyajl2.opt_path} #{$LDFLAGS}"
|
|
13
10
|
|
|
14
11
|
puts $CFLAGS
|
|
@@ -22,7 +19,14 @@ if RbConfig::MAKEFILE_CONFIG['CC'] =~ /gcc|clang/
|
|
|
22
19
|
$CFLAGS << " -Wall"
|
|
23
20
|
end
|
|
24
21
|
|
|
25
|
-
|
|
22
|
+
def windows?
|
|
23
|
+
!!(RUBY_PLATFORM =~ /mswin|mingw|windows/)
|
|
24
|
+
end
|
|
25
|
+
|
|
26
|
+
if windows?
|
|
27
|
+
# include our libyajldll.a definitions on windows in the libyajl2 gem
|
|
28
|
+
$libs = "#{$libs} -lyajldll"
|
|
29
|
+
end
|
|
26
30
|
|
|
27
31
|
dir_config 'parser'
|
|
28
32
|
|
data/lib/ffi_yajl/version.rb
CHANGED
metadata
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: ffi-yajl
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 0.1.
|
|
4
|
+
version: 0.1.4
|
|
5
5
|
platform: universal-java
|
|
6
6
|
authors:
|
|
7
7
|
- Lamont Granquist
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: bin
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date: 2014-05-
|
|
11
|
+
date: 2014-05-21 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: rake
|