[gnome-builder] build: use "copy: true" for meson configuration_file



commit 24d9014c37ed4b029d5c7030a925af04716e0121
Author: Christian Hergert <chergert redhat com>
Date:   Wed Aug 8 19:48:34 2018 -0700

    build: use "copy: true" for meson configuration_file
    
    We don't need this anymore now that we rely on 0.47, which simplifies the
    process of copying files to the build dir.

 src/libide/meson.build                               | 2 +-
 src/plugins/autotools-templates/meson.build          | 2 +-
 src/plugins/cargo/meson.build                        | 2 +-
 src/plugins/eslint/meson.build                       | 2 +-
 src/plugins/find-other-file/meson.build              | 2 +-
 src/plugins/gjs-symbols/meson.build                  | 2 +-
 src/plugins/go-langserv/meson.build                  | 2 +-
 src/plugins/gradle/meson.build                       | 2 +-
 src/plugins/html-preview/meson.build                 | 2 +-
 src/plugins/jedi/meson.build                         | 2 +-
 src/plugins/jhbuild/meson.build                      | 2 +-
 src/plugins/make/meson.build                         | 2 +-
 src/plugins/maven/meson.build                        | 2 +-
 src/plugins/meson-templates/meson.build              | 2 +-
 src/plugins/mono/meson.build                         | 2 +-
 src/plugins/npm/meson.build                          | 2 +-
 src/plugins/phpize/meson.build                       | 2 +-
 src/plugins/python-gi-imports-completion/meson.build | 2 +-
 src/plugins/rust-langserv/meson.build                | 2 +-
 src/plugins/rustup/meson.build                       | 2 +-
 src/plugins/vala-pack/meson.build                    | 2 +-
 src/plugins/valgrind/meson.build                     | 2 +-
 22 files changed, 22 insertions(+), 22 deletions(-)
---
diff --git a/src/libide/meson.build b/src/libide/meson.build
index c6a3909c5..a935fc869 100644
--- a/src/libide/meson.build
+++ b/src/libide/meson.build
@@ -301,7 +301,7 @@ if get_option('with_vapi')
 configure_file(
           input: 'libide-' + libide_api_version + '.deps',
          output: 'libide-' + libide_api_version + '.deps',
-  configuration: configuration_data(),
+           copy: true,
         install: true,
     install_dir: pkgvapidir,
 )
diff --git a/src/plugins/autotools-templates/meson.build b/src/plugins/autotools-templates/meson.build
index 8d941702e..3f0302a2d 100644
--- a/src/plugins/autotools-templates/meson.build
+++ b/src/plugins/autotools-templates/meson.build
@@ -9,7 +9,7 @@ install_subdir('autotools_templates/resources', install_dir: autotools_template_
 configure_file(
           input: 'autotools-templates.plugin',
          output: 'autotools-templates.plugin',
-  configuration: configuration_data(),
+           copy: true,
         install: true,
     install_dir: plugindir,
 )
diff --git a/src/plugins/cargo/meson.build b/src/plugins/cargo/meson.build
index f9c1d25d5..6e7a360fa 100644
--- a/src/plugins/cargo/meson.build
+++ b/src/plugins/cargo/meson.build
@@ -5,7 +5,7 @@ install_data('cargo_plugin.py', install_dir: plugindir)
 configure_file(
           input: 'cargo.plugin',
          output: 'cargo.plugin',
-  configuration: configuration_data(),
+           copy: true,
         install: true,
     install_dir: plugindir,
 )
diff --git a/src/plugins/eslint/meson.build b/src/plugins/eslint/meson.build
index a244e0aa2..d13bcb9c5 100644
--- a/src/plugins/eslint/meson.build
+++ b/src/plugins/eslint/meson.build
@@ -8,7 +8,7 @@ install_data('org.gnome.builder.plugins.eslint.gschema.xml',
 configure_file(
           input: 'eslint.plugin',
          output: 'eslint.plugin',
-  configuration: configuration_data(),
+           copy: true,
         install: true,
     install_dir: plugindir,
 )
diff --git a/src/plugins/find-other-file/meson.build b/src/plugins/find-other-file/meson.build
index 8781c9521..7b2e848ec 100644
--- a/src/plugins/find-other-file/meson.build
+++ b/src/plugins/find-other-file/meson.build
@@ -5,7 +5,7 @@ install_data('find_other_file.py', install_dir: plugindir)
 configure_file(
           input: 'find-other-file.plugin',
          output: 'find-other-file.plugin',
-  configuration: configuration_data(),
+           copy: true,
         install: true,
     install_dir: plugindir,
 )
diff --git a/src/plugins/gjs-symbols/meson.build b/src/plugins/gjs-symbols/meson.build
index 9a8759afb..189da66cf 100644
--- a/src/plugins/gjs-symbols/meson.build
+++ b/src/plugins/gjs-symbols/meson.build
@@ -5,7 +5,7 @@ install_data('gjs_symbols.py', install_dir: plugindir)
 configure_file(
           input: 'gjs_symbols.plugin',
          output: 'gjs_symbols.plugin',
-  configuration: configuration_data(),
+           copy: true,
         install: true,
     install_dir: plugindir,
 )
diff --git a/src/plugins/go-langserv/meson.build b/src/plugins/go-langserv/meson.build
index 2e665ba3b..33f28b3b7 100644
--- a/src/plugins/go-langserv/meson.build
+++ b/src/plugins/go-langserv/meson.build
@@ -5,7 +5,7 @@ install_data('go_langserver_plugin.py', install_dir: plugindir)
 configure_file(
           input: 'go-langserv.plugin',
          output: 'go-langserv.plugin',
-  configuration: configuration_data(),
+           copy: true,
         install: true,
     install_dir: plugindir,
 )
diff --git a/src/plugins/gradle/meson.build b/src/plugins/gradle/meson.build
index 23ee2eb83..a9c418adc 100644
--- a/src/plugins/gradle/meson.build
+++ b/src/plugins/gradle/meson.build
@@ -5,7 +5,7 @@ install_data('gradle_plugin.py', install_dir: plugindir)
 configure_file(
           input: 'gradle.plugin',
          output: 'gradle.plugin',
-  configuration: configuration_data(),
+           copy: true,
         install: true,
     install_dir: plugindir,
 )
diff --git a/src/plugins/html-preview/meson.build b/src/plugins/html-preview/meson.build
index 299493ce2..b992490fd 100644
--- a/src/plugins/html-preview/meson.build
+++ b/src/plugins/html-preview/meson.build
@@ -13,7 +13,7 @@ install_data('html_preview.py', install_dir: plugindir)
 configure_file(
           input: 'html-preview.plugin',
          output: 'html-preview.plugin',
-  configuration: configuration_data(),
+           copy: true,
         install: true,
     install_dir: plugindir,
 )
diff --git a/src/plugins/jedi/meson.build b/src/plugins/jedi/meson.build
index bfe1a6279..55ce52d6e 100644
--- a/src/plugins/jedi/meson.build
+++ b/src/plugins/jedi/meson.build
@@ -5,7 +5,7 @@ install_data('jedi_plugin.py', install_dir: plugindir)
 configure_file(
           input: 'jedi.plugin',
          output: 'jedi.plugin',
-  configuration: configuration_data(),
+           copy: true,
         install: true,
     install_dir: plugindir,
 )
diff --git a/src/plugins/jhbuild/meson.build b/src/plugins/jhbuild/meson.build
index ac948fe3f..2c44a355d 100644
--- a/src/plugins/jhbuild/meson.build
+++ b/src/plugins/jhbuild/meson.build
@@ -5,7 +5,7 @@ install_data('jhbuild_plugin.py', install_dir: plugindir)
 configure_file(
           input: 'jhbuild.plugin',
          output: 'jhbuild.plugin',
-  configuration: configuration_data(),
+           copy: true,
         install: true,
     install_dir: plugindir,
 )
diff --git a/src/plugins/make/meson.build b/src/plugins/make/meson.build
index e9768ef44..89c5e19f0 100644
--- a/src/plugins/make/meson.build
+++ b/src/plugins/make/meson.build
@@ -13,7 +13,7 @@ install_data('make_plugin.py', install_dir: plugindir)
 configure_file(
           input: 'make.plugin',
          output: 'make.plugin',
-  configuration: configuration_data(),
+           copy: true,
         install: true,
     install_dir: plugindir,
 )
diff --git a/src/plugins/maven/meson.build b/src/plugins/maven/meson.build
index 90039f45a..f174eb853 100644
--- a/src/plugins/maven/meson.build
+++ b/src/plugins/maven/meson.build
@@ -5,7 +5,7 @@ install_data('maven_plugin.py', install_dir: plugindir)
 configure_file(
           input: 'maven.plugin',
          output: 'maven.plugin',
-  configuration: configuration_data(),
+           copy: true,
         install: true,
     install_dir: plugindir,
 )
diff --git a/src/plugins/meson-templates/meson.build b/src/plugins/meson-templates/meson.build
index 141a6e599..b24d41a24 100644
--- a/src/plugins/meson-templates/meson.build
+++ b/src/plugins/meson-templates/meson.build
@@ -13,7 +13,7 @@ install_data('meson_templates.py', install_dir: plugindir)
 configure_file(
           input: 'meson-templates.plugin',
          output: 'meson-templates.plugin',
-  configuration: configuration_data(),
+           copy: true,
         install: true,
     install_dir: plugindir,
 )
diff --git a/src/plugins/mono/meson.build b/src/plugins/mono/meson.build
index bad0072fd..588f77e5b 100644
--- a/src/plugins/mono/meson.build
+++ b/src/plugins/mono/meson.build
@@ -5,7 +5,7 @@ install_data('mono_plugin.py', install_dir: plugindir)
 configure_file(
           input: 'mono.plugin',
          output: 'mono.plugin',
-  configuration: configuration_data(),
+           copy: true,
         install: true,
     install_dir: plugindir,
 )
diff --git a/src/plugins/npm/meson.build b/src/plugins/npm/meson.build
index cd9678b52..299d50167 100644
--- a/src/plugins/npm/meson.build
+++ b/src/plugins/npm/meson.build
@@ -5,7 +5,7 @@ install_data('npm_plugin.py', install_dir: plugindir)
 configure_file(
           input: 'npm.plugin',
          output: 'npm.plugin',
-  configuration: configuration_data(),
+           copy: true,
         install: true,
     install_dir: plugindir,
 )
diff --git a/src/plugins/phpize/meson.build b/src/plugins/phpize/meson.build
index d1ff85047..520f8f5a6 100644
--- a/src/plugins/phpize/meson.build
+++ b/src/plugins/phpize/meson.build
@@ -5,7 +5,7 @@ install_data('phpize_plugin.py', install_dir: plugindir)
 configure_file(
           input: 'phpize.plugin',
          output: 'phpize.plugin',
-  configuration: configuration_data(),
+           copy: true,
         install: true,
     install_dir: plugindir,
 )
diff --git a/src/plugins/python-gi-imports-completion/meson.build 
b/src/plugins/python-gi-imports-completion/meson.build
index 496138e32..23d0ab98d 100644
--- a/src/plugins/python-gi-imports-completion/meson.build
+++ b/src/plugins/python-gi-imports-completion/meson.build
@@ -5,7 +5,7 @@ install_data('python_gi_imports_completion.py', install_dir: plugindir)
 configure_file(
           input: 'python-gi-imports-completion.plugin',
          output: 'python-gi-imports-completion.plugin',
-  configuration: configuration_data(),
+           copy: true,
         install: true,
     install_dir: plugindir,
 )
diff --git a/src/plugins/rust-langserv/meson.build b/src/plugins/rust-langserv/meson.build
index cb3cb763c..34bd2db19 100644
--- a/src/plugins/rust-langserv/meson.build
+++ b/src/plugins/rust-langserv/meson.build
@@ -5,7 +5,7 @@ install_data('rust_langserv_plugin.py', install_dir: plugindir)
 configure_file(
           input: 'rust-langserv.plugin',
          output: 'rust-langserv.plugin',
-  configuration: configuration_data(),
+           copy: true,
         install: true,
     install_dir: plugindir,
 )
diff --git a/src/plugins/rustup/meson.build b/src/plugins/rustup/meson.build
index 9f97348ca..bb4e754de 100644
--- a/src/plugins/rustup/meson.build
+++ b/src/plugins/rustup/meson.build
@@ -13,7 +13,7 @@ install_data('rustup_plugin.py', install_dir: plugindir)
 configure_file(
           input: 'rustup.plugin',
          output: 'rustup.plugin',
-  configuration: configuration_data(),
+           copy: true,
         install: true,
     install_dir: plugindir,
 )
diff --git a/src/plugins/vala-pack/meson.build b/src/plugins/vala-pack/meson.build
index 3ea25be53..dd36d351d 100644
--- a/src/plugins/vala-pack/meson.build
+++ b/src/plugins/vala-pack/meson.build
@@ -64,7 +64,7 @@ shared_module('vala-pack-plugin', vala_pack_sources,
 configure_file(
           input: 'vala-pack.plugin',
          output: 'vala-pack.plugin',
-  configuration: configuration_data(),
+           copy: true,
         install: true,
     install_dir: plugindir,
 )
diff --git a/src/plugins/valgrind/meson.build b/src/plugins/valgrind/meson.build
index 7bcf042e1..7684f9f0c 100644
--- a/src/plugins/valgrind/meson.build
+++ b/src/plugins/valgrind/meson.build
@@ -14,7 +14,7 @@ valgrind_resources = gnome.compile_resources(
 configure_file(
           input: 'valgrind.plugin',
          output: 'valgrind.plugin',
-  configuration: configuration_data(),
+           copy: true,
         install: true,
     install_dir: plugindir,
 )


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]