diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-05-15 02:59:41 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-05-15 02:59:41 +0000 |
| commit | 49110e29d3a8299ada03d45b01c9f5f7df56099a (patch) | |
| tree | e5b8caf5e9ed631fd183c75d93c605ed734bbd4b | |
| parent | 1fb6c3a7b0da4c5f5102ee0f8e0d5e6f8b271b57 (diff) | |
* Makefile.in, common.mk, win32/Makefile.sub (revision.h): fix for
nmake. [ruby-core:30249]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@27798 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | Makefile.in | 9 | ||||
| -rw-r--r-- | bcc32/Makefile.sub | 7 | ||||
| -rw-r--r-- | common.mk | 16 | ||||
| -rw-r--r-- | version.h | 6 | ||||
| -rw-r--r-- | win32/Makefile.sub | 7 |
6 files changed, 31 insertions, 19 deletions
@@ -1,3 +1,8 @@ +Sat May 15 11:59:40 2010 Nobuyoshi Nakada <[email protected]> + + * Makefile.in, common.mk, win32/Makefile.sub (revision.h): fix for + nmake. [ruby-core:30249] + Tue May 11 22:51:11 2010 Tanaka Akira <[email protected]> * pack.c (pack_pack): call rb_quad_pack to preserve RangeError. diff --git a/Makefile.in b/Makefile.in index 58c92de532..de1b931317 100644 --- a/Makefile.in +++ b/Makefile.in @@ -173,6 +173,15 @@ lex.c: keywords .s.@OBJEXT@: $(AS) $(ASFLAGS) -o $@ $< +$(REVISION_H): + @if [ -f $(srcdir)/revision.h ] && \ + { [ ! -s revision.h.tmp ] || cmp $(srcdir)/revision.h revision.h.tmp >/dev/null; }; then \ + $(RM) revision.h.tmp; \ + else \ + mv -f revision.h.tmp $(srcdir)/revision.h; \ + fi + @exit > $@ + clean-local:: @$(RM) ext/extinit.c ext/extinit.$(OBJEXT) diff --git a/bcc32/Makefile.sub b/bcc32/Makefile.sub index 153c2835f0..7df9f67248 100644 --- a/bcc32/Makefile.sub +++ b/bcc32/Makefile.sub @@ -181,6 +181,8 @@ OBJEXT = obj INSTALLED_LIST= .installed.list +MKMAIN_CMD = mkmain.bat + WINMAINOBJ = winmain.$(OBJEXT) MINIOBJS = dmydln.$(OBJEXT) @@ -207,8 +209,9 @@ rubyw: $(WPROGRAM) !include $(srcdir)/common.mk -revision.h: revision.h.tmp - @$(IFCHANGE) "$(srcdir)/$@" "revision.h.tmp" +$(REVISION_H): + @$(IFCHANGE) "$(srcdir)/revision.h" "revision.h.tmp" + @exit > $@ $(MKFILES): $(srcdir)/bcc32/Makefile.sub $(srcdir)/bcc32/configure.bat $(srcdir)/bcc32/setup.mak $(COMSPEC) /C $(srcdir:/=\)\bcc32\configure.bat $(configure_args) @@ -486,20 +486,14 @@ $(srcdir)/revision.h: @exit > $@ $(REVISION_H): $(srcdir)/version.h $(srcdir)/ChangeLog revision.h.tmp $(REVISION_FORCE) - @if [ -f $(srcdir)/revision.h ] && \ - { [ ! -s revision.h.tmp ] || cmp $(srcdir)/revision.h revision.h.tmp >/dev/null; }; then \ - $(RM) revision.h.tmp; \ - else \ - mv -f revision.h.tmp $(srcdir)/revision.h; \ - fi - @exit > $@ revision.h.tmp: $(REVISION_FORCE) - @set LC_MESSAGES=C - -@{ $(CHDIR) "$(srcdir)" && $(SET_LC_MESSAGES) $(VCS) info | \ + @exit > "$@" + @set LC_ALL=C + -@($(CHDIR) "$(srcdir)" && $(SET_LC_MESSAGES) $(VCS) info | \ sed -n \ - -e '/^URL:/{' -e '/\/trunk$$/d' -e 's!.*/\([^/][^/]*\)$$!#define RUBY_BRANCH_NAME "\1"!p' -e '}' \ - -e "s/.*Rev:/#define RUBY_REVISION/p"; } > "$@" + -e '/^URL:/{' -e '/\/trunk$$/d' -e "s!.*/\([^/][^/]*\)$$"'!#define RUBY_BRANCH_NAME "\1"!p' -e '}' \ + -e "s/.*Rev:/#define RUBY_REVISION/p") > "$@" -IF-NO-STRING-LITERAL-CONCATENATION-:: @{ \ echo '#include "$@"'; \ @@ -1,7 +1,7 @@ #define RUBY_VERSION "1.8.8" -#define RUBY_RELEASE_DATE "2010-05-11" +#define RUBY_RELEASE_DATE "2010-05-15" #define RUBY_VERSION_CODE 188 -#define RUBY_RELEASE_CODE 20100511 +#define RUBY_RELEASE_CODE 20100515 #define RUBY_PATCHLEVEL -1 #define RUBY_VERSION_MAJOR 1 @@ -9,7 +9,7 @@ #define RUBY_VERSION_TEENY 8 #define RUBY_RELEASE_YEAR 2010 #define RUBY_RELEASE_MONTH 5 -#define RUBY_RELEASE_DAY 11 +#define RUBY_RELEASE_DAY 15 #define NO_STRING_LITERAL_CONCATENATION 1 #ifdef RUBY_EXTERN diff --git a/win32/Makefile.sub b/win32/Makefile.sub index 7f0b3f08b6..30af59bbaf 100644 --- a/win32/Makefile.sub +++ b/win32/Makefile.sub @@ -270,8 +270,9 @@ rubyw: $(WPROGRAM) !include $(srcdir)/common.mk -revision.h: revision.h.tmp - @$(IFCHANGE) "$(srcdir)/$@" "revision.h.tmp" +$(REVISION_H): + @$(IFCHANGE) "$(srcdir)/revision.h" "revision.h.tmp" + @exit > $@ $(MKFILES): $(srcdir)/win32/Makefile.sub $(win_srcdir)/Makefile.sub $(win_srcdir)/configure.bat $(win_srcdir)/setup.mak $(COMSPEC) /C $(win_srcdir:/=\)\configure.bat $(configure_args) @@ -641,7 +642,7 @@ clean-ext distclean-ext realclean-ext:: cd %CD% \ ) -$(RUBY_INSTALL_NAME).rc $(RUBYW_INSTALL_NAME).rc $(RUBY_SO_NAME).rc: $(RBCONFIG) +$(RUBY_INSTALL_NAME).rc $(RUBYW_INSTALL_NAME).rc $(RUBY_SO_NAME).rc: $(RBCONFIG) $(srcdir)/revision.h $(srcdir)/win32/resource.rb @$(MINIRUBY) $(srcdir)/win32/resource.rb \ -ruby_name=$(RUBY_INSTALL_NAME) \ -rubyw_name=$(RUBYW_INSTALL_NAME) \ |