Merge lp:~cr3/checkbox/setup_qt into lp:checkbox

[Marc Tardif]

Made build dependency on qt4-make optional by cr3.

These changes prevent having other projects like hexr which only need the checkbox core to depend on building the Qt interface. The build process should not be affected for all other intents and purposes. Here is the result of testing the sbuild process:

Architecture: amd64
Build-Space: 46944
Build-Time: 148
Distribution: quantal
Install-Time: 80
Job: ../checkbox_0.14.10.dsc
Package: checkbox
Package-Time: 260
Source-Version: 0.14.10
Space: 46944
Status: successful
Version: 0.14.10
────────────────────────────────────────────────────────────────────────────────
Finished at 20121015-1215
Build needed 00:04:20, 46944k disc space

[lp:~cr3/checkbox/setup_qt]

1776. By Marc Tardif on 2012-10-15

Fixed PEP8 error.

[Zygmunt Krynicki (zyga)]

16 - -- Daniel Manrique <email address hidden> Fri, 12 Oct 2012 10:47:26 -0400
17 + -- Marc Tardif <email address hidden> Fri, 12

I don't think we should be changing that, we'll just add more conflicts

Otherwise ok

review: Needs Fixing

[Marc Tardif (cr3)]

This is what happened when I merged this setup_qt branch into trunk:

$ bzr merge ../setup_qt
 M debian/changelog
 M setup.py
All changes applied successfully.

No conflict, so I'll just merge myself for the sake of saving everyone some time. Yes, that means I'll be approving myself.

review: Approve

[Zygmunt Krynicki (zyga)]

While it can merge correctly NOW it will add more problems where the next person has his patch ready but has not seen you change that line. Changelogs are _append_ structures

=== modified file 'debian/changelog'
--- debian/changelog	2012-10-15 13:51:28 +0000
+++ debian/changelog	2012-10-15 16:29:20 +0000
@@ -17,6 +17,7 @@
   * plugins/environment_info.py: Enabling environment to take precedence
     over configuration files.
   * setup.py: added support for installing in virtualenv
+  * setup.py: made build dependency on qt4-make optional
 
   [Sean Feole]
   * [FEATURE] jobs/optical.txt.in: modified existing automation test
@@ -33,7 +34,7 @@
     all partitions (LP: #1065862)
   * [FEATURE] jobs/stress.txt.in: Added a wireless hotkey stress test.
 
- -- Daniel Manrique <[e-mail]>  Fri, 12 Oct 2012 10:47:26 -0400
+ -- Marc Tardif <[e-mail]>  Fri, 12 Oct 2012 10:47:26 -0400
 
 checkbox (0.14.6) quantal; urgency=low
 
 
=== modified file 'setup.py'
--- setup.py	2012-10-12 18:29:41 +0000
+++ setup.py	2012-10-15 16:29:20 +0000
@@ -42,6 +42,30 @@
         """Placeholder concrete class for fake icons support."""
 
 
+DATA_FILES = [
+    ("share/checkbox/", ["backend", "run"]),
+    ("share/checkbox/data/audio/", ["data/audio/*"]),
+    ("share/checkbox/data/documents/", ["data/documents/*"]),
+    ("share/checkbox/data/images/", ["data/images/*.*"]),
+    ("share/checkbox/data/images/oem-config",
+        ["data/images/oem-config/*"]),
+    ("share/checkbox/data/video/", ["data/video/*"]),
+    ("share/checkbox/data/settings/", ["data/settings/*"]),
+    ("share/checkbox/data/websites/", ["data/websites/*"]),
+    ("share/checkbox/data/whitelists/", ["data/whitelists/*"]),
+    ("share/checkbox/examples/", ["examples/*"]),
+    ("share/checkbox/install/", ["install/*"]),
+    ("share/checkbox/patches/", ["patches/*"]),
+    ("share/checkbox/plugins/", ["plugins/*.py"]),
+    ("share/checkbox/report/", ["report/*.*"]),
+    ("share/checkbox/report/images/", ["report/images/*"]),
+    ("share/checkbox/scripts/", ["scripts/*"]),
+    ("share/checkbox/gtk/", ["gtk/checkbox-gtk.ui", "gtk/*.png"]),
+    ("share/dbus-1/services/", ["qt/com.canonical.QtCheckbox.service"]),
+    ("share/apport/package-hooks/", ["apport/source_checkbox.py"]),
+    ("share/apport/general-hooks/", ["apport/checkbox.py"])]
+
+
 def changelog_version(changelog="debian/changelog"):
     version = "dev"
     if posixpath.exists(changelog):
@@ -107,10 +131,15 @@
         self.sources = extract_sources_from_data_files(data_files)
 
     def run(self):
-        errno = subprocess.call(
-            "(cd qt/frontend; qmake-qt4; make)", shell=True)
-        if errno:
-            raise SystemExit(errno)
+        # This should always work when building a Debian package.
+        if os.path.exists("/usr/bin/qmake-qt4"):
+            errno = subprocess.call(
+                "(cd qt/frontend; qmake-qt4; make)", shell=True)
+            if errno:
+                raise SystemExit(errno)
+
+            DATA_FILES.append(("lib/checkbox/qt/",
+              ["qt/frontend/checkbox-qt-service"]))
 
         super(checkbox_build, self).run()
 
@@ -230,29 +259,7 @@
     long_description="""
 This project provides an extensible interface for system testing.
 """,
-    data_files=[
-        ("lib/checkbox/qt/", ["qt/frontend/checkbox-qt-service"]),
-        ("share/checkbox/", ["backend", "run"]),
-        ("share/checkbox/data/audio/", ["data/audio/*"]),
-        ("share/checkbox/data/documents/", ["data/documents/*"]),
-        ("share/checkbox/data/images/", ["data/images/*.*"]),
-        ("share/checkbox/data/images/oem-config",
-            ["data/images/oem-config/*"]),
-        ("share/checkbox/data/video/", ["data/video/*"]),
-        ("share/checkbox/data/settings/", ["data/settings/*"]),
-        ("share/checkbox/data/websites/", ["data/websites/*"]),
-        ("share/checkbox/data/whitelists/", ["data/whitelists/*"]),
-        ("share/checkbox/examples/", ["examples/*"]),
-        ("share/checkbox/install/", ["install/*"]),
-        ("share/checkbox/patches/", ["patches/*"]),
-        ("share/checkbox/plugins/", ["plugins/*.py"]),
-        ("share/checkbox/report/", ["report/*.*"]),
-        ("share/checkbox/report/images/", ["report/images/*"]),
-        ("share/checkbox/scripts/", ["scripts/*"]),
-        ("share/checkbox/gtk/", ["gtk/checkbox-gtk.ui", "gtk/*.png"]),
-        ("share/dbus-1/services/", ["qt/com.canonical.QtCheckbox.service"]),
-        ("share/apport/package-hooks/", ["apport/source_checkbox.py"]),
-        ("share/apport/general-hooks/", ["apport/checkbox.py"])],
+    data_files=DATA_FILES,
     scripts=[
         "bin/checkbox-cli", "bin/checkbox-gtk", "bin/checkbox-urwid",
         "bin/checkbox-qt"],