[gnome-shell] extensionPrefs: Move data/sources into subdirectories

[Florian Müllner <fmuellner src gnome org>]

commit c8a4a916815e95fe93fe59cdcbc8148ae8bda15f
Author: Florian Müllner <fmuellner gnome org>
Date:   Sun Mar 8 14:50:59 2020 +0100

    extensionPrefs: Move data/sources into subdirectories
    
    As we will eventually move the code to a subproject, start arranging
    it like a top-level srcdir.
    
    https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/1081

 js/extensionPrefs/{ => data}/css/application.css   |  0
 js/extensionPrefs/data/meson.build                 |  7 ++++
 .../org.gnome.Extensions.data.gresource.xml        |  0
 js/extensionPrefs/{ => data}/ui/extension-row.ui   |  0
 .../{ => data}/ui/extensions-window.ui             |  0
 .../{ => js}/gnome-shell-extension-prefs.in        |  0
 js/extensionPrefs/{ => js}/main.js                 |  0
 js/extensionPrefs/js/meson.build                   | 35 +++++++++++++++++
 js/extensionPrefs/js/misc/config.js.in             |  2 +
 js/extensionPrefs/js/misc/meson.build              |  8 ++++
 js/extensionPrefs/{ => js}/org.gnome.Extensions.in |  0
 .../org.gnome.Extensions.src.gresource.xml         |  0
 js/extensionPrefs/meson.build                      | 45 +---------------------
 lint/eslintrc-shell.yml                            |  2 +-
 po/POTFILES.in                                     |  6 +--
 15 files changed, 58 insertions(+), 47 deletions(-)
---
diff --git a/js/extensionPrefs/css/application.css b/js/extensionPrefs/data/css/application.css
similarity index 100%
rename from js/extensionPrefs/css/application.css
rename to js/extensionPrefs/data/css/application.css
diff --git a/js/extensionPrefs/data/meson.build b/js/extensionPrefs/data/meson.build
new file mode 100644
index 0000000000..424d144108
--- /dev/null
+++ b/js/extensionPrefs/data/meson.build
@@ -0,0 +1,7 @@
+gnome.compile_resources(
+  app_id + '.data',
+  app_id + '.data.gresource.xml',
+  gresource_bundle: true,
+  install: true,
+  install_dir: pkgdatadir
+)
diff --git a/js/extensionPrefs/org.gnome.Extensions.data.gresource.xml 
b/js/extensionPrefs/data/org.gnome.Extensions.data.gresource.xml
similarity index 100%
rename from js/extensionPrefs/org.gnome.Extensions.data.gresource.xml
rename to js/extensionPrefs/data/org.gnome.Extensions.data.gresource.xml
diff --git a/js/extensionPrefs/ui/extension-row.ui b/js/extensionPrefs/data/ui/extension-row.ui
similarity index 100%
rename from js/extensionPrefs/ui/extension-row.ui
rename to js/extensionPrefs/data/ui/extension-row.ui
diff --git a/js/extensionPrefs/ui/extensions-window.ui b/js/extensionPrefs/data/ui/extensions-window.ui
similarity index 100%
rename from js/extensionPrefs/ui/extensions-window.ui
rename to js/extensionPrefs/data/ui/extensions-window.ui
diff --git a/js/extensionPrefs/gnome-shell-extension-prefs.in 
b/js/extensionPrefs/js/gnome-shell-extension-prefs.in
similarity index 100%
rename from js/extensionPrefs/gnome-shell-extension-prefs.in
rename to js/extensionPrefs/js/gnome-shell-extension-prefs.in
diff --git a/js/extensionPrefs/main.js b/js/extensionPrefs/js/main.js
similarity index 100%
rename from js/extensionPrefs/main.js
rename to js/extensionPrefs/js/main.js
diff --git a/js/extensionPrefs/js/meson.build b/js/extensionPrefs/js/meson.build
new file mode 100644
index 0000000000..56687bf6c2
--- /dev/null
+++ b/js/extensionPrefs/js/meson.build
@@ -0,0 +1,35 @@
+launcherconf = configuration_data()
+launcherconf.set('app_id', app_id)
+launcherconf.set('PACKAGE_NAME', meson.project_name())
+launcherconf.set('PACKAGE_VERSION', meson.project_version())
+launcherconf.set('prefix', prefix)
+launcherconf.set('libdir', libdir)
+launcherconf.set('pkgdatadir', pkgdatadir)
+launcherconf.set('gjs', gjs.path())
+
+configure_file(
+  input: prgname + '.in',
+  output: prgname,
+  configuration: launcherconf,
+  install_dir: bindir,
+  install_mode: 'rwxr-xr-x',
+)
+
+configure_file(
+  input: app_id + '.in',
+  output: app_id,
+  configuration: launcherconf,
+  install_dir: pkgdatadir,
+)
+
+config_dir = '@0@/../..'.format(meson.current_build_dir())
+
+gnome.compile_resources(
+  app_id + '.src',
+  app_id + '.src.gresource.xml',
+  dependencies: [config_js],
+  source_dir: ['.', '../..', config_dir],
+  gresource_bundle: true,
+  install: true,
+  install_dir: pkgdatadir
+)
diff --git a/js/extensionPrefs/js/misc/config.js.in b/js/extensionPrefs/js/misc/config.js.in
new file mode 100644
index 0000000000..e9acb41592
--- /dev/null
+++ b/js/extensionPrefs/js/misc/config.js.in
@@ -0,0 +1,2 @@
+/* The version of this package */
+var PACKAGE_VERSION = '@PACKAGE_VERSION@';
diff --git a/js/extensionPrefs/js/misc/meson.build b/js/extensionPrefs/js/misc/meson.build
new file mode 100644
index 0000000000..c235615f0b
--- /dev/null
+++ b/js/extensionPrefs/js/misc/meson.build
@@ -0,0 +1,8 @@
+jsconf = configuration_data()
+jsconf.set('PACKAGE_VERSION', meson.project_version())
+
+extensions_config = configure_file(
+  input: 'config.js.in',
+  output: 'config.js',
+  configuration: jsconf
+)
diff --git a/js/extensionPrefs/org.gnome.Extensions.in b/js/extensionPrefs/js/org.gnome.Extensions.in
similarity index 100%
rename from js/extensionPrefs/org.gnome.Extensions.in
rename to js/extensionPrefs/js/org.gnome.Extensions.in
diff --git a/js/extensionPrefs/org.gnome.Extensions.src.gresource.xml 
b/js/extensionPrefs/js/org.gnome.Extensions.src.gresource.xml
similarity index 100%
rename from js/extensionPrefs/org.gnome.Extensions.src.gresource.xml
rename to js/extensionPrefs/js/org.gnome.Extensions.src.gresource.xml
diff --git a/js/extensionPrefs/meson.build b/js/extensionPrefs/meson.build
index 97da99714e..b17fe9ad12 100644
--- a/js/extensionPrefs/meson.build
+++ b/js/extensionPrefs/meson.build
@@ -1,46 +1,5 @@
 app_id = 'org.gnome.Extensions'
 prgname = 'gnome-shell-extension-prefs'
 
-launcherconf = configuration_data()
-launcherconf.set('app_id', app_id)
-launcherconf.set('PACKAGE_NAME', meson.project_name())
-launcherconf.set('PACKAGE_VERSION', meson.project_version())
-launcherconf.set('prefix', prefix)
-launcherconf.set('libdir', libdir)
-launcherconf.set('pkgdatadir', pkgdatadir)
-launcherconf.set('gjs', gjs.path())
-
-configure_file(
-  input: prgname + '.in',
-  output: prgname,
-  configuration: launcherconf,
-  install_dir: bindir,
-  install_mode: 'rwxr-xr-x',
-)
-
-configure_file(
-  input: app_id + '.in',
-  output: app_id,
-  configuration: launcherconf,
-  install_dir: pkgdatadir,
-)
-
-config_dir = '@0@/..'.format(meson.current_build_dir())
-
-gnome.compile_resources(
-  app_id + '.src',
-  app_id + '.src.gresource.xml',
-  dependencies: [config_js],
-  source_dir: ['.', '..', config_dir],
-  gresource_bundle: true,
-  install: true,
-  install_dir: pkgdatadir
-)
-
-gnome.compile_resources(
-  app_id + '.data',
-  app_id + '.data.gresource.xml',
-  gresource_bundle: true,
-  install: true,
-  install_dir: pkgdatadir
-)
+subdir('data')
+subdir('js')
diff --git a/lint/eslintrc-shell.yml b/lint/eslintrc-shell.yml
index 9d13f0c367..77e0bd5f29 100644
--- a/lint/eslintrc-shell.yml
+++ b/lint/eslintrc-shell.yml
@@ -17,7 +17,7 @@ rules:
 overrides:
   - files: js/**
     excludedFiles:
-      - js/extensionPrefs/*
+      - js/extensionPrefs/**
       - js/portalHelper/*
     globals:
       global: readonly
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 8afd84a9bd..e72dc7e267 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -5,9 +5,9 @@ data/org.gnome.Extensions.desktop.in.in
 data/org.gnome.Shell.desktop.in.in
 data/org.gnome.shell.gschema.xml.in
 data/org.gnome.Shell.PortalHelper.desktop.in.in
-js/extensionPrefs/main.js
-js/extensionPrefs/ui/extension-row.ui
-js/extensionPrefs/ui/extensions-window.ui
+js/extensionPrefs/js/main.js
+js/extensionPrefs/data/ui/extension-row.ui
+js/extensionPrefs/data/ui/extensions-window.ui
 js/gdm/authPrompt.js
 js/gdm/loginDialog.js
 js/gdm/util.js