ruby-changes:15225
From: nobu <ko1@a...>
Date: Tue, 30 Mar 2010 15:42:01 +0900 (JST)
Subject: [ruby-changes:15225] Ruby:r27107 (ruby_1_8): * common.mk (revision.h): add RUBY_BRANCH_NAME.
nobu 2010-03-30 15:41:45 +0900 (Tue, 30 Mar 2010) New Revision: 27107 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=27107 Log: * common.mk (revision.h): add RUBY_BRANCH_NAME. Modified files: branches/ruby_1_8/ChangeLog branches/ruby_1_8/common.mk Index: ruby_1_8/ChangeLog =================================================================== --- ruby_1_8/ChangeLog (revision 27106) +++ ruby_1_8/ChangeLog (revision 27107) @@ -1,5 +1,7 @@ -Tue Mar 30 12:36:11 2010 Nobuyoshi Nakada <nobu@r...> +Tue Mar 30 15:41:39 2010 Nobuyoshi Nakada <nobu@r...> + * common.mk (revision.h): add RUBY_BRANCH_NAME. + * configure.in (MINIOBJS): use dmydln.o on all platforms. * common.mk (COMMONOBJS): moved dln.o to OBJS not to conflict with Index: ruby_1_8/common.mk =================================================================== --- ruby_1_8/common.mk (revision 27106) +++ ruby_1_8/common.mk (revision 27107) @@ -14,6 +14,7 @@ EXTCONF = extconf.rb RBCONFIG = ./.rbconfig.time LIBRUBY_EXTS = ./.libruby-with-ext.time +REVISION_H = ./.revision.time RDOCOUT = $(EXTOUT)/rdoc DMYEXT = dmyext.$(OBJEXT) @@ -464,28 +465,41 @@ version.$(OBJEXT): {$(VPATH)}version.c $(RUBY_H_INCLUDES) \ {$(VPATH)}version.h {$(VPATH)}revision.h +srcs: {$(VPATH)}parse.c {$(VPATH)}lex.c + +incs: $(srcdir)/revision.h $(REVISION_H) + prelude.c: $(srcdir)/compile_prelude.rb $(RBCONFIG) $(PRELUDE_SCRIPTS) $(PREP) $(COMPILE_PRELUDE) $(PRELUDE_SCRIPTS) $@ miniprelude.$(OBJEXT): {$(VPATH)}miniprelude.c $(RUBY_H_INCLUDES) prelude.$(OBJEXT): {$(VPATH)}prelude.c $(RUBY_H_INCLUDES) +prereq: incs srcs preludes + +preludes: {$(VPATH)}miniprelude.c + dist: $(PROGRAM) $(RUNRUBY) $(srcdir)/distruby.rb -{$(VPATH)}revision.h: $(srcdir)/version.h $(srcdir)/ChangeLog $(REVISION_FORCE) - @$(MAKE) revision.h.tmp +$(srcdir)/revision.h: + @exit > $@ + +$(REVISION_H): $(srcdir)/version.h $(srcdir)/ChangeLog revision.h.tmp $(REVISION_FORCE) @if [ -f $(srcdir)/revision.h ] && \ { [ ! -s revision.h.tmp ] || cmp $(srcdir)/revision.h revision.h.tmp >/dev/null; }; then \ $(RM) revision.h.tmp; \ else \ mv -f revision.h.tmp $(srcdir)/revision.h; \ fi + @exit > $@ revision.h.tmp: $(REVISION_FORCE) @set LC_MESSAGES=C - -@$(SET_LC_MESSAGES) $(VCS) info "$(srcdir)" | \ - sed -n "s/.*Rev:/#define RUBY_REVISION/p" > "$@" + -@{ cd "$(srcdir)" && $(SET_LC_MESSAGES) $(VCS) info | \ + sed -n \ + -e '/^URL:/{' -e '/\/trunk$$/d' -e 's!.*/\([^/][^/]*\)$$!#define RUBY_BRANCH_NAME "\1"!p' -e '}' \ + -e "s/.*Rev:/#define RUBY_REVISION/p"; } > "$@" -IF-NO-STRING-LITERAL-CONCATENATION-:: @{ \ echo '#include "$@"'; \ -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/