1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00

* Makefile.in (update-mspec): split from update-rubyspec.

* win32/Makefile.sub (update-{rubyspec,mspec}): added.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@22798 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2009-03-06 09:46:52 +00:00
parent 2a413f97a4
commit 849c996270
3 changed files with 36 additions and 11 deletions

View file

@ -1,8 +1,12 @@
Fri Mar 6 18:37:30 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
Fri Mar 6 18:46:51 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
* configure.in, Makefile.in, win32/Makefile.sub (CHDIR): cd using
phisical directory.
* Makefile.in (update-mspec): split from update-rubyspec.
* win32/Makefile.sub (update-{rubyspec,mspec}): added.
Fri Mar 6 14:28:36 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
* Makefile.in, win32/Makefile.sub (INSNS): moved variable

View file

@ -250,23 +250,26 @@ ext/extinit.$(OBJEXT): ext/extinit.c $(SETUP)
up::
@$(CHDIR) "$(srcdir)" && LC_TIME=C exec $(VCSUP)
update-rubyspec:
@if [ -d $(srcdir)/spec/mspec ]; then \
$(CHDIR) $(srcdir)/spec/mspec; \
update-mspec:
@$(CHDIR) $(srcdir); \
if [ -d spec/mspec ]; then \
cd spec/mspec; \
echo updating mspec ...; \
git pull; \
cd ../..; \
exec git pull; \
else \
echo retrieving mspec ...; \
git clone $(MSPEC_GIT_URL) $(srcdir)/spec/mspec; \
exec git clone $(MSPEC_GIT_URL) spec/mspec; \
fi
@if [ -d $(srcdir)/spec/rubyspec ]; then \
$(CHDIR) $(srcdir)/spec/rubyspec; \
update-rubyspec: update-mspec
@$(CHDIR) $(srcdir); \
if [ -d spec/rubyspec ]; then \
cd spec/rubyspec; \
echo updating rubyspec ...; \
git pull; \
exec git pull; \
else \
echo retrieving rubyspec ...; \
git clone $(RUBYSPEC_GIT_URL) $(srcdir)/spec/rubyspec; \
exec git clone $(RUBYSPEC_GIT_URL) spec/rubyspec; \
fi
test-rubyspec:

View file

@ -306,6 +306,24 @@ up::
!include $(srcdir)/common.mk
update-mspec:
!if exist($(srcdir)/spec/mspec)
@echo updating mspec ...
@cd $(srcdir:/=\)\spec\mspec && git pull
!else
@echo retrieving mspec ...
@cd $(srcdir:/=\) && git clone $(MSPEC_GIT_URL) spec/mspec
!endif
update-rubyspec: update-mspec
!if exist($(srcdir)/spec/rubyspec)
@echo updating rubyspec ...
@cd $(srcdir:/=\)\spec\rubyspec && git pull
!else
@echo retrieving rubyspec ...
@cd $(srcdir:/=\) && git clone $(RUBYSPEC_GIT_URL) spec/rubyspec
!endif
$(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
$(COMSPEC) /C $(win_srcdir:/=\)\configure.bat $(configure_args)
@echo $(MKFILES) should be updated, re-run $(MAKE).