[SCM] ci-tooling packaging branch, master, updated. 718ca7852323864cdaedd05637e86c6e6e5ec37d
Harald Sitter
apachelogger-guest at moszumanska.debian.org
Thu Aug 27 07:20:30 UTC 2015
Gitweb-URL: http://git.debian.org/?p=pkg-kde/ci-tooling.git;a=commitdiff;h=718ca78
The following commit has been merged in the master branch:
commit 718ca7852323864cdaedd05637e86c6e6e5ec37d
Author: Harald Sitter <sitter at kde.org>
Date: Thu Aug 27 09:20:27 2015 +0200
allow cmake feature warnings to be ignored through cmake-ignore
---
kci/builder.rb | 22 +++++++++++++---------
1 file changed, 13 insertions(+), 9 deletions(-)
diff --git a/kci/builder.rb b/kci/builder.rb
index 4dbc39f..b3d8604 100755
--- a/kci/builder.rb
+++ b/kci/builder.rb
@@ -302,6 +302,17 @@ def puts_info(str)
puts_kci('I', str)
end
+def ignore?(array_of_ignores, thing_to_check)
+ array_of_ignores.each do |possibly_ignore|
+ if thing_to_check == possibly_ignore ||
+ thing_to_check.start_with?(possibly_ignore) ||
+ thing_to_check.start_with?(possibly_ignore.chomp('*'))
+ return true
+ end
+ end
+ false
+end
+
def puts_cmake(data, source_name)
# Bit of compat code. Very lovely... NOT
parser = CMakeParser.new(data)
@@ -324,15 +335,7 @@ def puts_cmake(data, source_name)
end
missing.each do |dep|
- ignore = false
- ignore_missing.each do |possibly_ignore|
- if possibly_ignore == dep || dep.start_with?(possibly_ignore) ||
- dep.start_with?(possibly_ignore.chomp('*'))
- ignore = true
- break
- end
- end
- next if ignore
+ next if ignore?(ignore_missing, dep)
puts_warning("Missing Dep: #{dep}")
end
@@ -341,6 +344,7 @@ def puts_cmake(data, source_name)
end
disabled_features.each do |disabled_feature|
+ next if ignore?(ignore_missing, disabled_feature)
puts_warning("Disabled Feature: #{disabled_feature}")
end
end
--
ci-tooling packaging
More information about the pkg-kde-commits
mailing list