Commit 582629f8 authored by Sandro Knauß's avatar Sandro Knauß Committed by Ben Cooksley

add additional includes to abi-complience-checker.

Differential Revision: https://phabricator.kde.org/D15706
parent dcaa84e7
......@@ -201,6 +201,7 @@ class Library:
version = self.version
headers = [] # type: List[str]
libs = [] # type: List[str]
additionalIncludes = [] # type: List[str]
# From the target information we previously collected...
# Grab the list of libraries and include headers for abi-compliance-checker
......@@ -209,6 +210,8 @@ class Library:
for i in target['include_dirs']:
# ignore general folders, as there are no lib specific headers are placed
if i == '/usr/include' or i.endswith("/KF5"):
if not i in additionalIncludes:
additionalIncludes.append(i)
continue
# Otherwise, if we don't already have it - add it to the list!
......@@ -233,7 +236,10 @@ class Library:
/usr/include/clang/AST
/usr/lib64/clang/6.0.1/include
</skip_include_paths>
""".format(version=version, headers="\n".join(headers), libs="\n".join(libs)) # replace with f-String in Python 3.6
<add_include_paths>
{additionalIncludes}
</add_include_paths>
""".format(version=version, headers="\n".join(headers), libs="\n".join(libs), additionalIncludes="\n".join(additionalIncludes)) # replace with f-String in Python 3.6
# Write the generated XML out to a file to pass to abi-compliance-checker
# We will give this to abi-compliance-checker using it's --dump parameter
......@@ -283,5 +289,5 @@ for library in foundLibraries:
scmRevision = max([t['SONAME'] for t in library.targets.values()]) # a more hackish way, to save the SONAME in the metadata
# Create a name for this entry in the Package archive and store it there
packageName = "{name}_{scmRevision}".format(name=lib.name, scmRevision=scmRevision)
packageName = "{name}_{scmRevision}".format(name=library.name, scmRevision=scmRevision)
ourArchive.storePackage(packageName, fileName, scmRevision)
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment