ruby-changes:11190
From: nobu <ko1@a...>
Date: Fri, 6 Mar 2009 18:37:45 +0900 (JST)
Subject: [ruby-changes:11190] Ruby:r22797 (trunk): * configure.in, Makefile.in, win32/Makefile.sub (CHDIR): cd using
nobu 2009-03-06 18:37:31 +0900 (Fri, 06 Mar 2009) New Revision: 22797 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=22797 Log: * configure.in, Makefile.in, win32/Makefile.sub (CHDIR): cd using phisical directory. Modified files: trunk/ChangeLog trunk/Makefile.in trunk/common.mk trunk/configure.in trunk/win32/Makefile.sub Index: configure.in =================================================================== --- configure.in (revision 22796) +++ configure.in (revision 22797) @@ -296,6 +296,23 @@ AC_SUBST(RMDIRS, ['$(top_srcdir)/tool/rmdirs']) AC_SUBST(RMALL, ['rm -fr']) +AC_MSG_CHECKING([for cd using phisical directory]) +rm -fr conf$$.dir +mkdir conf$$.dir && +(cd conf$$.dir && mkdir src build && cd src && +$as_ln_s ../build . > /dev/null 2>&1 && cd build && +for chdir in 'cd -P' 'PWD= cd'; do + ($chdir ../src 2> /dev/null && echo "$chdir" > cdcmd) && break +done) +if test -e conf$$.dir/src/cdcmd; then + read CHDIR < conf$$.dir/src/cdcmd 2> /dev/null +else + CHDIR=cd +fi +rm -fr conf$$.dir +AC_MSG_RESULT([$CHDIR]) +AC_SUBST(CHDIR) + dnl } dnl compiler section { Index: ChangeLog =================================================================== --- ChangeLog (revision 22796) +++ ChangeLog (revision 22797) @@ -1,12 +1,8 @@ -Fri Mar 6 16:17:45 2009 Nobuyoshi Nakada <nobu@r...> +Fri Mar 6 18:37:30 2009 Nobuyoshi Nakada <nobu@r...> - * win32/Makefile.sub (.c.asm): removed $(COUTFLAG). + * configure.in, Makefile.in, win32/Makefile.sub (CHDIR): cd using + phisical directory. -Fri Mar 6 14:59:30 2009 Yukihiro Matsumoto <matz@r...> - - * error.c (report_bug): message updated to better English. - [ruby-core:22665] - Fri Mar 6 14:28:36 2009 Nobuyoshi Nakada <nobu@r...> * Makefile.in, win32/Makefile.sub (INSNS): moved variable @@ -104,22 +100,6 @@ * win32/setup.mak (-unicows-): checks if unicows.lib is available. -Wed Mar 4 05:19:27 2009 James Edward Gray II <jeg2@r...> - - * lib/csv.rb: Some minor documentation fixes from Gregory Brown. - -Wed Mar 4 03:42:56 2009 James Edward Gray II <jeg2@r...> - - * lib/csv.rb: A patch from Madoka Yakamamoto to prevent an infinite - loop while reading some encodings. - -Wed Mar 4 00:54:43 2009 Yuki Sonoda (Yugui) <yugui@y...> - - * lib/prime.rb (Prime::prime?): used to return a wrong answer. - [ruby-core:22646]. - - * test/test_prime.rb (test_prime?): test case for [ruby-core:22646]. - Tue Mar 3 17:10:09 2009 Nobuyoshi Nakada <nobu@r...> * ext/extmk.rb (extmake): removes object files no longer used and @@ -3296,7 +3276,7 @@ Tue Jan 13 18:19:49 2009 NAKAMURA Usaku <usa@r...> * io.c (rb_io_initialize): workaround for Windows. [ruby-dev:37686] - (also see [ruby-dev:37721]) + (also see [ruby-dev:37721]) Tue Jan 13 17:29:02 2009 Nobuyoshi Nakada <nobu@r...> Index: common.mk =================================================================== --- common.mk (revision 22796) +++ common.mk (revision 22797) @@ -129,7 +129,7 @@ exts: $(MKMAIN_CMD) -$(MKMAIN_CMD): $(MKFILES) incs $(PREP) $(RBCONFIG) $(LIBRUBY) +$(MKMAIN_CMD): $(MKFILES) incs $(PREP) $(RBCONFIG) $(LIBRUBY) @$(MINIRUBY) $(srcdir)/ext/extmk.rb --make="$(MAKE)" --command-output=$@ $(EXTMK_ARGS) prog: $(PROGRAM) $(WPROGRAM) @@ -464,7 +464,7 @@ ia64.$(OBJEXT): {$(VPATH)}ia64.s $(CC) $(CFLAGS) -c $< -# when I use -I., there is confliction at "OpenFile" +# when I use -I., there is confliction at "OpenFile" # so, set . into environment varible "include" win32.$(OBJEXT): {$(VPATH)}win32.c $(RUBY_H_INCLUDES) @@ -690,7 +690,7 @@ @$(IFCHANGE) "$@" "$@.tmp" $(srcdir)/ext/ripper/ripper.c: - cd $(srcdir)/ext/ripper && $(exec) $(MAKE) -f depend $(MFLAGS) top_srcdir=../.. srcdir=. + $(CHDIR) $(srcdir)/ext/ripper && $(exec) $(MAKE) -f depend $(MFLAGS) top_srcdir=../.. srcdir=. ## Index: win32/Makefile.sub =================================================================== --- win32/Makefile.sub (revision 22796) +++ win32/Makefile.sub (revision 22797) @@ -4,6 +4,7 @@ RUNCMD = $(COMSPEC) /c MKFILES = Makefile NULL = nul +CHDIR = cd !ifndef MFLAGS MFLAGS=-l @@ -301,7 +302,7 @@ rubyw: $(WPROGRAM) up:: - @(set LC_TIME=C & $(VCSUP) "$(srcdir)") + @cd "$(srcdir:/=\)" && set LC_TIME=C && $(VCSUP) !include $(srcdir)/common.mk Index: Makefile.in =================================================================== --- Makefile.in (revision 22796) +++ Makefile.in (revision 22797) @@ -1,6 +1,7 @@ SHELL = /bin/sh NULLCMD = : RUNCMD = $(SHELL) +CHDIR = @CHDIR@ exec = exec #### Start of system configuration section. #### @@ -174,10 +175,10 @@ sed 's/{\$$([^(){}]*)[^{}]*}//g' $< > $@ config.status: $(srcdir)/configure $(srcdir)/enc/Makefile.in - MINIRUBY="$(MINIRUBY)" $(SHELL) ./config.status --recheck + PWD= MINIRUBY="$(MINIRUBY)" $(SHELL) ./config.status --recheck $(srcdir)/configure: $(srcdir)/configure.in - unset PWD; cd $(srcdir) && exec $(AUTOCONF) + $(CHDIR) $(srcdir) && exec $(AUTOCONF) incs: id.h id.h: parse.h $(srcdir)/tool/generic_erb.rb $(srcdir)/template/id.h.tmpl @@ -247,11 +248,11 @@ $(CC) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) $(COUTFLAG)$@ -c ext/extinit.c up:: - @cd "$(srcdir)" && LC_TIME=C exec $(VCSUP) + @$(CHDIR) "$(srcdir)" && LC_TIME=C exec $(VCSUP) update-rubyspec: @if [ -d $(srcdir)/spec/mspec ]; then \ - cd $(srcdir)/spec/mspec; \ + $(CHDIR) $(srcdir)/spec/mspec; \ echo updating mspec ...; \ git pull; \ cd ../..; \ @@ -260,7 +261,7 @@ git clone $(MSPEC_GIT_URL) $(srcdir)/spec/mspec; \ fi @if [ -d $(srcdir)/spec/rubyspec ]; then \ - cd $(srcdir)/spec/rubyspec; \ + $(CHDIR) $(srcdir)/spec/rubyspec; \ echo updating rubyspec ...; \ git pull; \ else \ -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/