Fix distributing and loading of data files

This commit is contained in:
coderkun 2017-05-06 16:38:14 +02:00
commit 680ac1896a
2 changed files with 16 additions and 8 deletions

View file

@ -9,12 +9,18 @@ import os
# Set environment # Set environment
srcdir = os.path.abspath(os.path.dirname(__file__)) srcdir = os.path.abspath(os.path.dirname(__file__))
datadir = os.path.join(srcdir, '..', 'data') datadir = os.path.join(srcdir, 'data')
localedir = os.path.join(srcdir, '..', 'locale') datadirdev = os.path.join(srcdir, '..', 'data')
if os.path.exists(datadirdev):
datadir = datadirdev
localedir = None
localedirdev = os.path.join(srcdir, '..', 'locale')
if os.path.exists(localedirdev):
localedir = datadirdev
# Set GSettings schema dir (if not set already) # Set GSettings schema dir (if not set already)
if not os.environ.get('GSETTINGS_SCHEMA_DIR'): if not os.environ.get('GSETTINGS_SCHEMA_DIR'):
os.environ['GSETTINGS_SCHEMA_DIR'] = datadir os.environ['GSETTINGS_SCHEMA_DIR'] = datadirdev

View file

@ -60,15 +60,20 @@ setup(
author_email = "olli@coderkun.de", author_email = "olli@coderkun.de",
license = "GPL", license = "GPL",
packages = [ packages = [
"mcg" 'mcg',
'mcg/data'
], ],
package_dir = { package_dir = {
'mcg': 'mcg' 'mcg': 'mcg',
'mcg/data': 'data'
}, },
package_data = { package_data = {
'mcg': [ 'mcg': [
'LICENSE', 'LICENSE',
'README.textile' 'README.textile'
],
'mcg/data': [
'de.coderkun.mcg.gresource'
] ]
}, },
install_requires = [ install_requires = [
@ -92,9 +97,6 @@ setup(
(os.path.join('share', 'glib-2.0', 'schemas'), [ (os.path.join('share', 'glib-2.0', 'schemas'), [
"data/de.coderkun.mcg.gschema.xml" "data/de.coderkun.mcg.gschema.xml"
]), ]),
(os.path.join('share', 'mcg'), [
"data/de.coderkun.mcg.gresource",
]),
(os.path.join('share', 'locale', 'en', 'LC_MESSAGES'), [ (os.path.join('share', 'locale', 'en', 'LC_MESSAGES'), [
'locale/en/LC_MESSAGES/mcg.mo' 'locale/en/LC_MESSAGES/mcg.mo'
]), ]),