Reviewers: mp+133063_code.launchpad.net, Message: Please take a look.
Description: Fix Makefile error wrt spritegen If app/assets/sprite exists then regenerating sprites failed since the logic assumed the directory would not be there. Remove the directory before copying the contents of the newly generated sprite data. https://code.launchpad.net/~bac/juju-gui/spritegen-trivial/+merge/133063 (do not edit description out of merge proposal) Please review this at https://codereview.appspot.com/6814092/ Affected files: M Makefile A [revision details] Index: Makefile === modified file 'Makefile' --- Makefile 2012-10-31 10:57:16 +0000 +++ Makefile 2012-11-06 13:16:34 +0000 @@ -28,7 +28,8 @@ $(SPRITE_GENERATED_FILES): node_modules/grunt node_modules/node-spritesheet $(SPRITE_SOURCE_FILES) @node_modules/grunt/bin/grunt spritegen - @mv bin/sprite app/assets/sprite/ + @rm -Rf app/assets/sprite/ + @mv bin/sprite app/assets $(NODE_TARGETS): package.json @npm install Index: [revision details] === added file '[revision details]' --- [revision details] 2012-01-01 00:00:00 +0000 +++ [revision details] 2012-01-01 00:00:00 +0000 @@ -0,0 +1,2 @@ +Old revision: [email protected] +New revision: [email protected] -- https://code.launchpad.net/~bac/juju-gui/spritegen-trivial/+merge/133063 Your team Juju GUI Hackers is requested to review the proposed merge of lp:~bac/juju-gui/spritegen-trivial into lp:juju-gui. -- Mailing list: https://launchpad.net/~yellow Post to : [email protected] Unsubscribe : https://launchpad.net/~yellow More help : https://help.launchpad.net/ListHelp
