Merge lp:~mpontillo/maas/create-idea-project into lp:~maas-committers/maas/trunk

Proposed by Mike Pontillo
Status: Merged
Approved by: Mike Pontillo
Approved revision: no longer in the source branch.
Merged at revision: 6065
Proposed branch: lp:~mpontillo/maas/create-idea-project
Merge into: lp:~maas-committers/maas/trunk
Diff against target: 35 lines (+8/-1)
1 file modified
Makefile (+8/-1)
To merge this branch: bzr merge lp:~mpontillo/maas/create-idea-project
Reviewer Review Type Date Requested Status
Blake Rouse (community) Approve
Review via email: mp+324696@code.launchpad.net

Commit message

Make .idea directory creation consistent with .run directory.

Previously, there was a .idea directory checked into source control. However, the .idea directory is in the .bzrignore (and .gitignore) files. So it doesn't work quite right, because if you are actually using a code editor that supports IDEA project files (such as PyCharm), every time you open the project, those files will be updated, and the fact that .idea is ignored doesn't matter; those changes will still be present in your `bzr status`, and they're very easy to accidentally commit.

The solution is to make the .idea directory consistent with other skeleton runtime directories in MAAS (namely the ".run" directory).

This means developers wishing to use the IDEA project files will need to `make pycharm` (or `make .idea`) before launching an IDEA-based code editor.

To post a comment you must log in.
Revision history for this message
Blake Rouse (blake-rouse) wrote :

I don't use pycharm, but looks like a simple change to ease your development process.

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 2017-05-24 13:16:24 +0000
3+++ Makefile 2017-05-26 20:01:14 +0000
4@@ -66,7 +66,8 @@
5 bin/test.e2e \
6 bin/test.parallel \
7 bin/py bin/ipy \
8- $(js_enums)
9+ $(js_enums) \
10+ pycharm
11
12 all: build doc
13
14@@ -382,6 +383,11 @@
15 .run .run-e2e: run-skel
16 @cp --archive --verbose $^ $@
17
18+.idea: contrib/pycharm
19+ @cp --archive --verbose $^ $@
20+
21+pycharm: .idea
22+
23 enums: $(js_enums)
24
25 $(js_enums): bin/py src/maasserver/utils/jsenums.py $(py_enums)
26@@ -422,6 +428,7 @@
27 $(RM) -r *.egg *.egg-info src/*.egg-info
28 $(RM) -r services/*/supervise
29 $(RM) -r .run .run-e2e
30+ $(RM) -r .idea
31 $(RM) xunit.*.xml
32 $(RM) .failed
33
34
35=== renamed directory '.idea' => 'contrib/pycharm'