Download-Tools/mkvtoolnix
1
0
Fork 0
mirror of https://gitlab.com/mbunkus/mkvtoolnix.git synced 2024-10-22 07:21:21 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

build system: fix moc dependencies

Browse Source 
- fix is a combination of 95c2edd3 and cee1debe progression
- 95c2edd3 masked a cee1debe regression

When pch is enabled we must establish a .moco => .moc dependency
(regressed by cee1debe).

Other changes are cosmetic.
This commit is contained in:
KonaBlend 2016-03-27 16:58:03 -04:00
parent f50e956d22
commit 693de4f112
1 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
rake.d/pch.rb
View File

@ -144,8 +144,8 @@ module PCH
t = file(@config_file.to_s => @config_deps) { scan_users }
t.invoke
end
PCH.add_tasks(&cxx_compiler)
PCH.add_prerequisites
add_tasks(&cxx_compiler)
add_prerequisites
end
#############################################################################
@ -298,13 +298,15 @@ module PCH
#############################################################################
@@object_file_ext_map = {
'moc' => 'moco',
}
def self.add_prerequisites
@db_scan.each_pair do |user, header|
object = user.gsub(%r{\.([^.]+)}) { |ext| @@object_file_ext_map[ext] || 'o' }
case File.extname(user)
when '.moc'
object = user + 'o'
file object => user
else
object = Pathname.new(user).sub_ext('.o')
end
file object => "#{header}#{@extension}"
end
end
@ -370,15 +372,15 @@ PCH status: <%= c?(:USE_PRECOMPILED_HEADERS) ? "enabled" : "disabled" %>
if @verbose
verb = @config_file.exist? ? "rescan" : "scan"
else
verb = "%8s" % [(@config_file.exist? ? "rescan" : "scan").upcase]
verb = "%12s" % [(@config_file.exist? ? "rescan" : "scan").upcase]
end
puts "#{verb} #{@users.size} pch candidates"
puts "#{verb} pch candidates (total=#{@users.size}, #{file_types(@users.keys)})"
@users.each_pair { |k,v| scan_user(k,v) }
end
def self.scan_user(user, intermediary)
def self.scan_user(user, indirect)
found = nil
input = intermediary ? intermediary : user
input = indirect ? indirect : user
File.open(input) do |f|
f.each_line do |line|
next if !@scan_include_re.match(line)
@ -513,7 +515,7 @@ PCH status: <%= c?(:USE_PRECOMPILED_HEADERS) ? "enabled" : "disabled" %>
h = options.fetch(:htrace, nil) ? 't' : '-'
u = options.fetch(:user, nil) ? 'u' : '-'
p = options.fetch(:precompile, nil) ? 'p' : '-'
puts "%c%c%c %4s %s" % [h,u,p,action,subject]
puts "%c%c%c %8s %s" % [h, u, p, action.gsub(/ +/, '_').upcase, subject]
end
htrace = options.fetch(:htrace, nil)
return execute(command, options) unless htrace
@ -544,9 +546,9 @@ PCH status: <%= c?(:USE_PRECOMPILED_HEADERS) ? "enabled" : "disabled" %>
def self.execute(command, options={}, &block)
if STDOUT.tty?
(ps,lines) = execute_tty(command, options, &block)
execute_tty(command, options, &block)
else
(ps,lines) = execute_command(command, options, &block)
execute_command(command, options, &block)
end
end