# HG changeset patch # User Emmanuel Gil Peyrot # Date 1404942293 -7200 # Node ID 7f113f15300b5183dc7e383418334403148e1669 # Parent e992927f07a8f082709ae376cf8f9fdd2f25476d Include the Glade file in the main package on install. diff --git a/pytouhou/menu.py b/pytouhou/menu.py --- a/pytouhou/menu.py +++ b/pytouhou/menu.py @@ -15,9 +15,10 @@ from pytouhou.utils.helpers import get_logger logger = get_logger(__name__) -from gi.repository import Gtk, Gdk +from gi.repository import Gtk, Gdk, GLib import sys +import os import re GL_VERSION_REGEX = re.compile(r'^\d\.\d$') @@ -293,7 +294,10 @@ def menu(config, args): handler = Handler(config, args) builder = Gtk.Builder() - builder.add_from_file('data/menu.glade') + try: + builder.add_from_file(os.path.join(os.path.dirname(__file__), 'data', 'menu.glade')) + except GLib.GError: + builder.add_from_file(os.path.join('data', 'menu.glade')) builder.connect_signals(handler) handler.init_gtk(builder) diff --git a/setup.py b/setup.py --- a/setup.py +++ b/setup.py @@ -137,6 +137,13 @@ else: 'executables': [Executable(script='scripts/pytouhou', base=base)]} +# Create a link to the data files (for packaging purposes) +current_dir = os.path.dirname(os.path.realpath(__file__)) +temp_data_dir = os.path.join(current_dir, 'pytouhou', 'data') +if not os.path.exists(temp_data_dir): + os.symlink(os.path.join(current_dir, 'data'), temp_data_dir) + + setup(name='PyTouhou', version='0.1', author='Thibaut Girka', @@ -153,4 +160,10 @@ setup(name='PyTouhou', 'MAX_SOUNDS': 26, 'USE_OPENGL': use_opengl}), scripts=['scripts/pytouhou'] + (['scripts/anmviewer'] if anmviewer else []), + package_data={'pytouhou': ['data/menu.glade']}, **extra) + + +# Remove the link afterwards +if os.path.exists(temp_data_dir): + os.unlink(temp_data_dir)