diff options
| author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-01-17 12:19:36 +0000 |
|---|---|---|
| committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-01-17 12:19:36 +0000 |
| commit | 0962222856126aa7b1f5763ed48751cd700e9359 (patch) | |
| tree | 8948621a9bcff4342c35441d57a6e592e0c9c247 /win32 | |
| parent | f1211dd405e78dfd3afba008598e91284cacbf69 (diff) | |
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.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@21631 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'win32')
| -rw-r--r-- | win32/Makefile.sub | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/win32/Makefile.sub b/win32/Makefile.sub index d7691cd8b9..a71eeb90e1 100644 --- a/win32/Makefile.sub +++ b/win32/Makefile.sub @@ -277,6 +277,17 @@ arch_hdrdir = $(EXTOUT)/include/$(arch) 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 @@ rubyw: $(WPROGRAM) 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 |