diff options
| -rw-r--r-- | common.mk | 2 | ||||
| -rwxr-xr-x | tool/make-snapshot | 4 |
2 files changed, 4 insertions, 2 deletions
@@ -895,7 +895,7 @@ gdb-ruby: $(PROGRAM) run.gdb PHONY $(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)" diff --git a/tool/make-snapshot b/tool/make-snapshot index 835d465e72..fa70d400cb 100755 --- a/tool/make-snapshot +++ b/tool/make-snapshot @@ -8,6 +8,7 @@ require 'tmpdir' 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 <<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 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| |