aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-09-03 08:57:18 +0000
committernaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-09-03 08:57:18 +0000
commit42a48c1e9d4767f0d32dcbc04822b87e3aee06cb (patch)
tree176dc11e4466382dd7c3d53b709ab7fb9acd1703
parent204929af9dfc7d483d69476325c1ceac1721e219 (diff)
downloadruby-42a48c1e9d4767f0d32dcbc04822b87e3aee06cb.tar.gz
* enc/trans/make_transdb.rb: check $(srcdir)/enc/trans before
enc/trans. * enc/trans/make_transdb.rb: keep names_t. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@19081 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog7
-rw-r--r--enc/trans/make_transdb.rb5
2 files changed, 10 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 17ed4fe20d..2d6b7e7c71 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Wed Sep 3 17:48:32 2008 NARUSE, Yui <naruse@ruby-lang.org>
+
+ * enc/trans/make_transdb.rb: check $(srcdir)/enc/trans before
+ enc/trans.
+
+ * enc/trans/make_transdb.rb: keep names_t.
+
Wed Sep 3 16:54:46 2008 Koichi Sasada <ko1@atdot.net>
* include/ruby/signal.h: removed.
diff --git a/enc/trans/make_transdb.rb b/enc/trans/make_transdb.rb
index 752e74624d..bbb7a9be6c 100644
--- a/enc/trans/make_transdb.rb
+++ b/enc/trans/make_transdb.rb
@@ -13,7 +13,7 @@ outhdr = transdirs.shift || 'transdb.h'
transdirs << 'enc/trans' if transdirs.empty?
transdirs = transdirs.sort_by {|td|
- td.length
+ -td.length
}.inject([]) {|tds, td|
next tds unless File.directory?(td)
tds << td if tds.all? {|td2| !File.identical?(td2, td) }
@@ -21,9 +21,10 @@ transdirs = transdirs.sort_by {|td|
}
files = {}
+names_t = []
transdirs.each do |transdir|
names = Dir.entries(transdir)
- names_t = names.map {|n| /(?!\A)\.trans\z/ =~ n ? $` : nil }.compact
+ names_t += names.map {|n| /(?!\A)\.trans\z/ =~ n ? $` : nil }.compact
names_c = names.map {|n| /(?!\A)\.c\z/ =~ n ? $` : nil }.compact
(names_t & names_c).map {|n|
"#{n}.c"