Launchpad itself

Merge lp:~jml/launchpad/apidoc-dir into lp:launchpad

  1. apidoc-dir
  2. Merge into devel
Proposed by Jonathan Lange on 2010-06-24
Status: Merged
Approved by: Jelmer Vernooij on 2010-06-24
Approved revision: no longer in the source branch.
Merged at revision: 11056
Proposed branch: lp:~jml/launchpad/apidoc-dir
Merge into: lp:launchpad
Diff against target: 33 lines (+3/-3)
2 files modified
.bzrignore (+1/-0)
Makefile (+2/-3)
To merge this branch: bzr merge lp:~jml/launchpad/apidoc-dir
Reviewer Review Type Date Requested Status
Jelmer Vernooij (community) code Approve on 2010-06-24
Māris Fogels 2010-06-24 Pending
Review via email: mp+28432@code.launchpad.net

Commit Message

Remove lib/canonical/launchpad/apidoc. Generate it in make apidoc.

Description of the Change

This branch deletes the apidoc directory, instead making it whenever the API docs are built. This means there's less auto-generatable stuff in the tree, which can only help those of us who have trouble navigating the code base.

To post a comment you must log in.
Jelmer Vernooij (jelmer) wrote :

This lacks adding a .bzrignore entry for the api doc directory as we discussed on IRC.

review: Approve (code)
Jelmer Vernooij (jelmer) wrote :

> This lacks adding a .bzrignore entry for the api doc directory as we discussed
> on IRC.
... and I hit enter a bit too early. What I meant to say was I'm happy to see this land if .bzrignore is updated.

review: Approve (code)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file '.bzrignore'
2--- .bzrignore 2010-05-27 07:12:50 +0000
3+++ .bzrignore 2010-06-24 17:22:28 +0000
4@@ -68,3 +68,4 @@
5 lp.sfood
6 apidocs
7 twistd.pid
8+lib/canonical/launchpad/apidoc
9
10=== modified file 'Makefile'
11--- Makefile 2010-06-11 18:57:02 +0000
12+++ Makefile 2010-06-24 17:22:28 +0000
13@@ -61,8 +61,7 @@
14 $(API_INDEX): $(BZR_VERSION_INFO)
15 mkdir -p $(APIDOC_DIR).tmp
16 LPCONFIG=$(LPCONFIG) $(PY) ./utilities/create-lp-wadl-and-apidoc.py "$(WADL_TEMPLATE)"
17- mv $(APIDOC_DIR).tmp/* $(APIDOC_DIR)
18- rmdir $(APIDOC_DIR).tmp
19+ mv $(APIDOC_DIR).tmp $(APIDOC_DIR)
20
21 apidoc: compile $(API_INDEX)
22
23@@ -340,7 +339,7 @@
24 $(RM) -r lib/mailman
25 $(RM) -rf lib/canonical/launchpad/icing/build/*
26 $(RM) -r $(CODEHOSTING_ROOT)
27- $(RM) $(APIDOC_DIR)/wadl*.xml $(APIDOC_DIR)/*.html
28+ $(RM) -rf $(APIDOC_DIR)
29 $(RM) -rf $(APIDOC_DIR).tmp
30 $(RM) $(BZR_VERSION_INFO)
31 $(RM) +config-overrides.zcml
32
33=== removed directory 'lib/canonical/launchpad/apidoc'