Commit 0080c610 authored by André's avatar André

Install data to new location

parent 3be1c209
......@@ -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 >> \
......
......@@ -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
......
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
......
SUBDIRS = data
INCLUDES = \
$(PYTHON_INCLUDES)
export MACOSX_DEPLOYMENT_TARGET=10.4
......
......@@ -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'))
......
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
activitiesdir = $(pkgdatadir)/data/activities
activitiesdir = $(gajim_srcdir)/data/activities
nobase_dist_activities_DATA = $(srcdir)/*/*/*
MAINTAINERCLEANFILES = Makefile.in
emoticonsdir = $(pkgdatadir)/data/emoticons
emoticonsdir = $(gajim_srcdir)/data/emoticons
nobase_dist_emoticons_DATA = \
$(srcdir)/*/*.png \
$(srcdir)/*/LICENSE \
......
guidir = $(pkgdatadir)/data/gui
guidir = $(gajim_srcdir)/data/gui
gui_DATA = $(srcdir)/*.ui
EXTRA_DIST = $(gui_DATA)
......
iconsetdir = $(pkgdatadir)/data/iconsets
iconsetdir = $(gajim_srcdir)/data/iconsets
nobase_dist_iconset_DATA = \
$(srcdir)/*/16x16/* \
$(srcdir)/*/32x32/* \
......
moodsdir = $(pkgdatadir)/data/moods
moodsdir = $(gajim_srcdir)/data/moods
nobase_dist_moods_DATA = $(srcdir)/*/*
MAINTAINERCLEANFILES = Makefile.in
......@@ -46,13 +46,13 @@ def setup_env():
import logging
logging.basicConfig()
app.DATA_DIR = gajim_root + '/data'
app.DATA_DIR = gajim_root + '/gajim/data'
app.use_x = use_x
app.contacts = LegacyContactsAPI()
app.connections = {}
if use_x:
from gajim import gtkgui_helpers
gtkgui_helpers.GUI_DIR = gajim_root + '/data/gui'
gtkgui_helpers.GUI_DIR = gajim_root + '/gajim/data/gui'
from gajim.gajim import GajimApplication
app.app = GajimApplication()
......@@ -55,7 +55,7 @@ gajim.common.configpaths.gajimpaths.init(configdir)
# for some reason common.app needs to be imported before xmpppy?
from gajim.common import app
app.DATA_DIR = gajim_root + '/data'
app.DATA_DIR = gajim_root + '/gajim/data'
from common.stanza_session import StanzaSession
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment