[前][次][番号順一覧][スレッド一覧]

ruby-changes:54649

From: nobu <ko1@a...>
Date: Fri, 18 Jan 2019 18:31:37 +0900 (JST)
Subject: [ruby-changes:54649] nobu:r66865 (trunk): make-snapshot: get rid of circular dependency

nobu	2019-01-18 18:31:32 +0900 (Fri, 18 Jan 2019)

  New Revision: 66865

  https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=66865

  Log:
    make-snapshot: get rid of circular dependency

  Modified files:
    trunk/tool/make-snapshot
Index: tool/make-snapshot
===================================================================
--- tool/make-snapshot	(revision 66864)
+++ tool/make-snapshot	(revision 66865)
@@ -408,7 +408,7 @@ def package(vcs, rev, destdir, tmp = nil https://github.com/ruby/ruby/blob/trunk/tool/make-snapshot#L408
       mk << commonmk.gsub(/\{\$([^(){}]*)[^{}]*\}/, "")
       mk << <<-'APPEND'
 
-prereq: clean-cache $(CLEAN_CACHE)
+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
@@ -421,11 +421,10 @@ _touch-unicode-files: https://github.com/ruby/ruby/blob/trunk/tool/make-snapshot#L421
 	touch $(UNICODE_SRC_DATA_DIR)/.unicode-tables.time $(UNICODE_DATA_HEADERS)
       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

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/

[前][次][番号順一覧][スレッド一覧]