nobu	2007-12-23 03:26:50 +0900 (Sun, 23 Dec 2007)

  New Revision: 14502

  Modified files:
    trunk/ChangeLog
    trunk/bcc32/setup.mak
    trunk/version.h
    trunk/win32/setup.mak
    trunk/wince/setup.mak

  Log:
    * version.h: use patchlevel if revision is not set.
    
    * {bcc32,win{32,ce}}/setup.mak (-version-): skip including revision.h.


  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/bcc32/setup.mak?r1=14502&r2=14501
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/win32/setup.mak?r1=14502&r2=14501
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/version.h?r1=14502&r2=14501
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/ChangeLog?r1=14502&r2=14501
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/wince/setup.mak?r1=14502&r2=14501

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 14501)
+++ ChangeLog	(revision 14502)
@@ -1,5 +1,9 @@
-Sun Dec 23 03:22:42 2007  Nobuyoshi Nakada  <nobu@r...>
+Sun Dec 23 03:26:48 2007  Nobuyoshi Nakada  <nobu@r...>
 
+	* version.h: use patchlevel if revision is not set.
+
+	* {bcc32,win{32,ce}}/setup.mak (-version-): skip including revision.h.
+
 	* common.mk (srcs): new target to generated sources.
 
 	* common.mk (encs, ext/ripper/ripper.c): MAKEFLAGS needs -.
Index: win32/setup.mak
===================================================================
--- win32/setup.mak	(revision 14501)
+++ win32/setup.mak	(revision 14502)
@@ -140,6 +140,7 @@
 
 -version-: nul
 	@$(CPP) -I$(srcdir) <<"Creating $(MAKEFILE)" >>$(MAKEFILE)
+#define RUBY_REVISION 0
 #include "version.h"
 MAJOR = RUBY_VERSION_MAJOR
 MINOR = RUBY_VERSION_MINOR
Index: version.h
===================================================================
--- version.h	(revision 14501)
+++ version.h	(revision 14502)
@@ -32,7 +32,7 @@
 #define RUBY_REVISION 0
 #endif
 
-#if RUBY_VERSION_TEENY > 0 && RUBY_PATCHLEVEL < 5000 && !RUBY_REVISION
+#if !RUBY_REVISION
 #define RUBY_RELEASE_STR "patchlevel"
 #define RUBY_RELEASE_NUM RUBY_PATCHLEVEL
 #else
Index: bcc32/setup.mak
===================================================================
--- bcc32/setup.mak	(revision 14501)
+++ bcc32/setup.mak	(revision 14502)
@@ -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: wince/setup.mak
===================================================================
--- wince/setup.mak	(revision 14501)
+++ wince/setup.mak	(revision 14502)
@@ -63,6 +63,7 @@
 !endif
 <<
 	@$(CPP) -I$(srcdir) <<"Creating $(MAKEFILE)" >> $(MAKEFILE)
+#define RUBY_REVISION 0
 #include "version.h"
 MAJOR = RUBY_VERSION_MAJOR
 MINOR = RUBY_VERSION_MINOR

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml