From 8a898afb7ecaee46aaa7fb77de145c7ed571ae67 Mon Sep 17 00:00:00 2001 From: Chun-wei Fan Date: Tue, 2 Feb 2021 15:17:54 +0800 Subject: tools: Generate the UAC manifest stuff instead This way, we can have the version info and identifier name that would be unique to the release and the utility program(s) that we want to embed this manifest with. This also adds flexibility to what we can do with the resulting executable: -Avoid or enforce UAC requirements --- tools/generate-uac-manifest.py | 110 +++++++++++++++++++++++++++++++++++ tools/meson.build | 19 +++++- tools/update-icon-cache.exe.manifest | 17 ------ tools/update-icon-cache.rc | 3 - 4 files changed, 128 insertions(+), 21 deletions(-) create mode 100644 tools/generate-uac-manifest.py delete mode 100644 tools/update-icon-cache.exe.manifest delete mode 100644 tools/update-icon-cache.rc diff --git a/tools/generate-uac-manifest.py b/tools/generate-uac-manifest.py new file mode 100644 index 0000000000..ede6ba5044 --- /dev/null +++ b/tools/generate-uac-manifest.py @@ -0,0 +1,110 @@ +#!/usr/bin/env python3 + +""" +This script generates a Windows manifest file and optionally a resource file to +determine whether a specified program requires UAC elevation +""" + +import os +import argparse + +DOMAIN_NAME='gnome' + +def main(): + parser = argparse.ArgumentParser( + description=__doc__) + parser.add_argument('-p', '--package', required=True, + help='package name of the executable') + parser.add_argument('-n', '--name', required=True, + help='name of executable') + parser.add_argument('--pkg-version', required=True, dest='version', + help='version of package') + parser.add_argument('--require-admin', action='store_true', dest='admin', + default=False, + help='require admin access to application') + parser.add_argument('--input-resource-file', dest='resource', + default=None, + help='existing .rc file to embed UAC manifest (do not generate a new .rc file), must have included winuser.h in it') + parser.add_argument('--output-dir', dest='outdir', + default=None, + help='directory to output resulting files') + args = parser.parse_args() + + if args.resource is not None: + if not os.path.isfile(args.resource): + raise FileNotFoundError("Specified resource file '%s' does not exist" % args.resource) + + generate_manifest(args.package, args.name, args.version, args.admin, args.outdir) + write_rc_file(args.name, args.resource, args.outdir) + +def generate_manifest(package, name, version, admin, outdir): + if version.count('.') == 0: + manifest_package_version = version + '.0.0.0' + elif version.count('.') == 1: + manifest_package_version = version + '.0.0' + elif version.count('.') == 2: + manifest_package_version = version + '.0' + elif version.count('.') == 3: + manifest_package_version = version + else: + parts = version.split('.') + manifest_package_version = '' + for x in (0, 1, 2, 3): + if x == 0: + manifest_package_version += parts[x] + else: + manifest_package_version += '.' + parts[x] + + if outdir is not None: + output_file_base_name = os.path.join(outdir, name) + else: + output_file_base_name = name + + outfile = open(output_file_base_name + '.exe.manifest', 'w+') + outfile.write('\n') + outfile.write('\n') + outfile.write(' \n') + outfile.write(' \n') + outfile.write(' \n') + outfile.write(' \n') + outfile.write(' \n') + outfile.write(' \n') + outfile.write(' \n') + outfile.write(' \n') + outfile.write('\n') + outfile.close() + +def write_rc_file(name, resource, outdir): + if outdir is not None: + output_file_base_name = os.path.join(outdir, name) + else: + output_file_base_name = name + + if resource is None: + outfile = open(output_file_base_name + '.rc', 'w+') + outfile.write('#include ') + else: + if resource != output_file_base_name + '.rc': + outfile = open(output_file_base_name + '.rc', 'w+') + else: + outfile = open(output_file_base_name + '.final.rc', 'w+') + srcfile = open(resource, 'r') + outfile.write(srcfile.read()) + srcfile.close() + + outfile.write('\n') + outfile.write('CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "%s.exe.manifest"' % name) + outfile.close() + +if __name__ == '__main__': + main() diff --git a/tools/meson.build b/tools/meson.build index 3d2ea2eb78..7b82caf132 100644 --- a/tools/meson.build +++ b/tools/meson.build @@ -2,7 +2,24 @@ extra_update_icon_cache_objs = [] if win32_enabled - extra_update_icon_cache_objs = import('windows').compile_resources('update-icon-cache.rc') + gen_uac_manifest = find_program('generate-uac-manifest.py') + + uac_exe_pkg = 'gtk4' + uac_exe_name = '@0@-update-icon-cache'.format(uac_exe_pkg) + + # Well, we have to forgo the xxx.exe.manifest in the output listing, since + # compile_resources doesn't like to consume targets with multiple outputs, + # and the xxx.exe.manifest and xxx.rc are tied together + uac_rc = custom_target( + 'tools/@0@.rc'.format(uac_exe_name), + output: ['@0@.rc'.format(uac_exe_name)], + command: [gen_uac_manifest, + '-p=@0@'.format(uac_exe_pkg), + '-n=@0@'.format(uac_exe_name), + '--pkg-version=@0@'.format(meson.project_version()), + '--output-dir=@OUTDIR@'], + ) + extra_update_icon_cache_objs = import('windows').compile_resources(uac_rc) endif gtk_tools = [ diff --git a/tools/update-icon-cache.exe.manifest b/tools/update-icon-cache.exe.manifest deleted file mode 100644 index f215634abc..0000000000 --- a/tools/update-icon-cache.exe.manifest +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - - - - diff --git a/tools/update-icon-cache.rc b/tools/update-icon-cache.rc deleted file mode 100644 index 86ab7cd6fe..0000000000 --- a/tools/update-icon-cache.rc +++ /dev/null @@ -1,3 +0,0 @@ -#include - -CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "update-icon-cache.exe.manifest" -- cgit v1.2.1