yugui	2009-01-17 21:19:36 +0900 (Sat, 17 Jan 2009)

  New Revision: 21631

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

  Log:
    merges r21602, r21603, r21607 and r21630 from trunk into ruby_1_9_1.
    * configure.in (Makefile): set VCS and VCSUP to support `git svn'                                      and git.
    * Makefile.in, win32/Makefile.sub (up): split from common.mk.

  Modified files:
    branches/ruby_1_9_1/ChangeLog
    branches/ruby_1_9_1/Makefile.in
    branches/ruby_1_9_1/common.mk
    branches/ruby_1_9_1/configure.in
    branches/ruby_1_9_1/win32/Makefile.sub

Index: ruby_1_9_1/configure.in
===================================================================
--- ruby_1_9_1/configure.in	(revision 21630)
+++ ruby_1_9_1/configure.in	(revision 21631)
@@ -2137,7 +2137,20 @@
 
 AC_CONFIG_FILES($FIRSTMAKEFILE)
 AC_CONFIG_FILES(Makefile, [{
-	sed '/^MISSING/s/\$U\././g' Makefile
+	if test -d "$srcdir/.svn"; then
+	    VCS='svn'
+	    VCSUP='$(VCS) up $(SVNUPOPTIONS)'
+	elif test -d "$srcdir/.git/svn"; then
+	    VCS='git svn'
+	    VCSUP='$(VCS) rebase $(GITSVNREBASEOPTIONS)'
+	elif test -d "$srcdir/.git"; then
+	    VCS='git'
+	    VCSUP='$(VCS) pull $(GITPULLOPTIONS)'
+	else
+	    VCS='echo cannot'
+	    VCSUP='$(VCS)'
+	fi
+	sed '/^MISSING/s/\$U\././g;/^VCS *=/s#@VCS@#'"$VCS"'#;/^VCSUP *=/s#@VCSUP@#'"$VCSUP"'#' Makefile
 	echo; test x"$EXEEXT" = x || echo 'miniruby: miniruby$(EXEEXT)'
 	test "$RUBY_INSTALL_NAME$EXEEXT" = ruby || echo 'ruby: $(PROGRAM);'
 	if test "$gnumake" != yes; then
Index: ruby_1_9_1/ChangeLog
===================================================================
--- ruby_1_9_1/ChangeLog	(revision 21630)
+++ ruby_1_9_1/ChangeLog	(revision 21631)
@@ -1,3 +1,23 @@
+Sat Jan 17 19:33:48 2009  Yuki Sonoda (Yugui)  <yugui@y...>
+
+	* configure.in (VCSUP): fixed the cases for git-svn or git.
+
+	* win32/Makefile.sub (VCSUP): ditto.
+
+	* Makefile.in (up): `cd' is necessary for git and git-svn.
+
+Fri Jan 16 18:51:11 2009  NAKAMURA Usaku  <usa@r...>
+
+	* win32/Makefile.sub (up): tell nmake that need to run command via
+	  shell.
+
+Fri Jan 16 17:33:59 2009  Nobuyoshi Nakada  <nobu@r...>
+
+	* configure.in (Makefile): set VCS and VCSUP to support `git svn'
+	  and git.
+
+	* Makefile.in, win32/Makefile.sub (up): split from common.mk.
+
 Mon Dec 29 22:37:57 2008  Yukihiro Matsumoto  <matz@r...>
 
 	* pack.c (pack_pack): template f should not accept non float
@@ -3,6 +23,4 @@
 	  values.  [ruby-dev:37656]
 
-	* object.c (rb_to_float): new function to type check floats.
-
 Fri Jan 16 18:43:30 2009  Nobuyoshi Nakada  <nobu@r...>
 
Index: ruby_1_9_1/common.mk
===================================================================
--- ruby_1_9_1/common.mk	(revision 21630)
+++ ruby_1_9_1/common.mk	(revision 21631)
@@ -122,8 +122,6 @@
 
 COMPILE_PRELUDE = $(MINIRUBY) -I$(srcdir) -rrbconfig $(srcdir)/tool/compile_prelude.rb
 
-VCS           = svn
-
 all: encs exts
 exts: $(MKFILES) incs $(PREP) $(RBCONFIG) $(LIBRUBY)
 	@$(MINIRUBY) $(srcdir)/ext/extmk.rb --make="$(MAKE)" $(EXTMK_ARGS)
@@ -717,8 +715,7 @@
 dist:
 	$(BASERUBY) $(srcdir)/tool/make-snapshot tmp $(RELNAME)
 
-up:
-	@$(VCS) up "$(srcdir)"
+up::
 	-@$(MAKE) $(MFLAGS) REVISION_FORCE=PHONY "$(srcdir)/revision.h"
 
 help: PHONY
Index: ruby_1_9_1/win32/Makefile.sub
===================================================================
--- ruby_1_9_1/win32/Makefile.sub	(revision 21630)
+++ ruby_1_9_1/win32/Makefile.sub	(revision 21631)
@@ -277,6 +277,17 @@
 hdrdir = $(srcdir)/include
 VPATH = $(arch_hdrdir)/ruby;$(hdrdir)/ruby;$(srcdir);$(srcdir)/enc;$(srcdir)/missing;$(win_srcdir)
 
+!if exist($(srcdir)/.svn)
+VCS = svn
+VCSUP = $(VCS) up $(SVNUPOPTIONS)
+!else if exist($(srcdir)/.git/svn)
+VCS = git svn
+VCSUP = $(VCS) rebase $(GITSVNREBASEOPTIONS)
+!else if exist($(srcdir)/.git)
+VCS = git
+VCSUP = $(VCS) pull $(GITPULLOPTIONS)
+!endif
+
 all: $(srcdir)/win32/Makefile.sub $(win_srcdir)/Makefile.sub $(srcdir)/common.mk
 
 ruby: $(PROGRAM)
@@ -285,6 +296,9 @@
 INSNS	= opt_sc.inc optinsn.inc optunifs.inc insns.inc insns_info.inc \
 	  vmtc.inc vm.inc
 
+up::
+	@(set LC_TIME=C & $(VCSUP) "$(srcdir)")
+
 !include $(srcdir)/common.mk
 
 $(MKFILES): $(srcdir)/win32/Makefile.sub $(win_srcdir)/Makefile.sub $(win_srcdir)/configure.bat $(win_srcdir)/setup.mak $(win_srcdir)/enc-setup.mak $(srcdir)/enc/Makefile.in
Index: ruby_1_9_1/Makefile.in
===================================================================
--- ruby_1_9_1/Makefile.in	(revision 21630)
+++ ruby_1_9_1/Makefile.in	(revision 21631)
@@ -104,6 +104,8 @@
 SET_LC_MESSAGES = env LC_MESSAGES=C
 OBJDUMP       = @OBJDUMP@
 OBJCOPY       = @OBJCOPY@
+VCS           = @VCS@
+VCSUP         = @VCSUP@
 
 OBJEXT        = @OBJEXT@
 ASMEXT        = S
@@ -242,6 +244,9 @@
 ext/extinit.$(OBJEXT): ext/extinit.c $(SETUP)
 	$(CC) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) $(COUTFLAG)$@ -c ext/extinit.c
 
+up::
+	@LC_TIME=C cd "$(srcdir)" && $(VCSUP)
+
 update-rubyspec: 
 	@if [ -d $(srcdir)/spec/mspec ]; then \
 	  cd $(srcdir)/spec/mspec; \

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