ruby-changes:7307

akr	2008-08-25 00:58:43 +0900 (Mon, 25 Aug 2008)

  New Revision: 18826

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

  Log:
    * configure.in (BUILTIN_TRANSSRCS): defined.
      (BUILTIN_TRANSOBJS): defined.
    
    * enc/Makefile.in (BUILTIN_TRANSES): defined.
    
    * enc/make_encmake.rb (BUILTIN_TRANSES): defined.
    
    * enc/depend: don't generate rules for builtin transcoders.
    
    * common.mk (COMMONOBJS): add BUILTIN_TRANSOBJS.
      (enc.mk): pass BUILTIN_TRANSOBJS.
      (newline.c): new rule.
      (newline.$(OBJEXT)): new ru.e
      (srcs): newline.c added.
    
    * Makefile.in (BUILTIN_TRANSSRCS): defined.
      (BUILTIN_TRANSOBJS): defined.
    
    * transcode.c (Init_transcode): call Init_newline.

  Modified directories:
    trunk/
  Modified files:
    trunk/ChangeLog
    trunk/Makefile.in
    trunk/common.mk
    trunk/configure.in
    trunk/enc/Makefile.in
    trunk/enc/depend
    trunk/enc/make_encmake.rb
    trunk/transcode.c

Index: configure.in
===================================================================
--- configure.in	(revision 18825)
+++ configure.in	(revision 18826)
@@ -2088,6 +2088,18 @@
 for e in $BUILTIN_ENCS; do BUILTIN_ENCOBJS="$BUILTIN_ENCOBJS `basename $e .c`"'.$(OBJEXT)'; done
 AC_SUBST(BUILTIN_ENCOBJS)
 
+BUILTIN_TRANSES=["`sed -n -e '/^BUILTIN_TRANSES[ 	]*=/{' \
+	-e s/// -e :l -e '/\\\\$/N' -e 's/\\\\\\n/ /' -e 't l' -e p \
+	-e '}' "${srcdir}/enc/Makefile.in"`"]
+BUILTIN_TRANSSRCS=
+BUILTIN_TRANSOBJS=
+for e in $BUILTIN_TRANSES; do
+  BUILTIN_TRANSSRCS="$BUILTIN_TRANSSRCS `basename $e .trans`"'.c';
+  BUILTIN_TRANSOBJS="$BUILTIN_TRANSOBJS `basename $e .trans`"'.$(OBJEXT)';
+done
+AC_SUBST(BUILTIN_TRANSSRCS)
+AC_SUBST(BUILTIN_TRANSOBJS)
+
 AC_CONFIG_FILES($FIRSTMAKEFILE)
 AC_CONFIG_FILES(Makefile, [{
 	sed '/^MISSING/s/\$U\././g' Makefile
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 18825)
+++ ChangeLog	(revision 18826)
@@ -1,3 +1,25 @@
+Mon Aug 25 00:52:31 2008  Tanaka Akira  <akr@f...>
+
+	* configure.in (BUILTIN_TRANSSRCS): defined.
+	  (BUILTIN_TRANSOBJS): defined.
+
+	* enc/Makefile.in (BUILTIN_TRANSES): defined.
+
+	* enc/make_encmake.rb (BUILTIN_TRANSES): defined.
+
+	* enc/depend: don't generate rules for builtin transcoders.
+
+	* common.mk (COMMONOBJS): add BUILTIN_TRANSOBJS.
+	  (enc.mk): pass BUILTIN_TRANSOBJS.
+	  (newline.c): new rule.
+	  (newline.$(OBJEXT)): new ru.e
+	  (srcs): newline.c added.
+
+	* Makefile.in (BUILTIN_TRANSSRCS): defined.
+	  (BUILTIN_TRANSOBJS): defined.
+
+	* transcode.c (Init_transcode): call Init_newline.
+
 Mon Aug 25 00:11:02 2008  Tanaka Akira  <akr@f...>
 
 	* transcode.c (declare_transcoder): arguments order changed.
Index: enc/Makefile.in
===================================================================
--- enc/Makefile.in	(revision 18825)
+++ enc/Makefile.in	(revision 18826)
@@ -17,6 +17,8 @@
 BUILTIN_ENCS	= ascii.c us_ascii.c\
 		  unicode.c utf_8.c
 
+BUILTIN_TRANSES	= newline.trans
+
 RUBY_SO_NAME = @RUBY_SO_NAME@
 LIBRUBY = @LIBRUBY@
 LIBRUBYARG_SHARED = @LIBRUBYARG_SHARED@
Index: enc/make_encmake.rb
===================================================================
--- enc/make_encmake.rb	(revision 18825)
+++ enc/make_encmake.rb	(revision 18826)
@@ -12,6 +12,7 @@
 CONFIG["MAKEDIRS"] ||= '@$(MINIRUBY) -run -e mkdir -- -p'
 
 BUILTIN_ENCS = []
+BUILTIN_TRANSES = []
 ENC_PATTERNS = []
 NOENC_PATTERNS = []
 
@@ -20,6 +21,9 @@
   when /\A--builtin-encs=/
     BUILTIN_ENCS.concat $'.split.map {|e| File.basename(e, '.*') << '.c'}
     ARGV.shift
+  when /\A--builtin-transes=/
+    BUILTIN_TRANSES.concat $'.split.map {|e| File.basename(e, '.*') }
+    ARGV.shift
   when /\A--encs=/
     ENC_PATTERNS.concat $'.split
     ARGV.shift
Index: enc/depend
===================================================================
--- enc/depend	(revision 18825)
+++ enc/depend	(revision 18826)
@@ -17,6 +17,8 @@
 %     end
 %   }
 % }
+% trans -= BUILTIN_TRANSES
+% atrans -= BUILTIN_TRANSES
 % trans.uniq!
 % atrans = atrans.sort_by(&alphanumeric_order)
 % trans = trans.sort_by(&alphanumeric_order)
Index: common.mk
===================================================================
--- common.mk	(revision 18825)
+++ common.mk	(revision 18826)
@@ -81,6 +81,7 @@
 		thread.$(OBJEXT) \
 		cont.$(OBJEXT) \
 		$(BUILTIN_ENCOBJS) \
+		$(BUILTIN_TRANSOBJS) \
 		$(MISSING)
 
 OBJS          = dln.$(OBJEXT) \
@@ -381,7 +382,7 @@
 
 enc.mk: $(srcdir)/enc/make_encmake.rb $(srcdir)/enc/Makefile.in $(srcdir)/enc/depend \
 	$(srcdir)/lib/mkmf.rb $(RBCONFIG)
-	$(MINIRUBY) $(srcdir)/enc/make_encmake.rb --builtin-encs="$(BUILTIN_ENCOBJS)" $@ $(ENCS)
+	$(MINIRUBY) $(srcdir)/enc/make_encmake.rb --builtin-encs="$(BUILTIN_ENCOBJS)" --builtin-transes="$(BUILTIN_TRANSOBJS)" $@ $(ENCS)
 
 .PRECIOUS: $(MKFILES)
 
@@ -661,6 +662,10 @@
 utf_8.$(OBJEXT): {$(VPATH)}utf_8.c {$(VPATH)}regenc.h {$(VPATH)}config.h \
   {$(VPATH)}defines.h {$(VPATH)}oniguruma.h
 
+newline.c: $(srcdir)/enc/trans/newline.trans $(srcdir)/tool/transcode-tblgen.rb
+newline.$(OBJEXT): {$(VPATH)}newline.c {$(VPATH)}defines.h  {$(VPATH)}intern.h \
+  {$(VPATH)}missing.h {$(VPATH)}st.h {$(VPATH)}transcode_data.h
+
 INSNS	= opt_sc.inc optinsn.inc optunifs.inc insns.inc insns_info.inc \
 	  vmtc.inc vm.inc
 
@@ -686,7 +691,7 @@
 
 vm.inc: $(srcdir)/template/vm.inc.tmpl
 
-srcs: {$(VPATH)}parse.c {$(VPATH)}lex.c $(srcdir)/ext/ripper/ripper.c srcs-enc
+srcs: {$(VPATH)}parse.c {$(VPATH)}lex.c {$(VPATH)}newline.c $(srcdir)/ext/ripper/ripper.c srcs-enc
 
 srcs-enc: enc.mk
 	$(MAKE) -f enc.mk RUBY="$(MINIRUBY)" MINIRUBY="$(MINIRUBY)" $(MFLAGS) srcs
@@ -715,6 +720,9 @@
 golf_prelude.c: $(srcdir)/tool/compile_prelude.rb $(RBCONFIG) $(srcdir)/prelude.rb $(srcdir)/golf_prelude.rb $(PREP)
 	$(COMPILE_PRELUDE) $(srcdir)/golf_prelude.rb $@
 
+newline.c: 
+	$(BASERUBY) "$(srcdir)/tool/transcode-tblgen.rb" -vo newline.c $(srcdir)/enc/trans/newline.trans
+
 prereq: incs srcs preludes
 
 preludes: {$(VPATH)}miniprelude.c
Index: Makefile.in
===================================================================
--- Makefile.in	(revision 18825)
+++ Makefile.in	(revision 18826)
@@ -57,6 +57,8 @@
 MAINLIBS = @MAINLIBS@
 ARCHMINIOBJS = @MINIOBJS@
 BUILTIN_ENCOBJS = @BUILTIN_ENCOBJS@
+BUILTIN_TRANSSRCS = @BUILTIN_TRANSSRCS@
+BUILTIN_TRANSOBJS = @BUILTIN_TRANSOBJS@
 
 RUBY_INSTALL_NAME=@RUBY_INSTALL_NAME@
 RUBY_SO_NAME=@RUBY_SO_NAME@
Index: transcode.c
===================================================================
--- transcode.c	(revision 18825)
+++ transcode.c	(revision 18826)
@@ -2424,6 +2424,8 @@
     return rb_attr_get(self, rb_intern("error_bytes"));
 }
 
+extern void Init_newline(void);
+
 void
 Init_transcode(void)
 {
@@ -2470,4 +2472,6 @@
     rb_define_method(rb_eInvalidByteSequence, "source_encoding", ecerr_source_encoding, 0);
     rb_define_method(rb_eInvalidByteSequence, "destination_encoding", ecerr_destination_encoding, 0);
     rb_define_method(rb_eInvalidByteSequence, "error_bytes", ecerr_error_bytes, 0);
+
+    Init_newline();
 }

Property changes on: .
___________________________________________________________________
Name: svn:ignore
   - *.bak
*.inc
*.orig
*.rej
*.sav
*~
.*-*
.*.list
.*.time
.ccmalloc
.ext
.git
.pc
.ppack
.svn
COPYING.LIB
ChangeLog-1.8.0
ChangeLog.pre-alpha
ChangeLog.pre1_1
GNUmakefile
Makefile
README.atheos
README.fat-patch
README.v6
TAGS
archive
autom4te*.cache
automake
beos
config.cache
config.h
config.h.in
config.log
config.status
config.status.lineno
configure
enc.mk
encdb.h
largefile.h
lex.c
libruby*.*
*.dylib
miniprelude.c
miniruby
newdate.rb
newver.rb
parse.c
parse.h
patches
patches-master
pitest.rb
ppack
prelude.c
preview
rbconfig.rb
rename2.h
revision.h
repack
riscos
rubicon
ruby
ruby-man.rd.gz
rubyspec
test.rb
tmp
transdb.h
uncommon.mk
web
y.output
y.tab.c
yasmdata.rb
*_prelude.c

   + *.bak
*.inc
*.orig
*.rej
*.sav
*~
.*-*
.*.list
.*.time
.ccmalloc
.ext
.git
.pc
.ppack
.svn
COPYING.LIB
ChangeLog-1.8.0
ChangeLog.pre-alpha
ChangeLog.pre1_1
GNUmakefile
Makefile
README.atheos
README.fat-patch
README.v6
TAGS
archive
autom4te*.cache
automake
beos
config.cache
config.h
config.h.in
config.log
config.status
config.status.lineno
configure
enc.mk
encdb.h
largefile.h
lex.c
libruby*.*
*.dylib
miniprelude.c
miniruby
newdate.rb
newver.rb
newline.c
parse.c
parse.h
patches
patches-master
pitest.rb
ppack
prelude.c
preview
rbconfig.rb
rename2.h
revision.h
repack
riscos
rubicon
ruby
ruby-man.rd.gz
rubyspec
test.rb
tmp
transdb.h
uncommon.mk
web
y.output
y.tab.c
yasmdata.rb
*_prelude.c



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