Merge lp://qastaging/~sergiusens/snapcraft/1500758 into lp://qastaging/~dholbach/snapcraft/1498347

Proposed by Sergio Schvezov
Status: Superseded
Proposed branch: lp://qastaging/~sergiusens/snapcraft/1500758
Merge into: lp://qastaging/~dholbach/snapcraft/1498347
Diff against target: 1710 lines (+706/-274)
46 files modified
debian/changelog (+55/-2)
debian/control (+11/-0)
debian/rules (+3/-0)
debian/snapcraft-examples.examples (+1/-0)
debian/snapcraft.install (+3/-0)
debian/source/options (+0/-5)
debian/tests/control (+3/-2)
debian/tests/runexamples (+2/-0)
debian/tests/runtests (+2/-0)
docs/intro.md (+1/-1)
docs/your-first-snap.md (+2/-2)
examples/downloader-with-wiki-parts/snapcraft.yaml (+1/-0)
integration-tests/data/build-tools/Makefile (+6/-0)
integration-tests/data/build-tools/icon.svg (+1/-0)
integration-tests/data/build-tools/snapcraft.yaml (+14/-0)
integration-tests/data/pip-requirements/snapcraft.yaml (+2/-2)
integration-tests/data/simple-scons/SConstruct (+14/-0)
integration-tests/data/simple-scons/main.c (+5/-0)
integration-tests/data/simple-scons/snapcraft.yaml (+11/-0)
integration-tests/data/simple-tar/snapcraft.yaml (+3/-0)
integration-tests/runtests.sh (+44/-17)
integration-tests/units/examples.pxu (+10/-0)
integration-tests/units/jobs.pxu (+40/-0)
integration-tests/units/testplans.pxu (+6/-1)
plugins/python2-project.yaml (+3/-3)
plugins/python2.yaml (+0/-3)
plugins/python3-project.yaml (+3/-3)
plugins/python3.yaml (+0/-3)
plugins/scons-project.yaml (+8/-0)
runtests.sh (+67/-35)
snapcraft/__init__.py (+19/-0)
snapcraft/cmds.py (+2/-0)
snapcraft/common.py (+11/-0)
snapcraft/plugin.py (+15/-19)
snapcraft/plugins/go_project.py (+3/-1)
snapcraft/plugins/python2.py (+0/-59)
snapcraft/plugins/python2_project.py (+65/-5)
snapcraft/plugins/python3.py (+0/-61)
snapcraft/plugins/python3_project.py (+62/-5)
snapcraft/plugins/scons_project.py (+31/-0)
snapcraft/repo.py (+83/-26)
snapcraft/sources.py (+7/-1)
snapcraft/tests/test_base_plugin.py (+13/-0)
snapcraft/tests/test_plugin.py (+0/-14)
snapcraft/tests/test_repo.py (+38/-0)
snapcraft/yaml.py (+36/-4)
To merge this branch: bzr merge lp://qastaging/~sergiusens/snapcraft/1500758
Reviewer Review Type Date Requested Status
Daniel Holbach Pending
Review via email: mp+272727@code.qastaging.launchpad.net

Commit message

Adding a simple scons plugin

To post a comment you must log in.

Unmerged revisions

216. By Sergio Schvezov

Adding tests for scons

215. By Sergio Schvezov

Simple scons plugin

214. By Sergio Schvezov

Detect tars in sources automatically

213. By Sergio Schvezov

Mask tar files so they are writable and set an extraction parameter to start with a clean build dir.

212. By Leo Arias

Fixed the heading on the build section of the docs. by elopio approved by dholbach

211. By Daniel Holbach

Reopen 0.3 for development (after 0.2.1 brown paperbag release). by dholbach approved by sergiusens

210. By Daniel Holbach

Brown paperbag release (install examples into the right directory). by dholbach approved by mvo

209. By Daniel Holbach

Open 0.3 for development. by dholbach approved by sergiusens

208. By Sergio Schvezov

Allow using local sources through an env var (mostly useful for launchpad building) by sergiusens approved by mvo,dholbach,cjwatson

207. By Sergio Schvezov

preparing a changelog by sergiusens approved by sergiusens,dholbach

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