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

Proposed by Marc Tardif
Status: Merged
Merged at revision: 1777
Proposed branch: lp:~cr3/checkbox/setup_qt
Merge into: lp:checkbox
Diff against target: 106 lines (+36/-28)
2 files modified
debian/changelog (+2/-1)
setup.py (+34/-27)
To merge this branch: bzr merge lp:~cr3/checkbox/setup_qt
Reviewer Review Type Date Requested Status
Marc Tardif (community) Approve
Zygmunt Krynicki (community) Needs Fixing
Review via email: mp+129712@code.launchpad.net

Commit message

Made build dependency on qt4-make optional by cr3.

Description of the change

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

To post a comment you must log in.
lp:~cr3/checkbox/setup_qt updated
1776. By Marc Tardif

Fixed PEP8 error.

Revision history for this message
Zygmunt Krynicki (zyga) wrote :

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
Revision history for this message
Marc Tardif (cr3) wrote :

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
Revision history for this message
Zygmunt Krynicki (zyga) wrote :

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2012-10-15 13:51:28 +0000
3+++ debian/changelog 2012-10-15 16:29:20 +0000
4@@ -17,6 +17,7 @@
5 * plugins/environment_info.py: Enabling environment to take precedence
6 over configuration files.
7 * setup.py: added support for installing in virtualenv
8+ * setup.py: made build dependency on qt4-make optional
9
10 [Sean Feole]
11 * [FEATURE] jobs/optical.txt.in: modified existing automation test
12@@ -33,7 +34,7 @@
13 all partitions (LP: #1065862)
14 * [FEATURE] jobs/stress.txt.in: Added a wireless hotkey stress test.
15
16- -- Daniel Manrique <roadmr@ubuntu.com> Fri, 12 Oct 2012 10:47:26 -0400
17+ -- Marc Tardif <marc@ubuntu.com> Fri, 12 Oct 2012 10:47:26 -0400
18
19 checkbox (0.14.6) quantal; urgency=low
20
21
22=== modified file 'setup.py'
23--- setup.py 2012-10-12 18:29:41 +0000
24+++ setup.py 2012-10-15 16:29:20 +0000
25@@ -42,6 +42,30 @@
26 """Placeholder concrete class for fake icons support."""
27
28
29+DATA_FILES = [
30+ ("share/checkbox/", ["backend", "run"]),
31+ ("share/checkbox/data/audio/", ["data/audio/*"]),
32+ ("share/checkbox/data/documents/", ["data/documents/*"]),
33+ ("share/checkbox/data/images/", ["data/images/*.*"]),
34+ ("share/checkbox/data/images/oem-config",
35+ ["data/images/oem-config/*"]),
36+ ("share/checkbox/data/video/", ["data/video/*"]),
37+ ("share/checkbox/data/settings/", ["data/settings/*"]),
38+ ("share/checkbox/data/websites/", ["data/websites/*"]),
39+ ("share/checkbox/data/whitelists/", ["data/whitelists/*"]),
40+ ("share/checkbox/examples/", ["examples/*"]),
41+ ("share/checkbox/install/", ["install/*"]),
42+ ("share/checkbox/patches/", ["patches/*"]),
43+ ("share/checkbox/plugins/", ["plugins/*.py"]),
44+ ("share/checkbox/report/", ["report/*.*"]),
45+ ("share/checkbox/report/images/", ["report/images/*"]),
46+ ("share/checkbox/scripts/", ["scripts/*"]),
47+ ("share/checkbox/gtk/", ["gtk/checkbox-gtk.ui", "gtk/*.png"]),
48+ ("share/dbus-1/services/", ["qt/com.canonical.QtCheckbox.service"]),
49+ ("share/apport/package-hooks/", ["apport/source_checkbox.py"]),
50+ ("share/apport/general-hooks/", ["apport/checkbox.py"])]
51+
52+
53 def changelog_version(changelog="debian/changelog"):
54 version = "dev"
55 if posixpath.exists(changelog):
56@@ -107,10 +131,15 @@
57 self.sources = extract_sources_from_data_files(data_files)
58
59 def run(self):
60- errno = subprocess.call(
61- "(cd qt/frontend; qmake-qt4; make)", shell=True)
62- if errno:
63- raise SystemExit(errno)
64+ # This should always work when building a Debian package.
65+ if os.path.exists("/usr/bin/qmake-qt4"):
66+ errno = subprocess.call(
67+ "(cd qt/frontend; qmake-qt4; make)", shell=True)
68+ if errno:
69+ raise SystemExit(errno)
70+
71+ DATA_FILES.append(("lib/checkbox/qt/",
72+ ["qt/frontend/checkbox-qt-service"]))
73
74 super(checkbox_build, self).run()
75
76@@ -230,29 +259,7 @@
77 long_description="""
78 This project provides an extensible interface for system testing.
79 """,
80- data_files=[
81- ("lib/checkbox/qt/", ["qt/frontend/checkbox-qt-service"]),
82- ("share/checkbox/", ["backend", "run"]),
83- ("share/checkbox/data/audio/", ["data/audio/*"]),
84- ("share/checkbox/data/documents/", ["data/documents/*"]),
85- ("share/checkbox/data/images/", ["data/images/*.*"]),
86- ("share/checkbox/data/images/oem-config",
87- ["data/images/oem-config/*"]),
88- ("share/checkbox/data/video/", ["data/video/*"]),
89- ("share/checkbox/data/settings/", ["data/settings/*"]),
90- ("share/checkbox/data/websites/", ["data/websites/*"]),
91- ("share/checkbox/data/whitelists/", ["data/whitelists/*"]),
92- ("share/checkbox/examples/", ["examples/*"]),
93- ("share/checkbox/install/", ["install/*"]),
94- ("share/checkbox/patches/", ["patches/*"]),
95- ("share/checkbox/plugins/", ["plugins/*.py"]),
96- ("share/checkbox/report/", ["report/*.*"]),
97- ("share/checkbox/report/images/", ["report/images/*"]),
98- ("share/checkbox/scripts/", ["scripts/*"]),
99- ("share/checkbox/gtk/", ["gtk/checkbox-gtk.ui", "gtk/*.png"]),
100- ("share/dbus-1/services/", ["qt/com.canonical.QtCheckbox.service"]),
101- ("share/apport/package-hooks/", ["apport/source_checkbox.py"]),
102- ("share/apport/general-hooks/", ["apport/checkbox.py"])],
103+ data_files=DATA_FILES,
104 scripts=[
105 "bin/checkbox-cli", "bin/checkbox-gtk", "bin/checkbox-urwid",
106 "bin/checkbox-qt"],

Subscribers

People subscribed via source and target branches