From 6671a8f26ee67f7cc40aa1e572a1cdf0736c67f3 Mon Sep 17 00:00:00 2001
From: Brian Matherly <brian@gramps-project.org>
Date: Sat, 17 Jan 2009 03:36:19 +0000
Subject: [PATCH] Plugins Restructure: Move import plugins into plugins/import.

svn: r11641
---
 po/POTFILES.in                            | 15 +++++++------
 src/plugins/Makefile.am                   |  6 ------
 src/plugins/{ => import}/ImportCsv.py     |  0
 src/plugins/{ => import}/ImportGedcom.py  |  0
 src/plugins/{ => import}/ImportGeneWeb.py |  0
 src/plugins/{ => import}/ImportGrdb.py    |  0
 src/plugins/{ => import}/ImportProGen.py  |  0
 src/plugins/{ => import}/ImportVCard.py   |  0
 src/plugins/import/Makefile.am            | 26 +++++++++++++++++++++++
 9 files changed, 35 insertions(+), 12 deletions(-)
 rename src/plugins/{ => import}/ImportCsv.py (100%)
 rename src/plugins/{ => import}/ImportGedcom.py (100%)
 rename src/plugins/{ => import}/ImportGeneWeb.py (100%)
 rename src/plugins/{ => import}/ImportGrdb.py (100%)
 rename src/plugins/{ => import}/ImportProGen.py (100%)
 rename src/plugins/{ => import}/ImportVCard.py (100%)
 create mode 100644 src/plugins/import/Makefile.am

diff --git a/po/POTFILES.in b/po/POTFILES.in
index d572d8b83..ced432360 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -240,13 +240,7 @@ src/plugins/BookReport.py
 src/plugins/Calendar.py
 src/plugins/ExportCd.py
 src/plugins/ExportXml.py
-src/plugins/ImportCsv.py
-src/plugins/ImportGedcom.py
-src/plugins/ImportGeneWeb.py
 src/plugins/ImportGpkg.py
-src/plugins/ImportGrdb.py
-src/plugins/ImportProGen.py
-src/plugins/ImportVCard.py
 src/plugins/ImportXml.py
 src/plugins/NarrativeWeb.py
 src/plugins/Records.py
@@ -281,6 +275,15 @@ src/plugins/graph/GVFamilyLines.py
 src/plugins/graph/GVHourGlass.py
 src/plugins/graph/GVRelGraph.py
 
+# plugins/import directory
+src/plugins/import/ImportCsv.py
+src/plugins/import/ImportGedcom.py
+src/plugins/import/ImportGeneWeb.py
+src/plugins/import/ImportGpkg.py
+src/plugins/import/ImportGrdb.py
+src/plugins/import/ImportProGen.py
+src/plugins/import/ImportVCard.py
+
 # plugins/quickview directory
 src/plugins/quickview/AgeOnDate.py
 src/plugins/quickview/all_events.py
diff --git a/src/plugins/Makefile.am b/src/plugins/Makefile.am
index 312732096..660aa8a6b 100644
--- a/src/plugins/Makefile.am
+++ b/src/plugins/Makefile.am
@@ -24,13 +24,7 @@ pkgdata_PYTHON = \
 	EndOfLineReport.py\
 	ExportXml.py\
 	FamilyGroup.py\
-	ImportCsv.py\
-	ImportGedcom.py\
-	ImportGeneWeb.py\
 	ImportGpkg.py\
-	ImportGrdb.py\
-	ImportProGen.py\
-	ImportVCard.py\
 	ImportXml.py\
 	IndivComplete.py\
 	KinshipReport.py\
diff --git a/src/plugins/ImportCsv.py b/src/plugins/import/ImportCsv.py
similarity index 100%
rename from src/plugins/ImportCsv.py
rename to src/plugins/import/ImportCsv.py
diff --git a/src/plugins/ImportGedcom.py b/src/plugins/import/ImportGedcom.py
similarity index 100%
rename from src/plugins/ImportGedcom.py
rename to src/plugins/import/ImportGedcom.py
diff --git a/src/plugins/ImportGeneWeb.py b/src/plugins/import/ImportGeneWeb.py
similarity index 100%
rename from src/plugins/ImportGeneWeb.py
rename to src/plugins/import/ImportGeneWeb.py
diff --git a/src/plugins/ImportGrdb.py b/src/plugins/import/ImportGrdb.py
similarity index 100%
rename from src/plugins/ImportGrdb.py
rename to src/plugins/import/ImportGrdb.py
diff --git a/src/plugins/ImportProGen.py b/src/plugins/import/ImportProGen.py
similarity index 100%
rename from src/plugins/ImportProGen.py
rename to src/plugins/import/ImportProGen.py
diff --git a/src/plugins/ImportVCard.py b/src/plugins/import/ImportVCard.py
similarity index 100%
rename from src/plugins/ImportVCard.py
rename to src/plugins/import/ImportVCard.py
diff --git a/src/plugins/import/Makefile.am b/src/plugins/import/Makefile.am
new file mode 100644
index 000000000..3f0cff3c4
--- /dev/null
+++ b/src/plugins/import/Makefile.am
@@ -0,0 +1,26 @@
+# This is the src/plugins/import 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/import
+
+pkgdata_PYTHON = \
+	ImportCsv.py \
+	ImportGedcom.py \
+	ImportGeneWeb.py \
+	ImportGrdb.py \
+	ImportProGen.py \
+	ImportVCard.py
+
+pkgpyexecdir = @pkgpyexecdir@/plugins/import
+pkgpythondir = @pkgpythondir@/plugins/import
+
+# Clean up all the byte-compiled files
+MOSTLYCLEANFILES = *pyc *pyo
+
+GRAMPS_PY_MODPATH = "../../"
+
+pycheck: 
+	(export PYTHONPATH=$(GRAMPS_PY_MODPATH); \
+	pychecker $(pkgdata_PYTHON));