nokogiri 1.2.3-x86-mswin32-60 → 1.4.5-x86-mswin32-60

data/Rakefile

@@ -1,50 +1,86 @@
 # -*- ruby -*-
 
 require 'rubygems'
-require 'rake'
+gem 'hoe', '>= 2.1.0'
 require 'hoe'
 
+windows = RUBY_PLATFORM =~ /(mswin|mingw)/i
+java    = RUBY_PLATFORM =~ /java/
+
+GENERATED_PARSER    = "lib/nokogiri/css/parser.rb"
+GENERATED_TOKENIZER = "lib/nokogiri/css/tokenizer.rb"
+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')
+  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",
+    'lib/nokogiri/*.{o,so,bundle,a,log,dll}',
+    'lib/nokogiri/nokogiri.rb',
+    'lib/nokogiri/1.{8,9}',
+    GENERATED_PARSER,
+    GENERATED_TOKENIZER,
+    CROSS_DIR
+  ]
 
-kind = Config::CONFIG['DLEXT']
-windows = RUBY_PLATFORM =~ /mswin/i ? true : false
+  %w{ racc rexical rake-compiler }.each do |dep|
+    extra_dev_deps << [dep, '>= 0']
+  end
+  extra_dev_deps << ["minitest", ">= 1.6.0"]
 
-LIB_DIR = File.expand_path(File.join(File.dirname(__FILE__), 'lib'))
-$LOAD_PATH << LIB_DIR
+  self.spec_extras = { :extensions => ["ext/nokogiri/extconf.rb"] }
 
-GENERATED_PARSER = "lib/nokogiri/css/generated_parser.rb"
-GENERATED_TOKENIZER = "lib/nokogiri/css/generated_tokenizer.rb"
+  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
 
-EXT = "ext/nokogiri/native.#{kind}"
+unless java
+  gem 'rake-compiler', '>= 0.4.1'
+  require "rake/extensiontask"
 
-require 'nokogiri/version'
+  RET = Rake::ExtensionTask.new("nokogiri", HOE.spec) do |ext|
+    ext.lib_dir = File.join(*['lib', 'nokogiri', ENV['FAT_DIR']].compact)
 
-HOE = Hoe.new('nokogiri', Nokogiri::VERSION) do |p|
-  p.developer('Aaron Patterson', 'aaronp@rubyforge.org')
-  p.developer('Mike Dalessio', 'mike.dalessio@gmail.com')
-  p.readme_file   = ['README', ENV['HLANG'], 'rdoc'].compact.join('.')
-  p.history_file  = ['CHANGELOG', ENV['HLANG'], 'rdoc'].compact.join('.')
-  p.extra_rdoc_files  = FileList['*.rdoc']
-  p.clean_globs = [
-    'ext/nokogiri/Makefile',
-    'ext/nokogiri/*.{o,so,bundle,a,log,dll}',
-    'ext/nokogiri/conftest.dSYM',
-    GENERATED_PARSER,
-    GENERATED_TOKENIZER,
-    'cross',
-  ]
-  p.spec_extras = { :extensions => ["ext/nokogiri/extconf.rb"] }
-end
-
-namespace :libxml do
-  desc "What version of LibXML are we building against?"
-  task :version => :build do
-    sh "#{RUBY} -Ilib:ext -rnokogiri -e 'puts Nokogiri::LIBXML_VERSION'"
+    ext.config_options << ENV['EXTOPTS']
+    ext.cross_compile   = true
+    ext.cross_platform = ["x86-mingw32", "x86-mswin32-60"]
+    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-zlib-dir=#{CROSS_DIR}"
   end
 end
 
 namespace :gem do
   namespace :dev do
-    task :spec 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)
@@ -52,37 +88,50 @@ namespace :gem do
     end
   end
 
-  namespace :win32 do
-    task :spec => ['build:win32'] do
-      File.open("#{HOE.name}.gemspec", 'w') do |f|
-        HOE.spec.files += Dir['ext/nokogiri/**.{dll,so}']
-        if windows
-          HOE.spec.platform = Gem::Platform::CURRENT
-        else
-          HOE.spec.platform = 'x86-mswin32-60'
-        end
-        HOE.spec.extensions = []
-        f.write(HOE.spec.to_ruby)
-      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 => ['build'] 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
-  end
 
-  namespace :unix do
-    task :spec do
-      File.open("#{HOE.name}.gemspec", 'w') do |f|
-        f.write(HOE.spec.to_ruby)
+    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
@@ -91,151 +140,20 @@ namespace :gem do
 end
 
 file GENERATED_PARSER => "lib/nokogiri/css/parser.y" do |t|
-  begin
-    racc = `which racc`.strip
-    racc = "#{::Config::CONFIG['bindir']}/racc" if racc.empty?
-    sh "#{racc} -o #{t.name} #{t.prerequisites.first}"
-  rescue
-    abort "need racc, sudo gem install racc"
-  end
+  racc = Config::CONFIG['target_os'] =~ /mswin32/ ? '' : `which racc`.strip
+  racc = "#{::Config::CONFIG['bindir']}/racc" if racc.empty?
+  sh "#{racc} -l -o #{t.name} #{t.prerequisites.first}"
 end
 
 file GENERATED_TOKENIZER => "lib/nokogiri/css/tokenizer.rex" do |t|
-  begin
-    sh "frex --independent -o #{t.name} #{t.prerequisites.first}"
-  rescue
-    abort "need frex, sudo gem install tenderlove-frex -s http://gems.github.com"   
-  end
-end
-
-task 'ext/nokogiri/Makefile' do
-  Dir.chdir('ext/nokogiri') do
-    ruby "extconf.rb #{ENV['EXTOPTS']}"
-  end
-end
-
-task EXT => 'ext/nokogiri/Makefile' do
-  Dir.chdir('ext/nokogiri') do
-    sh 'make'
-  end
-end
-
-if RUBY_PLATFORM == 'java'
-  task :build => [GENERATED_PARSER, GENERATED_TOKENIZER]
-else
-  task :build => [EXT, GENERATED_PARSER, GENERATED_TOKENIZER]
+  sh "rex --independent -o #{t.name} #{t.prerequisites.first}"
 end
 
-namespace :build do
-  namespace :win32 do
-    file 'cross/bin/ruby.exe' => ['cross/ruby-1.8.6-p287'] do
-      Dir.chdir('cross/ruby-1.8.6-p287') do
-        str = ''
-        File.open('Makefile.in', 'rb') do |f|
-          f.each_line do |line|
-            if line =~ /^\s*ALT_SEPARATOR =/
-              str += "\t\t    " + 'ALT_SEPARATOR = "\\\\\"; \\'
-              str += "\n"
-            else
-              str += line
-            end
-          end
-        end
-        File.open('Makefile.in', 'wb') { |f| f.write str }
-        buildopts = if File.exists?('/usr/bin/i586-mingw32msvc-gcc')
-                      "--host=i586-mingw32msvc --target=i386-mingw32 --build=i686-linux"
-                    else
-                      "--host=i386-mingw32 --target=i386-mingw32"
-                    end
-        sh(<<-eocommand)
-          env ac_cv_func_getpgrp_void=no \
-            ac_cv_func_setpgrp_void=yes \
-            rb_cv_negative_time_t=no \
-            ac_cv_func_memcmp_working=yes \
-            rb_cv_binary_elf=no \
-            ./configure \
-            #{buildopts} \
-            --prefix=#{File.expand_path(File.join(Dir.pwd, '..'))}
-        eocommand
-        sh 'make'
-        sh 'make install'
-      end
-    end
-
-    desc 'build cross compiled ruby'
-    task :ruby => 'cross/bin/ruby.exe'
-  end
-
-  desc 'build nokogiri for win32'
-  task :win32 => [GENERATED_PARSER, GENERATED_TOKENIZER, 'build:externals', 'build:win32:ruby'] do
-    dash_i = File.expand_path(
-      File.join(File.dirname(__FILE__), 'cross/lib/ruby/1.8/i386-mingw32/')
-    )
-
-    xml2_lib =
-      File.join(File.dirname(__FILE__), 'cross/libxml2-2.7.3.win32/bin')
-    xml2_inc =
-      File.join(File.dirname(__FILE__), 'cross/libxml2-2.7.3.win32/include')
-
-    xslt_lib =
-      File.join(File.dirname(__FILE__), 'cross/libxslt-1.1.24.win32/bin')
-    xslt_inc =
-      File.join(File.dirname(__FILE__), 'cross/libxslt-1.1.24.win32/include')
-
-    Dir.chdir('ext/nokogiri') do
-      ruby " -I #{dash_i} extconf.rb --with-xml2-lib=#{xml2_lib} --with-xml2-include=#{xml2_inc} --with-xslt-lib=#{xslt_lib} --with-xslt-include=#{xslt_inc}"
-      sh 'make'
-    end
-    dlls = Dir[File.join(File.dirname(__FILE__), 'cross', '**/*.dll')]
-    dlls.each do |dll|
-      next if dll =~ /ruby/
-      cp dll, 'ext/nokogiri'
-    end
-  end
-
-  libs = %w{
-    iconv-1.9.2.win32
-    zlib-1.2.3.win32
-    libxml2-2.7.3.win32
-    libxslt-1.1.24.win32
-  }
-
-  libs.each do |lib|
-    file "stash/#{lib}.zip" do |t|
-      puts "downloading #{lib}"
-      FileUtils.mkdir_p('stash')
-      Dir.chdir('stash') do 
-        url = "http://www.zlatkovic.com/pub/libxml/#{lib}.zip"
-        system("wget #{url} || curl -O #{url}")
-      end
-    end
-    file "cross/#{lib}" => ["stash/#{lib}.zip"] do |t|
-      puts "unzipping #{lib}.zip"
-      FileUtils.mkdir_p('cross')
-      Dir.chdir('cross') do
-        sh "unzip ../stash/#{lib}.zip"
-        sh "touch #{lib}"
-      end
-    end
-  end
-
-  file "stash/ruby-1.8.6-p287.tar.gz" do |t|
-    puts "downloading ruby"
-    FileUtils.mkdir_p('stash')
-    Dir.chdir('stash') do 
-      url = ("ftp://ftp.ruby-lang.org/pub/ruby/1.8/ruby-1.8.6-p287.tar.gz")
-      system("wget #{url} || curl -O #{url}")
-    end
-  end
-  file 'cross/ruby-1.8.6-p287' => ["stash/ruby-1.8.6-p287.tar.gz"] do |t|
-    puts "unzipping ruby"
-    FileUtils.mkdir_p('cross')
-    Dir.chdir('cross') do
-      sh "tar zxvf ../stash/ruby-1.8.6-p287.tar.gz"
-    end
-  end
-
-  task :externals => libs.map { |x| "cross/#{x}" } + ['cross/ruby-1.8.6-p287']
+require 'tasks/test'
+begin
+  require 'tasks/cross_compile' unless java
+rescue RuntimeError => e
+  warn "WARNING: Could not perform some cross-compiling: #{e}"
 end
 
 desc "set environment variables to build and/or test with debug options"
@@ -245,31 +163,29 @@ task :debug do
   ENV['CFLAGS'] += " -DDEBUG"
 end
 
-require 'tasks/test'
-
-Rake::Task['test:valgrind'].prerequisites << :build
-Rake::Task['test:valgrind_mem'].prerequisites << :build
-Rake::Task['test:valgrind_mem0'].prerequisites << :build
-Rake::Task['test:coverage'].prerequisites << :build
+# required_ruby_version
 
-namespace :install do
-  desc "Install frex and racc for development"
-  task :deps => %w(frex racc)
-
-  task :racc do |t|
-    sh "sudo gem install racc"
+# 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
   end
 
-  task :frex do
-    sh "sudo gem install tenderlove-frex -s http://gems.github.com"
+  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
+    end
   end
-end
-
-# Only do this on unix, since we can't build on windows
-unless windows
-  Rake::Task[:test].prerequisites << :build
-  Rake::Task[:check_manifest].prerequisites << GENERATED_PARSER
-  Rake::Task[:check_manifest].prerequisites << GENERATED_TOKENIZER
 end
 
 # vim: syntax=Ruby

data/bin/nokogiri

@@ -0,0 +1,54 @@
+#!/usr/bin/env ruby
+require 'optparse'
+require 'open-uri'
+require 'irb'
+require 'uri'
+require 'rubygems'
+require 'nokogiri'
+
+parse_class = Nokogiri
+encoding = nil
+
+opts = OptionParser.new do |opts|
+  opts.banner = "Nokogiri: an HTML, XML, SAX, and Reader parser"
+  opts.define_head "Usage: nokogiri <uri|path> [options]"
+  opts.separator ""
+  opts.separator "Examples:"
+  opts.separator "  nokogiri http://www.ruby-lang.org/"
+  opts.separator "  nokogiri ./public/index.html"
+  opts.separator ""
+  opts.separator "Options:"
+
+  opts.on("--type [TYPE]", [:xml, :html]) do |v|
+    parse_class = {:xml => Nokogiri::XML, :html => Nokogiri::HTML}[v]
+  end
+
+  opts.on("-E", "--encoding encoding", "Read as encoding (default #{encoding})") do |v|
+    encoding = v
+  end
+
+  opts.on_tail("-?", "--help", "Show this message") do
+    puts opts
+    exit
+  end
+
+  opts.on_tail("-v", "--version", "Show version") do
+    require 'yaml'
+    puts Nokogiri::VERSION_INFO.to_yaml
+    exit
+  end
+end
+opts.parse!
+
+uri = ARGV.shift
+
+if uri.to_s.strip.empty?
+  puts opts
+  exit 1
+end
+
+@doc = parse_class.parse(open(uri).read, nil, encoding)
+
+puts "Your document is stored in @doc..."
+IRB.start
+