Merge lp:~rharding/launchpad/diejs into lp:launchpad

Proposed by Richard Harding
Status: Work in progress
Proposed branch: lp:~rharding/launchpad/diejs
Merge into: lp:launchpad
Diff against target: 158 lines (+0/-138)
2 files modified
utilities/js-deps (+0/-7)
utilities/yui-deps.py (+0/-131)
To merge this branch: bzr merge lp:~rharding/launchpad/diejs
Reviewer Review Type Date Requested Status
Launchpad code reviewers Pending
Review via email: mp+114437@code.launchpad.net

Description of the change

Keep track of deletions we can do when the combo loader is available for all.

To post a comment you must log in.
lp:~rharding/launchpad/diejs updated
15606. By Richard Harding

Removed wrong file doh

Unmerged revisions

15606. By Richard Harding

Removed wrong file doh

15605. By Richard Harding

No need to manage individual deps

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== added file 'utilities/js-deps'
2--- utilities/js-deps 1970-01-01 00:00:00 +0000
3+++ utilities/js-deps 2012-07-11 14:57:20 +0000
4@@ -0,0 +1,6 @@
5+#!bin/py
6+
7+import _pythonpath
8+from convoy.meta import main
9+
10+main()
11
12=== removed file 'utilities/js-deps'
13--- utilities/js-deps 2012-01-10 16:48:14 +0000
14+++ utilities/js-deps 1970-01-01 00:00:00 +0000
15@@ -1,7 +0,0 @@
16-#!bin/py
17-
18-import _pythonpath
19-from convoy.meta import main
20-
21-main()
22-
23
24=== removed file 'utilities/yui-deps.py'
25--- utilities/yui-deps.py 2012-02-21 16:11:38 +0000
26+++ utilities/yui-deps.py 1970-01-01 00:00:00 +0000
27@@ -1,131 +0,0 @@
28-#!/usr/bin/python
29-#
30-# Copyright 2010-2012 Canonical Ltd. This software is licensed under the
31-# GNU Affero General Public License version 3 (see the file LICENSE).
32-
33-"""Print the YUI modules we are using."""
34-
35-from sys import argv
36-
37-yui_roots = {
38- 3: 'build/js/yui-3.3.0',
39- 2: 'build/js/yui2',
40-}
41-yui_deps = {
42- 3: [
43- 'yui/yui',
44- 'oop/oop',
45- 'dom/dom',
46- 'dom/dom-style-ie',
47- 'event-custom/event-custom',
48- 'event/event',
49- 'pluginhost/pluginhost',
50- 'node/node',
51- 'event/event-base-ie',
52- 'node/align-plugin',
53- 'attribute/attribute',
54- 'base/base',
55- 'anim/anim',
56- 'async-queue/async-queue',
57- 'json/json',
58- 'plugin/plugin',
59- 'cache/cache',
60- 'classnamemanager/classnamemanager',
61- 'collection/collection',
62- 'dump/dump',
63- 'intl/intl',
64- 'substitute/substitute',
65- 'widget/widget',
66- 'widget/widget-base-ie',
67- 'console/lang/console.js',
68- 'console/console',
69- 'console/console-filters',
70- 'cookie/cookie',
71- 'dataschema/dataschema',
72- 'datatype/lang/datatype.js',
73- 'datatype/datatype',
74- 'querystring/querystring-stringify-simple',
75- 'queue-promote/queue-promote',
76- 'io/io',
77- 'datasource/datasource',
78- 'dd/dd',
79- 'dd/dd-gestures',
80- 'dd/dd-drop-plugin',
81- 'event/event-touch',
82- 'event-gestures/event-gestures',
83- 'dd/dd-plugin',
84- 'dom/selector-css3',
85- 'editor/editor',
86- 'event-simulate/event-simulate',
87- 'event-valuechange/event-valuechange',
88- 'escape/escape',
89- 'text/text-data-wordbreak',
90- 'text/text-wordbreak',
91- 'text/text-data-accentfold',
92- 'text/text-accentfold',
93- 'highlight/highlight',
94- 'history/history',
95- 'history/history-hash-ie',
96- 'history-deprecated/history-deprecated',
97- 'imageloader/imageloader',
98- 'jsonp/jsonp',
99- 'jsonp/jsonp-url',
100- 'loader/loader',
101- 'node/node-event-simulate',
102- 'transition/transition',
103- 'node-flick/node-flick',
104- 'node-focusmanager/node-focusmanager',
105- 'node-menunav/node-menunav',
106- 'widget/widget-position',
107- 'widget/widget-position-align',
108- 'widget/widget-position-constrain',
109- 'widget/widget-stack',
110- 'widget/widget-stdmod',
111- 'overlay/overlay',
112- 'profiler/profiler',
113- 'querystring/querystring',
114- 'querystring/querystring-parse-simple',
115- 'scrollview/scrollview-base',
116- 'scrollview/scrollview-base-ie',
117- 'scrollview/scrollview-scrollbars',
118- 'scrollview/scrollview',
119- 'scrollview/scrollview-paginator',
120- 'node/shim-plugin',
121- 'slider/slider',
122- 'sortable/sortable',
123- 'sortable/sortable-scroll',
124- 'stylesheet/stylesheet',
125- 'swfdetect/swfdetect',
126- 'swf/swf',
127- 'tabview/tabview-base',
128- 'widget/widget-child',
129- 'widget/widget-parent',
130- 'tabview/tabview',
131- 'tabview/tabview-plugin',
132- 'test/test',
133- 'uploader/uploader',
134- 'widget-anim/widget-anim',
135- 'widget/widget-locale',
136- 'yql/yql',
137- ],
138- 2: [
139- 'yahoo/yahoo.js',
140- 'dom/dom.js',
141- 'event/event.js',
142- 'yahoo-dom-event/yahoo-dom-event.js',
143- 'calendar/calendar.js',
144- ]
145-}
146-
147-
148-if __name__ == '__main__':
149- ext = "-%s.js" % argv[1] if len(argv) >= 2 else ".js"
150- for version, yui_deps in yui_deps.iteritems():
151- yui_root = yui_roots[version]
152- for yui_dep in yui_deps:
153- # If the yui_dep already has a .js suffix, don't add ext to it.
154- if yui_dep.endswith(".js"):
155- yui_dep_path = "%s/%s" % (yui_root, yui_dep)
156- else:
157- yui_dep_path = "%s/%s%s" % (yui_root, yui_dep, ext)
158- print yui_dep_path