Roll the global getEnv and currentEnv functions into Environment.

Change-Id: Ife3f9c53ad3fb43364c53fe7c6c08aa3983b9221
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>

7 files changed, 16 insertions, 9 deletions

diff --git a/share/qbs/imports/qbs/Probes/AndroidNdkProbe.qbs b/share/qbs/imports/qbs/Probes/AndroidNdkProbe.qbs
index 29e954891..18d30faae 100644
--- a/share/qbs/imports/qbs/Probes/AndroidNdkProbe.qbs
+++ b/share/qbs/imports/qbs/Probes/AndroidNdkProbe.qbs
@@ -29,6 +29,7 @@
 ****************************************************************************/
 
 import qbs
+import qbs.Environment
 import qbs.File
 import qbs.FileInfo
 
@@ -36,7 +37,7 @@ PathProbe {
     // Inputs
     property stringList hostOS: qbs.hostOS
 
-    environmentPaths: qbs.getEnv("ANDROID_NDK_ROOT")
+    environmentPaths: Environment.getEnv("ANDROID_NDK_ROOT")
 
     // Outputs
     property var hostArch
diff --git a/share/qbs/imports/qbs/Probes/AndroidSdkProbe.qbs b/share/qbs/imports/qbs/Probes/AndroidSdkProbe.qbs
index 372e1a0ce..fb004703c 100644
--- a/share/qbs/imports/qbs/Probes/AndroidSdkProbe.qbs
+++ b/share/qbs/imports/qbs/Probes/AndroidSdkProbe.qbs
@@ -29,12 +29,13 @@
 ****************************************************************************/
 
 import qbs
+import qbs.Environment
 import qbs.File
 import qbs.FileInfo
 import "../../../modules/Android/sdk/utils.js" as SdkUtils
 
 PathProbe {
-    environmentPaths: qbs.getEnv("ANDROID_HOME")
+    environmentPaths: Environment.getEnv("ANDROID_HOME")
 
     // Outputs
     property var buildToolsVersions
diff --git a/share/qbs/imports/qbs/Probes/JdkProbe.qbs b/share/qbs/imports/qbs/Probes/JdkProbe.qbs
index b67d59177..00672a197 100644
--- a/share/qbs/imports/qbs/Probes/JdkProbe.qbs
+++ b/share/qbs/imports/qbs/Probes/JdkProbe.qbs
@@ -29,6 +29,7 @@
 ****************************************************************************/
 
 import qbs
+import qbs.Environment
 import qbs.File
 import qbs.FileInfo
 import qbs.Process
@@ -39,7 +40,7 @@ PathProbe {
     property stringList hostOS: qbs.hostOS
     property string architecture: qbs.architecture
 
-    environmentPaths: qbs.getEnv("JAVA_HOME")
+    environmentPaths: Environment.getEnv("JAVA_HOME")
     platformPaths: [
         "/usr/lib/jvm/default-java", // Debian/Ubuntu
         "/etc/alternatives/java_sdk_openjdk", // Fedora
diff --git a/share/qbs/imports/qbs/Probes/NodeJsProbe.qbs b/share/qbs/imports/qbs/Probes/NodeJsProbe.qbs
index b0e2dfca0..ecaf91180 100644
--- a/share/qbs/imports/qbs/Probes/NodeJsProbe.qbs
+++ b/share/qbs/imports/qbs/Probes/NodeJsProbe.qbs
@@ -29,6 +29,7 @@
 ****************************************************************************/
 
 import qbs
+import qbs.Environment
 import qbs.FileInfo
 
 BinaryProbe {
@@ -36,8 +37,8 @@ BinaryProbe {
     platformPaths: {
         var paths = base;
         if (qbs.hostOS.contains("windows")) {
-            var env32 = qbs.getEnv("PROGRAMFILES(X86)");
-            var env64 = qbs.getEnv("PROGRAMFILES");
+            var env32 = Environment.getEnv("PROGRAMFILES(X86)");
+            var env64 = Environment.getEnv("PROGRAMFILES");
             if (env64 === env32 && env64.endsWith(" (x86)"))
                 env64 = env64.slice(0, -(" (x86)".length)); // QTBUG-3845
             paths.push(FileInfo.joinPaths(env64, "nodejs"));
diff --git a/share/qbs/imports/qbs/Probes/path-probe.js b/share/qbs/imports/qbs/Probes/path-probe.js
index 418d451ff..4f634876a 100644
--- a/share/qbs/imports/qbs/Probes/path-probe.js
+++ b/share/qbs/imports/qbs/Probes/path-probe.js
@@ -28,6 +28,7 @@
 **
 ****************************************************************************/
 
+var Environment = loadExtension("qbs.Environment");
 var File = loadExtension("qbs.File");
 var FileInfo = loadExtension("qbs.FileInfo");
 var ModUtils = loadExtension("qbs.ModUtils");
@@ -47,7 +48,7 @@ function configure(names, nameSuffixes, nameFilter, pathPrefixes, pathSuffixes,
     // FIXME: Add getenv support
     var envs = ModUtils.concatAll(platformEnvironmentPaths, environmentPaths);
     for (var i = 0; i < envs.length; ++i) {
-        var value = qbs.getEnv(envs[i]) || '';
+        var value = Environment.getEnv(envs[i]) || '';
         if (value.length > 0)
             _paths = _paths.concat(value.split(pathListSeparator));
     }
diff --git a/share/qbs/modules/qbs/common.qbs b/share/qbs/modules/qbs/common.qbs
index 733a3096f..c0c05e114 100644
--- a/share/qbs/modules/qbs/common.qbs
+++ b/share/qbs/modules/qbs/common.qbs
@@ -29,6 +29,7 @@
 ****************************************************************************/
 
 import qbs 1.0
+import qbs.Environment
 import qbs.FileInfo
 import qbs.ModUtils
 import qbs.PathTools
@@ -120,10 +121,10 @@ Module {
     // private properties
     property string windowsRegistryKey: "HKEY_LOCAL_MACHINE\\Software\\Microsoft\\Windows NT\\CurrentVersion"
     property path windowsSystemRoot: FileInfo.fromWindowsSeparators(Utilities.getNativeSetting(windowsRegistryKey, "SystemRoot"))
-    property path windowsShellPath: FileInfo.fromWindowsSeparators(getEnv("COMSPEC")) || FileInfo.joinPaths(windowsSystemRoot, "System32", "cmd.exe")
+    property path windowsShellPath: FileInfo.fromWindowsSeparators(Environment.getEnv("COMSPEC")) || FileInfo.joinPaths(windowsSystemRoot, "System32", "cmd.exe")
 
     property var commonRunEnvironment: {
-        var env = qbs.currentEnv();
+        var env = Environment.currentEnv();
         if (targetOS.contains("windows")) {
             var newEntry = FileInfo.toWindowsSeparators(FileInfo.joinPaths(installRoot,
                                                                            installPrefix));
diff --git a/share/qbs/modules/xcode/xcode.qbs b/share/qbs/modules/xcode/xcode.qbs
index ad54b6cd2..f9b717867 100644
--- a/share/qbs/modules/xcode/xcode.qbs
+++ b/share/qbs/modules/xcode/xcode.qbs
@@ -1,5 +1,6 @@
 import qbs
 import qbs.BundleTools
+import qbs.Environment
 import qbs.File
 import qbs.FileInfo
 import qbs.DarwinTools
@@ -108,7 +109,7 @@ Module {
     }
 
     property path provisioningProfilesPath: {
-        return FileInfo.joinPaths(qbs.getEnv("HOME"), "Library/MobileDevice/Provisioning Profiles");
+        return FileInfo.joinPaths(Environment.getEnv("HOME"), "Library/MobileDevice/Provisioning Profiles");
     }
 
     readonly property var _availableSdks: Utils.sdkInfoList(sdksPath)