diff options
| author | Étienne Loks <etienne.loks@proxience.com> | 2015-06-10 00:39:36 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@proxience.com> | 2015-06-10 00:39:36 +0200 |
| commit | 84e238594b78720478c338fa656909a36374b718 (patch) | |
| tree | 42ad8f4aa1684c5ae922260624496d613a5b9c0a /Makefile.example | |
| parent | 939baeba6a263e3c11932c3e588521825df1cb13 (diff) | |
| parent | 417ec036f3645ec7d9542405b6fa2777663d5aad (diff) | |
| download | Ishtar-84e238594b78720478c338fa656909a36374b718.tar.bz2 Ishtar-84e238594b78720478c338fa656909a36374b718.zip | |
Merge branch 'stable'
Conflicts:
Makefile.example
Diffstat (limited to 'Makefile.example')
| -rw-r--r-- | Makefile.example | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/Makefile.example b/Makefile.example index 55638f9dd..29ba7cb56 100644 --- a/Makefile.example +++ b/Makefile.example @@ -45,6 +45,8 @@ fresh_syncdb: '../ishtar_common/fixtures/initial_data-'$(default_data)'.json' 2> /dev/null cd $(project); $(PYTHON) ./manage.py loaddata \ '../ishtar_common/fixtures/initial_towns-'$(default_data)'.json' 2> /dev/null + cd $(project); $(PYTHON) ./manage.py loaddata \ + '../ishtar_common/fixtures/initial_importtypes-'$(default_data)'.json' 2> /dev/null if [[ '$(apps)' == *archaeological_operations* ]]; then cd $(project); $(PYTHON) ./manage.py loaddata \ '../archaeological_operations/fixtures/initial_data-'$(default_data)'.json' 2> /dev/null; fi if [[ '$(apps)' == *archaeological_files* ]]; then cd $(project); $(PYTHON) ./manage.py loaddata \ @@ -93,11 +95,12 @@ schemamigrations: generate_doc: cd $(project);\ - $(PYTHON) manage.py graph_models --pydot -I "ImporterType,ImporterDefault,ImporterDefaultValues,ImporterColumn,Regexp,ImportTarget,FormaterType,Import" ishtar_common > /tmp/ishtar.dot - dot -Tpng /tmp/ishtar.dot -o docs/source/_static/db-imports.png + $(PYTHON) manage.py graph_models --pydot -I "ImporterType,ImporterDefault,ImporterDefaultValues,ImporterColumn,Regexp,ImportTarget,FormaterType,Import" ishtar_common > /tmp/ishtar.dot ;\ + dot -Tpng /tmp/ishtar.dot -o ../docs/source/_static/db-imports.png + cd $(project);\ for APP in $(apps); do \ - $(PYTHON) manage.py graph_models --pydot $$APP > /tmp/ishtar.dot - dot -Tpng /tmp/ishtar.dot -o docs/source/_static/db-$$APP.png + $(PYTHON) manage.py graph_models --pydot $$APP > /tmp/ishtar.dot; \ + dot -Tpng /tmp/ishtar.dot -o ../docs/source/_static/db-$$APP.png; \ done rm /tmp/ishtar.dot |