summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-03-16 00:29:00 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-03-16 00:29:00 +0000
commit40819d4599203e324cab5c6beea33cfb09a6ddfc (patch)
tree5abad500d44f1e88bfe237937f136d50b70e7a35
parent7b713539ee10e68d899646adec8339d49ac3c5c3 (diff)
* Makefile.in, common.mk, win32/Makefile.sub: added preprocessing rules.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@22973 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog9
-rw-r--r--Makefile.in3
-rw-r--r--common.mk2
-rw-r--r--version.h4
-rw-r--r--win32/Makefile.sub9
5 files changed, 24 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index bf2b4c363d6..7555e8551be 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+Mon Mar 16 09:28:58 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * Makefile.in, common.mk, win32/Makefile.sub: added preprocessing rules.
+
+Sun Mar 15 12:34:17 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * test/minitest/test_mini_test.rb: fixed tests depending on the
+ detail of floating point representation.
+
Sun Mar 15 12:01:36 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
* lib/rubygems/installer.rb (Gem::Installer#shebang): fix for env
diff --git a/Makefile.in b/Makefile.in
index 6f617c34d22..766b1124d6a 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -215,6 +215,9 @@ lex.c: defs/keywords
.c.S:
$(CC) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) $(COUTFLAG)$@ -S $<
+.c.i:
+ $(CC) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) $(COUTFLAG)$@ -E $< > $@
+
clean-local::
@$(RM) ext/extinit.c ext/extinit.$(OBJEXT) ext/ripper/y.output
diff --git a/common.mk b/common.mk
index 62c755dd03a..bb80ca1e586 100644
--- a/common.mk
+++ b/common.mk
@@ -2,7 +2,7 @@ bin: $(PROGRAM) $(WPROGRAM)
lib: $(LIBRUBY)
dll: $(LIBRUBY_SO)
-.SUFFIXES: .inc .h .c .y
+.SUFFIXES: .inc .h .c .y .i
RUBYLIB = -
RUBYOPT = -
diff --git a/version.h b/version.h
index fb153c45e58..6c4fd2ba821 100644
--- a/version.h
+++ b/version.h
@@ -1,5 +1,5 @@
#define RUBY_VERSION "1.9.2"
-#define RUBY_RELEASE_DATE "2009-03-15"
+#define RUBY_RELEASE_DATE "2009-03-16"
#define RUBY_PATCHLEVEL -1
#define RUBY_BRANCH_NAME "trunk"
@@ -8,7 +8,7 @@
#define RUBY_VERSION_TEENY 1
#define RUBY_RELEASE_YEAR 2009
#define RUBY_RELEASE_MONTH 3
-#define RUBY_RELEASE_DAY 15
+#define RUBY_RELEASE_DAY 16
#ifdef RUBY_EXTERN
RUBY_EXTERN const char ruby_version[];
diff --git a/win32/Makefile.sub b/win32/Makefile.sub
index aa3bcaf55ba..fd7cd1747e3 100644
--- a/win32/Makefile.sub
+++ b/win32/Makefile.sub
@@ -830,6 +830,15 @@ end
.c.asm:
$(CC) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) -Fa$@ -c -Tc$(<:\=/)
+{$(srcdir)/missing}.c.i:
+ $(CC) $(XCFLAGS) $(CPPFLAGS) -P -Tc$(<:\=/) > $@
+{$(srcdir)/win32}.c.i:
+ $(CC) $(XCFLAGS) $(CPPFLAGS) -P -Tc$(<:\=/)
+{$(srcdir)}.c.i:
+ $(CC) $(XCFLAGS) $(CPPFLAGS) -P -Tc$(<:\=/)
+.c.i:
+ $(CC) $(XCFLAGS) $(CPPFLAGS) -P -Tc$(<:\=/)
+
.rc.res:
$(RC) -I. -I$(<D) $(iconinc) -I$(srcdir)/win32 $(RFLAGS) -fo$@ $(<:\=/)