Plugins Restructure: Move docgen plugins into plugins/docgen.

svn: r11652

po/POTFILES.in

@@ -103,17 +103,9 @@ src/DateHandler/_Date_sv.py
 src/DateHandler/__init__.py
 
 # docgen directory
-src/docgen/AsciiDoc.py
-src/docgen/GtkPrint.py
-src/docgen/HtmlDoc.py
-src/docgen/LaTeXDoc.py
 src/docgen/ODSDoc.py
-src/docgen/ODFDoc.py
 src/docgen/ODSTab.py
-src/docgen/PSDrawDoc.py
-src/docgen/RTFDoc.py
 src/docgen/SpreadSheetDoc.py
-src/docgen/SvgDrawDoc.py
 src/docgen/TextBufDoc.py
 
 # DisplayModels package
@@ -244,6 +236,16 @@ src/plugins/ImportXml.py
 src/plugins/Records.py
 src/plugins/WebCal.py
 
+# plugins/docgen directory
+src/plugins/docgen/AsciiDoc.py
+src/plugins/docgen/GtkPrint.py
+src/plugins/docgen/HtmlDoc.py
+src/plugins/docgen/LaTeXDoc.py
+src/plugins/docgen/ODFDoc.py
+src/plugins/docgen/PSDrawDoc.py
+src/plugins/docgen/RTFDoc.py
+src/plugins/docgen/SvgDrawDoc.py
+
 # plugins/drawreport directory
 src/plugins/drawreport/AncestorTree.py
 src/plugins/drawreport/DescendTree.py

src/ViewManager.py

@@ -596,21 +596,15 @@ class ViewManager:
 
     def __do_load_plugins(self):
         """
-        Loads the plugins at initialization time.  We load the document 
-        generators and the plugins. The plugin status window is opened
-        on an error if the user has requested.
+        Loads the plugins at initialization time. The plugin status window is 
+        opened on an error if the user has requested.
         """
-        # load document generators
-        self.uistate.status_text(_('Loading document formats...'))
-        error  = self.__pmgr.load_plugins(const.DOCGEN_DIR)
-        error |= self.__pmgr.load_plugins(const.USER_DOCGEN)
-
         # load plugins
         self.uistate.status_text(_('Loading plugins...'))
-        error |= self.__pmgr.load_plugins(const.PLUGINS_DIR)
+        error = self.__pmgr.load_plugins(const.PLUGINS_DIR)
         error |= self.__pmgr.load_plugins(const.USER_PLUGINS)
 
-        #  get to ssee if we need to open the plugin status window
+        #  get to see if we need to open the plugin status window
         if error and Config.get(Config.POP_PLUGIN_STATUS):
             self.__plugin_status()
 

src/const.py.in

@@ -111,8 +111,7 @@ TOOL_OPTIONS   = os.path.join(HOME_DIR, "tool_options.xml")
 
 ENV_DIR        = os.path.join(HOME_DIR, "env")
 TEMP_DIR       = os.path.join(HOME_DIR, "temp")
-THUMB_DIR      = os.path.join(HOME_DIR, "thumb")
-USER_DOCGEN    = os.path.join(HOME_DIR, "docgen")    
+THUMB_DIR      = os.path.join(HOME_DIR, "thumb")  
 USER_PLUGINS   = os.path.join(HOME_DIR, "plugins")    
 USER_TEMPLATES = os.path.join(HOME_DIR, "templates")    
 # dirs checked/made for each Gramps session
@@ -137,7 +136,6 @@ RULE_GLADE     = os.path.join(GLADE_DIR, "rule.glade")
 
 
 PLUGINS_DIR    = os.path.join(ROOT_DIR, "plugins")
-DOCGEN_DIR     = os.path.join(ROOT_DIR, "docgen")
 DATA_DIR       = os.path.join(ROOT_DIR, "data")
 SYSTEM_FILTERS = os.path.join(DATA_DIR, "system_filters.xml")
 TEMPLATE_DIR   = os.path.join(DATA_DIR, "templates")

src/docgen/Makefile.am

@@ -5,28 +5,13 @@
 docgendir=$(prefix)/share/gramps/docgen
 
 docgen_PYTHON = \
-	__init__.py\
-	AsciiDoc.py\
-    CairoDoc.py\
-	CSVTab.py\
-	HtmlDoc.py\
-	LaTeXDoc.py\
-	ODFDoc.py\
-	ODSDoc.py\
-	ODSTab.py\
-	SpreadSheetDoc.py\
-	TabbedDoc.py\
-	PdfDoc.py\
-	PSDrawDoc.py\
-	RTFDoc.py\
-	SvgDrawDoc.py\
-	TextBufDoc.py \
-	GtkPrint.py
-
-docgen_DATA = \
-	gtkprintpreview.glade
-
-dist_docgen_DATA = $(docgen_DATA)
+	__init__.py \
+	CSVTab.py \
+	ODSDoc.py \
+	ODSTab.py \
+	SpreadSheetDoc.py \
+	TabbedDoc.py \
+	TextBufDoc.py
 
 # Clean up all the byte-compiled files
 MOSTLYCLEANFILES = *pyc *pyo

src/plugins/docgen/Makefile.am

@@ -0,0 +1,39 @@
+# This is the src/plugins/docgen 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/docgen
+
+pkgdata_PYTHON = \
+	AsciiDoc.py \
+    CairoDoc.py \
+    GtkPrint.py \
+	HtmlDoc.py \
+	LaTeXDoc.py \
+	ODFDoc.py \
+	PdfDoc.py \
+	PSDrawDoc.py \
+	RTFDoc.py \
+	SvgDrawDoc.py
+
+pkgpyexecdir = @pkgpyexecdir@/plugins/docgen
+pkgpythondir = @pkgpythondir@/plugins/docgen
+
+GLADEFILES = \
+	gtkprintpreview.glade
+
+GRAPHICS = 
+
+DATAFILES = 
+
+dist_pkgdata_DATA = $(GLADEFILES) $(GRAPHICS) $(DATAFILES)
+
+# Clean up all the byte-compiled files
+MOSTLYCLEANFILES = *pyc *pyo
+
+GRAMPS_PY_MODPATH = "../../"
+
+pycheck: 
+	(export PYTHONPATH=$(GRAMPS_PY_MODPATH); \
+	pychecker $(pkgdata_PYTHON));