From 0d283cb4ec02fb73a4f56fa0b1721c993c94e9e1 Mon Sep 17 00:00:00 2001 From: "Eddie Monge Jr." Date: Tue, 15 Nov 2011 09:04:16 -0800 Subject: [PATCH] combine the css structure min and license files --- Makefile | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 7c78838d..a3a4fc3c 100644 --- a/Makefile +++ b/Makefile @@ -95,7 +95,7 @@ css: init @@cat js/jquery.mobile.intro.js | ${VER} > ${OUTPUT}/${STRUCTURE}.css @@cat ${CSSFILES} >> ${OUTPUT}/${STRUCTURE}.css # ..... and then minify it - @@echo ${VER_MIN} > ${OUTPUT}/${NAME}.structure.min.css + @@echo ${VER_MIN} > ${OUTPUT}/${STRUCTURE}.min.css @@java -jar build/yuicompressor-2.4.6.jar --type css ${OUTPUT}/${STRUCTURE}.css >> ${OUTPUT}/${STRUCTURE}.min.css # ..... and then copy in the images @@cp -R css/themes/${THEME}/images ${OUTPUT}/ @@ -151,8 +151,10 @@ notify: init # Zip up the jQm files without docs zip: init css js # Packaging up the files into a zip archive - @@zip -rq ${NAME}.tmp.zip ${OUTPUT} - @@mv ${NAME}.tmp.zip ${OUTPUT}/${NAME}.zip + @@mkdir tmp + @@cp -r ${OUTPUT} tmp/${NAME} + @@zip -rq ${OUTPUT}/${NAME}.zip tmp/${NAME}/ + @@rm -rf tmp # ------------------------------------------------- @@ -201,3 +203,4 @@ deploy: init js css docs zip @@rm -rf ${OUTPUT} # ------------------------------------------------- +