AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2025-01-11 13:10:07 +00:00
Code Issues Projects Releases Wiki Activity

Visual Studio builds: Make .pc generation more flexible

Browse Source 
Allow the use of ${exec_prefix} for libdir and includedir when passing
them in as arguments to the script.
This commit is contained in:
Chun-wei Fan 2016-06-22 15:16:09 +08:00
parent f44b9ef1f0
commit c2ba9ca810
1 changed files with 30 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
build/win32/pc_base.py
View File

@ -50,15 +50,27 @@ class BasePCItems:
if not os.path.exists(args.prefix): if not os.path.exists(args.prefix):
raise SystemExit('Specified prefix \'%s\' is invalid' % args.prefix) raise SystemExit('Specified prefix \'%s\' is invalid' % args.prefix)
# use absolute paths for prefix
self.prefix = os.path.abspath(args.prefix).replace('\\','/')
# check and setup the exec_prefix # check and setup the exec_prefix
if getattr(args, 'exec_prefix', None) is None: if getattr(args, 'exec_prefix', None) is None:
input_exec_prefix = args.prefix exec_prefix_use_shorthand = True
self.exec_prefix = '${prefix}'
else: else:
input_exec_prefix = args.exec_prefix if args.exec_prefix.startswith('${prefix}'):
if not os.path.exists(input_exec_prefix): exec_prefix_use_shorthand = True
raise SystemExit('Specified exec-prefix \'%s\' is invalid' % input_exec_prefix = args.prefix + args.exec_prefix[len('${prefix}'):]
input_exec_prefix) else:
exec_prefix_use_shorthand = False
input_exec_prefix = args.exec_prefix
if not os.path.exists(input_exec_prefix):
raise SystemExit('Specified exec_prefix \'%s\' is invalid' %
args.exec_prefix)
if exec_prefix_use_shorthand is True:
self.exec_prefix = args.exec_prefix.replace('\\','/')
else:
self.exec_prefix = os.path.abspath(input_exec_prefix).replace('\\','/')
# check and setup the includedir # check and setup the includedir
if getattr(args, 'includedir', None) is None: if getattr(args, 'includedir', None) is None:
@ -68,8 +80,12 @@ class BasePCItems:
includedir_use_shorthand = True includedir_use_shorthand = True
input_includedir = args.prefix + args.includedir[len('${prefix}'):] input_includedir = args.prefix + args.includedir[len('${prefix}'):]
else: else:
includedir_use_shorthand = False if args.includedir.startswith('${exec_prefix}'):
input_includedir = args.includedir includedir_use_shorthand = True
input_includedir = input_exec_prefix + args.includedir[len('${exec_prefix}'):]
else:
includedir_use_shorthand = False
input_includedir = args.includedir
if not os.path.exists(input_includedir): if not os.path.exists(input_includedir):
raise SystemExit('Specified includedir \'%s\' is invalid' % raise SystemExit('Specified includedir \'%s\' is invalid' %
args.includedir) args.includedir)
@ -86,8 +102,12 @@ class BasePCItems:
libdir_use_shorthand = True libdir_use_shorthand = True
input_libdir = args.prefix + args.libdir[len('${prefix}'):] input_libdir = args.prefix + args.libdir[len('${prefix}'):]
else: else:
libdir_use_shorthand = False if args.libdir.startswith('${exec_prefix}'):
input_libdir = args.libdir libdir_use_shorthand = True
input_libdir = input_exec_prefix + args.libdir[len('${exec_prefix}'):]
else:
libdir_use_shorthand = False
input_libdir = args.libdir
if not os.path.exists(input_libdir): if not os.path.exists(input_libdir):
raise SystemExit('Specified libdir \'%s\' is invalid' % raise SystemExit('Specified libdir \'%s\' is invalid' %
args.libdir) args.libdir)
@ -96,10 +116,6 @@ class BasePCItems:
else: else:
self.libdir = os.path.abspath(input_libdir).replace('\\','/') self.libdir = os.path.abspath(input_libdir).replace('\\','/')
# use absolute paths for prefix and exec_prefix
self.prefix = os.path.abspath(args.prefix).replace('\\','/')
self.exec_prefix = os.path.abspath(input_exec_prefix).replace('\\','/')
# setup dictionary for replacing items in *.pc.in # setup dictionary for replacing items in *.pc.in
self.base_replace_items.update({'@VERSION@': self.version}) self.base_replace_items.update({'@VERSION@': self.version})
self.base_replace_items.update({'@prefix@': self.prefix}) self.base_replace_items.update({'@prefix@': self.prefix})