From 9504610b25de8ed8656f169c8a3bf533b6acc7ae Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Thu, 15 Jun 2017 03:12:32 +0000
Subject: [PATCH] common.mk: tweaked packages order

* common.mk (dist): tweaked packages order by $(DISTPKGS).
  .tar.gz comes first for the hash values in downloads page, then
  popular .zip.

* tool/make-snapshot: "all" in -packages means all of the rest
  package types now.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@59088 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 common.mk          | 3 ++-
 tool/make-snapshot | 3 +++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/common.mk b/common.mk
index 5f62719714..827735aa82 100644
--- a/common.mk
+++ b/common.mk
@@ -1085,9 +1085,10 @@ lldb: miniruby$(EXEEXT) PHONY
 lldb-ruby: $(PROGRAM) PHONY
 	lldb $(enable_shared:yes=-o 'target modules add ${LIBRUBY_SO}') -o '$(LLDB_INIT)' $(PROGRAM) -- $(TESTRUN_SCRIPT)
 
+DISTPKGS = gzip,zip,all
 dist:
 	$(BASERUBY) $(srcdir)/tool/make-snapshot \
-	-srcdir=$(srcdir) \
+	-srcdir=$(srcdir) -packages=$(DISTPKGS) \
 	-unicode-version=$(UNICODE_VERSION) \
 	tmp $(RELNAME)
 
diff --git a/tool/make-snapshot b/tool/make-snapshot
index d628004dea..4684dab234 100755
--- a/tool/make-snapshot
+++ b/tool/make-snapshot
@@ -93,6 +93,9 @@ class Dir
 end
 
 $packages &&= $packages.split(/[, ]+/).tap {|pkg|
+  if all = pkg.index("all")
+    pkg[all, 1] = PACKAGES.keys - pkg
+  end
   pkg -= PACKAGES.keys
   pkg.empty? or abort "#{File.basename $0}: unknown packages - #{pkg.join(", ")}"
 }