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

make-snapshot: use srcdir

Browse source 
* tool/make-snapshot: use srcdir as checked out working directory.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@48841 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2014-12-15 01:28:58 +00:00
parent fff1128281
commit 238d8586df
2 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
common.mk
View file

@ -895,7 +895,7 @@ gdb-ruby: $(PROGRAM) run.gdb PHONY
$(Q) $(RUNRUBY_COMMAND) $(RUNRUBY_DEBUGGER) -- $(TESTRUN_SCRIPT) $(Q) $(RUNRUBY_COMMAND) $(RUNRUBY_DEBUGGER) -- $(TESTRUN_SCRIPT)
dist: dist:
$(BASERUBY) $(srcdir)/tool/make-snapshot tmp $(RELNAME) $(BASERUBY) $(srcdir)/tool/make-snapshot -srcdir=$(srcdir) tmp $(RELNAME)
up:: up::
-$(Q)$(MAKE) $(MFLAGS) REVISION_FORCE=PHONY "$(REVISION_H)" -$(Q)$(MAKE) $(MFLAGS) REVISION_FORCE=PHONY "$(REVISION_H)"

4
tool/make-snapshot
View file

@ -8,6 +8,7 @@ require 'tmpdir'
require File.expand_path("../vcs", __FILE__) require File.expand_path("../vcs", __FILE__)
STDOUT.sync = true STDOUT.sync = true
$srcdir ||= nil
$exported = nil if ($exported ||= nil) == "" $exported = nil if ($exported ||= nil) == ""
$archname = nil if ($archname ||= nil) == "" $archname = nil if ($archname ||= nil) == ""
$keep_temp ||= nil $keep_temp ||= nil
@ -20,6 +21,7 @@ def usage
<<USAGE <<USAGE
usage: #{File.basename $0} [option...] new-directory-to-save [version ...] usage: #{File.basename $0} [option...] new-directory-to-save [version ...]
options: options:
-srcdir=PATH source directory path
-exported=PATH make snapshot from already exported working directory -exported=PATH make snapshot from already exported working directory
-archname=NAME make the basename of snapshots NAME -archname=NAME make the basename of snapshots NAME
-keep_temp keep temporary working directory -keep_temp keep temporary working directory
@ -341,7 +343,7 @@ ensure
FileUtils.rm_rf(v) if v and !$exported and !$keep_temp FileUtils.rm_rf(v) if v and !$exported and !$keep_temp
end end
vcs = VCS::SVN.new(SVNURL) vcs = (VCS.detect($srcdir) rescue nil if $srcdir) || VCS::SVN.new(SVNURL)
success = true success = true
revisions.collect {|rev| package(vcs, rev, destdir, tmp)}.flatten.each do |name| revisions.collect {|rev| package(vcs, rev, destdir, tmp)}.flatten.each do |name|