Merge lp:~wallyworld/launchpad/fix-convoy-make into lp:launchpad

[Ian Booth]

Tweak makefile so that the combo loader build steps are a different make target.

The combo loader make steps failed on production systems due to use of /var/tmp/convoy as the CONVOY_ROOT.

For now, pull out the combo loader make steps to separate make targets to allow the make to run on prod.

This branch retains the use of the local build/js/yui directory to which lib/canonical/launchpad/icing/yui is linked.

Tested locally by doing a make clean run

[William Grant (wgrant)]

review: Approve (code)

=== modified file 'Makefile'
--- Makefile	2012-01-22 23:12:51 +0000
+++ Makefile	2012-01-26 00:27:27 +0000
@@ -186,12 +186,15 @@
 	awk 'FNR == 1 {print "/* " FILENAME " */"} {print}' $^ > $@
 endif
 
-jsbuild: $(PY) $(JS_OUT)
+combobuild: jsbuild
 	mkdir -p $(CONVOY_ROOT)
 	bin/combo-rootdir $(CONVOY_ROOT)
 	rm -f $(ICING)/yui
 	ln -sf $(CONVOY_ROOT)/yui $(ICING)/yui
 
+jsbuild: $(PY) $(JS_OUT)
+	ln -sf ../../../../build/js/yui/yui-3.3.0 $(ICING)/yui
+
 eggs:
 	# Usually this is linked via link-external-sourcecode, but in
 	# deployment we create this ourselves.
@@ -357,10 +360,12 @@
 	@echo Rebuilding FTI indexes on launchpad_dev database
 	$(PY) database/schema/fti.py -d launchpad_dev --force
 
+clean_combo: clean_js
+	$(RM) -r $(CONVOY_ROOT)
+
 clean_js:
 	$(RM) $(JS_OUT)
 	$(RM) -r $(ICING)/yui
-	$(RM) -r $(CONVOY_ROOT)
 
 clean_buildout:
 	$(RM) -r bin