Skip to content

Commit e918442

Browse files
committed
Merge pull request jquery-archive#3112 from eddiemonge/make_file
Add images to the docs, fix cp syntax, rearrange build dependencies to ...
2 parents 574cafa + 5acc18a commit e918442

File tree

1 file changed

+9
-7
lines changed

1 file changed

+9
-7
lines changed

Makefile

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ css: init
109109
docs: init css js
110110
# Create the Demos/Docs/Tests/Tools
111111
@@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}/
113113
@@cp ${OUTPUT}/${NAME}.min.css ${OUTPUT}/${NAME}.min.js tmp/${NAME}/
114114
# ... Update the JavaScript and CSS paths
115115
@@find tmp/${NAME} -type f \
@@ -152,10 +152,12 @@ notify: init
152152

153153

154154
# Zip up the jQm files without docs
155-
zip: init css js
155+
zip: init css js
156156
# Packaging up the files into a zip archive
157157
@@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
159161
@@cd tmp; zip -rq ../${OUTPUT}/${NAME}.zip ${NAME}
160162
@@rm -rf tmp
161163
# -------------------------------------------------
@@ -172,15 +174,15 @@ zip: init css js
172174
# -------------------------------------------------
173175

174176
# 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
176178
# Time to put these on the CDN
177179
@@scp -qr ${OUTPUT}/* jqadmin@code.origin.jquery.com:/var/www/html/code.jquery.com/mobile/latest/
178180
# Do some cleanup to wrap it up
179181
@@rm -rf ${OUTPUT}
180182
# -------------------------------------------------
181183

182184
# 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
184186
# Time to put these on the CDN
185187
@@mkdir -p tmp/nightlies
186188
@@mv ${OUTPUT} tmp/nightlies/$$(date "+%Y%m%d")
@@ -191,10 +193,10 @@ nightlies: init js css zip docs
191193

192194

193195
# Deploy a finished release. This is manually done.
194-
deploy: init js css docs zip
196+
deploy: init css js docs zip
195197
# Deploying all the files to the CDN
196198
@@mkdir tmp
197-
@@cp -r ${OUTPUT} tmp/${VER_OFFICIAL}
199+
@@cp -R ${OUTPUT} tmp/${VER_OFFICIAL}
198200
@@scp -qr tmp/* jqadmin@code.origin.jquery.com:/var/www/html/code.jquery.com/mobile/
199201
@@rm -rf tmp/${VER_OFFICIAL}
200202
@@mv ${OUTPUT}/demos tmp/${VER_OFFICIAL}

0 commit comments

Comments
 (0)