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

Rakefile: Qt: handle #includes in .h for .ui-based .h, too

Browse Source
This commit is contained in:
Moritz Bunkus 2018-01-01 11:25:28 +01:00
parent 17eb6205e0
commit 8b073325ea
2 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Rakefile
View File

@ -946,7 +946,7 @@ end
new("#{[ lib[:dir] ].flatten.first}/lib#{lib[:name]}").
sources([ lib[:dir] ].flatten, :type => :dir, :except => lib[:except]).
only_if(c?(:USE_QT) && (lib[:name] == 'mtxcommon')).
sources(FileList["src/common/*.h"].select { |h| read_files(h)[h].any? { |line| /\bQ_OBJECT\b/.match line } }.map { |h| h.ext 'moc' }).
qt_dependencies_and_sources("common").
end_if.
build_dll(lib[:name] == 'mtxcommon').
libraries(:iconv, :z, :matroska, :ebml, :rpcrt4).

27
rake.d/target.rb
View File

@ -89,27 +89,26 @@ class Target
end
def qt_dependencies_and_sources(subdir, options = {})
ui_files = FileList["src/#{subdir}/forms/**/*.ui"].to_a
ui_h_files = ui_files.collect { |ui| ui.ext 'h' }
cpp_files = FileList["src/#{subdir}/**/*.cpp"].to_a.for_target! - (options[:cpp_except] || [])
h_files = FileList["src/#{subdir}/**/*.h"].to_a.for_target! - ui_h_files
cpp_content = read_files cpp_files
h_content = read_files h_files
qobject_h_files = h_files.select { |h| h_content[h].any? { |line| /\bQ_OBJECT\b/.match line } }
ui_files = FileList["src/#{subdir}/forms/**/*.ui"].to_a
ui_h_files = ui_files.collect { |ui| ui.ext 'h' }
cpp_files = FileList["src/#{subdir}/**/*.cpp"].to_a.for_target! - (options[:cpp_except] || [])
h_files = FileList["src/#{subdir}/**/*.h"].to_a.for_target! - ui_h_files
content = read_files(cpp_files + h_files)
qobject_h_files = h_files.select { |h| content[h].any? { |line| /\bQ_OBJECT\b/.match line } }
form_include_re = %r{^\s* \# \s* include \s+ \" (#{subdir}/forms/[^\"]+) }x
cpp_dependencies = {}
form_include_re = %r{^\s* \# \s* include \s+ \" (#{subdir}/forms/[^\"]+) }x
extra_dependencies = {}
cpp_files.each do |cpp|
cpp_content[cpp].each do |line|
(cpp_files + h_files).each do |file_name|
content[file_name].each do |line|
next unless form_include_re.match line
cpp_dependencies[cpp] ||= []
cpp_dependencies[cpp] << "src/#{$1}"
extra_dependencies[file_name] ||= []
extra_dependencies[file_name] << "src/#{$1}"
end
end
cpp_dependencies.each { |cpp, ui_hs| file cpp.ext('o') => ui_hs }
extra_dependencies.each { |file_name, ui_hs| file file_name => ui_hs }
self.
sources(ui_files).