summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ChangeLog5
-rw-r--r--Makefile.in1
-rw-r--r--bcc32/Makefile.sub3
-rwxr-xr-xbcc32/configure.bat7
-rw-r--r--bcc32/setup.mak5
-rw-r--r--common.mk1
-rw-r--r--configure.in17
-rw-r--r--version.h6
-rw-r--r--win32/Makefile.sub3
-rwxr-xr-xwin32/configure.bat8
-rw-r--r--win32/setup.mak3
-rw-r--r--wince/Makefile.sub3
-rwxr-xr-xwince/configure.bat7
-rw-r--r--wince/setup.mak3
14 files changed, 68 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 1cd4cf28c4..e5fbdbd54b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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.
diff --git a/Makefile.in b/Makefile.in
index 7acd0e05d9..1a3373161f 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -12,6 +12,7 @@ PURIFY =
AUTOCONF = autoconf
@SET_MAKE@
MKFILES = @MAKEFILES@
+BASERUBY = @BASERUBY@
prefix = @prefix@
exec_prefix = @exec_prefix@
diff --git a/bcc32/Makefile.sub b/bcc32/Makefile.sub
index baff3e3947..8f32b4c936 100644
--- a/bcc32/Makefile.sub
+++ b/bcc32/Makefile.sub
@@ -55,6 +55,9 @@ YFLAGS = -o y.tab.c
!ifndef AR
AR = tlib
!endif
+!ifndef BASERUBY
+BASERUBY = ruby
+!endif
PURIFY =
AUTOCONF = autoconf
diff --git a/bcc32/configure.bat b/bcc32/configure.bat
index 6e3056ff38..6e32df6fc7 100755
--- a/bcc32/configure.bat
+++ b/bcc32/configure.bat
@@ -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
diff --git a/bcc32/setup.mak b/bcc32/setup.mak
index 8f73b4f9f7..d52fc4b95a 100644
--- a/bcc32/setup.mak
+++ b/bcc32/setup.mak
@@ -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
diff --git a/common.mk b/common.mk
index 706c594c55..ee9353a577 100644
--- a/common.mk
+++ b/common.mk
@@ -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)
diff --git a/configure.in b/configure.in
index be6bbd2129..1343697b5d 100644
--- a/configure.in
+++ b/configure.in
@@ -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
diff --git a/version.h b/version.h
index ed22736d1a..c109e95ca1 100644
--- a/version.h
+++ b/version.h
@@ -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[];
diff --git a/win32/Makefile.sub b/win32/Makefile.sub
index fc4d9af596..d4cac0d26f 100644
--- a/win32/Makefile.sub
+++ b/win32/Makefile.sub
@@ -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
diff --git a/win32/configure.bat b/win32/configure.bat
index 5f5420f520..96e2ab40c3 100755
--- a/win32/configure.bat
+++ b/win32/configure.bat
@@ -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
diff --git a/win32/setup.mak b/win32/setup.mak
index e4f874434a..797ed56a02 100644
--- a/win32/setup.mak
+++ b/win32/setup.mak
@@ -47,6 +47,9 @@ RDOCTARGET = $(RDOCTARGET)
!if defined(EXTOUT)
EXTOUT = $(EXTOUT)
!endif
+!if defined(BASERUBY)
+BASERUBY = $(BASERUBY)
+!endif
<<
-system-vars-: -osname- -runtime-
diff --git a/wince/Makefile.sub b/wince/Makefile.sub
index fff533f1e1..5f9cffd749 100644
--- a/wince/Makefile.sub
+++ b/wince/Makefile.sub
@@ -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
diff --git a/wince/configure.bat b/wince/configure.bat
index 2c4a88fa16..dadfb2fa83 100755
--- a/wince/configure.bat
+++ b/wince/configure.bat
@@ -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
diff --git a/wince/setup.mak b/wince/setup.mak
index d2dbad2317..838441e669 100644
--- a/wince/setup.mak
+++ b/wince/setup.mak
@@ -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"
View Lorry Controller Status