nokogiri 1.4.7-x86-mingw32 → 1.5.0-x86-mingw32

data/CHANGELOG.ja.rdoc

@@ -1,3 +1,53 @@
+== 1.5.0 / 2011年7月1日
+
+* Notes
+
+  * See changelog from 1.4.7
+
+* Features
+
+  * extracted sets of Node::SaveOptions into Node::SaveOptions::DEFAULT_{X,H,XH}TML (refactor)
+
+* Bugfixes
+
+  * default output of XML on JRuby is no longer formatted due to
+    inconsistent whitespace handling. #415
+  * (JRuby) making empty NodeSets with null `nodes` member safe to operate on. #443
+  * Fix a bug in advanced encoding detection that leads to partially
+    duplicated document when parsing an HTML file with unknown
+    encoding.
+  * Add support for <meta charset="...">.
+
+
+== 1.5.0 beta3 ２０１０年１２月２日
+
+* 註
+
+  * JRubyでの性能改善
+  * 1.4.4からの変更点を参照
+
+* バグの修正
+
+  * Node#inner_textはnilを返さなくなった. (JRuby) #264
+
+== 1.5.0 beta2 ２０１０年７月３０日
+
+* 註
+
+  * 1.4.3からの変更点を参照
+
+== 1.5.0 beta1 ２０１０年５月２２日
+
+* 註
+
+  * 新しいピュアJavaバックエンドによりJRubyサポートを追加
+
+* 廃止
+
+  * Ruby 1.8.6は非推奨となった. インストールできるかもしれないが、正式なサポートは終了.
+  * LibXML 2.6.16および古いバージョンは非推奨. インストールできない.
+  * FFIサポートは削除された.
+
 === 1.4.7 / 2011年7月1日
 
 * バグの修正
@@ -11,7 +61,7 @@
   * このバージョンは、1.4.5と機能的に同じです
   * Rubyの1.8.6のサポートが復元されている
 
-=== 1.4.5 / 2011年6月15日
+=== 1.4.5 / 未リリース
 
 * 新機能
 
@@ -60,6 +110,7 @@
   * XML::Reader#empty_element?  - 子の無いエレメントにtrueを返す　 #262
   * Node#remove_namespaces! - 1.4.2では 名前空間のみを取り除いていたが、
     1.4.3 では名前空間及び、名前空間宣言も取り除く　#294
+  * NodeSet#{at_xpath,at_css,>} はNodeの同名メソッドと同様の動作
 
 * バグの修正
 
@@ -72,6 +123,8 @@
   * xmlFirstElementChild et al.による libxml2バージョンでの不適合性を修正 #303
   * XML::Attr#add_namespace　（！）文字通りの機能実現!　 #252
   * HTML::DocumentFragment が文字列に存在するエンコードを使用　#305
+  * CSS3の間接セレクタ"E ~ F G"がXPathの"//F//G[preceding-sibling::E]"へと
+    誤変換されてしまうのを修正
 
 === 1.4.2 ２０１０年５月２２日
 
@@ -93,6 +146,10 @@
   * Nokogiri::XML::Node#first_element_child は一番最初のELEMENT子ノードを返す
   * Nokogiri::XML::Node#last_element_child は最後のELEMENT子ノードを返す
   * Nokogiri::XML::Node#elements は全てのELEMENT子ノードを返す
+  * Nokogiri::XML::Node#add_child, #add_previous_sibling, #before,
+    #add_next_sibling, #after, #inner_html, #swap, #replaceはNode,
+    DocumentFragment, NodeSetおよびマークアップ文字列を受け付ける
+  * Node#fragment? はノードがDocumentFragmentかどうかを示す
 
 * バグの修正
 
@@ -111,6 +168,7 @@
     GH #204
   * XML::DocumentFragment はML::Node#parse を使用して子を限定する
   * XML Reader内のメモリリーク修正　 sdorさん、ありがとう! GH#244
+  * Node#replaceはRDocの通り新しい子ノードを返す（selfを返していた）
 
 * ノート
 

data/CHANGELOG.rdoc

@@ -1,3 +1,52 @@
+== 1.5.0 / 2011-07-01
+
+* Notes
+
+  * See changelog from 1.4.7
+
+* Features
+
+  * extracted sets of Node::SaveOptions into Node::SaveOptions::DEFAULT_{X,H,XH}TML (refactor)
+
+* Bugfixes
+
+  * default output of XML on JRuby is no longer formatted due to
+    inconsistent whitespace handling. #415
+  * (JRuby) making empty NodeSets with null `nodes` member safe to operate on. #443
+  * Fix a bug in advanced encoding detection that leads to partially
+    duplicated document when parsing an HTML file with unknown
+    encoding.
+  * Add support for <meta charset="...">.
+
+== 1.5.0 beta3 / 2010/12/02
+
+* Notes
+
+  * JRuby performance tuning
+  * See changelog from 1.4.4
+
+* Bugfixes
+
+  * Node#inner_text no longer returns nil. (JRuby) #264
+
+== 1.5.0 beta2 / 2010/07/30
+
+* Notes
+
+  * See changelog from 1.4.3
+
+== 1.5.0 beta1 / 2010/05/22
+
+* Notes
+
+  * JRuby support is provided by a new pure-java backend.
+
+* Deprecations
+
+  * Ruby 1.8.6 is deprecated. Nokogiri will install, but official support is ended.
+  * LibXML 2.6.16 and earlier are deprecated. Nokogiri will refuse to install.
+  * FFI support is removed.
+
 === 1.4.7 / 2011-07-01
 
 * Bugfixes
@@ -13,7 +62,7 @@
   * This version is functionally identical to 1.4.5.
   * Ruby 1.8.6 support has been restored.
 
-=== 1.4.5 / 2011-06-15
+=== 1.4.5 / 2011-05-19
 
 * New Features
 
@@ -81,7 +130,7 @@
   * XML::Attr#add_namespace now works as expected. #252
   * HTML::DocumentFragment uses the string's encoding. #305
   * Fix the CSS3 selector translation rule for the general sibling combinator
-    (a.k.a. preceding selector) that incorrectly converted "E + F G" to
+    (a.k.a. preceding selector) that incorrectly converted "E ~ F G" to
     "//F//G[preceding-sibling::E]".
 
 === 1.4.2 / 2010/05/22

data/Manifest.txt

@@ -7,6 +7,61 @@ README.ja.rdoc
 README.rdoc
 Rakefile
 bin/nokogiri
+ext/java/nokogiri/EncodingHandler.java
+ext/java/nokogiri/HtmlDocument.java
+ext/java/nokogiri/HtmlElementDescription.java
+ext/java/nokogiri/HtmlEntityLookup.java
+ext/java/nokogiri/HtmlSaxParserContext.java
+ext/java/nokogiri/NokogiriService.java
+ext/java/nokogiri/XmlAttr.java
+ext/java/nokogiri/XmlAttributeDecl.java
+ext/java/nokogiri/XmlCdata.java
+ext/java/nokogiri/XmlComment.java
+ext/java/nokogiri/XmlDocument.java
+ext/java/nokogiri/XmlDocumentFragment.java
+ext/java/nokogiri/XmlDtd.java
+ext/java/nokogiri/XmlElement.java
+ext/java/nokogiri/XmlElementContent.java
+ext/java/nokogiri/XmlElementDecl.java
+ext/java/nokogiri/XmlEntityDecl.java
+ext/java/nokogiri/XmlEntityReference.java
+ext/java/nokogiri/XmlNamespace.java
+ext/java/nokogiri/XmlNode.java
+ext/java/nokogiri/XmlNodeSet.java
+ext/java/nokogiri/XmlProcessingInstruction.java
+ext/java/nokogiri/XmlReader.java
+ext/java/nokogiri/XmlRelaxng.java
+ext/java/nokogiri/XmlSaxParserContext.java
+ext/java/nokogiri/XmlSaxPushParser.java
+ext/java/nokogiri/XmlSchema.java
+ext/java/nokogiri/XmlSyntaxError.java
+ext/java/nokogiri/XmlText.java
+ext/java/nokogiri/XmlXpathContext.java
+ext/java/nokogiri/XsltStylesheet.java
+ext/java/nokogiri/internals/HtmlDomParserContext.java
+ext/java/nokogiri/internals/NokogiriDocumentCache.java
+ext/java/nokogiri/internals/NokogiriErrorHandler.java
+ext/java/nokogiri/internals/NokogiriHandler.java
+ext/java/nokogiri/internals/NokogiriHelpers.java
+ext/java/nokogiri/internals/NokogiriNamespaceCache.java
+ext/java/nokogiri/internals/NokogiriNamespaceContext.java
+ext/java/nokogiri/internals/NokogiriNonStrictErrorHandler.java
+ext/java/nokogiri/internals/NokogiriNonStrictErrorHandler4NekoHtml.java
+ext/java/nokogiri/internals/NokogiriStrictErrorHandler.java
+ext/java/nokogiri/internals/NokogiriXPathFunction.java
+ext/java/nokogiri/internals/NokogiriXPathFunctionResolver.java
+ext/java/nokogiri/internals/NokogiriXPathVariableResolver.java
+ext/java/nokogiri/internals/NokogiriXsltErrorListener.java
+ext/java/nokogiri/internals/ParserContext.java
+ext/java/nokogiri/internals/PushInputStream.java
+ext/java/nokogiri/internals/ReaderNode.java
+ext/java/nokogiri/internals/SaveContextVisitor.java
+ext/java/nokogiri/internals/SchemaErrorHandler.java
+ext/java/nokogiri/internals/XmlDeclHandler.java
+ext/java/nokogiri/internals/XmlDomParser.java
+ext/java/nokogiri/internals/XmlDomParserContext.java
+ext/java/nokogiri/internals/XmlSaxParser.java
+ext/java/nokogiri/internals/XsltExtensionFunction.java
 ext/nokogiri/depend
 ext/nokogiri/extconf.rb
 ext/nokogiri/html_document.c
@@ -75,6 +130,10 @@ ext/nokogiri/xml_xpath_context.c
 ext/nokogiri/xml_xpath_context.h
 ext/nokogiri/xslt_stylesheet.c
 ext/nokogiri/xslt_stylesheet.h
+lib/isorelax.jar
+lib/jing.jar
+lib/nekodtd.jar
+lib/nekohtml.jar
 lib/nokogiri.rb
 lib/nokogiri/css.rb
 lib/nokogiri/css/node.rb
@@ -86,81 +145,17 @@ lib/nokogiri/css/tokenizer.rb
 lib/nokogiri/css/tokenizer.rex
 lib/nokogiri/css/xpath_visitor.rb
 lib/nokogiri/decorators/slop.rb
-lib/nokogiri/ffi/encoding_handler.rb
-lib/nokogiri/ffi/html/document.rb
-lib/nokogiri/ffi/html/element_description.rb
-lib/nokogiri/ffi/html/entity_lookup.rb
-lib/nokogiri/ffi/html/sax/parser_context.rb
-lib/nokogiri/ffi/io_callbacks.rb
-lib/nokogiri/ffi/libxml.rb
-lib/nokogiri/ffi/structs/common_node.rb
-lib/nokogiri/ffi/structs/html_elem_desc.rb
-lib/nokogiri/ffi/structs/html_entity_desc.rb
-lib/nokogiri/ffi/structs/xml_alloc.rb
-lib/nokogiri/ffi/structs/xml_attr.rb
-lib/nokogiri/ffi/structs/xml_attribute.rb
-lib/nokogiri/ffi/structs/xml_buffer.rb
-lib/nokogiri/ffi/structs/xml_char_encoding_handler.rb
-lib/nokogiri/ffi/structs/xml_document.rb
-lib/nokogiri/ffi/structs/xml_dtd.rb
-lib/nokogiri/ffi/structs/xml_element.rb
-lib/nokogiri/ffi/structs/xml_element_content.rb
-lib/nokogiri/ffi/structs/xml_entity.rb
-lib/nokogiri/ffi/structs/xml_enumeration.rb
-lib/nokogiri/ffi/structs/xml_node.rb
-lib/nokogiri/ffi/structs/xml_node_set.rb
-lib/nokogiri/ffi/structs/xml_notation.rb
-lib/nokogiri/ffi/structs/xml_ns.rb
-lib/nokogiri/ffi/structs/xml_parser_context.rb
-lib/nokogiri/ffi/structs/xml_parser_input.rb
-lib/nokogiri/ffi/structs/xml_relax_ng.rb
-lib/nokogiri/ffi/structs/xml_sax_handler.rb
-lib/nokogiri/ffi/structs/xml_sax_push_parser_context.rb
-lib/nokogiri/ffi/structs/xml_schema.rb
-lib/nokogiri/ffi/structs/xml_syntax_error.rb
-lib/nokogiri/ffi/structs/xml_text_reader.rb
-lib/nokogiri/ffi/structs/xml_xpath_context.rb
-lib/nokogiri/ffi/structs/xml_xpath_object.rb
-lib/nokogiri/ffi/structs/xml_xpath_parser_context.rb
-lib/nokogiri/ffi/structs/xslt_stylesheet.rb
-lib/nokogiri/ffi/weak_bucket.rb
-lib/nokogiri/ffi/xml/attr.rb
-lib/nokogiri/ffi/xml/attribute_decl.rb
-lib/nokogiri/ffi/xml/cdata.rb
-lib/nokogiri/ffi/xml/comment.rb
-lib/nokogiri/ffi/xml/document.rb
-lib/nokogiri/ffi/xml/document_fragment.rb
-lib/nokogiri/ffi/xml/dtd.rb
-lib/nokogiri/ffi/xml/element_content.rb
-lib/nokogiri/ffi/xml/element_decl.rb
-lib/nokogiri/ffi/xml/entity_decl.rb
-lib/nokogiri/ffi/xml/entity_reference.rb
-lib/nokogiri/ffi/xml/namespace.rb
-lib/nokogiri/ffi/xml/node.rb
-lib/nokogiri/ffi/xml/node_set.rb
-lib/nokogiri/ffi/xml/processing_instruction.rb
-lib/nokogiri/ffi/xml/reader.rb
-lib/nokogiri/ffi/xml/relax_ng.rb
-lib/nokogiri/ffi/xml/sax/parser.rb
-lib/nokogiri/ffi/xml/sax/parser_context.rb
-lib/nokogiri/ffi/xml/sax/push_parser.rb
-lib/nokogiri/ffi/xml/schema.rb
-lib/nokogiri/ffi/xml/syntax_error.rb
-lib/nokogiri/ffi/xml/text.rb
-lib/nokogiri/ffi/xml/xpath.rb
-lib/nokogiri/ffi/xml/xpath_context.rb
-lib/nokogiri/ffi/xslt/stylesheet.rb
 lib/nokogiri/html.rb
 lib/nokogiri/html/builder.rb
 lib/nokogiri/html/document.rb
 lib/nokogiri/html/document_fragment.rb
 lib/nokogiri/html/element_description.rb
+lib/nokogiri/html/element_description_defaults.rb
 lib/nokogiri/html/entity_lookup.rb
 lib/nokogiri/html/sax/parser.rb
 lib/nokogiri/html/sax/parser_context.rb
 lib/nokogiri/syntax_error.rb
 lib/nokogiri/version.rb
-lib/nokogiri/version_warning.rb
 lib/nokogiri/xml.rb
 lib/nokogiri/xml/attr.rb
 lib/nokogiri/xml/attribute_decl.rb
@@ -198,15 +193,17 @@ lib/nokogiri/xml/xpath/syntax_error.rb
 lib/nokogiri/xml/xpath_context.rb
 lib/nokogiri/xslt.rb
 lib/nokogiri/xslt/stylesheet.rb
+lib/xercesImpl.jar
 lib/xsd/xmlparser/nokogiri.rb
+nokogiri_help_responses.md
 tasks/cross_compile.rb
+tasks/nokogiri.org.rb
 tasks/test.rb
 test/css/test_nthiness.rb
 test/css/test_parser.rb
 test/css/test_tokenizer.rb
 test/css/test_xpath_visitor.rb
 test/decorators/test_slop.rb
-test/ffi/test_document.rb
 test/files/2ch.html
 test/files/address_book.rlx
 test/files/address_book.xml
@@ -217,6 +214,8 @@ test/files/encoding.xhtml
 test/files/exslt.xml
 test/files/exslt.xslt
 test/files/foo/foo.xsd
+test/files/metacharset.html
+test/files/noencoding.html
 test/files/po.xml
 test/files/po.xsd
 test/files/shift_jis.html
@@ -281,3 +280,4 @@ test/xml/test_text.rb
 test/xml/test_unparented_node.rb
 test/xml/test_xpath.rb
 test/xslt/test_custom_functions.rb
+test/xslt/test_exception_handling.rb

data/README.ja.rdoc

@@ -81,6 +81,10 @@ Copyright (c) 2008 - 2010:
 
 * {Aaron Patterson}[http://tenderlovemaking.com]
 * {Mike Dalessio}[http://mike.daless.io]
+* {Charles Nutter}[http://blog.headius.com]
+* {Sergio Arbeo}[http://www.serabe.com]
+* {Patrick Mahoney}[http://polycrystal.org]
+* {Yoko Harada}[http://yokolet.blogspot.com]
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.rdoc

@@ -112,10 +112,34 @@ Binary packages are available for:
 
 == DEVELOPMENT:
 
-Developing Nokogiri requires racc and rexical.
+=== Developing on C Ruby (MRI)
 
-* rake install:deps
-* rake test
+Developing Nokogiri requires racc and rexical to generate the parser and
+tokenizer.  To start development, make sure you have `libxml2` and `libxslt`
+installed.
+
+Then install hoe and rake-compiler:
+
+    $ gem install hoe rake-compiler racc rexical minitest
+
+Then run rake:
+
+    $ rake
+
+=== Developing on JRuby
+
+Currently, development with JRuby depends on C Ruby being installed.  With
+normal C Ruby, install racc and rexical:
+
+    $ gem install racc rexical
+
+Make sure hoe and rake compiler are installed with JRuby:
+
+    $ jgem install hoe rake-compiler
+
+Then run rake:
+
+    $ jruby -S rake
 
 == LICENSE:
 
@@ -125,6 +149,10 @@ Copyright (c) 2008 - 2010:
 
 * {Aaron Patterson}[http://tenderlovemaking.com]
 * {Mike Dalessio}[http://mike.daless.io]
+* {Charles Nutter}[http://blog.headius.com]
+* {Sergio Arbeo}[http://www.serabe.com]
+* {Patrick Mahoney}[http://polycrystal.org]
+* {Yoko Harada}[http://yokolet.blogspot.com]
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/Rakefile

@@ -1,147 +1,115 @@
 # -*- ruby -*-
-
 require 'rubygems'
-gem 'hoe', '>= 2.1.0'
-require 'hoe'
 
-windows = RUBY_PLATFORM =~ /(mswin|mingw)/i
-java    = RUBY_PLATFORM =~ /java/
+gem 'hoe'
+require 'hoe'
+Hoe.plugin :debugging
+Hoe.plugin :git
+Hoe.plugin :gemspec
+Hoe.plugin :bundler
+Hoe.add_include_dirs '.' # for ruby 1.9.2
 
 GENERATED_PARSER    = "lib/nokogiri/css/parser.rb"
 GENERATED_TOKENIZER = "lib/nokogiri/css/tokenizer.rb"
-CROSS_DIR           = File.join(File.dirname(__FILE__), 'tmp', 'cross')
+CROSS_DIR           =  File.join(File.dirname(__FILE__), 'ports')
 
-# Make sure hoe-debugging is installed
-Hoe.plugin :debugging
-Hoe.plugin :git
+def java?
+  !! (RUBY_PLATFORM =~ /java/)
+end
+
+require 'tasks/nokogiri.org'
 
 HOE = Hoe.spec 'nokogiri' do
-  developer('Aaron Patterson', 'aaronp@rubyforge.org')
-  developer('Mike Dalessio', 'mike.dalessio@gmail.com')
-  self.readme_file   = ['README', ENV['HLANG'], 'rdoc'].compact.join('.')
-  self.history_file  = ['CHANGELOG', ENV['HLANG'], 'rdoc'].compact.join('.')
-  self.extra_rdoc_files  = FileList['*.rdoc','ext/nokogiri/*.c']
-  self.clean_globs = [
-    "ext/nokogiri/*.dll",
+  developer 'Aaron Patterson', 'aaronp@rubyforge.org'
+  developer 'Mike Dalessio',   'mike.dalessio@gmail.com'
+  developer 'Yoko Harada',     'yokolet@gmail.com'
+
+  self.readme_file  = ['README',    ENV['HLANG'], 'rdoc'].compact.join('.')
+  self.history_file = ['CHANGELOG', ENV['HLANG'], 'rdoc'].compact.join('.')
+
+  self.extra_rdoc_files = FileList['*.rdoc','ext/nokogiri/*.c']
+
+  self.clean_globs += [
+    'nokogiri.gemspec',
     'lib/nokogiri/*.{o,so,bundle,a,log,dll}',
+    'lib/nokogiri/nokogiri.{so,dylib,rb,bundle}',
     'lib/nokogiri/nokogiri.rb',
     'lib/nokogiri/1.{8,9}',
     GENERATED_PARSER,
-    GENERATED_TOKENIZER,
-    CROSS_DIR
+    GENERATED_TOKENIZER
   ]
 
-  %w{ racc rexical rake-compiler }.each do |dep|
-    extra_dev_deps << [dep, '>= 0']
-  end
-  extra_dev_deps << ["minitest", ">= 1.6.0"]
+  self.extra_dev_deps += [
+    ["racc",            ">= 1.4.6"],
+    ["rexical",         ">= 1.0.5"],
+    ["rake-compiler",   ">= 0.7.9"],
+    ["minitest",        "~> 2.2.2"],
+    ["mini_portile",    ">= 0.2.2"],
+    ["hoe-debugging",   ">= 0"],
+    ["hoe-git",         ">= 0"],
+    ["hoe-gemspec",     ">= 0"],
+    ["hoe-bundler",     ">= 0"]
+  ]
 
-  self.spec_extras = { :extensions => ["ext/nokogiri/extconf.rb"] }
+  if java?
+    self.spec_extras = { :platform => 'java' }
+  else
+    self.spec_extras = {
+      :extensions => ["ext/nokogiri/extconf.rb"],
+      :required_ruby_version => '>= 1.8.7'
+    }
+  end
 
   self.testlib = :minitest
 end
-Hoe.add_include_dirs '.'
-
-task :ws_docs do
-  title = "#{HOE.name}-#{HOE.version} Documentation"
-
-  options = []
-  options << "--main=#{HOE.readme_file}"
-  options << '--format=activerecord'
-  options << '--threads=1'
-  options << "--title=#{title.inspect}"
-
-  options += HOE.spec.require_paths
-  options += HOE.spec.extra_rdoc_files
-  require 'rdoc/rdoc'
-  ENV['RAILS_ROOT'] ||= File.expand_path(File.join('..', 'nokogiri_ws'))
-  RDoc::RDoc.new.document options
-end
 
-unless java
-  gem 'rake-compiler', '>= 0.4.1'
+# ----------------------------------------
+
+if java?
+  # TODO: clean this section up.
+  require "rake/javaextensiontask"
+  Rake::JavaExtensionTask.new("nokogiri", HOE.spec) do |ext|
+    jruby_home = RbConfig::CONFIG['prefix']
+    ext.ext_dir = 'ext/java'
+    ext.lib_dir = 'lib/nokogiri'
+    jars = ["#{jruby_home}/lib/jruby.jar"] + FileList['lib/*.jar']
+    ext.classpath = jars.map { |x| File.expand_path x }.join ':'
+  end
+
+  gem_build_path = File.join 'pkg', HOE.spec.full_name
+
+  task gem_build_path => [:compile] do
+    cp 'lib/nokogiri/nokogiri.jar', File.join(gem_build_path, 'lib', 'nokogiri')
+    HOE.spec.files += ['lib/nokogiri/nokogiri.jar']
+  end
+else
+  require 'tasks/cross_compile'
   require "rake/extensiontask"
 
-  RET = Rake::ExtensionTask.new("nokogiri", HOE.spec) do |ext|
-    ext.lib_dir = File.join(*['lib', 'nokogiri', ENV['FAT_DIR']].compact)
+  HOE.spec.files.reject! { |f| f =~ %r{\.(java|jar)$} }
 
+  Rake::ExtensionTask.new("nokogiri", HOE.spec) do |ext|
+    ext.lib_dir = File.join(*['lib', 'nokogiri', ENV['FAT_DIR']].compact)
     ext.config_options << ENV['EXTOPTS']
-    ext.cross_compile   = true
+    ext.cross_compile  = true
     ext.cross_platform = ["x86-mswin32-60", "x86-mingw32"]
-    ext.cross_config_options <<
-      "--with-xml2-include=#{File.join(CROSS_DIR, 'include', 'libxml2')}"
-    ext.cross_config_options <<
-      "--with-xml2-lib=#{File.join(CROSS_DIR, 'lib')}"
-    ext.cross_config_options << "--with-iconv-dir=#{CROSS_DIR}"
-    ext.cross_config_options << "--with-xslt-dir=#{CROSS_DIR}"
+    ext.cross_config_options << "--with-xml2-include=#{File.join($recipes[:libxml2].path, 'include', 'libxml2')}"
+    ext.cross_config_options << "--with-xml2-lib=#{File.join($recipes[:libxml2].path, 'lib')}"
+    ext.cross_config_options << "--with-iconv-dir=#{$recipes[:libiconv].path}"
+    ext.cross_config_options << "--with-xslt-dir=#{$recipes[:libxslt].path}"
     ext.cross_config_options << "--with-zlib-dir=#{CROSS_DIR}"
   end
 end
 
-namespace :gem do
-  namespace :dev do
-    task :spec => [ GENERATED_PARSER, GENERATED_TOKENIZER ] do
-      File.open("#{HOE.name}.gemspec", 'w') do |f|
-        HOE.spec.version = "#{HOE.version}.#{Time.now.strftime("%Y%m%d%H%M%S")}"
-        f.write(HOE.spec.to_ruby)
-      end
-    end
-  end
-
-  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, :"gem:jruby:dlls"] do
-      File.open("#{HOE.name}.gemspec", 'w') do |f|
-        HOE.spec.platform = 'java'
-        HOE.spec.files << GENERATED_PARSER
-        HOE.spec.files << GENERATED_TOKENIZER
-        HOE.spec.files += Dir["ext/nokogiri/*.dll"]
-        HOE.spec.extensions = []
-        HOE.spec.add_dependency 'weakling', '>= 0.0.3'
-        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']
-end
+desc "Generate css/parser.rb and css/tokenizer.rex"
+task 'generate' => [GENERATED_PARSER, GENERATED_TOKENIZER]
+task 'gem:spec' => 'generate' if Rake::Task.task_defined?("gem:spec")
 
 file GENERATED_PARSER => "lib/nokogiri/css/parser.y" do |t|
-  racc = Config::CONFIG['target_os'] =~ /mswin32/ ? '' : `which racc`.strip
-  racc = "#{::Config::CONFIG['bindir']}/racc" if racc.empty?
+  racc = RbConfig::CONFIG['target_os'] =~ /mswin32/ ? '' : `which racc`.strip
+  racc = "#{::RbConfig::CONFIG['bindir']}/racc" if racc.empty?
   sh "#{racc} -l -o #{t.name} #{t.prerequisites.first}"
 end
 
@@ -149,13 +117,13 @@ file GENERATED_TOKENIZER => "lib/nokogiri/css/tokenizer.rex" do |t|
   sh "rex --independent -o #{t.name} #{t.prerequisites.first}"
 end
 
-require 'tasks/test'
-begin
-  require 'tasks/cross_compile' unless java
-rescue RuntimeError => e
-  warn "WARNING: Could not perform some cross-compiling: #{e}"
+[:compile, :check_manifest].each do |task_name|
+  Rake::Task[task_name].prerequisites << GENERATED_PARSER
+  Rake::Task[task_name].prerequisites << GENERATED_TOKENIZER
 end
 
+# ----------------------------------------
+
 desc "set environment variables to build and/or test with debug options"
 task :debug do
   ENV['NOKOGIRI_DEBUG'] = "true"
@@ -163,29 +131,37 @@ task :debug do
   ENV['CFLAGS'] += " -DDEBUG"
 end
 
-# required_ruby_version
+require 'tasks/test'
 
-# Only do this on unix, since we can't build on windows
-unless windows || java || ENV['NOKOGIRI_FFI']
-  [:compile, :check_manifest].each do |task_name|
-    Rake::Task[task_name].prerequisites << GENERATED_PARSER
-    Rake::Task[task_name].prerequisites << GENERATED_TOKENIZER
+Rake::Task[:test].prerequisites << :compile
+Rake::Task[:test].prerequisites << :check_extra_deps unless java?
+if Hoe.plugins.include?(:debugging)
+  ['valgrind', 'valgrind:mem', 'valgrind:mem0'].each do |task_name|
+    Rake::Task["test:#{task_name}"].prerequisites << :compile
   end
+end
 
-  Rake::Task[:test].prerequisites << :compile
-  Rake::Task[:test].prerequisites << :check_extra_deps
-  if Hoe.plugins.include?(:debugging)
-    ['valgrind', 'valgrind:mem', 'valgrind:mem0'].each do |task_name|
-      Rake::Task["test:#{task_name}"].prerequisites << :compile
-    end
-  end
-else
-  [:test, :check_manifest].each do |task_name|
-    if Rake::Task[task_name]
-      Rake::Task[task_name].prerequisites << GENERATED_PARSER
-      Rake::Task[task_name].prerequisites << GENERATED_TOKENIZER
+# ----------------------------------------
+
+desc "build a windows gem without all the ceremony."
+task "gem:windows" => "gem" do
+  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}"
+    unless rake_compiler_config.key?(rbconfig) && rake_compiler_config[rbconfig] =~ /-#{patchlevel}/
+      raise "rake-compiler '#{rbconfig}' not #{patchlevel}. try running 'env --unset=HOST rake-compiler cross-ruby VERSION=#{version}'"
     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?
+
+  pkg_config_path = [:libxslt, :libxml2].collect { |pkg| File.join($recipes[pkg].path, "lib/pkgconfig") }.join(":")
+  sh("env PKG_CONFIG_PATH=#{pkg_config_path} RUBY_CC_VERSION=1.8.6:1.9.1 rake cross native gem") || raise("build failed!")
 end
 
 # vim: syntax=Ruby