[PATCH] Provide path_sep as a variable to make it possible to reuse filelist

[Wald Commits]

# HG changeset patch
# User Andre Heinecke <aheinecke at intevation.de>
# Date 1398794804 0
# Node ID 81d6657757f3319e90ad3e38b843147815c8107b
# Parent  0290adbdc380f1e00ad4b17743801721d9bc1f1b
Provide path_sep as a variable to make it possible to reuse filelist

diff -r 0290adbdc380 -r 81d6657757f3 packaging/filelist.nsh
--- a/packaging/filelist.nsh	Tue Apr 29 18:00:55 2014 +0000
+++ b/packaging/filelist.nsh	Tue Apr 29 18:06:44 2014 +0000
@@ -8,19 +8,19 @@
 ; This file is not autogenerated.
 ; Keep it updated if you add new things.
 
-File "${files_dir}/cinst.exe"
-File "${files_dir}/trustbridge.exe"
-File "${files_dir}/mozilla.exe"
+File "${files_dir}${path_sep}cinst.exe"
+File "${files_dir}${path_sep}trustbridge.exe"
+File "${files_dir}${path_sep}mozilla.exe"
 
 ; NSS: This should ultimately be static
-File "${files_dir}/nssckbi.dll"
-File "${files_dir}/smime3.dll"
-File "${files_dir}/nss3.dll"
-File "${files_dir}/nssdbm3.dll"
-File "${files_dir}/softokn3.dll"
-File "${files_dir}/sqlite3.dll"
-File "${files_dir}/freebl3.dll"
-File "${files_dir}/nssutil3.dll"
-File "${files_dir}/libplc4.dll"
-File "${files_dir}/libplds4.dll"
-File "${files_dir}/libnspr4.dll"
+File "${files_dir}${path_sep}nssckbi.dll"
+File "${files_dir}${path_sep}smime3.dll"
+File "${files_dir}${path_sep}nss3.dll"
+File "${files_dir}${path_sep}nssdbm3.dll"
+File "${files_dir}${path_sep}softokn3.dll"
+File "${files_dir}${path_sep}sqlite3.dll"
+File "${files_dir}${path_sep}freebl3.dll"
+File "${files_dir}${path_sep}nssutil3.dll"
+File "${files_dir}${path_sep}libplc4.dll"
+File "${files_dir}${path_sep}libplds4.dll"
+File "${files_dir}${path_sep}libnspr4.dll"
diff -r 0290adbdc380 -r 81d6657757f3 ui/createinstallerdialog.cpp
--- a/ui/createinstallerdialog.cpp	Tue Apr 29 18:00:55 2014 +0000
+++ b/ui/createinstallerdialog.cpp	Tue Apr 29 18:06:44 2014 +0000
@@ -208,6 +208,7 @@
     mNSISProc.setWorkingDirectory(outDir.path());
 #ifdef Q_OS_WIN
     arguments << QString::fromLatin1("/Dfiles_dir=") + binDir.path().replace("/", "\\") + "\\windows";
+    arguments << "/Dpath_sep=\\"
     foreach (const QString &key, keys) {
         arguments << QString::fromLatin1("/D%1=%2").arg(key,
                 options.value(key, QString()).toString());
@@ -218,6 +219,7 @@
         arguments << QString::fromLatin1("-D%1=%2").arg(key,
                 options.value(key, QString()).toString());
     }
+    arguments << "-Dpath_sep=/"
 #endif
 
     arguments << binDir.path() + "/trustbridge.nsi";