From da51c492266db2357ca1a57ac6608c2ee41bcd61 Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Tue, 9 Jun 2015 20:52:54 +0200 Subject: Update Makefile sample with updated fixtures --- Makefile.example | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/Makefile.example b/Makefile.example index c18917319..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,13 +95,18 @@ 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; \ + done rm /tmp/ishtar.dot fixtures: fixtures_common fixtures_operations fixtures_archaeological_context_records fixtures_archaeological_finds fixtures_archaeological_warehouse fixtures_archaeological_files -fixtures_common: fixtures_common_importers +fixtures_common: fixtures_common_importers fixtures_common_towns cd $(project); $(PYTHON) ./manage.py dumpdata --indent 4 \ ishtar_common.authortype \ ishtar_common.persontype \ @@ -118,13 +125,12 @@ fixtures_common_importers: ishtar_common.formatertype \ > '../ishtar_common/fixtures/initial_importtypes-'$(default_data)'.json' -fixtures_initial_data: +fixtures_common_towns: cd $(project); $(PYTHON) ./manage.py dumpdata --indent 4 \ - ishtar_common.authortype \ - ishtar_common.persontype \ - ishtar_common.organizationtype \ - ishtar_common.sourcetype \ - > '../ishtar_common/fixtures/initial_data-'$(default_data)'.json' + ishtar_common.state \ + ishtar_common.department \ + ishtar_common.town \ + > '../ishtar_common/fixtures/initial_towns-'$(default_data)'.json' fixtures_operations: cd $(project); $(PYTHON) ./manage.py dumpdata --indent 4 \ -- cgit v1.2.3