From 942b0e74c13d68f6677f125b41d9a206ad772e9c Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Tue, 13 Oct 2009 16:00:16 -0600 Subject: [PATCH] Windows installer: Optionally add calibre install dir to PATH. Default is to add it, to be consistent with per 0.6.17 releases --- setup/installer/windows/util.c | 12 +++++++++--- setup/installer/windows/wix-template.xml | 9 +++++++++ 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/setup/installer/windows/util.c b/setup/installer/windows/util.c index 7aa2d019e2..fdec6d786f 100644 --- a/setup/installer/windows/util.c +++ b/setup/installer/windows/util.c @@ -105,15 +105,19 @@ wchar_t* get_app_dirw() { void load_python_dll() { - char *app_dir; - char *dll_dir, *qt_plugin_dir; + char *app_dir, *fc_dir, *fc_file, *dll_dir, *qt_plugin_dir; size_t l; + app_dir = get_app_dir(); l = strlen(app_dir)+20; dll_dir = (char*) calloc(l, sizeof(char)); + fc_dir = (char*) calloc(l, sizeof(char)); + fc_file = (char*) calloc(l, sizeof(char)); qt_plugin_dir = (char*) calloc(l, sizeof(char)); - if (!dll_dir || !qt_plugin_dir) ExitProcess(_show_error(L"Out of memory", L"", 1)); + if (!dll_dir || !qt_plugin_dir || !fc_dir) ExitProcess(_show_error(L"Out of memory", L"", 1)); _snprintf_s(dll_dir, l, _TRUNCATE, "%sDLLs", app_dir); + _snprintf_s(fc_dir, l, _TRUNCATE, "%sfontconfig", app_dir); + _snprintf_s(fc_file, l, _TRUNCATE, "%s\\fonts.conf", fc_dir); _snprintf_s(qt_plugin_dir, l, _TRUNCATE, "%sqt_plugins", app_dir); free(app_dir); @@ -121,6 +125,8 @@ void load_python_dll() { _putenv_s("MAGICK_CONFIGURE_PATH", dll_dir); _putenv_s("MAGICK_CODER_MODULE_PATH", dll_dir); _putenv_s("MAGICK_FILTER_MODULE_PATH", dll_dir); + _putenv_s("FC_CONFIG_DIR", fc_dir); + _putenv_s("FC_CONFIG_FILE", fc_file); _putenv_s("QT_PLUGIN_PATH", qt_plugin_dir); if (!SetDllDirectoryA(dll_dir)) ExitProcess(show_last_error(L"Failed to set DLL directory.")); diff --git a/setup/installer/windows/wix-template.xml b/setup/installer/windows/wix-template.xml index 015ef8c87b..8ef2de1f83 100644 --- a/setup/installer/windows/wix-template.xml +++ b/setup/installer/windows/wix-template.xml @@ -24,6 +24,10 @@ {app_components} + + + + @@ -84,6 +88,11 @@ Description="Shortcut to {app} on your desktop"> + + + +