nobu	2014-10-20 12:42:44 +0900 (Mon, 20 Oct 2014)

  New Revision: 48042

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=48042

  Log:
    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.

  Modified files:
    trunk/common.mk
    trunk/tool/unicode_norm_gen.rb
Index: common.mk
===================================================================
--- common.mk	(revision 48041)
+++ common.mk	(revision 48042)
@@ -1098,9 +1098,10 @@ update-unicode: PHONY https://github.com/ruby/ruby/blob/trunk/common.mk#L1098
 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
Index: tool/unicode_norm_gen.rb
===================================================================
--- tool/unicode_norm_gen.rb	(revision 48041)
+++ tool/unicode_norm_gen.rb	(revision 48042)
@@ -6,8 +6,8 @@ https://github.com/ruby/ruby/blob/trunk/tool/unicode_norm_gen.rb#L6
 # 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

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/