mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
merge revision(s) 53607:
* Makefile.in (update-rubyspec): fix r53208 like r53451. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_3@53608 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
0dfb398a9e
commit
ed2e608df3
3 changed files with 16 additions and 12 deletions
|
@ -1,3 +1,7 @@
|
|||
Thu Jan 21 16:39:55 2016 NARUSE, Yui <naruse@ruby-lang.org>
|
||||
|
||||
* Makefile.in (update-rubyspec): fix r53208 like r53451.
|
||||
|
||||
Fri Jan 15 00:05:57 2016 NARUSE, Yui <naruse@ruby-lang.org>
|
||||
|
||||
* lib/uri/generic.rb (URI::Generic#to_s): change encoding to
|
||||
|
|
18
Makefile.in
18
Makefile.in
|
@ -469,12 +469,12 @@ update-mspec:
|
|||
@$(CHDIR) $(srcdir); \
|
||||
if [ -d spec/mspec ]; then \
|
||||
echo updating mspec ...; \
|
||||
$(Q:@=:) set -x; \
|
||||
$(Q1:0=:) set -x; \
|
||||
cd spec/mspec && \
|
||||
exec git pull; \
|
||||
else \
|
||||
echo retrieving mspec ...; \
|
||||
$(Q:@=:) set -x; \
|
||||
$(Q1:0=:) set -x; \
|
||||
exec git clone $(MSPEC_GIT_URL) spec/mspec; \
|
||||
fi
|
||||
|
||||
|
@ -482,12 +482,12 @@ update-rubyspec: update-mspec
|
|||
@$(CHDIR) $(srcdir); \
|
||||
if [ -d spec/rubyspec ]; then \
|
||||
echo updating rubyspec ...; \
|
||||
$(Q:@=:) set -x; \
|
||||
$(Q1:0=:) set -x; \
|
||||
cd spec/rubyspec && \
|
||||
exec git pull; \
|
||||
else \
|
||||
echo retrieving rubyspec ...; \
|
||||
$(Q:@=:) set -x; \
|
||||
$(Q1:0=:) set -x; \
|
||||
exec git clone $(RUBYSPEC_GIT_URL) spec/rubyspec; \
|
||||
fi
|
||||
|
||||
|
@ -498,13 +498,13 @@ update-doclie:
|
|||
@$(CHDIR) $(srcdir); \
|
||||
if [ -d coverage/doclie ]; then \
|
||||
echo updating doclie ...; \
|
||||
$(Q:@=:) set -x; \
|
||||
$(Q1:0=:) set -x; \
|
||||
cd coverage/doclie && \
|
||||
git fetch && \
|
||||
exec git checkout $(DOCLIE_GIT_REF); \
|
||||
else \
|
||||
echo retrieving doclie ...; \
|
||||
$(Q:@=:) set -x; \
|
||||
$(Q1:0=:) set -x; \
|
||||
exec git clone --branch $(DOCLIE_GIT_REF) $(DOCLIE_GIT_URL) coverage/doclie; \
|
||||
fi
|
||||
|
||||
|
@ -512,7 +512,7 @@ update-simplecov-html:
|
|||
@$(CHDIR) $(srcdir); \
|
||||
if [ -d coverage/simplecov-html ]; then \
|
||||
echo updating simplecov-html ...; \
|
||||
$(Q:@=:) set -x; \
|
||||
$(Q1:0=:) set -x; \
|
||||
cd coverage/simplecov-html && \
|
||||
git fetch && \
|
||||
exec git checkout $(SIMPLECOV_HTML_GIT_REF); \
|
||||
|
@ -525,13 +525,13 @@ update-simplecov:
|
|||
@$(CHDIR) $(srcdir); \
|
||||
if [ -d coverage/simplecov ]; then \
|
||||
echo updating simplecov ...; \
|
||||
$(Q:@=:) set -x; \
|
||||
$(Q1:0=:) set -x; \
|
||||
cd coverage/simplecov && \
|
||||
git fetch && \
|
||||
exec git checkout $(SIMPLECOV_GIT_REF); \
|
||||
else \
|
||||
echo retrieving simplecov ...; \
|
||||
$(Q:@=:) set -x; \
|
||||
$(Q1:0=:) set -x; \
|
||||
exec git clone --branch $(SIMPLECOV_GIT_REF) $(SIMPLECOV_GIT_URL) coverage/simplecov; \
|
||||
fi
|
||||
|
||||
|
|
|
@ -1,10 +1,10 @@
|
|||
#define RUBY_VERSION "2.3.0"
|
||||
#define RUBY_RELEASE_DATE "2016-01-20"
|
||||
#define RUBY_PATCHLEVEL 6
|
||||
#define RUBY_RELEASE_DATE "2016-01-21"
|
||||
#define RUBY_PATCHLEVEL 7
|
||||
|
||||
#define RUBY_RELEASE_YEAR 2016
|
||||
#define RUBY_RELEASE_MONTH 1
|
||||
#define RUBY_RELEASE_DAY 20
|
||||
#define RUBY_RELEASE_DAY 21
|
||||
|
||||
#include "ruby/version.h"
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue