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

* configure.in (Makefile): set VCS and VCSUP.

Browse source 
* Makefile.in, win32/Makefile.sub (up): split from common.mk.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@21602 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2009-01-16 08:33:02 +00:00
parent 0be9fb8caa
commit 72aa4a8c46
5 changed files with 40 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -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

6
Makefile.in
View file

@ -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; \

5
common.mk
View file

@ -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

15
configure.in
View file

@ -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

14
win32/Makefile.sub
View file

@ -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