Merge lp:~fboucault/ubuntu-ui-toolkit/crossbuild_fixes into lp:ubuntu-ui-toolkit/staging
- crossbuild_fixes
- Merge into staging
Status: | Needs review |
---|---|
Proposed branch: | lp:~fboucault/ubuntu-ui-toolkit/crossbuild_fixes |
Merge into: | lp:ubuntu-ui-toolkit/staging |
Diff against target: |
190 lines (+34/-7) 11 files modified
debian/control (+2/-1) debian/control.gles (+2/-1) debian/qml-module-ubuntu-components-labs.install (+2/-1) debian/qml-module-ubuntu-components.install (+3/-2) debian/qml-module-ubuntu-layouts.install (+2/-1) debian/qml-module-ubuntu-performancemetrics.install (+2/-1) debian/rules (+5/-0) features/ubuntu_qml_plugin.prf (+7/-0) src/Ubuntu/Layouts/LayoutsModule.pro (+2/-0) src/Ubuntu/Test/TestModule.pro (+2/-0) ubuntu-sdk.pro (+5/-0) |
To merge this branch: | bzr merge lp:~fboucault/ubuntu-ui-toolkit/crossbuild_fixes |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Timo Jyrinki | Needs Fixing | ||
ubuntu-sdk-build-bot | continuous-integration | Needs Fixing | |
Zsombor Egri | Approve | ||
Review via email: mp+299920@code.launchpad.net |
Commit message
Crossbuilding fixes
Description of the change
Crossbuilding fixes
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote : | # |
FAILED: Continuous integration, rev:2037
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote : | # |
FAILED: Continuous integration, rev:2037
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote : | # |
FAILED: Continuous integration, rev:2037
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote : | # |
FAILED: Continuous integration, rev:2037
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote : | # |
FAILED: Continuous integration, rev:2037
https:/
Executed test runs:
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
None: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
Click here to trigger a rebuild:
https:/
Zsombor Egri (zsombi) wrote : | # |
Looks good, let's get CI passing then we merge.
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote : | # |
FAILED: Continuous integration, rev:2038
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote : | # |
FAILED: Continuous integration, rev:2038
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote : | # |
FAILED: Continuous integration, rev:2038
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote : | # |
FAILED: Continuous integration, rev:2038
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote : | # |
FAILED: Continuous integration, rev:2038
https:/
Executed test runs:
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
None: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
Click here to trigger a rebuild:
https:/
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote : | # |
FAILED: Continuous integration, rev:2039
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote : | # |
FAILED: Continuous integration, rev:2039
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/
Andrea Bernabei (faenil) wrote : | # |
will this not create incomplete arm packages? (missing .qmltypes)
It works for development, but if someone starts using it as the official way of building the arm package, then we could get into trouble, right?
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote : | # |
FAILED: Continuous integration, rev:2039
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote : | # |
FAILED: Continuous integration, rev:2039
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote : | # |
FAILED: Continuous integration, rev:2039
https:/
Executed test runs:
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
None: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
Click here to trigger a rebuild:
https:/
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote : | # |
FAILED: Continuous integration, rev:2041
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote : | # |
FAILED: Continuous integration, rev:2041
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote : | # |
FAILED: Continuous integration, rev:2041
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote : | # |
FAILED: Continuous integration, rev:2041
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote : | # |
FAILED: Continuous integration, rev:2041
https:/
Executed test runs:
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
None: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
Click here to trigger a rebuild:
https:/
Florian Boucault (fboucault) wrote : | # |
in Jenkins, setting up pbuilder a little differently makes it work:
kaleo@tequila:~$ cat .pbuilderrc
PBUILDERSATISFY
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote : | # |
FAILED: Continuous integration, rev:2041
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote : | # |
FAILED: Continuous integration, rev:2042
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote : | # |
FAILED: Continuous integration, rev:2042
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote : | # |
FAILED: Continuous integration, rev:2042
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote : | # |
FAILED: Continuous integration, rev:2042
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote : | # |
FAILED: Continuous integration, rev:2042
https:/
Executed test runs:
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
None: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
Click here to trigger a rebuild:
https:/
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote : | # |
FAILED: Continuous integration, rev:2042
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote : | # |
FAILED: Continuous integration, rev:2042
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote : | # |
FAILED: Continuous integration, rev:2042
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote : | # |
FAILED: Continuous integration, rev:2042
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote : | # |
FAILED: Continuous integration, rev:2042
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote : | # |
FAILED: Continuous integration, rev:2042
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote : | # |
FAILED: Continuous integration, rev:2042
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote : | # |
FAILED: Continuous integration, rev:2042
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote : | # |
FAILED: Continuous integration, rev:2042
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote : | # |
FAILED: Continuous integration, rev:2042
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote : | # |
FAILED: Autolanding.
More details in the following jenkins job:
https:/
Executed test runs:
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
None: https:/
SUCCESS: https:/
None: https:/
SUCCESS: https:/
SUCCESS: https:/
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote : | # |
FAILED: Continuous integration, rev:2042
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote : | # |
FAILED: Continuous integration, rev:2042
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote : | # |
PASSED: Continuous integration, rev:2042
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote : | # |
FAILED: Continuous integration, rev:2042
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote : | # |
FAILED: Continuous integration, rev:2042
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote : | # |
PASSED: Continuous integration, rev:2042
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote : | # |
PASSED: Continuous integration, rev:2042
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote : | # |
FAILED: Autolanding.
More details in the following jenkins job:
https:/
Executed test runs:
FAILURE: https:/
SUCCESS: https:/
SUCCESS: https:/
FAILURE: https:/
None: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote : | # |
FAILED: Continuous integration, rev:2043
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote : | # |
FAILED: Continuous integration, rev:2043
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote : | # |
PASSED: Continuous integration, rev:2043
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote : | # |
PASSED: Continuous integration, rev:2043
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote : | # |
FAILED: Continuous integration, rev:2043
https:/
Executed test runs:
FAILURE: https:/
SUCCESS: https:/
SUCCESS: https:/
FAILURE: https:/
None: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
Click here to trigger a rebuild:
https:/
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote : | # |
FAILED: Continuous integration, rev:2043
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote : | # |
FAILED: Continuous integration, rev:2044
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote : | # |
FAILED: Continuous integration, rev:2044
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote : | # |
PASSED: Continuous integration, rev:2044
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote : | # |
PASSED: Continuous integration, rev:2044
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote : | # |
FAILED: Continuous integration, rev:2044
https:/
Executed test runs:
FAILURE: https:/
SUCCESS: https:/
SUCCESS: https:/
FAILURE: https:/
None: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
Click here to trigger a rebuild:
https:/
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote : | # |
FAILED: Continuous integration, rev:2045
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote : | # |
FAILED: Continuous integration, rev:2045
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote : | # |
PASSED: Continuous integration, rev:2045
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote : | # |
PASSED: Continuous integration, rev:2045
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote : | # |
FAILED: Continuous integration, rev:2045
https:/
Executed test runs:
FAILURE: https:/
SUCCESS: https:/
SUCCESS: https:/
FAILURE: https:/
None: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
Click here to trigger a rebuild:
https:/
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote : | # |
FAILED: Continuous integration, rev:2045
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote : | # |
FAILED: Continuous integration, rev:2045
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote : | # |
PASSED: Continuous integration, rev:2045
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote : | # |
FAILED: Continuous integration, rev:2045
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote : | # |
PASSED: Continuous integration, rev:2045
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote : | # |
FAILED: Continuous integration, rev:2045
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote : | # |
FAILED: Autolanding.
More details in the following jenkins job:
https:/
Executed test runs:
FAILURE: https:/
SUCCESS: https:/
SUCCESS: https:/
FAILURE: https:/
None: https:/
None: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote : | # |
FAILED: Continuous integration, rev:2045
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote : | # |
PASSED: Continuous integration, rev:2045
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote : | # |
FAILED: Continuous integration, rev:2045
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote : | # |
PASSED: Continuous integration, rev:2045
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote : | # |
FAILED: Autolanding.
More details in the following jenkins job:
https:/
Executed test runs:
FAILURE: https:/
SUCCESS: https:/
SUCCESS: https:/
FAILURE: https:/
None: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
Timo Jyrinki (timo-jyrinki) wrote : | # |
The armhf failure is faulty CI, but he i386 gles problem is a real one:
make[2]: Leaving directory '/tmp/buildd/
make[1]: Leaving directory '/tmp/buildd/
dh_install -O--parallel
dh_install: qml-module-
debian/rules:19: recipe for target 'binary' failed
make: *** [binary] Error 2
Unmerged revisions
- 2045. By Florian Boucault
-
another gles fix
- 2044. By Florian Boucault
-
Added dh-exec to control.gles too
- 2043. By Florian Boucault
-
Merged from stagin
- 2042. By Florian Boucault
-
No change rebuild
- 2041. By Florian Boucault
-
reorder debian install files
- 2040. By Florian Boucault
-
reorder debian install files
- 2039. By Florian Boucault
-
correct packaging order
- 2038. By Florian Boucault
-
no change commit for rebuild
- 2037. By Florian Boucault
-
Use dh_exec to conditionally install qmltypes
- 2036. By Florian Boucault
-
reverted no suggest
Preview Diff
1 | === modified file 'debian/control' | |||
2 | --- debian/control 2016-07-11 10:34:21 +0000 | |||
3 | +++ debian/control 2016-07-21 14:17:09 +0000 | |||
4 | @@ -7,6 +7,7 @@ | |||
5 | 7 | dbus-test-runner, | 7 | dbus-test-runner, |
6 | 8 | debhelper (>= 9.0.0), | 8 | debhelper (>= 9.0.0), |
7 | 9 | devscripts, | 9 | devscripts, |
8 | 10 | dh-exec (>= 0.15), | ||
9 | 10 | gdb, | 11 | gdb, |
10 | 11 | language-pack-en-base, | 12 | language-pack-en-base, |
11 | 12 | libdbus-1-dev, | 13 | libdbus-1-dev, |
12 | @@ -53,7 +54,7 @@ | |||
13 | 53 | qtpim5-dev, | 54 | qtpim5-dev, |
14 | 54 | qtscript5-doc-html, | 55 | qtscript5-doc-html, |
15 | 55 | qtsvg5-doc-html, | 56 | qtsvg5-doc-html, |
17 | 56 | qttools5-dev-tools, | 57 | qttools5-dev-tools:native, |
18 | 57 | qtwebkit5-doc-html, | 58 | qtwebkit5-doc-html, |
19 | 58 | suru-icon-theme, | 59 | suru-icon-theme, |
20 | 59 | unity-action-doc, | 60 | unity-action-doc, |
21 | 60 | 61 | ||
22 | === modified file 'debian/control.gles' | |||
23 | --- debian/control.gles 2016-07-11 10:38:15 +0000 | |||
24 | +++ debian/control.gles 2016-07-21 14:17:09 +0000 | |||
25 | @@ -7,6 +7,7 @@ | |||
26 | 7 | dbus-test-runner, | 7 | dbus-test-runner, |
27 | 8 | debhelper (>= 9.0.0), | 8 | debhelper (>= 9.0.0), |
28 | 9 | devscripts, | 9 | devscripts, |
29 | 10 | dh-exec (>= 0.15), | ||
30 | 10 | gdb, | 11 | gdb, |
31 | 11 | language-pack-en-base, | 12 | language-pack-en-base, |
32 | 12 | libdbus-1-dev, | 13 | libdbus-1-dev, |
33 | @@ -46,7 +47,7 @@ | |||
34 | 46 | qml-module-qtquick-window2, | 47 | qml-module-qtquick-window2, |
35 | 47 | qml-module-qtquick2, | 48 | qml-module-qtquick2, |
36 | 48 | qml-module-qttest, | 49 | qml-module-qttest, |
38 | 49 | qtbase5-dev-tools, | 50 | qtbase5-dev-tools:native, |
39 | 50 | qtbase5-gles-dev, | 51 | qtbase5-gles-dev, |
40 | 51 | qtbase5-private-gles-dev, | 52 | qtbase5-private-gles-dev, |
41 | 52 | qtdeclarative5-dev-tools, | 53 | qtdeclarative5-dev-tools, |
42 | 53 | 54 | ||
43 | === modified file 'debian/qml-module-ubuntu-components-labs.install' (properties changed: -x to +x) | |||
44 | --- debian/qml-module-ubuntu-components-labs.install 2016-06-23 13:54:01 +0000 | |||
45 | +++ debian/qml-module-ubuntu-components-labs.install 2016-07-21 14:17:09 +0000 | |||
46 | @@ -1,3 +1,4 @@ | |||
47 | 1 | #!/usr/bin/dh-exec | ||
48 | 2 | <!cross> usr/lib/*/qt5/qml/Ubuntu/Components/Labs/plugins.qmltypes | ||
49 | 1 | usr/lib/*/qt5/qml/Ubuntu/Components/Labs/libUbuntuComponentsLabs.so | 3 | usr/lib/*/qt5/qml/Ubuntu/Components/Labs/libUbuntuComponentsLabs.so |
50 | 2 | usr/lib/*/qt5/qml/Ubuntu/Components/Labs/plugins.qmltypes | ||
51 | 3 | usr/lib/*/qt5/qml/Ubuntu/Components/Labs/qmldir | 4 | usr/lib/*/qt5/qml/Ubuntu/Components/Labs/qmldir |
52 | 4 | 5 | ||
53 | === modified file 'debian/qml-module-ubuntu-components.install' (properties changed: -x to +x) | |||
54 | --- debian/qml-module-ubuntu-components.install 2016-06-23 09:13:51 +0000 | |||
55 | +++ debian/qml-module-ubuntu-components.install 2016-07-21 14:17:09 +0000 | |||
56 | @@ -1,3 +1,6 @@ | |||
57 | 1 | #!/usr/bin/dh-exec | ||
58 | 2 | <!cross> usr/lib/*/qt5/qml/Ubuntu/Components/Styles/plugins.qmltypes | ||
59 | 3 | <!cross> usr/lib/*/qt5/qml/Ubuntu/Components/plugins.qmltypes | ||
60 | 1 | usr/lib/*/qt5/qml/Ubuntu/Components/1.0/*.qml | 4 | usr/lib/*/qt5/qml/Ubuntu/Components/1.0/*.qml |
61 | 2 | usr/lib/*/qt5/qml/Ubuntu/Components/1.1/*.qml | 5 | usr/lib/*/qt5/qml/Ubuntu/Components/1.1/*.qml |
62 | 3 | usr/lib/*/qt5/qml/Ubuntu/Components/1.2/*.js | 6 | usr/lib/*/qt5/qml/Ubuntu/Components/1.2/*.js |
63 | @@ -18,10 +21,8 @@ | |||
64 | 18 | usr/lib/*/qt5/qml/Ubuntu/Components/Styles/1.2/*.qml | 21 | usr/lib/*/qt5/qml/Ubuntu/Components/Styles/1.2/*.qml |
65 | 19 | usr/lib/*/qt5/qml/Ubuntu/Components/Styles/1.3/*.qml | 22 | usr/lib/*/qt5/qml/Ubuntu/Components/Styles/1.3/*.qml |
66 | 20 | usr/lib/*/qt5/qml/Ubuntu/Components/Styles/libUbuntuComponentsStyles.so | 23 | usr/lib/*/qt5/qml/Ubuntu/Components/Styles/libUbuntuComponentsStyles.so |
67 | 21 | usr/lib/*/qt5/qml/Ubuntu/Components/Styles/plugins.qmltypes | ||
68 | 22 | usr/lib/*/qt5/qml/Ubuntu/Components/Styles/qmldir | 24 | usr/lib/*/qt5/qml/Ubuntu/Components/Styles/qmldir |
69 | 23 | usr/lib/*/qt5/qml/Ubuntu/Components/artwork | 25 | usr/lib/*/qt5/qml/Ubuntu/Components/artwork |
70 | 24 | usr/lib/*/qt5/qml/Ubuntu/Components/libUbuntuComponents.so | 26 | usr/lib/*/qt5/qml/Ubuntu/Components/libUbuntuComponents.so |
71 | 25 | usr/lib/*/qt5/qml/Ubuntu/Components/plugins.qmltypes | ||
72 | 26 | usr/lib/*/qt5/qml/Ubuntu/Components/qmldir | 27 | usr/lib/*/qt5/qml/Ubuntu/Components/qmldir |
73 | 27 | usr/share/locale/*/LC_MESSAGES/ubuntu-ui-toolkit.mo | 28 | usr/share/locale/*/LC_MESSAGES/ubuntu-ui-toolkit.mo |
74 | 28 | 29 | ||
75 | === modified file 'debian/qml-module-ubuntu-layouts.install' (properties changed: -x to +x) | |||
76 | --- debian/qml-module-ubuntu-layouts.install 2016-03-04 11:58:12 +0000 | |||
77 | +++ debian/qml-module-ubuntu-layouts.install 2016-07-21 14:17:09 +0000 | |||
78 | @@ -1,3 +1,4 @@ | |||
79 | 1 | #!/usr/bin/dh-exec | ||
80 | 2 | <!cross> usr/lib/*/qt5/qml/Ubuntu/Layouts/plugins.qmltypes | ||
81 | 1 | usr/lib/*/qt5/qml/Ubuntu/Layouts/libUbuntuLayouts.so | 3 | usr/lib/*/qt5/qml/Ubuntu/Layouts/libUbuntuLayouts.so |
82 | 2 | usr/lib/*/qt5/qml/Ubuntu/Layouts/plugins.qmltypes | ||
83 | 3 | usr/lib/*/qt5/qml/Ubuntu/Layouts/qmldir | 4 | usr/lib/*/qt5/qml/Ubuntu/Layouts/qmldir |
84 | 4 | 5 | ||
85 | === modified file 'debian/qml-module-ubuntu-performancemetrics.install' (properties changed: -x to +x) | |||
86 | --- debian/qml-module-ubuntu-performancemetrics.install 2016-03-04 11:58:12 +0000 | |||
87 | +++ debian/qml-module-ubuntu-performancemetrics.install 2016-07-21 14:17:09 +0000 | |||
88 | @@ -1,4 +1,5 @@ | |||
89 | 1 | #!/usr/bin/dh-exec | ||
90 | 2 | <!cross> usr/lib/*/qt5/qml/Ubuntu/PerformanceMetrics/plugins.qmltypes | ||
91 | 1 | usr/lib/*/qt5/qml/Ubuntu/PerformanceMetrics/*.qml | 3 | usr/lib/*/qt5/qml/Ubuntu/PerformanceMetrics/*.qml |
92 | 2 | usr/lib/*/qt5/qml/Ubuntu/PerformanceMetrics/libUbuntuPerformanceMetrics.so | 4 | usr/lib/*/qt5/qml/Ubuntu/PerformanceMetrics/libUbuntuPerformanceMetrics.so |
93 | 3 | usr/lib/*/qt5/qml/Ubuntu/PerformanceMetrics/plugins.qmltypes | ||
94 | 4 | usr/lib/*/qt5/qml/Ubuntu/PerformanceMetrics/qmldir | 5 | usr/lib/*/qt5/qml/Ubuntu/PerformanceMetrics/qmldir |
95 | 5 | 6 | ||
96 | === modified file 'debian/rules' | |||
97 | --- debian/rules 2016-07-07 18:47:22 +0000 | |||
98 | +++ debian/rules 2016-07-21 14:17:09 +0000 | |||
99 | @@ -10,6 +10,11 @@ | |||
100 | 10 | DEB_HOST_MULTI_ARCH ?= $(shell dpkg-architecture -qDEB_BUILD_MULTIARCH) | 10 | DEB_HOST_MULTI_ARCH ?= $(shell dpkg-architecture -qDEB_BUILD_MULTIARCH) |
101 | 11 | DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH) | 11 | DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH) |
102 | 12 | DEB_HOST_SERIES ?= $(shell lsb_release -c -s) | 12 | DEB_HOST_SERIES ?= $(shell lsb_release -c -s) |
103 | 13 | ifneq ($(DEB_BUILD_GNU_TYPE),$(DEB_HOST_GNU_TYPE)) | ||
104 | 14 | export QT_SELECT=qt5-$(DEB_BUILD_MULTIARCH)-$(DEB_HOST_MULTIARCH) | ||
105 | 15 | export DEB_BUILD_PROFILES := cross | ||
106 | 16 | endif | ||
107 | 17 | export PKG_CONFIG_PATH=/usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig | ||
108 | 13 | 18 | ||
109 | 14 | # Skip tests on the archs they are known to be flaky with current configuration | 19 | # Skip tests on the archs they are known to be flaky with current configuration |
110 | 15 | testskip_architectures := powerpc arm64 ppc64el s390x | 20 | testskip_architectures := powerpc arm64 ppc64el s390x |
111 | 16 | 21 | ||
112 | === modified file 'features/ubuntu_qml_plugin.prf' | |||
113 | --- features/ubuntu_qml_plugin.prf 2016-06-17 13:42:23 +0000 | |||
114 | +++ features/ubuntu_qml_plugin.prf 2016-07-21 14:17:09 +0000 | |||
115 | @@ -1,6 +1,11 @@ | |||
116 | 1 | load(qml_plugin) | 1 | load(qml_plugin) |
117 | 2 | CONFIG -= hide_symbols | 2 | CONFIG -= hide_symbols |
118 | 3 | 3 | ||
119 | 4 | QMAKE_HOST_ARCH=$$QMAKE_HOST.arch | ||
120 | 5 | !equals(QMAKE_HOST_ARCH, $$QT_ARCH) { | ||
121 | 6 | CONFIG += cross_build | ||
122 | 7 | } | ||
123 | 8 | |||
124 | 4 | load(ubuntu_enable_testing) | 9 | load(ubuntu_enable_testing) |
125 | 5 | 10 | ||
126 | 6 | #hacky hacks to build the qmltypes | 11 | #hacky hacks to build the qmltypes |
127 | @@ -55,6 +60,7 @@ | |||
128 | 55 | 60 | ||
129 | 56 | TARGETPATHBASE = $$replace(TARGETPATH, \\.\\d+\$, ) | 61 | TARGETPATHBASE = $$replace(TARGETPATH, \\.\\d+\$, ) |
130 | 57 | 62 | ||
131 | 63 | !cross_build { | ||
132 | 58 | QMLTYPEFILE = $$instbase/$$TARGETPATH/plugins.qmltypes | 64 | QMLTYPEFILE = $$instbase/$$TARGETPATH/plugins.qmltypes |
133 | 59 | autobld_qmltypes.target = $$QMLTYPEFILE | 65 | autobld_qmltypes.target = $$QMLTYPEFILE |
134 | 60 | autobld_qmltypes.commands = $$QMLPLUGINDUMP -nonrelocatable $$replace(TARGETPATHBASE, /, .) $$IMPORT_VERSION > $$QMLTYPEFILE | 66 | autobld_qmltypes.commands = $$QMLPLUGINDUMP -nonrelocatable $$replace(TARGETPATHBASE, /, .) $$IMPORT_VERSION > $$QMLTYPEFILE |
135 | @@ -69,6 +75,7 @@ | |||
136 | 69 | 75 | ||
137 | 70 | INSTALLS+=autobld_install_qmltypes | 76 | INSTALLS+=autobld_install_qmltypes |
138 | 71 | QMAKE_EXTRA_TARGETS += autobld_qmltypes | 77 | QMAKE_EXTRA_TARGETS += autobld_qmltypes |
139 | 78 | } | ||
140 | 72 | } | 79 | } |
141 | 73 | 80 | ||
142 | 74 | # when building against the system Qt we pick up the CXX_FLAGS for a release build | 81 | # when building against the system Qt we pick up the CXX_FLAGS for a release build |
143 | 75 | 82 | ||
144 | === modified file 'src/Ubuntu/Layouts/LayoutsModule.pro' | |||
145 | --- src/Ubuntu/Layouts/LayoutsModule.pro 2014-11-24 10:39:15 +0000 | |||
146 | +++ src/Ubuntu/Layouts/LayoutsModule.pro 2016-07-21 14:17:09 +0000 | |||
147 | @@ -12,6 +12,7 @@ | |||
148 | 12 | qmldir_file.installPath = $$installPath | 12 | qmldir_file.installPath = $$installPath |
149 | 13 | qmldir_file.files = $$QMLDIR_FILE | 13 | qmldir_file.files = $$QMLDIR_FILE |
150 | 14 | 14 | ||
151 | 15 | !cross_build { | ||
152 | 15 | plugins_qmltypes.path = $$installPath | 16 | plugins_qmltypes.path = $$installPath |
153 | 16 | plugins_qmltypes.files = plugins.qmltypes | 17 | plugins_qmltypes.files = plugins.qmltypes |
154 | 17 | # Silence spam on stderr due to fonts | 18 | # Silence spam on stderr due to fonts |
155 | @@ -22,3 +23,4 @@ | |||
156 | 22 | UBUNTU_QML_MODULE_FILES += qmldir_file | 23 | UBUNTU_QML_MODULE_FILES += qmldir_file |
157 | 23 | 24 | ||
158 | 24 | INSTALLS += plugins_qmltypes | 25 | INSTALLS += plugins_qmltypes |
159 | 26 | } | ||
160 | 25 | 27 | ||
161 | === modified file 'src/Ubuntu/Test/TestModule.pro' | |||
162 | --- src/Ubuntu/Test/TestModule.pro 2014-11-24 10:39:15 +0000 | |||
163 | +++ src/Ubuntu/Test/TestModule.pro 2016-07-21 14:17:09 +0000 | |||
164 | @@ -23,6 +23,7 @@ | |||
165 | 23 | 23 | ||
166 | 24 | UBUNTU_QML_MODULE_FILES += qmldir_file qml_files js_files | 24 | UBUNTU_QML_MODULE_FILES += qmldir_file qml_files js_files |
167 | 25 | 25 | ||
168 | 26 | !cross_build { | ||
169 | 26 | plugins_qmltypes.path = $$installPath | 27 | plugins_qmltypes.path = $$installPath |
170 | 27 | plugins_qmltypes.files = plugins.qmltypes | 28 | plugins_qmltypes.files = plugins.qmltypes |
171 | 28 | # Silence spam on stderr due to fonts | 29 | # Silence spam on stderr due to fonts |
172 | @@ -31,3 +32,4 @@ | |||
173 | 31 | plugins_qmltypes.extra = $$[QT_INSTALL_BINS]/qmlplugindump -notrelocatable Ubuntu.Test 0.1 ../../ 2>/dev/null > $(INSTALL_ROOT)/$$installPath/plugins.qmltypes | 32 | plugins_qmltypes.extra = $$[QT_INSTALL_BINS]/qmlplugindump -notrelocatable Ubuntu.Test 0.1 ../../ 2>/dev/null > $(INSTALL_ROOT)/$$installPath/plugins.qmltypes |
174 | 32 | 33 | ||
175 | 33 | INSTALLS += plugins_qmltypes | 34 | INSTALLS += plugins_qmltypes |
176 | 35 | } | ||
177 | 34 | 36 | ||
178 | === modified file 'ubuntu-sdk.pro' | |||
179 | --- ubuntu-sdk.pro 2016-06-17 11:26:12 +0000 | |||
180 | +++ ubuntu-sdk.pro 2016-07-21 14:17:09 +0000 | |||
181 | @@ -1,5 +1,10 @@ | |||
182 | 1 | #include( documentation/documentation.pri ) | 1 | #include( documentation/documentation.pri ) |
183 | 2 | 2 | ||
184 | 3 | QMAKE_HOST_ARCH=$$QMAKE_HOST.arch | ||
185 | 4 | !equals(QMAKE_HOST_ARCH, $$QT_ARCH) { | ||
186 | 5 | CONFIG += cross_build | ||
187 | 6 | } | ||
188 | 7 | |||
189 | 3 | BUILD_PATH_CONTENTS="SRC_DIR=\"$$PWD\"" \ | 8 | BUILD_PATH_CONTENTS="SRC_DIR=\"$$PWD\"" \ |
190 | 4 | "BUILD_DIR=\"$$OUT_PWD\"" | 9 | "BUILD_DIR=\"$$OUT_PWD\"" |
191 | 5 | 10 |
depends on https:/ /requests. ci-train. ubuntu. com/#/silo/ 075