archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-08-15 21:49:06 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

merge revision(s) 17aeff3e77e6fe0d37a9943dd93bcb16c4bb9f66,1616dcb16ef34ebf4ffc2167292f9a779f3e121e,1616dcb16ef34ebf4ffc2167292f9a779f3e121e:

Browse source 
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
This commit is contained in:
usa 2021-06-23 15:47:43 +00:00
parent 72ad9d27aa
commit 263f966244
2 changed files with 9 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

13
tool/make-snapshot
View file

@ -394,24 +394,21 @@ def package(vcs, rev, destdir, tmp = nil)
mk << commonmk.gsub(/\{\$([^(){}]*)[^{}]*\}/, "") mk << commonmk.gsub(/\{\$([^(){}]*)[^{}]*\}/, "")
mk << <<-'APPEND' 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 clean-cache $(CLEAN_CACHE): after-update
touch-unicode-files: _touch-unicode-files
update-download:: touch-unicode-files
update-download:: update-gems update-download:: update-gems
after-update:: extract-gems after-update:: extract-gems
extract-gems: update-gems extract-gems: update-gems
update-gems: update-gems:
_touch-unicode-files: $(UNICODE_SRC_DATA_DIR)/.unicode-tables.time:
$(MAKEDIRS) $(UNICODE_SRC_DATA_DIR) touch-unicode-files:
touch $(UNICODE_SRC_DATA_DIR)/.unicode-tables.time $(UNICODE_DATA_HEADERS)
APPEND APPEND
open(clean.add("Makefile"), "w") do |f| open(clean.add("Makefile"), "w") do |f|
f.puts "prereq: update-download"
f.puts mk f.puts mk
end end
ENV["CACHE_SAVE"] = "no" 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") clean.push("rbconfig.rb", ".rbconfig.time", "enc.mk")
print "prerequisites" print "prerequisites"
else else

8
version.h
View file

@ -1,10 +1,10 @@
#define RUBY_VERSION "2.6.8" #define RUBY_VERSION "2.6.8"
#define RUBY_RELEASE_DATE "2021-05-10" #define RUBY_RELEASE_DATE "2021-06-24"
#define RUBY_PATCHLEVEL 199 #define RUBY_PATCHLEVEL 200
#define RUBY_RELEASE_YEAR 2021 #define RUBY_RELEASE_YEAR 2021
#define RUBY_RELEASE_MONTH 5 #define RUBY_RELEASE_MONTH 6
#define RUBY_RELEASE_DAY 10 #define RUBY_RELEASE_DAY 24
#include "ruby/version.h" #include "ruby/version.h"