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

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
This commit is contained in:
nobu 2017-06-15 03:12:32 +00:00
parent d25ed18c3d
commit 9504610b25
2 changed files with 5 additions and 1 deletions

View file

@ -1085,9 +1085,10 @@ lldb: miniruby$(EXEEXT) PHONY
lldb-ruby: $(PROGRAM) PHONY lldb-ruby: $(PROGRAM) PHONY
lldb $(enable_shared:yes=-o 'target modules add ${LIBRUBY_SO}') -o '$(LLDB_INIT)' $(PROGRAM) -- $(TESTRUN_SCRIPT) lldb $(enable_shared:yes=-o 'target modules add ${LIBRUBY_SO}') -o '$(LLDB_INIT)' $(PROGRAM) -- $(TESTRUN_SCRIPT)
DISTPKGS = gzip,zip,all
dist: dist:
$(BASERUBY) $(srcdir)/tool/make-snapshot \ $(BASERUBY) $(srcdir)/tool/make-snapshot \
-srcdir=$(srcdir) \ -srcdir=$(srcdir) -packages=$(DISTPKGS) \
-unicode-version=$(UNICODE_VERSION) \ -unicode-version=$(UNICODE_VERSION) \
tmp $(RELNAME) tmp $(RELNAME)

View file

@ -93,6 +93,9 @@ class Dir
end end
$packages &&= $packages.split(/[, ]+/).tap {|pkg| $packages &&= $packages.split(/[, ]+/).tap {|pkg|
if all = pkg.index("all")
pkg[all, 1] = PACKAGES.keys - pkg
end
pkg -= PACKAGES.keys pkg -= PACKAGES.keys
pkg.empty? or abort "#{File.basename $0}: unknown packages - #{pkg.join(", ")}" pkg.empty? or abort "#{File.basename $0}: unknown packages - #{pkg.join(", ")}"
} }