nokogiri 1.4.4-java → 1.4.4.2-java

Sign up to get free protection for your applications and to get access to all the features.

Potentially problematic release.


This version of nokogiri might be problematic. Click here for more details.

@@ -1,4 +1,4 @@
1
- === 1.4.4 / Unreleased
1
+ === 1.4.4 / 2010-11-15
2
2
 
3
3
  * New Features
4
4
 
data/Rakefile CHANGED
@@ -13,6 +13,7 @@ CROSS_DIR = File.join(File.dirname(__FILE__), 'tmp', 'cross')
13
13
 
14
14
  # Make sure hoe-debugging is installed
15
15
  Hoe.plugin :debugging
16
+ Hoe.plugin :git
16
17
 
17
18
  HOE = Hoe.spec 'nokogiri' do
18
19
  developer('Aaron Patterson', 'aaronp@rubyforge.org')
@@ -21,6 +22,7 @@ HOE = Hoe.spec 'nokogiri' do
21
22
  self.history_file = ['CHANGELOG', ENV['HLANG'], 'rdoc'].compact.join('.')
22
23
  self.extra_rdoc_files = FileList['*.rdoc','ext/nokogiri/*.c']
23
24
  self.clean_globs = [
25
+ "ext/nokogiri/*.dll",
24
26
  'lib/nokogiri/*.{o,so,bundle,a,log,dll}',
25
27
  'lib/nokogiri/nokogiri.rb',
26
28
  'lib/nokogiri/1.{8,9}',
@@ -89,13 +91,14 @@ namespace :gem do
89
91
 
90
92
  desc "Build a gem targetted for JRuby"
91
93
  task :jruby => ['gem:jruby:spec'] do
94
+ raise "ERROR: please run this task under jruby" unless java
92
95
  system "gem build nokogiri.gemspec"
93
96
  FileUtils.mkdir_p "pkg"
94
97
  FileUtils.mv Dir.glob("nokogiri*-java.gem"), "pkg"
95
98
  end
96
99
 
97
100
  namespace :jruby do
98
- task :spec => [GENERATED_PARSER, GENERATED_TOKENIZER] do
101
+ task :spec => [GENERATED_PARSER, GENERATED_TOKENIZER, :"gem:jruby:dlls"] do
99
102
  File.open("#{HOE.name}.gemspec", 'w') do |f|
100
103
  HOE.spec.platform = 'java'
101
104
  HOE.spec.files << GENERATED_PARSER
@@ -106,6 +109,32 @@ namespace :gem do
106
109
  f.write(HOE.spec.to_ruby)
107
110
  end
108
111
  end
112
+
113
+ task :dlls do
114
+ def run cmd
115
+ puts(cmd) || system(cmd) || raise("command failed")
116
+ end
117
+
118
+ dlldir = "tmp/dlls"
119
+ FileUtils.mkdir_p dlldir
120
+ Dir.chdir dlldir do
121
+ unless File.exists? "nokogiri-1.4.3.1-java.gem"
122
+ run "wget http://rubygems.org/downloads/nokogiri-1.4.3.1-java.gem"
123
+ end
124
+ unless File.exists? "data.tar.gz"
125
+ run "tar -xf nokogiri-1.4.3.1-java.gem"
126
+ end
127
+ FileUtils.rm_rf "unpack"
128
+ FileUtils.mkdir "unpack"
129
+ Dir.chdir "unpack" do
130
+ run "tar -zxf ../data.tar.gz"
131
+ end
132
+ end
133
+
134
+ Dir["#{dlldir}/unpack/ext/nokogiri/*.dll"].each do |file|
135
+ cp file, "ext/nokogiri"
136
+ end
137
+ end
109
138
  end
110
139
 
111
140
  task :spec => ['gem:dev:spec']
Binary file
Binary file
Binary file
Binary file
@@ -1,6 +1,6 @@
1
1
  module Nokogiri
2
2
  # The version of Nokogiri you are using
3
- VERSION = '1.4.4'
3
+ VERSION = '1.4.4.2'
4
4
 
5
5
  # More complete version information about libxml
6
6
  VERSION_INFO = {}
@@ -141,23 +141,15 @@ namespace :cross do
141
141
  end
142
142
  end
143
143
 
144
- task :copy_dlls do
145
- Dir['tmp/cross/bin/*.dll'].each do |file|
146
- cp file, "ext/nokogiri"
147
- end
148
- end
149
-
150
- task :file_list => 'cross:copy_dlls' do
144
+ task :file_list do
151
145
  HOE.spec.extensions = []
152
146
  HOE.spec.files += Dir["lib/#{HOE.name}/#{HOE.name}.rb"]
153
147
  HOE.spec.files += Dir["lib/#{HOE.name}/1.{8,9}/#{HOE.name}.so"]
154
- HOE.spec.files += Dir["ext/nokogiri/*.dll"]
155
148
  end
156
149
  end
157
150
 
158
151
  CLOBBER.include("lib/nokogiri/nokogiri.{so,dylib,rb,bundle}")
159
152
  CLOBBER.include("lib/nokogiri/1.{8,9}")
160
- CLOBBER.include("ext/nokogiri/*.dll")
161
153
 
162
154
  if Rake::Task.task_defined?(:cross)
163
155
  Rake::Task[:cross].prerequisites << "lib/nokogiri/nokogiri.rb"
@@ -166,8 +158,9 @@ end
166
158
 
167
159
  desc "build a windows gem without all the ceremony."
168
160
  task "gem:windows" do
169
- # check that rake-compiler config contains the right patchlevels of 1.8.6 and 1.9.1
170
161
  rake_compiler_config = YAML.load_file("#{ENV['HOME']}/.rake-compiler/config.yml")
162
+
163
+ # check that rake-compiler config contains the right patchlevels of 1.8.6 and 1.9.1. see #279.
171
164
  ["1.8.6-p383", "1.9.1-p243"].each do |version|
172
165
  majmin, patchlevel = version.split("-")
173
166
  rbconfig = "rbconfig-#{majmin}"
@@ -176,5 +169,9 @@ task "gem:windows" do
176
169
  end
177
170
  end
178
171
 
172
+ # verify that --export-all is in the 1.9.1 rbconfig. see #279,#374,#375.
173
+ rbconfig_191 = rake_compiler_config["rbconfig-1.9.1"]
174
+ raise "rbconfig #{rbconfig_191} needs --export-all in its DLDFLAGS value" if File.read(rbconfig_191).grep(/CONFIG\["DLDFLAGS"\].*--export-all/).empty?
175
+
179
176
  system("env PKG_CONFIG_PATH=#{RAKE_COMPILER_PKGCONFIG} RUBY_CC_VERSION=1.8.6:1.9.1 rake cross native gem") || raise("build failed!")
180
177
  end
metadata CHANGED
@@ -6,7 +6,8 @@ version: !ruby/object:Gem::Version
6
6
  - 1
7
7
  - 4
8
8
  - 4
9
- version: 1.4.4
9
+ - 2
10
+ version: 1.4.4.2
10
11
  platform: java
11
12
  authors:
12
13
  - Aaron Patterson
@@ -15,13 +16,14 @@ autorequire:
15
16
  bindir: bin
16
17
  cert_chain: []
17
18
 
18
- date: 2010-11-16 00:00:00 -05:00
19
+ date: 2010-12-01 00:00:00 -05:00
19
20
  default_executable: nokogiri
20
21
  dependencies:
21
22
  - !ruby/object:Gem::Dependency
22
23
  name: rubyforge
23
24
  prerelease: false
24
25
  requirement: &id001 !ruby/object:Gem::Requirement
26
+ none: false
25
27
  requirements:
26
28
  - - ">="
27
29
  - !ruby/object:Gem::Version
@@ -36,6 +38,7 @@ dependencies:
36
38
  name: racc
37
39
  prerelease: false
38
40
  requirement: &id002 !ruby/object:Gem::Requirement
41
+ none: false
39
42
  requirements:
40
43
  - - ">="
41
44
  - !ruby/object:Gem::Version
@@ -48,6 +51,7 @@ dependencies:
48
51
  name: rexical
49
52
  prerelease: false
50
53
  requirement: &id003 !ruby/object:Gem::Requirement
54
+ none: false
51
55
  requirements:
52
56
  - - ">="
53
57
  - !ruby/object:Gem::Version
@@ -60,6 +64,7 @@ dependencies:
60
64
  name: rake-compiler
61
65
  prerelease: false
62
66
  requirement: &id004 !ruby/object:Gem::Requirement
67
+ none: false
63
68
  requirements:
64
69
  - - ">="
65
70
  - !ruby/object:Gem::Version
@@ -72,6 +77,7 @@ dependencies:
72
77
  name: minitest
73
78
  prerelease: false
74
79
  requirement: &id005 !ruby/object:Gem::Requirement
80
+ none: false
75
81
  requirements:
76
82
  - - ">="
77
83
  - !ruby/object:Gem::Version
@@ -86,6 +92,7 @@ dependencies:
86
92
  name: hoe
87
93
  prerelease: false
88
94
  requirement: &id006 !ruby/object:Gem::Requirement
95
+ none: false
89
96
  requirements:
90
97
  - - ">="
91
98
  - !ruby/object:Gem::Version
@@ -100,6 +107,7 @@ dependencies:
100
107
  name: weakling
101
108
  prerelease: false
102
109
  requirement: &id007 !ruby/object:Gem::Requirement
110
+ none: false
103
111
  requirements:
104
112
  - - ">="
105
113
  - !ruby/object:Gem::Version
@@ -443,6 +451,12 @@ files:
443
451
  - test/xml/test_unparented_node.rb
444
452
  - test/xml/test_xpath.rb
445
453
  - test/xslt/test_custom_functions.rb
454
+ - ext/nokogiri/libiconv-2.dll
455
+ - ext/nokogiri/libxml2.dll
456
+ - ext/nokogiri/libxslt.dll
457
+ - ext/nokogiri/zlib1.dll
458
+ - ext/nokogiri/libexslt.dll
459
+ - ext/nokogiri/libcharset-1.dll
446
460
  has_rdoc: true
447
461
  homepage: http://nokogiri.org
448
462
  licenses: []
@@ -454,6 +468,7 @@ rdoc_options:
454
468
  require_paths:
455
469
  - lib
456
470
  required_ruby_version: !ruby/object:Gem::Requirement
471
+ none: false
457
472
  requirements:
458
473
  - - ">="
459
474
  - !ruby/object:Gem::Version
@@ -461,6 +476,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
461
476
  - 0
462
477
  version: "0"
463
478
  required_rubygems_version: !ruby/object:Gem::Requirement
479
+ none: false
464
480
  requirements:
465
481
  - - ">="
466
482
  - !ruby/object:Gem::Version
@@ -470,7 +486,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
470
486
  requirements: []
471
487
 
472
488
  rubyforge_project: nokogiri
473
- rubygems_version: 1.3.6
489
+ rubygems_version: 1.3.7
474
490
  signing_key:
475
491
  specification_version: 3
476
492
  summary: "Nokogiri (\xE9\x8B\xB8) is an HTML, XML, SAX, and Reader parser"