Mercurial > trustbridge
changeset 866:8dc9b2cd20d4
merge
| author | Andre Heinecke <andre.heinecke@intevation.de> |
|---|---|
| date | Tue, 05 Aug 2014 15:34:32 +0200 |
| parents | 478bc3f42a4e (diff) 3f23130b16b2 (current diff) |
| children | ecdc279dea15 |
| files | |
| diffstat | 2 files changed, 8 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgsubstate Tue Aug 05 12:24:08 2014 +0200 +++ b/.hgsubstate Tue Aug 05 15:34:32 2014 +0200 @@ -1,1 +1,1 @@ -1e5118fa0cb1e483c7f696a774da944c10b3b00a nss-cmake-static +a945361df361ebd06a9c2663685fe1d6e485b13e nss-cmake-static
--- a/ui/createinstallerdialog.cpp Tue Aug 05 12:24:08 2014 +0200 +++ b/ui/createinstallerdialog.cpp Tue Aug 05 15:34:32 2014 +0200 @@ -293,6 +293,7 @@ } arguments << QString::fromLatin1("/D%1=%2").arg(key, value); } + arguments << QString(binDir.path() + "/trustbridge.nsi").replace("/", "\\"); #else arguments << QString::fromLatin1("-Dfiles_dir=") + mCurrentWorkingDir->path(); arguments << "-Dpath_sep=/"; @@ -304,9 +305,14 @@ } arguments << QString::fromLatin1("-D%1=%2").arg(key, value); } + arguments << binDir.path() + "/trustbridge.nsi"; #endif - arguments << binDir.path() + "/trustbridge.nsi"; + + QFileInfo nsiFile (binDir.path() + "/trustbridge.nsi"); + if (!nsiFile.exists()) { + showErrorMessage(tr("Failed to find installer script at: %1 ").arg(nsiFile.filePath())); + } qDebug() << "Starting makensis with arguments: " << arguments; mNSISProc.setArguments(arguments);