Skip to content
This repository
Browse code

Merge pull request #3112 from eddiemonge/make_file

Add images to the docs, fix cp syntax, rearrange build dependencies to ...
  • Loading branch information...
commit e918442bbbebce9cedfc9a5ce3b15f37c62bdb4f 2 parents 574cafa + 5acc18a
Todd Parker toddparker authored

Showing 1 changed file with 9 additions and 7 deletions. Show diff stats Hide diff stats

  1. +9 7 Makefile
16 Makefile
@@ -109,7 +109,7 @@ css: init
109 109 docs: init css js
110 110 # Create the Demos/Docs/Tests/Tools
111 111 @@mkdir -p tmp/${NAME}
112   - @@cp -r index.html docs experiments external js/jquery.js tests tmp/${NAME}/
  112 + @@cp -R index.html docs experiments external js/jquery.js tests css/themes/${THEME}/images tmp/${NAME}/
113 113 @@cp ${OUTPUT}/${NAME}.min.css ${OUTPUT}/${NAME}.min.js tmp/${NAME}/
114 114 # ... Update the JavaScript and CSS paths
115 115 @@find tmp/${NAME} -type f \
@@ -152,10 +152,12 @@ notify: init
152 152
153 153
154 154 # Zip up the jQm files without docs
155   -zip: init css js
  155 +zip: init css js
156 156 # Packaging up the files into a zip archive
157 157 @@mkdir tmp
158   - @@cp -r ${OUTPUT} tmp/${NAME}
  158 + @@cp -R ${OUTPUT} tmp/${NAME}
  159 + # ... And remove the Zipped docs so they aren't included twice (for deploy scripts)
  160 + @@rm -rf tmp/${NAME}/${NAME}.docs.zip
159 161 @@cd tmp; zip -rq ../${OUTPUT}/${NAME}.zip ${NAME}
160 162 @@rm -rf tmp
161 163 # -------------------------------------------------
@@ -172,7 +174,7 @@ zip: init css js
172 174 # -------------------------------------------------
173 175
174 176 # Push the latest git version to the CDN. This is done on a post commit hook
175   -latest: init js css zip
  177 +latest: init css js zip
176 178 # Time to put these on the CDN
177 179 @@scp -qr ${OUTPUT}/* jqadmin@code.origin.jquery.com:/var/www/html/code.jquery.com/mobile/latest/
178 180 # Do some cleanup to wrap it up
@@ -180,7 +182,7 @@ latest: init js css zip
180 182 # -------------------------------------------------
181 183
182 184 # Build the nightly backups. This is done on a server cronjob
183   -nightlies: init js css zip docs
  185 +nightlies: init css js docs zip
184 186 # Time to put these on the CDN
185 187 @@mkdir -p tmp/nightlies
186 188 @@mv ${OUTPUT} tmp/nightlies/$$(date "+%Y%m%d")
@@ -191,10 +193,10 @@ nightlies: init js css zip docs
191 193
192 194
193 195 # Deploy a finished release. This is manually done.
194   -deploy: init js css docs zip
  196 +deploy: init css js docs zip
195 197 # Deploying all the files to the CDN
196 198 @@mkdir tmp
197   - @@cp -r ${OUTPUT} tmp/${VER_OFFICIAL}
  199 + @@cp -R ${OUTPUT} tmp/${VER_OFFICIAL}
198 200 @@scp -qr tmp/* jqadmin@code.origin.jquery.com:/var/www/html/code.jquery.com/mobile/
199 201 @@rm -rf tmp/${VER_OFFICIAL}
200 202 @@mv ${OUTPUT}/demos tmp/${VER_OFFICIAL}

0 comments on commit e918442

Please sign in to comment.
Something went wrong with that request. Please try again.