kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

* Makefile.in, common.mk, configure.in, */{Makefile.sub, configure.bat,

Browse source 
setup.mak}: add --with-baseruby configure option.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@11559 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
usa 2007-01-23 06:41:22 +00:00
parent 06720d45c7
commit b696420526
14 changed files with 68 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
Tue Jan 23 15:39:25 2007 NAKAMURA Usaku <usa@ruby-lang.org>
* Makefile.in, common.mk, configure.in, */{Makefile.sub, configure.bat,
setup.mak}: add --with-baseruby configure option.
Mon Jan 22 14:57:25 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
* ext/socket/socket.c: fix errors in socket sample code.

1
Makefile.in
View file

@ -12,6 +12,7 @@ PURIFY =
AUTOCONF = autoconf
@SET_MAKE@
MKFILES = @MAKEFILES@
BASERUBY = @BASERUBY@
prefix = @prefix@
exec_prefix = @exec_prefix@

3
bcc32/Makefile.sub
View file

@ -55,6 +55,9 @@ YFLAGS = -o y.tab.c
!ifndef AR
AR = tlib
!endif
!ifndef BASERUBY
BASERUBY = ruby
!endif
PURIFY =
AUTOCONF = autoconf

7
bcc32/configure.bat
View file

@ -21,6 +21,7 @@ if "%1" == "--program-name" goto :progname
if "%1" == "--enable-install-doc" goto :enable-rdoc
if "%1" == "--disable-install-doc" goto :disable-rdoc
if "%1" == "--extout" goto :extout
if "%1" == "--with-baseruby" goto :baseruby
if "%1" == "-h" goto :help
if "%1" == "--help" goto :help
echo>> ~tmp~.mak "%1" \
@ -73,6 +74,11 @@ goto :loop
shift
shift
goto :loop
:baseruby
echo>> ~tmp~.mak -D"BASERUBY=%2" \
shift
shift
goto :loop
:help
echo Configuration:
echo --help display this help
@ -82,6 +88,7 @@ goto :loop
echo System types:
echo --target=TARGET configure for TARGET [i386-bccwin32]
echo Optional Package:
echo --with-baseruby=RUBY use RUBY as baseruby [ruby]
echo --with-static-linked-ext link external modules statically
echo --disable-install-doc do not install rdoc indexes during install
del ~tmp~.mak

5
bcc32/setup.mak
View file

@ -53,6 +53,11 @@ $(BANG)ifndef EXTOUT
EXTOUT = $(EXTOUT)
$(BANG)endif
!endif
!if defined(BASERUBY)
$(BANG)ifndef BASERUBY
BASERUBY = $(BASERUBY)
$(BANG)endif
!endif
|
@type > usebormm.bat &&|
@echo off

1
common.mk
View file

@ -524,7 +524,6 @@ debug.$(OBJEXT): {$(VPATH)}debug.h
blockinlining.$(OBJEXT): {$(VPATH)}yarv.h {$(VPATH)}yarvcore.h vm_opts.h
BASERUBY = ruby
MATZRUBY = $(MATZRUBYDIR)ruby
INSNS2VMOPT = $(CPPFLAGS) --srcdir=$(srcdir)

17
configure.in
View file

@ -1606,6 +1606,23 @@ if test -z "$MANTYPE"; then
fi
AC_SUBST(MANTYPE)
AC_ARG_WITH(baseruby,
[ --with-baseruby=RUBY use RUBY as baseruby; RUBY is the pathname of ruby],
[
case "$withval" in
*ruby*)
BASERUBY=$withval
;;
*)
AC_MSG_ERROR(need ruby)
;;
esac
],
[
BASERUBY="ruby"
])
AC_SUBST(BASERUBY)
if test -f config.h && tr -d '\015' < confdefs.h | cmp -s config.h -; then
echo "config.h unchanged"
else

6
version.h
View file

@ -1,7 +1,7 @@
#define RUBY_VERSION "1.9.0"
#define RUBY_RELEASE_DATE "2007-01-22"
#define RUBY_RELEASE_DATE "2007-01-23"
#define RUBY_VERSION_CODE 190
#define RUBY_RELEASE_CODE 20070122
#define RUBY_RELEASE_CODE 20070123
#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 1
#define RUBY_RELEASE_DAY 22
#define RUBY_RELEASE_DAY 23
RUBY_EXTERN const char ruby_version[];
RUBY_EXTERN const char ruby_release_date[];

3
win32/Makefile.sub
View file

@ -51,6 +51,9 @@ AR = lib -nologo
PURIFY =
AUTOCONF = autoconf
RM = $(COMSPEC) /C $(srcdir:/=\)\win32\rm.bat
!if !defined(BASERUBY)
BASERUBY = ruby
!endif
!if !defined(PROCESSOR_ARCHITECTURE)
PROCESSOR_ARCHITECTURE = x86

8
win32/configure.bat
View file

@ -26,6 +26,7 @@ if "%1" == "--enable-install-doc" goto :enable-rdoc
if "%1" == "--disable-install-doc" goto :disable-rdoc
if "%1" == "--extout" goto :extout
if "%1" == "--path" goto :path
if "%1" == "--with-baseruby" goto :baseruby
if "%1" == "-h" goto :help
if "%1" == "--help" goto :help
echo>>confargs.tmp %1 \
@ -94,6 +95,12 @@ goto :loop
shift
shift
goto :loop
:baseruby
echo>> ~tmp~.mak "BASERUBY=%2" \
echo>>confargs.tmp %1=%2 \
shift
shift
goto :loop
:help
echo Configuration:
echo --help display this help
@ -103,6 +110,7 @@ goto :loop
echo System types:
echo --target=TARGET configure for TARGET [i386-mswin32]
echo Optional Package:
echo --with-baseruby=RUBY use RUBY as baseruby [ruby]
echo --with-static-linked-ext link external modules statically
echo --disable-install-doc do not install rdoc indexes during install
del *.tmp

3
win32/setup.mak
View file

@ -47,6 +47,9 @@ RDOCTARGET = $(RDOCTARGET)
!if defined(EXTOUT)
EXTOUT = $(EXTOUT)
!endif
!if defined(BASERUBY)
BASERUBY = $(BASERUBY)
!endif
<<
-system-vars-: -osname- -runtime-

3
wince/Makefile.sub
View file

@ -45,6 +45,9 @@ AR = lib -nologo
PURIFY =
AUTOCONF = autoconf
RM = $(srcdir)\win32\rm.bat
!if !defined(BASERUBY)
BASERUBY = ruby
!endif
!if !defined(PROCESSOR_ARCHITECTURE)
PROCESSOR_ARCHITECTURE = x86

7
wince/configure.bat
View file

@ -21,6 +21,7 @@ if "%1" == "--program-name" goto :progname
if "%1" == "--enable-install-doc" goto :enable-rdoc
if "%1" == "--disable-install-doc" goto :disable-rdoc
if "%1" == "--extout" goto :extout
if "%1" == "--with-baseruby" goto :baseruby
if "%1" == "-h" goto :help
if "%1" == "--help" goto :help
if "%1" == "CC" goto :define
@ -83,6 +84,11 @@ goto :loop
shift
shift
goto :loop
:baseruby
echo>> ~tmp~.mak "BASERUBY=%2" \
shift
shift
goto :loop
:help
echo Configuration:
echo --help display this help
@ -92,6 +98,7 @@ goto :loop
echo System types:
echo --target=TARGET configure for TARGET [i386-mswin32]
echo Optional Package:
echo --with-baseruby=RUBY use RUBY as baseruby [ruby]
echo --with-static-linked-ext link external modules statically
echo --enable-install-doc install rdoc indexes during install
del ~tmp~.mak

3
wince/setup.mak
View file

@ -58,6 +58,9 @@ RDOCTARGET = $(RDOCTARGET)
!if defined(EXTOUT)
EXTOUT = $(EXTOUT)
!endif
!if defined(BASERUBY)
BASERUBY = $(BASERUBY)
!endif
<<
@$(CPP) -I$(srcdir) -DRUBY_EXTERN="//" <<"Creating $(MAKEFILE)" >> $(MAKEFILE)
#include "version.h"