diff options
| -rw-r--r-- | ChangeLog | 22 | ||||
| -rw-r--r-- | Makefile.in | 5 | ||||
| -rw-r--r-- | common.mk | 5 | ||||
| -rw-r--r-- | configure.in | 15 | ||||
| -rw-r--r-- | win32/Makefile.sub | 14 |
5 files changed, 54 insertions, 7 deletions
@@ -1,10 +1,28 @@ +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. + +Fri Jan 16 18:51:11 2009 NAKAMURA Usaku <usa@ruby-lang.org> + + * win32/Makefile.sub (up): tell nmake that need to run command via + shell. + +Fri Jan 16 17:33:59 2009 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * 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@ruby-lang.org> * pack.c (pack_pack): template f should not accept non float 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@ruby-lang.org> * tool/make-snapshot (package): includes all rules and expand diff --git a/Makefile.in b/Makefile.in index 6c0b9dce07..776c08d53f 100644 --- a/Makefile.in +++ b/Makefile.in @@ -104,6 +104,8 @@ IFCHANGE = $(srcdir)/tool/ifchange SET_LC_MESSAGES = env LC_MESSAGES=C OBJDUMP = @OBJDUMP@ OBJCOPY = @OBJCOPY@ +VCS = @VCS@ +VCSUP = @VCSUP@ OBJEXT = @OBJEXT@ ASMEXT = S @@ -242,6 +244,9 @@ distclean-ext realclean-ext:: 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; \ @@ -122,8 +122,6 @@ BOOTSTRAPRUBY = $(BASERUBY) 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 @@ gdb-ruby: $(PROGRAM) run.gdb PHONY dist: $(BASERUBY) $(srcdir)/tool/make-snapshot tmp $(RELNAME) -up: - @$(VCS) up "$(srcdir)" +up:: -@$(MAKE) $(MFLAGS) REVISION_FORCE=PHONY "$(srcdir)/revision.h" help: PHONY diff --git a/configure.in b/configure.in index 5601e9a408..de740bab99 100644 --- a/configure.in +++ b/configure.in @@ -2137,7 +2137,20 @@ AC_SUBST(BUILTIN_TRANSOBJS) 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 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 |