Merge lp://qastaging/~snappy-dev/snapcraft/core into lp://qastaging/snapcraft
Status: | Needs review |
---|---|
Proposed branch: | lp://qastaging/~snappy-dev/snapcraft/core |
Merge into: | lp://qastaging/snapcraft |
Diff against target: |
17197 lines (+16068/-0) 191 files modified
.bzrignore (+14/-0) .tarmac.sh (+2/-0) COPYING (+674/-0) HACKING.md (+48/-0) README.md (+7/-0) bin/snapcraft (+33/-0) bin/snapcraft-coverage (+44/-0) debian/changelog (+119/-0) debian/compat (+1/-0) debian/control (+59/-0) debian/copyright (+22/-0) debian/rules (+8/-0) debian/snapcraft-examples.examples (+1/-0) debian/snapcraft.install (+3/-0) debian/source/format (+1/-0) debian/source/options (+2/-0) debian/tests/control (+11/-0) debian/tests/runexamples (+2/-0) debian/tests/runtests (+2/-0) docs/intro.md (+95/-0) docs/snapcraft-advanced-features.md (+188/-0) docs/your-first-snap.md (+328/-0) examples/downloader-with-wiki-parts/Makefile (+11/-0) examples/downloader-with-wiki-parts/snapcraft.yaml (+17/-0) examples/downloader-with-wiki-parts/test.c (+17/-0) examples/godd/snapcraft.yaml (+20/-0) examples/gopaste/Makefile (+8/-0) examples/gopaste/gopaste (+10/-0) examples/gopaste/snapcraft.yaml (+15/-0) examples/java-hello-world/Makefile (+7/-0) examples/java-hello-world/build.xml (+39/-0) examples/java-hello-world/snapcraft.yaml (+17/-0) examples/java-hello-world/src/oata/HelloWorld.java (+10/-0) examples/java-hello-world/wrapper (+2/-0) examples/libpipeline/Makefile (+11/-0) examples/libpipeline/snapcraft.yaml (+19/-0) examples/libpipeline/test.c (+18/-0) examples/py2-project/Makefile (+8/-0) examples/py2-project/sha3sum.py (+14/-0) examples/py2-project/snapcraft.yaml (+20/-0) examples/py3-project/sha3sum.py (+14/-0) examples/py3-project/snapcraft.yaml (+18/-0) examples/qmldemo/demo.qml (+9/-0) examples/qmldemo/meta/package.yaml (+10/-0) examples/qmldemo/meta/readme.md (+4/-0) examples/qmldemo/snapcraft.yaml (+22/-0) examples/ros/icon.svg (+1/-0) examples/ros/snapcraft.yaml (+27/-0) examples/ros/src/CMakeLists.txt (+47/-0) examples/ros/src/beginner_tutorials/CMakeLists.txt (+39/-0) examples/ros/src/beginner_tutorials/msg/Num.msg (+1/-0) examples/ros/src/beginner_tutorials/package.xml (+42/-0) examples/ros/src/beginner_tutorials/src/add_two_ints_client.cpp (+30/-0) examples/ros/src/beginner_tutorials/src/add_two_ints_server.cpp (+23/-0) examples/ros/src/beginner_tutorials/src/listener.cpp (+60/-0) examples/ros/src/beginner_tutorials/src/talker.cpp (+87/-0) examples/ros/src/beginner_tutorials/srv/AddTwoInts.srv (+4/-0) examples/tomcat-maven-webapp/Makefile (+6/-0) examples/tomcat-maven-webapp/snapcraft.yaml (+25/-0) examples/tomcat-maven-webapp/tomcat-conf/catalina.policy (+250/-0) examples/tomcat-maven-webapp/tomcat-conf/catalina.properties (+145/-0) examples/tomcat-maven-webapp/tomcat-conf/context.xml (+36/-0) examples/tomcat-maven-webapp/tomcat-conf/logging.properties (+64/-0) examples/tomcat-maven-webapp/tomcat-conf/server.xml (+142/-0) examples/tomcat-maven-webapp/tomcat-conf/tomcat-users.xml (+39/-0) examples/tomcat-maven-webapp/tomcat-conf/tomcat-users.xsd (+43/-0) examples/tomcat-maven-webapp/tomcat-conf/web.xml (+4664/-0) examples/tomcat-maven-webapp/wrapper (+23/-0) examples/webcam-webui/config.py (+60/-0) examples/webcam-webui/setup.py (+16/-0) examples/webcam-webui/snapcraft.yaml (+38/-0) examples/webcam-webui/webcam-webui (+17/-0) integration-tests/data/assemble/Makefile (+11/-0) integration-tests/data/assemble/bin/assemble-echo (+2/-0) integration-tests/data/assemble/bin/not-wrapped (+2/-0) integration-tests/data/assemble/binary1 (+2/-0) integration-tests/data/assemble/binary1.after (+5/-0) integration-tests/data/assemble/service-start (+2/-0) integration-tests/data/assemble/service-stop (+2/-0) integration-tests/data/assemble/snapcraft.yaml (+20/-0) integration-tests/data/assemble/snappy/package.yaml (+11/-0) integration-tests/data/assemble/snappy/readme.md (+3/-0) integration-tests/data/assemble/subdir/binary2 (+2/-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 (+15/-0) integration-tests/data/bzr-head/snapcraft.yaml (+12/-0) integration-tests/data/bzr-tag/snapcraft.yaml (+13/-0) integration-tests/data/conflicts/Makefile (+8/-0) integration-tests/data/conflicts/p2/Makefile (+8/-0) integration-tests/data/conflicts/p2/test.c (+4/-0) integration-tests/data/conflicts/snapcraft.yaml (+15/-0) integration-tests/data/conflicts/test.c (+4/-0) integration-tests/data/dependencies/p1/Makefile (+9/-0) integration-tests/data/dependencies/p1/p1.c (+4/-0) integration-tests/data/dependencies/p1/p1.h (+1/-0) integration-tests/data/dependencies/p2/Makefile (+9/-0) integration-tests/data/dependencies/p2/p2.c (+6/-0) integration-tests/data/dependencies/p2/p2.h (+1/-0) integration-tests/data/dependencies/p3/Makefile (+8/-0) integration-tests/data/dependencies/p3/p3.c (+7/-0) integration-tests/data/dependencies/snapcraft.yaml (+19/-0) integration-tests/data/framework-policy/snapcraft.yaml (+14/-0) integration-tests/data/git-branch/snapcraft.yaml (+13/-0) integration-tests/data/git-head/snapcraft.yaml (+12/-0) integration-tests/data/git-tag/snapcraft.yaml (+13/-0) integration-tests/data/hg-branch/snapcraft.yaml (+13/-0) integration-tests/data/hg-head/snapcraft.yaml (+12/-0) integration-tests/data/hg-tag/snapcraft.yaml (+13/-0) integration-tests/data/local-plugin/parts/plugins/x_local_plugin.py (+22/-0) integration-tests/data/local-plugin/snapcraft.yaml (+11/-0) integration-tests/data/local-source/Makefile (+7/-0) integration-tests/data/local-source/snapcraft.yaml (+11/-0) integration-tests/data/pip-requirements/icon.svg (+2/-0) integration-tests/data/pip-requirements/requirements.txt (+1/-0) integration-tests/data/pip-requirements/snapcraft.yaml (+14/-0) integration-tests/data/pypi-config/config.py (+61/-0) integration-tests/data/pypi-config/setup.py (+16/-0) integration-tests/data/pypi-config/snapcraft.yaml (+16/-0) integration-tests/data/simple-cmake/CMakeLists.txt (+3/-0) integration-tests/data/simple-cmake/snapcraft.yaml (+11/-0) integration-tests/data/simple-cmake/test.c (+4/-0) integration-tests/data/simple-copy/snapcraft.yaml (+12/-0) integration-tests/data/simple-copy/src (+1/-0) integration-tests/data/simple-make-filesets/Makefile (+12/-0) integration-tests/data/simple-make-filesets/snapcraft.yaml (+26/-0) integration-tests/data/simple-make/Makefile (+8/-0) integration-tests/data/simple-make/snapcraft.yaml (+11/-0) integration-tests/data/simple-make/test.c (+4/-0) integration-tests/data/simple-maven/my-app/pom.xml (+18/-0) integration-tests/data/simple-maven/my-app/src/main/java/com/canonical/testapp/App.java (+13/-0) integration-tests/data/simple-maven/my-app/src/main/resources/META-INF/application.properties (+1/-0) integration-tests/data/simple-maven/my-app/src/test/java/com/canonical/testapp/AppTest.java (+38/-0) integration-tests/data/simple-maven/snapcraft.yaml (+15/-0) integration-tests/data/simple-scons/SConstruct (+22/-0) integration-tests/data/simple-scons/main.c (+5/-0) integration-tests/data/simple-scons/snapcraft.yaml (+13/-0) integration-tests/data/simple-tar/snapcraft.yaml (+36/-0) integration-tests/data/wiki/snapcraft.yaml (+16/-0) integration-tests/manage.py (+20/-0) integration-tests/runtests.sh (+75/-0) integration-tests/units/examples.pxu (+10/-0) integration-tests/units/jobs.pxu (+403/-0) integration-tests/units/testplans.pxu (+9/-0) runtests.sh (+123/-0) schema/snapcraft.yaml (+128/-0) setup.py (+39/-0) snapcraft/__init__.py (+261/-0) snapcraft/cmds.py (+409/-0) snapcraft/common.py (+116/-0) snapcraft/dirs.py (+30/-0) snapcraft/help.py (+72/-0) snapcraft/lifecycle.py (+373/-0) snapcraft/log.py (+62/-0) snapcraft/main.py (+148/-0) snapcraft/manifest.txt (+110/-0) snapcraft/meta.py (+249/-0) snapcraft/plugins/ant.py (+63/-0) snapcraft/plugins/autotools.py (+76/-0) snapcraft/plugins/catkin.py (+275/-0) snapcraft/plugins/cmake.py (+60/-0) snapcraft/plugins/copy.py (+49/-0) snapcraft/plugins/go.py (+77/-0) snapcraft/plugins/jdk.py (+37/-0) snapcraft/plugins/make.py (+38/-0) snapcraft/plugins/maven.py (+81/-0) snapcraft/plugins/python2.py (+144/-0) snapcraft/plugins/python3.py (+143/-0) snapcraft/plugins/qml.py (+119/-0) snapcraft/plugins/roscore.py (+82/-0) snapcraft/plugins/scons.py (+62/-0) snapcraft/plugins/tar_content.py (+44/-0) snapcraft/repo.py (+300/-0) snapcraft/sources.py (+306/-0) snapcraft/tests/__init__.py (+35/-0) snapcraft/tests/fixture_setup.py (+29/-0) snapcraft/tests/mock_plugin.py (+21/-0) snapcraft/tests/test_base_plugin.py (+118/-0) snapcraft/tests/test_cmds.py (+243/-0) snapcraft/tests/test_common.py (+49/-0) snapcraft/tests/test_copy_plugin.py (+75/-0) snapcraft/tests/test_help.py (+38/-0) snapcraft/tests/test_lifecycle.py (+243/-0) snapcraft/tests/test_log.py (+87/-0) snapcraft/tests/test_meta.py (+351/-0) snapcraft/tests/test_repo.py (+111/-0) snapcraft/tests/test_sources.py (+351/-0) snapcraft/tests/test_wiki.py (+76/-0) snapcraft/tests/test_yaml.py (+579/-0) snapcraft/wiki.py (+71/-0) snapcraft/yaml.py (+333/-0) |
To merge this branch: | bzr merge lp://qastaging/~snappy-dev/snapcraft/core |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Snappy Developers | Pending | ||
Review via email: mp+423044@code.qastaging.launchpad.net |
Commit message
That’s good
Description of the change
Perfect
Unmerged revisions
- 261. By Sergio Schvezov
-
Release changelog for 0.4
- 260. By Sergio Schvezov
-
Support combinations of --version, -v and version. Also order help by sergiusens approved by chipaca
- 259. By Sergio Schvezov
-
stat and chmod the actual file and not the target when removing suid/guid bits by sergiusens approved by elopio
- 258. By Sergio Schvezov
-
Fix path to binaries in the ros example by sergiusens approved by elopio
- 257. By Sergio Schvezov
-
Support --version with small note on snapcraft help by sergiusens approved by chipaca
- 256. By Sergio Schvezov
-
Listing plugins on help should not raise an exception by sergiusens approved by dholbach
- 255. By Daniel Holbach
-
Integrate all relevant information from https:/
/developer. ubuntu. com/snappy/ tutorials/ build-snaps/ so it will be easier to maintain the docs for us. Fixed some other small issues along the way. by dholbach approved by sergiusens - 254. By Sergio Schvezov
-
Adding a help command to get snapcraft help from the cli. by sergiusens approved by chipaca
- 253. By Sergio Schvezov
-
Add list-plugins by sergiusens approved by elopio,chipaca
- 252. By Sergio Schvezov
-
Plugins raise exception instead of true/false by sergiusens approved by elopio