Merge lp://staging/~zeller-benjamin/qtcreator-plugin-ubuntu/snapcraft-step2 into lp://staging/qtcreator-plugin-ubuntu
Proposed by
Benjamin Zeller
| Status: | Needs review |
|---|---|
| Proposed branch: | lp://staging/~zeller-benjamin/qtcreator-plugin-ubuntu/snapcraft-step2 |
| Merge into: | lp://staging/qtcreator-plugin-ubuntu |
| Prerequisite: | lp://staging/~zeller-benjamin/qtcreator-plugin-ubuntu/publishcompileinfo |
| Diff against target: |
3433 lines (+2806/-145) 45 files modified
UbuntuPlugin.pro (+4/-2) share/qtcreator/templates/wizards/ubuntu/snap-qtquick-app-qmake/appName.pro (+0/-32) share/qtcreator/templates/wizards/ubuntu/snap-qtquick-app-qmake/appName/appName.pro (+2/-19) share/qtcreator/templates/wizards/ubuntu/snap-qtquick-app-qmake/snapcraft.yaml (+10/-4) share/qtcreator/templates/wizards/ubuntu/snap-qtquick-app-qmake/wizard.json (+8/-13) share/qtcreator/ubuntu/scripts/qtc_desktop_snaprunner.py (+90/-0) share/qtcreator/ubuntu/scripts/run_snapcraft.py (+51/-0) src/ubuntu/UbuntuProject.mimetypes.xml (+5/-0) src/ubuntu/clicktoolchain.cpp (+21/-1) src/ubuntu/clicktoolchain.h (+1/-0) src/ubuntu/snap/project/snapcraftbuildconfiguration.cpp (+44/-0) src/ubuntu/snap/project/snapcraftbuildconfiguration.h (+33/-0) src/ubuntu/snap/project/snapcraftbuildconfigurationfactory.cpp (+154/-0) src/ubuntu/snap/project/snapcraftbuildconfigurationfactory.h (+44/-0) src/ubuntu/snap/project/snapcraftbuildstepfactory.cpp (+65/-0) src/ubuntu/snap/project/snapcraftbuildstepfactory.h (+25/-0) src/ubuntu/snap/project/snapcraftproject.cpp (+214/-0) src/ubuntu/snap/project/snapcraftproject.h (+102/-0) src/ubuntu/snap/project/snapcraftprojectfile.cpp (+42/-0) src/ubuntu/snap/project/snapcraftprojectfile.h (+48/-0) src/ubuntu/snap/project/snapcraftprojectmanager.cpp (+64/-0) src/ubuntu/snap/project/snapcraftprojectmanager.h (+40/-0) src/ubuntu/snap/project/snapcraftprojectnode.cpp (+517/-0) src/ubuntu/snap/project/snapcraftprojectnode.h (+136/-0) src/ubuntu/snap/project/snapcraftrsyncstep.cpp (+51/-0) src/ubuntu/snap/project/snapcraftrsyncstep.h (+31/-0) src/ubuntu/snap/project/snapcraftstep.cpp (+139/-0) src/ubuntu/snap/project/snapcraftstep.h (+50/-0) src/ubuntu/snap/project/snaprunconfiguration.cpp (+273/-0) src/ubuntu/snap/project/snaprunconfiguration.h (+94/-0) src/ubuntu/snap/project/snaprunconfigurationfactory.cpp (+85/-0) src/ubuntu/snap/project/snaprunconfigurationfactory.h (+31/-0) src/ubuntu/snap/settings/snapcraftkitinformation.cpp (+114/-0) src/ubuntu/snap/settings/snapcraftkitinformation.h (+59/-0) src/ubuntu/snap/snap.pri (+31/-0) src/ubuntu/snap/snapcraftpackagestep.cpp (+1/-1) src/ubuntu/ubuntuclicktool.cpp (+5/-0) src/ubuntu/ubuntuclicktool.h (+1/-0) src/ubuntu/ubuntuconstants.h (+22/-13) src/ubuntu/ubuntujsextension.cpp (+11/-0) src/ubuntu/ubuntujsextension.h (+1/-0) src/ubuntu/ubuntukitmanager.cpp (+4/-1) src/ubuntu/ubuntuplugin.cpp (+27/-3) src/ubuntu/ubuntuversion.cpp (+43/-45) src/ubuntu/ubuntuversion.h (+13/-11) |
| To merge this branch: | bzr merge lp://staging/~zeller-benjamin/qtcreator-plugin-ubuntu/snapcraft-step2 |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| ubuntu-sdk-build-bot | continuous-integration | Needs Fixing | |
| Zoltan Balogh | Pending | ||
|
Review via email:
|
|||
Commit message
Implementing Part2 of the snapcraft plan
Description of the change
Implementing Part2 of the snapcraft plan
To post a comment you must log in.
Revision history for this message
| ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote | # |
review:
Needs Fixing
(continuous-integration)
Revision history for this message
| ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote | # |
review:
Needs Fixing
(continuous-integration)
Revision history for this message
| ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote | # |
review:
Needs Fixing
(continuous-integration)
Revision history for this message
| ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote | # |
review:
Needs Fixing
(continuous-integration)
Revision history for this message
| ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote | # |
review:
Needs Fixing
(continuous-integration)
Revision history for this message
| ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote | # |
review:
Needs Fixing
(continuous-integration)
Unmerged revisions
- 487. By Benjamin Zeller
-
Compile on trusty
- 486. By Benjamin Zeller
-
- Superuser check
- Less messages when opening a project - 485. By Benjamin Zeller
-
add devmode switch
- 484. By Benjamin Zeller
-
Send errors to the TaskHub
- 483. By Benjamin Zeller
-
Allow local execution of snapcraft projects.
- 482. By Benjamin Zeller
-
Support building in Ubuntu Containers
- 481. By Benjamin Zeller
-
Migrate snapcraft template to use the snapcraft project type
- 480. By Benjamin Zeller
-
Fix mimetype file
- 479. By Benjamin Zeller
-
some polishing
- 478. By Benjamin Zeller
-
- Added buildsteps
- Added buildconfiguration
- For now rsync the whole project to the build dir
- Wrap snapcraft call so "clean" is called always
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
FAILED: Continuous integration, rev:473
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/