Merge lp:~nataliabidart/ubuntu-sso-client/install-ui-files-properly into lp:ubuntu-sso-client

[Natalia Bidart]

- Install ui files consitently between Gtk and Qt (part of LP: #927994).

[Roberto Alsina (ralsina)]

+1

review: Approve

=== modified file '.bzrignore'
--- .bzrignore	2012-02-01 19:19:32 +0000
+++ .bzrignore	2012-02-07 01:58:19 +0000
@@ -1,7 +1,9 @@
 _trial_temp
 data/*.service
+MANIFEST
 build/
 dist/
-MANIFEST
 po/ubuntu-sso-client.pot
+ubuntu_sso/constants.py
 ubuntu_sso/qt/ui/*_ui.py
+ubuntu_sso/qt/ui/*_rc.py

=== modified file 'run-tests'
--- run-tests	2012-02-03 19:07:37 +0000
+++ run-tests	2012-02-07 01:58:19 +0000
@@ -40,6 +40,7 @@
 }
 unset GTK_MODULES
 
+XVFB_CMDLINE=""
 XVFB=$(which xvfb-run)
 if [ $XVFB ]; then
     XVFB_CMDLINE="$XVFB -a"

=== modified file 'setup.py'
--- setup.py	2012-02-01 20:20:45 +0000
+++ setup.py	2012-02-07 01:58:19 +0000
@@ -40,15 +40,16 @@
 
 POT_FILE = 'po/ubuntu-sso-client.pot'
 SERVICE_FILE = 'data/com.ubuntu.sso.service'
+CONSTANTS = 'ubuntu_sso/constants.py'
 
-CLEANFILES = [SERVICE_FILE, POT_FILE, 'MANIFEST']
+CLEANFILES = [SERVICE_FILE, POT_FILE, CONSTANTS, 'MANIFEST']
 QT_UI_DIR = os.path.join('ubuntu_sso', 'qt', 'ui')
 
 
 def replace_prefix(prefix):
     """Replace every '@prefix@' with prefix within 'filename' content."""
-    # replace .service file
-    for filename in (SERVICE_FILE,):
+    # replace .service file, DATA_DIR constant
+    for filename in (SERVICE_FILE, CONSTANTS):
         with open(filename + '.in') as in_file:
             content = in_file.read()
             with open(filename, 'w') as out_file:
@@ -327,6 +328,7 @@
     def run(self, *args):
         """Dummy."""
 
+
 if sys.platform == 'win32':
     cmdclass['build_i18n'] = dummy_build_i18n
 
@@ -364,7 +366,6 @@
           'bin/ubuntu-sso-login-gtk',
           'bin/ubuntu-sso-login-qt']),
         ('share/dbus-1/services', ['data/com.ubuntu.sso.service']),
-        ('share/ubuntu-sso-client/data/gtk', ['data/gtk/ui.glade']),
     ]
     extra = {}
 
@@ -382,15 +383,22 @@
     data_files=data_files,
     packages=[
         'ubuntu_sso',
+        'ubuntu_sso.tests',
         'ubuntu_sso.gtk',
         'ubuntu_sso.keyring',
+        'ubuntu_sso.keyring.tests',
         'ubuntu_sso.main',
+        'ubuntu_sso.main.tests',
         'ubuntu_sso.networkstate',
+        'ubuntu_sso.networkstate.tests',
         'ubuntu_sso.qt',
         'ubuntu_sso.qt.ui',
         'ubuntu_sso.utils',
+        'ubuntu_sso.utils.tests',
         'ubuntu_sso.utils.webclient',
+        'ubuntu_sso.utils.webclient.tests',
         'ubuntu_sso.xdg_base_directory',
+        'ubuntu_sso.xdg_base_directory.tests',
     ],
     cmdclass=cmdclass,
     **extra)

=== added file 'ubuntu_sso/constants.py.in'
--- ubuntu_sso/constants.py.in	1970-01-01 00:00:00 +0000
+++ ubuntu_sso/constants.py.in	2012-02-07 01:58:19 +0000
@@ -0,0 +1,27 @@
+# -*- coding: utf-8 -*-
+#
+# Copyright 2012 Canonical Ltd.
+#
+# This program is free software: you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 3, as published
+# by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranties of
+# MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+# PURPOSE.  See the GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+"""Some generated constants.
+
+DO NO EDIT! This is a generated file. It will be built at installation time.
+
+"""
+
+import os
+
+
+PROJECT_NAME = 'ubuntu-sso-client'
+PROJECT_DIR = os.path.join('@prefix@', 'share', PROJECT_NAME)

=== modified file 'ubuntu_sso/utils/ui.py'
--- ubuntu_sso/utils/ui.py	2012-01-04 16:02:05 +0000
+++ ubuntu_sso/utils/ui.py	2012-02-07 01:58:19 +0000
@@ -1,9 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Author: Natalia Bidart <[e-mail]>
-# Author: Manuel de la Pena <[e-mail]>
-#
-# Copyright 2011 Canonical Ltd.
+# Copyright 2011-2012 Canonical Ltd.
 #
 # This program is free software: you can redistribute it and/or modify it
 # under the terms of the GNU General Public License version 3, as published
@@ -23,7 +20,6 @@
 import gettext
 
 from ubuntu_sso.logger import setup_logging
-from ubuntu_sso import xdg_base_directory
 
 logger = setup_logging('ubuntu_sso.utils.ui')
 
@@ -105,37 +101,37 @@
 YES_TO_TC = _('I agree with the %(app_name)s terms and conditions')
 YES_TO_UPDATES = _('Yes! Email me %(app_name)s tips and updates.')
 
-
-def get_data_dir():
-    """Build absolute path to  the 'data' directory."""
+DATA_SUFFIX = 'data'
+
+
+def get_project_dir():
+    """Return the absolute path to this project's data/ dir.
+
+    Support symlinks, and priorize local (relative) data/ dir.
+    """
     module = os.path.dirname(__file__)
-    result = os.path.abspath(os.path.join(module, os.pardir,
-                                          os.pardir, 'data'))
-    logger.debug('get_data_file: trying to load from %r (exists? %s)',
-                 result, os.path.exists(result))
+    result = os.path.abspath(os.path.join(module, os.path.pardir,
+                                          os.path.pardir, DATA_SUFFIX))
+    logger.debug('get_project_dir: trying use data dir at %r (exists? %s)',
+                  result, os.path.exists(result))
     if os.path.exists(result):
-        logger.info('get_data_file: returning data dir located at %r.', result)
+        logger.info('get_project_dir: returning dir located at %r.', result)
         return result
 
-    # no local data dir, looking within system data dirs
-    data_dirs = xdg_base_directory.xdg_data_dirs
-    for path in data_dirs:
-        result = os.path.join(path, 'ubuntu-sso-client', 'data')
-        result = os.path.abspath(result)
-        logger.debug('get_data_file: trying to load from %r (exists? %s)',
-                     result, os.path.exists(result))
-        if os.path.exists(result):
-            logger.info('get_data_file: data dir located at %r.', result)
-            return result
-    else:
-        msg = 'get_data_file: can not build a valid data path. Giving up.' \
-              '__file__ is %r, data_dirs are %r'
-        logger.error(msg, __file__, data_dirs)
+    # otherwise, try to load PROJECT_DIR from installation path
+    try:
+        # pylint: disable=F0401, E0611, W0404
+        from ubuntu_sso.constants import PROJECT_DIR
+        return PROJECT_DIR
+    except ImportError:
+        msg = 'get_project_dir: can not build a valid path. Giving up. ' \
+              '__file__ is %r, constants module not available.'
+        logger.error(msg, __file__)
 
 
 def get_data_file(*args):
-    """Build absolute path to the path within the 'data' directory."""
-    return os.path.join(get_data_dir(), *args)
+    """Return the absolute path to 'args' within project data dir."""
+    return os.path.join(get_project_dir(), *args)
 
 
 def get_password_strength(password):