From f25b8994eaa85b024fe9b2fd5cf55ef30eff909a Mon Sep 17 00:00:00 2001
From: Niels Weber <niels.weber@digia.com>
Date: Wed, 7 Aug 2013 13:40:13 +0200
Subject: Documented two more predefined variables.

Also allow uppercase variable names and document those.
Also update the config.xml files in the examples to uppercase.

Task-number: QTIFW-257

Change-Id: I446ed4e537cb7c15f49ba3071a9ab6591aab3329
Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
---
 doc/scripting.qdoc                               | 6 ++++++
 examples/changeuserinterface/config/config.xml   | 2 +-
 examples/modifyextract/config/config.xml         | 2 +-
 examples/quit_installer/config/config.xml        | 2 +-
 examples/registerfileextension/config/config.xml | 2 +-
 examples/startmenu/config/config.xml             | 2 +-
 examples/tutorial/config/config.xml              | 2 +-
 src/libs/installer/packagemanagercoredata.cpp    | 2 ++
 8 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/doc/scripting.qdoc b/doc/scripting.qdoc
index d0094575c..38fced90e 100644
--- a/doc/scripting.qdoc
+++ b/doc/scripting.qdoc
@@ -246,6 +246,12 @@
         \row
             \o  os
             \o  Current platform: \c "x11", \c "win", or \c "mac".
+        \row
+            \o  RootDir
+            \o  Root directory of the filesystem.
+        \row
+            \o  HomeDir
+            \o  Home directory of the current user.
     \endtable
 
     The variables can be resolved by calls to \c installer.value(). If embedded
diff --git a/examples/changeuserinterface/config/config.xml b/examples/changeuserinterface/config/config.xml
index cf9eb26f7..c00f6c705 100644
--- a/examples/changeuserinterface/config/config.xml
+++ b/examples/changeuserinterface/config/config.xml
@@ -5,5 +5,5 @@
     <Title>Change installer UI Example</Title>
     <Publisher>Qt-Project</Publisher>
     <StartMenuDir>Change installer UI Example</StartMenuDir>
-    <TargetDir>@homeDir@/IFWChangeInstallerUIExample</TargetDir>
+    <TargetDir>@HomeDir@/IFWChangeInstallerUIExample</TargetDir>
 </Installer>
diff --git a/examples/modifyextract/config/config.xml b/examples/modifyextract/config/config.xml
index bb2c18ce4..2f365dbcc 100644
--- a/examples/modifyextract/config/config.xml
+++ b/examples/modifyextract/config/config.xml
@@ -5,5 +5,5 @@
     <Title>Modify extract Installer Example</Title>
     <Publisher>Qt-Project</Publisher>
     <StartMenuDir>Qt Installer Framework Example</StartMenuDir>
-    <TargetDir>@homeDir@/IFWModifyExtractInstallerExample</TargetDir>
+    <TargetDir>@HomeDir@/IFWModifyExtractInstallerExample</TargetDir>
 </Installer>
diff --git a/examples/quit_installer/config/config.xml b/examples/quit_installer/config/config.xml
index a38254d30..36717025c 100644
--- a/examples/quit_installer/config/config.xml
+++ b/examples/quit_installer/config/config.xml
@@ -5,5 +5,5 @@
     <Title>Quit Installer Example</Title>
     <Publisher>Qt-Project</Publisher>
     <StartMenuDir>Qt Installer Framework Example</StartMenuDir>
-    <TargetDir>@homeDir@/IFWQuitInstallerExample</TargetDir>
+    <TargetDir>@HomeDir@/IFWQuitInstallerExample</TargetDir>
 </Installer>
diff --git a/examples/registerfileextension/config/config.xml b/examples/registerfileextension/config/config.xml
index 6e6db7843..fbc5e3b79 100644
--- a/examples/registerfileextension/config/config.xml
+++ b/examples/registerfileextension/config/config.xml
@@ -5,5 +5,5 @@
     <Title>Register File Extension Example</Title>
     <Publisher>Qt-Project</Publisher>
     <StartMenuDir>Register File Extension Example</StartMenuDir>
-    <TargetDir>@homeDir@/IFWRegisterFileExtensionExample</TargetDir>
+    <TargetDir>@HomeDir@/IFWRegisterFileExtensionExample</TargetDir>
 </Installer>
diff --git a/examples/startmenu/config/config.xml b/examples/startmenu/config/config.xml
index 9a06186d3..e95445d1b 100644
--- a/examples/startmenu/config/config.xml
+++ b/examples/startmenu/config/config.xml
@@ -6,5 +6,5 @@
     <Publisher>Qt-Project</Publisher>
     <!-- Directory name is used in component.xml -->
     <StartMenuDir>Qt Installer Framework Example</StartMenuDir>
-    <TargetDir>@homeDir@/IFWStartMenuExample</TargetDir>
+    <TargetDir>@HomeDir@/IFWStartMenuExample</TargetDir>
 </Installer>
diff --git a/examples/tutorial/config/config.xml b/examples/tutorial/config/config.xml
index 235434776..6ffb2e3e8 100644
--- a/examples/tutorial/config/config.xml
+++ b/examples/tutorial/config/config.xml
@@ -5,5 +5,5 @@
     <Title>Your application Installer</Title>
     <Publisher>Your vendor</Publisher>
     <StartMenuDir>Super App</StartMenuDir>
-    <TargetDir>@rootDir@InstallationDirectory</TargetDir>
+    <TargetDir>@RootDir@InstallationDirectory</TargetDir>
 </Installer>
diff --git a/src/libs/installer/packagemanagercoredata.cpp b/src/libs/installer/packagemanagercoredata.cpp
index efc83f520..2294a8086 100644
--- a/src/libs/installer/packagemanagercoredata.cpp
+++ b/src/libs/installer/packagemanagercoredata.cpp
@@ -57,6 +57,8 @@ PackageManagerCoreData::PackageManagerCoreData(const QHash<QString, QString> &va
     // in a script or...
     m_variables.insert(QLatin1String("rootDir"), QDir::rootPath());
     m_variables.insert(QLatin1String("homeDir"), QDir::homePath());
+    m_variables.insert(QLatin1String("RootDir"), QDir::rootPath());
+    m_variables.insert(QLatin1String("HomeDir"), QDir::homePath());
     m_variables.insert(scTargetConfigurationFile, QLatin1String("components.xml"));
 
 #ifdef Q_OS_WIN
-- 
cgit v1.2.3