diff options
| author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2021-06-23 15:47:43 +0000 |
|---|---|---|
| committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2021-06-23 15:47:43 +0000 |
| commit | 263f9662442a31f723aa9513c84349552e9d2ba7 (patch) | |
| tree | d50a0385d3048f023762582323d7fc49a9d4baca /tool | |
| parent | 72ad9d27aa12c9f9b98b4e566d0c91598a0ad408 (diff) | |
merge revision(s) 17aeff3e77e6fe0d37a9943dd93bcb16c4bb9f66,1616dcb16ef34ebf4ffc2167292f9a779f3e121e,1616dcb16ef34ebf4ffc2167292f9a779f3e121e:
make-snapshot: get rid of circular dependency
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@66865 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
tool/make-snapshot | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
make-snapshot: try downloading Unicode files
[Bug #15593]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@67038 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
tool/make-snapshot | 7 +------
1 file changed, 1 insertion(+), 6 deletions(-)
make-snapshot: try downloading Unicode files
[Bug #15593]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@67038 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
tool/make-snapshot | 7 +------
1 file changed, 1 insertion(+), 6 deletions(-)
these patches are not for security issue, but are needed to resolv a
packaging problem.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_6@67944 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'tool')
| -rwxr-xr-x | tool/make-snapshot | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/tool/make-snapshot b/tool/make-snapshot index 89aad4b932..c8f4b0a628 100755 --- a/tool/make-snapshot +++ b/tool/make-snapshot @@ -394,24 +394,21 @@ def package(vcs, rev, destdir, tmp = nil) mk << commonmk.gsub(/\{\$([^(){}]*)[^{}]*\}/, "") mk << <<-'APPEND' -prereq: clean-cache $(CLEAN_CACHE) +prepare-package: touch-unicode-files: +prepare-package: prereq update-download clean-cache $(CLEAN_CACHE) clean-cache $(CLEAN_CACHE): after-update -touch-unicode-files: _touch-unicode-files -update-download:: touch-unicode-files update-download:: update-gems after-update:: extract-gems extract-gems: update-gems update-gems: -_touch-unicode-files: - $(MAKEDIRS) $(UNICODE_SRC_DATA_DIR) - touch $(UNICODE_SRC_DATA_DIR)/.unicode-tables.time $(UNICODE_DATA_HEADERS) +$(UNICODE_SRC_DATA_DIR)/.unicode-tables.time: +touch-unicode-files: APPEND open(clean.add("Makefile"), "w") do |f| - f.puts "prereq: update-download" f.puts mk end ENV["CACHE_SAVE"] = "no" - system(ENV["MAKE"] || ENV["make"] || "make", "prereq", *args.map {|arg| arg.join("=")}) + system(ENV["MAKE"] || ENV["make"] || "make", "prepare-package", *args.map {|arg| arg.join("=")}) clean.push("rbconfig.rb", ".rbconfig.time", "enc.mk") print "prerequisites" else |