Merge lp:~rockstar/launchpad/makefile-hackery into lp:launchpad

[Paul Hummer]

[Paul Hummer (rockstar)]

Hi Edwin-

  This branch fixes two bugs. The first makes it so that the combined css file
isn't generated if it doesn't need to be changed. The second creates a
run_codehosting make target so that we don't need to have mailman and all the
superfluous services when all we want is codehosting.

Cheers,
Paul

[Edwin Grubbs (edwin-grubbs)]

Looks good.

merge-approved

review: Approve

=== modified file 'Makefile'
--- Makefile	2010-02-09 03:57:08 +0000
+++ Makefile	2010-02-17 22:01:25 +0000
@@ -215,6 +215,11 @@
 stop_codebrowse:
 	$(PY) sourcecode/launchpad-loggerhead/stop-loggerhead.py
 
+run_codehosting: inplace stop hosted_branches
+	$(RM) thread*.request
+	bin/run -r librarian,sftp,codebrowse -i $(LPCONFIG)
+
+
 start_librarian: build
 	bin/start_librarian
 

=== modified file 'buildout-templates/bin/combine-css.in'
--- buildout-templates/bin/combine-css.in	2010-02-10 06:02:33 +0000
+++ buildout-templates/bin/combine-css.in	2010-02-17 22:01:25 +0000
@@ -2,11 +2,13 @@
 
 import os
 
+from lazr.js.build import ComboFile
 from lazr.js.combo import combine_files
 
 
 root = '${buildout:directory}'
 icing = os.path.join(root, 'lib/canonical/launchpad/icing')
+target = os.path.join(icing, 'combo.css')
 # It'd probably be nice to have this script find all the CSS files we might
 # need and combine them together, but if we do that we'd certainly end up
 # including lots of styles that we don't need/want, so keeping this hard-coded
@@ -27,10 +29,17 @@
     # This one goes at the end because it's our main stylesheet and should
     # take precedence over the others.
     'build/style-3-0.css']
-result = ''
-for content in combine_files(names, icing):
-    result += content
-
-f = open(os.path.join(icing, 'combo.css'), 'w')
-f.write(result)
-f.close()
+
+absolute_names = []
+for name in names:
+    absolute_names.append(os.path.join(icing, name))
+
+combo = ComboFile(absolute_names, target)
+if combo.needs_update():
+    result = ''
+    for content in combine_files(names, icing):
+        result += content
+
+    f = open(target, 'w')
+    f.write(result)
+    f.close()