summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--doc/reference/items/module.qdoc2
-rw-r--r--doc/reference/jsextensions/jsextensions-general.qdoc4
-rw-r--r--share/qbs/imports/qbs/Probes/PathProbe.qbs2
-rw-r--r--share/qbs/modules/Qt/core/core.qbs4
-rw-r--r--share/qbs/modules/utils.js4
-rw-r--r--src/lib/language/evaluatorscriptclass.cpp8
-rw-r--r--src/lib/language/evaluatorscriptclass.h4
-rw-r--r--src/lib/language/language.cpp20
-rw-r--r--src/lib/language/moduleloader.cpp5
-rw-r--r--src/lib/language/testdata/environmentvariable.qbs2
-rw-r--r--tests/auto/blackbox/testdata/propertyChanges/project.qbs2
-rw-r--r--tests/auto/blackbox/testdata/trackExternalProductChanges/project.qbs2
12 files changed, 34 insertions, 25 deletions
diff --git a/doc/reference/items/module.qdoc b/doc/reference/items/module.qdoc
index 5a28266b4..0cc7707b9 100644
--- a/doc/reference/items/module.qdoc
+++ b/doc/reference/items/module.qdoc
@@ -59,7 +59,7 @@
\li script
\li \c undefined
\li Script for setting up the environment in which the project is built.
- Use the \c putenv and \c getenv functions to alter the environment.
+ Use the \c putEnv and \c getEnv functions to alter the environment.
The return value of this script is ignored.
\row
\li setupRunEnvironment
diff --git a/doc/reference/jsextensions/jsextensions-general.qdoc b/doc/reference/jsextensions/jsextensions-general.qdoc
index d503f6c8c..8c14360df 100644
--- a/doc/reference/jsextensions/jsextensions-general.qdoc
+++ b/doc/reference/jsextensions/jsextensions-general.qdoc
@@ -40,9 +40,9 @@
\section1 Available Operations
- \section2 getenv
+ \section2 getEnv
\code
- qbs.getenv(name)
+ qbs.getEnv(name)
\endcode
Tries to find a variable with the given name in the build environment and returns its value. If
no such variable could be found, \c undefined is returned.
diff --git a/share/qbs/imports/qbs/Probes/PathProbe.qbs b/share/qbs/imports/qbs/Probes/PathProbe.qbs
index 29a5a050d..26871dc22 100644
--- a/share/qbs/imports/qbs/Probes/PathProbe.qbs
+++ b/share/qbs/imports/qbs/Probes/PathProbe.qbs
@@ -29,7 +29,7 @@ Probe {
// FIXME: Add getenv support
var envs = Utils.concatAll(platformEnvironmentPaths, environmentPaths);
for (var i = 0; i < envs.length; ++i) {
- var value = qbs.getenv(envs[i]) || '';
+ var value = qbs.getEnv(envs[i]) || '';
if (value.length > 0)
_paths = _paths.concat(value.split(qbs.pathListSeparator));
}
diff --git a/share/qbs/modules/Qt/core/core.qbs b/share/qbs/modules/Qt/core/core.qbs
index 0c2ba0088..64742406e 100644
--- a/share/qbs/modules/Qt/core/core.qbs
+++ b/share/qbs/modules/Qt/core/core.qbs
@@ -169,11 +169,11 @@ Module {
setupRunEnvironment: {
if (qbs.targetOS.contains('windows')) {
- var v = getenv('PATH') || '';
+ var v = getEnv('PATH') || '';
if (v.length > 0 && v.charAt(0) != ';')
v = ';' + v;
v = FileInfo.toWindowsSeparators(binPath) + v;
- putenv('PATH', v);
+ putEnv('PATH', v);
}
}
diff --git a/share/qbs/modules/utils.js b/share/qbs/modules/utils.js
index 9d187d01f..5b3349ca6 100644
--- a/share/qbs/modules/utils.js
+++ b/share/qbs/modules/utils.js
@@ -156,7 +156,7 @@ function EnvironmentVariable(name, separator, convertPathSeparators)
if (!name)
throw "EnvironmentVariable c'tor needs a name as first argument."
this.name = name
- this.value = getenv(name).toString()
+ this.value = getEnv(name).toString()
this.separator = separator || ''
this.convertPathSeparators = convertPathSeparators || false
}
@@ -181,6 +181,6 @@ EnvironmentVariable.prototype.append = function(v)
EnvironmentVariable.prototype.set = function()
{
- putenv(this.name, this.value)
+ putEnv(this.name, this.value)
}
diff --git a/src/lib/language/evaluatorscriptclass.cpp b/src/lib/language/evaluatorscriptclass.cpp
index 38ca7c257..7d5100812 100644
--- a/src/lib/language/evaluatorscriptclass.cpp
+++ b/src/lib/language/evaluatorscriptclass.cpp
@@ -224,7 +224,7 @@ EvaluatorScriptClass::EvaluatorScriptClass(QScriptEngine *scriptEngine, const Lo
, m_logger(logger)
{
m_getNativeSettingBuiltin = scriptEngine->newFunction(js_getNativeSetting, 3);
- m_getenvBuiltin = scriptEngine->newFunction(js_getenv, 1);
+ m_getEnvBuiltin = scriptEngine->newFunction(js_getEnv, 1);
m_getHostOSBuiltin = scriptEngine->newFunction(js_getHostOS, 1);
m_canonicalArchitectureBuiltin = scriptEngine->newFunction(js_canonicalArchitecture, 1);
}
@@ -394,7 +394,7 @@ QScriptValue EvaluatorScriptClass::scriptValueForBuiltin(BuiltinValue::Builtin b
case BuiltinValue::GetNativeSettingFunction:
return m_getNativeSettingBuiltin;
case BuiltinValue::GetEnvFunction:
- return m_getenvBuiltin;
+ return m_getEnvBuiltin;
case BuiltinValue::GetHostOSFunction:
return m_getHostOSBuiltin;
case BuiltinValue::CanonicalArchitectureFunction:
@@ -424,11 +424,11 @@ QScriptValue EvaluatorScriptClass::js_getNativeSetting(QScriptContext *context,
return value.isNull() ? engine->undefinedValue() : engine->toScriptValue(value);
}
-QScriptValue EvaluatorScriptClass::js_getenv(QScriptContext *context, QScriptEngine *engine)
+QScriptValue EvaluatorScriptClass::js_getEnv(QScriptContext *context, QScriptEngine *engine)
{
if (Q_UNLIKELY(context->argumentCount() < 1)) {
return context->throwError(QScriptContext::SyntaxError,
- QLatin1String("getenv expects 1 argument"));
+ QLatin1String("getEnv expects 1 argument"));
}
const QString name = context->argument(0).toString();
ScriptEngine * const e = static_cast<ScriptEngine *>(engine);
diff --git a/src/lib/language/evaluatorscriptclass.h b/src/lib/language/evaluatorscriptclass.h
index 20bd223bc..bfa39685f 100644
--- a/src/lib/language/evaluatorscriptclass.h
+++ b/src/lib/language/evaluatorscriptclass.h
@@ -65,7 +65,7 @@ private:
static QString resultToString(const QScriptValue &scriptValue);
static Item *findParentOfType(const Item *item, const QString &typeName);
static QScriptValue js_getNativeSetting(QScriptContext *context, QScriptEngine *engine);
- static QScriptValue js_getenv(QScriptContext *context, QScriptEngine *engine);
+ static QScriptValue js_getEnv(QScriptContext *context, QScriptEngine *engine);
static QScriptValue js_getHostOS(QScriptContext *context, QScriptEngine *engine);
static QScriptValue js_canonicalArchitecture(QScriptContext *context, QScriptEngine *engine);
@@ -87,7 +87,7 @@ private:
QueryResult m_queryResult;
Logger m_logger;
QScriptValue m_getNativeSettingBuiltin;
- QScriptValue m_getenvBuiltin;
+ QScriptValue m_getEnvBuiltin;
QScriptValue m_getHostOSBuiltin;
QScriptValue m_canonicalArchitectureBuiltin;
};
diff --git a/src/lib/language/language.cpp b/src/lib/language/language.cpp
index 3fee4a759..2d0448abf 100644
--- a/src/lib/language/language.cpp
+++ b/src/lib/language/language.cpp
@@ -474,21 +474,21 @@ QList<const ResolvedModule*> topSortModules(const QHash<const ResolvedModule*, Q
return result;
}
-static QScriptValue js_getenv(QScriptContext *context, QScriptEngine *engine)
+static QScriptValue js_getEnv(QScriptContext *context, QScriptEngine *engine)
{
if (Q_UNLIKELY(context->argumentCount() < 1))
return context->throwError(QScriptContext::SyntaxError,
- QLatin1String("getenv expects 1 argument"));
+ QLatin1String("getEnv expects 1 argument"));
QVariant v = engine->property("_qbs_procenv");
QProcessEnvironment *procenv = reinterpret_cast<QProcessEnvironment*>(v.value<void*>());
return engine->toScriptValue(procenv->value(context->argument(0).toString()));
}
-static QScriptValue js_putenv(QScriptContext *context, QScriptEngine *engine)
+static QScriptValue js_putEnv(QScriptContext *context, QScriptEngine *engine)
{
if (Q_UNLIKELY(context->argumentCount() < 2))
return context->throwError(QScriptContext::SyntaxError,
- QLatin1String("putenv expects 2 arguments"));
+ QLatin1String("putEnv expects 2 arguments"));
QVariant v = engine->property("_qbs_procenv");
QProcessEnvironment *procenv = reinterpret_cast<QProcessEnvironment*>(v.value<void*>());
procenv->insert(context->argument(0).toString(), context->argument(1).toString());
@@ -544,8 +544,16 @@ static QProcessEnvironment getProcessEnvironment(ScriptEngine *engine, EnvType e
engine->clearImportsCache();
QScriptValue scope = engine->newObject();
- scope.setProperty("getenv", engine->newFunction(js_getenv, 1));
- scope.setProperty("putenv", engine->newFunction(js_putenv, 2));
+
+ const QScriptValue getEnvValue = engine->newFunction(js_getEnv, 1);
+ const QScriptValue putEnvValue = engine->newFunction(js_putEnv, 1);
+
+ // TODO: Remove in 1.3
+ scope.setProperty("getenv", getEnvValue);
+ scope.setProperty("putenv", putEnvValue);
+
+ scope.setProperty("getEnv", getEnvValue);
+ scope.setProperty("putEnv", putEnvValue);
QSet<QString> seenModuleNames;
QList<const ResolvedModule *> topSortedModules = topSortModules(moduleChildren, rootModules, seenModuleNames);
diff --git a/src/lib/language/moduleloader.cpp b/src/lib/language/moduleloader.cpp
index c9a8c014b..c5d722710 100644
--- a/src/lib/language/moduleloader.cpp
+++ b/src/lib/language/moduleloader.cpp
@@ -784,8 +784,9 @@ void ModuleLoader::setupBaseModulePrototype(Item *prototype)
{
prototype->setProperty(QLatin1String("getNativeSetting"),
BuiltinValue::create(BuiltinValue::GetNativeSettingFunction));
- prototype->setProperty(QLatin1String("getenv"),
- BuiltinValue::create(BuiltinValue::GetEnvFunction));
+ const BuiltinValuePtr getEnvValue = BuiltinValue::create(BuiltinValue::GetEnvFunction);
+ prototype->setProperty(QLatin1String("getEnv"), getEnvValue);
+ prototype->setProperty(QLatin1String("getenv"), getEnvValue); // TODO: Remove in 1.3.
prototype->setProperty(QLatin1String("getHostOS"),
BuiltinValue::create(BuiltinValue::GetHostOSFunction));
prototype->setProperty(QLatin1String("canonicalArchitecture"),
diff --git a/src/lib/language/testdata/environmentvariable.qbs b/src/lib/language/testdata/environmentvariable.qbs
index ea66abf6a..b930e8511 100644
--- a/src/lib/language/testdata/environmentvariable.qbs
+++ b/src/lib/language/testdata/environmentvariable.qbs
@@ -1,3 +1,3 @@
Product {
- name: qbs.getenv("PRODUCT_NAME")
+ name: qbs.getEnv("PRODUCT_NAME")
}
diff --git a/tests/auto/blackbox/testdata/propertyChanges/project.qbs b/tests/auto/blackbox/testdata/propertyChanges/project.qbs
index 4be63101f..d1f0ab5ee 100644
--- a/tests/auto/blackbox/testdata/propertyChanges/project.qbs
+++ b/tests/auto/blackbox/testdata/propertyChanges/project.qbs
@@ -16,7 +16,7 @@ Project {
}
CppApplication {
name: "product 3"
- cpp.defines: qbs.getenv("QBS_BLACKBOX_DEFINE")
+ cpp.defines: qbs.getEnv("QBS_BLACKBOX_DEFINE")
files: "source3.cpp"
}
DynamicLibrary {
diff --git a/tests/auto/blackbox/testdata/trackExternalProductChanges/project.qbs b/tests/auto/blackbox/testdata/trackExternalProductChanges/project.qbs
index 8ed267fa5..6b4bfa951 100644
--- a/tests/auto/blackbox/testdata/trackExternalProductChanges/project.qbs
+++ b/tests/auto/blackbox/testdata/trackExternalProductChanges/project.qbs
@@ -3,7 +3,7 @@ import qbs.File
import "fileList.js" as FileList
CppApplication {
- property pathList filesFromEnv: qbs.getenv("QBS_TEST_PULL_IN_FILE_VIA_ENV") ? ["environmentChange.cpp"] : []
+ property pathList filesFromEnv: qbs.getEnv("QBS_TEST_PULL_IN_FILE_VIA_ENV") ? ["environmentChange.cpp"] : []
property pathList filesFromJs: FileList.fileList()
property pathList filesFromFs: File.exists(path + "/fileExists.cpp") ? ["fileExists.cpp"] : []
files: ["main.cpp"].concat(filesFromJs).concat(filesFromEnv).concat(filesFromFs)
View Lorry Controller Status