1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* bcc32/{Makefile.sub,setup.mak}: remove surplus slash from srcdir.

Browse Source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@12727 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2007-07-10 05:50:10 +00:00
parent a87664923f
commit c18e8ad7e9
4 changed files with 25 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,3 +1,7 @@
Tue Jul 10 14:50:01 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
* bcc32/{Makefile.sub,setup.mak}: remove surplus slash from srcdir.
Mon Jul 9 02:17:36 2007 NAKAMURA Usaku <usa@ruby-lang.org> Mon Jul 9 02:17:36 2007 NAKAMURA Usaku <usa@ruby-lang.org>
* cont.c (cont_restore_1): workaround for x64-mswin64's SEH. * cont.c (cont_restore_1): workaround for x64-mswin64's SEH.

24
bcc32/Makefile.sub
View File

@ -142,7 +142,7 @@ MISSING = acosh.obj crypt.obj erf.obj strlcat.obj strlcpy.obj win32.obj
STACK = 0x2000000 STACK = 0x2000000
!endif !endif
XCFLAGS = -DRUBY_EXPORT -I. -I$(srcdir) -I$(srcdir)missing XCFLAGS = -DRUBY_EXPORT -I. -I$(srcdir) -I$(srcdir)/missing
ARFLAGS = /a ARFLAGS = /a
LD = ilink32 -q -Gn LD = ilink32 -q -Gn
@ -161,7 +161,7 @@ PROGRAM=$(RUBY_INSTALL_NAME)$(EXEEXT)
WPROGRAM=$(RUBYW_INSTALL_NAME)$(EXEEXT) WPROGRAM=$(RUBYW_INSTALL_NAME)$(EXEEXT)
RUBYDEF = $(RUBY_SO_NAME).def RUBYDEF = $(RUBY_SO_NAME).def
MINIRUBY = .\miniruby$(EXEEXT) $(MINIRUBYOPT) MINIRUBY = .\miniruby$(EXEEXT) $(MINIRUBYOPT)
RUNRUBY = .\ruby$(EXEEXT) "$(srcdir)runruby.rb" --extout="$(EXTOUT)" -- RUNRUBY = .\ruby$(EXEEXT) "$(srcdir)/runruby.rb" --extout="$(EXTOUT)" --
ORGLIBPATH = $(LIB) ORGLIBPATH = $(LIB)
@ -183,8 +183,8 @@ INSTALLED_LIST= .installed.list
WINMAINOBJ = winmain.$(OBJEXT) WINMAINOBJ = winmain.$(OBJEXT)
MINIOBJS = dmydln.$(OBJEXT) MINIOBJS = dmydln.$(OBJEXT)
.path.c = .;$(srcdir);$(srcdir)win32;$(srcdir)missing .path.c = .;$(srcdir);$(srcdir)/win32;$(srcdir)/missing
.path.h = .;$(srcdir);$(srcdir)win32;$(srcdir)missing .path.h = .;$(srcdir);$(srcdir)/win32;$(srcdir)/missing
.path.y = $(srcdir) .path.y = $(srcdir)
.path. = $(srcdir) .path. = $(srcdir)
@ -195,14 +195,14 @@ MINIOBJS = dmydln.$(OBJEXT)
$(CC) $(CFLAGS) $(XCFLAGS) -I. $(CPPFLAGS) -S $(<:\=/) $(CC) $(CFLAGS) $(XCFLAGS) -I. $(CPPFLAGS) -S $(<:\=/)
.rc.res: .rc.res:
$(RC) $(RFLAGS) -I. -I$(<D). $(iconinc) -I$(srcdir)win32 $(RFLAGS) -fo$@ $(<:/=\) $(RC) $(RFLAGS) -I. -I$(<D). $(iconinc) -I$(srcdir)/win32 $(RFLAGS) -fo$@ $(<:/=\)
.y.c: .y.c:
$(YACC) $(YFLAGS) $(<:\=/) $(YACC) $(YFLAGS) $(<:\=/)
sed -e "s!^ *extern char \*getenv();!/* & */!;s/^\(#.*\)y\.tab/\1parse/" y.tab.c > $(@F) sed -e "s!^ *extern char \*getenv();!/* & */!;s/^\(#.*\)y\.tab/\1parse/" y.tab.c > $(@F)
@del y.tab.c @del y.tab.c
all: $(srcdir)bcc32/Makefile.sub $(srcdir)common.mk all: $(srcdir)/bcc32/Makefile.sub $(srcdir)/common.mk
ruby: $(PROGRAM) ruby: $(PROGRAM)
rubyw: $(WPROGRAM) rubyw: $(WPROGRAM)
@ -217,8 +217,8 @@ config: config.status
config.status: $(CONFIG_H) config.status: $(CONFIG_H)
$(CONFIG_H): $(MKFILES) $(srcdir)bcc32/Makefile.sub $(CONFIG_H): $(MKFILES) $(srcdir)/bcc32/Makefile.sub
@$(srcdir:/=\)win32\ifchange.bat config.h &&| @$(srcdir:/=\)\win32\ifchange.bat config.h &&|
\#define HAVE_SYS_TYPES_H 1 \#define HAVE_SYS_TYPES_H 1
\#define HAVE_SYS_STAT_H 1 \#define HAVE_SYS_STAT_H 1
\#define HAVE_STDLIB_H 1 \#define HAVE_STDLIB_H 1
@ -303,7 +303,7 @@ $(CONFIG_H): $(MKFILES) $(srcdir)bcc32/Makefile.sub
| |
@exit > $@ @exit > $@
config.status: $(MKFILES) $(srcdir)bcc32/Makefile.sub $(srcdir)common.mk config.status: $(MKFILES) $(srcdir)/bcc32/Makefile.sub $(srcdir)/common.mk
@echo Creating $@ @echo Creating $@
@type > $@ &&| @type > $@ &&|
# Generated automatically by Makefile.sub. # Generated automatically by Makefile.sub.
@ -445,14 +445,14 @@ $(LIBRUBY_SO): $(LIBRUBY_A) $(DLDOBJS) $(RUBYDEF) $(RUBY_SO_NAME).res
$(LIBRUBY): $(LIBRUBY_SO) $(LIBRUBY): $(LIBRUBY_SO)
$(RUBYDEF): $(LIBRUBY_A) $(PREP) $(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 $(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) \ -ruby_name=$(RUBY_INSTALL_NAME) \
-rubyw_name=$(RUBYW_INSTALL_NAME) \ -rubyw_name=$(RUBYW_INSTALL_NAME) \
-so_name=$(RUBY_SO_NAME) \ -so_name=$(RUBY_SO_NAME) \
. $(icondirs) $(srcdir)win32 . $(icondirs) $(srcdir)/win32
post-install-bin:: post-install-bin::
@$(NULLCMD) @$(NULLCMD)

12
bcc32/setup.mak
View File

@ -1,13 +1,13 @@
# -*- makefile -*- # -*- makefile -*-
!if "$(srcdir)" != "" !if "$(srcdir)" != ""
bcc32dir = $(srcdir)bcc32/ bcc32dir = $(srcdir)/bcc32
!elseif "$(bcc32dir)" == "bcc32/" !elseif "$(bcc32dir)" == "bcc32/"
srcdir = ./ srcdir = .
!elseif "$(bcc32dir:/bcc32/=)/bcc32/" == "$(bcc32dir)" !elseif "$(bcc32dir:/bcc32/=)/bcc32/" == "$(bcc32dir)"
srcdir = $(bcc32dir:/bcc32/=/) srcdir = $(bcc32dir:/bcc32/=)
!else !else
srcdir = $(bcc32dir)../ srcdir = $(bcc32dir)/..
!endif !endif
!if "$(prefix)" == "" !if "$(prefix)" == ""
prefix = /usr prefix = /usr
@ -127,12 +127,12 @@ $(BANG)endif
\# RUBY_INSTALL_NAME = ruby \# RUBY_INSTALL_NAME = ruby
\# RUBY_SO_NAME = $$(RT)-$$(RUBY_INSTALL_NAME)$$(MAJOR)$$(MINOR) \# RUBY_SO_NAME = $$(RT)-$$(RUBY_INSTALL_NAME)$$(MAJOR)$$(MINOR)
\# CFLAGS = -q $$(DEBUGFLAGS) $$(OPTFLAGS) $$(PROCESSOR_FLAG) -w- -wsus -wcpt -wdup -wext -wrng -wrpt -wzdi \# 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 \# STACK = 0x2000000
\# LDFLAGS = -S:$$(STACK) \# LDFLAGS = -S:$$(STACK)
\# RFLAGS = $$(iconinc) \# RFLAGS = $$(iconinc)
\# EXTLIBS = cw32.lib import32.lib user32.lib kernel32.lib \# 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 @$(srcdir:/=\)\win32\rm.bat config.h config.status
@echo type "`$(MAKE)'" to make ruby for $(OS). @echo type "`$(MAKE)'" to make ruby for $(OS).

6
version.h
View File

@ -1,7 +1,7 @@
#define RUBY_VERSION "1.9.0" #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_VERSION_CODE 190
#define RUBY_RELEASE_CODE 20070709 #define RUBY_RELEASE_CODE 20070710
#define RUBY_PATCHLEVEL 0 #define RUBY_PATCHLEVEL 0
#define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MAJOR 1
@ -9,7 +9,7 @@
#define RUBY_VERSION_TEENY 0 #define RUBY_VERSION_TEENY 0
#define RUBY_RELEASE_YEAR 2007 #define RUBY_RELEASE_YEAR 2007
#define RUBY_RELEASE_MONTH 7 #define RUBY_RELEASE_MONTH 7
#define RUBY_RELEASE_DAY 9 #define RUBY_RELEASE_DAY 10
#ifdef RUBY_EXTERN #ifdef RUBY_EXTERN
RUBY_EXTERN const char ruby_version[]; RUBY_EXTERN const char ruby_version[];