summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-05-06 03:12:28 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-05-06 03:12:28 +0000
commit4211e89401a616fb1595e9d3e55a960870785e52 (patch)
treed112170af801f690b00fa72da89bfde05677da36
parent320f7e5300f4f17c0719bdbd6d06b05fdcd0c332 (diff)
* README: update.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@27636 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--README19
-rw-r--r--README.ja22
-rw-r--r--bcc32/README.bcc3235
-rw-r--r--version.h6
-rw-r--r--win32/README.win3219
6 files changed, 67 insertions, 38 deletions
diff --git a/ChangeLog b/ChangeLog
index 403e3572b7..0fedd48f29 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Thu May 6 12:12:26 2010 Nobuyoshi Nakada <[email protected]>
+
+ * README: update.
+
Wed May 5 19:00:01 2010 Hidetoshi NAGAI <[email protected]>
* ext/tk/extconf.rb: revert. enbugged by last commit.
diff --git a/README b/README
index 1b79781367..6c0fff6537 100644
--- a/README
+++ b/README
@@ -93,6 +93,25 @@ This is what you need to do to compile and install Ruby:
7. Run 'make install'
+ This command will create following directories and install files
+ onto them.
+
+ * ${DESTDIR}${prefix}/bin
+ * ${DESTDIR}${prefix}/lib
+ * ${DESTDIR}${prefix}/lib/ruby
+ * ${DESTDIR}${prefix}/lib/ruby/${MAJOR}.${MINOR}
+ * ${DESTDIR}${prefix}/lib/ruby/${MAJOR}.${MINOR}/${PLATFORM}
+ * ${DESTDIR}${prefix}/lib/ruby/site_ruby
+ * ${DESTDIR}${prefix}/lib/ruby/site_ruby/${MAJOR}.${MINOR}
+ * ${DESTDIR}${prefix}/lib/ruby/site_ruby/${MAJOR}.${MINOR}/${PLATFORM}
+ * ${DESTDIR}${prefix}/lib/ruby/vendor_ruby
+ * ${DESTDIR}${prefix}/lib/ruby/vendor_ruby/${MAJOR}.${MINOR}
+ * ${DESTDIR}${prefix}/lib/ruby/vendor_ruby/${MAJOR}.${MINOR}/${PLATFORM}
+ * ${DESTDIR}${prefix}/share/man/man1
+
+ If Ruby's version is `x.y.z', the ((|${MAJOR}|)) is `x' and the
+ ((|${MINOR}|)) is `y'.
+
You may have to be a super user to install ruby.
If you fail to compile ruby, please send the detailed error report with
diff --git a/README.ja b/README.ja
index 1eeb8eac52..4ad8a97be3 100644
--- a/README.ja
+++ b/README.ja
@@ -120,6 +120,28 @@ Ruby��ĥ�⥸�塼��ˤĤ����ä��礦ruby-ext�᡼��󥰥ꥹ�Ȥ�
7. make install
+ �ʲ��Υǥ��쥯�ȥ���äơ������˥ե�����򥤥󥹥ȡ�
+ �뤷�ޤ���
+
+ * ${DESTDIR}${prefix}/bin
+ * ${DESTDIR}${prefix}/lib
+ * ${DESTDIR}${prefix}/lib/ruby
+ * ${DESTDIR}${prefix}/lib/ruby/${MAJOR}.${MINOR}
+ * ${DESTDIR}${prefix}/lib/ruby/${MAJOR}.${MINOR}/${PLATFORM}
+ * ${DESTDIR}${prefix}/lib/ruby/site_ruby
+ * ${DESTDIR}${prefix}/lib/ruby/site_ruby/${MAJOR}.${MINOR}
+ * ${DESTDIR}${prefix}/lib/ruby/site_ruby/${MAJOR}.${MINOR}/${PLATFORM}
+ * ${DESTDIR}${prefix}/lib/ruby/vendor_ruby
+ * ${DESTDIR}${prefix}/lib/ruby/vendor_ruby/${MAJOR}.${MINOR}
+ * ${DESTDIR}${prefix}/lib/ruby/vendor_ruby/${MAJOR}.${MINOR}/${PLATFORM}
+ * ${DESTDIR}${prefix}/share/man/man1
+
+ Ruby��API�С������`x.y.z'�Ǥ���С�((|${MAJOR}|))��
+ `x'�ǡ�((|${MINOR}|))��`y'��((|${TEENY}|))��`z'�Ǥ���
+
+ ����: API�С�������teeny�ϡ�Ruby�ץ������ΥС�����
+ ��Ȥϰۤʤ뤳�Ȥ�����ޤ���
+
root�Ǻ�Ȥ���ɬ�פ����뤫�⤷��ޤ���
�⤷������ѥ�����˥��顼��ȯ���������ˤϥ��顼�Υ����ȥ�
diff --git a/bcc32/README.bcc32 b/bcc32/README.bcc32
index c27a1261f1..1ce9a23c17 100644
--- a/bcc32/README.bcc32
+++ b/bcc32/README.bcc32
@@ -30,7 +30,13 @@
== How to compile and install
(1) Execute bcc32\configure.bat on your build directory.
- ex. c:\ruby-1.6.7>bcc32\configure.bat
+ ex. c:\ruby-1.8.8> bcc32\configure.bat
+ You can specify the target platform as an argument.
+ For example, run `((%configure i686-bccwin32%))'
+ You can also specify the install directory.
+ For example, run `((%configure --prefix=<install_directory>%))'
+ Default of the install directory is /usr .
+ The default ((|<PLATFORM>|)) is `(({i386-bccwin32}))'.
(2) Change ((|RUBY_INSTALL_NAME|)) and ((|RUBY_SO_NAME|)) in (({Makefile}))
if you want to change the name of the executable files.
@@ -41,20 +47,7 @@
(4) Run `((%make test%))'
-(5) Run `((%make DESTDIR=<install_directory> install%))'
-
- This command will create following directories and install files onto them.
- * <install_directory>\bin
- * <install_directory>\lib
- * <install_directory>\lib\ruby
- * <install_directory>\lib\ruby\<MAJOR>.<MINOR>
- * <install_directory>\lib\ruby\<MAJOR>.<MINOR>\<PLATFORM>
- * <install_directory>\lib\ruby\site_ruby
- * <install_directory>\lib\ruby\site_ruby\<MAJOR>.<MINOR>
- * <install_directory>\lib\ruby\site_ruby\<MAJOR>.<MINOR>\<PLATFORM>
- * <install_directory>\man\man1
- If Ruby's version is `x.y.z', the ((|<MAJOR>|)) is `x' and the ((|<MINOR>|)) is `y'.
- The ((|<PLATFORM>|)) is usually `(({i586-bccwin32}))'.
+(5) Run `((%make install%))'
(6) Requires dynamic RTL (cc3250.dll on C++Builder5) and borlndmm.dll (If built with
usebormm.lib) to use installed binary. These files are ordinary in bcc32's bin
@@ -90,10 +83,10 @@ in Japanese, but you can download at least.
C:
cd \ruby
- bcc32\configure
+ bcc32\configure --prefix=/usr/local
make
make test
- make DESTDIR=/usr/local install
+ make install
* Build on the relative directory from the ruby source directory and CPU type
i386.
@@ -108,10 +101,10 @@ in Japanese, but you can download at least.
cd \ruby
mkdir bccwin32
cd bccwin32
- ..\bcc32\configure target i386-bccwin32
+ ..\bcc32\configure --prefix=/usr/local
make
make test
- make DESTDIR=/usr/local install
+ make install
* Build on the different drive.
@@ -122,10 +115,10 @@ in Japanese, but you can download at least.
D:
cd D:\build\ruby
- C:\src\ruby\bcc32\configure
+ C:\src\ruby\bcc32\configure --prefix=C:/usr/local
make
make test
- make DESTDIR=C:/usr/local install
+ make install
== Bugs
diff --git a/version.h b/version.h
index bb8e9b888e..cb04779f9e 100644
--- a/version.h
+++ b/version.h
@@ -1,7 +1,7 @@
#define RUBY_VERSION "1.8.8"
-#define RUBY_RELEASE_DATE "2010-05-05"
+#define RUBY_RELEASE_DATE "2010-05-06"
#define RUBY_VERSION_CODE 188
-#define RUBY_RELEASE_CODE 20100505
+#define RUBY_RELEASE_CODE 20100506
#define RUBY_PATCHLEVEL -1
#define RUBY_VERSION_MAJOR 1
@@ -9,7 +9,7 @@
#define RUBY_VERSION_TEENY 8
#define RUBY_RELEASE_YEAR 2010
#define RUBY_RELEASE_MONTH 5
-#define RUBY_RELEASE_DAY 5
+#define RUBY_RELEASE_DAY 6
#define NO_STRING_LITERAL_CONCATENATION 1
#ifdef RUBY_EXTERN
diff --git a/win32/README.win32 b/win32/README.win32
index e7d589759c..cc4081ab29 100644
--- a/win32/README.win32
+++ b/win32/README.win32
@@ -4,7 +4,7 @@
== Requirement
-(1) Visual C++ 5.0 or later.
+(1) Visual C++ 6.0 or later.
(2) If you want to run `((%nmake clean%))' or `((%nmake distclean%))'
properly, you must install UNIX compatible `((%rm%))' command on
@@ -24,6 +24,10 @@
(1) Execute win32\configure.bat on your build directory.
You can specify the target platform as an argument.
For example, run `((%configure i686-mswin32%))'
+ You can also specify the install directory.
+ For example, run `((%configure --prefix=<install_directory>%))'
+ Default of the install directory is /usr .
+ The default ((|<PLATFORM>|)) is `(({i386-mswin32}))'.
(2) Change ((|RUBY_INSTALL_NAME|)) and ((|RUBY_SO_NAME|)) in (({Makefile}))
if you want to change the name of the executable files.
@@ -38,19 +42,6 @@
(6) Run `((%nmake DESTDIR=<install_directory> install%))'
- This command will create following directories and install files onto them.
- * <install_directory>\bin
- * <install_directory>\lib
- * <install_directory>\lib\ruby
- * <install_directory>\lib\ruby\<MAJOR>.<MINOR>
- * <install_directory>\lib\ruby\<MAJOR>.<MINOR>\<PLATFORM>
- * <install_directory>\lib\ruby\site_ruby
- * <install_directory>\lib\ruby\site_ruby\<MAJOR>.<MINOR>
- * <install_directory>\lib\ruby\site_ruby\<MAJOR>.<MINOR>\<PLATFORM>
- * <install_directory>\man\man1
- If Ruby's version is `x.y.z', the ((|<MAJOR>|)) is `x' and the ((|<MINOR>|)) is `y'.
- The default ((|<PLATFORM>|)) is `(({i386-mswin32}))'.
-
== Icons
Any icon files(*.ico) in the build directory, directories specified with