Launchpad itself

Merge lp:~rockstar/launchpad/enable-edge-recipe-builds into lp:launchpad

  1. enable-edge-recipe-builds
  2. Merge into devel
Proposed by Paul Hummer on 2010-05-12
Status: Merged
Approved by: Edwin Grubbs on 2010-05-12
Approved revision: no longer in the source branch.
Merged at revision: 10856
Proposed branch: lp:~rockstar/launchpad/enable-edge-recipe-builds
Merge into: lp:launchpad
Diff against target: 265 lines (+114/-125)
3 files modified
configs/development/build-from-branch.zcml (+0/-124)
lib/canonical/config/schema-lazr.conf (+1/-1)
lib/lp/code/browser/configure.zcml (+113/-0)
To merge this branch: bzr merge lp:~rockstar/launchpad/enable-edge-recipe-builds
Reviewer Review Type Date Requested Status
Edwin Grubbs (community) 2010-05-12 Approve on 2010-05-12
Review via email: mp+25175@code.launchpad.net

Description of the Change

This branch just enables the build_from_branch stuff globally, and removes the
development/testrunner specific parts. We want this functionality on edge
yesterday! :)

To post a comment you must log in.
Edwin Grubbs (edwin-grubbs) wrote :

Looks good.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== removed file 'configs/development/build-from-branch.zcml'
2--- configs/development/build-from-branch.zcml 2010-04-29 16:38:00 +0000
3+++ configs/development/build-from-branch.zcml 1970-01-01 00:00:00 +0000
4@@ -1,124 +0,0 @@
5-<!-- Copyright 2010 Canonical Ltd. This software is licensed under the
6- GNU Affero General Public License version 3 (see the file LICENSE).
7--->
8-
9-<configure
10- xmlns="http://namespaces.zope.org/zope"
11- xmlns:browser="http://namespaces.zope.org/browser"
12- xmlns:i18n="http://namespaces.zope.org/i18n"
13- xmlns:xmlrpc="http://namespaces.zope.org/xmlrpc"
14- i18n_domain="launchpad">
15- <browser:navigation
16- module="lp.code.browser.sourcepackagerecipe"
17- classes="SourcePackageRecipeNavigation
18- SourcePackageRecipeBuildNavigation" />
19-
20- <facet facet="branches">
21-
22- <browser:defaultView
23- for="lp.code.interfaces.sourcepackagerecipe.ISourcePackageRecipe"
24- name="+index"
25- layer="canonical.launchpad.layers.CodeLayer"/>
26- <browser:page
27- for="lp.code.interfaces.sourcepackagerecipe.ISourcePackageRecipe"
28- class="lp.code.browser.sourcepackagerecipe.SourcePackageRecipeView"
29- name="+index"
30- template="../../lib/lp/code/templates/sourcepackagerecipe-index.pt"
31- permission="launchpad.View"/>
32- <browser:page
33- for="lp.code.interfaces.sourcepackagerecipe.ISourcePackageRecipe"
34- class="lp.code.browser.sourcepackagerecipe.SourcePackageRecipeRequestBuildsView"
35- name="+request-builds"
36- template="../../lib/lp/code/templates/sourcepackagerecipe-request-builds.pt"
37- permission="launchpad.View"/>
38- </facet>
39- <facet facet="branches">
40- <browser:defaultView
41- for="lp.code.interfaces.sourcepackagerecipebuild.ISourcePackageRecipeBuild"
42- name="+index"
43- layer="canonical.launchpad.layers.CodeLayer"/>
44- <browser:page
45- for="lp.code.interfaces.sourcepackagerecipebuild.ISourcePackageRecipeBuild"
46- class="lp.code.browser.sourcepackagerecipe.SourcePackageRecipeBuildView"
47- name="+index"
48- template="../../lib/lp/code/templates/sourcepackagerecipebuild-index.pt"
49- permission="launchpad.View"/>
50- <browser:menus
51- classes="
52- SourcePackageRecipeNavigationMenu
53- SourcePackageRecipeContextMenu"
54- module="lp.code.browser.sourcepackagerecipe"/>
55-
56- <browser:page
57- for="lp.code.interfaces.branch.IBranch"
58- class="lp.code.browser.sourcepackagerecipe.SourcePackageRecipeAddView"
59- permission="zope.Public"
60- facet="branches"
61- name="+new-recipe"
62- template="../../lib/lp/app/templates/generic-edit.pt"/>
63- <browser:page
64- for="lp.code.interfaces.sourcepackagerecipe.ISourcePackageRecipe"
65- class="lp.code.browser.sourcepackagerecipe.SourcePackageRecipeEditView"
66- permission="zope.Public"
67- facet="branches"
68- name="+edit"
69- template="../../lib/lp/app/templates/generic-edit.pt"/>
70- <browser:page
71- for="lp.code.interfaces.sourcepackagerecipe.ISourcePackageRecipe"
72- class="lp.code.browser.sourcepackagerecipe.SourcePackageRecipeDeleteView"
73- permission="zope.Public"
74- facet="branches"
75- name="+delete"
76- template="../../lib/lp/app/templates/generic-edit.pt"/>
77-
78-
79- <browser:page
80- for="lp.code.interfaces.branch.IBranch"
81- class="lp.code.browser.sourcepackagerecipelisting.BranchRecipeListingView"
82- permission="zope.Public"
83- facet="branches"
84- name="+recipes"
85- template="../../lib/lp/code/templates/sourcepackagerecipe-listing.pt"/>
86- <browser:page
87- for="lp.registry.interfaces.product.IProduct"
88- class="lp.code.browser.sourcepackagerecipelisting.ProductRecipeListingView"
89- permission="zope.Public"
90- facet="branches"
91- name="+recipes"
92- template="../../lib/lp/code/templates/sourcepackagerecipe-listing.pt"/>
93- <browser:page
94- for="lp.registry.interfaces.person.IPerson"
95- class="lp.code.browser.sourcepackagerecipelisting.PersonRecipeListingView"
96- permission="zope.Public"
97- facet="branches"
98- name="+recipes"
99- template="../../lib/lp/code/templates/sourcepackagerecipe-listing.pt"/>
100-
101- <browser:page
102- for="lp.code.interfaces.sourcepackagerecipe.ISourcePackageRecipe"
103- name="+hierarchy"
104- class="lp.code.browser.sourcepackagerecipe.SourcePackageRecipeHierarchy"
105- template="../../lib/lp/app/templates/launchpad-hierarchy.pt"
106- permission="zope.Public"/>
107-
108- <adapter
109- provides="canonical.launchpad.webapp.interfaces.IBreadcrumb"
110- for="lp.code.interfaces.sourcepackagerecipe.ISourcePackageRecipe"
111- factory="canonical.launchpad.webapp.breadcrumb.NameBreadcrumb"
112- permission="zope.Public"/>
113- </facet>
114- <securedutility
115- name="BuildableDistroSeries"
116- component="lp.code.browser.sourcepackagerecipe.buildable_distroseries_vocabulary"
117- provides="zope.schema.interfaces.IVocabularyFactory"
118- >
119- <allow interface="zope.schema.interfaces.IVocabularyFactory"/>
120- </securedutility>
121- <securedutility
122- name="TargetPPAs"
123- component="lp.code.browser.sourcepackagerecipe.target_ppas_vocabulary"
124- provides="zope.schema.interfaces.IVocabularyFactory"
125- >
126- <allow interface="zope.schema.interfaces.IVocabularyFactory"/>
127- </securedutility>
128-</configure>
129
130=== removed symlink 'configs/testrunner/build-from-branch.zcml'
131=== target was u'../development/build-from-branch.zcml'
132=== modified file 'lib/canonical/config/schema-lazr.conf'
133--- lib/canonical/config/schema-lazr.conf 2010-05-11 16:02:51 +0000
134+++ lib/canonical/config/schema-lazr.conf 2010-05-12 17:29:30 +0000
135@@ -167,7 +167,7 @@
136
137
138 [build_from_branch]
139-enabled = False
140+enabled = True
141
142
143 # Configuration for spawned Bazaar subprocesses.
144
145=== modified file 'lib/lp/code/browser/configure.zcml'
146--- lib/lp/code/browser/configure.zcml 2010-04-28 22:03:05 +0000
147+++ lib/lp/code/browser/configure.zcml 2010-05-12 17:29:30 +0000
148@@ -1096,4 +1096,117 @@
149 path_expression="string:+build/${id}"
150 rootsite="code" />
151
152+ <browser:navigation
153+ module="lp.code.browser.sourcepackagerecipe"
154+ classes="SourcePackageRecipeNavigation
155+ SourcePackageRecipeBuildNavigation" />
156+
157+ <facet facet="branches">
158+
159+ <browser:defaultView
160+ for="lp.code.interfaces.sourcepackagerecipe.ISourcePackageRecipe"
161+ name="+index"
162+ layer="canonical.launchpad.layers.CodeLayer"/>
163+ <browser:page
164+ for="lp.code.interfaces.sourcepackagerecipe.ISourcePackageRecipe"
165+ class="lp.code.browser.sourcepackagerecipe.SourcePackageRecipeView"
166+ name="+index"
167+ template="../templates/sourcepackagerecipe-index.pt"
168+ permission="launchpad.View"/>
169+ <browser:page
170+ for="lp.code.interfaces.sourcepackagerecipe.ISourcePackageRecipe"
171+ class="lp.code.browser.sourcepackagerecipe.SourcePackageRecipeRequestBuildsView"
172+ name="+request-builds"
173+ template="../templates/sourcepackagerecipe-request-builds.pt"
174+ permission="launchpad.View"/>
175+ </facet>
176+ <facet facet="branches">
177+ <browser:defaultView
178+ for="lp.code.interfaces.sourcepackagerecipebuild.ISourcePackageRecipeBuild"
179+ name="+index"
180+ layer="canonical.launchpad.layers.CodeLayer"/>
181+ <browser:page
182+ for="lp.code.interfaces.sourcepackagerecipebuild.ISourcePackageRecipeBuild"
183+ class="lp.code.browser.sourcepackagerecipe.SourcePackageRecipeBuildView"
184+ name="+index"
185+ template="../templates/sourcepackagerecipebuild-index.pt"
186+ permission="launchpad.View"/>
187+ <browser:menus
188+ classes="
189+ SourcePackageRecipeNavigationMenu
190+ SourcePackageRecipeContextMenu"
191+ module="lp.code.browser.sourcepackagerecipe"/>
192+
193+ <browser:page
194+ for="lp.code.interfaces.branch.IBranch"
195+ class="lp.code.browser.sourcepackagerecipe.SourcePackageRecipeAddView"
196+ permission="zope.Public"
197+ facet="branches"
198+ name="+new-recipe"
199+ template="../../app/templates/generic-edit.pt"/>
200+ <browser:page
201+ for="lp.code.interfaces.sourcepackagerecipe.ISourcePackageRecipe"
202+ class="lp.code.browser.sourcepackagerecipe.SourcePackageRecipeEditView"
203+ permission="zope.Public"
204+ facet="branches"
205+ name="+edit"
206+ template="../../app/templates/generic-edit.pt"/>
207+ <browser:page
208+ for="lp.code.interfaces.sourcepackagerecipe.ISourcePackageRecipe"
209+ class="lp.code.browser.sourcepackagerecipe.SourcePackageRecipeDeleteView"
210+ permission="zope.Public"
211+ facet="branches"
212+ name="+delete"
213+ template="../../app/templates/generic-edit.pt"/>
214+
215+ <browser:page
216+ for="lp.code.interfaces.branch.IBranch"
217+ class="lp.code.browser.sourcepackagerecipelisting.BranchRecipeListingView"
218+ permission="zope.Public"
219+ facet="branches"
220+ name="+recipes"
221+ template="../templates/sourcepackagerecipe-listing.pt"/>
222+ <browser:page
223+ for="lp.registry.interfaces.product.IProduct"
224+ class="lp.code.browser.sourcepackagerecipelisting.ProductRecipeListingView"
225+ permission="zope.Public"
226+ facet="branches"
227+ name="+recipes"
228+ template="../templates/sourcepackagerecipe-listing.pt"/>
229+ <browser:page
230+ for="lp.registry.interfaces.person.IPerson"
231+ class="lp.code.browser.sourcepackagerecipelisting.PersonRecipeListingView"
232+ permission="zope.Public"
233+ facet="branches"
234+ name="+recipes"
235+ template="../templates/sourcepackagerecipe-listing.pt"/>
236+
237+ <browser:page
238+ for="lp.code.interfaces.sourcepackagerecipe.ISourcePackageRecipe"
239+ name="+hierarchy"
240+ class="lp.code.browser.sourcepackagerecipe.SourcePackageRecipeHierarchy"
241+ template="../../app/templates/launchpad-hierarchy.pt"
242+ permission="zope.Public"/>
243+
244+ <adapter
245+ provides="canonical.launchpad.webapp.interfaces.IBreadcrumb"
246+ for="lp.code.interfaces.sourcepackagerecipe.ISourcePackageRecipe"
247+ factory="canonical.launchpad.webapp.breadcrumb.NameBreadcrumb"
248+ permission="zope.Public"/>
249+ </facet>
250+ <securedutility
251+ name="BuildableDistroSeries"
252+ component="lp.code.browser.sourcepackagerecipe.buildable_distroseries_vocabulary"
253+ provides="zope.schema.interfaces.IVocabularyFactory"
254+ >
255+ <allow interface="zope.schema.interfaces.IVocabularyFactory"/>
256+ </securedutility>
257+ <securedutility
258+ name="TargetPPAs"
259+ component="lp.code.browser.sourcepackagerecipe.target_ppas_vocabulary"
260+ provides="zope.schema.interfaces.IVocabularyFactory"
261+ >
262+ <allow interface="zope.schema.interfaces.IVocabularyFactory"/>
263+ </securedutility>
264+
265 </configure>