Merge branch 'moveData' into 'master'

Move data files to module

See merge request !132

autogen.sh

@@ -3,7 +3,7 @@
   CONF_ARGS=""
 
   echo "[encoding: UTF-8]" > po/POTFILES.in \
-  && for p in `ls data/gui/*.ui`; do echo "[type: gettext/glade]$p" >> \
+  && for p in `ls gajim/data/gui/*.ui`; do echo "[type: gettext/glade]$p" >> \
   po/POTFILES.in; done \
   && ls -1 data/org.gajim.Gajim.appdata.xml.in data/org.gajim.Gajim.desktop.in.in data/gajim-remote.desktop.in.in \
   gajim/*.py gajim/common/*.py gajim/command_system/*.py gajim/command_system/implementation/*.py gajim/common/zeroconf/*.py gajim/plugins/*.py | grep -v ipython_view.py >> \

configure.ac

@@ -54,12 +54,13 @@ AC_SUBST(PACKAGE)
 AC_CONFIG_FILES([ 
 	Makefile
 	data/Makefile
-	data/gui/Makefile
-	data/emoticons/Makefile
+	gajim/data/Makefile
+	gajim/data/gui/Makefile
+	gajim/data/emoticons/Makefile
 	data/pixmaps/Makefile
-	data/iconsets/Makefile
-	data/moods/Makefile
-	data/activities/Makefile
+	gajim/data/iconsets/Makefile
+	gajim/data/moods/Makefile
+	gajim/data/activities/Makefile
 	icons/Makefile
 	data/org.gajim.Gajim.appdata.xml
 	data/org.gajim.Gajim.desktop.in

data/Makefile.am

@@ -1,4 +1,4 @@
-SUBDIRS = gui emoticons pixmaps iconsets moods activities
+SUBDIRS = pixmaps
 @INTLTOOL_DESKTOP_RULE@
 
 appstreamdir = $(datadir)/metainfo/
@@ -13,25 +13,12 @@ desktop_DATA = $(desktop_in_files:.desktop.in.in=.desktop)
 installdefsdir = $(gajim_srcdir)/common
 installdefs_DATA = defs.py
 
-soundsdir = $(pkgdatadir)/data/sounds
-sounds_DATA = $(srcdir)/sounds/*.wav
-
-styledir = $(pkgdatadir)/data/style
-style_DATA = $(srcdir)/style/*.css
-
-otherdir = $(pkgdatadir)/data/other
-other_DATA = other/servers.xml other/dh4096.pem
-# other/cacert.pem is used only on Windows. On Unix platforms
-# use CA certificates installed in /etc/ssl/certs
 
 man_MANS = gajim.1 gajim-remote.1 gajim-history-manager.1
 
 
 EXTRA_DIST = $(appstream_in_files) \
 			 $(desktop_in_files) \
-			 $(sounds_DATA) \
-			 $(style_DATA) \
-			 $(other_DATA) \
 			 $(man_MANS) \
 			 defs.py.in
 

gajim/Makefile.am

@@ -1,3 +1,5 @@
+SUBDIRS = data
+
 INCLUDES = \
 	$(PYTHON_INCLUDES)
 export MACOSX_DEPLOYMENT_TARGET=10.4

gajim/common/configpaths.py

@@ -98,9 +98,11 @@ class ConfigPaths:
                 base = expand('~/.local/share')
             self.data_root = os.path.join(base, 'gajim')
 
-        basedir = os.environ.get('GAJIM_BASEDIR', defs.basedir)
+        import pkg_resources
+        basedir = pkg_resources.resource_filename("gajim", ".")
         self.add('DATA', None, os.path.join(basedir, 'data'))
         self.add('GUI', None, os.path.join(basedir, 'data', 'gui'))
+        basedir = os.environ.get('GAJIM_BASEDIR', defs.basedir)
         self.add('ICONS', None, os.path.join(basedir, 'icons'))
         self.add('HOME', None, os.path.expanduser('~'))
         self.add('PLUGINS_BASE', None, os.path.join(basedir, 'plugins'))

gajim/data/Makefile.am

@@ -0,0 +1,19 @@
+SUBDIRS = gui emoticons iconsets moods activities
+@INTLTOOL_DESKTOP_RULE@
+
+soundsdir = $(gajim_srcdir)/data/sounds
+sounds_DATA = $(srcdir)/sounds/*.wav
+
+styledir = $(gajim_srcdir)/data/style
+style_DATA = $(srcdir)/style/*.css
+
+otherdir = $(gajim_srcdir)/data/other
+other_DATA = other/servers.xml other/dh4096.pem
+# other/cacert.pem is used only on Windows. On Unix platforms
+# use CA certificates installed in /etc/ssl/certs
+
+EXTRA_DIST = $(sounds_DATA) \
+			 $(style_DATA) \
+			 $(other_DATA)
+
+MAINTAINERCLEANFILES = Makefile.in

gajim/data/activities/Makefile.am

@@ -1,4 +1,4 @@
-activitiesdir = $(pkgdatadir)/data/activities
+activitiesdir = $(gajim_srcdir)/data/activities
 nobase_dist_activities_DATA = $(srcdir)/*/*/*
 
 MAINTAINERCLEANFILES = Makefile.in

gajim/data/emoticons/Makefile.am

@@ -1,4 +1,4 @@
-emoticonsdir = $(pkgdatadir)/data/emoticons
+emoticonsdir = $(gajim_srcdir)/data/emoticons
 nobase_dist_emoticons_DATA = \
 	$(srcdir)/*/*.png \
 	$(srcdir)/*/LICENSE \