Launchpad itself

Merge lp:~gary/launchpad/py25makeclean into lp:launchpad

  1. py25makeclean
  2. Merge into devel
Proposed by Gary Poster
Status: Merged
Approved by: Tim Penhey
Approved revision: not available
Merged at revision: not available
Proposed branch: lp:~gary/launchpad/py25makeclean
Merge into: lp:launchpad
Diff against target: 37 lines (+13/-2)
1 file modified
Makefile (+13/-2)
To merge this branch: bzr merge lp:~gary/launchpad/py25makeclean
Reviewer Review Type Date Requested Status
Māris Fogels (community) Approve
Tim Penhey (community) Approve
Review via email: mp+14916@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Gary Poster (gary) wrote :

This is a simple Makefile change to try to make the migration to Python 2.5 smoother. Most of it is an excerpt from https://code.edge.launchpad.net/~mars/launchpad/yui-3final-upgrade/+merge/14838 . The other change is an expedient fix for bug 483782 that should be removed within the week.

Revision history for this message
Tim Penhey (thumper) wrote :

Looks good.

review: Approve
Revision history for this message
Māris Fogels (mars) wrote :

Looks good to me. As a note, those two Makefile variables will have to be applied to the jsbuild and jsbuild_lazr targets, but I can do that in my branch.

Maris

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'Makefile'
2--- Makefile 2009-10-29 05:10:38 +0000
3+++ Makefile 2009-11-16 19:55:22 +0000
4@@ -17,6 +17,9 @@
5
6 LPCONFIG=development
7
8+LP_BUILT_JS_ROOT=lib/canonical/launchpad/icing/build
9+LAZR_BUILT_JS_ROOT=lazr-js/build
10+
11 MINS_TO_SHUTDOWN=15
12
13 CODEHOSTING_ROOT=/var/tmp/bazaar.launchpad.dev
14@@ -259,8 +262,16 @@
15 @echo Rebuilding FTI indexes on launchpad_dev database
16 $(PY) database/schema/fti.py -d launchpad_dev --force
17
18-clean:
19+clean_js:
20+ $(RM) $(LP_BUILT_JS_ROOT)/launchpad.js
21+ $(RM) -r $(LAZR_BUILT_JS_ROOT)
22+
23+clean: clean_js
24 $(MAKE) -C sourcecode/pygettextpo clean
25+ # XXX gary 2009-11-16 bug 483782
26+ # The pygettextpo Makefile should have this next line in it for its make
27+ # clean, and then we should remove this line.
28+ $(RM) sourcecode/pygpgme/gpgme/*.so
29 if test -f sourcecode/mailman/Makefile; then \
30 $(MAKE) -C sourcecode/mailman clean; \
31 fi
32@@ -357,4 +368,4 @@
33 check check_loggerhead_on_merge check_merge check_sourcecode_merge \
34 schema default launchpad.pot check_merge_ui pull scan sync_branches\
35 reload-apache hosted_branches check_db_merge check_mailman check_config\
36- jsbuild
37+ jsbuild clean_js