ruby-changes:57506
From: Nobuyoshi <ko1@a...>
Date: Tue, 3 Sep 2019 11:40:28 +0900 (JST)
Subject: [ruby-changes:57506] 703f0cd3d0 (master): Do not keep tar file by the default
https://git.ruby-lang.org/ruby.git/commit/?id=703f0cd3d0 From 703f0cd3d007f1ada69957a529870b07fa053230 Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada <nobu@r...> Date: Tue, 3 Sep 2019 11:30:40 +0900 Subject: Do not keep tar file by the default diff --git a/tool/make-snapshot b/tool/make-snapshot index 28e4cad..b6cd606 100755 --- a/tool/make-snapshot +++ b/tool/make-snapshot @@ -55,7 +55,7 @@ PACKAGES = { https://github.com/ruby/ruby/blob/trunk/tool/make-snapshot#L55 "xz" => %w".tar.xz xz -c", "zip" => %w".zip zip -qr", } - +DEFAULT_PACKAGES = PACKAGES.keys - ["tar"] if system("7z", out: IO::NULL) PACKAGES["gzip"] = %w".tar.gz 7z a dummy -tgzip -mx -so" PACKAGES["zip"] = %w".zip 7z a -tzip -mx" << {out: IO::NULL} @@ -105,12 +105,12 @@ end https://github.com/ruby/ruby/blob/trunk/tool/make-snapshot#L105 $packages &&= $packages.split(/[, ]+/).tap {|pkg| if all = pkg.index("all") - pkg[all, 1] = PACKAGES.keys - pkg + pkg[all, 1] = DEFAULT_PACKAGES - pkg end pkg -= PACKAGES.keys pkg.empty? or abort "#{File.basename $0}: unknown packages - #{pkg.join(", ")}" } -$packages ||= PACKAGES.keys +$packages ||= DEFAULT_PACKAGES $digests &&= $digests.split(/[, ]+/).tap {|dig| dig -= DIGESTS @@ -514,11 +514,11 @@ after-update:: https://github.com/ruby/ruby/blob/trunk/tool/make-snapshot#L514 if tarball next if tarball.empty? else - tarball = cmd.empty? ? file : "#{$archname||v}.tar" + tarball = ext == ".tar" ? file : "#{$archname||v}.tar" print "creating tarball... #{tarball}" if tar_create(tarball, v) puts $colorize.pass(" done") - next if cmd.empty? + next if tarball == file else puts $colorize.fail(" failed") tarball = "" -- cgit v0.10.2 -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/