diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-12-22 18:26:50 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-12-22 18:26:50 +0000 |
| commit | 872899fa5833fbe193e533c496672ef836095bc7 (patch) | |
| tree | 201dd6de82dd173c3ae9bfb00b6716c3c044738d | |
| parent | c892851a25b58b10f71edf8abdfda4be6ef37012 (diff) | |
| download | ruby-872899fa5833fbe193e533c496672ef836095bc7.tar.gz | |
* version.h: use patchlevel if revision is not set.
* {bcc32,win{32,ce}}/setup.mak (-version-): skip including revision.h.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@14502 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | bcc32/setup.mak | 1 | ||||
| -rw-r--r-- | version.h | 2 | ||||
| -rw-r--r-- | win32/setup.mak | 1 | ||||
| -rw-r--r-- | wince/setup.mak | 1 |
5 files changed, 9 insertions, 2 deletions
@@ -1,4 +1,8 @@ -Sun Dec 23 03:22:42 2007 Nobuyoshi Nakada <nobu@ruby-lang.org> +Sun Dec 23 03:26:48 2007 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * 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. diff --git a/bcc32/setup.mak b/bcc32/setup.mak index 28eb39e4ab..0e0bb45d09 100644 --- a/bcc32/setup.mak +++ b/bcc32/setup.mak @@ -84,6 +84,7 @@ $(BANG)endif -version-: nul @cpp32 -I$(srcdir) -P- -o$(MAKEFILE) > nul &&| +\#define RUBY_REVISION 0 \#include "version.h" MAJOR = RUBY_VERSION_MAJOR MINOR = RUBY_VERSION_MINOR @@ -32,7 +32,7 @@ RUBY_EXTERN const char ruby_copyright[]; #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 diff --git a/win32/setup.mak b/win32/setup.mak index abf3aaeb8e..205f1f956a 100644 --- a/win32/setup.mak +++ b/win32/setup.mak @@ -140,6 +140,7 @@ int main(int argc, char **argv) -version-: nul @$(CPP) -I$(srcdir) <<"Creating $(MAKEFILE)" >>$(MAKEFILE) +#define RUBY_REVISION 0 #include "version.h" MAJOR = RUBY_VERSION_MAJOR MINOR = RUBY_VERSION_MINOR diff --git a/wince/setup.mak b/wince/setup.mak index ca4a42b145..96151c7da7 100644 --- a/wince/setup.mak +++ b/wince/setup.mak @@ -63,6 +63,7 @@ BASERUBY = $(BASERUBY) !endif << @$(CPP) -I$(srcdir) <<"Creating $(MAKEFILE)" >> $(MAKEFILE) +#define RUBY_REVISION 0 #include "version.h" MAJOR = RUBY_VERSION_MAJOR MINOR = RUBY_VERSION_MINOR |