aboutsummaryrefslogtreecommitdiff
path: root/mesonbuild/modules/dlang.py
diff options
context:
space:
mode:
authorFFY00 <filipe.lains@gmail.com>2018-07-16 12:39:29 +0100
committerFFY00 <filipe.lains@gmail.com>2018-07-16 12:39:29 +0100
commit6727af4e619f3e08d027b7d81cfef2a5272c767a (patch)
tree8df676fd9b503962642652ffc6dd44dc8afee93b /mesonbuild/modules/dlang.py
parentdddc1a527a4929baae56a309e7c54c22ca14fb01 (diff)
downloadmeson-6727af4e619f3e08d027b7d81cfef2a5272c767a.zip
meson-6727af4e619f3e08d027b7d81cfef2a5272c767a.tar.gz
meson-6727af4e619f3e08d027b7d81cfef2a5272c767a.tar.bz2
dlang module: allow all configuration types when generating dub.json
Diffstat (limited to 'mesonbuild/modules/dlang.py')
-rw-r--r--mesonbuild/modules/dlang.py39
1 files changed, 2 insertions, 37 deletions
diff --git a/mesonbuild/modules/dlang.py b/mesonbuild/modules/dlang.py
index a0cf0b1..d4f62e4 100644
--- a/mesonbuild/modules/dlang.py
+++ b/mesonbuild/modules/dlang.py
@@ -82,43 +82,8 @@ class DlangModule(ExtensionModule):
arg not in config:
mlog.warning('Without', mlog.bold(arg), 'the DUB package can\'t be published')
- type_array = [
- 'authors',
- 'dflags',
- 'lflags',
- 'libs',
- 'copyFiles',
- 'versions',
- 'debugVersions',
- 'importPaths',
- 'stringImportPaths',
- 'preGenerateCommands',
- 'postGenerateCommands',
- 'preBuildCommands',
- 'postBuildCommands',
- 'buildRequirements',
- 'options',
- 'buildOptions',
- 'sourceFiles',
- 'sourcePaths',
- 'excludedSourceFiles'
- ]
-
- disabled = [
- 'configurations',
- 'subConfigurations',
- 'buildTypes'
- ]
-
for key, value in kwargs.items():
- if key in disabled:
- continue
- elif key in type_array:
- if isinstance(value, list):
- config[key] = value
- elif isinstance(value, str):
- config[key] = [value]
- elif key == 'dependencies':
+ if key == 'dependencies':
config[key] = {}
if isinstance(value, list):
for dep in value:
@@ -140,7 +105,7 @@ class DlangModule(ExtensionModule):
config[key][name] = ''
else:
config[key][name] = version
- elif isinstance(value, str):
+ else:
config[key] = value
with open(config_path, 'w', encoding='utf8') as ofile: