From 446a36887bc9ac280ac9fb73222fa77c1c4a8e7a Mon Sep 17 00:00:00 2001 From: Aqua-sama Date: Fri, 17 May 2019 22:24:50 +0300 Subject: Add openssl key generation step to meson.build --- configure | 4 +--- lib/pluginloader/meson.build | 14 ++++++++++++++ 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/configure b/configure index 40e7fd4..fb011b0 100755 --- a/configure +++ b/configure @@ -2,8 +2,6 @@ import shutil import os import subprocess -from colorama import Fore -from colorama import Style def concat_options(default, options=[]): if not options: @@ -58,7 +56,7 @@ if __name__ == "__main__": '-DBreakpad={}'.format(f_breakpad), '-DPlasma={}'.format(f_plasma), '-Dmanpage={}'.format(f_manpage), build_dir], env=env, check=True) - print(f"{Style.BRIGHT}Configure step complete{Style.RESET_ALL}") + print("\n\n--- Configure step complete ---") print("For more configuration options run 'meson configure' in the configured build directory.") print("You can now build with 'ninja -C {}'.".format(build_dir)) diff --git a/lib/pluginloader/meson.build b/lib/pluginloader/meson.build index 4786156..9334f24 100644 --- a/lib/pluginloader/meson.build +++ b/lib/pluginloader/meson.build @@ -1,5 +1,17 @@ dep_openssl = dependency('openssl') +openssl_exe = find_program('openssl', required: true) +sh = find_program('sh') +hexdump = meson.source_root() / 'tools/hexdump.py' + +publickey = custom_target('publicKey.h', + output: 'publicKey.h', + build_by_default: true, + command: [sh, '-c', + openssl_exe.path() + ' genrsa -out privateKey.pem 4096; ' + openssl_exe.path() + ' rsa -in privateKey.pem -pubout -out publicKey.pem; python3 ' + hexdump + ' --name=publicKey_pem publicKey.pem --output=@OUTPUT@' + ] +) + pluginloader_moc = mod_qt5.preprocess( moc_headers: ['pluginloader.h'], dependencies: dep_qt5 @@ -9,5 +21,7 @@ dep_pluginloader = declare_dependency( include_directories: include_directories('.'), link_with: static_library('plugin', ['pluginloader.cpp', pluginloader_moc], + include_directories: include_directories('.'), dependencies: [dep_qt5, dep_openssl, dep_genheaders]) ) + -- cgit v1.2.1