nokogiri 1.4.4-java → 1.4.4.2-java

data/CHANGELOG.rdoc

@@ -1,4 +1,4 @@
-=== 1.4.4 / Unreleased
+=== 1.4.4 / 2010-11-15
 
 * New Features
 

data/Rakefile

@@ -13,6 +13,7 @@ CROSS_DIR           = File.join(File.dirname(__FILE__), 'tmp', 'cross')
 
 # Make sure hoe-debugging is installed
 Hoe.plugin :debugging
+Hoe.plugin :git
 
 HOE = Hoe.spec 'nokogiri' do
   developer('Aaron Patterson', 'aaronp@rubyforge.org')
@@ -21,6 +22,7 @@ HOE = Hoe.spec 'nokogiri' do
   self.history_file  = ['CHANGELOG', ENV['HLANG'], 'rdoc'].compact.join('.')
   self.extra_rdoc_files  = FileList['*.rdoc','ext/nokogiri/*.c']
   self.clean_globs = [
+    "ext/nokogiri/*.dll",
     'lib/nokogiri/*.{o,so,bundle,a,log,dll}',
     'lib/nokogiri/nokogiri.rb',
     'lib/nokogiri/1.{8,9}',
@@ -89,13 +91,14 @@ namespace :gem do
 
   desc "Build a gem targetted for JRuby"
   task :jruby => ['gem:jruby:spec'] do
+    raise "ERROR: please run this task under jruby" unless java
     system "gem build nokogiri.gemspec"
     FileUtils.mkdir_p "pkg"
     FileUtils.mv Dir.glob("nokogiri*-java.gem"), "pkg"
   end
 
   namespace :jruby do
-    task :spec => [GENERATED_PARSER, GENERATED_TOKENIZER] do
+    task :spec => [GENERATED_PARSER, GENERATED_TOKENIZER, :"gem:jruby:dlls"] do
       File.open("#{HOE.name}.gemspec", 'w') do |f|
         HOE.spec.platform = 'java'
         HOE.spec.files << GENERATED_PARSER
@@ -106,6 +109,32 @@ namespace :gem do
         f.write(HOE.spec.to_ruby)
       end
     end
+
+    task :dlls do
+      def run cmd
+        puts(cmd) || system(cmd) || raise("command failed")
+      end
+
+      dlldir = "tmp/dlls"
+      FileUtils.mkdir_p dlldir
+      Dir.chdir dlldir do
+        unless File.exists? "nokogiri-1.4.3.1-java.gem"
+          run "wget http://rubygems.org/downloads/nokogiri-1.4.3.1-java.gem"
+        end
+        unless File.exists? "data.tar.gz"
+          run "tar -xf nokogiri-1.4.3.1-java.gem"
+        end
+        FileUtils.rm_rf "unpack"
+        FileUtils.mkdir "unpack"
+        Dir.chdir "unpack" do
+          run "tar -zxf ../data.tar.gz"
+        end
+      end
+
+      Dir["#{dlldir}/unpack/ext/nokogiri/*.dll"].each do |file|
+        cp file, "ext/nokogiri"
+      end
+    end
   end
 
   task :spec => ['gem:dev:spec']

data/lib/nokogiri/version.rb

@@ -1,6 +1,6 @@
 module Nokogiri
   # The version of Nokogiri you are using
-  VERSION = '1.4.4'
+  VERSION = '1.4.4.2'
 
   # More complete version information about libxml
   VERSION_INFO = {}

data/tasks/cross_compile.rb

@@ -141,23 +141,15 @@ namespace :cross do
     end
   end
 
-  task :copy_dlls do
-    Dir['tmp/cross/bin/*.dll'].each do |file|
-      cp file, "ext/nokogiri"
-    end
-  end
-
-  task :file_list => 'cross:copy_dlls' do
+  task :file_list do
     HOE.spec.extensions = []
     HOE.spec.files += Dir["lib/#{HOE.name}/#{HOE.name}.rb"]
     HOE.spec.files += Dir["lib/#{HOE.name}/1.{8,9}/#{HOE.name}.so"]
-    HOE.spec.files += Dir["ext/nokogiri/*.dll"]
   end
 end
 
 CLOBBER.include("lib/nokogiri/nokogiri.{so,dylib,rb,bundle}")
 CLOBBER.include("lib/nokogiri/1.{8,9}")
-CLOBBER.include("ext/nokogiri/*.dll")
 
 if Rake::Task.task_defined?(:cross)
   Rake::Task[:cross].prerequisites << "lib/nokogiri/nokogiri.rb"
@@ -166,8 +158,9 @@ end
 
 desc "build a windows gem without all the ceremony."
 task "gem:windows" do
-  # check that rake-compiler config contains the right patchlevels of 1.8.6 and 1.9.1
   rake_compiler_config = YAML.load_file("#{ENV['HOME']}/.rake-compiler/config.yml")
+
+  # check that rake-compiler config contains the right patchlevels of 1.8.6 and 1.9.1. see #279.
   ["1.8.6-p383", "1.9.1-p243"].each do |version|
     majmin, patchlevel = version.split("-")
     rbconfig = "rbconfig-#{majmin}"
@@ -176,5 +169,9 @@ task "gem:windows" do
     end
   end
 
+  # verify that --export-all is in the 1.9.1 rbconfig. see #279,#374,#375.
+  rbconfig_191 = rake_compiler_config["rbconfig-1.9.1"]
+  raise "rbconfig #{rbconfig_191} needs --export-all in its DLDFLAGS value" if File.read(rbconfig_191).grep(/CONFIG\["DLDFLAGS"\].*--export-all/).empty?
+
   system("env PKG_CONFIG_PATH=#{RAKE_COMPILER_PKGCONFIG} RUBY_CC_VERSION=1.8.6:1.9.1 rake cross native gem") || raise("build failed!")
 end

metadata

@@ -6,7 +6,8 @@ version: !ruby/object:Gem::Version
     - 1
     - 4
     - 4
-  version: 1.4.4
+    - 2
+  version: 1.4.4.2
 platform: java
 authors: 
   - Aaron Patterson
@@ -15,13 +16,14 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-16 00:00:00 -05:00
+date: 2010-12-01 00:00:00 -05:00
 default_executable: nokogiri
 dependencies: 
   - !ruby/object:Gem::Dependency 
     name: rubyforge
     prerelease: false
     requirement: &id001 !ruby/object:Gem::Requirement 
+      none: false
       requirements: 
         - - ">="
           - !ruby/object:Gem::Version 
@@ -36,6 +38,7 @@ dependencies:
     name: racc
     prerelease: false
     requirement: &id002 !ruby/object:Gem::Requirement 
+      none: false
       requirements: 
         - - ">="
           - !ruby/object:Gem::Version 
@@ -48,6 +51,7 @@ dependencies:
     name: rexical
     prerelease: false
     requirement: &id003 !ruby/object:Gem::Requirement 
+      none: false
       requirements: 
         - - ">="
           - !ruby/object:Gem::Version 
@@ -60,6 +64,7 @@ dependencies:
     name: rake-compiler
     prerelease: false
     requirement: &id004 !ruby/object:Gem::Requirement 
+      none: false
       requirements: 
         - - ">="
           - !ruby/object:Gem::Version 
@@ -72,6 +77,7 @@ dependencies:
     name: minitest
     prerelease: false
     requirement: &id005 !ruby/object:Gem::Requirement 
+      none: false
       requirements: 
         - - ">="
           - !ruby/object:Gem::Version 
@@ -86,6 +92,7 @@ dependencies:
     name: hoe
     prerelease: false
     requirement: &id006 !ruby/object:Gem::Requirement 
+      none: false
       requirements: 
         - - ">="
           - !ruby/object:Gem::Version 
@@ -100,6 +107,7 @@ dependencies:
     name: weakling
     prerelease: false
     requirement: &id007 !ruby/object:Gem::Requirement 
+      none: false
       requirements: 
         - - ">="
           - !ruby/object:Gem::Version 
@@ -443,6 +451,12 @@ files:
   - test/xml/test_unparented_node.rb
   - test/xml/test_xpath.rb
   - test/xslt/test_custom_functions.rb
+  - ext/nokogiri/libiconv-2.dll
+  - ext/nokogiri/libxml2.dll
+  - ext/nokogiri/libxslt.dll
+  - ext/nokogiri/zlib1.dll
+  - ext/nokogiri/libexslt.dll
+  - ext/nokogiri/libcharset-1.dll
 has_rdoc: true
 homepage: http://nokogiri.org
 licenses: []
@@ -454,6 +468,7 @@ rdoc_options:
 require_paths: 
   - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
@@ -461,6 +476,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
           - 0
         version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
@@ -470,7 +486,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: nokogiri
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: "Nokogiri (\xE9\x8B\xB8) is an HTML, XML, SAX, and Reader parser"