libyajl2 0.1.8 → 0.1.9
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/Rakefile +7 -2
- data/ext/libyajl2/extconf.rb +6 -5
- data/lib/libyajl2/version.rb +1 -1
- metadata +1 -1
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 47a29269f0f6fe28123a2d647ec6dd6921f728f1
|
|
4
|
+
data.tar.gz: f953d9cd19d856c4d0ef56e0bae79d8ee14572e3
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 6d73f4d3b669da8e16589359d9e5de815258d41c37b48a1979e65781070745d658bff014ea821cdbffee96a2e0dde0b3c5603d89d44fc788b31438306bdd1d65
|
|
7
|
+
data.tar.gz: ef13acbbeb0a20cee3e0ee85c553ab727788ba910d17746cee719992ccf1900b6563acc395b401068b88e2d2abba5d5d5772057b50fac82df1d0d6ed201f4685
|
data/Rakefile
CHANGED
|
@@ -102,9 +102,14 @@ task :prep do
|
|
|
102
102
|
generate_yajl_version
|
|
103
103
|
end
|
|
104
104
|
|
|
105
|
+
#
|
|
105
106
|
# FIXME: need a rake task to update the git submodule and need to do that before shipping
|
|
106
|
-
|
|
107
|
-
#
|
|
107
|
+
#
|
|
108
|
+
# to ship, update lib/libyajl2/version.rb and commit that, then:
|
|
109
|
+
#
|
|
110
|
+
# git push && rake clean && rake prep && rake gem && rake ship
|
|
111
|
+
#
|
|
112
|
+
desc "Ship it"
|
|
108
113
|
task :ship do
|
|
109
114
|
sh("git tag #{Libyajl2::VERSION}")
|
|
110
115
|
sh("git push --tags")
|
data/ext/libyajl2/extconf.rb
CHANGED
|
@@ -44,6 +44,12 @@ module Libyajl2Build
|
|
|
44
44
|
# ENV vars can override everything
|
|
45
45
|
$CFLAGS = ENV['CFLAGS'] if ENV['CFLAGS']
|
|
46
46
|
$LDFLAGS = ENV['LDFLAGS'] if ENV['LDFLAGS']
|
|
47
|
+
|
|
48
|
+
if windows?
|
|
49
|
+
# 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
|
|
50
|
+
# will never export that.
|
|
51
|
+
RbConfig::MAKEFILE_CONFIG['EXTDLDFLAGS'] = ''
|
|
52
|
+
end
|
|
47
53
|
end
|
|
48
54
|
|
|
49
55
|
def self.makemakefiles
|
|
@@ -51,11 +57,6 @@ module Libyajl2Build
|
|
|
51
57
|
dir_config("libyajl")
|
|
52
58
|
create_makefile("libyajl")
|
|
53
59
|
|
|
54
|
-
# 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
|
|
55
|
-
FileUtils.rm_f(Dir["*.def"])
|
|
56
|
-
# and we need to surgically remove it from the LDFLAGS
|
|
57
|
-
$LDFLAGS.gsub!(/\S+.def/, ' ')
|
|
58
|
-
|
|
59
60
|
# we cheat and build it right away...
|
|
60
61
|
system("make V=1")
|
|
61
62
|
# ...so we can hack up what install does later and copy over the include files
|
data/lib/libyajl2/version.rb
CHANGED