From 23a7f3baa33265519840609dc54e950615ec39b1 Mon Sep 17 00:00:00 2001
From: Aqua-sama <aqua@iserlohn-fortress.net>
Date: Fri, 3 Jan 2020 18:04:08 +0200
Subject: Merge some QoL improvements from staging branch

- Build executable in top-level buildroot
- Use meson sourceset
- Pull in poi-crash and poi-update from staging
- Remove extraneous scripts in tools/
- Pull in configure scripts in scripts/
---
 configure | 62 --------------------------------------------------------------
 1 file changed, 62 deletions(-)
 delete mode 100755 configure

(limited to 'configure')

diff --git a/configure b/configure
deleted file mode 100755
index fb011b0..0000000
--- a/configure
+++ /dev/null
@@ -1,62 +0,0 @@
-#!/usr/bin/env python3
-import shutil
-import os
-import subprocess
-
-def concat_options(default, options=[]):
-    if not options:
-        return default
-    r = ''
-    for option in options:
-        if option is default:
-            r += '*' + option + '* '
-        else:
-            r += option + ' '
-    return r.strip()
-
-def prompt(prompt, default, options=[]):
-    v = input("{} ({}): ".format(prompt, concat_options(default, options)))
-    if v is not '':
-        return v
-    return default
-
-if __name__ == "__main__":
-    # build options
-    build_dir = prompt('build folder', 'build')
-    build_type = prompt('build type', 'release', ['plain', 'debug', 'debugoptimized', 'release'])
-    build_prefix = prompt('prefix', '/usr/local')
-
-    build_pie = prompt('position-independent executable', 'true', ['true', 'false'])
-    build_lto = prompt('link-time optimization', 'true', ['true', 'false'])
-
-    # feature selection
-    auto_features = prompt('Feature auto state', 'disabled', ['auto', 'enabled', 'disabled'])
-    f_breakpad = prompt('Use breakpad', 'disabled', ['enabled', 'disabled'])
-    f_plasma = prompt('Use plasma', 'disabled', ['enabled', 'disabled'])
-    f_manpage = prompt('make manpage', 'enabled', ['enabled', 'disabled'])
-
-    # compilers
-    cc = prompt('C compiler', 'gcc')
-    cpp = prompt('CPP compiler', 'g++')
-    ld = prompt('Linker', 'gold')
-
-    # clean build folder
-    if os.path.isdir(build_dir):
-        shutil.rmtree(build_dir)
-    os.mkdir(build_dir, 0o700)
-
-    env = {
-        **os.environ,
-        'CC' : cc,
-        'CXX' : cpp
-    }
-    # configure build dir
-    subprocess.run(['meson', '--buildtype={}'.format(build_type), '--prefix={}'.format(build_prefix), '--auto-features={}'.format(auto_features),
-        '-Db_pie={}'.format(build_pie), '-Db_lto={}'.format(build_lto), '-Dcpp_link_args="-fuse-ld={}"'.format(ld),
-        '-DBreakpad={}'.format(f_breakpad), '-DPlasma={}'.format(f_plasma), '-Dmanpage={}'.format(f_manpage),
-        build_dir], env=env, check=True)
-
-    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))
-
-- 
cgit v1.2.1