From 853e54a624162a44f41334a22b7ae027ac8b7f9f Mon Sep 17 00:00:00 2001 From: Brian Matherly Date: Fri, 16 Jan 2009 23:10:34 +0000 Subject: [PATCH] Plugins Restructure: Move text reports into plugins/textreport. svn: r11638 --- po/POTFILES.in | 30 ++++++++-------- src/plugins/Makefile.am | 5 --- .../{ => textreport}/AncestorReport.py | 0 .../{ => textreport}/CustomBookText.py | 0 src/plugins/{ => textreport}/DescendReport.py | 0 .../{ => textreport}/DetAncestralReport.py | 0 .../{ => textreport}/DetDescendantReport.py | 0 .../{ => textreport}/EndOfLineReport.py | 0 src/plugins/{ => textreport}/FamilyGroup.py | 0 src/plugins/{ => textreport}/IndivComplete.py | 0 src/plugins/{ => textreport}/KinshipReport.py | 0 src/plugins/textreport/Makefile.am | 34 +++++++++++++++++++ src/plugins/{ => textreport}/MarkerReport.py | 0 .../NumberOfAncestorsReport.py | 0 src/plugins/{ => textreport}/PlaceReport.py | 0 .../{ => textreport}/SimpleBookTitle.py | 0 src/plugins/{ => textreport}/Summary.py | 0 17 files changed, 50 insertions(+), 19 deletions(-) rename src/plugins/{ => textreport}/AncestorReport.py (100%) rename src/plugins/{ => textreport}/CustomBookText.py (100%) rename src/plugins/{ => textreport}/DescendReport.py (100%) rename src/plugins/{ => textreport}/DetAncestralReport.py (100%) rename src/plugins/{ => textreport}/DetDescendantReport.py (100%) rename src/plugins/{ => textreport}/EndOfLineReport.py (100%) rename src/plugins/{ => textreport}/FamilyGroup.py (100%) rename src/plugins/{ => textreport}/IndivComplete.py (100%) rename src/plugins/{ => textreport}/KinshipReport.py (100%) create mode 100644 src/plugins/textreport/Makefile.am rename src/plugins/{ => textreport}/MarkerReport.py (100%) rename src/plugins/{ => textreport}/NumberOfAncestorsReport.py (100%) rename src/plugins/{ => textreport}/PlaceReport.py (100%) rename src/plugins/{ => textreport}/SimpleBookTitle.py (100%) rename src/plugins/{ => textreport}/Summary.py (100%) diff --git a/po/POTFILES.in b/po/POTFILES.in index e032fa354..d0d3b30a2 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -236,14 +236,8 @@ src/Selectors/__init__.py # plugins directory src/plugins/AgeStats.py -src/plugins/AncestorReport.py src/plugins/BookReport.py src/plugins/Calendar.py -src/plugins/CustomBookText.py -src/plugins/DescendReport.py -src/plugins/DetAncestralReport.py -src/plugins/DetDescendantReport.py -src/plugins/EndOfLineReport.py src/plugins/ExportCd.py src/plugins/ExportCsv.py src/plugins/ExportFtree.py @@ -253,7 +247,6 @@ src/plugins/ExportPkg.py src/plugins/ExportVCalendar.py src/plugins/ExportVCard.py src/plugins/ExportXml.py -src/plugins/FamilyGroup.py src/plugins/GVFamilyLines.py src/plugins/GVHourGlass.py src/plugins/GVRelGraph.py @@ -265,15 +258,8 @@ src/plugins/ImportGrdb.py src/plugins/ImportProGen.py src/plugins/ImportVCard.py src/plugins/ImportXml.py -src/plugins/IndivComplete.py -src/plugins/KinshipReport.py -src/plugins/MarkerReport.py src/plugins/NarrativeWeb.py -src/plugins/NumberOfAncestorsReport.py -src/plugins/PlaceReport.py src/plugins/Records.py -src/plugins/SimpleBookTitle.py -src/plugins/Summary.py src/plugins/WebCal.py # plugins/drawreport directory @@ -320,6 +306,22 @@ src/plugins/rel/rel_ru.py src/plugins/rel/rel_sk.py src/plugins/rel/rel_sv.py +# plugins/textreport directory +src/plugins/textreport/AncestorReport.py +src/plugins/textreport/CustomBookText.py +src/plugins/textreport/DescendReport.py +src/plugins/textreport/DetAncestralReport.py +src/plugins/textreport/DetDescendantReport.py +src/plugins/textreport/EndOfLineReport.py +src/plugins/textreport/FamilyGroup.py +src/plugins/textreport/IndivComplete.py +src/plugins/textreport/KinshipReport.py +src/plugins/textreport/MarkerReport.py +src/plugins/textreport/NumberOfAncestorsReport.py +src/plugins/textreport/PlaceReport.py +src/plugins/textreport/SimpleBookTitle.py +src/plugins/textreport/Summary.py + # plugins/tool directory src/plugins/tool/CalculateEstimatedDates.py src/plugins/tool/ChangeNames.py diff --git a/src/plugins/Makefile.am b/src/plugins/Makefile.am index 0d63cf4e0..9d19e36ad 100644 --- a/src/plugins/Makefile.am +++ b/src/plugins/Makefile.am @@ -14,12 +14,10 @@ pkgdatadir = $(datadir)/@PACKAGE@/plugins pkgdata_PYTHON = \ AgeStats.py\ - AncestorTree.py\ AncestorReport.py\ BookReport.py\ Calendar.py \ CustomBookText.py\ - DescendTree.py\ DescendReport.py\ DetAncestralReport.py\ DetDescendantReport.py\ @@ -34,7 +32,6 @@ pkgdata_PYTHON = \ ExportVCard.py\ ExportXml.py\ FamilyGroup.py\ - FanChart.py\ GVFamilyLines.py \ GVHourGlass.py\ GVRelGraph.py\ @@ -54,9 +51,7 @@ pkgdata_PYTHON = \ PlaceReport.py\ Records.py\ SimpleBookTitle.py\ - StatisticsChart.py\ Summary.py\ - TimeLine.py\ WebCal.py\ WhatsNext.py diff --git a/src/plugins/AncestorReport.py b/src/plugins/textreport/AncestorReport.py similarity index 100% rename from src/plugins/AncestorReport.py rename to src/plugins/textreport/AncestorReport.py diff --git a/src/plugins/CustomBookText.py b/src/plugins/textreport/CustomBookText.py similarity index 100% rename from src/plugins/CustomBookText.py rename to src/plugins/textreport/CustomBookText.py diff --git a/src/plugins/DescendReport.py b/src/plugins/textreport/DescendReport.py similarity index 100% rename from src/plugins/DescendReport.py rename to src/plugins/textreport/DescendReport.py diff --git a/src/plugins/DetAncestralReport.py b/src/plugins/textreport/DetAncestralReport.py similarity index 100% rename from src/plugins/DetAncestralReport.py rename to src/plugins/textreport/DetAncestralReport.py diff --git a/src/plugins/DetDescendantReport.py b/src/plugins/textreport/DetDescendantReport.py similarity index 100% rename from src/plugins/DetDescendantReport.py rename to src/plugins/textreport/DetDescendantReport.py diff --git a/src/plugins/EndOfLineReport.py b/src/plugins/textreport/EndOfLineReport.py similarity index 100% rename from src/plugins/EndOfLineReport.py rename to src/plugins/textreport/EndOfLineReport.py diff --git a/src/plugins/FamilyGroup.py b/src/plugins/textreport/FamilyGroup.py similarity index 100% rename from src/plugins/FamilyGroup.py rename to src/plugins/textreport/FamilyGroup.py diff --git a/src/plugins/IndivComplete.py b/src/plugins/textreport/IndivComplete.py similarity index 100% rename from src/plugins/IndivComplete.py rename to src/plugins/textreport/IndivComplete.py diff --git a/src/plugins/KinshipReport.py b/src/plugins/textreport/KinshipReport.py similarity index 100% rename from src/plugins/KinshipReport.py rename to src/plugins/textreport/KinshipReport.py diff --git a/src/plugins/textreport/Makefile.am b/src/plugins/textreport/Makefile.am new file mode 100644 index 000000000..f54744a14 --- /dev/null +++ b/src/plugins/textreport/Makefile.am @@ -0,0 +1,34 @@ +# This is the src/plugins/textreport level Makefile for Gramps +# We could use GNU make's ':=' syntax for nice wildcard use, +# but that is not necessarily portable. +# If not using GNU make, then list all .py files individually + +pkgdatadir = $(datadir)/@PACKAGE@/plugins/textreport + +pkgdata_PYTHON = \ + AncestorReport.py\ + CustomBookText.py\ + DescendReport.py\ + DetAncestralReport.py\ + DetDescendantReport.py\ + EndOfLineReport.py\ + FamilyGroup.py\ + IndivComplete.py\ + KinshipReport.py\ + MarkerReport.py\ + NumberOfAncestorsReport.py\ + PlaceReport.py\ + SimpleBookTitle.py\ + Summary.py\ + +pkgpyexecdir = @pkgpyexecdir@/plugins/textreport +pkgpythondir = @pkgpythondir@/plugins/textreport + +# Clean up all the byte-compiled files +MOSTLYCLEANFILES = *pyc *pyo + +GRAMPS_PY_MODPATH = "../../" + +pycheck: + (export PYTHONPATH=$(GRAMPS_PY_MODPATH); \ + pychecker $(pkgdata_PYTHON)); diff --git a/src/plugins/MarkerReport.py b/src/plugins/textreport/MarkerReport.py similarity index 100% rename from src/plugins/MarkerReport.py rename to src/plugins/textreport/MarkerReport.py diff --git a/src/plugins/NumberOfAncestorsReport.py b/src/plugins/textreport/NumberOfAncestorsReport.py similarity index 100% rename from src/plugins/NumberOfAncestorsReport.py rename to src/plugins/textreport/NumberOfAncestorsReport.py diff --git a/src/plugins/PlaceReport.py b/src/plugins/textreport/PlaceReport.py similarity index 100% rename from src/plugins/PlaceReport.py rename to src/plugins/textreport/PlaceReport.py diff --git a/src/plugins/SimpleBookTitle.py b/src/plugins/textreport/SimpleBookTitle.py similarity index 100% rename from src/plugins/SimpleBookTitle.py rename to src/plugins/textreport/SimpleBookTitle.py diff --git a/src/plugins/Summary.py b/src/plugins/textreport/Summary.py similarity index 100% rename from src/plugins/Summary.py rename to src/plugins/textreport/Summary.py