[polari] build: Stop generating resource XML
- From: Marge Bot <marge-bot src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [polari] build: Stop generating resource XML
- Date: Fri, 18 Feb 2022 03:53:35 +0000 (UTC)
commit e262daad15b7c898d752f0da11c9cc557998b6e8
Author: Florian Müllner <fmuellner gnome org>
Date: Fri Feb 18 03:46:32 2022 +0100
build: Stop generating resource XML
This was done to have a single list of source files for the
resource and js78 tests. Now that the tests have been removed,
there is no longer a reason for keeping the list in meson.
Part-of: <https://gitlab.gnome.org/GNOME/polari/-/merge_requests/245>
src/meson.build | 43 +---------------------------
src/org.gnome.Polari.src.gresource.xml | 29 +++++++++++++++++++
src/org.gnome.Polari.src.gresource.xml.meson | 7 -----
3 files changed, 30 insertions(+), 49 deletions(-)
---
diff --git a/src/meson.build b/src/meson.build
index 9a4015e9..34870e45 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -5,47 +5,6 @@ data_resources = gnome.compile_resources(
c_name: 'data_resources'
)
-js_sources = [
- 'accountsMonitor.js',
- 'application.js',
- 'appNotifications.js',
- 'chatView.js',
- 'connections.js',
- 'entryArea.js',
- 'initialSetup.js',
- 'ircParser.js',
- 'joinDialog.js',
- 'main.js',
- 'mainWindow.js',
- 'networksManager.js',
- 'pasteManager.js',
- 'roomList.js',
- 'roomManager.js',
- 'roomStack.js',
- 'serverRoomManager.js',
- 'tabCompletion.js',
- 'telepathyClient.js',
- 'urlPreview.js',
- 'userList.js',
- 'utils.js',
- 'userTracker.js'
-]
-
-js_xml = []
-foreach js_source : js_sources
- js_xml += ' <file>@0@</file>'.format(js_source)
-endforeach
-
-resource_data = configuration_data()
-resource_data.set('JS_SOURCE_FILES', '\n'.join(js_xml))
-
-resource_xml_name = '@0 src gresource xml'.format(app_id)
-src_resources_xml = configure_file(
- input: resource_xml_name + '.meson',
- output: resource_xml_name,
- configuration: resource_data
-)
-
config_js = vcs_tag(
command: ['git', 'describe'],
input: configure_file(
@@ -63,7 +22,7 @@ config_js = vcs_tag(
src_resources = gnome.compile_resources(
'src-resources',
- src_resources_xml,
+ '@0 src gresource xml'.format(app_id),
dependencies: config_js,
c_name: 'src_resources'
)
diff --git a/src/org.gnome.Polari.src.gresource.xml b/src/org.gnome.Polari.src.gresource.xml
new file mode 100644
index 00000000..3d7ac3b3
--- /dev/null
+++ b/src/org.gnome.Polari.src.gresource.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<gresources>
+ <gresource prefix="/org/gnome/Polari/js">
+ <file>config.js</file>
+ <file>accountsMonitor.js</file>
+ <file>application.js</file>
+ <file>appNotifications.js</file>
+ <file>chatView.js</file>
+ <file>connections.js</file>
+ <file>entryArea.js</file>
+ <file>initialSetup.js</file>
+ <file>ircParser.js</file>
+ <file>joinDialog.js</file>
+ <file>main.js</file>
+ <file>mainWindow.js</file>
+ <file>networksManager.js</file>
+ <file>pasteManager.js</file>
+ <file>roomList.js</file>
+ <file>roomManager.js</file>
+ <file>roomStack.js</file>
+ <file>serverRoomManager.js</file>
+ <file>tabCompletion.js</file>
+ <file>telepathyClient.js</file>
+ <file>urlPreview.js</file>
+ <file>userList.js</file>
+ <file>utils.js</file>
+ <file>userTracker.js</file>
+ </gresource>
+</gresources>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]