ruby-changes:6034
From: nobu <ko1@a...>
Date: Mon, 23 Jun 2008 11:18:08 +0900 (JST)
Subject: [ruby-changes:6034] Ruby:r17543 (ruby_1_8): * Makefile.in, common.mk, {win,bcc}32/Makefile.sub (revision.h): auto
nobu 2008-06-23 11:17:37 +0900 (Mon, 23 Jun 2008)
New Revision: 17543
Modified directories:
branches/ruby_1_8/
Modified files:
branches/ruby_1_8/ChangeLog
branches/ruby_1_8/Makefile.in
branches/ruby_1_8/bcc32/Makefile.sub
branches/ruby_1_8/bcc32/setup.mak
branches/ruby_1_8/common.mk
branches/ruby_1_8/win32/Makefile.sub
branches/ruby_1_8/win32/ifchange.bat
branches/ruby_1_8/win32/setup.mak
Log:
* Makefile.in, common.mk, {win,bcc}32/Makefile.sub (revision.h): auto
update. [ruby-core:17373]
Modified: branches/ruby_1_8/
http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8/win32/setup.mak?r1=17543&r2=17542&diff_format=u
http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8/common.mk?r1=17543&r2=17542&diff_format=u
http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8/Makefile.in?r1=17543&r2=17542&diff_format=u
http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8/ChangeLog?r1=17543&r2=17542&diff_format=u
http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8/bcc32/Makefile.sub?r1=17543&r2=17542&diff_format=u
http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8/win32/Makefile.sub?r1=17543&r2=17542&diff_format=u
http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8/bcc32/setup.mak?r1=17543&r2=17542&diff_format=u
http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8/win32/ifchange.bat?r1=17543&r2=17542&diff_format=u
http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8?r1=17543&r2=17542&diff_format=u
Index: ruby_1_8/Makefile.in
===================================================================
--- ruby_1_8/Makefile.in (revision 17542)
+++ ruby_1_8/Makefile.in (revision 17543)
@@ -201,3 +201,10 @@
@if [ ! -d $(srcdir)/rubyspec ]; then echo No rubyspec here. make update-rubyspec first.; exit 1; fi
$(RUNRUBY) $(srcdir)/rubyspec/mspec/bin/mspec -r$(srcdir)/ext/purelib.rb $(srcdir)/rubyspec/spec/rubyspec/$(MAJOR).$(MINOR)
+
+$(srcdir)/revision.h: revision.h.tmp
+ @if [ -f "$@" ] && { [ ! -s $? ] || cmp "$@" $? >/dev/null; }; then \
+ $(RM) $?; \
+ else \
+ mv -f $? "$@"; \
+ fi
Index: ruby_1_8/ChangeLog
===================================================================
--- ruby_1_8/ChangeLog (revision 17542)
+++ ruby_1_8/ChangeLog (revision 17543)
@@ -1,3 +1,8 @@
+Mon Jun 23 11:17:24 2008 Nobuyoshi Nakada <nobu@r...>
+
+ * Makefile.in, common.mk, {win,bcc}32/Makefile.sub (revision.h): auto
+ update. [ruby-core:17373]
+
Sun Jun 22 14:16:28 2008 Nobuyoshi Nakada <nobu@r...>
* ext/readline/extconf.rb (have_readline_func): readline on Mac OS X
Index: ruby_1_8/bcc32/Makefile.sub
===================================================================
--- ruby_1_8/bcc32/Makefile.sub (revision 17542)
+++ ruby_1_8/bcc32/Makefile.sub (revision 17543)
@@ -61,6 +61,7 @@
PURIFY =
AUTOCONF = autoconf
+IFCHANGE = $(srcdir:/=\)\win32\ifchange.bat
RM = $(srcdir:/=\)\win32\rm.bat
!if !defined(PROCESSOR_ARCHITECTURE)
@@ -201,6 +202,9 @@
!include $(srcdir)/common.mk
+revision.h: revision.h.tmp
+ @$(IFCHANGE) "$(srcdir)/$@" "revision.h.tmp"
+
$(MKFILES): $(srcdir)/bcc32/Makefile.sub $(srcdir)/bcc32/configure.bat $(srcdir)/bcc32/setup.mak
$(COMSPEC) /C $(srcdir:/=\)\bcc32\configure.bat $(configure_args)
@echo $(MKFILES) should be updated, re-run $(MAKE).
@@ -216,7 +220,7 @@
config.status: $(CONFIG_H)
$(CONFIG_H): $(MKFILES) $(srcdir)/bcc32/Makefile.sub
- @$(srcdir:/=\)\win32\ifchange.bat config.h &&|
+ @$(IFCHANGE) config.h &&|
\#define HAVE_SYS_TYPES_H 1
\#define HAVE_SYS_STAT_H 1
\#define HAVE_STDLIB_H 1
Index: ruby_1_8/bcc32/setup.mak
===================================================================
--- ruby_1_8/bcc32/setup.mak (revision 17542)
+++ ruby_1_8/bcc32/setup.mak (revision 17543)
@@ -84,6 +84,7 @@
-version-: nul
@cpp32 -I$(srcdir) -P- -o$(MAKEFILE) > nul &&|
+\#define RUBY_REVISION 0
\#include "version.h"
MAJOR = RUBY_VERSION_MAJOR
MINOR = RUBY_VERSION_MINOR
Index: ruby_1_8/common.mk
===================================================================
--- ruby_1_8/common.mk (revision 17542)
+++ ruby_1_8/common.mk (revision 17543)
@@ -78,6 +78,8 @@
TESTSDIR = $(srcdir)/test
TESTWORKDIR = testwork
+VCS = svn
+
all: $(MKFILES) $(PREP) $(RBCONFIG) $(LIBRUBY)
@$(MINIRUBY) $(srcdir)/ext/extmk.rb --make="$(MAKE)" $(EXTMK_ARGS)
prog: $(PROGRAM) $(WPROGRAM)
@@ -464,7 +466,12 @@
{$(VPATH)}env.h {$(VPATH)}node.h {$(VPATH)}st.h {$(VPATH)}util.h
version.$(OBJEXT): {$(VPATH)}version.c {$(VPATH)}ruby.h config.h \
{$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h \
- {$(VPATH)}version.h
+ {$(VPATH)}version.h {$(VPATH)}revision.h
dist: $(PROGRAM)
$(RUNRUBY) $(srcdir)/distruby.rb
+
+revision.h.tmp: $(REVISION_FORCE)
+ @set LC_MESSAGES=C
+ -@$(SET_LC_MESSAGES) $(VCS) info "$(srcdir)" | \
+ sed -n "s/.*Rev:/#define RUBY_REVISION/p" > "$@"
Index: ruby_1_8/win32/Makefile.sub
===================================================================
--- ruby_1_8/win32/Makefile.sub (revision 17542)
+++ ruby_1_8/win32/Makefile.sub (revision 17543)
@@ -57,6 +57,7 @@
AR = lib -nologo
PURIFY =
AUTOCONF = autoconf
+IFCHANGE = $(COMSPEC) /C $(srcdir:/=\)\win32\ifchange.bat
RM = $(COMSPEC) /C $(srcdir:/=\)\win32\rm.bat
!if !defined(PROCESSOR_ARCHITECTURE)
@@ -261,6 +262,9 @@
!include $(srcdir)/common.mk
+revision.h: revision.h.tmp
+ @$(IFCHANGE) "$(srcdir)/$@" "revision.h.tmp"
+
$(MKFILES): $(srcdir)/win32/Makefile.sub $(win_srcdir)/Makefile.sub $(win_srcdir)/configure.bat $(win_srcdir)/setup.mak
$(COMSPEC) /C $(win_srcdir:/=\)\configure.bat $(configure_args)
@echo $(MKFILES) should be updated, re-run $(MAKE).
@@ -280,7 +284,7 @@
$(CONFIG_H): $(MKFILES) $(srcdir)/win32/Makefile.sub $(win_srcdir)/Makefile.sub
@echo Creating config.h
- @$(COMSPEC) /C $(srcdir:/=\)\win32\ifchange.bat config.h <<
+ @$(IFCHANGE) config.h <<
#if _MSC_VER != $(MSC_VER)
#error MSC version unmatch: _MSC_VER: $(MSC_VER) is expected.
#endif
Index: ruby_1_8/win32/setup.mak
===================================================================
--- ruby_1_8/win32/setup.mak (revision 17542)
+++ ruby_1_8/win32/setup.mak (revision 17543)
@@ -117,6 +117,7 @@
-version-: nul
@$(APPEND)
@$(CPP) -I$(srcdir) <<"Creating $(MAKEFILE)" | find "=" >>$(MAKEFILE)
+#define RUBY_REVISION 0
#include "version.h"
MAJOR = RUBY_VERSION_MAJOR
MINOR = RUBY_VERSION_MINOR
Index: ruby_1_8/win32/ifchange.bat
===================================================================
--- ruby_1_8/win32/ifchange.bat (revision 17542)
+++ ruby_1_8/win32/ifchange.bat (revision 17543)
@@ -1,13 +1,23 @@
@echo off
:: usage: ifchange target temporary
+if "%1" == "" goto :end
+
+set dest=%1
+set src=%2
+set dest=%dest:/=\%
+set src=%src:/=\%
+if not "%dest%" == "" if not "%dest%" == "%%dest:/=\%%" goto :nt
+
+if not exist %2 goto :end
+
:: check if fc.exe works.
-echo foo > conftest1.tmp
-echo bar > conftest2.tmp
-fc.exe conftest1.tmp conftest2.tmp > nul
+echo foo > conftst1.tmp
+echo bar > conftst2.tmp
+fc.exe conftst1.tmp conftst2.tmp > nul
if not errorlevel 1 goto :brokenfc
-del conftest1.tmp > nul
-del conftest2.tmp > nul
+del conftst1.tmp > nul
+del conftst2.tmp > nul
:: target does not exist or new file differs from it.
if not exist %1 goto :update
@@ -27,6 +37,23 @@
:update
echo %1 updated.
-if exist %1 del %1
-copy %2 %1 > nul
+:: if exist %1 del %1
+dir /b %2
+copy %2 %1
+del %2
+goto :end
+
+:nt
+if not exist %src% goto :end
+if exist %dest% (
+ fc.exe %dest% %src% > nul && (
+ echo %dest% unchanged.
+ del %src%
+ goto :end
+ )
+)
+echo %dest% updated.
+copy %src% %dest% > nul
+del %src%
+
:end
Property changes on: ruby_1_8
___________________________________________________________________
Name: svn:ignore
- *.bak
*.orig
*.rej
*.sav
*~
.*.list
.*.time
.ccmalloc
.ppack
.ext
.git
.svn
.pc
COPYING.LIB
ChangeLog.pre-alpha
ChangeLog.pre1_1
GNUmakefile
Makefile
README.fat-patch
README.v6
README.atheos
archive
autom4te*.cache
automake
beos
config.cache
config.h
config.h.in
config.log
config.status
config.status.lineno
configure
libruby*.*
miniruby
newdate.rb
newver.rb
parse.c
patches
ppack
preview
rbconfig.rb
repack
riscos
rubicon
ruby
ruby-man.rd.gz
rubyspec
tmp
web
y.output
y.tab.c
+ *.bak
*.orig
*.rej
*.sav
*~
.*.list
.*.time
.ccmalloc
.ppack
.ext
.git
.svn
.pc
COPYING.LIB
ChangeLog.pre-alpha
ChangeLog.pre1_1
GNUmakefile
Makefile
README.fat-patch
README.v6
README.atheos
archive
autom4te*.cache
automake
beos
config.cache
config.h
config.h.in
config.log
config.status
config.status.lineno
configure
libruby*.*
miniruby
newdate.rb
newver.rb
parse.c
patches
ppack
preview
rbconfig.rb
repack
revision.h
riscos
rubicon
ruby
ruby-man.rd.gz
rubyspec
tmp
web
y.output
y.tab.c
--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/