* common.mk (encdb.h): see both $(srcdir)/enc and enc.

* enc/make_encdb.rb: ditto.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@18435 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

2 files changed, 42 insertions, 36 deletions

diff --git a/enc/make_encdb.rb b/enc/make_encdb.rb
index 8b5731f548..41e9a91293 100755
--- a/enc/make_encdb.rb
+++ b/enc/make_encdb.rb
@@ -22,42 +22,48 @@ count = 0
 lines = []
 encodings = []
 defs = {}
-encdir = ARGV[0]
-outhdr = ARGV[1] || 'encdb.h'
-Dir.open(encdir) {|d| d.grep(/.+\.[ch]\z/)}.sort_by {|e|
-  e.scan(/(\d+)|(\D+)/).map {|n,a| a||[n.size,n.to_i]}.flatten
-}.each do |fn|
-  open(File.join(encdir,fn)) do |f|
-    orig = nil
-    name = nil
-    f.each_line do |line|
-      if (/^OnigEncodingDefine/ =~ line)..(/"(.*?)"/ =~ line)
-        if $1
-          check_duplication(defs, $1, fn, $.)
-          encodings << $1
-          count += 1
-        end
-      else
-        case line
-        when /^\s*rb_enc_register\(\s*"([^"]+)"/
-          count += 1
-          line = nil
-        when /^ENC_REPLICATE\(\s*"([^"]+)"\s*,\s*"([^"]+)"/
-          raise ArgumentError,
-          '%s:%d: ENC_REPLICATE: %s is not defined yet. (replica %s)' %
-            [fn, $., $2, $1] unless defs[$2.upcase]
-          count += 1
-        when /^ENC_ALIAS\(\s*"([^"]+)"\s*,\s*"([^"]+)"/
-          raise ArgumentError,
-          '%s:%d: ENC_ALIAS: %s is not defined yet. (alias %s)' %
-            [fn, $., $2, $1] unless defs[$2.upcase]
-        when /^ENC_DUMMY\(\s*"([^"]+)"/
-          count += 1
+encdirs = ARGV.dup
+outhdr = encdirs.shift || 'encdb.h'
+encdirs << 'enc' if encdirs.empty?
+files = {}
+encdirs.each do |encdir|
+  Dir.open(encdir) {|d| d.grep(/.+\.[ch]\z/)}.sort_by {|e|
+    e.scan(/(\d+)|(\D+)/).map {|n,a| a||[n.size,n.to_i]}.flatten
+  }.each do |fn|
+    next if files[fn]
+    files[fn] = true
+    open(File.join(encdir,fn)) do |f|
+      orig = nil
+      name = nil
+      f.each_line do |line|
+        if (/^OnigEncodingDefine/ =~ line)..(/"(.*?)"/ =~ line)
+          if $1
+            check_duplication(defs, $1, fn, $.)
+            encodings << $1
+            count += 1
+          end
         else
-          next
+          case line
+          when /^\s*rb_enc_register\(\s*"([^"]+)"/
+            count += 1
+            line = nil
+          when /^ENC_REPLICATE\(\s*"([^"]+)"\s*,\s*"([^"]+)"/
+            raise ArgumentError,
+            '%s:%d: ENC_REPLICATE: %s is not defined yet. (replica %s)' %
+              [fn, $., $2, $1] unless defs[$2.upcase]
+            count += 1
+          when /^ENC_ALIAS\(\s*"([^"]+)"\s*,\s*"([^"]+)"/
+            raise ArgumentError,
+            '%s:%d: ENC_ALIAS: %s is not defined yet. (alias %s)' %
+              [fn, $., $2, $1] unless defs[$2.upcase]
+          when /^ENC_DUMMY\(\s*"([^"]+)"/
+            count += 1
+          else
+            next
+          end
+          check_duplication(defs, $1, fn, $.)
+          lines << line.sub(/;.*/m, "").chomp + ";\n" if line
         end
-        check_duplication(defs, $1, fn, $.)
-        lines << line.sub(/;.*/m, "").chomp + ";\n" if line
       end
     end
   end
diff --git a/enc/trans/make_transdb.rb b/enc/trans/make_transdb.rb
index 6016db8b5b..4cadfdeeb3 100644
--- a/enc/trans/make_transdb.rb
+++ b/enc/trans/make_transdb.rb
@@ -8,8 +8,8 @@
 
 count = 0
 converters = {}
-outhdr = ARGV[0] || 'transdb.h'
-transdirs = ARGV[1..-1]
+transdirs = ARGV.dup
+outhdr = transdirs.shift || 'transdb.h'
 transdirs << 'enc/trans' if transdirs.empty?
 files = {}
 transdirs.each do |transdir|