Permalink
Browse files

remove all zip files before compressing, add build latest and deploy …

…latest bash scripts
  • Loading branch information...
johnbender committed Apr 27, 2012
1 parent 3d165c0 commit b18397276c5ee8050c7d3905de0c3f20a193151b
Showing with 22 additions and 15 deletions.
  1. +3 −12 Makefile
  2. +4 −0 build/bin/build_latest.sh
  3. +4 −0 build/bin/config.sh
  4. +4 −0 build/bin/deploy_latest.sh
  5. +3 −1 build/bin/docs.sh
  6. +4 −2 build/bin/zip.sh
View
@@ -51,31 +51,24 @@ docs: init js css
# Output a message saying the process is complete
notify: init
@@echo "The files have been built and are in: " $$(pwd)/${OUTPUT}
- # -------------------------------------------------
# Zip up the jQm files without docs
-zip: clean init css js
+zip: init css js
@@bash build/bin/zip.sh
-# -------------------------------------------------
-# -------------------------------------------------
# -------------------------------------------------
#
# For jQuery Team Use Only
#
# -------------------------------------------------
# NOTE the clean (which removes previous build output) has been removed to prevent a gap in service
build_latest: css docs js zip
- # ... Copy over the lib js, avoid the compiled stuff, to get the defines for tests/unit/*
- @@ # TODO centralize list of built files
- @@find js -name "*.js" -not -name "*.docs.js" -not -name "*.mobile.js" | xargs -L1 -I FILENAME cp FILENAME ${OUTPUT}/demos/js/
+ @@bash build/bin/build_latest.sh
# Push the latest git version to the CDN. This is done on a post commit hook
deploy_latest:
- # Time to put these on the CDN
- @@scp -qr ${OUTPUT}/* jqadmin@code.origin.jquery.com:/var/www/html/code.jquery.com/mobile/latest/
- # -------------------------------------------------
+ @@bash build/bin/deploy_latest.sh
# TODO target name preserved to avoid issues during refactor, latest -> deploy_latest
latest: build_latest deploy_latest
@@ -84,7 +77,6 @@ latest: build_latest deploy_latest
deploy_nightlies:
# Time to put these on the CDN
@@scp -qr ${OUTPUT} jqadmin@code.origin.jquery.com:/var/www/html/code.jquery.com/mobile/nightlies/$$(date "+%Y%m%d")
- # -------------------------------------------------
# Deploy a finished release. This is manually done.
deploy: clean init css js docs zip
@@ -106,4 +98,3 @@ deploy: clean init css js docs zip
# Do some cleanup to wrap it up
@@rm -rf tmp
@@rm -rf ${OUTPUT}
- # -------------------------------------------------
@@ -0,0 +1,4 @@
+source build/bin/config.sh
+
+# Copy over the lib js, avoid the compiled stuff, to get the defines for tests/unit/*
+find js -name "*.js" -not -name "*.docs.js" -not -name "*.mobile.js" | xargs -L1 -I FILENAME cp FILENAME $OUTPUT/demos/js/
View
@@ -18,6 +18,10 @@ function ver {
sed "s/v@VERSION/$BUILD_SHA/"
}
+function clear_zip_files {
+ find $1 -name "*.zip" | xargs -L1 -I FILENAME rm FILENAME
+}
+
# The output folder for the finished files
OUTPUT="compiled"
@@ -0,0 +1,4 @@
+source build/bin/config.sh
+
+# Push the latest git version to the CDN. This is done on a post commit hook
+scp -qr $OUTPUT/* jqadmin@code.origin.jquery.com:/var/www/html/code.jquery.com/mobile/latest/
View
@@ -16,8 +16,10 @@ cp -r compiled/images tmp/demos/css/themes/$THEME
find tmp/demos -name "*.html" -exec sed -i$SED_INPLACE_EXT -e 's@js/"@js/jquery.mobile.js"@' {} \;
find tmp/demos -name "*$SED_INPLACE_EXT" -exec rm {} \;
+# clear out old zip files
+clear_zip_files $OUTPUT
+
# ... Move and zip up the the whole folder
-rm -f $OUTPUT/$NAME.docs.zip
cd tmp/demos && mkdir -p $OUTPUT && zip -qr $OUTPUT/$BASE_NAME.docs.zip ./* && cd -
rm -rf $OUTPUT/demos && mv -f tmp/demos $OUTPUT
# Finish by removing the temporary files
View
@@ -3,8 +3,10 @@ source build/bin/config.sh
# Packaging up the files into a zip archive
mkdir -p tmp
cp -R $OUTPUT tmp/$NAME
+
# ... And remove the Zipped docs so they aren't included twice (for deploy scripts)
-rm -rf tmp/$NAME/$NAME/*.zip
+# clear out old zip files
+clear_zip_files tmp/$NAME
+
cd tmp; zip -rq ../$OUTPUT/$NAME.zip $NAME
rm -rf tmp
-# -------------------------------------------------

0 comments on commit b183972

Please sign in to comment.