Merge lp:~cjwatson/launchpad/tidy-makefile into lp:launchpad

Proposed by Colin Watson on 2018-01-02
Status: Needs review
Proposed branch: lp:~cjwatson/launchpad/tidy-makefile
Merge into: lp:launchpad
Diff against target: 41 lines (+5/-8)
1 file modified
Makefile (+5/-8)
To merge this branch: bzr merge lp:~cjwatson/launchpad/tidy-makefile
Reviewer Review Type Date Requested Status
William Grant code 2018-01-02 Approve on 2018-01-02
Review via email: mp+335614@code.launchpad.net

Commit Message

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

To post a comment you must log in.
William Grant (wgrant) :
review: Approve (code)

Unmerged revisions

18528. By Colin Watson on 2018-01-02

Remove lib/subvertpy cruft from Makefile. We install subvertpy as a normal Python dependency nowadays.

18527. By Colin Watson on 2018-01-02

Ensure that $(CODEHOSTING_ROOT) exists before touching rewrite.log inside it.

18526. By Colin Watson on 2018-01-02

Avoid noisy mkdir failures when building JS.

18525. By Colin Watson on 2018-01-02

Guard sourcecode/pygettextpo clean so that it works even if the tree is unbuilt.

18524. By Colin Watson on 2018-01-02

Remove sourcecode/pygpgme cruft from Makefile. We install pygpgme as a normal Python dependency nowadays.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'Makefile'
2--- Makefile 2018-01-01 20:24:26 +0000
3+++ Makefile 2018-01-02 04:49:50 +0000
4@@ -205,8 +205,7 @@
5 ln -sfn ../../yarn/node_modules/yui $@
6
7 $(LP_JS_BUILD): | $(JS_BUILD_DIR)
8- -mkdir $@
9- -mkdir $@/services
10+ mkdir -p $@/services
11 for jsdir in lib/lp/*/javascript lib/lp/services/*/javascript; do \
12 app=$$(echo $$jsdir | sed -e 's,lib/lp/\(.*\)/javascript,\1,'); \
13 cp -a $$jsdir $@/$$app; \
14@@ -398,16 +397,13 @@
15 # it does everything expected from a clean target. When the
16 # referenced bug is fixed, this target may be reunited with
17 # the 'clean' target.
18- $(MAKE) -C sourcecode/pygettextpo clean
19- # XXX gary 2009-11-16 bug 483782
20- # The pygettextpo Makefile should have this next line in it for its make
21- # clean, and then we should remove this line.
22- $(RM) sourcecode/pygpgme/gpgme/*.so
23+ if test -f sourcecode/pygettextpo/Makefile; then \
24+ $(MAKE) -C sourcecode/pygettextpo clean; \
25+ fi
26 if test -f sourcecode/mailman/Makefile; then \
27 $(MAKE) -C sourcecode/mailman clean; \
28 fi
29 $(RM) -r env
30- $(RM) -r lib/subvertpy/*.so
31 $(RM) -r $(LP_BUILT_JS_ROOT)/*
32 $(RM) -r $(CODEHOSTING_ROOT)/*
33 $(RM) -r $(APIDOC_DIR)
34@@ -472,6 +468,7 @@
35 -e 's,%LISTEN_ADDRESS%,$(LISTEN_ADDRESS),' \
36 configs/development/local-launchpad-apache > \
37 /etc/apache2/sites-available/$$base
38+ mkdir -p $(CODEHOSTING_ROOT)
39 touch $(CODEHOSTING_ROOT)/rewrite.log
40 chown -R $(SUDO_UID):$(SUDO_GID) $(CODEHOSTING_ROOT)
41 if [ ! -d /srv/launchpad.dev ]; then \