ruby-changes:36760
From: nobu <ko1@a...>
Date: Mon, 15 Dec 2014 10:29:12 +0900 (JST)
Subject: [ruby-changes:36760] nobu:r48841 (trunk): make-snapshot: use srcdir
nobu 2014-12-15 10:28:58 +0900 (Mon, 15 Dec 2014) New Revision: 48841 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=48841 Log: make-snapshot: use srcdir * tool/make-snapshot: use srcdir as checked out working directory. Modified files: trunk/common.mk trunk/tool/make-snapshot Index: common.mk =================================================================== --- common.mk (revision 48840) +++ common.mk (revision 48841) @@ -895,7 +895,7 @@ gdb-ruby: $(PROGRAM) run.gdb PHONY https://github.com/ruby/ruby/blob/trunk/common.mk#L895 $(Q) $(RUNRUBY_COMMAND) $(RUNRUBY_DEBUGGER) -- $(TESTRUN_SCRIPT) dist: - $(BASERUBY) $(srcdir)/tool/make-snapshot tmp $(RELNAME) + $(BASERUBY) $(srcdir)/tool/make-snapshot -srcdir=$(srcdir) tmp $(RELNAME) up:: -$(Q)$(MAKE) $(MFLAGS) REVISION_FORCE=PHONY "$(REVISION_H)" Index: tool/make-snapshot =================================================================== --- tool/make-snapshot (revision 48840) +++ tool/make-snapshot (revision 48841) @@ -8,6 +8,7 @@ require 'tmpdir' https://github.com/ruby/ruby/blob/trunk/tool/make-snapshot#L8 require File.expand_path("../vcs", __FILE__) STDOUT.sync = true +$srcdir ||= nil $exported = nil if ($exported ||= nil) == "" $archname = nil if ($archname ||= nil) == "" $keep_temp ||= nil @@ -20,6 +21,7 @@ def usage https://github.com/ruby/ruby/blob/trunk/tool/make-snapshot#L21 <<USAGE usage: #{File.basename $0} [option...] new-directory-to-save [version ...] options: + -srcdir=PATH source directory path -exported=PATH make snapshot from already exported working directory -archname=NAME make the basename of snapshots NAME -keep_temp keep temporary working directory @@ -341,7 +343,7 @@ ensure https://github.com/ruby/ruby/blob/trunk/tool/make-snapshot#L343 FileUtils.rm_rf(v) if v and !$exported and !$keep_temp end -vcs = VCS::SVN.new(SVNURL) +vcs = (VCS.detect($srcdir) rescue nil if $srcdir) || VCS::SVN.new(SVNURL) success = true revisions.collect {|rev| package(vcs, rev, destdir, tmp)}.flatten.each do |name| -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/