Skip to content

Commit

Permalink
make-snapshot: UNICODE_VERSION
Browse files Browse the repository at this point in the history
* 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
  • Loading branch information
nobu committed Aug 16, 2016
1 parent 2ae5e54 commit b24c490
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 1 deletion.
5 changes: 4 additions & 1 deletion common.mk
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 2 additions & 0 deletions tool/make-snapshot
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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(/\{\$([^(){}]*)[^{}]*\}/, "")
Expand Down

0 comments on commit b24c490

Please sign in to comment.