[Commit-gnuradio] r9297 - in gnuradio/branches/developers/jblum/grc/grc/src/grc_gnuradio: . utils

[jblum]

Author: jblum
Date: 2008-08-15 10:07:38 -0600 (Fri, 15 Aug 2008)
New Revision: 9297

Modified:
   gnuradio/branches/developers/jblum/grc/grc/src/grc_gnuradio/Constants.py.in
   
gnuradio/branches/developers/jblum/grc/grc/src/grc_gnuradio/utils/extract_docs.py
Log:
docs dependency

Modified: 
gnuradio/branches/developers/jblum/grc/grc/src/grc_gnuradio/Constants.py.in
===================================================================
--- gnuradio/branches/developers/jblum/grc/grc/src/grc_gnuradio/Constants.py.in 
2008-08-15 01:12:02 UTC (rev 9296)
+++ gnuradio/branches/developers/jblum/grc/grc/src/grc_gnuradio/Constants.py.in 
2008-08-15 16:07:38 UTC (rev 9297)
@@ -27,8 +27,9 @@
 PYEXEC = @grc_gnuradio_pyexec@
 
 #setup paths
-DATA_PATH = @grc_gnuradio_data_dir@
-BLOCK_PATH = os.path.join(DATA_PATH, 'blocks')
+DOCS_DIR = @gnuradio_xml_docs_dir@
+DATA_DIR = @grc_gnuradio_data_dir@
+BLOCK_PATH = os.path.join(DATA_DIR, 'blocks')
 HIER_BLOCKS_LIB_PATH = os.path.join(os.path.expanduser('~'), '.grc_gnuradio')
 
 #file creation modes
@@ -36,8 +37,8 @@
 HIER_BLOCK_FILE_MODE = stat.S_IRUSR | stat.S_IWUSR | stat.S_IRGRP | 
stat.S_IWGRP | stat.S_IROTH
 
 #data files
-FLOW_GRAPH_TEMPLATE = os.path.join(DATA_PATH, 'flow_graph.tmpl')
-BLOCK_DTD = os.path.join(DATA_PATH, 'block.dtd')
-BLOCK_TREE = os.path.join(DATA_PATH, 'block_tree.xml')
-DEFAULT_FLOW_GRAPH = os.path.join(DATA_PATH, 'default_flow_graph.grc.xml')
+FLOW_GRAPH_TEMPLATE = os.path.join(DATA_DIR, 'flow_graph.tmpl')
+BLOCK_DTD = os.path.join(DATA_DIR, 'block.dtd')
+BLOCK_TREE = os.path.join(DATA_DIR, 'block_tree.xml')
+DEFAULT_FLOW_GRAPH = os.path.join(DATA_DIR, 'default_flow_graph.grc.xml')
 

Modified: 
gnuradio/branches/developers/jblum/grc/grc/src/grc_gnuradio/utils/extract_docs.py
===================================================================
--- 
gnuradio/branches/developers/jblum/grc/grc/src/grc_gnuradio/utils/extract_docs.py
   2008-08-15 01:12:02 UTC (rev 9296)
+++ 
gnuradio/branches/developers/jblum/grc/grc/src/grc_gnuradio/utils/extract_docs.py
   2008-08-15 16:07:38 UTC (rev 9297)
@@ -20,10 +20,10 @@
 #Extract documentation from the gnuradio doxygen files.
 address@hidden Josh Blum
 
+from grc_gnuradio.Constants import *
 from lxml import etree
 import os
 
-DOCS_DIR = '/usr/local/share/doc/grc_gnuradio_docs/'
 DOXYGEN_NAME_XPATH = '/doxygen/compounddef/compoundname'
 DOXYGEN_BRIEFDESC_GR_XPATH = '/doxygen/compounddef/briefdescription'
 DOXYGEN_DETAILDESC_GR_XPATH = '/doxygen/compounddef/detaileddescription'