Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Don't post-process the output of r.js, just wrap the output of r.js t…

…o export as an AMD module if AMD loader present, shim the define function otherwise
  • Loading branch information...
commit 3b140fdcea65055aef716de81a25ffc9061e5eec 1 parent 855856a
@gseguin gseguin authored
Showing with 5 additions and 7 deletions.
  1. +5 −7 Makefile
View
12 Makefile
@@ -113,18 +113,16 @@ js: init
-classpath build/js.jar:build/google-compiler-20111003.jar org.mozilla.javascript.tools.shell.Main \
external/r.js/dist/r.js \
-o baseUrl="js" \
- include=jquery.mobile,jquery.mobile.init exclude=jquery,order \
+ include=jquery.mobile exclude=jquery,order \
out=${OUTPUT}/${NAME}.compiled.js \
- pragmasOnSave.jqmBuildExclude=true \
findNestedDependencies=true \
skipModuleInsertion=true \
+ wrap.startFile=build/wrap.start \
+ wrap.endFile=build/wrap.end \
optimize=none
- @@java -XX:ReservedCodeCacheSize=64m \
- -classpath build/js.jar org.mozilla.javascript.tools.shell.Main \
- build/WrapDefineJava.js ${OUTPUT}/${NAME}.compiled.js >> ${OUTPUT}/${NAME}.filtered.js
@@cat LICENSE-INFO.txt | ${VER} > ${OUTPUT}/${NAME}.js
- @@cat ${OUTPUT}/${NAME}.filtered.js >> ${OUTPUT}/${NAME}.js
- @@rm ${OUTPUT}/${NAME}.compiled.js ${OUTPUT}/${NAME}.filtered.js
+ @@cat ${OUTPUT}/${NAME}.compiled.js >> ${OUTPUT}/${NAME}.js
+ @@rm ${OUTPUT}/${NAME}.compiled.js
# ..... and then minify it
@@echo ${VER_MIN} > ${OUTPUT}/${NAME}.min.js
@@java -XX:ReservedCodeCacheSize=64m \
Please sign in to comment.
Something went wrong with that request. Please try again.