From a1c5fb7d5d6e28f736933b91ea2948b2f91156a6 Mon Sep 17 00:00:00 2001 From: Christian Stimming Date: Fri, 20 Jul 2007 21:59:19 +0000 Subject: [PATCH] Ship the gnucash binary including the Qt DLLs. #457228 git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@16341 57a11ea4-9604-0410-9ed3-97b8803252fd --- packaging/win32/dist.sh | 6 +++++- packaging/win32/gnucash.iss.in | 11 +++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/packaging/win32/dist.sh b/packaging/win32/dist.sh index 255b0d213a..68f12bcbdb 100755 --- a/packaging/win32/dist.sh +++ b/packaging/win32/dist.sh @@ -185,7 +185,11 @@ function dist_gnucash() { mkdir -p $DIST_UDIR/share cp -a $_INSTALL_UDIR/share/{gnucash,pixmaps,xml} $DIST_UDIR/share cp -a $_REPOS_UDIR/packaging/win32/install-fq-mods.bat $DIST_UDIR/bin - cp -a $_BUILD_UDIR/packaging/win32/gnucash.iss $_GNUCASH_UDIR + + _QTDIR_WIN=`echo $QTDIR | sed 's,^/\([A-Za-z]\)/,\1:/,g' ` + sed < $_BUILD_UDIR/packaging/win32/gnucash.iss \ + > $_GNUCASH_UDIR/gnucash.iss \ + -e "s#@-qtbindir-@#${_QTDIR_WIN}/bin#g" } function finish() { diff --git a/packaging/win32/gnucash.iss.in b/packaging/win32/gnucash.iss.in index 07551fcf01..04f8c7ac92 100644 --- a/packaging/win32/gnucash.iss.in +++ b/packaging/win32/gnucash.iss.in @@ -77,6 +77,17 @@ Source: "@prefix@\..\dist\lib\*"; DestDir: "{app}\lib"; Flags: recursesubdirs; C Source: "@prefix@\..\dist\libexec\*"; DestDir: "{app}\libexec"; Flags: recursesubdirs; Components: main Source: "@prefix@\..\dist\share\*"; DestDir: "{app}\share"; Flags: recursesubdirs; Components: main +; Additionally, we ship the Qt DLLs because the Online-Banking-Wizard +; lib/aqbanking/plugins/16/wizards/qt3-wizard.exe needs them. +Source: "@-qtbindir-@\QtCore4.dll"; DestDir: "{app}\bin"; Flags: ignoreversion +Source: "@-qtbindir-@\QtGui4.dll"; DestDir: "{app}\bin"; Flags: ignoreversion +Source: "@-qtbindir-@\mingwm10.dll"; DestDir: "{app}\bin"; Flags: ignoreversion +; The following are all needed by Qt3Support +Source: "@-qtbindir-@\Qt3Support4.dll"; DestDir: "{app}\bin"; Flags: ignoreversion +Source: "@-qtbindir-@\QtXml4.dll"; DestDir: "{app}\bin"; Flags: ignoreversion +Source: "@-qtbindir-@\QtSql4.dll"; DestDir: "{app}\bin"; Flags: ignoreversion +Source: "@-qtbindir-@\QtNetwork4.dll"; DestDir: "{app}\bin"; Flags: ignoreversion + ;; The translations (no idea why mingw installs them in prefix/lib/locale) ;Source: "@prefix@\..\dist\lib\locale\*"; DestDir: "{app}\lib\locale"; Flags: recursesubdirs; Components: translations ;