Mercurial > trustbridge
comparison ui/createinstallerdialog.cpp @ 537:522b4e28c073
Use windows argument format for nsis on windows
| author | Andre Heinecke <aheinecke@intevation.de> |
|---|---|
| date | Tue, 29 Apr 2014 17:52:19 +0000 |
| parents | f6371e9c959a |
| children | 0290adbdc380 |
comparison
equal
deleted
inserted
replaced
| 536:82770fa41af9 | 537:522b4e28c073 |
|---|---|
| 204 /* Copy windows directory contents to tmpdir */ | 204 /* Copy windows directory contents to tmpdir */ |
| 205 QStringList arguments; | 205 QStringList arguments; |
| 206 mNSISProc.setProgram("makensis"); | 206 mNSISProc.setProgram("makensis"); |
| 207 mNSISProc.setProcessChannelMode(QProcess::MergedChannels); | 207 mNSISProc.setProcessChannelMode(QProcess::MergedChannels); |
| 208 mNSISProc.setWorkingDirectory(outDir.path()); | 208 mNSISProc.setWorkingDirectory(outDir.path()); |
| 209 #ifdef Q_OS_WIN | |
| 210 arguments << QString::fromLatin1("/Dfiles_dir=") + binDir.path() + "/windows"; | |
| 211 foreach (const QString &key, keys) { | |
| 212 arguments << QString::fromLatin1("/D%1=%2").arg(key, | |
| 213 options.value(key, QString()).toString()); | |
| 214 } | |
| 215 #else | |
| 209 arguments << QString::fromLatin1("-Dfiles_dir=") + binDir.path() + "/windows"; | 216 arguments << QString::fromLatin1("-Dfiles_dir=") + binDir.path() + "/windows"; |
| 210 foreach (const QString &key, keys) { | 217 foreach (const QString &key, keys) { |
| 211 arguments << QString::fromLatin1("-D%1=%2").arg(key, | 218 arguments << QString::fromLatin1("-D%1=%2").arg(key, |
| 212 options.value(key, QString()).toString()); | 219 options.value(key, QString()).toString()); |
| 213 } | 220 } |
| 221 #endif | |
| 214 | 222 |
| 215 arguments << binDir.path() + "/trustbridge.nsi"; | 223 arguments << binDir.path() + "/trustbridge.nsi"; |
| 216 | 224 |
| 217 qDebug() << "Starting makensis with arguments: " << arguments; | 225 qDebug() << "Starting makensis with arguments: " << arguments; |
| 218 mNSISProc.setArguments(arguments); | 226 mNSISProc.setArguments(arguments); |