Merge lp:~fgallina/rnr-server/bootstrap-fixes into lp:rnr-server

Proposed by Fabián Ezequiel Gallina
Status: Merged
Approved by: Fabián Ezequiel Gallina
Approved revision: 260
Merged at revision: 260
Proposed branch: lp:~fgallina/rnr-server/bootstrap-fixes
Merge into: lp:rnr-server
Diff against target: 29 lines (+11/-2)
1 file modified
Makefile (+11/-2)
To merge this branch: bzr merge lp:~fgallina/rnr-server/bootstrap-fixes
Reviewer Review Type Date Requested Status
Martin Albisetti (community) Approve
Review via email: mp+229685@code.launchpad.net

Commit message

Generate default local_config at bootstrap if needed

To post a comment you must log in.
Revision history for this message
Martin Albisetti (beuno) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'Makefile'
--- Makefile 2014-08-05 16:58:03 +0000
+++ Makefile 2014-08-05 20:09:03 +0000
@@ -13,6 +13,15 @@
13VIRTUALENV_DIR ?= ./virtualenv13VIRTUALENV_DIR ?= ./virtualenv
14VIRTUALENV_ARGS ?= --distribute --clear --system-site-packages14VIRTUALENV_ARGS ?= --distribute --clear --system-site-packages
1515
16LOCAL_CONFIG_DIR = ../local_config
17LOCAL_CONFIG_PATH := ${LOCAL_CONFIG_DIR}/local.cfg
18
19local-config:
20 @if test ! -e $(LOCAL_CONFIG_PATH); then \
21 mkdir -p $(LOCAL_CONFIG_DIR); \
22 echo '[__main__]\nincludes = ${HERE}/django_project/config/devel.cfg' > $(LOCAL_CONFIG_PATH); \
23 echo 'Generated devel local config.'; \
24 fi;
1625
17sanitize-sourcedeps:26sanitize-sourcedeps:
18 sed -e '1,/# Dependencies/d;s/^rnr-server/./g;s/bazaar.isd/bazaar.launchpad.net/g' config-manager.txt > $(CM_TMP_CONFIG)27 sed -e '1,/# Dependencies/d;s/^rnr-server/./g;s/bazaar.isd/bazaar.launchpad.net/g' config-manager.txt > $(CM_TMP_CONFIG)
@@ -32,7 +41,7 @@
32 $(CM) update $(CM_TMP_CONFIG)41 $(CM) update $(CM_TMP_CONFIG)
33 @rm $(CM_TMP_CONFIG)42 @rm $(CM_TMP_CONFIG)
3443
35bootstrap: sourcedeps virtualenv install-virtualenv-requirements44bootstrap: local-config sourcedeps virtualenv install-virtualenv-requirements
3645
37.PHONY: sanitize-sourcedeps clean-virtualenv virtualenv \46.PHONY: local-config sanitize-sourcedeps clean-virtualenv virtualenv \
38 install-virtualenv-requirements sourcedeps bootstrap47 install-virtualenv-requirements sourcedeps bootstrap

Subscribers

People subscribed via source and target branches