diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | enc/depend | 11 | ||||
| -rw-r--r-- | version.h | 4 |
3 files changed, 16 insertions, 4 deletions
@@ -1,3 +1,8 @@ +Mon Mar 23 06:51:16 2009 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * enc/depend (link_so): replaces $(TARGET) with basename of the + target. [ruby-talk:330286] + Sun Mar 22 14:51:55 2009 Nobuyoshi Nakada <nobu@ruby-lang.org> * win32/win32.c (rb_w32_spawn, rb_w32_aspawn): use NULL as diff --git a/enc/depend b/enc/depend index f5aa76ef7b..7186179ef0 100644 --- a/enc/depend +++ b/enc/depend @@ -1,3 +1,5 @@ +% CONFIG["DLDFLAGS"].sub!(/(\A|\s)(-\S+(?:\s*\w*)?\$\(TARGET\)\S*)/, '\1') +% dldflags = $2 % enable_shared = CONFIG['ENABLE_SHARED'] == 'yes' % deffile = (true if /\$\(DEFFILE\)/ =~ CONFIG["LINK_SO"]) % encs = Dir.open($srcdir) {|d| d.grep(/.+\.c\z/)} - BUILTIN_ENCS @@ -103,12 +105,17 @@ $(TRANSOBJS): ruby.h intern.h config.h defines.h missing.h encoding.h oniguruma. % obj = "enc/#{e}.$(OBJEXT)" % df = ("enc/#{e}.def" if deffile) $(ENCSODIR)/<%=e%>.$(DLEXT): <%=obj%> +% cmd = link_so.sub(/\$\(OBJS\)/) {obj} +% base = File.basename(e) +% cmd.sub!(/(?=\$\(DLDFLAGS\))/) {dldflags.sub(/\$\(TARGET\)/) {base} + " "} if dldflags % if df echo> <%=df%> EXPORTS - echo>> <%=df%> <%=EXPORT_PREFIX%>Init_<%=File.basename(e)%> + echo>> <%=df%> <%=EXPORT_PREFIX%>Init_<%=base%> +% cmd.sub!(/\$\(DEFFILE\)/) {df} +% cmd.gsub!(/-(?:implib|pdb):/) {|s|"#{s}enc/#{e.sub(/[^\/]+\z/, '')}"} % end @$(MAKEDIRS) "$(@D)" - <%=link_so.sub(/\$\(OBJS\)/) {obj}.sub(/\$\(DEFFILE\)/) {df}.gsub(/-(?:implib|pdb):/) {|s|"#{s}enc/#{e.sub(/[^\/]+\z/, '')}"}%> + <%=cmd%> % end % dependencies.each do |e| @@ -1,5 +1,5 @@ #define RUBY_VERSION "1.9.2" -#define RUBY_RELEASE_DATE "2009-03-22" +#define RUBY_RELEASE_DATE "2009-03-23" #define RUBY_PATCHLEVEL -1 #define RUBY_BRANCH_NAME "trunk" @@ -8,7 +8,7 @@ #define RUBY_VERSION_TEENY 1 #define RUBY_RELEASE_YEAR 2009 #define RUBY_RELEASE_MONTH 3 -#define RUBY_RELEASE_DAY 22 +#define RUBY_RELEASE_DAY 23 #ifdef RUBY_EXTERN RUBY_EXTERN const char ruby_version[]; |