Permalink
Browse files

Add images to the docs, fix cp syntax, rearrange build dependencies t…

…o be consistent
  • Loading branch information...
1 parent 574cafa commit 5acc18a21547d8e26b31e186481591dd784952f4 @eddiemonge eddiemonge committed Nov 19, 2011
Showing with 9 additions and 7 deletions.
  1. +9 −7 Makefile
View
@@ -109,7 +109,7 @@ css: init
docs: init css js
# Create the Demos/Docs/Tests/Tools
@@mkdir -p tmp/${NAME}
- @@cp -r index.html docs experiments external js/jquery.js tests tmp/${NAME}/
+ @@cp -R index.html docs experiments external js/jquery.js tests css/themes/${THEME}/images tmp/${NAME}/
@@cp ${OUTPUT}/${NAME}.min.css ${OUTPUT}/${NAME}.min.js tmp/${NAME}/
# ... Update the JavaScript and CSS paths
@@find tmp/${NAME} -type f \
@@ -152,10 +152,12 @@ notify: init
# Zip up the jQm files without docs
-zip: init css js
+zip: init css js
# Packaging up the files into a zip archive
@@mkdir tmp
- @@cp -r ${OUTPUT} tmp/${NAME}
+ @@cp -R ${OUTPUT} tmp/${NAME}
+ # ... And remove the Zipped docs so they aren't included twice (for deploy scripts)
+ @@rm -rf tmp/${NAME}/${NAME}.docs.zip
@@cd tmp; zip -rq ../${OUTPUT}/${NAME}.zip ${NAME}
@@rm -rf tmp
# -------------------------------------------------
@@ -172,15 +174,15 @@ zip: init css js
# -------------------------------------------------
# Push the latest git version to the CDN. This is done on a post commit hook
-latest: init js css zip
+latest: init css js zip
# Time to put these on the CDN
@@scp -qr ${OUTPUT}/* jqadmin@code.origin.jquery.com:/var/www/html/code.jquery.com/mobile/latest/
# Do some cleanup to wrap it up
@@rm -rf ${OUTPUT}
# -------------------------------------------------
# Build the nightly backups. This is done on a server cronjob
-nightlies: init js css zip docs
+nightlies: init css js docs zip
# Time to put these on the CDN
@@mkdir -p tmp/nightlies
@@mv ${OUTPUT} tmp/nightlies/$$(date "+%Y%m%d")
@@ -191,10 +193,10 @@ nightlies: init js css zip docs
# Deploy a finished release. This is manually done.
-deploy: init js css docs zip
+deploy: init css js docs zip
# Deploying all the files to the CDN
@@mkdir tmp
- @@cp -r ${OUTPUT} tmp/${VER_OFFICIAL}
+ @@cp -R ${OUTPUT} tmp/${VER_OFFICIAL}
@@scp -qr tmp/* jqadmin@code.origin.jquery.com:/var/www/html/code.jquery.com/mobile/
@@rm -rf tmp/${VER_OFFICIAL}
@@mv ${OUTPUT}/demos tmp/${VER_OFFICIAL}

0 comments on commit 5acc18a

Please sign in to comment.