diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-08-16 13:02:33 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-08-16 13:02:33 +0000 |
| commit | b24c4908e9d2617a011c040ee42f54ba2d6bca0d (patch) | |
| tree | eb78cc67e7b91c3728940be3e87cb1afe9697c8f | |
| parent | 2ae5e54e62c1525d6058c35c4bd86b04a45384c4 (diff) | |
make-snapshot: UNICODE_VERSION
* tool/make-snapshot (package): propagate UNICODE_VERSION to make
snapshot from the parent make.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@55946 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | common.mk | 5 | ||||
| -rwxr-xr-x | tool/make-snapshot | 2 |
2 files changed, 6 insertions, 1 deletions
@@ -996,7 +996,10 @@ gdb-ruby: $(PROGRAM) run.gdb PHONY $(Q) $(RUNRUBY_COMMAND) $(RUNRUBY_DEBUGGER) -- $(TESTRUN_SCRIPT) dist: - $(BASERUBY) $(srcdir)/tool/make-snapshot -srcdir=$(srcdir) tmp $(RELNAME) + $(BASERUBY) $(srcdir)/tool/make-snapshot \ + -srcdir=$(srcdir) \ + -unicode-version=$(UNICODE_VERSION) \ + tmp $(RELNAME) up:: update-remote diff --git a/tool/make-snapshot b/tool/make-snapshot index 73278a34bc..f1663a3e22 100755 --- a/tool/make-snapshot +++ b/tool/make-snapshot @@ -17,6 +17,7 @@ $patch_file ||= nil $packages ||= nil $digests ||= nil $tooldir = File.expand_path("..", __FILE__) +$unicode_version = nil if ($unicode_version ||= nil) == "" def usage <<USAGE @@ -309,6 +310,7 @@ def package(vcs, rev, destdir, tmp = nil) "PWD"=>Dir.pwd, "CONFIGURE"=>"configure", } + vars["UNICODE_VERSION"] = $unicode_version if $unicode_version args = vars.dup mk.gsub!(/@([A-Za-z_]\w*)@/) {args.delete($1); vars[$1] || ENV[$1]} mk << commonmk.gsub(/\{\$([^(){}]*)[^{}]*\}/, "") |