From 07ad033850328cf2f19a9e1521eb631b7059b5ed Mon Sep 17 00:00:00 2001
From: duerst <duerst@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Sun, 7 Feb 2016 01:39:26 +0000
Subject: [PATCH] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@53759
 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

---
 common.mk                   |  6 ++++++
 enc/unicode/case-folding.rb | 18 +++++++++++++++++-
 2 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/common.mk b/common.mk
index 6b96f82bcf..c622c14ed7 100644
--- a/common.mk
+++ b/common.mk
@@ -1047,6 +1047,12 @@ $(srcdir)/.unicode-tables.time: $(srcdir)/tool/generic_erb.rb \
 		$(srcdir)/template/unicode_norm_gen.tmpl \
 		$(UNICODE_DATA_DIR) lib/unicode_normalize
 
+$(srcdir)/enc/unicode/casefold.h: $(srcdir)/enc/unicode/case-folding.rb \
+		$(UNICODE_SRC_DATA_DIR)/CaseFolding.txt
+	$(Q) $(BASERUBY) $(srcdir)/enc/unicode/case-folding.rb \
+		--output-file=$(srcdir)/enc/unicode/casefold.h \
+		$(UNICODE_SRC_DATA_DIR)/CaseFolding.txt
+
 download-extlibs:
 	$(Q) $(BASERUBY) -C $(srcdir) -w tool/extlibs.rb --download ext
 
diff --git a/enc/unicode/case-folding.rb b/enc/unicode/case-folding.rb
index d93de6581b..c514ab0171 100755
--- a/enc/unicode/case-folding.rb
+++ b/enc/unicode/case-folding.rb
@@ -3,6 +3,9 @@
 # Usage:
 #   $ wget http://www.unicode.org/Public/UNIDATA/CaseFolding.txt
 #   $ ruby case-folding.rb CaseFolding.txt -o casefold.h
+#  or:
+#   $ wget http://www.unicode.org/Public/UNIDATA/CaseFolding.txt
+#   $ ruby case-folding.rb -m . -o casefold.h
 
 class CaseFolding
   module Util
@@ -175,16 +178,29 @@ end
 if $0 == __FILE__
   require 'optparse'
   dest = nil
+  mapping_directory = nil
+  mapping_data = nil
   fold_1 = false
   ARGV.options do |opt|
     opt.banner << " [INPUT]"
     opt.on("--output-file=FILE", "-o", "output to the FILE instead of STDOUT") {|output|
       dest = (output unless output == '-')
     }
+    opt.on('--mapping-data-directory', '-m', 'data directory of mapping files') { |directory|
+      mapping_directory = directory
+    }
     opt.parse!
     abort(opt.to_s) if ARGV.size > 1
   end
-  filename = ARGV[0] || 'CaseFolding.txt'
+  if mapping_directory
+    if ARGV[0]
+      warn "Either specify directory or individual file, but not both."
+      exit
+    end
+    filename = File.expand_path("CaseFolding.txt", mapping_directory)
+  end
+  filename ||= ARGV[0] || 'CaseFolding.txt'
+  
   data = CaseFolding.load(filename)
   if dest
     open(dest, "wb") do |f|