diff options
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | Makefile.in | 6 | ||||
-rw-r--r-- | common.mk | 5 | ||||
-rw-r--r-- | configure.in | 15 | ||||
-rw-r--r-- | win32/Makefile.sub | 14 |
5 files changed, 40 insertions, 6 deletions
@@ -1,3 +1,9 @@ +Fri Jan 16 17:33:59 2009 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * configure.in (Makefile): set VCS and VCSUP. + + * Makefile.in, win32/Makefile.sub (up): split from common.mk. + Fri Jan 16 12:24:39 2009 Koichi Sasada <ko1@atdot.net> * thread.c (thread_start_func_2): call ruby_cleanup() if thread is diff --git a/Makefile.in b/Makefile.in index e86090ff56..73a3512972 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 @@ -166,7 +168,6 @@ fake.rb: Makefile Makefile: $(srcdir)/Makefile.in $(srcdir)/enc/Makefile.in Doxyfile: $(srcdir)/Doxyfile.in config.status MAKE=$(MAKE) $(SHELL) ./config.status - $(MKFILES): config.status MAKE=$(MAKE) $(SHELL) ./config.status @@ -247,6 +248,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 $(VCSUP) "$(srcdir)" + 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) @@ -727,8 +725,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 60662e2c5c..a2ea066d25 100644 --- a/configure.in +++ b/configure.in @@ -2159,7 +2159,20 @@ AC_SUBST(PACKAGE) AC_CONFIG_FILES(Doxyfile) 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) up $(SVNUPOPTIONS)' + elif test -d "$srcdir/.git"; then + VCS='git' + VCSUP='$(VCS) up $(GITUPOPTIONS)' + 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 f5acdeb92e..3caf064c83 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) up $(SVNUPOPTIONS) +!else if exist($(srcdir)/.git) +VCS = git +VCSUP = $(VCS) up $(GITUPOPTIONS) +!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 |