Skip to content

Commit 6eaa86b

Browse files
committed
Upgraded RequireJS and r.js to 1.0.6
1 parent 49f28ff commit 6eaa86b

File tree

3 files changed

+690
-126
lines changed

3 files changed

+690
-126
lines changed

Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ docs: init
8484
${RUN_JS} \
8585
external/r.js/dist/r.js \
8686
-o build/docs.build.js \
87-
dir=../tmp/demos
87+
dir=tmp/demos
8888
# ... Prepend versioned license to jquery.mobile.js
8989
@@cat LICENSE-INFO.txt | ${VER} > tmp/demos/LICENSE-INFO.txt
9090
@@cat tmp/demos/LICENSE-INFO.txt | cat - tmp/demos/js/jquery.mobile.js > tmp/demos/js/jquery.mobile.js.tmp
@@ -116,7 +116,7 @@ js: init
116116
${RUN_JS} \
117117
external/r.js/dist/r.js \
118118
-o baseUrl="js" \
119-
include=jquery.mobile \
119+
name=jquery.mobile \
120120
exclude=jquery,../external/requirejs/order,../external/requirejs/depend,../external/requirejs/text,../external/requirejs/text!../version.txt \
121121
out=${OUTPUT}/${NAME}.compiled.js \
122122
pragmasOnSave.jqmBuildExclude=true \

0 commit comments

Comments
 (0)