From c18e8ad7e9f152880de35f4e1904e46693dcba57 Mon Sep 17 00:00:00 2001 From: nobu Date: Tue, 10 Jul 2007 05:50:10 +0000 Subject: * bcc32/{Makefile.sub,setup.mak}: remove surplus slash from srcdir. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@12727 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 4 ++++ bcc32/Makefile.sub | 24 ++++++++++++------------ bcc32/setup.mak | 12 ++++++------ version.h | 6 +++--- 4 files changed, 25 insertions(+), 21 deletions(-) diff --git a/ChangeLog b/ChangeLog index d5bc821b01..09fc856808 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Tue Jul 10 14:50:01 2007 Nobuyoshi Nakada + + * bcc32/{Makefile.sub,setup.mak}: remove surplus slash from srcdir. + Mon Jul 9 02:17:36 2007 NAKAMURA Usaku * cont.c (cont_restore_1): workaround for x64-mswin64's SEH. diff --git a/bcc32/Makefile.sub b/bcc32/Makefile.sub index 0545816b89..eb543491b9 100644 --- a/bcc32/Makefile.sub +++ b/bcc32/Makefile.sub @@ -142,7 +142,7 @@ MISSING = acosh.obj crypt.obj erf.obj strlcat.obj strlcpy.obj win32.obj STACK = 0x2000000 !endif -XCFLAGS = -DRUBY_EXPORT -I. -I$(srcdir) -I$(srcdir)missing +XCFLAGS = -DRUBY_EXPORT -I. -I$(srcdir) -I$(srcdir)/missing ARFLAGS = /a LD = ilink32 -q -Gn @@ -161,7 +161,7 @@ PROGRAM=$(RUBY_INSTALL_NAME)$(EXEEXT) WPROGRAM=$(RUBYW_INSTALL_NAME)$(EXEEXT) RUBYDEF = $(RUBY_SO_NAME).def MINIRUBY = .\miniruby$(EXEEXT) $(MINIRUBYOPT) -RUNRUBY = .\ruby$(EXEEXT) "$(srcdir)runruby.rb" --extout="$(EXTOUT)" -- +RUNRUBY = .\ruby$(EXEEXT) "$(srcdir)/runruby.rb" --extout="$(EXTOUT)" -- ORGLIBPATH = $(LIB) @@ -183,8 +183,8 @@ INSTALLED_LIST= .installed.list WINMAINOBJ = winmain.$(OBJEXT) MINIOBJS = dmydln.$(OBJEXT) -.path.c = .;$(srcdir);$(srcdir)win32;$(srcdir)missing -.path.h = .;$(srcdir);$(srcdir)win32;$(srcdir)missing +.path.c = .;$(srcdir);$(srcdir)/win32;$(srcdir)/missing +.path.h = .;$(srcdir);$(srcdir)/win32;$(srcdir)/missing .path.y = $(srcdir) .path. = $(srcdir) @@ -195,14 +195,14 @@ MINIOBJS = dmydln.$(OBJEXT) $(CC) $(CFLAGS) $(XCFLAGS) -I. $(CPPFLAGS) -S $(<:\=/) .rc.res: - $(RC) $(RFLAGS) -I. -I$( $(@F) @del y.tab.c -all: $(srcdir)bcc32/Makefile.sub $(srcdir)common.mk +all: $(srcdir)/bcc32/Makefile.sub $(srcdir)/common.mk ruby: $(PROGRAM) rubyw: $(WPROGRAM) @@ -217,8 +217,8 @@ config: config.status config.status: $(CONFIG_H) -$(CONFIG_H): $(MKFILES) $(srcdir)bcc32/Makefile.sub - @$(srcdir:/=\)win32\ifchange.bat config.h &&| +$(CONFIG_H): $(MKFILES) $(srcdir)/bcc32/Makefile.sub + @$(srcdir:/=\)\win32\ifchange.bat config.h &&| \#define HAVE_SYS_TYPES_H 1 \#define HAVE_SYS_STAT_H 1 \#define HAVE_STDLIB_H 1 @@ -303,7 +303,7 @@ $(CONFIG_H): $(MKFILES) $(srcdir)bcc32/Makefile.sub | @exit > $@ -config.status: $(MKFILES) $(srcdir)bcc32/Makefile.sub $(srcdir)common.mk +config.status: $(MKFILES) $(srcdir)/bcc32/Makefile.sub $(srcdir)/common.mk @echo Creating $@ @type > $@ &&| # Generated automatically by Makefile.sub. @@ -445,14 +445,14 @@ $(LIBRUBY_SO): $(LIBRUBY_A) $(DLDOBJS) $(RUBYDEF) $(RUBY_SO_NAME).res $(LIBRUBY): $(LIBRUBY_SO) $(RUBYDEF): $(LIBRUBY_A) $(PREP) - $(MINIRUBY) $(srcdir)bcc32/mkexports.rb -output=$@ -base=$(RUBY_SO_NAME) $(LIBRUBY_A) + $(MINIRUBY) $(srcdir)/bcc32/mkexports.rb -output=$@ -base=$(RUBY_SO_NAME) $(LIBRUBY_A) $(RUBY_INSTALL_NAME).rc $(RUBYW_INSTALL_NAME).rc $(RUBY_SO_NAME).rc: rbconfig.rb - @$(MINIRUBY) $(srcdir)win32/resource.rb \ + @$(MINIRUBY) $(srcdir)/win32/resource.rb \ -ruby_name=$(RUBY_INSTALL_NAME) \ -rubyw_name=$(RUBYW_INSTALL_NAME) \ -so_name=$(RUBY_SO_NAME) \ - . $(icondirs) $(srcdir)win32 + . $(icondirs) $(srcdir)/win32 post-install-bin:: @$(NULLCMD) diff --git a/bcc32/setup.mak b/bcc32/setup.mak index d52fc4b95a..7c68ddbb9d 100644 --- a/bcc32/setup.mak +++ b/bcc32/setup.mak @@ -1,13 +1,13 @@ # -*- makefile -*- !if "$(srcdir)" != "" -bcc32dir = $(srcdir)bcc32/ +bcc32dir = $(srcdir)/bcc32 !elseif "$(bcc32dir)" == "bcc32/" -srcdir = ./ +srcdir = . !elseif "$(bcc32dir:/bcc32/=)/bcc32/" == "$(bcc32dir)" -srcdir = $(bcc32dir:/bcc32/=/) +srcdir = $(bcc32dir:/bcc32/=) !else -srcdir = $(bcc32dir)../ +srcdir = $(bcc32dir)/.. !endif !if "$(prefix)" == "" prefix = /usr @@ -127,12 +127,12 @@ $(BANG)endif \# RUBY_INSTALL_NAME = ruby \# RUBY_SO_NAME = $$(RT)-$$(RUBY_INSTALL_NAME)$$(MAJOR)$$(MINOR) \# CFLAGS = -q $$(DEBUGFLAGS) $$(OPTFLAGS) $$(PROCESSOR_FLAG) -w- -wsus -wcpt -wdup -wext -wrng -wrpt -wzdi -\# CPPFLAGS = -I. -I$$(srcdir) -I$$(srcdir)missing -DLIBRUBY_SO=\"$$(LIBRUBY_SO)\" +\# CPPFLAGS = -I. -I$$(srcdir) -I$$(srcdir)/missing -DLIBRUBY_SO=\"$$(LIBRUBY_SO)\" \# STACK = 0x2000000 \# LDFLAGS = -S:$$(STACK) \# RFLAGS = $$(iconinc) \# EXTLIBS = cw32.lib import32.lib user32.lib kernel32.lib -$(BANG)include $$(srcdir)bcc32/Makefile.sub +$(BANG)include $$(srcdir)/bcc32/Makefile.sub | @$(srcdir:/=\)\win32\rm.bat config.h config.status @echo type "`$(MAKE)'" to make ruby for $(OS). diff --git a/version.h b/version.h index fbe2592b88..16ef5483ca 100644 --- a/version.h +++ b/version.h @@ -1,7 +1,7 @@ #define RUBY_VERSION "1.9.0" -#define RUBY_RELEASE_DATE "2007-07-09" +#define RUBY_RELEASE_DATE "2007-07-10" #define RUBY_VERSION_CODE 190 -#define RUBY_RELEASE_CODE 20070709 +#define RUBY_RELEASE_CODE 20070710 #define RUBY_PATCHLEVEL 0 #define RUBY_VERSION_MAJOR 1 @@ -9,7 +9,7 @@ #define RUBY_VERSION_TEENY 0 #define RUBY_RELEASE_YEAR 2007 #define RUBY_RELEASE_MONTH 7 -#define RUBY_RELEASE_DAY 9 +#define RUBY_RELEASE_DAY 10 #ifdef RUBY_EXTERN RUBY_EXTERN const char ruby_version[]; -- cgit v1.2.3