Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

switching nokogiri to rake-compiler

  • Loading branch information...
commit fd9b7731b46c478ba65f517b692cfbb4c3742932 1 parent 9ba58a9
@tenderlove tenderlove authored
Showing with 117 additions and 211 deletions.
  1. +1 −1  .gitignore
  2. +2 −2 Manifest.txt
  3. +75 −167 Rakefile
  4. +9 −11 ext/nokogiri/extconf.rb
  5. +1 −1  ext/nokogiri/html_document.h
  6. +1 −1  ext/nokogiri/html_element_description.h
  7. +1 −1  ext/nokogiri/html_entity_lookup.h
  8. +1 −1  ext/nokogiri/html_sax_parser.h
  9. +2 −2 ext/nokogiri/{native.c → nokogiri.c}
  10. 0  ext/nokogiri/{native.h → nokogiri.h}
  11. +1 −1  ext/nokogiri/xml_attr.h
  12. +1 −1  ext/nokogiri/xml_cdata.h
  13. +1 −1  ext/nokogiri/xml_comment.h
  14. +2 −2 ext/nokogiri/xml_document.c
  15. +1 −1  ext/nokogiri/xml_document.h
  16. +1 −1  ext/nokogiri/xml_document_fragment.h
  17. +1 −1  ext/nokogiri/xml_dtd.h
  18. +1 −1  ext/nokogiri/xml_entity_reference.h
  19. +1 −1  ext/nokogiri/xml_io.h
  20. +1 −1  ext/nokogiri/xml_node.h
  21. +1 −1  ext/nokogiri/xml_node_set.h
  22. +1 −1  ext/nokogiri/xml_processing_instruction.h
  23. +1 −1  ext/nokogiri/xml_reader.h
  24. +1 −1  ext/nokogiri/xml_relax_ng.h
  25. +1 −1  ext/nokogiri/xml_sax_parser.h
  26. +1 −1  ext/nokogiri/xml_sax_push_parser.h
  27. +1 −1  ext/nokogiri/xml_schema.h
  28. +1 −1  ext/nokogiri/xml_syntax_error.h
  29. +1 −1  ext/nokogiri/xml_text.h
  30. +1 −1  ext/nokogiri/xml_xpath.h
  31. +1 −1  ext/nokogiri/xml_xpath_context.h
  32. +1 −1  ext/nokogiri/xslt_stylesheet.h
  33. +1 −1  lib/nokogiri.rb
View
2  .gitignore
@@ -15,4 +15,4 @@ cross
tags
stash
.rake_tasks
-
+tmp
View
4 Manifest.txt
@@ -14,8 +14,8 @@ ext/nokogiri/html_entity_lookup.c
ext/nokogiri/html_entity_lookup.h
ext/nokogiri/html_sax_parser.c
ext/nokogiri/html_sax_parser.h
-ext/nokogiri/native.c
-ext/nokogiri/native.h
+ext/nokogiri/nokogiri.c
+ext/nokogiri/nokogiri.h
ext/nokogiri/xml_attr.c
ext/nokogiri/xml_attr.h
ext/nokogiri/xml_cdata.c
View
242 Rakefile
@@ -3,18 +3,16 @@
require 'rubygems'
require 'rake'
require 'hoe'
+require "rake/extensiontask"
-kind = Config::CONFIG['DLEXT']
-windows = RUBY_PLATFORM =~ /mswin/i ? true : false
-
LIB_DIR = File.expand_path(File.join(File.dirname(__FILE__), 'lib'))
$LOAD_PATH << LIB_DIR
-GENERATED_PARSER = "lib/nokogiri/css/generated_parser.rb"
-GENERATED_TOKENIZER = "lib/nokogiri/css/generated_tokenizer.rb"
+windows = RUBY_PLATFORM =~ /mswin/i ? true : false
-EXT = "ext/nokogiri/native.#{kind}"
+GENERATED_PARSER = "lib/nokogiri/css/generated_parser.rb"
+GENERATED_TOKENIZER = "lib/nokogiri/css/generated_tokenizer.rb"
require 'nokogiri/version'
@@ -32,14 +30,27 @@ HOE = Hoe.new('nokogiri', Nokogiri::VERSION) do |p|
GENERATED_TOKENIZER,
'cross',
]
+
+ p.extra_dev_deps << "racc"
+ p.extra_dev_deps << "tenderlove-frex"
+ p.extra_dev_deps << "rake-compiler"
+
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'"
- end
+Rake::ExtensionTask.new("nokogiri", HOE.spec) do |ext|
+ ext.lib_dir = "ext/nokogiri"
+ ### Uncomment this crap to do cross compile
+ #ext.gem_spec.required_ruby_version = "~> #{RUBY_VERSION.sub(/\.\d+$/, '.0')}"
+ #cross_dir = File.join(File.dirname(__FILE__), 'tmp', 'cross')
+ #ext.cross_compile = true
+ #ext.cross_platform = 'i386-mswin32'
+ #ext.cross_config_options <<
+ # "--with-iconv-dir=#{File.join(cross_dir, 'iconv')}"
+ #ext.cross_config_options <<
+ # "--with-xml2-dir=#{File.join(cross_dir, 'libxml2')}"
+ #ext.cross_config_options <<
+ # "--with-xslt-dir=#{File.join(cross_dir, 'libxslt')}"
end
namespace :gem do
@@ -52,21 +63,6 @@ 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
- end
-
namespace :jruby do
task :spec => ['build'] do
File.open("#{HOE.name}.gemspec", 'w') do |f|
@@ -79,14 +75,6 @@ namespace :gem do
end
end
- namespace :unix do
- task :spec do
- File.open("#{HOE.name}.gemspec", 'w') do |f|
- f.write(HOE.spec.to_ruby)
- end
- end
- end
-
task :spec => ['gem:dev:spec']
end
@@ -108,136 +96,40 @@ file GENERATED_TOKENIZER => "lib/nokogiri/css/tokenizer.rex" do |t|
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]
-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")
+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 "tmp/stash/#{lib}.zip" do |t|
+ puts "downloading #{lib}"
+ FileUtils.mkdir_p('tmp/stash')
+ Dir.chdir('tmp/stash') do
+ url = "http://www.zlatkovic.com/pub/libxml/#{lib}.zip"
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"
+ file "tmp/cross/#{lib.split('-').first}" => ["tmp/stash/#{lib}.zip"] do |t|
+ puts "unzipping #{lib}.zip"
+ FileUtils.mkdir_p('tmp/cross')
+ Dir.chdir('tmp/cross') do
+ sh "unzip ../stash/#{lib}.zip"
+ sh "cp #{lib}/bin/* #{lib}/lib" # put DLL in lib, so dirconfig works
+ sh "cp #{lib}/bin/*.dll ../../ext/nokogiri/"
+ sh "mv #{lib} #{lib.split('-').first}"
+ sh "touch #{lib.split('-').first}"
end
end
-
- task :externals => libs.map { |x| "cross/#{x}" } + ['cross/ruby-1.8.6-p287']
+ if Rake::Task.task_defined?(:cross)
+ Rake::Task[:cross].prerequisites << "tmp/cross/#{lib.split('-').first}"
+ end
end
+require 'tasks/test'
+
desc "set environment variables to build and/or test with debug options"
task :debug do
ENV['NOKOGIRI_DEBUG'] = "true"
@@ -245,12 +137,28 @@ task :debug do
ENV['CFLAGS'] += " -DDEBUG"
end
-require 'tasks/test'
+if Rake::Task.task_defined?(:cross)
+ task :add_dll_to_manifest do
+ HOE.spec.files += Dir['ext/nokogiri/**.{dll,so}']
+ end
+
+ Rake::Task[:cross].prerequisites << :add_dll_to_manifest
+end
+
+# required_ruby_version
+
+# Only do this on unix, since we can't build on windows
+unless windows
+ [:compile, :check_manifest].each do |task_name|
+ Rake::Task[task_name].prerequisites << GENERATED_PARSER
+ Rake::Task[task_name].prerequisites << GENERATED_TOKENIZER
+ end
-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
+ Rake::Task[:test].prerequisites << :compile
+ ['valgrind', 'valgrind_mem', 'valgrind_mem0', 'coverage'].each do |task_name|
+ Rake::Task["test:#{task_name}"].prerequisites << :compile
+ end
+end
namespace :install do
desc "Install frex and racc for development"
@@ -265,11 +173,11 @@ namespace :install do
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
+namespace :libxml do
+ desc "What version of LibXML are we building against?"
+ task :version => :compile do
+ sh "#{RUBY} -Ilib:ext -rnokogiri -e 'puts Nokogiri::LIBXML_VERSION'"
+ end
end
# vim: syntax=Ruby
View
20 ext/nokogiri/extconf.rb
@@ -35,16 +35,10 @@
'/usr/lib'
]
-if Config::CONFIG['target_os'] == 'mingw32'
- header = File.join(ROOT, 'cross', 'iconv-1.9.2.win32', 'include')
- unless find_header('iconv.h', header)
- abort "need iconv"
- end
-else
- unless find_header('iconv.h', INCLUDEDIR, '/opt/local/include',
- '/usr/local/include', '/usr/include')
- abort "iconv is missing. try 'port install iconv' or 'yum install iconv'"
- end
+iconv_dirs = dir_config('iconv', '/opt/local/include', '/opt/local/lib')
+unless [nil, nil] == iconv_dirs
+ HEADER_DIRS.unshift iconv_dirs.first
+ LIB_DIRS.unshift iconv_dirs[1]
end
xml2_dirs = dir_config('xml2', '/opt/local/include/libxml2', '/opt/local/lib')
@@ -59,6 +53,10 @@
LIB_DIRS.unshift xslt_dirs[1]
end
+unless find_header('iconv.h', *HEADER_DIRS)
+ abort "iconv is missing. try 'port install iconv' or 'yum install iconv'"
+end
+
unless find_header('libxml/parser.h', *HEADER_DIRS)
abort "libxml2 is missing. try 'port install libxml2' or 'yum install libxml2'"
end
@@ -82,4 +80,4 @@
abort "libxslt is missing. try 'port install libxslt' or 'yum install libxslt-devel'"
end
-create_makefile('nokogiri/native')
+create_makefile('nokogiri/nokogiri')
View
2  ext/nokogiri/html_document.h
@@ -1,7 +1,7 @@
#ifndef NOKOGIRI_HTML_DOCUMENT
#define NOKOGIRI_HTML_DOCUMENT
-#include <native.h>
+#include <nokogiri.h>
void init_html_document();
View
2  ext/nokogiri/html_element_description.h
@@ -1,7 +1,7 @@
#ifndef NOKOGIRI_HTML_ELEMENT_DESCRIPTION
#define NOKOGIRI_HTML_ELEMENT_DESCRIPTION
-#include <native.h>
+#include <nokogiri.h>
void init_html_element_description();
View
2  ext/nokogiri/html_entity_lookup.h
@@ -1,7 +1,7 @@
#ifndef NOKOGIRI_HTML_ENTITY_LOOKUP
#define NOKOGIRI_HTML_ENTITY_LOOKUP
-#include <native.h>
+#include <nokogiri.h>
void init_html_entity_lookup();
View
2  ext/nokogiri/html_sax_parser.h
@@ -1,7 +1,7 @@
#ifndef NOKOGIRI_HTML_SAX_PARSER
#define NOKOGIRI_HTML_SAX_PARSER
-#include <native.h>
+#include <nokogiri.h>
void init_html_sax_parser();
View
4 ext/nokogiri/native.c → ext/nokogiri/nokogiri.c
@@ -1,4 +1,4 @@
-#include <native.h>
+#include <nokogiri.h>
VALUE mNokogiri ;
VALUE mNokogiriXml ;
@@ -24,7 +24,7 @@ int vasprintf (char **strp, const char *fmt, va_list ap)
#endif
-void Init_native()
+void Init_nokogiri()
{
xmlMemSetup(
(xmlFreeFunc)ruby_xfree,
View
0  ext/nokogiri/native.h → ext/nokogiri/nokogiri.h
File renamed without changes
View
2  ext/nokogiri/xml_attr.h
@@ -1,7 +1,7 @@
#ifndef NOKOGIRI_XML_ATTR
#define NOKOGIRI_XML_ATTR
-#include <native.h>
+#include <nokogiri.h>
void init_xml_attr();
View
2  ext/nokogiri/xml_cdata.h
@@ -1,7 +1,7 @@
#ifndef NOKOGIRI_XML_CDATA
#define NOKOGIRI_XML_CDATA
-#include <native.h>
+#include <nokogiri.h>
void init_xml_cdata();
View
2  ext/nokogiri/xml_comment.h
@@ -1,7 +1,7 @@
#ifndef NOKOGIRI_XML_COMMENT
#define NOKOGIRI_XML_COMMENT
-#include <native.h>
+#include <nokogiri.h>
void init_xml_comment();
View
4 ext/nokogiri/xml_document.c
@@ -227,9 +227,9 @@ static VALUE duplicate_node(int argc, VALUE *argv, VALUE self)
/*
* call-seq:
- * new
+ * new(version = '1.0')
*
- * Create a new document
+ * Create a new document with +version+
*/
static VALUE new(int argc, VALUE *argv, VALUE klass)
{
View
2  ext/nokogiri/xml_document.h
@@ -1,7 +1,7 @@
#ifndef NOKOGIRI_XML_DOCUMENT
#define NOKOGIRI_XML_DOCUMENT
-#include <native.h>
+#include <nokogiri.h>
struct _nokogiriTuple {
xmlDocPtr doc;
View
2  ext/nokogiri/xml_document_fragment.h
@@ -1,7 +1,7 @@
#ifndef NOKOGIRI_XML_DOCUMENT_FRAGMENT
#define NOKOGIRI_XML_DOCUMENT_FRAGMENT
-#include <native.h>
+#include <nokogiri.h>
void init_xml_document_fragment();
View
2  ext/nokogiri/xml_dtd.h
@@ -1,7 +1,7 @@
#ifndef NOKOGIRI_XML_DTD
#define NOKOGIRI_XML_DTD
-#include <native.h>
+#include <nokogiri.h>
void init_xml_dtd();
View
2  ext/nokogiri/xml_entity_reference.h
@@ -1,7 +1,7 @@
#ifndef NOKOGIRI_XML_ENTITY_REFERENCE
#define NOKOGIRI_XML_ENTITY_REFERENCE
-#include <native.h>
+#include <nokogiri.h>
void init_xml_entity_reference();
View
2  ext/nokogiri/xml_io.h
@@ -1,7 +1,7 @@
#ifndef NOKOGIRI_XML_IO
#define NOKOGIRI_XML_IO
-#include <native.h>
+#include <nokogiri.h>
int io_read_callback(void * ctx, char * buffer, int len);
int io_write_callback(void * ctx, char * buffer, int len);
View
2  ext/nokogiri/xml_node.h
@@ -1,7 +1,7 @@
#ifndef NOKOGIRI_XML_NODE
#define NOKOGIRI_XML_NODE
-#include <native.h>
+#include <nokogiri.h>
void init_xml_node();
VALUE Nokogiri_wrap_xml_node(xmlNodePtr root);
View
2  ext/nokogiri/xml_node_set.h
@@ -1,7 +1,7 @@
#ifndef NOKOGIRI_XML_NODE_SET
#define NOKOGIRI_XML_NODE_SET
-#include <native.h>
+#include <nokogiri.h>
void init_xml_node_set();
extern VALUE cNokogiriXmlNodeSet ;
View
2  ext/nokogiri/xml_processing_instruction.h
@@ -1,7 +1,7 @@
#ifndef NOKOGIRI_XML_PROCESSING_INSTRUCTION
#define NOKOGIRI_XML_PROCESSING_INSTRUCTION
-#include <native.h>
+#include <nokogiri.h>
void init_xml_processing_instruction();
View
2  ext/nokogiri/xml_reader.h
@@ -1,7 +1,7 @@
#ifndef NOKOGIRI_XML_READER
#define NOKOGIRI_XML_READER
-#include <native.h>
+#include <nokogiri.h>
void init_xml_reader();
View
2  ext/nokogiri/xml_relax_ng.h
@@ -1,7 +1,7 @@
#ifndef NOKOGIRI_XML_RELAX_NG
#define NOKOGIRI_XML_RELAX_NG
-#include <native.h>
+#include <nokogiri.h>
void init_xml_relax_ng();
View
2  ext/nokogiri/xml_sax_parser.h
@@ -1,7 +1,7 @@
#ifndef NOKOGIRI_XML_SAX_PARSER
#define NOKOGIRI_XML_SAX_PARSER
-#include <native.h>
+#include <nokogiri.h>
void init_xml_sax_parser();
View
2  ext/nokogiri/xml_sax_push_parser.h
@@ -1,7 +1,7 @@
#ifndef NOKOGIRI_XML_SAX_PUSH_PARSER
#define NOKOGIRI_XML_SAX_PUSH_PARSER
-#include <native.h>
+#include <nokogiri.h>
void init_xml_sax_push_parser();
View
2  ext/nokogiri/xml_schema.h
@@ -1,7 +1,7 @@
#ifndef NOKOGIRI_XML_SCHEMA
#define NOKOGIRI_XML_SCHEMA
-#include <native.h>
+#include <nokogiri.h>
void init_xml_schema();
View
2  ext/nokogiri/xml_syntax_error.h
@@ -1,7 +1,7 @@
#ifndef NOKOGIRI_XML_SYNTAX_ERROR
#define NOKOGIRI_XML_SYNTAX_ERROR
-#include <native.h>
+#include <nokogiri.h>
void init_xml_syntax_error();
VALUE Nokogiri_wrap_xml_syntax_error(VALUE klass, xmlErrorPtr error);
View
2  ext/nokogiri/xml_text.h
@@ -1,7 +1,7 @@
#ifndef NOKOGIRI_XML_TEXT
#define NOKOGIRI_XML_TEXT
-#include <native.h>
+#include <nokogiri.h>
void init_xml_text();
View
2  ext/nokogiri/xml_xpath.h
@@ -1,7 +1,7 @@
#ifndef NOKOGIRI_XML_XPATH
#define NOKOGIRI_XML_XPATH
-#include <native.h>
+#include <nokogiri.h>
void init_xml_xpath();
VALUE Nokogiri_wrap_xml_xpath(xmlXPathObjectPtr xpath);
View
2  ext/nokogiri/xml_xpath_context.h
@@ -1,7 +1,7 @@
#ifndef NOKOGIRI_XML_XPATH_CONTEXT
#define NOKOGIRI_XML_XPATH_CONTEXT
-#include <native.h>
+#include <nokogiri.h>
void init_xml_xpath_context();
View
2  ext/nokogiri/xslt_stylesheet.h
@@ -1,7 +1,7 @@
#ifndef NOKOGIRI_XSLT_STYLESHEET
#define NOKOGIRI_XSLT_STYLESHEET
-#include <native.h>
+#include <nokogiri.h>
void init_xslt_stylesheet();
View
2  lib/nokogiri.rb
@@ -3,7 +3,7 @@
File.join(File.dirname(__FILE__), "..", "ext", "nokogiri")
), ENV['PATH']].compact.join(';') if RUBY_PLATFORM =~ /mswin/i
-require 'nokogiri/native' unless RUBY_PLATFORM =~ /java/
+require 'nokogiri/nokogiri' unless RUBY_PLATFORM =~ /java/
require 'nokogiri/version'
require 'nokogiri/syntax_error'
Please sign in to comment.
Something went wrong with that request. Please try again.