diff options
| author | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-11-22 07:22:16 +0000 |
|---|---|---|
| committer | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-11-22 07:22:16 +0000 |
| commit | c233358e654fd345820efcdfc4b01d1e34d7e993 (patch) | |
| tree | 64a990ae589a8720cd40530dfb62e07780751071 | |
| parent | 658da719bf86713cd350adcba78f93190719baa0 (diff) | |
Thu, 7 Oct 2010 09:10:47 +0000 nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
merge revision(s) 29420:29424:
* cygwin/GNUmakefile.in, win32/Makefile.sub (RCFILES): depend on
real config.rb file. [ruby-core:32709]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@29421 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Signed-off-by: URABE, Shyouhei <shyouhei@ruby-lang.org>
* common.mk (RBCONFIG): depends on version.h due to
RUBY_PATCHLEVEL. [ruby-core:32709]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@29424 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Signed-off-by: URABE, Shyouhei <shyouhei@ruby-lang.org>
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@29864 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 10 | ||||
| -rw-r--r-- | common.mk | 2 | ||||
| -rw-r--r-- | cygwin/GNUmakefile.in | 2 | ||||
| -rw-r--r-- | version.h | 2 | ||||
| -rw-r--r-- | win32/Makefile.sub | 3 |
5 files changed, 15 insertions, 4 deletions
@@ -1,3 +1,13 @@ +Fri Oct 8 10:51:56 2010 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * common.mk (RBCONFIG): depends on version.h due to + RUBY_PATCHLEVEL. [ruby-core:32709] + +Thu Oct 7 18:10:35 2010 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * cygwin/GNUmakefile.in, win32/Makefile.sub (RCFILES): depend on + real config.rb file. [ruby-core:32709] + Sun Oct 3 18:30:23 2010 Nobuyoshi Nakada <nobu@ruby-lang.org> * parse.y (rb_intern): should check symbol table overflow. @@ -312,7 +312,7 @@ extconf: $(MINIRUBY) -run -e mkdir -- -p "$(EXTCONFDIR)" $(RUNRUBY) -C "$(EXTCONFDIR)" $(EXTCONF) $(EXTCONFARGS) -$(RBCONFIG): $(srcdir)/mkconfig.rb config.status $(PREP) +$(RBCONFIG): $(srcdir)/mkconfig.rb config.status $(srcdir)/version.h $(PREP) @$(MINIRUBY) $(srcdir)/mkconfig.rb -timestamp=$@ \ -install_name=$(RUBY_INSTALL_NAME) \ -so_name=$(RUBY_SO_NAME) rbconfig.rb diff --git a/cygwin/GNUmakefile.in b/cygwin/GNUmakefile.in index 03208df11c..fb322c492a 100644 --- a/cygwin/GNUmakefile.in +++ b/cygwin/GNUmakefile.in @@ -38,7 +38,7 @@ $(RUBY_EXP) $(LIBRUBY_SO): $(DLL_BASE_NAME).res.@OBJEXT@ %.res.@OBJEXT@: %.rc @WINDRES@ --include-dir . --include-dir $(<D) --include-dir $(srcdir)/win32 $< $@ -$(RCFILES): $(RBCONFIG) +$(RCFILES): $(RBCONFIG) $(srcdir)/revision.h $(srcdir)/win32/resource.rb @$(MINIRUBY) $(srcdir)/win32/resource.rb \ -ruby_name=$(RUBY_INSTALL_NAME) -rubyw_name=$(RUBYW_INSTALL_NAME) \ -so_name=$(DLL_BASE_NAME) \ @@ -2,7 +2,7 @@ #define RUBY_RELEASE_DATE "2010-11-22" #define RUBY_VERSION_CODE 187 #define RUBY_RELEASE_CODE 20101122 -#define RUBY_PATCHLEVEL 313 +#define RUBY_PATCHLEVEL 314 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 8 diff --git a/win32/Makefile.sub b/win32/Makefile.sub index 2a644d1f4a..cfbecc9489 100644 --- a/win32/Makefile.sub +++ b/win32/Makefile.sub @@ -181,6 +181,7 @@ CPPFLAGS = $(CRTDEFFLAGS) $(DEFS) $(ARCHDEFS) $(CPPFLAGS) DLDFLAGS = $(LDFLAGS) -dll SOLIBS = +RCFILES = $(RUBY_INSTALL_NAME).rc $(RUBYW_INSTALL_NAME).rc $(RUBY_SO_NAME).rc LIBRUBY_LDSHARED = $(LDSHARED) LIBRUBY_DLDFLAGS = $(EXTLDFLAGS) -def:$(RUBYDEF) @@ -614,7 +615,7 @@ distclean-local:: @$(RM) ext\config.cache $(RBCONFIG:/=\) $(CONFIG_H:/=\) @$(RM) $(RUBY_INSTALL_NAME).rc $(RUBYW_INSTALL_NAME).rc $(RUBY_SO_NAME).rc -$(RUBY_INSTALL_NAME).rc $(RUBYW_INSTALL_NAME).rc $(RUBY_SO_NAME).rc: $(RBCONFIG) +$(RCFILES): $(RBCONFIG) $(srcdir)/revision.h $(srcdir)/win32/resource.rb @$(MINIRUBY) $(srcdir)/win32/resource.rb \ -ruby_name=$(RUBY_INSTALL_NAME) \ -rubyw_name=$(RUBYW_INSTALL_NAME) \ |