diff options
author | Eike Ziller <eike.ziller@qt.io> | 2017-10-13 14:18:19 +0200 |
---|---|---|
committer | Eike Ziller <eike.ziller@qt.io> | 2017-10-13 14:09:37 +0000 |
commit | caba6b489050227e876d9478a4ec5815c06fce37 (patch) | |
tree | 56889e5bef704928fc12f22dadd9a6bae0805226 /qtc-super.qbs | |
parent | 2e241241845fd744771d4d56ddbf037149ae08ee (diff) |
Simplify Qbs setup4.6
We require Qbs 1.8 now, which enables us to do autodetection
of the available plugins
Change-Id: Ia2140965494b70e92aa27cdd7c73aa46646f8714
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Diffstat (limited to 'qtc-super.qbs')
-rw-r--r-- | qtc-super.qbs | 53 |
1 files changed, 24 insertions, 29 deletions
diff --git a/qtc-super.qbs b/qtc-super.qbs index d656d0e..c924e13 100644 --- a/qtc-super.qbs +++ b/qtc-super.qbs @@ -8,41 +8,36 @@ Project { qbsSearchPaths: ["qtcreator/qbs"] -// TODO: enable when we can require Qbs 1.8 -// Probe { -// id: submodules -// property var modules: [] + Probe { + id: submodules + property var modules: [] -// configure: { -// var mods = []; -// var gitmodules = new TextFile(FileInfo.joinPaths(path, ".gitmodules")); -// var module = null; -// while (!gitmodules.atEof()) { -// var line = gitmodules.readLine(); -// var modLine = line.match(/^\[submodule "([^"]+)"\]$/); -// if (modLine) { -// module = { _name: modLine[1] }; -// mods.push(module); -// } else if (module) { -// var propLine = line.match(/^\t([^ =]+) *= *(.*)$/); -// if (propLine) -// module[propLine[1]] = propLine[2]; -// else -// console.warn("Malformed line in .gitmodules: " + line); -// } -// } -// modules = mods; -// } -// } + configure: { + var mods = []; + var gitmodules = new TextFile(FileInfo.joinPaths(path, ".gitmodules")); + var module = null; + while (!gitmodules.atEof()) { + var line = gitmodules.readLine(); + var modLine = line.match(/^\[submodule "([^"]+)"\]$/); + if (modLine) { + module = { _name: modLine[1] }; + mods.push(module); + } else if (module) { + var propLine = line.match(/^\t([^ =]+) *= *(.*)$/); + if (propLine) + module[propLine[1]] = propLine[2]; + else + console.warn("Malformed line in .gitmodules: " + line); + } + } + modules = mods; + } + } SubProject { filePath: "qtcreator/qtcreator.qbs" Properties { additionalPlugins: { - // TODO remove when we can use the Probe - var submodules = { modules: [ - { _name: "fossil", path: "plugins/fossil" } - ]} var plugins = []; submodules.modules.forEach(function(module) { var modulePath = module.path; |