Mercurial > trustbridge
changeset 1121:a162f4cbba75
(issue54) Handle plugin dir in create-dist-package and on installer creation.
| author | Andre Heinecke <andre.heinecke@intevation.de> |
|---|---|
| date | Wed, 17 Sep 2014 10:57:54 +0200 |
| parents | 9651fabca17d |
| children | 4a17c9f977d0 |
| files | packaging/create-dist-package.sh.in ui/createinstallerdialog.cpp |
| diffstat | 2 files changed, 6 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/packaging/create-dist-package.sh.in Wed Sep 17 09:15:47 2014 +0200 +++ b/packaging/create-dist-package.sh.in Wed Sep 17 10:57:54 2014 +0200 @@ -40,11 +40,12 @@ cp @CMAKE_SOURCE_DIR@/build-windows/ui/trustbridge.exe $TMPDIR/windows cp @CMAKE_SOURCE_DIR@/build-windows/cinst/cinst.exe $TMPDIR/windows cp @CMAKE_SOURCE_DIR@/build-windows/cinst/mozilla.exe $TMPDIR/windows +cp -r @CMAKE_SOURCE_DIR@/packaging/resources $TMPDIR/resources +cp @CMAKE_SOURCE_DIR@/build-windows/packaging/DesktopShellRun.dll $TMPDIR/resources cp -r @CMAKE_BINARY_DIR@/manuals/help-manual/html $TMPDIR/windows/doc cp @CMAKE_SOURCE_DIR@/packaging/filelist.nsh $TMPDIR cp @CMAKE_SOURCE_DIR@/packaging/trustbridge.nsi $TMPDIR -cp -r @CMAKE_SOURCE_DIR@/packaging/resources $TMPDIR/resources LC_ALL="de_DE.latin-1" echo "company=Bundesamt für Sicherheit in der Informationstechnik" > $TMPDIR/meta.ini EST_SIZE=$(du -s $TMPDIR/windows | cut -f 1) echo "version_number=@PROJECT_VERSION@" >> $TMPDIR/meta.ini @@ -58,7 +59,7 @@ # Create a temporary NSIS file for the uninstaller cration LC_ALL="de_DE.latin-1" makensis -Dfiles_dir=$TMPDIR/windows \ -Dcompany="Bundesamt für Sicherheit in der Informationstechnik" \ - -Dplugin_dir="@CMAKE_CURRENT_BINARY_DIR@" \ + -Dplugin_dir="$TMPDIR/resources" \ -Dversion_number=@PROJECT_VERSION@ \ -Dsetupname="$TMPDIR/TrustBridge-@PROJECT_VERSION@-uni.exe" \ -Dproductname="TrustBridge" \
--- a/ui/createinstallerdialog.cpp Wed Sep 17 09:15:47 2014 +0200 +++ b/ui/createinstallerdialog.cpp Wed Sep 17 10:57:54 2014 +0200 @@ -294,6 +294,8 @@ mNSISProc.setWorkingDirectory(outDir.path()); #ifdef Q_OS_WIN arguments << QString::fromLatin1("/Dfiles_dir=") + mCurrentWorkingDir->path().replace("/", "\\"); + QString resourcedir = binDir.path() + "/resources"; + arguments << QString::fromLatin1("/Dplugin_dir=") + resourcedir.replace("/", "\\"); arguments << "/Dpath_sep=\\"; foreach (const QString &key, keys) { QString value = options.value(key, QString()).toString(); @@ -306,6 +308,7 @@ arguments << QString(binDir.path() + "/trustbridge.nsi").replace("/", "\\"); #else arguments << QString::fromLatin1("-Dfiles_dir=") + mCurrentWorkingDir->path(); + arguments << QString::fromLatin1("-Dplugin_dir=") + binDir.path() + "/resources"; arguments << "-Dpath_sep=/"; foreach (const QString &key, keys) { QString value = options.value(key, QString()).toString();