[polari] build: Move JS sources into resources as well



commit 41831194770d93c50609a078425abf177977250b
Author: Florian Müllner <fmuellner gnome org>
Date:   Mon Feb 23 01:25:08 2015 +0100

    build: Move JS sources into resources as well
    
    Loading all modules as a single resource file is slightly more effective
    than using individual files, so do that.

 .gitignore                             |    1 +
 src/Makefile.am                        |   30 +++++++++---------------------
 src/org.gnome.Polari.src.gresource.xml |   23 +++++++++++++++++++++++
 3 files changed, 33 insertions(+), 21 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index ed30fd2..7fb9019 100644
--- a/.gitignore
+++ b/.gitignore
@@ -39,5 +39,6 @@ po/POTFILES
 po/Rules-quot
 po/polari.pot
 po/stamp-it
+src/*.gresource
 src/config.js
 src/org.gnome.Polari
diff --git a/src/Makefile.am b/src/Makefile.am
index fd43e99..5d659cc 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -27,34 +27,22 @@ nodist_app_SCRIPTS = $(APP_ID)
 $(APP_ID): $(APP_ID).in
        $(AM_V_GEN) $(do_subst) $< > $@
 
-jsdir = $(pkgdatadir)/
-dist_js_DATA = \
-       accountsMonitor.js \
-       application.js \
-       appNotifications.js \
-       chatroomManager.js \
-       chatView.js \
-       connections.js \
-       entryArea.js \
-       ircParser.js \
-       joinDialog.js \
-       main.js \
-       mainWindow.js \
-       messageDialog.js \
-       pasteManager.js \
-       roomList.js \
-       roomStack.js \
-       tabCompletion.js \
-       userList.js \
-       utils.js \
-       $(NULL)
+resource_files = $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir) --generate-dependencies 
$(srcdir)/$(APP_ID).src.gresource.xml)
+$(APP_ID).src.gresource: $(APP_ID).src.gresource.xml $(resource_files)
+       $(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir) $<
+
+resourcedir = $(pkgdatadir)
+resource_DATA = $(APP_ID).src.gresource
 
 EXTRA_DIST += \
        $(APP_ID).in \
+       $(APP_ID).src.gresource.xml \
+       $(resource_files) \
        $(NULL)
 
 CLEANFILES += \
        $(APP_ID) \
+       $(APP_ID).src.gresource \
        $(NULL)
 
 install-exec-hook:
diff --git a/src/org.gnome.Polari.src.gresource.xml b/src/org.gnome.Polari.src.gresource.xml
new file mode 100644
index 0000000..c4b9fc2
--- /dev/null
+++ b/src/org.gnome.Polari.src.gresource.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<gresources>
+  <gresource prefix="/org/gnome/Polari/js">
+    <file>accountsMonitor.js</file>
+    <file>application.js</file>
+    <file>appNotifications.js</file>
+    <file>chatroomManager.js</file>
+    <file>chatView.js</file>
+    <file>connections.js</file>
+    <file>entryArea.js</file>
+    <file>ircParser.js</file>
+    <file>joinDialog.js</file>
+    <file>main.js</file>
+    <file>mainWindow.js</file>
+    <file>messageDialog.js</file>
+    <file>pasteManager.js</file>
+    <file>roomList.js</file>
+    <file>roomStack.js</file>
+    <file>tabCompletion.js</file>
+    <file>userList.js</file>
+    <file>utils.js</file>
+  </gresource>
+</gresources>


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