Mercurial > trustbridge
comparison ui/createinstallerdialog.cpp @ 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 | 01128d63226d |
| children | 2a1206932f53 |
comparison
equal
deleted
inserted
replaced
| 1120:9651fabca17d | 1121:a162f4cbba75 |
|---|---|
| 292 mNSISProc.setProgram("makensis"); | 292 mNSISProc.setProgram("makensis"); |
| 293 mNSISProc.setProcessChannelMode(QProcess::MergedChannels); | 293 mNSISProc.setProcessChannelMode(QProcess::MergedChannels); |
| 294 mNSISProc.setWorkingDirectory(outDir.path()); | 294 mNSISProc.setWorkingDirectory(outDir.path()); |
| 295 #ifdef Q_OS_WIN | 295 #ifdef Q_OS_WIN |
| 296 arguments << QString::fromLatin1("/Dfiles_dir=") + mCurrentWorkingDir->path().replace("/", "\\"); | 296 arguments << QString::fromLatin1("/Dfiles_dir=") + mCurrentWorkingDir->path().replace("/", "\\"); |
| 297 QString resourcedir = binDir.path() + "/resources"; | |
| 298 arguments << QString::fromLatin1("/Dplugin_dir=") + resourcedir.replace("/", "\\"); | |
| 297 arguments << "/Dpath_sep=\\"; | 299 arguments << "/Dpath_sep=\\"; |
| 298 foreach (const QString &key, keys) { | 300 foreach (const QString &key, keys) { |
| 299 QString value = options.value(key, QString()).toString(); | 301 QString value = options.value(key, QString()).toString(); |
| 300 if (key == "setupname") { | 302 if (key == "setupname") { |
| 301 value = value.arg(outDir.path().replace("/", "\\") + "\\"); | 303 value = value.arg(outDir.path().replace("/", "\\") + "\\"); |
| 304 arguments << QString::fromLatin1("/D%1=%2").arg(key, value); | 306 arguments << QString::fromLatin1("/D%1=%2").arg(key, value); |
| 305 } | 307 } |
| 306 arguments << QString(binDir.path() + "/trustbridge.nsi").replace("/", "\\"); | 308 arguments << QString(binDir.path() + "/trustbridge.nsi").replace("/", "\\"); |
| 307 #else | 309 #else |
| 308 arguments << QString::fromLatin1("-Dfiles_dir=") + mCurrentWorkingDir->path(); | 310 arguments << QString::fromLatin1("-Dfiles_dir=") + mCurrentWorkingDir->path(); |
| 311 arguments << QString::fromLatin1("-Dplugin_dir=") + binDir.path() + "/resources"; | |
| 309 arguments << "-Dpath_sep=/"; | 312 arguments << "-Dpath_sep=/"; |
| 310 foreach (const QString &key, keys) { | 313 foreach (const QString &key, keys) { |
| 311 QString value = options.value(key, QString()).toString(); | 314 QString value = options.value(key, QString()).toString(); |
| 312 if (key == "setupname") { | 315 if (key == "setupname") { |
| 313 value = value.arg(outDir.path() + "/"); | 316 value = value.arg(outDir.path() + "/"); |