Merge lp://staging/~canonical-platform-qa/autopilot/pdf-build into lp://staging/autopilot

Proposed by Allan LeSage
Status: Needs review
Proposed branch: lp://staging/~canonical-platform-qa/autopilot/pdf-build
Merge into: lp://staging/autopilot
Diff against target: 96 lines (+17/-6)
3 files modified
debian/control (+3/-0)
debian/rules (+9/-1)
docs/man.rst (+5/-5)
To merge this branch: bzr merge lp://staging/~canonical-platform-qa/autopilot/pdf-build
Reviewer Review Type Date Requested Status
platform-qa-bot continuous-integration Approve
PS Jenkins bot continuous-integration Approve
Martin Pitt (community) Needs Fixing
Thomi Richards (community) Approve
Review via email: mp+247249@code.staging.launchpad.net

Commit message

Provide pdf build.

Description of the change

Provide pdf-building via LaTeX.

Required minor modification for a unicode char unprovided-for. Where/how would we want to install the result?

This'll be on hold until I fix a noodly Makefile/bash issue (marked as FIXME in debian/rules), but wanting to get some feedback.

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
530. By Allan LeSage

Correct .svg extensions.

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
531. By Allan LeSage

Revert whitespace change.

532. By Allan LeSage

Makefile hackery to convert .svgs to .pdf, revert wildcard .svg change, add imagemagick build-dep.

533. By Allan LeSage

Merge trunk.

534. By Allan LeSage

Clean up debian/rules comments :/ .

Revision history for this message
Allan LeSage (allanlesage) wrote :

To build/test, just do a normal debian build--the .pdf arrives in build/sphinx/latex/Autopilot.pdf , else just follow the steps listed in debian/rules. Note that you'll need the added dependencies.

Also note that the man.rst changes convert that unicode em-dash to a normal hyphen, wasn't supported during the LaTeX generation.

535. By Allan LeSage

debian/control whitespace fix.

Revision history for this message
Thomi Richards (thomir-deactivatedaccount) wrote :

LGTM, but I'd like to see someone review the packaging bits.

Cheers,

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
Martin Pitt (pitti) wrote :

The packaging in debian/rules looks fine to me. However, it fails to build:

   debian/rules override_dh_auto_build
make[1]: Entering directory '/«BUILDDIR»/autopilot-1.5.0+14.10.20140806'
convert /«BUILDDIR»/autopilot-1.5.0+14.10.20140806/docs/images/test_pyramid.svg /«BUILDDIR»/autopilot-1.5.0+14.10.20140806/docs/images/test_pyramid.pdf
convert: delegate failed `"rsvg-convert" -o "%o" "%i"' @ error/delegate.c/InvokeDelegate/1310.
convert: unable to open image `/tmp/magick-28976RCFje6T2VDtX': No such file or directory @ error/blob.c/OpenBlob/2709.
convert: unable to open file `/tmp/magick-28976RCFje6T2VDtX': No such file or directory @ error/constitute.c/ReadImage/540.
convert: no images defined `/«BUILDDIR»/autopilot-1.5.0+14.10.20140806/docs/images/test_pyramid.pdf' @ error/convert.c/ConvertImageCommand/3210.
make[1]: *** [/«BUILDDIR»/autopilot-1.5.0+14.10.20140806/docs/images/test_pyramid.pdf] Error 1
debian/rules:8: recipe for target '/«BUILDDIR»/autopilot-1.5.0+14.10.20140806/docs/images/test_pyramid.pdf' failed
make[1]: Leaving directory '/«BUILDDIR»/autopilot-1.5.0+14.10.20140806'
make: *** [build] Error 2
debian/rules:14: recipe for target 'build' failed

Maybe that's still missing some build dep?

I can't quite see what changed in docs/man.rst, that seems to be some whitespace noise?

review: Needs Fixing
536. By Allan LeSage

Add librsvg2-bin build-dep.

Revision history for this message
Allan LeSage (allanlesage) wrote :

Mysterious missing dependency; this builds under pbuilder; we'll wait for Jenkins' approval--thanks for your notes pitti.

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
Francis Ginther (fginther) wrote :

The jenkins node for the amd64 build failed, I've restarted a new ci run.

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:536
http://jenkins.qa.ubuntu.com/job/autopilot-ci/1007/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-vivid-amd64-ci/70
        deb: http://jenkins.qa.ubuntu.com/job/autopilot-vivid-amd64-ci/70/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-vivid-armhf-ci/70
        deb: http://jenkins.qa.ubuntu.com/job/autopilot-vivid-armhf-ci/70/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-vivid-i386-ci/70
        deb: http://jenkins.qa.ubuntu.com/job/autopilot-vivid-i386-ci/70/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/1003
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-vivid-autopilot/100
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/888
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1001
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1001/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/17473
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-vivid-autopilot/97
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/570
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/570/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/autopilot-ci/1007/rebuild

review: Approve (continuous-integration)
Revision history for this message
Nicholas Skaggs (nskaggs) wrote :

Unsure as to why there are newline changes in docs/man.rst. But otherwise, LGTM. Did you find texlive-fonts-recommended required? Is our font special?

Revision history for this message
platform-qa-bot (platform-qa-bot) wrote :
review: Approve (continuous-integration)

Unmerged revisions

536. By Allan LeSage

Add librsvg2-bin build-dep.

535. By Allan LeSage

debian/control whitespace fix.

534. By Allan LeSage

Clean up debian/rules comments :/ .

533. By Allan LeSage

Merge trunk.

532. By Allan LeSage

Makefile hackery to convert .svgs to .pdf, revert wildcard .svg change, add imagemagick build-dep.

531. By Allan LeSage

Revert whitespace change.

530. By Allan LeSage

Correct .svg extensions.

529. By Allan LeSage

Provide for pdf in 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