From 5b4da417eafdfde3a8f1bf66fc4b6c680de3ea4b Mon Sep 17 00:00:00 2001 From: lloyd Date: Thu, 19 Nov 2009 23:09:12 +0000 Subject: Add the first bits of support for packaging botan with InnoSetup. Untested, almost certainly doesn't work. --- src/build-data/botan.iss.in | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 src/build-data/botan.iss.in (limited to 'src/build-data') diff --git a/src/build-data/botan.iss.in b/src/build-data/botan.iss.in new file mode 100644 index 000000000..4d8b10dc2 --- /dev/null +++ b/src/build-data/botan.iss.in @@ -0,0 +1,17 @@ +; A script for packaging botan with InnoSetup + +[Setup] +AppName=Botan +AppVerName=Botan %{version} +DefaultDirName={pf}\botan +DefaultGroupName=botan + +AppCopyright=Copyright (C) 1999-2009 Jack Lloyd and others + +SolidCompression=yes + +; Todo - add [Types] and select 'user' / 'developer' installs + +[Files] +Source: "libbotan.lib"; DestDir: "{app} +Source: "build\lib\botan\*" DestDir: "{app}\botan" -- cgit v1.2.3 From f82384ceb442be6204b76e765de3ae26b41d70bd Mon Sep 17 00:00:00 2001 From: lloyd Date: Thu, 19 Nov 2009 23:24:27 +0000 Subject: Fix typos, set other fields in InnoSetup script --- src/build-data/botan.iss.in | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'src/build-data') diff --git a/src/build-data/botan.iss.in b/src/build-data/botan.iss.in index 4d8b10dc2..a625697f7 100644 --- a/src/build-data/botan.iss.in +++ b/src/build-data/botan.iss.in @@ -3,6 +3,11 @@ [Setup] AppName=Botan AppVerName=Botan %{version} + +AppPublisher=Jack Lloyd +AppPublisherURL=http://botan.randombit.net/ +AppVersion=%{version} + DefaultDirName={pf}\botan DefaultGroupName=botan @@ -10,8 +15,8 @@ AppCopyright=Copyright (C) 1999-2009 Jack Lloyd and others SolidCompression=yes -; Todo - add [Types] and select 'user' / 'developer' installs +OutputDir=. [Files] -Source: "libbotan.lib"; DestDir: "{app} -Source: "build\lib\botan\*" DestDir: "{app}\botan" +Source: "..\libbotan.lib"; DestDir: "{app}" +Source: "lib\botan\*"; DestDir: "{app}\botan" -- cgit v1.2.3 From ac7ebedffe54a09770a93283f9644554d5cf06c5 Mon Sep 17 00:00:00 2001 From: lloyd Date: Thu, 19 Nov 2009 23:26:41 +0000 Subject: Fix includes, and put into {app}\include\botan so -IC:\botan\include causes to be visible as expected. --- src/build-data/botan.iss.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/build-data') diff --git a/src/build-data/botan.iss.in b/src/build-data/botan.iss.in index a625697f7..27e5d3784 100644 --- a/src/build-data/botan.iss.in +++ b/src/build-data/botan.iss.in @@ -19,4 +19,4 @@ OutputDir=. [Files] Source: "..\libbotan.lib"; DestDir: "{app}" -Source: "lib\botan\*"; DestDir: "{app}\botan" +Source: "include\botan\*"; DestDir: "{app}\include\botan" -- cgit v1.2.3 From 3786032100c34e2196bbb8af1e89226b05fbc324 Mon Sep 17 00:00:00 2001 From: lloyd Date: Thu, 19 Nov 2009 23:34:17 +0000 Subject: Most compilers had empty dll_*_flags; remove them since the default is empty anyway. For VC++ (only user) set BOTAN_DLL to dllimport by default (for apps), and then redefine as dllexport when building the library. --- configure.py | 3 +-- src/build-data/botan.iss.in | 2 +- src/build-data/buildh.in | 2 +- src/build-data/cc/compaq.txt | 3 --- src/build-data/cc/ekopath.txt | 3 --- src/build-data/cc/gcc.txt | 3 --- src/build-data/cc/hpcc.txt | 3 --- src/build-data/cc/icc.txt | 3 --- src/build-data/cc/kai.txt | 3 --- src/build-data/cc/mipspro.txt | 3 --- src/build-data/cc/msvc.txt | 3 +-- src/build-data/cc/open64.txt | 3 --- src/build-data/cc/pgi.txt | 3 --- src/build-data/cc/sgipro64.txt | 3 --- src/build-data/cc/sunwspro.txt | 3 --- src/build-data/cc/xlc.txt | 3 --- 16 files changed, 4 insertions(+), 42 deletions(-) (limited to 'src/build-data') diff --git a/configure.py b/configure.py index 668d03986..5085b2f70 100755 --- a/configure.py +++ b/configure.py @@ -535,7 +535,6 @@ class CompilerInfo(object): 'lang_flags': '', 'warning_flags': '', 'dll_import_flags': '', - 'dll_export_flags': '', 'ar_command': None, 'makefile_style': '', 'compiler_has_tr1': False, @@ -831,7 +830,7 @@ def create_template_vars(build_config, options, modules, cc, arch, osinfo): 'lang_flags': cc.lang_flags + options.extra_flags, 'warn_flags': cc.warning_flags, 'shared_flags': cc.shared_flags, - 'dll_export_flags': cc.dll_export_flags, + 'dll_import_flags': cc.dll_import_flags, 'so_link': cc.so_link_command_for(osinfo.basename), diff --git a/src/build-data/botan.iss.in b/src/build-data/botan.iss.in index 27e5d3784..ee8229f3f 100644 --- a/src/build-data/botan.iss.in +++ b/src/build-data/botan.iss.in @@ -18,5 +18,5 @@ SolidCompression=yes OutputDir=. [Files] -Source: "..\libbotan.lib"; DestDir: "{app}" +Source: "..\libbotan.dll"; DestDir: "{app}" Source: "include\botan\*"; DestDir: "{app}\include\botan" diff --git a/src/build-data/buildh.in b/src/build-data/buildh.in index e0d8368ed..37ff06f9d 100644 --- a/src/build-data/buildh.in +++ b/src/build-data/buildh.in @@ -9,7 +9,7 @@ #define BOTAN_VERSION_PATCH %{version_patch} #ifndef BOTAN_DLL - #define BOTAN_DLL %{dll_export_flags} + #define BOTAN_DLL %{dll_import_flags} #endif /* Chunk sizes */ diff --git a/src/build-data/cc/compaq.txt b/src/build-data/cc/compaq.txt index b5a080ae9..7e7f1ea56 100644 --- a/src/build-data/cc/compaq.txt +++ b/src/build-data/cc/compaq.txt @@ -15,9 +15,6 @@ debug_flags -g no_debug_flags "" lang_flags "-std ansi -D__USE_STD_IOSTREAM" -dll_import_flags "" -dll_export_flags "" - makefile_style unix diff --git a/src/build-data/cc/ekopath.txt b/src/build-data/cc/ekopath.txt index bff1ff460..ac514261e 100644 --- a/src/build-data/cc/ekopath.txt +++ b/src/build-data/cc/ekopath.txt @@ -18,9 +18,6 @@ ar_command "pathCC -ar -o" shared_flags "-fPIC" debug_flags -g -dll_import_flags "" -dll_export_flags "" - makefile_style unix diff --git a/src/build-data/cc/gcc.txt b/src/build-data/cc/gcc.txt index f0806fe7a..73e1ecf06 100644 --- a/src/build-data/cc/gcc.txt +++ b/src/build-data/cc/gcc.txt @@ -20,9 +20,6 @@ shared_flags "-fPIC" debug_flags -g no_debug_flags "-finline-functions" -dll_import_flags "" -dll_export_flags "" - makefile_style unix diff --git a/src/build-data/cc/hpcc.txt b/src/build-data/cc/hpcc.txt index 614830f9e..4b21a03de 100644 --- a/src/build-data/cc/hpcc.txt +++ b/src/build-data/cc/hpcc.txt @@ -16,9 +16,6 @@ lang_flags "-AA -ext +eh -z" warning_flags "" # +w shared_flags "+Z" -dll_import_flags "" -dll_export_flags "" - makefile_style unix diff --git a/src/build-data/cc/icc.txt b/src/build-data/cc/icc.txt index 10e689e1a..ea7936870 100644 --- a/src/build-data/cc/icc.txt +++ b/src/build-data/cc/icc.txt @@ -18,9 +18,6 @@ lang_flags "" warning_flags "-w1" shared_flags "-fPIC" -dll_import_flags "" -dll_export_flags "" - makefile_style unix diff --git a/src/build-data/cc/kai.txt b/src/build-data/cc/kai.txt index 52fb7c5e1..2d9c0cd65 100644 --- a/src/build-data/cc/kai.txt +++ b/src/build-data/cc/kai.txt @@ -16,9 +16,6 @@ lang_flags "-D__KAI_STRICT" debug_flags -g no_debug_flags "" -dll_import_flags "" -dll_export_flags "" - makefile_style unix diff --git a/src/build-data/cc/mipspro.txt b/src/build-data/cc/mipspro.txt index 2de03938a..28b47b30d 100644 --- a/src/build-data/cc/mipspro.txt +++ b/src/build-data/cc/mipspro.txt @@ -18,9 +18,6 @@ lang_flags "-ansi -LANG:ansi-for-init-scope=ON" # headers #warning_flags "-fullwarn" -dll_import_flags "" -dll_export_flags "" - makefile_style unix diff --git a/src/build-data/cc/msvc.txt b/src/build-data/cc/msvc.txt index 805093ce5..bbc6345bc 100644 --- a/src/build-data/cc/msvc.txt +++ b/src/build-data/cc/msvc.txt @@ -8,7 +8,7 @@ add_include_dir_option "/I" add_lib_dir_option -L add_lib_option "" -lib_opt_flags "/O2" +lib_opt_flags "/O2 /DBOTAN_DLL=__declspec(dllexport)" check_opt_flags "/O2" debug_flags "/Zi" no_debug_flags "" @@ -16,7 +16,6 @@ lang_flags "/EHsc /GR /D_CONSOLE" warning_flags "" dll_import_flags "__declspec(dllimport)" -dll_export_flags "__declspec(dllexport)" ar_command "lib" diff --git a/src/build-data/cc/open64.txt b/src/build-data/cc/open64.txt index 275d25f72..34359ef63 100644 --- a/src/build-data/cc/open64.txt +++ b/src/build-data/cc/open64.txt @@ -16,9 +16,6 @@ shared_flags "-fPIC" lang_flags "-ansi -LANG:ansi-for-init-scope=ON" warning_flags "-Wall -W" -dll_import_flags "" -dll_export_flags "" - makefile_style unix diff --git a/src/build-data/cc/pgi.txt b/src/build-data/cc/pgi.txt index 99f7bcea5..0e4f8baf2 100644 --- a/src/build-data/cc/pgi.txt +++ b/src/build-data/cc/pgi.txt @@ -12,9 +12,6 @@ lib_opt_flags "-fast -Minline" check_opt_flags "-fast" shared_flags "-fPIC" -dll_import_flags "" -dll_export_flags "" - makefile_style unix diff --git a/src/build-data/cc/sgipro64.txt b/src/build-data/cc/sgipro64.txt index a359ef5ae..e6a58f16d 100644 --- a/src/build-data/cc/sgipro64.txt +++ b/src/build-data/cc/sgipro64.txt @@ -16,9 +16,6 @@ shared_flags "-KPIC" lang_flags "-ansi -LANG:ansi-for-init-scope=ON" warning_flags "-Wall -W" -dll_import_flags "" -dll_export_flags "" - makefile_style unix diff --git a/src/build-data/cc/sunwspro.txt b/src/build-data/cc/sunwspro.txt index ee41ebeca..bd86ade33 100644 --- a/src/build-data/cc/sunwspro.txt +++ b/src/build-data/cc/sunwspro.txt @@ -18,9 +18,6 @@ shared_flags "-KPIC" warning_flags "+w" lang_flags "+p -D__EXTENSIONS__" -dll_import_flags "" -dll_export_flags "" - makefile_style unix diff --git a/src/build-data/cc/xlc.txt b/src/build-data/cc/xlc.txt index e9ae41c1a..87b32746b 100644 --- a/src/build-data/cc/xlc.txt +++ b/src/build-data/cc/xlc.txt @@ -14,9 +14,6 @@ lang_flags "" debug_flags -g no_debug_flags "" -dll_import_flags "" -dll_export_flags "" - makefile_style unix -- cgit v1.2.3 From dea953ccb4b722c9cc3f4bc25c729ffcc03efb9f Mon Sep 17 00:00:00 2001 From: lloyd Date: Thu, 19 Nov 2009 23:52:03 +0000 Subject: Switch from only-static with VC++ to only a DLL. The static library is huge (60+ Mb!); the DLL should be smaller due to link-time merging making it viable to distribute binaries. --- src/build-data/cc/msvc.txt | 5 +++-- src/build-data/makefile/nmake.in | 20 +++++++++----------- src/build-data/os/windows.txt | 2 +- 3 files changed, 13 insertions(+), 14 deletions(-) (limited to 'src/build-data') diff --git a/src/build-data/cc/msvc.txt b/src/build-data/cc/msvc.txt index bbc6345bc..0df8c67d6 100644 --- a/src/build-data/cc/msvc.txt +++ b/src/build-data/cc/msvc.txt @@ -8,7 +8,8 @@ add_include_dir_option "/I" add_lib_dir_option -L add_lib_option "" -lib_opt_flags "/O2 /DBOTAN_DLL=__declspec(dllexport)" +lib_opt_flags "/O2" +shared_flags "/DBOTAN_DLL=__declspec(dllexport)" check_opt_flags "/O2" debug_flags "/Zi" no_debug_flags "" @@ -22,5 +23,5 @@ ar_command "lib" makefile_style nmake -default -> "link /DLL" +default -> "$(CXX) /LD" diff --git a/src/build-data/makefile/nmake.in b/src/build-data/makefile/nmake.in index 34c864e93..0d60c7e73 100644 --- a/src/build-data/makefile/nmake.in +++ b/src/build-data/makefile/nmake.in @@ -7,6 +7,8 @@ CHECK_OPT = %{check_opt} MACH_OPT = %{mach_opt} LANG_FLAGS = %{lang_flags} WARN_FLAGS = %{warn_flags} +SO_OBJ_FLAGS = %{shared_flags} +SO_LINK_CMD = %{so_link} LINK_TO = %{link_to} ################################################## @@ -49,13 +51,13 @@ LIBOBJS = %{lib_objs} CHECKOBJS = %{check_objs} -LIB_FLAGS = $(LIB_OPT) $(MACH_OPT) $(LANG_FLAGS) $(WARN_FLAGS) +LIB_FLAGS = $(LIB_OPT) $(MACH_OPT) $(LANG_FLAGS) $(WARN_FLAGS) $(SO_OBJ_FLAGS) CHECK_FLAGS = $(CHECK_OPT) $(LANG_FLAGS) $(WARN_FLAGS) -LIBRARIES = $(STATIC_LIB) +LIBRARIES = $(DLL) LIBNAME = libbotan -STATIC_LIB = $(LIBNAME).%{static_suffix} +DLL = $(LIBNAME).%{so_suffix} all: $(LIBRARIES) @@ -70,20 +72,16 @@ all: $(LIBRARIES) # Link Commands # ################################################## -# Link for Borland? -#ilink32 -L$(BCB)\lib -w -c -x -Gn -ap -Tpe c0x32.obj \ -# $(CHECKOBJS),check.exe,,$(LINK_TO) $(STATIC_LIB) - $(CHECK): $(LIBRARIES) $(CHECKOBJS) - link /OUT:$@.exe $(CHECKOBJS) $(STATIC_LIB) $(LINK_TO) + link /OUT:$@.exe $(CHECKOBJS) $(DLL) $(LINK_TO) -$(STATIC_LIB): $(LIBOBJS) - $(AR) /OUT:$@ /NAME:BOTAN-$(VERSION) $(LIBOBJS) +$(DLL): $(LIBOBJS) + $(CXX) $(SO_LINK_CMD) /OUT:$@ /NAME:BOTAN-$(VERSION) $(LIBOBJS) ################################################## # Misc Targets # ################################################## -static: $(STATIC_LIB) +dll: $(DLL) ################################################## # Fake Targets # diff --git a/src/build-data/os/windows.txt b/src/build-data/os/windows.txt index e2e8bb665..6951937e5 100644 --- a/src/build-data/os/windows.txt +++ b/src/build-data/os/windows.txt @@ -15,7 +15,7 @@ win32_virtual_lock -msvc +all -- cgit v1.2.3 From e02ec3a2273b72096ae789bee28333690bd02908 Mon Sep 17 00:00:00 2001 From: lloyd Date: Fri, 20 Nov 2009 00:23:05 +0000 Subject: Nmake makefile cleanups and DLL fixes --- src/build-data/makefile/nmake.in | 44 +++++++++------------------------------- 1 file changed, 10 insertions(+), 34 deletions(-) (limited to 'src/build-data') diff --git a/src/build-data/makefile/nmake.in b/src/build-data/makefile/nmake.in index 0d60c7e73..c8f089a1d 100644 --- a/src/build-data/makefile/nmake.in +++ b/src/build-data/makefile/nmake.in @@ -1,6 +1,4 @@ -################################################## -# Compiler Options # -################################################## +### Compiler Options CXX = %{cc} LIB_OPT = %{lib_opt} CHECK_OPT = %{check_opt} @@ -11,23 +9,17 @@ SO_OBJ_FLAGS = %{shared_flags} SO_LINK_CMD = %{so_link} LINK_TO = %{link_to} -################################################## -# Version Numbers # -################################################## +### Version Numbers VERSION = %{version} -################################################## -# Installation Settings # -################################################## +### Installation Settings DESTDIR = %{prefix} LIBDIR = $(DESTDIR)\%{libdir} HEADERDIR = $(DESTDIR)\%{includedir}\botan DOCDIR = $(DESTDIR)\%{docdir}\Botan-$(VERSION) -################################################## -# Aliases for Common Programs # -################################################## +### Aliases for Common Programs AR = %{ar_command} CD = @cd ECHO = @echo @@ -38,9 +30,7 @@ MKDIR_INSTALL = @md RM = @del /Q RMDIR = @rmdir -################################################## -# File Lists # -################################################## +### File Lists CHECK = check DOCS = %{doc_files} @@ -61,31 +51,19 @@ DLL = $(LIBNAME).%{so_suffix} all: $(LIBRARIES) -################################################## -# Build Commands # -################################################## +### Build Commands %{lib_build_cmds} %{check_build_cmds} -################################################## -# Link Commands # -################################################## - +### Link Commands $(CHECK): $(LIBRARIES) $(CHECKOBJS) link /OUT:$@.exe $(CHECKOBJS) $(DLL) $(LINK_TO) $(DLL): $(LIBOBJS) - $(CXX) $(SO_LINK_CMD) /OUT:$@ /NAME:BOTAN-$(VERSION) $(LIBOBJS) - -################################################## -# Misc Targets # -################################################## -dll: $(DLL) + $(SO_LINK_CMD) /Febotan $(LIBOBJS) $(LINK_TO) -################################################## -# Fake Targets # -################################################## +### Fake Targets clean: $(RM) %{build_dir}\lib\* %{build_dir}\checks\* $(RM) $(LIBRARIES) $(CHECK) @@ -98,8 +76,6 @@ distclean: clean $(RMDIR) %{build_dir} $(RM) Makefile -################################################## -# Install Commands # -################################################## +### Install Commands install: $(LIBRARIES) $(ECHO) "Install command not implemented" -- cgit v1.2.3 From 7b3ed530a124f4dc47fafe98af3d76f430df878a Mon Sep 17 00:00:00 2001 From: lloyd Date: Fri, 20 Nov 2009 01:44:15 +0000 Subject: Fix nmake's distclean and DLL inking. Add static lib to InnoSetup --- src/build-data/botan.iss.in | 6 +++--- src/build-data/makefile/nmake.in | 11 ++++++----- 2 files changed, 9 insertions(+), 8 deletions(-) (limited to 'src/build-data') diff --git a/src/build-data/botan.iss.in b/src/build-data/botan.iss.in index ee8229f3f..c0bc97fa2 100644 --- a/src/build-data/botan.iss.in +++ b/src/build-data/botan.iss.in @@ -5,18 +5,18 @@ AppName=Botan AppVerName=Botan %{version} AppPublisher=Jack Lloyd +AppCopyright=Copyright (C) 1999-2009 Jack Lloyd and others AppPublisherURL=http://botan.randombit.net/ AppVersion=%{version} DefaultDirName={pf}\botan DefaultGroupName=botan -AppCopyright=Copyright (C) 1999-2009 Jack Lloyd and others - SolidCompression=yes OutputDir=. [Files] -Source: "..\libbotan.dll"; DestDir: "{app}" +Source: "..\botan.dll"; DestDir: "{app}" +Source: "..\botan.lib"; DestDir: "{app}" Source: "include\botan\*"; DestDir: "{app}\include\botan" diff --git a/src/build-data/makefile/nmake.in b/src/build-data/makefile/nmake.in index c8f089a1d..2604a3459 100644 --- a/src/build-data/makefile/nmake.in +++ b/src/build-data/makefile/nmake.in @@ -28,6 +28,7 @@ INSTALL_CMD = %{install_cmd_exec} MKDIR = @md MKDIR_INSTALL = @md RM = @del /Q +RM_R = $(RM) /S RMDIR = @rmdir ### File Lists @@ -46,8 +47,9 @@ CHECK_FLAGS = $(CHECK_OPT) $(LANG_FLAGS) $(WARN_FLAGS) LIBRARIES = $(DLL) -LIBNAME = libbotan +LIBNAME = botan DLL = $(LIBNAME).%{so_suffix} +STATIC_LIB = $(LIBNAME).%{static_suffix} all: $(LIBRARIES) @@ -58,7 +60,7 @@ all: $(LIBRARIES) ### Link Commands $(CHECK): $(LIBRARIES) $(CHECKOBJS) - link /OUT:$@.exe $(CHECKOBJS) $(DLL) $(LINK_TO) + $(CXX) /Fe$@ $(CHECKOBJS) $(STATIC_LIB) $(LINK_TO) $(DLL): $(LIBOBJS) $(SO_LINK_CMD) /Febotan $(LIBOBJS) $(LINK_TO) @@ -69,12 +71,11 @@ clean: $(RM) $(LIBRARIES) $(CHECK) distclean: clean - $(RM) %{build_dir}\build.h - $(RM) %{build_dir}\include\botan\* + $(RM_R) %{build_dir} $(RMDIR) %{build_dir}\include\botan %{build_dir}\include $(RMDIR) %{build_dir}\lib %{build_dir}\checks $(RMDIR) %{build_dir} - $(RM) Makefile + $(RM) Makefile $(LIBNAME).* $(CHECK).* ### Install Commands install: $(LIBRARIES) -- cgit v1.2.3 From c5109ab90e958f4a385f257b5e3ff0f8d34a82b2 Mon Sep 17 00:00:00 2001 From: lloyd Date: Fri, 20 Nov 2009 01:53:37 +0000 Subject: Create installer file as botan-VERSION.exe --- configure.py | 2 +- src/build-data/botan.iss.in | 22 ---------------------- src/build-data/innosetup.in | 23 +++++++++++++++++++++++ 3 files changed, 24 insertions(+), 23 deletions(-) delete mode 100644 src/build-data/botan.iss.in create mode 100644 src/build-data/innosetup.in (limited to 'src/build-data') diff --git a/configure.py b/configure.py index 5085b2f70..82e8b6129 100755 --- a/configure.py +++ b/configure.py @@ -1102,7 +1102,7 @@ def setup_build(build_config, options, template_vars): ('botan-config.in', 'botan-config'), ('botan.pc.in', build_config.pkg_config_file()), ('botan.doxy.in', 'botan.doxy'), - ('botan.iss.in', 'botan.iss')]: + ('innosetup.in', 'botan.iss')]: templates_to_proc[os.path.join(options.build_data, template)] = \ os.path.join(build_config.build_dir, sink) diff --git a/src/build-data/botan.iss.in b/src/build-data/botan.iss.in deleted file mode 100644 index c0bc97fa2..000000000 --- a/src/build-data/botan.iss.in +++ /dev/null @@ -1,22 +0,0 @@ -; A script for packaging botan with InnoSetup - -[Setup] -AppName=Botan -AppVerName=Botan %{version} - -AppPublisher=Jack Lloyd -AppCopyright=Copyright (C) 1999-2009 Jack Lloyd and others -AppPublisherURL=http://botan.randombit.net/ -AppVersion=%{version} - -DefaultDirName={pf}\botan -DefaultGroupName=botan - -SolidCompression=yes - -OutputDir=. - -[Files] -Source: "..\botan.dll"; DestDir: "{app}" -Source: "..\botan.lib"; DestDir: "{app}" -Source: "include\botan\*"; DestDir: "{app}\include\botan" diff --git a/src/build-data/innosetup.in b/src/build-data/innosetup.in new file mode 100644 index 000000000..1054507ac --- /dev/null +++ b/src/build-data/innosetup.in @@ -0,0 +1,23 @@ +; A script for packaging botan with InnoSetup + +[Setup] +AppName=Botan +AppVerName=Botan %{version} + +AppPublisher=Jack Lloyd +AppCopyright=Copyright (C) 1999-2009 Jack Lloyd and others +AppPublisherURL=http://botan.randombit.net/ +AppVersion=%{version} + +DefaultDirName={pf}\botan +DefaultGroupName=botan + +SolidCompression=yes + +OutputDir=. +OutputBaseFilename=botan-%{version} + +[Files] +Source: "..\botan.dll"; DestDir: "{app}" +Source: "..\botan.lib"; DestDir: "{app}" +Source: "include\botan\*"; DestDir: "{app}\include\botan" -- cgit v1.2.3 From 2ff00f80e9498c22e1e75734ce6d2493c05d688f Mon Sep 17 00:00:00 2001 From: lloyd Date: Fri, 20 Nov 2009 02:29:53 +0000 Subject: Fix windows install_root --- src/build-data/os/windows.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/build-data') diff --git a/src/build-data/os/windows.txt b/src/build-data/os/windows.txt index 6951937e5..e72931c98 100644 --- a/src/build-data/os/windows.txt +++ b/src/build-data/os/windows.txt @@ -4,7 +4,7 @@ obj_suffix obj so_suffix dll static_suffix lib -install_root c:\Botan +install_root c:\\Botan doc_dir docs install_cmd_data "copy" -- cgit v1.2.3 From 54437c45c4bc40bef4435bf3f725ef2faa6fdf0a Mon Sep 17 00:00:00 2001 From: lloyd Date: Fri, 20 Nov 2009 03:19:29 +0000 Subject: Force /MD (threaded+DLL libc) with VC++. /MT is the default but seems to cause random crashes during the test suite. With /MD they go away. I don't know enough about Windows development to know what this means... I'm sure it makes sense to somebody. Anyway, going with something that appears to function. --- src/build-data/cc/msvc.txt | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'src/build-data') diff --git a/src/build-data/cc/msvc.txt b/src/build-data/cc/msvc.txt index 0df8c67d6..278aaadf4 100644 --- a/src/build-data/cc/msvc.txt +++ b/src/build-data/cc/msvc.txt @@ -25,3 +25,7 @@ makefile_style nmake default -> "$(CXX) /LD" + + +all -> "/MD" + -- cgit v1.2.3 From 34d7ecc997683562a3b639246217eb19531ab225 Mon Sep 17 00:00:00 2001 From: lloyd Date: Fri, 20 Nov 2009 03:28:11 +0000 Subject: Include the dll.manifest and exports file in the installer; I'm not sure that anyone needs either of these, but it appears like they may be useful if you're doing unusual stuff like C++/CLI. --- src/build-data/innosetup.in | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/build-data') diff --git a/src/build-data/innosetup.in b/src/build-data/innosetup.in index 1054507ac..ffe780979 100644 --- a/src/build-data/innosetup.in +++ b/src/build-data/innosetup.in @@ -19,5 +19,7 @@ OutputBaseFilename=botan-%{version} [Files] Source: "..\botan.dll"; DestDir: "{app}" +Source: "..\botan.dll.manifest"; DestDir: "{app}" +Source: "..\botan.exp"; DestDir: "{app}" Source: "..\botan.lib"; DestDir: "{app}" Source: "include\botan\*"; DestDir: "{app}\include\botan" -- cgit v1.2.3