mirror of
				https://github.com/ruby/ruby.git
				synced 2022-11-09 12:17:21 -05:00 
			
		
		
		
	make-snapshot: override rest variables
* tool/make-snapshot (package): override variables which are not substituted by the command line. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@50087 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
		
							parent
							
								
									cfa98ab2eb
								
							
						
					
					
						commit
						8d43213467
					
				
					 1 changed files with 3 additions and 2 deletions
				
			
		| 
						 | 
				
			
			@ -308,7 +308,8 @@ def package(vcs, rev, destdir, tmp = nil)
 | 
			
		|||
        "PWD"=>Dir.pwd,
 | 
			
		||||
        "CONFIGURE"=>"configure",
 | 
			
		||||
      }
 | 
			
		||||
      mk.gsub!(/@([A-Za-z_]\w*)@/) {vars[$1] || ENV[$1]}
 | 
			
		||||
      args = vars.dup
 | 
			
		||||
      mk.gsub!(/@([A-Za-z_]\w*)@/) {args.delete($1); vars[$1] || ENV[$1]}
 | 
			
		||||
      mk << commonmk.gsub(/(?<!#)\{[^{}]*\}/, "")
 | 
			
		||||
      mk << <<-'APPEND'
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			@ -320,7 +321,7 @@ extract-gems:
 | 
			
		|||
      open(clean.add("Makefile"), "w") do |f|
 | 
			
		||||
        f.puts mk
 | 
			
		||||
      end
 | 
			
		||||
      system("make", "prereq")
 | 
			
		||||
      system("make", "prereq", *args.map {|arg| arg.join("=")})
 | 
			
		||||
      clean.push("rbconfig.rb", ".rbconfig.time", "enc.mk")
 | 
			
		||||
      print "prerequisites"
 | 
			
		||||
    else
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue