Merge lp://qastaging/~mterry/snapcraft/cmake into lp://qastaging/~snappy-dev/snapcraft/core

Proposed by Michael Terry
Status: Merged
Approved by: Michael Terry
Approved revision: 78
Merged at revision: 74
Proposed branch: lp://qastaging/~mterry/snapcraft/cmake
Merge into: lp://qastaging/~snappy-dev/snapcraft/core
Prerequisite: lp://qastaging/~mterry/snapcraft/lifecycle-fixes2
Diff against target: 108 lines (+60/-1)
7 files modified
debian/control (+2/-1)
plugins/cmake-project.yaml (+7/-0)
snapcraft/plugins/cmake_project.py (+32/-0)
tests/plainbox/data/simple-cmake/CMakeLists.txt (+3/-0)
tests/plainbox/data/simple-cmake/snapcraft.yaml (+3/-0)
tests/plainbox/data/simple-cmake/test.c (+4/-0)
tests/plainbox/units/jobs.pxu (+9/-0)
To merge this branch: bzr merge lp://qastaging/~mterry/snapcraft/cmake
Reviewer Review Type Date Requested Status
Michael Vogt (community) Approve
Review via email: mp+264285@code.qastaging.launchpad.net

Commit message

Add simple CMake support.

Description of the change

Add simple CMake support.

To post a comment you must log in.
Revision history for this message
Michael Vogt (mvo) wrote :

Good stuff, nice to see it all coming together. Some minor stuff inline, but not important.

review: Approve
Revision history for this message
Michael Terry (mterry) wrote :

Comments to your comments, but nothing I want to deal with now. So I'll top-approve.

Thanks for the review!

Revision history for this message
Snappy Tarmac (snappydevtarmac) wrote :
Download full text (26.3 KiB)

The attempt to merge lp:~mterry/snapcraft/cmake into lp:snapcraft failed. Below is the output from the failed tests.

Pulling mock-part
Skipping pull mock-part (already ran)
===============================[ Analyzing Jobs ]===============================
=============================[ Session Statistics ]=============================
This session is about 0.00% complete
Estimated duration is 2.20 for automated jobs.
Estimated duration cannot be determined for manual jobs.
Size of the desired job list: 8
Size of the effective execution plan: 8
===========================[ Running Selected Jobs ]============================
--------------[ Running job 1 / 8. Estimated time left: 0:00:02 ]---------------
--------------------------[ snapcraft/normal/no-yaml ]--------------------------
ID: 2015.com.canonical.snapcraft::snapcraft/normal/no-yaml
Category: 2013.com.canonical.plainbox::uncategorised
... 8< -------------------------------------------------------------------------
Could not find snapcraft.yaml. Are you sure you're in the right directory? To start a new project, use 'snapcraft init'
------------------------------------------------------------------------- >8 ---
Outcome: job passed
--------------[ Running job 2 / 8. Estimated time left: 0:00:02 ]---------------
-----------------------[ snapcraft/normal/local-source ]------------------------
ID: 2015.com.canonical.snapcraft::snapcraft/normal/local-source
Category: 2013.com.canonical.plainbox::uncategorised
... 8< -------------------------------------------------------------------------
touch stamp-all
touch stamp-install
Pulling make-project
Building make-project
make
make install DESTDIR=/home/tarmac/tmp/cwd-jol3i9p6.146941f2868395658a68a8574943280c4612acf9913e056e8b7040e3d3e0c424/parts/make-project/install
Skipping pull make-project (already ran)
Skipping build make-project (already ran)
Staging make-project
------------------------------------------------------------------------- >8 ---
Outcome: job passed
--------------[ Running job 3 / 8. Estimated time left: 0:00:02 ]---------------
------------------------[ snapcraft/normal/simple-make ]------------------------
ID: 2015.com.canonical.snapcraft::snapcraft/normal/simple-make
Category: 2013.com.canonical.plainbox::uncategorised
... 8< -------------------------------------------------------------------------
gcc -o test test.c
mkdir -p /home/tarmac/tmp/cwd-8r_9u6_2.59134fdf74fbd5c037bc827cfe08d03c0cbe26b3aab9f0b98abfb567c9af130b/parts/make-project/install/bin
cp -a test /home/tarmac/tmp/cwd-8r_9u6_2.59134fdf74fbd5c037bc827cfe08d03c0cbe26b3aab9f0b98abfb567c9af130b/parts/make-project/install/bin/
Pulling make-project
Building make-project
make
make install DESTDIR=/home/tarmac/tmp/cwd-8r_9u6_2.59134fdf74fbd5c037bc827cfe08d03c0cbe26b3aab9f0b98abfb567c9af130b/parts/make-project/install
Staging make-project
Snapping make-project
------------------------------------------------------------------------- >8 ---
Outcome: job passed
--------------[ Running job 4 / 8. Estimated time left: 0:00:02 ]---------------
-----------------------[ sn...

77. By Michael Terry

Merge from trunk

78. By Michael Terry

Add cmake to Build-Depends for debian build

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches