From 508b170dcd07c2bb1e9e1cb641451915fbeba024 Mon Sep 17 00:00:00 2001 From: naruse Date: Wed, 6 Aug 2008 19:44:50 +0000 Subject: [PATCH] * enc/depend: for build in other than srcdir. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@18396 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 4 ++++ enc/depend | 8 ++++---- version.h | 6 +++--- 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index 41fab76ae6..6fc99a56b3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Thu Aug 7 04:43:14 2008 NARUSE, Yui + + * enc/depend: for build in other than srcdir. + Wed Aug 6 22:40:48 2008 Tanaka Akira * tool/transcode-tblgen.rb (transcode_generate_node): code diff --git a/enc/depend b/enc/depend index e644096173..3ab7e48ef1 100644 --- a/enc/depend +++ b/enc/depend @@ -6,7 +6,7 @@ % atrans = [] % trans = Dir.open($srcdir+"/trans") {|d| % d.select {|e| -% if e.chomp!('.c') +% if e != 'transdb.c' && e.chomp!('.c') % atrans << e if e.chomp!(".erb") % true % end @@ -51,7 +51,7 @@ $(TRANSOBJS): ruby.h intern.h config.h defines.h missing.h encoding.h oniguruma. % src = "#{e}.erb.c" % src = [src, *IO.read(File.join($srcdir, "trans", src)).scan(/^\s*require\s+[\'\"]([^\'\"]*)/).flatten.map{|c|c+".rb"}] -$(srcdir)/enc/trans/<%=e%>.c: <%= src.map {|e| "$(srcdir)/enc/trans/#{e}"}.join(" ")%> $(srcdir)/tool/transcode-tblgen.rb +enc/trans/<%=e%>.c: <%= src.map {|e| "$(srcdir)/enc/trans/#{e}"}.join(" ")%> $(srcdir)/tool/transcode-tblgen.rb $(BASERUBY) "$(srcdir)/tool/transcode-tblgen.rb" -vo "$@" <%= src.map {|e| %'"$(srcdir)/enc/trans/#{e}"'}.join(" ")%> % end @@ -70,8 +70,8 @@ $(ENCSODIR)/<%=e%>.$(DLEXT): <%=obj%> % end % dependencies.each do |e| -enc/<%=e%>.$(OBJEXT): $(srcdir)/enc/<%=e%>.c - <%=COMPILE_C.sub(/\$(?:<|\(<(?:.*)\))/) {"$(srcdir)/enc/#{e}.c"}%> +enc/<%=e%>.$(OBJEXT): enc/<%=e%>.c + <%=COMPILE_C.sub(/\$(?:<|\(<(?:.*)\))/) {"enc/#{e}.c"}%> % end enc/encdb.$(OBJEXT): encdb.h diff --git a/version.h b/version.h index ee70966012..35cbc82063 100644 --- a/version.h +++ b/version.h @@ -1,7 +1,7 @@ #define RUBY_VERSION "1.9.0" -#define RUBY_RELEASE_DATE "2008-08-06" +#define RUBY_RELEASE_DATE "2008-08-07" #define RUBY_VERSION_CODE 190 -#define RUBY_RELEASE_CODE 20080806 +#define RUBY_RELEASE_CODE 20080807 #define RUBY_PATCHLEVEL 0 #define RUBY_VERSION_MAJOR 1 @@ -9,7 +9,7 @@ #define RUBY_VERSION_TEENY 0 #define RUBY_RELEASE_YEAR 2008 #define RUBY_RELEASE_MONTH 8 -#define RUBY_RELEASE_DAY 6 +#define RUBY_RELEASE_DAY 7 #ifdef RUBY_EXTERN RUBY_EXTERN const char ruby_version[];