1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* configure.in (VCSUP): fixed the cases for git-svn or git.

Browse Source 
* win32/Makefile.sub (VCSUP): ditto.

* Makefile.in (up): `cd' is necessary for git and git-svn.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@21630 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
yugui 2009-01-17 10:40:51 +00:00
parent cfa14a5554
commit fe011304e7
4 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -1,3 +1,11 @@
Sat Jan 17 19:33:48 2009 Yuki Sonoda (Yugui) <yugui@yugui.jp>
* 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@fsij.org> Sat Jan 17 19:16:16 2009 Tanaka Akira <akr@fsij.org>
* ext/socket/mkconstants.rb: generate a header file for generated * ext/socket/mkconstants.rb: generate a header file for generated

2
Makefile.in
View File

@ -249,7 +249,7 @@ ext/extinit.$(OBJEXT): ext/extinit.c $(SETUP)
$(CC) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) $(COUTFLAG)$@ -c ext/extinit.c $(CC) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) $(COUTFLAG)$@ -c ext/extinit.c
up:: up::
@LC_TIME=C $(VCSUP) "$(srcdir)" @LC_TIME=C cd "$(srcdir)" && $(VCSUP)
update-rubyspec: update-rubyspec:
@if [ -d $(srcdir)/spec/mspec ]; then \ @if [ -d $(srcdir)/spec/mspec ]; then \

4
configure.in
View File

@ -2172,10 +2172,10 @@ AC_CONFIG_FILES(Makefile, [{
VCSUP='$(VCS) up $(SVNUPOPTIONS)' VCSUP='$(VCS) up $(SVNUPOPTIONS)'
elif test -d "$srcdir/.git/svn"; then elif test -d "$srcdir/.git/svn"; then
VCS='git svn' VCS='git svn'
VCSUP='$(VCS) up $(SVNUPOPTIONS)' VCSUP='$(VCS) rebase $(GITSVNREBASEOPTIONS)'
elif test -d "$srcdir/.git"; then elif test -d "$srcdir/.git"; then
VCS='git' VCS='git'
VCSUP='$(VCS) up $(GITUPOPTIONS)' VCSUP='$(VCS) pull $(GITPULLOPTIONS)'
else else
VCS='echo cannot' VCS='echo cannot'
VCSUP='$(VCS)' VCSUP='$(VCS)'

4
win32/Makefile.sub
View File

@ -282,10 +282,10 @@ VCS = svn
VCSUP = $(VCS) up $(SVNUPOPTIONS) VCSUP = $(VCS) up $(SVNUPOPTIONS)
!else if exist($(srcdir)/.git/svn) !else if exist($(srcdir)/.git/svn)
VCS = git svn VCS = git svn
VCSUP = $(VCS) up $(SVNUPOPTIONS) VCSUP = $(VCS) rebase $(GITSVNREBASEOPTIONS)
!else if exist($(srcdir)/.git) !else if exist($(srcdir)/.git)
VCS = git VCS = git
VCSUP = $(VCS) up $(GITUPOPTIONS) VCSUP = $(VCS) pull $(GITPULLOPTIONS)
!endif !endif
all: $(srcdir)/win32/Makefile.sub $(win_srcdir)/Makefile.sub $(srcdir)/common.mk all: $(srcdir)/win32/Makefile.sub $(win_srcdir)/Makefile.sub $(srcdir)/common.mk