launchpad-reviewers team mailing list archive

[Colin Watson <cjwatson@xxxxxxxxxxxxx>]

Colin Watson has proposed merging lp:~cjwatson/launchpad/tidy-makefile into lp:launchpad.

Commit message:
Tidy up various minor problems in the top-level Makefile.

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)
Related bugs:
  Bug #483782 in Launchpad itself: "The Makefile in our sourcecode's copy of pygpgme should clean *.so from gpgme"
  https://bugs.launchpad.net/launchpad/+bug/483782

For more details, see:
https://code.launchpad.net/~cjwatson/launchpad/tidy-makefile/+merge/335614
-- 
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~cjwatson/launchpad/tidy-makefile into lp:launchpad.

=== modified file 'Makefile'
--- Makefile	2018-01-01 20:24:26 +0000
+++ Makefile	2018-01-02 04:49:50 +0000
@@ -205,8 +205,7 @@
 	ln -sfn ../../yarn/node_modules/yui $@
 
 $(LP_JS_BUILD): | $(JS_BUILD_DIR)
-	-mkdir $@
-	-mkdir $@/services
+	mkdir -p $@/services
 	for jsdir in lib/lp/*/javascript lib/lp/services/*/javascript; do \
 		app=$$(echo $$jsdir | sed -e 's,lib/lp/\(.*\)/javascript,\1,'); \
 		cp -a $$jsdir $@/$$app; \
@@ -398,16 +397,13 @@
 	# it does everything expected from a clean target.  When the
 	# referenced bug is fixed, this target may be reunited with
 	# the 'clean' target.
-	$(MAKE) -C sourcecode/pygettextpo clean
-	# XXX gary 2009-11-16 bug 483782
-	# The pygettextpo Makefile should have this next line in it for its make
-	# clean, and then we should remove this line.
-	$(RM) sourcecode/pygpgme/gpgme/*.so
+	if test -f sourcecode/pygettextpo/Makefile; then \
+		$(MAKE) -C sourcecode/pygettextpo clean; \
+	fi
 	if test -f sourcecode/mailman/Makefile; then \
 		$(MAKE) -C sourcecode/mailman clean; \
 	fi
 	$(RM) -r env
-	$(RM) -r lib/subvertpy/*.so
 	$(RM) -r $(LP_BUILT_JS_ROOT)/*
 	$(RM) -r $(CODEHOSTING_ROOT)/*
 	$(RM) -r $(APIDOC_DIR)
@@ -472,6 +468,7 @@
 		-e 's,%LISTEN_ADDRESS%,$(LISTEN_ADDRESS),' \
 		configs/development/local-launchpad-apache > \
 		/etc/apache2/sites-available/$$base
+	mkdir -p $(CODEHOSTING_ROOT)
 	touch $(CODEHOSTING_ROOT)/rewrite.log
 	chown -R $(SUDO_UID):$(SUDO_GID) $(CODEHOSTING_ROOT)
 	if [ ! -d /srv/launchpad.dev ]; then \