diff options
| author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-01-22 02:24:11 +0000 |
|---|---|---|
| committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-01-22 02:24:11 +0000 |
| commit | 94eed2b622b36881fdae73142b41bc23738e90b2 (patch) | |
| tree | e53292ab13386b02ebda5b2a06a13f03d6fa5b01 | |
| parent | 3f63918c5cc18f55519ff35d1708add2339e9fa3 (diff) | |
* win32/setup.mak ($(ARCH)): if a macro is appended by $(APPEND),
a space will be inserted on the top of the line.
* win32/Makefile.sub (MKFILES): stop make process if Makefile is
updated.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@15166 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | version.h | 6 | ||||
| -rw-r--r-- | win32/Makefile.sub | 3 | ||||
| -rw-r--r-- | win32/setup.mak | 18 |
4 files changed, 22 insertions, 13 deletions
@@ -1,3 +1,11 @@ +Tue Jan 22 11:22:47 2008 NAKAMURA Usaku <usa@ruby-lang.org> + + * win32/setup.mak ($(ARCH)): if a macro is appended by $(APPEND), + a space will be inserted on the top of the line. + + * win32/Makefile.sub (MKFILES): stop make process if Makefile is + updated. + Mon Jan 21 17:34:41 2008 Akinori MUSHA <knu@iDaemons.org> * io.c (rb_io_mode_flags, rb_io_mode_modenum): Ignore encoding @@ -1,7 +1,7 @@ #define RUBY_VERSION "1.8.6" -#define RUBY_RELEASE_DATE "2008-01-21" +#define RUBY_RELEASE_DATE "2008-01-22" #define RUBY_VERSION_CODE 186 -#define RUBY_RELEASE_CODE 20080121 +#define RUBY_RELEASE_CODE 20080122 #define RUBY_PATCHLEVEL 5000 #define RUBY_VERSION_MAJOR 1 @@ -9,7 +9,7 @@ #define RUBY_VERSION_TEENY 6 #define RUBY_RELEASE_YEAR 2008 #define RUBY_RELEASE_MONTH 1 -#define RUBY_RELEASE_DAY 21 +#define RUBY_RELEASE_DAY 22 #ifdef RUBY_EXTERN RUBY_EXTERN const char ruby_version[]; diff --git a/win32/Makefile.sub b/win32/Makefile.sub index 5387d032fc..8ce9cf736e 100644 --- a/win32/Makefile.sub +++ b/win32/Makefile.sub @@ -272,6 +272,7 @@ rubyw: $(WPROGRAM) $(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). + @exit 1 CONFIG_H = ./.config.h.time @@ -292,7 +293,7 @@ $(CONFIG_H): $(MKFILES) $(srcdir)/win32/Makefile.sub $(win_srcdir)/Makefile.sub #error MSC version unmatch: _MSC_VER: $(MSC_VER) is expected. #endif !if defined(USE_WINSOCK2) -#define USE_WINSOCK2 1 +#define USE_WINSOCK2 $(USE_WINSOCK2) !endif #define STDC_HEADERS 1 #define HAVE_SYS_TYPES_H 1 diff --git a/win32/setup.mak b/win32/setup.mak index 86f6f6ae55..e87d1dbf39 100644 --- a/win32/setup.mak +++ b/win32/setup.mak @@ -14,7 +14,7 @@ prefix = /usr !endif OS = mswin32 BANG = ! -APPEND = echo>>$(MAKEFILE) +APPEND = echo.>>$(MAKEFILE) !ifdef MAKEFILE MAKE = $(MAKE) -f $(MAKEFILE) !else @@ -41,8 +41,8 @@ MAKE = nmake srcdir = $(srcdir:\=/) prefix = $(prefix:\=/) EXTSTATIC = $(EXTSTATIC) -!if defined(USE_WINSOCK2) -USE_WINSOCK2 = $(USE_WINSOCK2) +!if "$(USE_WINSOCK2)" != "0" +USE_WINSOCK2 = 1 !endif !if defined(RDOCTARGET) RDOCTARGET = $(RDOCTARGET) @@ -151,18 +151,18 @@ $(CPU) = $(PROCESSOR_LEVEL) !endif -alpha-: nul - @$(APPEND) $(ARCH) = alpha + @echo $(ARCH) = alpha>>$(MAKEFILE) -ix86-: nul - @$(APPEND) $(ARCH) = x86 + @echo $(ARCH) = x86>>$(MAKEFILE) -i386-: -ix86- - @$(APPEND) $(CPU) = 3 + @echo $(CPU) = 3>>$(MAKEFILE) -i486-: -ix86- - @$(APPEND) $(CPU) = 4 + @echo $(CPU) = 4>>$(MAKEFILE) -i586-: -ix86- - @$(APPEND) $(CPU) = 5 + @echo $(CPU) = 5>>$(MAKEFILE) -i686-: -ix86- - @$(APPEND) $(CPU) = 6 + @echo $(CPU) = 6>>$(MAKEFILE) -epilogue-: nul @type << >>$(MAKEFILE) |