* enc/trans/iso2022.trans: renamed from iso2022.erb.c.

* enc/trans/single_byte.trans: ditto.

* enc/trans/utf_16_32.trans: ditto.

* enc/trans/korean.trans: ditto.

* enc/trans/japanese.trans: ditto.

* enc/depend: follow the renaming.

* tool/build-transcode: ditto.




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

8 files changed, 28 insertions, 10 deletions

diff --git a/ChangeLog b/ChangeLog
index cf0c0d7377..0147f9a8d3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,19 @@
+Mon Aug 11 16:34:48 2008  Tanaka Akira  <akr@fsij.org>
+
+	* enc/trans/iso2022.trans: renamed from iso2022.erb.c.
+
+	* enc/trans/single_byte.trans: ditto.
+
+	* enc/trans/utf_16_32.trans: ditto.
+
+	* enc/trans/korean.trans: ditto.
+
+	* enc/trans/japanese.trans: ditto.
+
+	* enc/depend: follow the renaming.
+
+	* tool/build-transcode: ditto.
+
 Mon Aug 11 15:09:23 2008  Tanaka Akira  <akr@fsij.org>
 
 	* configure.in (rb_cv_broken_glibc_ia64_erfc): renamed from
diff --git a/enc/depend b/enc/depend
index d413898689..2eeb058d91 100644
--- a/enc/depend
+++ b/enc/depend
@@ -7,8 +7,10 @@
 % atrans = []
 % trans = Dir.open($srcdir+"/trans") {|d|
 %   d.select {|e|
-%     if e.chomp!('.c')
-%       atrans << e if e.chomp!(".erb")
+%     if e.chomp!('.trans')
+%       atrans << e
+%       true
+%     elsif e.chomp!('.c')
 %       true
 %     end
 %   }
@@ -72,7 +74,7 @@ $(ENCOBJS): regenc.h oniguruma.h config.h defines.h
 $(TRANSOBJS): ruby.h intern.h config.h defines.h missing.h encoding.h oniguruma.h st.h transcode_data.h
 %   end
 %   atrans.each do |e|
-%     src = "#{e}.erb.c"
+%     src = "#{e}.trans"
 %     src = [src, *IO.read(File.join($srcdir, "trans", src)).scan(/^\s*require\s+[\'\"]([^\'\"]*)/).flatten.map{|c|c+".rb"}]
 
 <%=rule_subst % "enc/trans/#{e}.c"%>: <%= src.map {|e| rule_subst % "enc/trans/#{e}"}.join(" ")%> $(srcdir)/tool/transcode-tblgen.rb
diff --git a/enc/trans/iso2022.erb.c b/enc/trans/iso2022.trans
index 3209fad163..3209fad163 100644
--- a/enc/trans/iso2022.erb.c
+++ b/enc/trans/iso2022.trans
diff --git a/enc/trans/japanese.erb.c b/enc/trans/japanese.trans
index dae3bf1e03..dae3bf1e03 100644
--- a/enc/trans/japanese.erb.c
+++ b/enc/trans/japanese.trans
diff --git a/enc/trans/korean.erb.c b/enc/trans/korean.trans
index f04fa15613..f04fa15613 100644
--- a/enc/trans/korean.erb.c
+++ b/enc/trans/korean.trans
diff --git a/enc/trans/single_byte.erb.c b/enc/trans/single_byte.trans
index 8cbf474eb5..8cbf474eb5 100644
--- a/enc/trans/single_byte.erb.c
+++ b/enc/trans/single_byte.trans
diff --git a/enc/trans/utf_16_32.erb.c b/enc/trans/utf_16_32.trans
index aea2ab50a8..aea2ab50a8 100644
--- a/enc/trans/utf_16_32.erb.c
+++ b/enc/trans/utf_16_32.trans
diff --git a/tool/build-transcode b/tool/build-transcode
index 69ffac2484..fa71155530 100755
--- a/tool/build-transcode
+++ b/tool/build-transcode
@@ -1,15 +1,15 @@
 #!/bin/sh
 
 [ "$1" -a -d "$1" ] && { cd "$1" || exit $?; } && shift
-[ "$#" = 0 ] && set enc/trans/*.erb.c
-for erb; do
-    case "$erb" in
-    *.erb.c)
-	src=`expr "$erb" | sed 's/\.erb\.c$/.c/'`
-	${BASERUBY-ruby} tool/transcode-tblgen.rb -vo "$src" "$erb"
+[ "$#" = 0 ] && set enc/trans/*.trans
+for src; do
+    case "$src" in
+    *.trans)
+        c="`dirname $src`/`basename $src .trans`.c"
+	${BASERUBY-ruby} tool/transcode-tblgen.rb -vo "$c" "$src"
 	;;
     *)
-	echo "$0: don' know how to deal with $erb"
+	echo "$0: don't know how to deal with $src"
 	continue
 	;;
     esac