diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-10-20 03:42:44 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-10-20 03:42:44 +0000 |
| commit | 8b99ce965631de9d475ed28b27e265d92fc91445 (patch) | |
| tree | 4aa1294b9c3614079250c633feb19ba3f12f03f9 | |
| parent | f61265746e54ad1706e382630679a855d919d6c0 (diff) | |
unicode_norm_gen.rb: get rid of hard coded paths
* common.mk (lib/unicode_normalize/tables.rb): run at top srcdir.
* tool/unicode_norm_gen.rb: add -input and -output options to set
InputDataDir and OuputDataDir respectively.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@48042 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | common.mk | 7 | ||||
| -rw-r--r-- | tool/unicode_norm_gen.rb | 4 |
2 files changed, 6 insertions, 5 deletions
@@ -1098,9 +1098,10 @@ update-unicode: PHONY enc/unicode/data/UnicodeData.txt: update-unicode lib/unicode_normalize/tables.rb: tool/unicode_norm_gen.rb \ -enc/unicode/data/UnicodeData.txt \ -enc/unicode/data/CompositionExclusions.txt - $(BASERUBY) -C "$(srcdir)/tool" unicode_norm_gen.rb + enc/unicode/data/UnicodeData.txt \ + enc/unicode/data/CompositionExclusions.txt + $(BASERUBY) -s -C "$(srcdir)" tool/unicode_norm_gen.rb \ + -input=enc/unicode/data -ouput=lib/unicode_normalize info: info-program info-libruby_a info-libruby_so info-arch info-program: PHONY diff --git a/tool/unicode_norm_gen.rb b/tool/unicode_norm_gen.rb index b728abbf49..5f2545075b 100644 --- a/tool/unicode_norm_gen.rb +++ b/tool/unicode_norm_gen.rb @@ -6,8 +6,8 @@ # String#unicode_normalize,... # Constants for input and ouput directory -InputDataDir = '../enc/unicode/data' -OuputDataDir = '../lib/unicode_normalize' +InputDataDir = $input || 'enc/unicode/data' +OuputDataDir = $ouput || 'lib/unicode_normalize' # convenience methods class Integer |