Skip to content
This repository was archived by the owner on Jun 8, 2018. It is now read-only.

Commit c128822

Browse files
committed
updated demo config to work with bdBuild refactor (user: rcgill tags: trunk)
1 parent 9a26788 commit c128822

File tree

4 files changed

+76
-75
lines changed

4 files changed

+76
-75
lines changed

demo/appFrame/config.js

+15-11
Original file line numberDiff line numberDiff line change
@@ -11,20 +11,12 @@ var require= {
1111
name:"dijit",
1212
location:"../../../dojotoolkit/dijit",
1313
lib:".",
14-
main:"lib/main",
15-
trees:[
16-
// this is the lib tree without the svn, tests, or robot modules
17-
[".", ".", "*/.*", "*/dijit/tests/*", /\/robot(x)?/]
18-
]
14+
main:"lib/main"
1915
},{
2016
name:"dojo",
2117
location:"../../../dojotoolkit/dojo",
2218
lib:".",
23-
main:"lib/main-browser",
24-
trees:[
25-
// this is the lib tree without the tests, svn, plugins, or temp files
26-
[".", ".", "*/dojo/tests/*", /\/robot(x)?/, "*/.*", "*/dojo/lib/plugins"]
27-
]
19+
main:"lib/main-browser"
2820
}],
2921

3022
deps:["main"],
@@ -48,7 +40,19 @@ var require= {
4840
i18n:1,
4941
text:1
5042
}
51-
}],
43+
},{
44+
name:"dijit",
45+
trees:[
46+
// this is the lib tree without the svn, tests, or robot modules
47+
[".", ".", "*/.*", "*/dijit/tests/*", /\/robot(x)?/]
48+
]
49+
},{
50+
name:"dojo",
51+
trees:[
52+
// this is the lib tree without the tests, svn, plugins, or temp files
53+
[".", ".", "*/dojo/tests/*", /\/robot(x)?/, "*/.*", "*/dojo/lib/plugins"]
54+
]
55+
}],
5256

5357
replacements: {
5458
"./appFrame.html": [

demo/helloWorld/build.js

-60
This file was deleted.

demo/helloWorld/config.js

+58-1
Original file line numberDiff line numberDiff line change
@@ -19,5 +19,62 @@ var require= {
1919
main:"lib/main"
2020
}],
2121

22-
deps:["main"]
22+
deps:["main"],
23+
24+
build:{
25+
files:[
26+
// the loader...
27+
["../../../bdLoad/lib/require.js", "./require.js"]
28+
],
29+
30+
destPaths:{
31+
// override paths so that i18n and text go in the root of the default package
32+
},
33+
34+
packages:[{
35+
// since dojo uses the "text!" and "i18n!" plugin, and these are not really in the default package tree
36+
// we must tell bdBuild to discover them by explicitly asking for them which will cause paths
37+
// to be inspected
38+
name:"*",
39+
modules:{
40+
i18n:1,
41+
text:1
42+
}
43+
},{
44+
name:"dojo",
45+
trees:[
46+
// this is the lib tree without the tests, svn, plugins, or temp files
47+
[".", ".", "*/dojo/tests/*", /\/robot(x)?/, "*/.*", "*/dojo/lib/plugins"]
48+
]
49+
},{
50+
name:"dijit",
51+
trees:[
52+
// this is the lib tree without the svn, tests, or robot modules
53+
[".", ".", "*/.*", "*/dijit/tests/*", /\/robot(x)?/]
54+
]
55+
}],
56+
57+
replacements: {
58+
"./helloWorld.html": [
59+
['css.css', "css/css.css"],
60+
['<script src="config.js"></script>', ""],
61+
["../../../bdLoad/lib/require.js", "boot.js"]
62+
]
63+
},
64+
65+
compactCssSet:{
66+
"./css.css":"./css/css.css"
67+
},
68+
69+
layers:{
70+
main:{
71+
boot:"./boot.js",
72+
bootText:"require(['main']);\n"
73+
}
74+
},
75+
76+
dojoPragmaKwArgs:{
77+
asynchLoader:1
78+
}
79+
}
2380
};

fossil-info

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ repository: /home/rcgill/fossils/backdraft.fossil
33
local-root: /usr/home/rcgill/git-mirrors/backdraft/work/
44
project-code: d8225bb92dc341749fca70013a95f3bf483a9f97
55
server-code: 5a21d54623343f043b0aa5451b4d6b715b1909d3
6-
checkout: 74917a8e7dc6af12dedf2ee7f3a4d9c8e0faf491 2011-02-25 10:09:06 UTC
7-
parent: dd8cc8b75a875f0a8ca44498bcc011d4b5ab0122 2011-02-11 09:39:34 UTC
6+
checkout: b70201fcdecdd9ef1d49b390041efc0e3bafaca0 2011-03-02 10:00:21 UTC
7+
parent: 74917a8e7dc6af12dedf2ee7f3a4d9c8e0faf491 2011-02-25 10:09:06 UTC
88
tags: trunk
9-
comment: updated demos to use refactored/upgraded bdBuild (user: rcgill)
9+
comment: updated demo config to work with bdBuild refactor (user: rcgill)

0 commit comments

Comments
 (0)