Launchpad itself

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

  1. tidy-makefile
  2. Merge into devel
Proposed by Colin Watson
Status: Merged
Merged at revision: 18544
Proposed branch: lp:~cjwatson/launchpad/tidy-makefile
Merge into: lp:launchpad
Diff against target: 70 lines (+11/-11)
1 file modified
Makefile (+11/-11)
To merge this branch: bzr merge lp:~cjwatson/launchpad/tidy-makefile
Reviewer Review Type Date Requested Status
William Grant code Approve
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.
Revision history for this message
William Grant (wgrant) :
review: Approve (code)
Revision history for this message
Colin Watson (cjwatson) :

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'Makefile'
--- Makefile 2018-01-01 20:24:26 +0000
+++ Makefile 2018-02-01 20:58:36 +0000
@@ -141,12 +141,18 @@
141 mkdir logs141 mkdir logs
142142
143codehosting-dir:143codehosting-dir:
144 mkdir -p $(CODEHOSTING_ROOT)
144 mkdir -p $(CODEHOSTING_ROOT)/mirrors145 mkdir -p $(CODEHOSTING_ROOT)/mirrors
145 mkdir -p $(CODEHOSTING_ROOT)/config146 mkdir -p $(CODEHOSTING_ROOT)/config
146 mkdir -p /var/tmp/bzrsync147 mkdir -p /var/tmp/bzrsync
147 touch $(CODEHOSTING_ROOT)/rewrite.log148 touch $(CODEHOSTING_ROOT)/rewrite.log
148 chmod 777 $(CODEHOSTING_ROOT)/rewrite.log149 chmod 777 $(CODEHOSTING_ROOT)/rewrite.log
149 touch $(CODEHOSTING_ROOT)/config/launchpad-lookup.txt150 touch $(CODEHOSTING_ROOT)/config/launchpad-lookup.txt
151ifneq ($(SUDO_UID),)
152 if [ "$$(id -u)" = 0 ]; then \
153 chown -R $(SUDO_UID):$(SUDO_GID) $(CODEHOSTING_ROOT); \
154 fi
155endif
150156
151inplace: build logs clean_logs codehosting-dir157inplace: build logs clean_logs codehosting-dir
152 if [ -d /srv/launchpad.dev ]; then \158 if [ -d /srv/launchpad.dev ]; then \
@@ -205,8 +211,7 @@
205 ln -sfn ../../yarn/node_modules/yui $@211 ln -sfn ../../yarn/node_modules/yui $@
206212
207$(LP_JS_BUILD): | $(JS_BUILD_DIR)213$(LP_JS_BUILD): | $(JS_BUILD_DIR)
208 -mkdir $@214 mkdir -p $@/services
209 -mkdir $@/services
210 for jsdir in lib/lp/*/javascript lib/lp/services/*/javascript; do \215 for jsdir in lib/lp/*/javascript lib/lp/services/*/javascript; do \
211 app=$$(echo $$jsdir | sed -e 's,lib/lp/\(.*\)/javascript,\1,'); \216 app=$$(echo $$jsdir | sed -e 's,lib/lp/\(.*\)/javascript,\1,'); \
212 cp -a $$jsdir $@/$$app; \217 cp -a $$jsdir $@/$$app; \
@@ -398,16 +403,13 @@
398 # it does everything expected from a clean target. When the403 # it does everything expected from a clean target. When the
399 # referenced bug is fixed, this target may be reunited with404 # referenced bug is fixed, this target may be reunited with
400 # the 'clean' target.405 # the 'clean' target.
401 $(MAKE) -C sourcecode/pygettextpo clean406 if test -f sourcecode/pygettextpo/Makefile; then \
402 # XXX gary 2009-11-16 bug 483782407 $(MAKE) -C sourcecode/pygettextpo clean; \
403 # The pygettextpo Makefile should have this next line in it for its make408 fi
404 # clean, and then we should remove this line.
405 $(RM) sourcecode/pygpgme/gpgme/*.so
406 if test -f sourcecode/mailman/Makefile; then \409 if test -f sourcecode/mailman/Makefile; then \
407 $(MAKE) -C sourcecode/mailman clean; \410 $(MAKE) -C sourcecode/mailman clean; \
408 fi411 fi
409 $(RM) -r env412 $(RM) -r env
410 $(RM) -r lib/subvertpy/*.so
411 $(RM) -r $(LP_BUILT_JS_ROOT)/*413 $(RM) -r $(LP_BUILT_JS_ROOT)/*
412 $(RM) -r $(CODEHOSTING_ROOT)/*414 $(RM) -r $(CODEHOSTING_ROOT)/*
413 $(RM) -r $(APIDOC_DIR)415 $(RM) -r $(APIDOC_DIR)
@@ -458,7 +460,7 @@
458 cp configs/development/launchpad.crt /etc/apache2/ssl/460 cp configs/development/launchpad.crt /etc/apache2/ssl/
459 cp configs/development/launchpad.key /etc/apache2/ssl/461 cp configs/development/launchpad.key /etc/apache2/ssl/
460462
461copy-apache-config:463copy-apache-config: codehosting-dir
462 # We insert the absolute path to the branch-rewrite script464 # We insert the absolute path to the branch-rewrite script
463 # into the Apache config as we copy the file into position.465 # into the Apache config as we copy the file into position.
464 set -e; \466 set -e; \
@@ -472,8 +474,6 @@
472 -e 's,%LISTEN_ADDRESS%,$(LISTEN_ADDRESS),' \474 -e 's,%LISTEN_ADDRESS%,$(LISTEN_ADDRESS),' \
473 configs/development/local-launchpad-apache > \475 configs/development/local-launchpad-apache > \
474 /etc/apache2/sites-available/$$base476 /etc/apache2/sites-available/$$base
475 touch $(CODEHOSTING_ROOT)/rewrite.log
476 chown -R $(SUDO_UID):$(SUDO_GID) $(CODEHOSTING_ROOT)
477 if [ ! -d /srv/launchpad.dev ]; then \477 if [ ! -d /srv/launchpad.dev ]; then \
478 mkdir /srv/launchpad.dev; \478 mkdir /srv/launchpad.dev; \
479 chown $(SUDO_UID):$(SUDO_GID) /srv/launchpad.dev; \479 chown $(SUDO_UID):$(SUDO_GID) /srv/launchpad.dev; \