Browse files

Use original r.js, externalized stripping of define/require to amd-st…

…ripper.js
  • Loading branch information...
1 parent ad98a8f commit 08b89551b285b5765ccfe5c24d2c45b65a184ca0 @gseguin gseguin committed Dec 14, 2011
Showing with 9 additions and 9,036 deletions.
  1. +9 −6 Makefile
  2. +0 −9,030 js/r-jqm.js
View
15 Makefile
@@ -142,15 +142,18 @@ init:
# Build and minify the JS files
js: init
# Build the JavaScript file
- @@node js/r-jqm.js -o baseUrl="js" include=jquery.mobile exclude=jquery,order out=${OUTPUT}/${NAME}.tmp.js wrap.start=${WRAP_START} wrap.end=${WRAP_END} optimize=none
+ @@node js/r.js -o baseUrl="js" include=jquery.mobile exclude=jquery,order out=${OUTPUT}/${NAME}.tmp.js wrap.start=${WRAP_START} wrap.end=${WRAP_END} optimize=none
@@cat LICENSE-INFO.txt | ${VER} > ${OUTPUT}/${NAME}.js
- @@cat ${OUTPUT}/${NAME}.tmp.js | sed "s/'order!/'/g" >> ${OUTPUT}/${NAME}.js
+ @@node js/amd-stripper.js ${OUTPUT}/${NAME}.tmp.js ${OUTPUT}/${NAME}.js
@@rm ${OUTPUT}/${NAME}.tmp.js
- # Build the minified JavaScript file
- @@node js/r-jqm.js -o baseUrl="js" include=jquery.mobile exclude=jquery,order out=${OUTPUT}/${NAME}.tmp.min.js wrap.start=${WRAP_START} wrap.end=${WRAP_END} optimize=uglify
+ # ..... and then minify it
@@echo ${VER_MIN} > ${OUTPUT}/${NAME}.min.js
- @@cat ${OUTPUT}/${NAME}.tmp.min.js | sed "s/'order!/'/g" >> ${OUTPUT}/${NAME}.min.js
- @@rm ${OUTPUT}/${NAME}.tmp.min.js
+ @@java -XX:ReservedCodeCacheSize=64m \
+ -jar build/google-compiler-20111003.jar \
+ --js ${OUTPUT}/${NAME}.js \
+ --js_output_file ${OUTPUT}/${NAME}.tmp.js
+ @@cat ${OUTPUT}/${NAME}.tmp.js >> ${OUTPUT}/${NAME}.min.js
+ @@rm ${OUTPUT}/${NAME}.tmp.js
# -------------------------------------------------
View
9,030 js/r-jqm.js
0 additions, 9,030 deletions not shown because the diff is too large. Please use a local Git client to view these changes.

0 comments on commit 08b8955

Please sign in to comment.