From 96f9411caa46cf2382c2bcf120c7f544dbfa5900 Mon Sep 17 00:00:00 2001
From: Brian Matherly <brian@gramps-project.org>
Date: Fri, 16 Jan 2009 21:10:36 +0000
Subject: [PATCH] Move all draw reports into plugins/drawreport.

svn: r11634
---
 po/POTFILES.in                                | 63 ++++++++++---------
 src/plugins/{ => drawreport}/AncestorTree.py  |  0
 src/plugins/{ => drawreport}/DescendTree.py   |  0
 src/plugins/{ => drawreport}/FanChart.py      |  0
 src/plugins/drawreport/Makefile.am            | 25 ++++++++
 .../{ => drawreport}/StatisticsChart.py       |  0
 src/plugins/{ => drawreport}/TimeLine.py      |  0
 src/plugins/rel/Makefile.am                   |  5 +-
 src/plugins/tool/Makefile.am                  |  6 +-
 9 files changed, 64 insertions(+), 35 deletions(-)
 rename src/plugins/{ => drawreport}/AncestorTree.py (100%)
 rename src/plugins/{ => drawreport}/DescendTree.py (100%)
 rename src/plugins/{ => drawreport}/FanChart.py (100%)
 create mode 100644 src/plugins/drawreport/Makefile.am
 rename src/plugins/{ => drawreport}/StatisticsChart.py (100%)
 rename src/plugins/{ => drawreport}/TimeLine.py (100%)

diff --git a/po/POTFILES.in b/po/POTFILES.in
index 96575110e..7a4adae6f 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -240,29 +240,17 @@ src/plugins/AgeStats.py
 src/plugins/all_events.py
 src/plugins/all_relations.py
 src/plugins/AncestorReport.py
-src/plugins/AncestorTree.py
 src/plugins/AttributeMatch.py
 src/plugins/AttributesGramplet.py
 src/plugins/BookReport.py
-src/plugins/CalculateEstimatedDates.py
 src/plugins/Calendar.py
-src/plugins/ChangeNames.py
-src/plugins/ChangeTypes.py
-src/plugins/Check.py
-src/plugins/CmdRef.py
 src/plugins/CustomBookText.py
-src/plugins/DateParserDisplayTest.py
 src/plugins/DefaultGramplets.py
-src/plugins/Desbrowser.py
-src/plugins/DescendTree.py
 src/plugins/DescendReport.py
 src/plugins/DescendGramplet.py
 src/plugins/DetAncestralReport.py
 src/plugins/DetDescendantReport.py
 src/plugins/EndOfLineReport.py
-src/plugins/Eval.py
-src/plugins/EventCmp.py
-src/plugins/EventNames.py
 src/plugins/ExportCd.py
 src/plugins/ExportCsv.py
 src/plugins/ExportFtree.py
@@ -272,11 +260,8 @@ src/plugins/ExportPkg.py
 src/plugins/ExportVCalendar.py
 src/plugins/ExportVCard.py
 src/plugins/ExportXml.py
-src/plugins/ExtractCity.py
 src/plugins/FamilyGroup.py
-src/plugins/FanChart.py
 src/plugins/FilterByName.py
-src/plugins/FindDupes.py
 src/plugins/GivenNameGramplet.py
 src/plugins/GVFamilyLines.py
 src/plugins/GVHourGlass.py
@@ -291,35 +276,28 @@ src/plugins/ImportVCard.py
 src/plugins/ImportXml.py
 src/plugins/IndivComplete.py
 src/plugins/KinshipReport.py
-src/plugins/Leak.py
 src/plugins/lineage.py
 src/plugins/MarkerReport.py
-src/plugins/MediaManager.py
 src/plugins/NarrativeWeb.py
-src/plugins/NotRelated.py
 src/plugins/NumberOfAncestorsReport.py
 src/plugins/OnThisDay.py
-src/plugins/OwnerEditor.py
-src/plugins/PatchNames.py
 src/plugins/PlaceReport.py
-src/plugins/Rebuild.py
-src/plugins/RebuildRefMap.py
 src/plugins/Records.py
 src/plugins/References.py
-src/plugins/RelCalc.py
-src/plugins/RemoveUnused.py
-src/plugins/ReorderIds.py
 src/plugins/SameSurnames.py
 src/plugins/siblings.py
 src/plugins/SimpleBookTitle.py
-src/plugins/SoundGen.py
-src/plugins/StatisticsChart.py
 src/plugins/Summary.py
-src/plugins/TimeLine.py
-src/plugins/Verify.py
 src/plugins/WebCal.py
 src/plugins/WhatsNext.py
 
+# plugins/drawreport directory
+src/plugins/drawreport/AncestorTree.py
+src/plugins/drawreport/DescendTree.py
+src/plugins/drawreport/FanChart.py
+src/plugins/drawreport/StatisticsChart.py
+src/plugins/drawreport/TimeLine.py
+
 # plugins/rel directory
 src/plugins/rel/rel_cs.py
 src/plugins/rel/rel_da.py
@@ -337,6 +315,33 @@ src/plugins/rel/rel_ru.py
 src/plugins/rel/rel_sk.py
 src/plugins/rel/rel_sv.py
 
+# plugins/tool directory
+src/plugins/tool/CalculateEstimatedDates.py
+src/plugins/tool/ChangeNames.py
+src/plugins/tool/ChangeTypes.py
+src/plugins/tool/Check.py
+src/plugins/tool/CmdRef.py
+src/plugins/tool/DateParserDisplayTest.py
+src/plugins/tool/Desbrowser.py
+src/plugins/tool/Eval.py
+src/plugins/tool/EventCmp.py
+src/plugins/tool/EventNames.py
+src/plugins/tool/ExtractCity.py
+src/plugins/tool/FindDupes.py
+src/plugins/tool/Leak.py
+src/plugins/tool/MediaManager.py
+src/plugins/tool/NotRelated.py
+src/plugins/tool/OwnerEditor.py
+src/plugins/tool/PatchNames.py
+src/plugins/tool/Rebuild.py
+src/plugins/tool/RebuildRefMap.py
+src/plugins/tool/RelCalc.py
+src/plugins/tool/RemoveUnused.py
+src/plugins/tool/ReorderIds.py
+src/plugins/tool/SortEvents.py
+src/plugins/tool/SoundGen.py
+src/plugins/tool/Verify.py
+
 # PluginUtils package
 src/PluginUtils/_GuiOptions.py
 src/PluginUtils/_Options.py
diff --git a/src/plugins/AncestorTree.py b/src/plugins/drawreport/AncestorTree.py
similarity index 100%
rename from src/plugins/AncestorTree.py
rename to src/plugins/drawreport/AncestorTree.py
diff --git a/src/plugins/DescendTree.py b/src/plugins/drawreport/DescendTree.py
similarity index 100%
rename from src/plugins/DescendTree.py
rename to src/plugins/drawreport/DescendTree.py
diff --git a/src/plugins/FanChart.py b/src/plugins/drawreport/FanChart.py
similarity index 100%
rename from src/plugins/FanChart.py
rename to src/plugins/drawreport/FanChart.py
diff --git a/src/plugins/drawreport/Makefile.am b/src/plugins/drawreport/Makefile.am
new file mode 100644
index 000000000..4257729e5
--- /dev/null
+++ b/src/plugins/drawreport/Makefile.am
@@ -0,0 +1,25 @@
+# This is the src/plugins/rel 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/drawreport
+
+pkgdata_PYTHON = \
+	AncestorTree.py \
+	DescendTree.py \
+	FanChart.py \
+	StatisticsChart.py \
+	TimeLine.py
+
+pkgpyexecdir = @pkgpyexecdir@/plugins/drawreport
+pkgpythondir = @pkgpythondir@/plugins/drawreport
+
+# 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/StatisticsChart.py b/src/plugins/drawreport/StatisticsChart.py
similarity index 100%
rename from src/plugins/StatisticsChart.py
rename to src/plugins/drawreport/StatisticsChart.py
diff --git a/src/plugins/TimeLine.py b/src/plugins/drawreport/TimeLine.py
similarity index 100%
rename from src/plugins/TimeLine.py
rename to src/plugins/drawreport/TimeLine.py
diff --git a/src/plugins/rel/Makefile.am b/src/plugins/rel/Makefile.am
index 210e6dca1..c4aab9776 100644
--- a/src/plugins/rel/Makefile.am
+++ b/src/plugins/rel/Makefile.am
@@ -22,9 +22,8 @@ pkgdata_PYTHON = \
 	rel_sk.py\
 	rel_sv.py
 
-pkgpyexecdir = @pkgpyexecdir@/gen/proxy
-pkgpythondir = @pkgpythondir@/gen/proxy
-
+pkgpyexecdir = @pkgpyexecdir@/plugins/rel
+pkgpythondir = @pkgpythondir@/plugins/rel
 
 # Clean up all the byte-compiled files
 MOSTLYCLEANFILES = *pyc *pyo
diff --git a/src/plugins/tool/Makefile.am b/src/plugins/tool/Makefile.am
index 81630a0f3..95e889340 100644
--- a/src/plugins/tool/Makefile.am
+++ b/src/plugins/tool/Makefile.am
@@ -3,7 +3,7 @@
 # but that is not necessarily portable.
 # If not using GNU make, then list all .py files individually
 
-pkgdatadir = $(datadir)/@PACKAGE@/plugins/rel
+pkgdatadir = $(datadir)/@PACKAGE@/plugins/tool
 
 pkgdata_PYTHON = \
 	CalculateEstimatedDates.py \
@@ -36,8 +36,8 @@ pkgdata_PYTHON = \
 #	PHPGedViewConnector.py \
 #	TestcaseGenerator.py \
 
-pkgpyexecdir = @pkgpyexecdir@/gen/proxy
-pkgpythondir = @pkgpythondir@/gen/proxy
+pkgpyexecdir = @pkgpyexecdir@/plugins/tool
+pkgpythondir = @pkgpythondir@/plugins/tool
 
 GLADEFILES = \
 	changenames.glade \