libxslt-ruby 1.1.1 → 1.2.0

data/Rakefile

@@ -1,90 +1,90 @@
-#!/usr/bin/env ruby
-
-require 'rubygems'
-require 'rake/extensiontask'
-require 'rake/testtask'
-require 'rdoc/task'
-require 'yaml'
-
-GEM_NAME = 'libxslt-ruby'
-SO_NAME  = 'libxslt_ruby'
-
-# Read the spec file
-spec = Gem::Specification.load("#{GEM_NAME}.gemspec")
-
-# Setup compile tasks.  Configuration can be passed via EVN.
-# Example:
-#  rake compile with_xml2_include=C:/MinGW/local/include/libxml2
-#               with_xslt_include=C:/MinGW/local/include/libxslt
-#               with_exslt_include=C:/MinGW/local/include/libexslt
-Rake::ExtensionTask.new do |ext|
-  ext.gem_spec = spec
-  ext.name = SO_NAME
-  ext.ext_dir = "ext/libxslt"
-  ext.lib_dir = "lib/#{RUBY_VERSION.sub(/\.\d$/, '')}"
-  
-  ext.config_options << "--with-zlib-dir=C:/MinGW64/local"
-  ext.config_options << "--with-xml2-include=C:/MinGW64/local/include/libxml2"
-  ext.config_options << "--with-xslt-include=C:/MinGW64/local/include/libxslt"
-  ext.config_options << "--with-exslt-include=C:/MinGW64/local/include/libexslt"
-
-  ENV.each do |key, val|
-    next unless key =~ /\Awith_(\w+)\z/i
-    opt = $1.downcase.tr('_', '-')
-    if File.directory?(path = File.expand_path(val))
-      ext.config_options << "--with-#{opt}=#{path}"
-    else
-      warn "No such directory: #{opt}: #{path}"
-    end
-  end
-end
-
-# Setup generic gem
-Gem::PackageTask.new(spec) do |pkg|
-  pkg.package_dir = 'pkg'
-  pkg.need_tar    = false
-end
-
-# Setup Windows Gem
-if RUBY_PLATFORM.match(/win32|mingw32/)
-  binaries = (FileList['lib/**/*.so',
-                       'lib/**/*dll'])
-
-  # Windows specification
-  win_spec = spec.clone
-  win_spec.platform = Gem::Platform::CURRENT
-  win_spec.files += binaries.to_a
-  win_spec.instance_variable_set(:@cache_file, nil)
-
-  # Unset extensions
-  win_spec.extensions = nil
-
-  # Rake task to build the windows package
-  Gem::PackageTask.new(win_spec) do |pkg|
-    pkg.package_dir = 'pkg'
-    pkg.need_tar = false
-  end
-end
-
-# RDoc Task
-desc "Generate rdoc documentation"
-RDoc::Task.new("rdoc") do |rdoc|
-  rdoc.rdoc_dir = 'doc'
-  rdoc.title    = "libxml-xslt"
-  # Show source inline with line numbers
-  rdoc.options << "--line-numbers"
-  # Make the readme file the start page for the generated html
-  rdoc.options << '--main' << 'README'
-  rdoc.rdoc_files.include('doc/*.rdoc',
-                          'ext/**/*.c',
-                          'lib/**/*.rb',
-                          'CHANGES',
-                          'README',
-                          'LICENSE')
-end
-
-# Test Task
-Rake::TestTask.new do |t|
-  t.libs << "test"
-  t.verbose = true
-end
+#!/usr/bin/env ruby
+
+require 'rubygems'
+require 'rake/extensiontask'
+require 'rake/testtask'
+require 'rdoc/task'
+require 'yaml'
+
+GEM_NAME = 'libxslt-ruby'
+SO_NAME  = 'libxslt_ruby'
+
+# Read the spec file
+spec = Gem::Specification.load("#{GEM_NAME}.gemspec")
+
+# Setup compile tasks.  Configuration can be passed via EVN.
+# Example:
+#  rake compile with_xml2_include=C:/MinGW/local/include/libxml2
+#               with_xslt_include=C:/MinGW/local/include/libxslt
+#               with_exslt_include=C:/MinGW/local/include/libexslt
+Rake::ExtensionTask.new do |ext|
+  ext.gem_spec = spec
+  ext.name = SO_NAME
+  ext.ext_dir = "ext/libxslt"
+  ext.lib_dir = "lib/#{RUBY_VERSION.sub(/\.\d$/, '')}"
+  
+  ext.config_options << "--with-zlib-dir=C:/MinGW64/local"
+  ext.config_options << "--with-xml2-include=C:/MinGW64/local/include/libxml2"
+  ext.config_options << "--with-xslt-include=C:/MinGW64/local/include/libxslt"
+  ext.config_options << "--with-exslt-include=C:/MinGW64/local/include/libexslt"
+
+  ENV.each do |key, val|
+    next unless key =~ /\Awith_(\w+)\z/i
+    opt = $1.downcase.tr('_', '-')
+    if File.directory?(path = File.expand_path(val))
+      ext.config_options << "--with-#{opt}=#{path}"
+    else
+      warn "No such directory: #{opt}: #{path}"
+    end
+  end
+end
+
+# Setup generic gem
+Gem::PackageTask.new(spec) do |pkg|
+  pkg.package_dir = 'pkg'
+  pkg.need_tar    = false
+end
+
+# Setup Windows Gem
+if RUBY_PLATFORM.match(/win32|mingw32/)
+  binaries = (FileList['lib/**/*.so',
+                       'lib/**/*dll'])
+
+  # Windows specification
+  win_spec = spec.clone
+  win_spec.platform = Gem::Platform::CURRENT
+  win_spec.files += binaries.to_a
+  win_spec.instance_variable_set(:@cache_file, nil)
+
+  # Unset extensions
+  win_spec.extensions = nil
+
+  # Rake task to build the windows package
+  Gem::PackageTask.new(win_spec) do |pkg|
+    pkg.package_dir = 'pkg'
+    pkg.need_tar = false
+  end
+end
+
+# RDoc Task
+desc "Generate rdoc documentation"
+RDoc::Task.new("rdoc") do |rdoc|
+  rdoc.rdoc_dir = 'doc'
+  rdoc.title    = "libxml-xslt"
+  # Show source inline with line numbers
+  rdoc.options << "--line-numbers"
+  # Make the readme file the start page for the generated html
+  rdoc.options << '--main' << 'README.rdoc'
+  rdoc.rdoc_files.include('doc/*.rdoc',
+                          'ext/**/*.c',
+                          'lib/**/*.rb',
+                          'CHANGES',
+                          'README.rdoc',
+                          'LICENSE')
+end
+
+# Test Task
+Rake::TestTask.new do |t|
+  t.libs << "test"
+  t.verbose = true
+end

data/ext/libxslt/extconf.h

@@ -0,0 +1,6 @@
+#ifndef EXTCONF_H
+#define EXTCONF_H
+#define HAVE_LIBXML_XMLVERSION_H 1
+#define HAVE_XSLT_H 1
+#define HAVE_EXSLT_H 1
+#endif

data/ext/libxslt/extconf.rb

@@ -1,157 +1,112 @@
-#!/usr/local/bin/ruby -w
-
-# See the LICENSE file for copyright and distribution information
-
-require 'mkmf'
-require 'rbconfig'
-
-require 'rubygems'
-$preload = nil
-$INCFLAGS << " -I/usr/local/include"
-$LIBPATH.push(RbConfig::CONFIG['libdir'])
-
-def crash(str)
-  print(" extconf failure: %s\n", str)
-  exit 1
-end
-
-# Directories
-dir_config('iconv')
-dir_config('zlib')
-dir_config('xml2')
-dir_config('xslt')
-dir_config('exslt')
-
-# Ruby 1.9 has ruby/io.h instead of rubyio.h
-have_header('ruby/io.h')
-
-# First get zlib
-unless have_library('z', 'inflate') or
-       have_library('zlib', 'inflate') or
-       have_library('zlib1', 'inflate') or
-       have_library('libz', 'inflate')
-  crash('need zlib')
-else
-  $defs.push('-DHAVE_ZLIB_H')
-end
-
-unless have_library('iconv','iconv_open') or
-       have_library('iconv','libiconv_open') or
-       have_library('libiconv', 'libiconv_open') or
-       have_library('libiconv', 'iconv_open') or
-       have_library('c','iconv_open') or
-       have_library('recode','iconv_open') or
-       have_library('iconv')
-  crash(<<-EOL)
-need libiconv.
-
-Install the libiconv or try passing one of the following options
-to extconf.rb:
-
-  --with-iconv-dir=/path/to/iconv
-  --with-iconv-lib=/path/to/iconv/lib
-  --with-iconv-include=/path/to/iconv/include
-EOL
-end
-
-
-unless (have_library('xml2', 'xmlXPtrNewRange') or
-        have_library('libxml2', 'xmlXPtrNewRange') or
-        find_library('xml2', 'xmlXPtrNewRange', '/opt/lib', '/usr/local/lib', '/usr/lib')) and
-       (have_header('libxml/xmlversion.h') or
-        find_header('libxml/xmlversion.h',
-                    '/opt/include/libxml2',
-                    '/usr/local/include/libxml2',
-                    '/usr/include/libxml2'))
-  crash(<<-EOL)
-need libxml2.
-
-        Install the library or try one of the following options to extconf.rb:
-
-        --with-xml2-dir=/path/to/libxml2
-        --with-xml2-lib=/path/to/libxml2/lib
-        --with-xml2-include=/path/to/libxml2/include
-EOL
-end
-
-unless (have_library('xslt','xsltApplyStylesheet') or
-        have_library('libxslt','xsltApplyStylesheet') or
-        find_library('xslt', 'xsltApplyStylesheet', '/opt/lib', '/usr/local/lib', '/usr/lib')) and
-       (have_header('xslt.h') or
-        find_header('xslt.h',
-                    '/opt/include/libxslt',
-                    '/usr/local/include/libxslt',
-                    '/usr/include/libxslt'))
-  crash(<<-EOL)
-need libxslt.
-
-        Install the library or try one of the following options to extconf.rb:
-
-        --with-xslt-dir=/path/to/libxslt
-        --with-xslt-lib=/path/to/libxslt/lib
-        --with-xslt-include=/path/to/libxslt/include
-EOL
-end
-
-unless (have_library('exslt','exsltRegisterAll') or
-        have_library('libexslt','exsltRegisterAll') or
-        find_library('exslt', 'exsltRegisterAll', '/opt/lib', '/usr/local/lib', '/usr/lib')) and
-       (have_header('exslt.h') or
-        find_header('exslt.h',
-                    '/opt/include/libexslt',
-                    '/usr/local/include/libexslt',
-                    '/usr/include/libexslt'))
-  crash(<<-EOL)
-    Need libexslt.
-        Install the library or try one of the following options to extconf.rb:
-        --with-exslt-dir=/path/to/libexslt
-        --with-exslt-lib=/path/to/libexslt/lib
-        --with-exslt-include=/path/to/libexslt/include
-   EOL
-end
-
-# Figure out where libxml-ruby is installed
-unless gem_spec = Gem::Specification.find_by_name('libxml-ruby')
-  crash(<<-EOL)
-    libxml-ruby bindings must be installed
-  EOL
-end
-
-unless find_header("ruby_libxml.h", "#{gem_spec.full_gem_path}/ext/libxml")
-  crash(<<-EOL)
-    Need headers for libxml-ruby.
-  EOL
-end
-
-
-RUBY_VERSION =~ /(\d+.\d+)/
-minor_version = $1
-paths = ["#{gem_spec.full_gem_path}/lib", 
-         "#{gem_spec.full_gem_path}/lib/#{minor_version}",
-         "#{gem_spec.full_gem_path}/ext/libxml"]
-
-# No need to link xml_ruby on OS X
-unless RbConfig::CONFIG['host_os'].match(/darwin/)
-  # Hack to make sure ruby library is *after* xml_ruby library
-  $LIBS = "#{$LIBRUBYARG_STATIC} #{$LIBS}"
-
-  libraries = ["xml_ruby", # Linux
-               ":libxml_ruby.so",  # mingw
-               "libxml_ruby-#{RbConfig::CONFIG["arch"]}"] # mswin
-
-  libxml_library = libraries.detect do |library|
-    find_library(library, "Init_libxml_ruby", *paths)
-  end
-
-  unless libxml_library
-    crash(<<-EOL)
-      Need libxml-ruby
-      Please install libxml-ruby or specify the path to the gem via:
-        --with-libxml-ruby=/path/to/libxml-ruby gem
-    EOL
-  end
-  $LIBS.gsub!($LIBRUBYARG_STATIC,'')
-end
-
-create_header()
-create_makefile("libxslt_ruby")
+#!/usr/local/bin/ruby -w
+
+# See the LICENSE file for copyright and distribution information
+
+require 'mkmf'
+require 'rbconfig'
+
+require 'rubygems'
+
+def crash(str)
+  print(" extconf failure: %s\n", str)
+  exit 1
+end
+
+# Directories
+dir_config('xml2')
+dir_config('xslt')
+dir_config('exslt')
+
+unless (have_library('xml2', 'xmlXPtrNewRange') or
+        have_library('libxml2', 'xmlXPtrNewRange') or
+        find_library('xml2', 'xmlXPtrNewRange', '/opt/lib', '/usr/local/lib', '/usr/lib')) and
+       (have_header('libxml/xmlversion.h') or
+        find_header('libxml/xmlversion.h',
+                    '/opt/include/libxml2',
+                    '/usr/local/include/libxml2',
+                    '/usr/include/libxml2'))
+  crash(<<-EOL)
+Cannot find libxml2.
+
+        Install the library or try one of the following options to extconf.rb:
+
+        --with-xml2-dir=/path/to/libxml2
+        --with-xml2-lib=/path/to/libxml2/lib
+        --with-xml2-include=/path/to/libxml2/include
+EOL
+end
+
+unless (have_library('xslt','xsltApplyStylesheet') or
+        have_library('libxslt','xsltApplyStylesheet') or
+        find_library('xslt', 'xsltApplyStylesheet', '/opt/lib', '/usr/local/lib', '/usr/lib')) and
+       (have_header('xslt.h') or
+        find_header('xslt.h',
+                    '/opt/include/libxslt',
+                    '/usr/local/include/libxslt',
+                    '/usr/include/libxslt'))
+  crash(<<-EOL)
+need libxslt.
+
+        Install the library or try one of the following options to extconf.rb:
+
+        --with-xslt-dir=/path/to/libxslt
+        --with-xslt-lib=/path/to/libxslt/lib
+        --with-xslt-include=/path/to/libxslt/include
+EOL
+end
+
+unless (have_library('exslt','exsltRegisterAll') or
+        have_library('libexslt','exsltRegisterAll') or
+        find_library('exslt', 'exsltRegisterAll', '/opt/lib', '/usr/local/lib', '/usr/lib')) and
+       (have_header('exslt.h') or
+        find_header('exslt.h',
+                    '/opt/include/libexslt',
+                    '/usr/local/include/libexslt',
+                    '/usr/include/libexslt'))
+  crash(<<-EOL)
+    Need libexslt.
+        Install the library or try one of the following options to extconf.rb:
+        --with-exslt-dir=/path/to/libexslt
+        --with-exslt-lib=/path/to/libexslt/lib
+        --with-exslt-include=/path/to/libexslt/include
+   EOL
+end
+
+# Figure out where libxml-ruby is installed
+unless gem_spec = Gem::Specification.find_by_name('libxml-ruby')
+  crash(<<-EOL)
+    libxml-ruby gem must be installed
+  EOL
+end
+
+# Tell gcc where to find ruby_libxml.h
+$INCFLAGS << " -I\"#{gem_spec.full_gem_path}/ext/libxml\""
+
+RUBY_VERSION =~ /^(\d+.\d+)/
+minor_version = $1
+paths = ["#{gem_spec.full_gem_path}/lib",
+         "#{gem_spec.full_gem_path}/lib/#{minor_version}",
+         "#{gem_spec.full_gem_path}/ext/libxml"]
+
+# No need to link xml_ruby on OS X
+unless RbConfig::CONFIG['host_os'].match(/darwin|linux/)
+  libraries = ["xml_ruby", # Linux
+               ":libxml_ruby.so",  # mingw
+               "libxml_ruby-#{RbConfig::CONFIG["arch"]}"] # mswin
+
+  libxml_library = libraries.detect do |library|
+    find_library(library, "Init_libxml_ruby", *paths)
+  end
+
+  unless libxml_library
+    crash(<<-EOL)
+      Need libxml-ruby
+      Please install libxml-ruby or specify the path to the gem via:
+        --with-libxml-ruby=/path/to/libxml-ruby gem
+    EOL
+  end
+  $LIBS.gsub!($LIBRUBYARG_STATIC,'')
+end
+
+create_header()
+create_makefile("libxslt_ruby")