launchpad-reviewers team mailing list archive

[Brad Crittenden <bac@xxxxxxxxxxxxx>]

Brad Crittenden has proposed merging lp:~bac/launchpad/restore-sprites into lp:launchpad.

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~bac/launchpad/restore-sprites/+merge/55619

The icon-sprites file is generated and was thus removed from the tree by
Huw in a branch that landed earlier today.  Unfortunately there were no
makefile rules to actually automatically build the file.

This branch creates the rules to make icon-sprites only when necessary.
-- 
https://code.launchpad.net/~bac/launchpad/restore-sprites/+merge/55619
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~bac/launchpad/restore-sprites into lp:launchpad.

=== modified file '.bzrignore'
--- .bzrignore	2011-02-18 16:15:01 +0000
+++ .bzrignore	2011-03-30 19:55:41 +0000
@@ -79,3 +79,4 @@
 doc/_build
 .idea
 run.gdb
+lib/canonical/launchpad/icing/icon-sprites

=== modified file 'Makefile'
--- Makefile	2011-03-18 22:47:24 +0000
+++ Makefile	2011-03-30 19:55:41 +0000
@@ -149,7 +149,7 @@
 	chmod 777 $(CODEHOSTING_ROOT)/rewrite.log
 	touch $(CODEHOSTING_ROOT)/config/launchpad-lookup.txt
 
-build: compile apidoc jsbuild css_combine
+build: compile apidoc jsbuild css_combine sprite_image
 
 css_combine: sprite_css bin/combine-css
 	${SHHH} bin/combine-css
@@ -159,7 +159,9 @@
 ${LP_BUILT_JS_ROOT}/sprite.css: bin/sprite-util ${ICING}/sprite.css.in ${ICING}/icon-sprites.positioning
 	${SHHH} bin/sprite-util create-css
 
-sprite_image:
+sprite_image: ${ICING}/icon-sprites
+
+${ICING}/icon-sprites: bin/sprite-util ${ICING}/icon-sprites.positioning
 	${SHHH} bin/sprite-util create-image
 
 # We absolutely do not want to include the lazr.testing module and