diff options
| author | Jack Lloyd <[email protected]> | 2016-08-17 11:11:01 -0400 |
|---|---|---|
| committer | Jack Lloyd <[email protected]> | 2016-08-17 11:11:01 -0400 |
| commit | b13da1c251bf4ecc6f175d62e0cea32894bcabd1 (patch) | |
| tree | c2ea384f95b5ef78cd9a11b209b2b0c26f72a6ea | |
| parent | 50a88e05692b83aee3828d92d8101a97e3d0b2fc (diff) | |
| parent | 73a6416efe83600eeedf8046d81659070aaaf3e7 (diff) | |
Merge GH #584 Changes to support Windows debugging
| -rwxr-xr-x | configure.py | 13 | ||||
| -rw-r--r-- | src/build-data/makefile/nmake.in | 2 | ||||
| -rwxr-xr-x | src/scripts/install.py | 3 |
3 files changed, 12 insertions, 6 deletions
diff --git a/configure.py b/configure.py index bee9f99e4..9d30d08a0 100755 --- a/configure.py +++ b/configure.py @@ -1325,10 +1325,6 @@ def create_template_vars(build_config, options, modules, cc, arch, osinfo): 'shared_flags': cc.gen_shared_flags(options), 'visibility_attribute': cc.gen_visibility_attribute(options), - # 'botan' or 'botan-1.11'. Used in Makefile and install script - # This can be made consistent over all platforms in the future - 'libname': 'botan' if options.os == 'windows' else 'botan-%d.%d' % (build_config.version_major, build_config.version_minor), - 'lib_link_cmd': cc.so_link_command_for(osinfo.basename, options), 'cli_link_cmd': cc.binary_link_command_for(osinfo.basename, options), 'test_link_cmd': cc.binary_link_command_for(osinfo.basename, options), @@ -1393,6 +1389,15 @@ def create_template_vars(build_config, options, modules, cc, arch, osinfo): vars['botan_pkgconfig'] = prefix_with_build_dir(os.path.join(build_config.build_dir, build_config.pkg_config_file())) + # 'botan' or 'botan-1.11'. Used in Makefile and install script + # This can be made consistent over all platforms in the future + vars['libname'] = 'botan-%d.%d' % (build_config.version_major, build_config.version_minor) + else: + if options.with_debug_info: + vars['libname'] = 'botand' + else: + vars['libname'] = 'botan' + vars["header_in"] = process_template('src/build-data/makefile/header.in', vars) if vars["makefile_style"] == "gmake": diff --git a/src/build-data/makefile/nmake.in b/src/build-data/makefile/nmake.in index 119e91849..4075ccbbf 100644 --- a/src/build-data/makefile/nmake.in +++ b/src/build-data/makefile/nmake.in @@ -14,7 +14,7 @@ RM_R = $(RM) /S RMDIR = @rmdir # Executable targets -CLI = %{out_dir}\botan%{program_suffix} +CLI = %{out_dir}\botan-cli%{program_suffix} TEST = %{out_dir}\botan-test%{program_suffix} # Library targets diff --git a/src/scripts/install.py b/src/scripts/install.py index d87e69b49..33a316ad4 100755 --- a/src/scripts/install.py +++ b/src/scripts/install.py @@ -159,7 +159,8 @@ def main(args = None): if bool(cfg['build_shared_lib']): if str(cfg['os']) == "windows": - soname_base = process_template('%{soname_base}') # botan.dll + libname = process_template('%{libname}') + soname_base = libname + '.dll' copy_executable(os.path.join(out_dir, soname_base), os.path.join(lib_dir, soname_base)) else: |