From b5c0beb0c63ba7850de6c1be5f362e831e805490 Mon Sep 17 00:00:00 2001 From: Daniel Neus Date: Tue, 16 Aug 2016 15:17:00 +0200 Subject: No PDB output for CLI and tests Fixes GH #432 : Previously the Botan CLI PDB file has overwritten the Botan lib PDB file. Furthermore the output filename of the lib is changed to botand in debug mode. --- configure.py | 13 +++++++++---- src/build-data/cc/msvc.txt | 2 +- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/configure.py b/configure.py index e7e61cab1..2983b7506 100755 --- a/configure.py +++ b/configure.py @@ -1337,10 +1337,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), @@ -1405,6 +1401,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/cc/msvc.txt b/src/build-data/cc/msvc.txt index 8231c0429..ff4b4369b 100644 --- a/src/build-data/cc/msvc.txt +++ b/src/build-data/cc/msvc.txt @@ -48,7 +48,7 @@ default-debug -> "$(LINKER) /DLL /DEBUG" default -> "$(LINKER)" -default-debug -> "$(LINKER) /DEBUG" +default-debug -> "$(LINKER)" -- cgit v1.2.3 From 52429c81815ef97eaa72e16407c1bc6d90875936 Mon Sep 17 00:00:00 2001 From: Daniel Neus Date: Tue, 16 Aug 2016 16:45:09 +0200 Subject: fix install.py to copy botand.dll in debug mode --- src/scripts/install.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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: -- cgit v1.2.3 From 73a6416efe83600eeedf8046d81659070aaaf3e7 Mon Sep 17 00:00:00 2001 From: Daniel Neus Date: Wed, 17 Aug 2016 15:38:50 +0200 Subject: change botan CLI filename to botan-cli.exe instead of no PDB output for CLI and tests --- src/build-data/cc/msvc.txt | 2 +- src/build-data/makefile/nmake.in | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/build-data/cc/msvc.txt b/src/build-data/cc/msvc.txt index ff4b4369b..8231c0429 100644 --- a/src/build-data/cc/msvc.txt +++ b/src/build-data/cc/msvc.txt @@ -48,7 +48,7 @@ default-debug -> "$(LINKER) /DLL /DEBUG" default -> "$(LINKER)" -default-debug -> "$(LINKER)" +default-debug -> "$(LINKER) /DEBUG" 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 -- cgit v1.2.3