Merge lp://qastaging/~saviq/ubuntu-settings-components/packaging-cleanup into lp://qastaging/ubuntu-settings-components
- packaging-cleanup
- Merge into trunk
Status: | Superseded |
---|---|
Proposed branch: | lp://qastaging/~saviq/ubuntu-settings-components/packaging-cleanup |
Merge into: | lp://qastaging/ubuntu-settings-components |
Diff against target: |
1686 lines (+576/-839) 29 files modified
CMakeLists.txt (+8/-43) SettingsComponents.qmlproject (+0/-23) cmake/modules/EnableCoverageReport.cmake (+0/-166) cmake/modules/FindLcov.cmake (+0/-29) cmake/modules/Findgcovr.cmake (+0/-31) cmake/modules/ParseArguments.cmake (+0/-52) cmake/modules/QmlPlugins.cmake (+0/-150) cmake/modules/QmlTest.cmake (+311/-118) cmake_uninstall.cmake.in (+0/-21) debian/changelog (+7/-0) debian/control (+16/-5) debian/qml-module-ubuntu-system-components.install (+2/-0) debian/rules (+2/-0) debian/tests/control (+4/-0) debian/tests/qmluitests.sh (+9/-0) examples/Fingerprint.qml (+1/-1) plugins/Ubuntu/Settings/Components/CMakeLists.txt (+5/-8) plugins/Ubuntu/Settings/Components/Components.qmltypes (+0/-73) plugins/Ubuntu/Settings/Components/serverpropertysynchroniser.cpp (+0/-1) plugins/Ubuntu/Settings/Menus/CMakeLists.txt (+6/-14) plugins/Ubuntu/Settings/Menus/Menus.qmltypes (+0/-30) runtests.sh (+1/-1) tests/CMakeLists.txt (+24/-7) tests/imports/CMakeLists.txt (+5/-0) tests/imports/check_imports.py (+125/-0) tests/qmltests/CMakeLists.txt (+34/-46) tests/qmltests/Fingerprint/tst_FingerprintSetup.qml (+2/-2) tests/utils/modules/CMakeLists.txt (+2/-0) tests/utils/modules/Ubuntu/Test/CMakeLists.txt (+12/-18) |
To merge this branch: | bzr merge lp://qastaging/~saviq/ubuntu-settings-components/packaging-cleanup |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Unity8 CI Bot | continuous-integration | Needs Fixing | |
Michael Terry | Pending | ||
PS Jenkins bot | continuous-integration | Pending | |
Nick Dedekind | Pending | ||
Review via email:
|
This proposal supersedes a proposal from 2016-01-29.
Commit message
Refactor and clean up packaging/build system and add autopkgtests
a lot of clean ups
using cmake-extras instead of a copy of CMake modules (except for QmlPlugins, bug #1539314)
add an import version checker (UITK hates it when you mix 1.2 and 1.3)
add autopkgtest running the qml UI tests
Description of the change
![](/+icing/build/overlay/assets/skins/sam/images/close.gif)
Unity8 CI Bot (unity8-ci-bot) wrote : Posted in a previous version of this proposal | # |
![](/+icing/build/overlay/assets/skins/sam/images/close.gif)
Unity8 CI Bot (unity8-ci-bot) wrote : Posted in a previous version of this proposal | # |
FAILED: Continuous integration, rev:115
https:/
Executed test runs:
Click here to trigger a rebuild:
https:/
![](/+icing/build/overlay/assets/skins/sam/images/close.gif)
PS Jenkins bot (ps-jenkins) wrote : Posted in a previous version of this proposal | # |
FAILED: Continuous integration, rev:115
http://
Executed test runs:
FAILURE: http://
SUCCESS: http://
SUCCESS: http://
deb: http://
Click here to trigger a rebuild:
http://
![](/+icing/build/overlay/assets/skins/sam/images/close.gif)
Unity8 CI Bot (unity8-ci-bot) wrote : Posted in a previous version of this proposal | # |
PASSED: Continuous integration, rev:116
https:/
Executed test runs:
Click here to trigger a rebuild:
https:/
![](/+icing/build/overlay/assets/skins/sam/images/close.gif)
Unity8 CI Bot (unity8-ci-bot) wrote : Posted in a previous version of this proposal | # |
FAILED: Continuous integration, rev:116
https:/
Executed test runs:
Click here to trigger a rebuild:
https:/
![](/+icing/build/overlay/assets/skins/sam/images/close.gif)
PS Jenkins bot (ps-jenkins) wrote : Posted in a previous version of this proposal | # |
FAILED: Continuous integration, rev:116
http://
Executed test runs:
FAILURE: http://
SUCCESS: http://
SUCCESS: http://
deb: http://
Click here to trigger a rebuild:
http://
![](/+icing/build/overlay/assets/skins/sam/images/close.gif)
Unity8 CI Bot (unity8-ci-bot) wrote : Posted in a previous version of this proposal | # |
PASSED: Continuous integration, rev:117
https:/
Executed test runs:
Click here to trigger a rebuild:
https:/
![](/+icing/build/overlay/assets/skins/sam/images/close.gif)
Unity8 CI Bot (unity8-ci-bot) wrote : Posted in a previous version of this proposal | # |
FAILED: Continuous integration, rev:117
https:/
Executed test runs:
Click here to trigger a rebuild:
https:/
![](/+icing/build/overlay/assets/skins/sam/images/close.gif)
PS Jenkins bot (ps-jenkins) wrote : Posted in a previous version of this proposal | # |
FAILED: Continuous integration, rev:117
http://
Executed test runs:
UNSTABLE: http://
SUCCESS: http://
SUCCESS: http://
deb: http://
Click here to trigger a rebuild:
http://
![](/+icing/build/overlay/assets/skins/sam/images/close.gif)
Unity8 CI Bot (unity8-ci-bot) wrote : Posted in a previous version of this proposal | # |
FAILED: Continuous integration, rev:118
https:/
Executed test runs:
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
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:/
![](/+icing/build/overlay/assets/skins/sam/images/close.gif)
PS Jenkins bot (ps-jenkins) wrote : Posted in a previous version of this proposal | # |
FAILED: Continuous integration, rev:118
http://
Executed test runs:
FAILURE: http://
FAILURE: http://
FAILURE: http://
Click here to trigger a rebuild:
http://
![](/+icing/build/overlay/assets/skins/sam/images/close.gif)
Unity8 CI Bot (unity8-ci-bot) wrote : Posted in a previous version of this proposal | # |
PASSED: Continuous integration, rev:120
https:/
Executed test runs:
SUCCESS: https:/
UNSTABLE: https:/
UNSTABLE: https:/
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:/
![](/+icing/build/overlay/assets/skins/sam/images/close.gif)
Unity8 CI Bot (unity8-ci-bot) wrote : Posted in a previous version of this proposal | # |
FAILED: Continuous integration, rev:120
https:/
Executed test runs:
SUCCESS: https:/
UNSTABLE: https:/
UNSTABLE: https:/
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:/
![](/+icing/build/overlay/assets/skins/sam/images/close.gif)
PS Jenkins bot (ps-jenkins) wrote : Posted in a previous version of this proposal | # |
FAILED: Continuous integration, rev:119
http://
Executed test runs:
FAILURE: http://
SUCCESS: http://
SUCCESS: http://
deb: http://
Click here to trigger a rebuild:
http://
![](/+icing/build/overlay/assets/skins/sam/images/close.gif)
PS Jenkins bot (ps-jenkins) wrote : Posted in a previous version of this proposal | # |
FAILED: Continuous integration, rev:120
http://
Executed test runs:
FAILURE: http://
SUCCESS: http://
SUCCESS: http://
deb: http://
Click here to trigger a rebuild:
http://
![](/+icing/build/overlay/assets/skins/sam/images/close.gif)
Nick Dedekind (nick-dedekind) wrote : Posted in a previous version of this proposal | # |
* Did you perform an exploratory manual test run of the code change and any related functionality?
Yes
* Did CI run pass? If not, please explain why.
Unrelated test failure.
![](/+icing/build/overlay/assets/skins/sam/images/close.gif)
Unity8 CI Bot (unity8-ci-bot) wrote : Posted in a previous version of this proposal | # |
PASSED: Continuous integration, rev:121
https:/
Executed test runs:
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
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:/
![](/+icing/build/overlay/assets/skins/sam/images/close.gif)
Michael Terry (mterry) wrote : Posted in a previous version of this proposal | # |
As for packaging... It's not common to provide an oldlibs transitional version AND do the Breaks/
Doing both will mean the transitional one pulls in the new one, but the new one can't live with the transitional one. I'm not sure what would happen on an upgrade there. It might work like you want, but I'm not positive what apt does. Have you tested the upgrade case there? Maybe with a silo to be able to test apt logic?
![](/+icing/build/overlay/assets/skins/sam/images/close.gif)
Unity8 CI Bot (unity8-ci-bot) wrote : Posted in a previous version of this proposal | # |
FAILED: Continuous integration, rev:120
https:/
Executed test runs:
FAILURE: https:/
Click here to trigger a rebuild:
https:/
![](/+icing/build/overlay/assets/skins/sam/images/close.gif)
Unity8 CI Bot (unity8-ci-bot) wrote : | # |
FAILED: Continuous integration, rev:121
https:/
Executed test runs:
FAILURE: https:/
FAILURE: https:/
Click here to trigger a rebuild:
https:/
- 122. By Michał Sawicz
-
Merge trunk
- 123. By Michał Sawicz
-
Drop qmltypes files
- 124. By Michał Sawicz
-
Don't mix imports
- 125. By Michał Sawicz
-
Update QmlTest.cmake
- 126. By Michał Sawicz
-
Bump transitional version
- 127. By Michał Sawicz
-
Build mocks in autopkgtests
- 128. By Michał Sawicz
-
Fix FingerprintSetup test
- 129. By Michał Sawicz
-
Don't depend on qt5-default, export QT_SELECT instead
![](/+icing/build/overlay/assets/skins/sam/images/close.gif)
Unity8 CI Bot (unity8-ci-bot) wrote : | # |
FAILED: Continuous integration, rev:129
https:/
Executed test runs:
SUCCESS: https:/
UNSTABLE: https:/
UNSTABLE: https:/
UNSTABLE: https:/
SUCCESS: https:/
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:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
Click here to trigger a rebuild:
https:/
- 130. By Michał Sawicz
-
Rename install file
- 131. By Michał Sawicz
-
Update install file
- 132. By Michał Sawicz
-
Don't install mocks
- 133. By Michał Sawicz
-
Use imported Qt5 targets
- 134. By Michał Sawicz
-
Fix install file
- 135. By Michał Sawicz
-
Add missing thumbnailer dep and transition to qml-module-* dependencies
- 136. By Michał Sawicz
-
wrap-and-sort -at
- 137. By Michał Sawicz
-
Add missing dependency on folderlistmodel
- 138. By Michał Sawicz
-
Fix test suite names
- 139. By Michał Sawicz
-
Fix tst_Fingerprint
s.qml - 140. By Michał Sawicz
-
Fix import path
- 141. By Michał Sawicz
-
Merge lp:~nick-dedekind/ubuntu-settings-components/calendar-test-fixes
- 142. By Michał Sawicz
-
Fix typo
- 143. By Michał Sawicz
-
Drop spurious moc includes
- 144. By Michał Sawicz
-
Unskip test after it's been fixed upstream
- 145. By Michał Sawicz
-
Fix up import paths and environment
- 146. By Michał Sawicz
-
8
PASSED: Continuous integration, rev:115 /unity8- jenkins. ubuntu. com/job/ lp-ubuntu- settings- components- 1-ci/7/
https:/
Executed test runs:
Click here to trigger a rebuild: /unity8- jenkins. ubuntu. com/job/ lp-ubuntu- settings- components- 1-ci/7/ rebuild
https:/