diff options
author | Jack Lloyd <[email protected]> | 2021-02-14 14:35:37 -0500 |
---|---|---|
committer | Jack Lloyd <[email protected]> | 2021-02-14 14:35:37 -0500 |
commit | 2915ca3660969c0c995e32de2964f7a935ac80b6 (patch) | |
tree | 4858473d5f86a54d06cb058f1d6e2e2f374cc026 | |
parent | 35f7f2d000dc80a511de07b240edb7b851966b26 (diff) |
Remove support for bakefile
Bakefile still only supports up to VC 2013 which we no longer support at all,
and the upstream looks pretty dead, so there doesn't seem to be much need to
continue supporting this.
-rwxr-xr-x | configure.py | 17 | ||||
-rw-r--r-- | src/build-data/bakefile.in | 51 |
2 files changed, 1 insertions, 67 deletions
diff --git a/configure.py b/configure.py index 2100ba764..73fc0271e 100755 --- a/configure.py +++ b/configure.py @@ -482,13 +482,10 @@ def process_command_line(args): # pylint: disable=too-many-locals,too-many-state build_group.add_option('--with-valgrind', help='use valgrind API', dest='with_valgrind', action='store_true', default=False) - # Cmake and bakefile options are hidden as they should not be used by end users + # Cmake option is hidden as it should not be used by end users build_group.add_option('--with-cmake', action='store_true', default=False, help=optparse.SUPPRESS_HELP) - build_group.add_option('--with-bakefile', action='store_true', - default=False, help=optparse.SUPPRESS_HELP) - build_group.add_option('--unsafe-fuzzer-mode', action='store_true', default=False, help='Disable essential checks for testing') @@ -2122,8 +2119,6 @@ def create_template_vars(source_paths, build_paths, options, modules, cc, arch, 'endian': options.with_endian, 'cpu_is_64bit': arch.wordsize == 64, - 'bakefile_arch': 'x86' if options.arch == 'x86_32' else 'x86_64', - 'innosetup_arch': innosetup_arch(options.os, options.arch), 'mp_bits': choose_mp_bits(), @@ -3099,13 +3094,6 @@ def validate_options(options, info_os, info_cc, available_module_policies): if options.with_pdf and not options.with_sphinx: raise UserError('Option --with-pdf requires --with-sphinx') - if options.with_bakefile: - if options.os != 'windows' or options.compiler != 'msvc' or options.build_shared_lib is False: - raise UserError("Building via bakefile is only supported for MSVC DLL build") - - if options.arch not in ['x86_64', 'x86_32']: - raise UserError("Bakefile only supports x86 targets") - # Warnings if options.os == 'windows' and options.compiler != 'msvc': logging.warning('The windows target is oriented towards MSVC; maybe you want --os=cygwin or --os=mingw') @@ -3276,9 +3264,6 @@ def do_io_for_build(cc, arch, osinfo, using_mods, build_paths, source_paths, tem if options.with_cmake: logging.warning("CMake build is only for development: use make for production builds") write_template('CMakeLists.txt', in_build_data('cmake.in')) - elif options.with_bakefile: - logging.warning("Bakefile build is only for development: use make for production builds") - write_template('botan.bkl', in_build_data('bakefile.in')) else: write_template(template_vars['makefile_path'], in_build_data('makefile.in')) diff --git a/src/build-data/bakefile.in b/src/build-data/bakefile.in deleted file mode 100644 index a1c0ff134..000000000 --- a/src/build-data/bakefile.in +++ /dev/null @@ -1,51 +0,0 @@ -toolsets = vs2013; -shared-library botan { - defines = "BOTAN_DLL=__declspec(dllexport)"; - sources { -%{for lib_srcs} - %{i} -%{endfor} - } -} - -program cli { - deps = botan; - sources { -%{for cli_srcs} - %{i} -%{endfor} - } - - headers { -%{for cli_headers} - %{i} -%{endfor} - } - -} - -program tests { - deps = botan; - sources { -%{for test_srcs} - %{i} -%{endfor} - } -} - -includedirs += build/include/; -includedirs += build/include/external; - -%{for libs_used} -libs += "%{i}"; -%{endfor} - -archs = %{bakefile_arch}; - -vs2013.option.ClCompile.DisableSpecificWarnings = "4250;4251;4275"; -vs2013.option.ClCompile.WarningLevel = Level4; -vs2013.option.ClCompile.ExceptionHandling = SyncCThrow; -vs2013.option.ClCompile.RuntimeTypeInfo = true; -if ( $(config) == Release ) { - vs2013.option.Configuration.WholeProgramOptimization = true; -} |