ruby-changes:10087
From: yugui <ko1@a...>
Date: Sat, 17 Jan 2009 19:41:13 +0900 (JST)
Subject: [ruby-changes:10087] Ruby:r21630 (trunk): * configure.in (VCSUP): fixed the cases for git-svn or git.
yugui 2009-01-17 19:40:51 +0900 (Sat, 17 Jan 2009) New Revision: 21630 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=21630 Log: * 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. Modified files: trunk/ChangeLog trunk/Makefile.in trunk/configure.in trunk/win32/Makefile.sub Index: configure.in =================================================================== --- configure.in (revision 21629) +++ configure.in (revision 21630) @@ -2172,10 +2172,10 @@ VCSUP='$(VCS) up $(SVNUPOPTIONS)' elif test -d "$srcdir/.git/svn"; then VCS='git svn' - VCSUP='$(VCS) up $(SVNUPOPTIONS)' + VCSUP='$(VCS) rebase $(GITSVNREBASEOPTIONS)' elif test -d "$srcdir/.git"; then VCS='git' - VCSUP='$(VCS) up $(GITUPOPTIONS)' + VCSUP='$(VCS) pull $(GITPULLOPTIONS)' else VCS='echo cannot' VCSUP='$(VCS)' Index: ChangeLog =================================================================== --- ChangeLog (revision 21629) +++ ChangeLog (revision 21630) @@ -1,3 +1,11 @@ +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. + Sat Jan 17 19:16:16 2009 Tanaka Akira <akr@f...> * ext/socket/mkconstants.rb: generate a header file for generated Index: win32/Makefile.sub =================================================================== --- win32/Makefile.sub (revision 21629) +++ win32/Makefile.sub (revision 21630) @@ -282,10 +282,10 @@ VCSUP = $(VCS) up $(SVNUPOPTIONS) !else if exist($(srcdir)/.git/svn) VCS = git svn -VCSUP = $(VCS) up $(SVNUPOPTIONS) +VCSUP = $(VCS) rebase $(GITSVNREBASEOPTIONS) !else if exist($(srcdir)/.git) VCS = git -VCSUP = $(VCS) up $(GITUPOPTIONS) +VCSUP = $(VCS) pull $(GITPULLOPTIONS) !endif all: $(srcdir)/win32/Makefile.sub $(win_srcdir)/Makefile.sub $(srcdir)/common.mk Index: Makefile.in =================================================================== --- Makefile.in (revision 21629) +++ Makefile.in (revision 21630) @@ -249,7 +249,7 @@ $(CC) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) $(COUTFLAG)$@ -c ext/extinit.c up:: - @LC_TIME=C $(VCSUP) "$(srcdir)" + @LC_TIME=C cd "$(srcdir)" && $(VCSUP) update-rubyspec: @if [ -d $(srcdir)/spec/mspec ]; then \ -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/