[gedit] Revert "build: Validate gschema files"

[Michael Catanzaro <mcatanzaro src gnome org>]

commit be1a970d84867df41c6df4914172ac5fe691544c
Author: Michael Catanzaro <mcatanzaro gnome org>
Date:   Wed Nov 6 13:02:45 2019 -0600

    Revert "build: Validate gschema files"
    
    This reverts commit 2bd55e4851b81b45e15956a331679bbcbd389af2.

 data/meson.build                  | 45 +++++++++++----------------------------
 plugins/externaltools/meson.build | 16 ++------------
 plugins/filebrowser/meson.build   | 16 ++------------
 plugins/pythonconsole/meson.build | 16 ++------------
 plugins/spell/meson.build         | 16 ++------------
 plugins/time/meson.build          | 16 ++------------
 6 files changed, 22 insertions(+), 103 deletions(-)
---
diff --git a/data/meson.build b/data/meson.build
index bef694c4f..ecf473a29 100644
--- a/data/meson.build
+++ b/data/meson.build
@@ -23,15 +23,12 @@ appdata_file = i18n.merge_file(
 
 appstream_util = find_program('appstream-util', required: false)
 if appstream_util.found()
-  test(
-    'validate-appdata',
-    appstream_util,
+test(
+    'validate-appdata', appstream_util,
     args: [
-      'validate-relax',
-      '--nonet',
-      appdata_file.full_path()
+        'validate-relax', '--nonet', appdata_file.full_path()
     ]
-  )
+)
 endif
 
 
@@ -60,13 +57,13 @@ desktop_file = i18n.merge_file(
 
 desktop_file_validate = find_program('desktop-file-validate', required: false)
 if desktop_file_validate.found()
-  test(
+test(
     'validate-desktop',
     desktop_file_validate,
     args: [
-      desktop_file.full_path(),
+        desktop_file.full_path()
     ]
-  )
+)
 endif
 
 quoted_plugins = []
@@ -76,38 +73,20 @@ foreach plugin_name:active_plugins
   ]
 endforeach
 
-gschema_in = configuration_data()
-gschema_in.set('GETTEXT_PACKAGE', package_name)
-gschema_in.set('ACTIVE_PLUGINS', ', '.join(quoted_plugins))
+gschema_xml = configuration_data()
+gschema_xml.set('GETTEXT_PACKAGE', package_name)
+gschema_xml.set('ACTIVE_PLUGINS', ', '.join(quoted_plugins))
 
-gschema_file = configure_file(
+configure_file(
   input: 'org.gnome.gedit.gschema.xml.in',
   output: 'org.gnome.gedit.gschema.xml',
-  configuration: gschema_in,
+  configuration: gschema_xml,
   install_dir: join_paths(
     glibdir,
     'schemas',
   )
 )
 
-gschema_dtd = join_paths(
-  gio_dep.get_pkgconfig_variable('schemasdir'),
-  'gschema.dtd',
-)
-
-xmllint = find_program('xmllint', required: false)
-if xmllint.found()
-  test(
-    'validate-gschema',
-    xmllint,
-    args: [
-      '--noout',
-      '--dtdvalid', gschema_dtd,
-      gschema_file,
-    ]
-  )
-endif
-
 service_in = configuration_data()
 service_in.set('bindir', bindir)
 
diff --git a/plugins/externaltools/meson.build b/plugins/externaltools/meson.build
index 9718b9188..75a23a144 100644
--- a/plugins/externaltools/meson.build
+++ b/plugins/externaltools/meson.build
@@ -2,28 +2,16 @@ subdir('scripts')
 subdir('tools')
 subdir('data')
 
-externaltools_gschema_file = configure_file(
+configure_file(
   input: 'org.gnome.gedit.plugins.externaltools.gschema.xml.in',
   output: 'org.gnome.gedit.plugins.externaltools.gschema.xml',
-  configuration: gschema_in,
+  configuration: gschema_xml,
   install_dir: join_paths(
     glibdir,
     'schemas',
   )
 )
 
-if xmllint.found()
-  test(
-    'validate-externaltools-gschema',
-    xmllint,
-    args: [
-      '--noout',
-      '--dtdvalid', gschema_dtd,
-      externaltools_gschema_file,
-    ]
-  )
-endif
-
 custom_target(
   'externaltools.plugin',
   input: 'externaltools.plugin.desktop.in',
diff --git a/plugins/filebrowser/meson.build b/plugins/filebrowser/meson.build
index fe5a5767e..7bae8f4ac 100644
--- a/plugins/filebrowser/meson.build
+++ b/plugins/filebrowser/meson.build
@@ -101,28 +101,16 @@ custom_target(
   )
 )
 
-filebrowser_gschema_file = configure_file(
+configure_file(
   input: 'org.gnome.gedit.plugins.filebrowser.gschema.xml.in',
   output: 'org.gnome.gedit.plugins.filebrowser.gschema.xml',
-  configuration: gschema_in,
+  configuration: gschema_xml,
   install_dir: join_paths(
     glibdir,
     'schemas',
   )
 )
 
-if xmllint.found()
-  test(
-    'validate-filebrowser-gschema',
-    xmllint,
-    args: [
-      '--noout',
-      '--dtdvalid', gschema_dtd,
-      filebrowser_gschema_file,
-    ]
-  )
-endif
-
 custom_target(
   'filebrowser.plugin',
   input: 'filebrowser.plugin.desktop.in',
diff --git a/plugins/pythonconsole/meson.build b/plugins/pythonconsole/meson.build
index 786167537..55b0af282 100644
--- a/plugins/pythonconsole/meson.build
+++ b/plugins/pythonconsole/meson.build
@@ -1,27 +1,15 @@
 subdir('pythonconsole')
 
-pythonconsole_gschema_file = configure_file(
+configure_file(
   input: 'org.gnome.gedit.plugins.pythonconsole.gschema.xml.in',
   output: 'org.gnome.gedit.plugins.pythonconsole.gschema.xml',
-  configuration: gschema_in,
+  configuration: gschema_xml,
   install_dir: join_paths(
     glibdir,
     'schemas',
   )
 )
 
-if xmllint.found()
-  test(
-    'validate-pythonconsole-gschema',
-    xmllint,
-    args: [
-      '--noout',
-      '--dtdvalid', gschema_dtd,
-      pythonconsole_gschema_file,
-    ]
-  )
-endif
-
 custom_target(
   'pythonconsole.plugin',
   input: 'pythonconsole.plugin.desktop.in',
diff --git a/plugins/spell/meson.build b/plugins/spell/meson.build
index f6fe6255b..4832da8e0 100644
--- a/plugins/spell/meson.build
+++ b/plugins/spell/meson.build
@@ -28,28 +28,16 @@ libspell_sha = shared_module(
   name_suffix: module_suffix,
 )
 
-spell_gschema_file = configure_file(
+configure_file(
   input: 'org.gnome.gedit.plugins.spell.gschema.xml.in',
   output: 'org.gnome.gedit.plugins.spell.gschema.xml',
-  configuration: gschema_in,
+  configuration: gschema_xml,
   install_dir: join_paths(
     glibdir,
     'schemas',
   )
 )
 
-if xmllint.found()
-  test(
-    'validate-spell-gschema',
-    xmllint,
-    args: [
-      '--noout',
-      '--dtdvalid', gschema_dtd,
-      spell_gschema_file,
-    ]
-  )
-endif
-
 custom_target(
   'spell.plugin',
   input: 'spell.plugin.desktop.in',
diff --git a/plugins/time/meson.build b/plugins/time/meson.build
index 657ac694c..25e80e580 100644
--- a/plugins/time/meson.build
+++ b/plugins/time/meson.build
@@ -42,28 +42,16 @@ libtime_sha = shared_module(
   name_suffix: module_suffix,
 )
 
-time_gschema_file = configure_file(
+configure_file(
   input: 'org.gnome.gedit.plugins.time.gschema.xml.in',
   output: 'org.gnome.gedit.plugins.time.gschema.xml',
-  configuration: gschema_in,
+  configuration: gschema_xml,
   install_dir: join_paths(
     glibdir,
     'schemas',
   )
 )
 
-if xmllint.found()
-  test(
-    'validate-time-gschema',
-    xmllint,
-    args: [
-      '--noout',
-      '--dtdvalid', gschema_dtd,
-      time_gschema_file,
-    ]
-  )
-endif
-
 custom_target(
   'time.plugin',
   input: 'time.plugin.desktop.in',