nokogiri 1.5.11-x86-mingw32 → 1.6.0-x86-mingw32

data/build_all

@@ -8,7 +8,7 @@
 #  here's what I recommend for building all the gems:
 #
 #   1. set up a vagrant VM guest running ubuntu lucid 32-bit.
-#   2. install rvm, and install 1.8.7, 1.9.3 and jruby.
+#   2. install rvm, and install 1.9.3, 2.0.0 and jruby.
 #   3. `sudo apt-get install mingw32`
 #
 #  as you build, you may run into these problems:
@@ -53,7 +53,7 @@ function rvm_use {
 set -o errexit
 
 # initialize
-rvm_use 1.8.7
+rvm_use 1.9.3
 bundle install --quiet --local || bundle install
 rm -rf tmp pkg
 bundle exec rake clean
@@ -70,15 +70,7 @@ if [[ $platform =~ "64" ]] ; then
     echo ""
     exit 1
 fi
-rvm_use 1.8.7
-if [[ ! -a ${HOME}/.rake-compiler/ruby/ruby-1.8.7-p358/lib/ruby/1.8.7/x86_64-linux/rbconfig.rb ]] ; then
-
-    # if this fails around the purelib.rb thing, try varying the ruby
-    # used to run this script, and whether the HOST env var is set
-    # below.
-
-    bundle exec rake-compiler cross-ruby VERSION=1.8.7-p358 # HOST=i386-mingw32
-fi
+rvm_use 1.9.3
 if [[ ! -a ${HOME}/.rake-compiler/ruby/ruby-1.9.3-p194/lib/ruby/1.9.1/x86_64-linux/rbconfig.rb ]] ; then
     bundle exec rake-compiler cross-ruby VERSION=1.9.3-p194
 fi
@@ -90,7 +82,7 @@ bundle exec rake gem:windows
 cp -v pkg/nokogiri*x86-{mingw32,mswin32}*.gem gems
 
 # MRI
-rvm_use 1.8.7
+rvm_use 1.9.3
 bundle exec rake gem
 cp -v pkg/nokogiri*.gem gems # should only be one at this point in the script
 
@@ -98,7 +90,7 @@ cp -v pkg/nokogiri*.gem gems # should only be one at this point in the script
 rvm_use jruby
 bundle install --quiet --local || bundle install
 bundle exec rake clean clobber
-rvm_use 1.8.7
+rvm_use 1.9.3
 bundle exec rake generate
 rvm_use jruby
 bundle exec rake gem

data/dependencies.yml

@@ -0,0 +1,4 @@
+libxml2: "2.8.0"
+libxslt: "1.1.26"
+zlib: "1.2.7"
+libiconv: "1.13.1"

data/ext/nokogiri/extconf.rb

@@ -18,7 +18,34 @@ end
 $CFLAGS << " #{ENV["CFLAGS"]}"
 $LIBS << " #{ENV["LIBS"]}"
 
-if RbConfig::CONFIG['target_os'] == 'mingw32' || RbConfig::CONFIG['target_os'] =~ /mswin/
+def preserving_globals
+  values =
+    $arg_config,
+    $CFLAGS, $CPPFLAGS,
+    $LDFLAGS, $LIBPATH, $libs
+  yield
+ensure
+  $arg_config,
+  $CFLAGS, $CPPFLAGS,
+  $LDFLAGS, $LIBPATH, $libs =
+    values
+end
+
+def asplode(lib)
+  abort "-----\n#{lib} is missing.  please visit http://nokogiri.org/tutorials/installing_nokogiri.html for help with installing dependencies.\n-----"
+end
+
+def have_iconv?
+  have_header('iconv.h') or return false
+  %w{ iconv_open libiconv_open }.any? do |method|
+    have_func(method, 'iconv.h') or
+      have_library('iconv', method, 'iconv.h')
+  end
+end
+
+windows_p = RbConfig::CONFIG['target_os'] == 'mingw32' || RbConfig::CONFIG['target_os'] =~ /mswin/
+
+if windows_p
   $CFLAGS << " -DXP_WIN -DXP_WIN32 -DUSE_INCLUDED_VASPRINTF"
 elsif RbConfig::CONFIG['target_os'] =~ /solaris/
   $CFLAGS << " -DUSE_INCLUDED_VASPRINTF"
@@ -36,20 +63,14 @@ if RbConfig::MAKEFILE_CONFIG['CC'] =~ /gcc/
   $CFLAGS << " -Wall -Wcast-qual -Wwrite-strings -Wconversion -Wmissing-noreturn -Winline"
 end
 
-if RbConfig::CONFIG['target_os'] =~ /mswin/
-  lib_prefix = 'lib'
-
-  # There's no default include/lib dir on Windows. Let's just add the Ruby ones
-  # and resort on the search path specified by INCLUDE and LIB environment
-  # variables
+if windows_p
+  # I'm cross compiling!
   HEADER_DIRS = [INCLUDEDIR]
   LIB_DIRS = [LIBDIR]
   XML2_HEADER_DIRS = [File.join(INCLUDEDIR, "libxml2"), INCLUDEDIR]
 
 else
-  lib_prefix = ''
-
-  HEADER_DIRS = [
+  opt_header_dirs = [
     # First search /opt/local for macports
     '/opt/local/include',
 
@@ -58,37 +79,136 @@ else
 
     # Check the ruby install locations
     INCLUDEDIR,
-
-    # Finally fall back to /usr
-    '/usr/include',
-    '/usr/include/libxml2',
   ]
 
-  LIB_DIRS = [
-    # First search /opt/local for macports
-    '/opt/local/lib',
-
-    # Then search /usr/local for people that installed from source
-    '/usr/local/lib',
-
-    # Check the ruby install locations
-    LIBDIR,
-
-    # Finally fall back to /usr
-    '/usr/lib',
-  ]
-
-  XML2_HEADER_DIRS = [
-    '/opt/local/include/libxml2',
-    '/usr/local/include/libxml2',
-    File.join(INCLUDEDIR, "libxml2")
-  ] + HEADER_DIRS
-
-  # If the user has homebrew installed, use the libxml2 inside homebrew
-  brew_prefix = `brew --prefix libxml2 2> /dev/null`.chomp
-  unless brew_prefix.empty?
-    LIB_DIRS.unshift File.join(brew_prefix, 'lib')
-    XML2_HEADER_DIRS.unshift File.join(brew_prefix, 'include/libxml2')
+  if ENV['NOKOGIRI_USE_SYSTEM_LIBRARIES']
+    HEADER_DIRS = opt_header_dirs + [
+      # Fall back to /usr
+      '/usr/include',
+      '/usr/include/libxml2',
+    ]
+
+    LIB_DIRS = [
+      # First search /opt/local for macports
+      '/opt/local/lib',
+
+      # Then search /usr/local for people that installed from source
+      '/usr/local/lib',
+
+      # Check the ruby install locations
+      LIBDIR,
+
+      # Finally fall back to /usr
+      '/usr/lib',
+    ]
+
+    XML2_HEADER_DIRS = opt_header_dirs.map { |idir|
+      File.join(idir, "libxml2")
+    } + HEADER_DIRS
+
+    # If the user has homebrew installed, use the libxml2 inside homebrew
+    brew_prefix = `brew --prefix libxml2 2> /dev/null`.chomp
+    unless brew_prefix.empty?
+      LIB_DIRS.unshift File.join(brew_prefix, 'lib')
+      XML2_HEADER_DIRS.unshift File.join(brew_prefix, 'include/libxml2')
+    end
+
+  else
+    require 'mini_portile'
+    require 'yaml'
+
+    common_recipe = lambda do |recipe|
+      recipe.target = File.join(ROOT, "ports")
+      recipe.files = ["ftp://ftp.xmlsoft.org/libxml2/#{recipe.name}-#{recipe.version}.tar.gz"]
+
+      checkpoint = "#{recipe.target}/#{recipe.name}-#{recipe.version}-#{recipe.host}.installed"
+      unless File.exist?(checkpoint)
+        recipe.cook
+        FileUtils.touch checkpoint
+      end
+      recipe.activate
+    end
+
+    def each_idir
+      # If --with-iconv-dir is given, it should be the first priority
+      idir = preserving_globals {
+        dir_config('iconv')
+      }.first and yield idirta
+
+      # Then --with-opt-dir
+      idir = preserving_globals {
+        dir_config('opt')
+      }.first and yield idir
+
+      # Try the system default
+      yield "/usr/include"
+
+      opt_header_dirs.each { |dir|
+        yield dir
+      }
+
+      cflags, = preserving_globals {
+        pkg_config('libiconv')
+      }
+      if cflags
+        cflags.shellsplit.each { |arg|
+          arg.sub!(/\A-I/, '') and
+          yield arg
+        }
+      end
+
+      nil
+    end
+
+    # Make sure libxml2 is built with iconv
+    iconv_prefix = each_idir { |idir|
+      prefix = %r{\A(.+)?/include\z} === idir && $1 or next
+      File.exist?(File.join(idir, 'iconv.h')) or next
+      preserving_globals {
+        # Follow the way libxml2's configure uses a value given with
+        # --with-iconv[=DIR]
+        $CPPFLAGS << " -I#{idir}"
+        $LDFLAGS  << " -L#{prefix}/lib"
+        have_iconv?
+      } and break prefix
+    } or asplode "libiconv"
+
+    dependencies = YAML.load_file(File.join(ROOT, "dependencies.yml"))
+
+    libxml2_recipe = MiniPortile.new("libxml2", dependencies["libxml2"]).tap do |recipe|
+      recipe.configure_options = [
+        "--enable-shared",
+        "--disable-static",
+        "--without-python",
+        "--without-readline",
+        "--with-iconv=#{iconv_prefix}",
+        "--with-c14n",
+        "--with-debug",
+        "--with-threads"
+      ]
+      common_recipe.call recipe
+    end
+
+    libxslt_recipe = MiniPortile.new("libxslt", dependencies["libxslt"]).tap do |recipe|
+      recipe.configure_options = [
+        "--enable-shared",
+        "--disable-static",
+        "--without-python",
+        "--without-crypto",
+        "--with-debug",
+        "--with-libxml-prefix=#{libxml2_recipe.path}"
+      ]
+      common_recipe.call recipe
+    end
+
+    $LDFLAGS << " -Wl,-rpath,#{libxml2_recipe.path}/lib"
+    $LDFLAGS << " -Wl,-rpath,#{libxslt_recipe.path}/lib"
+
+    $CFLAGS << " -DNOKOGIRI_USE_PACKAGED_LIBRARIES -DNOKOGIRI_LIBXML2_PATH='\"#{libxml2_recipe.path}\"' -DNOKOGIRI_LIBXSLT_PATH='\"#{libxslt_recipe.path}\"'"
+
+    HEADER_DIRS = [libxml2_recipe, libxslt_recipe].map { |f| File.join(f.path, "include") }
+    LIB_DIRS = [libxml2_recipe, libxslt_recipe].map { |f| File.join(f.path, "lib") }
+    XML2_HEADER_DIRS = HEADER_DIRS + [File.join(libxml2_recipe.path, "include", "libxml2")]
   end
 end
 
@@ -97,29 +217,17 @@ dir_config('iconv', HEADER_DIRS, LIB_DIRS)
 dir_config('xml2', XML2_HEADER_DIRS, LIB_DIRS)
 dir_config('xslt', HEADER_DIRS, LIB_DIRS)
 
-def asplode(lib)
-  abort "-----\n#{lib} is missing.  please visit http://nokogiri.org/tutorials/installing_nokogiri.html for help with installing dependencies.\n-----"
-end
-
 pkg_config('libxslt')
 pkg_config('libxml-2.0')
 pkg_config('libiconv')
 
-def have_iconv?
-  %w{ iconv_open libiconv_open }.any? do |method|
-    have_func(method, 'iconv.h') or
-      have_library('iconv', method, 'iconv.h') or
-      find_library('iconv', method, 'iconv.h')
-  end
-end
-
 asplode "libxml2"  unless find_header('libxml/parser.h')
 asplode "libxslt"  unless find_header('libxslt/xslt.h')
 asplode "libexslt" unless find_header('libexslt/exslt.h')
 asplode "libiconv" unless have_iconv?
-asplode "libxml2"  unless find_library("#{lib_prefix}xml2", 'xmlParseDoc')
-asplode "libxslt"  unless find_library("#{lib_prefix}xslt", 'xsltParseStylesheetDoc')
-asplode "libexslt" unless find_library("#{lib_prefix}exslt", 'exsltFuncRegister')
+asplode "libxml2"  unless find_library("xml2", 'xmlParseDoc')
+asplode "libxslt"  unless find_library("xslt", 'xsltParseStylesheetDoc')
+asplode "libexslt" unless find_library("exslt", 'exsltFuncRegister')
 
 unless have_func('xmlHasFeature')
   abort "-----\nThe function 'xmlHasFeature' is missing from your installation of libxml2.  Likely this means that your installed version of libxml2 is old enough that nokogiri will not work well.  To get around this problem, please upgrade your installation of libxml2.
@@ -141,4 +249,5 @@ if ENV['CPUPROFILE']
 end
 
 create_makefile('nokogiri/nokogiri')
+
 # :startdoc:

data/ext/nokogiri/nokogiri.c

@@ -90,6 +90,16 @@ void Init_nokogiri()
                 NOKOGIRI_STR_NEW2(xmlParserVersion)
               );
 
+#ifdef NOKOGIRI_USE_PACKAGED_LIBRARIES
+  rb_const_set(mNokogiri, rb_intern("NOKOGIRI_USE_PACKAGED_LIBRARIES"), Qtrue);
+  rb_const_set(mNokogiri, rb_intern("NOKOGIRI_LIBXML2_PATH"), NOKOGIRI_STR_NEW2(NOKOGIRI_LIBXML2_PATH));
+  rb_const_set(mNokogiri, rb_intern("NOKOGIRI_LIBXSLT_PATH"), NOKOGIRI_STR_NEW2(NOKOGIRI_LIBXSLT_PATH));
+#else
+  rb_const_set(mNokogiri, rb_intern("NOKOGIRI_USE_PACKAGED_LIBRARIES"), Qfalse);
+  rb_const_set(mNokogiri, rb_intern("NOKOGIRI_LIBXML2_PATH"), Qnil);
+  rb_const_set(mNokogiri, rb_intern("NOKOGIRI_LIBXSLT_PATH"), Qnil);
+#endif
+
 #ifdef LIBXML_ICONV_ENABLED
   rb_const_set(mNokogiri, rb_intern("LIBXML_ICONV_ENABLED"), Qtrue);
 #else

data/lib/nokogiri/version.rb

@@ -1,6 +1,6 @@
 module Nokogiri
   # The version of Nokogiri you are using
-  VERSION = '1.5.11'
+  VERSION = '1.6.0'
 
   class VersionInfo # :nodoc:
     def jruby?
@@ -12,7 +12,7 @@ module Nokogiri
     end
 
     def loaded_parser_version
-      LIBXML_PARSER_VERSION.scan(/^(\d+)(\d\d)(\d\d)(?!\d)/).first.collect{ |j|
+      LIBXML_PARSER_VERSION.scan(/^(.*)(..)(..)$/).first.collect{ |j|
         j.to_i
       }.join(".")
     end
@@ -25,6 +25,14 @@ module Nokogiri
       defined?(LIBXML_VERSION)
     end
 
+    def libxml2_using_system?
+      ! libxml2_using_packaged?
+    end
+
+    def libxml2_using_packaged?
+      NOKOGIRI_USE_PACKAGED_LIBRARIES
+    end
+
     def warnings
       return [] unless libxml2?
 
@@ -49,6 +57,13 @@ module Nokogiri
       if libxml2?
         hash_info['libxml']              = {}
         hash_info['libxml']['binding']   = 'extension'
+        if libxml2_using_packaged?
+          hash_info['libxml']['source']  = "packaged"
+          hash_info['libxml']['libxml2_path'] = NOKOGIRI_LIBXML2_PATH
+          hash_info['libxml']['libxslt_path'] = NOKOGIRI_LIBXSLT_PATH
+        else
+          hash_info['libxml']['source']  = "system"
+        end
         hash_info['libxml']['compiled']  = compiled_parser_version
         hash_info['libxml']['loaded']    = loaded_parser_version
         hash_info['warnings']            = warnings

data/tasks/cross_compile.rb

@@ -3,11 +3,11 @@ require 'rake/extensioncompiler'
 HOST = Rake::ExtensionCompiler.mingw_host
 
 require 'mini_portile'
+dependencies = YAML.load_file("dependencies.yml")
 $recipes = {}
-$recipes["zlib"]     = MiniPortile.new "zlib",     "1.2.7"
-$recipes["libiconv"] = MiniPortile.new "libiconv", "1.13.1"
-$recipes["libxml2"]  = MiniPortile.new "libxml2",  "2.7.7"
-$recipes["libxslt"]  = MiniPortile.new "libxslt",  "1.1.26"
+%w[zlib libiconv libxml2 libxslt].each do |lib|
+  $recipes[lib] = MiniPortile.new lib, dependencies[lib]
+end
 $recipes.each { |_, recipe| recipe.host = HOST }
 
 file "lib/nokogiri/nokogiri.rb" do
@@ -90,15 +90,6 @@ namespace :cross do
       "--without-readline",
       "CFLAGS='-DIN_LIBXML'"
     ]
-    class << recipe
-      def download
-        Dir.chdir archives_path do
-          @files.each do |url|
-            sh "wget #{url} || curl -O #{url}"
-          end
-        end
-      end
-    end
 
     checkpoint = "#{CROSS_DIR}/#{recipe.name}-#{recipe.version}-#{recipe.host}.installed"
     unless File.exist?(checkpoint)
@@ -120,15 +111,6 @@ namespace :cross do
       "--without-crypto",
       "CFLAGS='-DIN_LIBXML'"
     ]
-    class << recipe
-      def download
-        Dir.chdir archives_path do
-          @files.each do |url|
-            sh "wget #{url} || curl -O #{url}"
-          end
-        end
-      end
-    end
 
     checkpoint = "#{CROSS_DIR}/#{recipe.name}-#{recipe.version}-#{recipe.host}.installed"
     unless File.exist?(checkpoint)
@@ -139,12 +121,12 @@ namespace :cross do
   end
 
   task :file_list do
-    HOE.spec.files += Dir["lib/nokogiri/nokogiri.rb"]
-    HOE.spec.files += Dir["lib/nokogiri/{1.8,1.9,2.0}/nokogiri.so"]
+    add_file_to_gem "lib/nokogiri/nokogiri.rb"
   end
+
 end
 
 require 'rake/clean'
 CLOBBER.include("#{CROSS_DIR}/*.installed", "#{CROSS_DIR}/#{HOST}", "tmp/#{HOST}")
 
-task :cross => ["cross:libxslt", "lib/nokogiri/nokogiri.rb", "cross:file_list"]
+task :cross2 => ["cross:libxslt", "lib/nokogiri/nokogiri.rb", "cross", "cross:file_list"]