unf_ext 0.0.3 → 0.0.4

data/Gemfile

@@ -10,4 +10,5 @@ group :development do
   gem "bundler", "~> 1.0.0"
   gem "jeweler", "~> 1.6.4"
   gem "rcov", ">= 0"
+  gem "rake-compiler", ">= 0.7.9"
 end

data/README.md

@@ -29,7 +29,7 @@ Requirement
 Installation
 ------------
 
-	gem install unf
+	gem install unf_ext
 
 Or:
 

data/Rakefile

@@ -22,10 +22,21 @@ Jeweler::Tasks.new do |gem|
   gem.email = "knu@idaemons.org"
   gem.authors = ["Takeru Ohta", "Akinori MUSHA"]
   # dependencies defined in Gemfile
-  gem.extensions << "extconf.rb"
 end
 Jeweler::RubygemsDotOrgTasks.new
 
+def generated_gemspec
+  eval(File.read(Rake.application.jeweler.gemspec_helper.path))
+rescue
+  nil
+end
+
+require 'rake/extensiontask'
+Rake::ExtensionTask.new('unf_ext', generated_gemspec) do |ext|
+    ext.cross_compile = true
+    ext.cross_platform = 'x86-mingw32'
+end
+
 require 'rake/testtask'
 Rake::TestTask.new(:test) do |test|
   test.libs << 'lib' << 'test'

data/VERSION

@@ -1 +1 @@
-0.0.3
+0.0.4

data/ext/unf_ext/extconf.rb

@@ -0,0 +1,25 @@
+require 'mkmf'
+have_library('stdc++')
+have_header('ruby/encoding.h')
+create_makefile 'unf_ext'
+
+unless CONFIG['CXX']
+  case CONFIG['CC']
+  when %r{((?:.*[-/])?)gcc([-0-9.]*)$}
+    cxx = $1 + 'g++' + $2
+  when %r{((?:.*[-/])?)clang([-0-9.]*)$}
+    cxx = $1 + 'clang++' + $2
+  else
+    cxx = CONFIG['CC']
+  end
+
+  warn "CXX is automatically set to #{cxx}"
+
+  new_mf = <<-EOF << File.read('Makefile')
+CXX=#{cxx}
+  EOF
+
+  File.open('Makefile', 'w') { |mf|
+    mf.print new_mf
+  }
+end

data/{unf → ext/unf_ext/unf}/normalizer.hh

@@ -17,12 +17,12 @@ namespace UNF {
 
   public:
     Normalizer()
-      : nf_d(TABLE::CANONICAL_DECOM_NODES, TABLE::VALUE),
-	nf_kd(TABLE::COMPATIBILITY_DECOM_NODES, TABLE::VALUE),
-	nf_c(TABLE::CANONICAL_COM_NODES, TABLE::VALUE),
-	nf_c_qc(TABLE::NFC_ILLEGAL_NODES),
-	nf_kc_qc(TABLE::NFKC_ILLEGAL_NODES),
-	ccc(TABLE::CANONICAL_CLASS_NODES)
+      : nf_d(TABLE::NODES, TABLE::CANONICAL_DECOM_ROOT, TABLE::STRINGS),
+	nf_kd(TABLE::NODES, TABLE::COMPATIBILITY_DECOM_ROOT, TABLE::STRINGS),
+	nf_c(TABLE::NODES, TABLE::CANONICAL_COM_ROOT, TABLE::STRINGS),
+	nf_c_qc(TABLE::NODES, TABLE::NFC_ILLEGAL_ROOT),
+	nf_kc_qc(TABLE::NODES, TABLE::NFKC_ILLEGAL_ROOT),
+	ccc(TABLE::NODES, TABLE::CANONICAL_CLASS_ROOT)
     {}
 
     const char* normalize(const char* src, Form form) {