1 From 58213e7b55e64ff22f29e46823714cb7bbbde841 Mon Sep 17 00:00:00 2001
2 From: Youmin Ha <youmin.ha@samsung.com>
3 Date: Wed, 15 Feb 2012 17:42:51 +0900
4 Subject: [PATCH] JQM: Fix jqm build to exclude compressed version build
7 libs/js/jquery-mobile-1.0.1pre/Makefile | 22 ++++++++++++----------
8 1 files changed, 12 insertions(+), 10 deletions(-)
10 diff --git a/libs/js/jquery-mobile-1.0.1pre/Makefile b/libs/js/jquery-mobile-1.0.1pre/Makefile
11 index 23541cd..5db7772 100644
12 --- a/libs/js/jquery-mobile-1.0.1pre/Makefile
13 +++ b/libs/js/jquery-mobile-1.0.1pre/Makefile
14 @@ -82,21 +82,22 @@ THEME = default
15 # When no build target is specified, all gets ran
16 all: init css js zip notify
18 +all-but-min: init js css notify
20 # Build and minify the CSS files
22 # Build the CSS file with the theme included
23 @@cat js/jquery.mobile.intro.js | ${VER} > ${OUTPUT}/${NAME}.css
24 @@cat ${CSSTHEMEFILES} ${CSSFILES} >> ${OUTPUT}/${NAME}.css
25 - # ..... and then minify it
26 - @@echo ${VER_MIN} > ${OUTPUT}/${NAME}.min.css
27 - @@java -jar build/yuicompressor-2.4.6.jar --type css ${OUTPUT}/${NAME}.css >> ${OUTPUT}/${NAME}.min.css
28 + ## ..... and then minify it
29 + #@@echo ${VER_MIN} > ${OUTPUT}/${NAME}.min.css
30 + #@@java -jar build/yuicompressor-2.4.6.jar --type css ${OUTPUT}/${NAME}.css >> ${OUTPUT}/${NAME}.min.css
31 # Build the CSS Structure-only file
32 @@cat js/jquery.mobile.intro.js | ${VER} > ${OUTPUT}/${STRUCTURE}.css
33 @@cat ${CSSFILES} >> ${OUTPUT}/${STRUCTURE}.css
34 - # ..... and then minify it
35 - @@echo ${VER_MIN} > ${OUTPUT}/${STRUCTURE}.min.css
36 - @@java -jar build/yuicompressor-2.4.6.jar --type css ${OUTPUT}/${STRUCTURE}.css >> ${OUTPUT}/${STRUCTURE}.min.css
37 + ## ..... and then minify it
38 + #@@echo ${VER_MIN} > ${OUTPUT}/${STRUCTURE}.min.css
39 + #@@java -jar build/yuicompressor-2.4.6.jar --type css ${OUTPUT}/${STRUCTURE}.css >> ${OUTPUT}/${STRUCTURE}.min.css
40 # ..... and then copy in the images
41 @@cp -R css/themes/${THEME}/images ${OUTPUT}/
42 # Css portion is complete.
43 @@ -136,9 +137,9 @@ js: init
44 # Build the JavaScript file
45 @@cat js/jquery.mobile.intro.js | ${VER} > ${OUTPUT}/${NAME}.js
46 @@cat ${JSFILES} >> ${OUTPUT}/${NAME}.js
47 - # ..... and then minify it
48 - @@echo ${VER_MIN} > ${OUTPUT}/${NAME}.min.js
49 - @@java -jar build/google-compiler-20111003.jar --js ${OUTPUT}/${NAME}.js --warning_level QUIET >> ${OUTPUT}/${NAME}.min.js
50 + ## ..... and then minify it
51 + #@@echo ${VER_MIN} > ${OUTPUT}/${NAME}.min.js
52 + #@@java -jar build/google-compiler-20111003.jar --js ${OUTPUT}/${NAME}.js --warning_level QUIET >> ${OUTPUT}/${NAME}.min.js
53 # -------------------------------------------------
56 @@ -208,4 +209,5 @@ deploy: init js css docs zip
58 # -------------------------------------------------
62 + @@rm -rf ${CURDIR}/compiled