Merge lp:~unity-team/qtmir/inline-gles-quilt into lp:qtmir
- inline-gles-quilt
- Merge into trunk
Status: | Rejected |
---|---|
Rejected by: | Michał Sawicz |
Proposed branch: | lp:~unity-team/qtmir/inline-gles-quilt |
Merge into: | lp:qtmir |
Diff against target: |
262 lines (+234/-0) 5 files modified
debian/bileto_convert_to_gles (+13/-0) debian/gles-patches/convert-to-gles.patch (+203/-0) debian/gles-patches/series (+1/-0) tests/CMakeLists.txt (+6/-0) tests/convert-to-gles.sh (+11/-0) |
To merge this branch: | bzr merge lp:~unity-team/qtmir/inline-gles-quilt |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Robert Bruce Park (community) | Disapprove | ||
Unity8 CI Bot (community) | continuous-integration | Needs Fixing | |
Gerry Boland | tentative | Pending | |
Review via email: mp+290061@code.launchpad.net |
This proposal supersedes a proposal from 2016-03-11.
Commit message
Inline GLES packaging
Description of the change
Experimenting with having GLES debian/ dir inlined in same trunk, and experimenting with train building gles package for you.
control.gles and rules.gles are copied verbatim from lp:qtmir/gles
=====
I've now employed quilt to do this, and added a test that runs in the non-gles tree.
Unity8 CI Bot (unity8-ci-bot) wrote : Posted in a previous version of this proposal | # |
Unity8 CI Bot (unity8-ci-bot) wrote : Posted in a previous version of this proposal | # |
FAILED: Continuous integration, rev:454
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https:/
https:/
Executed test runs:
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
Click here to trigger a rebuild:
https:/
Unity8 CI Bot (unity8-ci-bot) wrote : Posted in a previous version of this proposal | # |
PASSED: Continuous integration, rev:455
https:/
Executed test runs:
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
Click here to trigger a rebuild:
https:/
Unity8 CI Bot (unity8-ci-bot) wrote : Posted in a previous version of this proposal | # |
PASSED: Continuous integration, rev:456
https:/
Executed test runs:
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
Click here to trigger a rebuild:
https:/
Unity8 CI Bot (unity8-ci-bot) wrote : Posted in a previous version of this proposal | # |
PASSED: Continuous integration, rev:457
https:/
Executed test runs:
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
Click here to trigger a rebuild:
https:/
Unity8 CI Bot (unity8-ci-bot) wrote : Posted in a previous version of this proposal | # |
PASSED: Continuous integration, rev:459
https:/
Executed test runs:
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
Click here to trigger a rebuild:
https:/
Unity8 CI Bot (unity8-ci-bot) wrote : Posted in a previous version of this proposal | # |
PASSED: Continuous integration, rev:460
https:/
Executed test runs:
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
Click here to trigger a rebuild:
https:/
Gerry Boland (gerboland) wrote : Posted in a previous version of this proposal | # |
+sed --in-place 's/qtmir/
this will edit more than just the package names in the changelog. Example:
- * Depend on same-version qtmir-{
+ * Depend on same-version qtmir-gles-
- * Migration of qtmir from the legacy Mir API
+ * Migration of qtmir-gles from the legacy Mir API
Could you make the sed replace a bit more strict, to prevent this?
I'm also a giant fan of explaining non-obvious things with a comment or readme - please add a readme to explain the purpose of the *.gles and bileto scripts.
Also, is editing "debian/copyright" necessary? Upstream name always being "qtmir" strikes me as more correct.
Looks fine to me otherwise.
Robert Bruce Park (robru) wrote : Posted in a previous version of this proposal | # |
On Mon, Mar 21, 2016 at 7:55 AM, Gerry Boland
<email address hidden> wrote:
> Could you make the sed replace a bit more strict, to prevent this?
Can do.
> I'm also a giant fan of explaining non-obvious things with a comment or readme - please add a readme to explain the purpose of the *.gles and bileto scripts.
On it.
> Also, is editing "debian/copyright" necessary? Upstream name always being "qtmir" strikes me as more correct.
Well I wrote the script to minimize the diff against the existing
qtmir-gles package, eg, the existing qtmir-gles already defines
"Upstream-Name: qtmir-gles" in its debian/copyright.
Now that you mention it, since the field is called "Upstream" Name, it
does seem more correct to leave it as just qtmir, but that will
introduce a packaging diff when this code goes live.
--
robru
Robert Bruce Park (robru) wrote : Posted in a previous version of this proposal | # |
Ok fixed sed, let me know if the comment is clear enough.
This is safe to merge as-is however the train implementation of this isn't in production yet so you have to keep maintaining lp:qtmir/gles for the time being.
Unity8 CI Bot (unity8-ci-bot) wrote : Posted in a previous version of this proposal | # |
FAILED: Continuous integration, rev:461
https:/
Executed test runs:
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
FAILURE: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
Click here to trigger a rebuild:
https:/
Unity8 CI Bot (unity8-ci-bot) wrote : Posted in a previous version of this proposal | # |
FAILED: Continuous integration, rev:461
https:/
Executed test runs:
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
deb: https:/
FAILURE: https:/
SUCCESS: https:/
deb: https:/
FAILURE: https:/
SUCCESS: https:/
deb: https:/
FAILURE: https:/
Click here to trigger a rebuild:
https:/
Gerry Boland (gerboland) wrote : Posted in a previous version of this proposal | # |
Tentative approval. Approach is good.
Already the build dependencies here are out of date, so this will need refreshing at land-time.
Would be cool to auto-generate the control.gles file from the control file, as build-dep changes are something easily forgotten in the gles file. But this will as first step.
Robert Bruce Park (robru) wrote : Posted in a previous version of this proposal | # |
Yeah it's difficult for me to identify which differences are because lp:qtmir/gles is languishing and which are the necessary changes for gles to actually work.
I like saviq's idea to use a patch instead of duplicating the files but i don't have enough knowledge of gles to produce the correct patch. This branch currently is just "merge lp:qtmir/gles into here" and doesn't make any attempt at reducing the delta.
Robert Bruce Park (robru) wrote : | # |
Drop vcs-bzr/
Also the sed is wrong, needs a space after qtmir-gles (my fault though)
Why do you drop --fail-missing? High chance of building empty packages there.
Unity8 CI Bot (unity8-ci-bot) wrote : | # |
FAILED: Continuous integration, rev:462
https:/
Executed test runs:
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
Click here to trigger a rebuild:
https:/
- 463. By Michał Sawicz
-
Fix sed line and drop gles-specific Vcs headers
Michał Sawicz (saviq) wrote : | # |
> Why do you drop --fail-missing? High chance of building empty packages there.
Because we're still installing the whole thing and only packaging a small part of it. With --fail-missing dpkg will complain that we're not packaging all the installed files.
Michał Sawicz (saviq) wrote : | # |
Oh and fixed the other bits, thanks!
Robert Bruce Park (robru) wrote : | # |
Wouldn't it then be more correct to delete the unnecessary files and keep --fail-missing?
Dropping --fail-missing terrifies me, I've seen to many packages be built empty and nobody noticed until it's too late.
Unity8 CI Bot (unity8-ci-bot) wrote : | # |
FAILED: Continuous integration, rev:463
https:/
Executed test runs:
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
Click here to trigger a rebuild:
https:/
Robert Bruce Park (robru) wrote : | # |
Hmmm, tried running this in the staging train, not sure what happened to quilt here:
https:/
+ su citrain-
+ QUILT_PATCHES=
+ quilt push -a
No series file found
I guess you need to export QUILT_PATCHES.
Robert Bruce Park (robru) wrote : | # |
Also it's not entirely clear to me that your test makes sense, because if "quilt push -a" fails, that means bileto_
Unless you're intending that test to be run locally by devs before it goes into a silo.
Robert Bruce Park (robru) wrote : | # |
Ok, I've started iterating on this in the ci train staging instance which has the new GLES magic live, see here:
https:/
Unmerged revisions
Preview Diff
1 | === added file 'debian/bileto_convert_to_gles' | |||
2 | --- debian/bileto_convert_to_gles 1970-01-01 00:00:00 +0000 | |||
3 | +++ debian/bileto_convert_to_gles 2016-03-30 22:58:26 +0000 | |||
4 | @@ -0,0 +1,13 @@ | |||
5 | 1 | #!/bin/sh | ||
6 | 2 | |||
7 | 3 | # This script converts the debian/ packaging into an alternate source package | ||
8 | 4 | # which builds with GLES. You should copy the source tree into a new directory | ||
9 | 5 | # before running this script (so you have one copy for GLES and one copy for | ||
10 | 6 | # regular GL). | ||
11 | 7 | |||
12 | 8 | set -eux | ||
13 | 9 | |||
14 | 10 | QUILT_PATCHES=debian/gles-patches | ||
15 | 11 | quilt push -a | ||
16 | 12 | |||
17 | 13 | sed --in-place 's/^qtmir /qtmir-gles /g' debian/changelog | ||
18 | 0 | 14 | ||
19 | === added directory 'debian/gles-patches' | |||
20 | === added file 'debian/gles-patches/convert-to-gles.patch' | |||
21 | --- debian/gles-patches/convert-to-gles.patch 1970-01-01 00:00:00 +0000 | |||
22 | +++ debian/gles-patches/convert-to-gles.patch 2016-03-30 22:58:26 +0000 | |||
23 | @@ -0,0 +1,203 @@ | |||
24 | 1 | Index: qtmir/debian/control | ||
25 | 2 | =================================================================== | ||
26 | 3 | --- qtmir.orig/debian/control | ||
27 | 4 | +++ qtmir/debian/control | ||
28 | 5 | @@ -1,4 +1,4 @@ | ||
29 | 6 | -Source: qtmir | ||
30 | 7 | +Source: qtmir-gles | ||
31 | 8 | Section: libs | ||
32 | 9 | Priority: optional | ||
33 | 10 | Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com> | ||
34 | 11 | @@ -16,7 +16,13 @@ Build-Depends: cmake, | ||
35 | 12 | libmirserver-dev (>= 0.19.0), | ||
36 | 13 | libmtdev-dev, | ||
37 | 14 | libprocess-cpp-dev, | ||
38 | 15 | + libqt5gui5-gles, | ||
39 | 16 | + libqt5quick5-gles, | ||
40 | 17 | + libqt5quickparticles5-gles, | ||
41 | 18 | + libqt5quicktest5, | ||
42 | 19 | + libqt5quickwidgets5-gles, | ||
43 | 20 | libqt5sensors5-dev, | ||
44 | 21 | + libqt5test5, | ||
45 | 22 | libqtdbusmock1-dev (>= 0.2), | ||
46 | 23 | libqtdbustest1-dev (>= 0.2), | ||
47 | 24 | libubuntu-app-launch2-dev, | ||
48 | 25 | @@ -31,8 +37,8 @@ Build-Depends: cmake, | ||
49 | 26 | # lttng-gen-ts needs python3, but doesn't depend on it itself: bug 1359147 | ||
50 | 27 | python3:any, | ||
51 | 28 | qt5-default, | ||
52 | 29 | - qtbase5-dev, | ||
53 | 30 | - qtbase5-private-dev, | ||
54 | 31 | + qtbase5-gles-dev, | ||
55 | 32 | + qtbase5-private-gles-dev, | ||
56 | 33 | qtdeclarative5-dev, | ||
57 | 34 | qtdeclarative5-private-dev, | ||
58 | 35 | Standards-Version: 3.9.5 | ||
59 | 36 | @@ -45,7 +51,7 @@ Vcs-Browser: http://bazaar.launchpad.net | ||
60 | 37 | Xs-Testsuite: autopkgtest | ||
61 | 38 | |||
62 | 39 | Package: qtmir-android | ||
63 | 40 | -Architecture: armhf | ||
64 | 41 | +Architecture: amd64 i386 | ||
65 | 42 | Multi-Arch: same | ||
66 | 43 | Conflicts: libqtmir, | ||
67 | 44 | qtmir-desktop, | ||
68 | 45 | @@ -56,65 +62,10 @@ Replaces: libqtmir, | ||
69 | 46 | Provides: qtmir, | ||
70 | 47 | Depends: ${misc:Depends}, | ||
71 | 48 | ${shlibs:Depends}, | ||
72 | 49 | -Description: Qt platform abstraction (QPA) plugin for a Mir server (mobile) | ||
73 | 50 | +Description: Qt platform abstraction (QPA) plugin for a Mir server (mobile) - OpenGLES | ||
74 | 51 | QtMir is a set of Qt5 components to enable one to write a Mir server with Qt. | ||
75 | 52 | It contains a QPA (Qt Platform Abstraction) plugin which creates and manages | ||
76 | 53 | a Mir server. It also exposes some internal Mir functionality. | ||
77 | 54 | . | ||
78 | 55 | - This variant of the package is for Android-based phones and tablets. | ||
79 | 56 | - | ||
80 | 57 | -Package: qtmir-desktop | ||
81 | 58 | -Architecture: any | ||
82 | 59 | -Multi-Arch: same | ||
83 | 60 | -Conflicts: qtmir-android, | ||
84 | 61 | - qtubuntu-android, | ||
85 | 62 | -Replaces: libqtmir, | ||
86 | 63 | - qtmir-android, | ||
87 | 64 | - qtubuntu-android, | ||
88 | 65 | -Provides: qtmir, | ||
89 | 66 | -Depends: ${misc:Depends}, | ||
90 | 67 | - ${shlibs:Depends}, | ||
91 | 68 | -Description: Qt platform abstraction (QPA) plugin for a Mir server (desktop) | ||
92 | 69 | - QtMir is a set of Qt5 components to enable one to write a Mir server with Qt. | ||
93 | 70 | - It contains a QPA (Qt Platform Abstraction) plugin which creates and manages | ||
94 | 71 | - a Mir server. It also exposes some internal Mir functionality. | ||
95 | 72 | - . | ||
96 | 73 | - This variant of the package is for GNU-based desktops. | ||
97 | 74 | - | ||
98 | 75 | -Package: qtdeclarative5-qtmir-plugin | ||
99 | 76 | -Architecture: any | ||
100 | 77 | -Multi-Arch: same | ||
101 | 78 | -Pre-Depends: ${misc:Pre-Depends}, | ||
102 | 79 | -Depends: qtmir-desktop (= ${source:Version}) | qtmir-android (= ${source:Version}), | ||
103 | 80 | - ${misc:Depends}, | ||
104 | 81 | - ${shlibs:Depends}, | ||
105 | 82 | -Replaces: libqtmir, | ||
106 | 83 | - libunity-mir1, | ||
107 | 84 | -Conflicts: libqtmir, | ||
108 | 85 | - libunity-mir1, | ||
109 | 86 | -Provides: unity-application-impl, | ||
110 | 87 | - unity-application-impl-13, | ||
111 | 88 | -Description: Qt plugin for Unity specific Mir APIs | ||
112 | 89 | - QtMir provides Qt/QML bindings for Mir features that are exposed through the | ||
113 | 90 | - qtmir-desktop or qtmir-android QPA plugin such as Application management | ||
114 | 91 | - (start/stop/suspend/resume) and surface management. | ||
115 | 92 | - | ||
116 | 93 | -Package: qtmir-tests | ||
117 | 94 | -Architecture: any | ||
118 | 95 | -Multi-Arch: same | ||
119 | 96 | -Pre-Depends: ${misc:Pre-Depends}, | ||
120 | 97 | -Depends: autopilot-qt5, | ||
121 | 98 | - littler, | ||
122 | 99 | - lttng-tools, | ||
123 | 100 | - mir-test-tools, | ||
124 | 101 | - python3-autopilot, | ||
125 | 102 | - python3-babeltrace, | ||
126 | 103 | - python3-evdev, | ||
127 | 104 | - python3-mir-perf-framework, | ||
128 | 105 | - qtdeclarative5-qtmir-plugin, | ||
129 | 106 | - qtmir-desktop (= ${source:Version}) | qtmir-android (= ${source:Version}), | ||
130 | 107 | - ${misc:Depends}, | ||
131 | 108 | - ${shlibs:Depends}, | ||
132 | 109 | -Description: QtMir tests and demos | ||
133 | 110 | - This package provides benchmark tests and a simple shell and client using the | ||
134 | 111 | - QtMir QPA. | ||
135 | 112 | + This variant of the package is for Android-based phones and tablets (built | ||
136 | 113 | + against the OpenGLES variant of qtbase). | ||
137 | 114 | Index: qtmir/debian/qtdeclarative5-qtmir-plugin.install | ||
138 | 115 | =================================================================== | ||
139 | 116 | --- qtmir.orig/debian/qtdeclarative5-qtmir-plugin.install | ||
140 | 117 | +++ /dev/null | ||
141 | 118 | @@ -1,2 +0,0 @@ | ||
142 | 119 | -usr/lib/*/qt5/qml/* | ||
143 | 120 | -usr/share/glib-2.0/schemas | ||
144 | 121 | Index: qtmir/debian/qtmir-desktop.install | ||
145 | 122 | =================================================================== | ||
146 | 123 | --- qtmir.orig/debian/qtmir-desktop.install | ||
147 | 124 | +++ /dev/null | ||
148 | 125 | @@ -1 +0,0 @@ | ||
149 | 126 | -usr/lib/*/qt5/plugins/platforms/* | ||
150 | 127 | Index: qtmir/debian/qtmir-tests.install | ||
151 | 128 | =================================================================== | ||
152 | 129 | --- qtmir.orig/debian/qtmir-tests.install | ||
153 | 130 | +++ /dev/null | ||
154 | 131 | @@ -1,6 +0,0 @@ | ||
155 | 132 | -usr/bin/qtmir-demo-client | ||
156 | 133 | -usr/bin/qtmir-demo-shell | ||
157 | 134 | -usr/share/applications/qtmir-demo-client.desktop | ||
158 | 135 | -usr/share/qtmir/benchmarks/* | ||
159 | 136 | -usr/share/qtmir/qtmir-demo-client/* | ||
160 | 137 | -usr/share/qtmir/qtmir-demo-shell/ | ||
161 | 138 | Index: qtmir/debian/rules | ||
162 | 139 | =================================================================== | ||
163 | 140 | --- qtmir.orig/debian/rules | ||
164 | 141 | +++ qtmir/debian/rules | ||
165 | 142 | @@ -3,60 +3,27 @@ | ||
166 | 143 | |||
167 | 144 | export DPKG_GENSYMBOLS_CHECK_LEVEL=4 | ||
168 | 145 | |||
169 | 146 | -include /usr/share/dpkg/default.mk | ||
170 | 147 | - | ||
171 | 148 | ANDROID_DIR = build-android | ||
172 | 149 | -DESKTOP_DIR = build-desktop | ||
173 | 150 | TMP1_DIR = $(CURDIR)/debian/tmp1 | ||
174 | 151 | -TMP2_DIR = $(CURDIR)/debian/tmp2 | ||
175 | 152 | - | ||
176 | 153 | -# We only want to build qtmir-android on arches using Qt built with OpenGL ES2.0 | ||
177 | 154 | -DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH) | ||
178 | 155 | -gles2_architectures = armhf | ||
179 | 156 | - | ||
180 | 157 | -USES_GLES2 = $(findstring $(DEB_HOST_ARCH), $(gles2_architectures)) | ||
181 | 158 | |||
182 | 159 | %: | ||
183 | 160 | - dh $@ --parallel --fail-missing | ||
184 | 161 | + dh $@ --parallel | ||
185 | 162 | |||
186 | 163 | override_dh_clean: | ||
187 | 164 | -ifeq ($(DEB_HOST_ARCH),$(USES_GLES2)) | ||
188 | 165 | rm -rf $(TMP1_DIR) | ||
189 | 166 | -endif | ||
190 | 167 | - rm -rf $(TMP2_DIR) | ||
191 | 168 | dh_clean | ||
192 | 169 | |||
193 | 170 | override_dh_auto_configure: | ||
194 | 171 | -ifeq ($(DEB_HOST_ARCH),$(USES_GLES2)) | ||
195 | 172 | mkdir -p $(ANDROID_DIR) && dh_auto_configure -B$(ANDROID_DIR) -- $(FLAGS) $(CURDIR) -DUSE_OPENGLES=1 | ||
196 | 173 | -# See comment in CMakeLists.txt | ||
197 | 174 | - mkdir -p $(DESKTOP_DIR) && dh_auto_configure -B$(DESKTOP_DIR) -- $(FLAGS) $(CURDIR) -DUSE_OPENGL_BUT_LINK_AGAINST_OPENGLES=1 | ||
198 | 175 | -else | ||
199 | 176 | - mkdir -p $(DESKTOP_DIR) && dh_auto_configure -B$(DESKTOP_DIR) -- $(FLAGS) $(CURDIR) -DUSE_OPENGLES=1 | ||
200 | 177 | -endif | ||
201 | 178 | |||
202 | 179 | override_dh_auto_build: | ||
203 | 180 | -ifeq ($(DEB_HOST_ARCH),$(USES_GLES2)) | ||
204 | 181 | dh_auto_build -B$(ANDROID_DIR) | ||
205 | 182 | -endif | ||
206 | 183 | - dh_auto_build -B$(DESKTOP_DIR) | ||
207 | 184 | |||
208 | 185 | override_dh_auto_test: | ||
209 | 186 | -ifeq ($(DEB_HOST_ARCH),$(USES_GLES2)) | ||
210 | 187 | dh_auto_test -B$(ANDROID_DIR) | ||
211 | 188 | -endif | ||
212 | 189 | - dh_auto_test -B$(DESKTOP_DIR) | ||
213 | 190 | |||
214 | 191 | override_dh_auto_install: | ||
215 | 192 | -ifeq ($(DEB_HOST_ARCH),$(USES_GLES2)) | ||
216 | 193 | dh_auto_install -B$(ANDROID_DIR) --destdir=$(TMP1_DIR) | ||
217 | 194 | -endif | ||
218 | 195 | - dh_auto_install -B$(DESKTOP_DIR) --destdir=$(TMP2_DIR) | ||
219 | 196 | |||
220 | 197 | override_dh_install: | ||
221 | 198 | -ifeq ($(DEB_HOST_ARCH),$(USES_GLES2)) | ||
222 | 199 | dh_install --sourcedir=$(TMP1_DIR) -pqtmir-android | ||
223 | 200 | -endif | ||
224 | 201 | - dh_install --sourcedir=$(TMP2_DIR) -pqtmir-desktop | ||
225 | 202 | - dh_install --sourcedir=$(TMP2_DIR) -pqtdeclarative5-qtmir-plugin | ||
226 | 203 | - dh_install --sourcedir=$(TMP2_DIR) -pqtmir-tests | ||
227 | 0 | 204 | ||
228 | === added file 'debian/gles-patches/series' | |||
229 | --- debian/gles-patches/series 1970-01-01 00:00:00 +0000 | |||
230 | +++ debian/gles-patches/series 2016-03-30 22:58:26 +0000 | |||
231 | @@ -0,0 +1,1 @@ | |||
232 | 1 | convert-to-gles.patch | ||
233 | 0 | 2 | ||
234 | === modified file 'tests/CMakeLists.txt' | |||
235 | --- tests/CMakeLists.txt 2015-09-30 15:45:17 +0000 | |||
236 | +++ tests/CMakeLists.txt 2016-03-30 22:58:26 +0000 | |||
237 | @@ -3,3 +3,9 @@ | |||
238 | 3 | add_subdirectory(framework) | 3 | add_subdirectory(framework) |
239 | 4 | add_subdirectory(mirserver) | 4 | add_subdirectory(mirserver) |
240 | 5 | add_subdirectory(modules) | 5 | add_subdirectory(modules) |
241 | 6 | |||
242 | 7 | add_test( | ||
243 | 8 | NAME convert-to-gles | ||
244 | 9 | COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/convert-to-gles.sh | ||
245 | 10 | WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} | ||
246 | 11 | ) | ||
247 | 6 | 12 | ||
248 | === added file 'tests/convert-to-gles.sh' | |||
249 | --- tests/convert-to-gles.sh 1970-01-01 00:00:00 +0000 | |||
250 | +++ tests/convert-to-gles.sh 2016-03-30 22:58:26 +0000 | |||
251 | @@ -0,0 +1,11 @@ | |||
252 | 1 | #!/bin/sh | ||
253 | 2 | |||
254 | 3 | set -eux | ||
255 | 4 | |||
256 | 5 | QUILT_EXIT=0 | ||
257 | 6 | QUILT_PATCHES=debian/gles-patches | ||
258 | 7 | |||
259 | 8 | quilt push -a || QUILT_EXIT=$? | ||
260 | 9 | quilt pop -a | ||
261 | 10 | |||
262 | 11 | exit $QUILT_EXIT |
FAILED: Continuous integration, rev:453 /code.launchpad .net/~robru/ qtmir/inline- gles/+merge/ 288732/ +edit-commit- message
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https:/
https:/ /unity8- jenkins. ubuntu. com/job/ lp-qtmir- ci/104/ /unity8- jenkins. ubuntu. com/job/ build-0- fetch/879 /unity8- jenkins. ubuntu. com/job/ build-1- sourcepkg/ release= vivid+overlay/ 895 /unity8- jenkins. ubuntu. com/job/ build-1- sourcepkg/ release= xenial/ 895 /unity8- jenkins. ubuntu. com/job/ build-2- binpkg/ arch=amd64, release= vivid+overlay/ 893 /unity8- jenkins. ubuntu. com/job/ build-2- binpkg/ arch=amd64, release= vivid+overlay/ 893/artifact/ output/ *zip*/output. zip /unity8- jenkins. ubuntu. com/job/ build-2- binpkg/ arch=amd64, release= xenial/ 893 /unity8- jenkins. ubuntu. com/job/ build-2- binpkg/ arch=amd64, release= xenial/ 893/artifact/ output/ *zip*/output. zip /unity8- jenkins. ubuntu. com/job/ build-2- binpkg/ arch=armhf, release= vivid+overlay/ 893 /unity8- jenkins. ubuntu. com/job/ build-2- binpkg/ arch=armhf, release= vivid+overlay/ 893/artifact/ output/ *zip*/output. zip /unity8- jenkins. ubuntu. com/job/ build-2- binpkg/ arch=armhf, release= xenial/ 893 /unity8- jenkins. ubuntu. com/job/ build-2- binpkg/ arch=armhf, release= xenial/ 893/artifact/ output/ *zip*/output. zip /unity8- jenkins. ubuntu. com/job/ build-2- binpkg/ arch=i386, release= vivid+overlay/ 893 /unity8- jenkins. ubuntu. com/job/ build-2- binpkg/ arch=i386, release= vivid+overlay/ 893/artifact/ output/ *zip*/output. zip /unity8- jenkins. ubuntu. com/job/ build-2- binpkg/ arch=i386, release= xenial/ 893 /unity8- jenkins. ubuntu. com/job/ build-2- binpkg/ arch=i386, release= xenial/ 893/artifact/ output/ *zip*/output. zip
Executed test runs:
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
Click here to trigger a rebuild: /unity8- jenkins. ubuntu. com/job/ lp-qtmir- ci/104/ rebuild
https:/