Custom wizards: Enhance generator script

following suggestions. Introduce argument syntax in XML allowing for
fine-grained control of handling (omitting empty values, use
temporary files).

1 files changed, 12 insertions, 4 deletions

diff --git a/src/plugins/projectexplorer/customwizard/customwizardscriptgenerator.h b/src/plugins/projectexplorer/customwizard/customwizardscriptgenerator.h
index d47168b3f9..6010a97e1b 100644
--- a/src/plugins/projectexplorer/customwizard/customwizardscriptgenerator.h
+++ b/src/plugins/projectexplorer/customwizard/customwizardscriptgenerator.h
@@ -31,8 +31,7 @@
 #define CUSTOMWIZARDSCRIPTGENERATOR_H
 
 #include <QtCore/QMap>
-#include <QtCore/QList>
-#include <QtCore/QString>
+#include <QtCore/QStringList>
 
 namespace Core {
 class GeneratedFile;
@@ -41,6 +40,8 @@ class GeneratedFile;
 namespace ProjectExplorer {
 namespace Internal {
 
+struct GeneratorScriptArgument;
+
 /* Custom wizard script generator functions. In addition to the <file> elements
  * that define template files in which macros are replaced, it is possible to have
  * a custom wizard call a generation script (specified in the "generatorscript"
@@ -64,14 +65,21 @@ namespace Internal {
  * should create those, too.
  */
 
+// Parse the script arguments apart and expand the binary.
+QStringList fixGeneratorScript(const QString &configFile, QString attributeIn);
+
 // Step 1) Do a dry run of the generation script to get a list of files on stdout
 QList<Core::GeneratedFile>
-    dryRunCustomWizardGeneratorScript(const QString &targetPath, const QString &script,
+    dryRunCustomWizardGeneratorScript(const QString &targetPath,
+                                      const QStringList &script,
+                                      const QList<GeneratorScriptArgument> &arguments,
                                       const QMap<QString, QString> &fieldMap,
                                       QString *errorMessage);
 
 // Step 2) Generate files
-bool runCustomWizardGeneratorScript(const QString &targetPath, const QString &script,
+bool runCustomWizardGeneratorScript(const QString &targetPath,
+                                    const QStringList &script,
+                                    const QList<GeneratorScriptArgument> &arguments,
                                     const QMap<QString, QString> &fieldMap,
                                     QString *errorMessage);