diff options
| author | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-11-24 07:38:39 +0000 |
|---|---|---|
| committer | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-11-24 07:38:39 +0000 |
| commit | 578a6fd6a6e771706a384509d24120c33c7153d0 (patch) | |
| tree | 6d4f58e58434f91640e221d9af94bcfe8b22bfa2 | |
| parent | 23a810e37959b299b7f51b66730529d622b0b27b (diff) | |
* win32/Makefile.sub ($(RCFILES)): no revision.h in this
branch, a patch from Luis Lavena <luislavena at gmail.com>.
[ruby-core:33310]
* cygwin/GNUmakefile.in ($(RCFILES)): ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@29907 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | cygwin/GNUmakefile.in | 2 | ||||
| -rw-r--r-- | version.h | 2 | ||||
| -rw-r--r-- | win32/Makefile.sub | 2 |
4 files changed, 11 insertions, 3 deletions
@@ -1,3 +1,11 @@ +Wed Nov 24 16:18:02 2010 URABE Shyouhei <shyouhei@ruby-lang.org> + + * win32/Makefile.sub ($(RCFILES)): no revision.h in this + branch, a patch from Luis Lavena <luislavena at gmail.com>. + [ruby-core:33310] + + * cygwin/GNUmakefile.in ($(RCFILES)): ditto. + Wed Nov 24 15:44:11 2010 NAKAMURA Usaku <usa@ruby-lang.org> * ext/socket/extconf.rb (getaddrinfo): should initialize winsock on diff --git a/cygwin/GNUmakefile.in b/cygwin/GNUmakefile.in index fb322c492a..734d8702a6 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) $(srcdir)/revision.h $(srcdir)/win32/resource.rb +$(RCFILES): $(RBCONFIG) $(srcdir)/version.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-24" #define RUBY_VERSION_CODE 187 #define RUBY_RELEASE_CODE 20101124 -#define RUBY_PATCHLEVEL 323 +#define RUBY_PATCHLEVEL 324 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 8 diff --git a/win32/Makefile.sub b/win32/Makefile.sub index cfbecc9489..792481ac33 100644 --- a/win32/Makefile.sub +++ b/win32/Makefile.sub @@ -615,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 -$(RCFILES): $(RBCONFIG) $(srcdir)/revision.h $(srcdir)/win32/resource.rb +$(RCFILES): $(RBCONFIG) $(srcdir)/version.h $(srcdir)/win32/resource.rb @$(MINIRUBY) $(srcdir)/win32/resource.rb \ -ruby_name=$(RUBY_INSTALL_NAME) \ -rubyw_name=$(RUBYW_INSTALL_NAME) \ |