summaryrefslogtreecommitdiffstats
path: root/bin
diff options
context:
space:
mode:
authorLuboš Luňák <l.lunak@collabora.com>2019-05-18 16:32:06 +0200
committerLuboš Luňák <l.lunak@collabora.com>2019-05-19 09:48:40 +0200
commit5e23a1f7c83ff369e884bbe9963655938363c27d (patch)
tree4921db708d0a7b02c685ec2ba0c91076d681d86b /bin
parentport update_pch to python3 (diff)
downloadcore-5e23a1f7c83ff369e884bbe9963655938363c27d.tar.gz
core-5e23a1f7c83ff369e884bbe9963655938363c27d.zip
support also StaticLibrary in update_pch
Change-Id: I02127cd8a023e87482eff4071eb81b30f39870fd Reviewed-on: https://gerrit.libreoffice.org/72526 Tested-by: Jenkins Reviewed-by: Luboš Luňák <l.lunak@collabora.com>
Diffstat (limited to 'bin')
-rwxr-xr-xbin/update_pch11
1 files changed, 7 insertions, 4 deletions
diff --git a/bin/update_pch b/bin/update_pch
index bf1cbeb20f41..adac49592fa1 100755
--- a/bin/update_pch
+++ b/bin/update_pch
@@ -603,14 +603,18 @@ def parse_makefile(groups, lines, lineno, lastif, ifstack):
return groups
-def process_makefile(root, module, makefile):
+def process_makefile(root, module, libname):
""" Parse a gmake makefile and extract
source filenames from it.
"""
+ makefile = 'Library_{}.mk'.format(libname)
filename = os.path.join(os.path.join(root, module), makefile)
if not os.path.isfile(filename):
- sys.stderr.write('Error: Module {} has no makefile at {}.'.format(module, filename))
+ makefile = 'StaticLibrary_{}.mk'.format(libname)
+ filename = os.path.join(os.path.join(root, module), makefile)
+ if not os.path.isfile(filename):
+ sys.stderr.write('Error: Module {} has no makefile at {}.'.format(module, filename))
groups = {'':[], 'ANDROID':[], 'iOS':[], 'WNT':[], 'LINUX':[], 'MACOSX':[]}
@@ -917,8 +921,7 @@ def main():
not EXCLUDE_LOCAL)
# Read input.
- makefile = 'Library_{}.mk'.format(libname)
- groups = process_makefile(root, module, makefile)
+ groups = process_makefile(root, module, libname)
generic = []
for osname, group in groups.items():