summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2017-06-15 03:12:32 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2017-06-15 03:12:32 +0000
commit9504610b25de8ed8656f169c8a3bf533b6acc7ae (patch)
tree4116b2d03393737ab14906ece11fc316a7143910
parentd25ed18c3defab09e71318baca5037541728c877 (diff)
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
-rw-r--r--common.mk3
-rwxr-xr-xtool/make-snapshot3
2 files changed, 5 insertions, 1 deletions
diff --git a/common.mk b/common.mk
index 5f62719..827735a 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 d628004..4684dab 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(", ")}"
}