From c727e19ea841eea13bfa977505f9f33708027ff1 Mon Sep 17 00:00:00 2001 From: Vassilii Khachaturov Date: Mon, 19 Aug 2013 20:18:39 +0000 Subject: [PATCH] Adapt to gramps40/trunk - add GRAMPS_RESOURCES env Rewrote Makefile to use a single macro PYTHON which includes all the env magic in it. svn: r22877 --- gramps/webapp/Makefile | 54 ++++++++++++++++++++++-------------------- 1 file changed, 28 insertions(+), 26 deletions(-) diff --git a/gramps/webapp/Makefile b/gramps/webapp/Makefile index dff164818..16be63b5f 100644 --- a/gramps/webapp/Makefile +++ b/gramps/webapp/Makefile @@ -1,22 +1,24 @@ # Initialize GRAMPS Django site +PYTHON=GRAMPS_RESOURCES=../.. PYTHONPATH=../.. python + update: grampsdb/fixtures/initial_data.json - PYTHONPATH=../.. python manage.py syncdb --noinput - PYTHONPATH=../.. python manage.py createsuperuser --username=admin --email=bugs@gramps-project.org - PYTHONPATH=../.. python manage.py createsuperuser --username=admin1 --email=bugs@gramps-project.org + $(PYTHON) manage.py syncdb --noinput + $(PYTHON) manage.py createsuperuser --username=admin --email=bugs@gramps-project.org + $(PYTHON) manage.py createsuperuser --username=admin1 --email=bugs@gramps-project.org grampsdb/fixtures/initial_data.json: init.py mkdir -p grampsdb/fixtures - PYTHONPATH=../.. python init.py > grampsdb/fixtures/initial_data.json + $(PYTHON) init.py > grampsdb/fixtures/initial_data.json init_gramps: - PYTHONPATH=../.. python init_gramps.py # clear primary and secondary tables + $(PYTHON) init_gramps.py # clear primary and secondary tables run: - PYTHONPATH=../.. python manage.py runserver + $(PYTHON) manage.py runserver sql: - PYTHONPATH=../.. python manage.py sqlall > gramps-sql.sql + $(PYTHON) manage.py sqlall > gramps-sql.sql dump: echo ".dump" | sqlite3 sqlite.db > gramps-data.sql @@ -25,34 +27,34 @@ load: sqlite3 sqlite.db < gramps-data.sql superusers: - PYTHONPATH=../.. python manage.py createsuperuser --username=admin --email=bugs@gramps-project.org - PYTHONPATH=../.. python manage.py createsuperuser --username=admin1 --email=bugs@gramps-project.org + $(PYTHON) manage.py createsuperuser --username=admin --email=bugs@gramps-project.org + $(PYTHON) manage.py createsuperuser --username=admin1 --email=bugs@gramps-project.org backup: - PYTHONPATH=../.. python manage.py dumpdata > backup.json + $(PYTHON) manage.py dumpdata > backup.json restore: empty - PYTHONPATH=../.. python manage.py loaddata backup.json + $(PYTHON) manage.py loaddata backup.json initial_data: - PYTHONPATH=../.. python manage.py loaddata grampsdb/fixtures/initial_data.json + $(PYTHON) manage.py loaddata grampsdb/fixtures/initial_data.json docs: mkdir -p docs - python manage.py graph_models grampsdb -i Person,Family,Source,Event,Repository,Place,Media,Note -o docs/primary-tables.png - python manage.py graph_models grampsdb -i Note -o docs/note-table.png - python manage.py graph_models grampsdb -i Media -o docs/media-table.png - python manage.py graph_models grampsdb -i Place -o docs/place-table.png - python manage.py graph_models grampsdb -i Repository -o docs/repository-table.png - python manage.py graph_models grampsdb -i Event -o docs/event-table.png - python manage.py graph_models grampsdb -i Source -o docs/source-table.png - python manage.py graph_models grampsdb -i Family -o docs/family-table.png - python manage.py graph_models grampsdb -i Person -o docs/person-table.png - python manage.py graph_models grampsdb -o docs/all-tables.png - python manage.py graph_models grampsdb -i Attribute,Datamap,Name,Lds,Tag,Address,Location,Url -o docs/secondary-tables.png - python manage.py graph_models grampsdb -i Person,Family,Source,Event,Repository,Place,Media,Note,Attribute,Datamap,Name,Lds,Tag,Address,Location,Url -o docs/prim-sec-tables.png - python manage.py graph_models grampsdb -i Person,Family,Source,Event,Repository,Place,Media,Note,Attribute,Datamap,Name,Lds,Tag,Address,Location,Url -o docs/prim-sec-tables.png - python manage.py graph_models grampsdb -i Person,Family,Source,Event,Repository,Place,Media,Note,Attribute,Datamap,Name,Lds,Tag,Address,Location,Url,NoteRef,SourceRef,EventRef,RepositoryRef,PersonRef,ChildRef,MediaRef -o docs/prim-sec-ref-tables.png + $(PYTHON) graph_models grampsdb -i Person,Family,Source,Event,Repository,Place,Media,Note -o docs/primary-tables.png + $(PYTHON) graph_models grampsdb -i Note -o docs/note-table.png + $(PYTHON) graph_models grampsdb -i Media -o docs/media-table.png + $(PYTHON) graph_models grampsdb -i Place -o docs/place-table.png + $(PYTHON) graph_models grampsdb -i Repository -o docs/repository-table.png + $(PYTHON) graph_models grampsdb -i Event -o docs/event-table.png + $(PYTHON) graph_models grampsdb -i Source -o docs/source-table.png + $(PYTHON) graph_models grampsdb -i Family -o docs/family-table.png + $(PYTHON) graph_models grampsdb -i Person -o docs/person-table.png + $(PYTHON) graph_models grampsdb -o docs/all-tables.png + $(PYTHON) graph_models grampsdb -i Attribute,Datamap,Name,Lds,Tag,Address,Location,Url -o docs/secondary-tables.png + $(PYTHON) graph_models grampsdb -i Person,Family,Source,Event,Repository,Place,Media,Note,Attribute,Datamap,Name,Lds,Tag,Address,Location,Url -o docs/prim-sec-tables.png + $(PYTHON) graph_models grampsdb -i Person,Family,Source,Event,Repository,Place,Media,Note,Attribute,Datamap,Name,Lds,Tag,Address,Location,Url -o docs/prim-sec-tables.png + $(PYTHON) graph_models grampsdb -i Person,Family,Source,Event,Repository,Place,Media,Note,Attribute,Datamap,Name,Lds,Tag,Address,Location,Url,NoteRef,SourceRef,EventRef,RepositoryRef,PersonRef,ChildRef,MediaRef -o docs/prim-sec-ref-tables.png make-empty: echo ".dump" | sqlite3 sqlite.db > empty.sql