diff options
| author | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-12-21 07:17:03 +0000 |
|---|---|---|
| committer | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-12-21 07:17:03 +0000 |
| commit | 0ef92798abfb49a433db0e73ac2b9a7b9a62c82c (patch) | |
| tree | 6d1c445f6fd90cba05a6d2083bb4e334009d5e32 | |
| parent | 96aca8fc70270a1d491b638eadace2ebc5456455 (diff) | |
merge revision(s) 25181:25183:
* win32/Makefile.sub (LD_SHARED1): typo.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@26141 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | version.h | 8 | ||||
| -rw-r--r-- | win32/Makefile.sub | 4 |
3 files changed, 10 insertions, 6 deletions
@@ -1,3 +1,7 @@ +Mon Dec 21 16:09:09 2009 NAKAMURA Usaku <usa@ruby-lang.org> + + * win32/Makefile.sub (LD_SHARED1): typo. + Wed Dec 16 20:17:40 2009 NAKAMURA Usaku <usa@ruby-lang.org> * win32/win32.c (CreateChild): allocate temporary buffer and use it @@ -1,15 +1,15 @@ #define RUBY_VERSION "1.8.7" -#define RUBY_RELEASE_DATE "2009-12-16" +#define RUBY_RELEASE_DATE "2009-12-21" #define RUBY_VERSION_CODE 187 -#define RUBY_RELEASE_CODE 20091216 -#define RUBY_PATCHLEVEL 242 +#define RUBY_RELEASE_CODE 20091221 +#define RUBY_PATCHLEVEL 243 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 8 #define RUBY_VERSION_TEENY 7 #define RUBY_RELEASE_YEAR 2009 #define RUBY_RELEASE_MONTH 12 -#define RUBY_RELEASE_DAY 16 +#define RUBY_RELEASE_DAY 21 #ifdef RUBY_EXTERN RUBY_EXTERN const char ruby_version[]; diff --git a/win32/Makefile.sub b/win32/Makefile.sub index c2e09abd42..40ae378912 100644 --- a/win32/Makefile.sub +++ b/win32/Makefile.sub @@ -174,8 +174,8 @@ XCFLAGS = -DRUBY_EXPORT -I. -I$(srcdir) -I$(srcdir)/missing $(XCFLAGS) # Prevents VC++ 2005 (cl ver 14) warnings CRTDEFFLAGS = -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE MANIFESTTOOL = mt -nologo -LDSHARED_1 = $(MANIFESTTOOL) -manifest $(@).manifest -outputresource:$(@);2 -LDSHARED_2 = @$(RM) $(@:/=\).manifest +LDSHARED_1 = @if exist $(@).manifest $(MANIFESTTOOL) -manifest $(@).manifest -outputresource:$(@);2 +LDSHARED_2 = @if exist $(@).manifest $(RM) $(@:/=\).manifest !endif CPPFLAGS = $(CRTDEFFLAGS) $(DEFS) $(ARCHDEFS) $(CPPFLAGS) |