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

merge revision(s) 47641,47642,47644: [Backport #10262]

* win32/win32.c (VCSUP): nothing to do if this worktree is not under
	  any VCS (it means that the worktree may be from the release package).

	* win32/Makefile.sub (VCSUP): nothing to do if this worktree is not
	  under any VCS (it means that the worktree may be from the release
	  package).


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@47931 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
usa 2014-10-15 06:58:02 +00:00
parent 172cc121b9
commit a7679182e5
3 changed files with 9 additions and 1 deletions

View file

@ -1,3 +1,9 @@
Wed Oct 15 15:57:48 2014 NAKAMURA Usaku <usa@ruby-lang.org>
* win32/Makefile.sub (VCSUP): nothing to do if this worktree is not
under any VCS (it means that the worktree may be from the release
package).
Wed Oct 15 15:35:39 2014 Kazuki Tsujimoto <kazuki@callcc.net>
* ext/pathname/pathname.c (path_inspect): use PRIsVALUE to preserve

View file

@ -1,6 +1,6 @@
#define RUBY_VERSION "2.0.0"
#define RUBY_RELEASE_DATE "2014-10-15"
#define RUBY_PATCHLEVEL 578
#define RUBY_PATCHLEVEL 579
#define RUBY_RELEASE_YEAR 2014
#define RUBY_RELEASE_MONTH 10

View file

@ -371,6 +371,8 @@ VCSUP = $(VCS) rebase $(GITSVNREBASEOPTIONS)
!else if exist($(srcdir)/.git)
VCS = git
VCSUP = $(VCS) pull $(GITPULLOPTIONS)
!else
VCSUP = rem
!endif
ruby_pc = $(RUBY_BASE_NAME)-$(MAJOR).$(MINOR).pc