[前][次][番号順一覧][スレッド一覧]

ruby-changes:15862

From: nobu <ko1@a...>
Date: Sat, 15 May 2010 11:59:56 +0900 (JST)
Subject: [ruby-changes:15862] Ruby:r27798 (ruby_1_8): * Makefile.in, common.mk, win32/Makefile.sub (revision.h): fix for

nobu	2010-05-15 11:59:41 +0900 (Sat, 15 May 2010)

  New Revision: 27798

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=27798

  Log:
    * Makefile.in, common.mk, win32/Makefile.sub (revision.h): fix for
      nmake.  [ruby-core:30249]

  Modified files:
    branches/ruby_1_8/ChangeLog
    branches/ruby_1_8/Makefile.in
    branches/ruby_1_8/bcc32/Makefile.sub
    branches/ruby_1_8/common.mk
    branches/ruby_1_8/version.h
    branches/ruby_1_8/win32/Makefile.sub

Index: ruby_1_8/Makefile.in
===================================================================
--- ruby_1_8/Makefile.in	(revision 27797)
+++ ruby_1_8/Makefile.in	(revision 27798)
@@ -173,6 +173,15 @@
 .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)
 
Index: ruby_1_8/ChangeLog
===================================================================
--- ruby_1_8/ChangeLog	(revision 27797)
+++ ruby_1_8/ChangeLog	(revision 27798)
@@ -1,3 +1,8 @@
+Sat May 15 11:59:40 2010  Nobuyoshi Nakada  <nobu@r...>
+
+	* Makefile.in, common.mk, win32/Makefile.sub (revision.h): fix for
+	  nmake.  [ruby-core:30249]
+
 Tue May 11 22:51:11 2010  Tanaka Akira  <akr@f...>
 
 	* pack.c (pack_pack): call rb_quad_pack to preserve RangeError.
Index: ruby_1_8/version.h
===================================================================
--- ruby_1_8/version.h	(revision 27797)
+++ ruby_1_8/version.h	(revision 27798)
@@ -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
Index: ruby_1_8/bcc32/Makefile.sub
===================================================================
--- ruby_1_8/bcc32/Makefile.sub	(revision 27797)
+++ ruby_1_8/bcc32/Makefile.sub	(revision 27798)
@@ -181,6 +181,8 @@
 
 INSTALLED_LIST= .installed.list
 
+MKMAIN_CMD    = mkmain.bat
+
 WINMAINOBJ    = winmain.$(OBJEXT)
 MINIOBJS      = dmydln.$(OBJEXT)
 
@@ -207,8 +209,9 @@
 
 !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)
Index: ruby_1_8/common.mk
===================================================================
--- ruby_1_8/common.mk	(revision 27797)
+++ ruby_1_8/common.mk	(revision 27798)
@@ -486,20 +486,14 @@
 	@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 "$@"'; \
Index: ruby_1_8/win32/Makefile.sub
===================================================================
--- ruby_1_8/win32/Makefile.sub	(revision 27797)
+++ ruby_1_8/win32/Makefile.sub	(revision 27798)
@@ -270,8 +270,9 @@
 
 !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 @@
 		    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) \

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/

[前][次][番号順一覧][スレッド一覧]