mirror of
https://gitlab.com/mbunkus/mkvtoolnix.git
synced 2024-10-22 07:21:21 +00:00
build system: centralize runq output
That way adjusting to a uniform width is easier.
This commit is contained in:
Moritz Bunkus
parent
535a188255
commit
7e600c7e70
43
Rakefile
43
Rakefile
@ -219,7 +219,7 @@ namespace :apps do
|
||||
|
||||
desc "Strip all apps"
|
||||
task :strip => $applications do
|
||||
runq " STRIP", "#{c(:STRIP)} #{$applications.join(' ')}"
|
||||
runq "strip", nil, "#{c(:STRIP)} #{$applications.join(' ')}"
|
||||
end
|
||||
end
|
||||
|
||||
@ -235,7 +235,7 @@ cxx_compiler = lambda do |t|
|
||||
lang = pchi.language ? pchi.language : "c++"
|
||||
|
||||
args = [
|
||||
" CXX #{source}",
|
||||
"cxx", source,
|
||||
"#{c(:CXX)} #{$flags[:cxxflags]}#{pchu}#{pchx} #{$system_includes} -c -MMD -MF #{dep} -o #{t.name} -x #{lang} #{source}",
|
||||
:allow_failure => true
|
||||
]
|
||||
@ -257,12 +257,12 @@ rule '.o' => '.c' do |t|
|
||||
create_dependency_dirs
|
||||
dep = dependency_output_name_for t.name
|
||||
|
||||
runq " CC #{t.source}", "#{c(:CC)} #{$flags[:cflags]} #{$system_includes} -c -MMD -MF #{dep} -o #{t.name} #{t.sources.join(" ")}", :allow_failure => true
|
||||
runq "cc", t.source, "#{c(:CC)} #{$flags[:cflags]} #{$system_includes} -c -MMD -MF #{dep} -o #{t.name} #{t.sources.join(" ")}", :allow_failure => true
|
||||
handle_deps t.name, last_exit_code
|
||||
end
|
||||
|
||||
rule '.o' => '.rc' do |t|
|
||||
runq " WINDRES #{t.source}", "#{c(:WINDRES)} #{$flags[:windres]} -o #{t.name} #{t.sources.join(" ")}"
|
||||
runq "windres", t.source, "#{c(:WINDRES)} #{$flags[:windres]} -o #{t.name} #{t.sources.join(" ")}"
|
||||
end
|
||||
|
||||
# Resources depend on the manifest.xml file for Windows builds.
|
||||
@ -275,12 +275,12 @@ if c?(:MINGW)
|
||||
end
|
||||
|
||||
rule '.mo' => '.po' do |t|
|
||||
runq " MSGFMT #{t.source}", "msgfmt -c -o #{t.name} #{t.sources.join(" ")}"
|
||||
runq "msgfmt", t.source, "msgfmt -c -o #{t.name} #{t.sources.join(" ")}"
|
||||
end
|
||||
|
||||
if !c(:LCONVERT).blank?
|
||||
rule '.qm' => '.ts' do |t|
|
||||
runq "LCONVERT #{t.source}", "#{c(:LCONVERT)} -o #{t.name} -i #{t.sources.join(" ")}"
|
||||
runq "lconvert", t.source, "#{c(:LCONVERT)} -o #{t.name} -i #{t.sources.join(" ")}"
|
||||
end
|
||||
end
|
||||
|
||||
@ -297,7 +297,7 @@ if c?(:XSLTPROC_WORKS)
|
||||
end
|
||||
end
|
||||
|
||||
runq "XSLTPROC #{t.source}", "#{c(:XSLTPROC)} #{c(:XSLTPROC_FLAGS)} -o #{t.name} #{c(:DOCBOOK_MANPAGES_STYLESHEET)} #{t.sources.join(" ")}", :filter_output => filter
|
||||
runq "xsltproc", t.source, "#{c(:XSLTPROC)} #{c(:XSLTPROC_FLAGS)} -o #{t.name} #{c(:DOCBOOK_MANPAGES_STYLESHEET)} #{t.sources.join(" ")}", :filter_output => filter
|
||||
end
|
||||
|
||||
$manpages.each do |manpage|
|
||||
@ -315,7 +315,7 @@ rule '.h' => '.ui' do |t|
|
||||
begin
|
||||
temp.close
|
||||
|
||||
runq " UIC #{t.source}", "#{c(:UIC)} -tr QPTR #{t.sources.join(" ")} > #{temp.path}"
|
||||
runq "uic", t.source, "#{c(:UIC)} -tr QPTR #{t.sources.join(" ")} > #{temp.path}"
|
||||
|
||||
# Convert calls to QPTR(…, 0) to QT(…)
|
||||
output = IO.
|
||||
@ -331,11 +331,11 @@ rule '.h' => '.ui' do |t|
|
||||
end
|
||||
|
||||
rule '.cpp' => '.qrc' do |t|
|
||||
runq " RCC #{t.source}", "#{c(:RCC)} #{t.sources.join(" ")} > #{t.name}"
|
||||
runq "rcc", t.source, "#{c(:RCC)} #{t.sources.join(" ")} > #{t.name}"
|
||||
end
|
||||
|
||||
rule '.moc' => '.h' do |t|
|
||||
runq " MOC #{t.source}", "#{c(:MOC)} #{c(:QT_CFLAGS)} #{$system_includes} #{$flags[:moc]} -nw #{t.source} > #{t.name}"
|
||||
runq "moc", t.source, "#{c(:MOC)} #{c(:QT_CFLAGS)} #{$system_includes} #{$flags[:moc]} -nw #{t.source} > #{t.name}"
|
||||
end
|
||||
|
||||
rule '.moco' => '.moc' do |t|
|
||||
@ -350,16 +350,17 @@ desc "Create browse file for Emacs"
|
||||
task :browse => "BROWSE"
|
||||
|
||||
file "TAGS" => $all_sources do |t|
|
||||
runq ' ETAGS', "#{c(:ETAGS)} -o #{t.name} #{t.prerequisites.join(" ")}"
|
||||
runq 'etags', nil, "#{c(:ETAGS)} -o #{t.name} #{t.prerequisites.join(" ")}"
|
||||
end
|
||||
|
||||
file "BROWSE" => ($all_sources + $all_headers) do |t|
|
||||
runq ' EBROWSE', "#{c(:EBROWSE)} -o #{t.name} #{t.prerequisites.join(" ")}"
|
||||
runq 'ebrowse', nil, "#{c(:EBROWSE)} -o #{t.name} #{t.prerequisites.join(" ")}"
|
||||
end
|
||||
|
||||
file "doc/development.html" => [ "doc/development.md", "doc/pandoc-template.html" ] do |t|
|
||||
runq " PANDOC #{t.prerequisites.first}", "#{c(:PANDOC)} -o #{t.name} --standalone --from markdown_strict --to html --number-sections --table-of-contents " +
|
||||
"--css=pandoc.css --template=doc/pandoc-template.html doc/development.md"
|
||||
runq "pandoc", t.prerequisites.first, <<COMMAND
|
||||
#{c(:PANDOC)} -o #{t.name} --standalone --from markdown_strict --to html --number-sections --table-of-contents --css=pandoc.css --template=doc/pandoc-template.html doc/development.md
|
||||
COMMAND
|
||||
end
|
||||
|
||||
file "po/mkvtoolnix.pot" => $all_sources + $all_headers + $gui_ui_h_files + %w{Rakefile} do |t|
|
||||
@ -380,7 +381,7 @@ file "po/mkvtoolnix.pot" => $all_sources + $all_headers + $gui_ui_h_files + %w{R
|
||||
options += ["'--msgid-bugs-address=Moritz Bunkus <moritz@bunkus.org>'"]
|
||||
options += ["'--copyright-holder=Moritz Bunkus <moritz@bunkus.org>'", "--package-name=MKVToolNix", "--package-version=#{c(:PACKAGE_VERSION)}", "--foreign-user"]
|
||||
|
||||
runq "XGETTEXT #{t.name}", "xgettext #{keywords.join(" ")} #{options.join(" ")} -o #{t.name} #{sources.join(" ")}"
|
||||
runq "xgettext", t.name, "xgettext #{keywords.join(" ")} #{options.join(" ")} -o #{t.name} #{sources.join(" ")}"
|
||||
end
|
||||
|
||||
task :manpages => $manpages
|
||||
@ -488,7 +489,7 @@ EOT
|
||||
name = manpage.gsub(/man\//, "man/#{language}/")
|
||||
file name => [ name.ext('xml'), "doc/man/po4a/po/#{language}.po" ]
|
||||
file name.ext('xml') => [ manpage.ext('.xml'), "doc/man/po4a/po/#{language}.po" ] do |t|
|
||||
runq " PO4A #{manpage.ext('.xml')} (#{language})", "#{c(:PO4A_TRANSLATE)} #{c(:PO4A_TRANSLATE_FLAGS)} -m #{manpage.ext('.xml')} -p doc/man/po4a/po/#{language}.po -l #{t.name}"
|
||||
runq "po4a", "#{manpage.ext('.xml')} (#{language})", "#{c(:PO4A_TRANSLATE)} #{c(:PO4A_TRANSLATE_FLAGS)} -m #{manpage.ext('.xml')} -p doc/man/po4a/po/#{language}.po -l #{t.name}"
|
||||
end
|
||||
end
|
||||
end
|
||||
@ -506,7 +507,7 @@ EOT
|
||||
po = "po/#{language}.po"
|
||||
tmp_file = "#{po}.new"
|
||||
no_wrap = $unwrapped_po.include?(language) ? "" : "--no-wrap"
|
||||
runq "MSGMERGE #{po}", "msgmerge -q -s #{no_wrap} #{po} po/mkvtoolnix.pot > #{tmp_file}", :allow_failure => true
|
||||
runq "msgmerge", po, "msgmerge -q -s #{no_wrap} #{po} po/mkvtoolnix.pot > #{tmp_file}", :allow_failure => true
|
||||
|
||||
exit_code = last_exit_code
|
||||
if 0 != exit_code
|
||||
@ -523,7 +524,7 @@ EOT
|
||||
|
||||
desc "Update the man pages' translation files"
|
||||
task :manpages do
|
||||
runq " PO4A doc/man/po4a/po4a.cfg", "#{c(:PO4A)} #{c(:PO4A_FLAGS)} --msgmerge-opt=--no-wrap doc/man/po4a/po4a.cfg"
|
||||
runq "po4a", "doc/man/po4a/po4a.cfg", "#{c(:PO4A)} #{c(:PO4A_FLAGS)} --msgmerge-opt=--no-wrap doc/man/po4a/po4a.cfg"
|
||||
$all_man_po_files.each do |po_file|
|
||||
normalize_po po_file
|
||||
end
|
||||
@ -583,8 +584,8 @@ EOT
|
||||
task task_name do
|
||||
FileList["po/*.po", "doc/man/po4a/po/*.po"].each do |name|
|
||||
command = "msgfmt --statistics -o /dev/null #{name} 2>&1"
|
||||
if ENV["V"].to_bool
|
||||
runq " MSGFMT #{name}", command, :allow_failure => true
|
||||
if verbose
|
||||
runq "msgfmt", name, command, :allow_failure => true
|
||||
else
|
||||
puts "#{name} : " + `#{command}`.split(/\n/).first
|
||||
end
|
||||
@ -613,7 +614,7 @@ namespace :man2html do
|
||||
|
||||
xml.each do |name|
|
||||
file name.ext('html') => %w{manpages translations:manpages} do
|
||||
runq "SAXON-HE #{name}", "java -classpath lib/saxon-he/saxon9he.jar net.sf.saxon.Transform -o:#{name.ext('html')} -xsl:doc/stylesheets/docbook-to-html.xsl #{name}"
|
||||
runq "saxon-he", name, "java -classpath lib/saxon-he/saxon9he.jar net.sf.saxon.Transform -o:#{name.ext('html')} -xsl:doc/stylesheets/docbook-to-html.xsl #{name}"
|
||||
end
|
||||
|
||||
task File.basename(name, '.xml') => name.ext('html')
|
||||
|
||||
@ -10,7 +10,7 @@ class Application < Target
|
||||
namespace :apps do
|
||||
desc @desc if @aliases.empty? && !@desc.empty?
|
||||
file @target => @dependencies do |t|
|
||||
runq " LINK #{t.name}", "#{c(:CXX)} #{$flags[:ldflags]} #{$system_libdirs} -o #{t.name} #{@objects.join(" ")} #{@libraries.join(" ")}"
|
||||
runq "link", t.name, "#{c(:CXX)} #{$flags[:ldflags]} #{$system_libdirs} -o #{t.name} #{@objects.join(" ")} #{@libraries.join(" ")}"
|
||||
end
|
||||
end
|
||||
self
|
||||
|
||||
@ -65,9 +65,18 @@ ensure
|
||||
end
|
||||
end
|
||||
|
||||
def runq(msg, cmdline, options = {})
|
||||
def puts_runq action, target
|
||||
return if verbose
|
||||
|
||||
msg = sprintf "%12s", action.gsub(/ +/, '_').upcase
|
||||
msg += " #{target}" if target && !target.empty?
|
||||
|
||||
puts msg
|
||||
end
|
||||
|
||||
def runq(action, target, cmdline, options = {})
|
||||
verbose = ENV['V'].to_bool
|
||||
puts msg if !verbose
|
||||
puts_runq action, target
|
||||
run cmdline, options.clone.merge(:dont_echo => !verbose)
|
||||
end
|
||||
|
||||
|
||||
@ -12,14 +12,14 @@ class Library < Target
|
||||
def create_specific
|
||||
file "#{@target}.a" => @objects do |t|
|
||||
FileUtils.rm_f t.name
|
||||
runq " AR #{t.name}", "#{c(:AR)} rc #{t.name} #{@objects.join(" ")}"
|
||||
runq " RANLIB #{t.name}", "#{c(:RANLIB)} #{t.name}"
|
||||
runq "ar", t.name, "#{c(:AR)} rc #{t.name} #{@objects.join(" ")}"
|
||||
runq "ranlib", t.name, "#{c(:RANLIB)} #{t.name}"
|
||||
end
|
||||
|
||||
return self unless @build_dll
|
||||
|
||||
file "#{@target}.dll" => @objects do |t|
|
||||
runq " LD/DLL #{t.name}", <<-COMMAND
|
||||
runq "link", t.name, <<-COMMAND
|
||||
#{c(:CXX)} #{$flags[:ldflags]} #{$system_libdirs} -shared -Wl,--export-all -Wl,--out-implib=#{t.name}.a -o #{t.name} #{@objects.join(" ")} #{@libraries.join(" ")}
|
||||
COMMAND
|
||||
end
|
||||
|
||||
@ -1,3 +1,4 @@
|
||||
# coding: utf-8
|
||||
#
|
||||
# mkvtoolnix - programs for manipulating Matroska files
|
||||
# Copyright © 2003…2016 Moritz Bunkus
|
||||
@ -497,16 +498,11 @@ PCH status: <%= c?(:USE_PRECOMPILED_HEADERS) ? "enabled" : "disabled" %>
|
||||
# Advantage of keeping command-output together in a parallel build.
|
||||
# Disadvantage of delaying output until command is complete.
|
||||
#
|
||||
def self.runq(msg, command, options={})
|
||||
def self.runq(action, subject, command, options={})
|
||||
command = command.gsub(/\n/, ' ').gsub(/^\s+/, '').gsub(/\s+$/, '').gsub(/\s+/, ' ')
|
||||
if @verbose
|
||||
puts command
|
||||
else
|
||||
if msg =~ /^\s*(\S+)\s+(.*)/
|
||||
(action,subject) = $~.captures
|
||||
else
|
||||
(action,subject) = nil
|
||||
end
|
||||
h = options.fetch(:htrace, nil) ? 't' : '-'
|
||||
u = options.fetch(:user, nil) ? 'u' : '-'
|
||||
p = options.fetch(:precompile, nil) ? 'p' : '-'
|
||||
|
||||
@ -184,9 +184,9 @@ def transifex_pull_and_merge resource, language
|
||||
|
||||
orig_items = read_po(po_file)
|
||||
|
||||
runq " TX_PULL #{po_file}", "tx pull -f -r mkvtoolnix.#{resource} -l #{language} > /dev/null"
|
||||
runq "tx pull", po_file, "tx pull -f -r mkvtoolnix.#{resource} -l #{language} > /dev/null"
|
||||
|
||||
puts " MERGE #{po_file}"
|
||||
puts_runq "MERGE", po_file
|
||||
|
||||
transifex_items = read_po(po_file)
|
||||
merged_items = transifex_merge orig_items, transifex_items
|
||||
@ -200,13 +200,13 @@ def transifex_remove_fuzzy_and_push resource, language
|
||||
|
||||
runq_git po_file, "checkout HEAD -- #{po_file}"
|
||||
|
||||
runq "MSGATTRIB #{po_file}", "msgattrib --no-fuzzy --output=#{po_file_no_fuzzy.path} #{po_file}"
|
||||
runq "msgattrib", po_file, "msgattrib --no-fuzzy --output=#{po_file_no_fuzzy.path} #{po_file}"
|
||||
|
||||
IO.write(po_file, IO.read(po_file_no_fuzzy))
|
||||
|
||||
normalize_po po_file
|
||||
|
||||
runq " TX_PUSH #{po_file}", "tx push -t -f --no-interactive -r mkvtoolnix.#{resource} -l #{language} > /dev/null"
|
||||
runq "tx push", po_file, "tx push -t -f --no-interactive -r mkvtoolnix.#{resource} -l #{language} > /dev/null"
|
||||
|
||||
runq_git po_file, "checkout HEAD -- #{po_file}"
|
||||
end
|
||||
|
||||
Loading…
Reference in New Issue
Block a user