[GRASS-SVN] r52851 - grass/trunk/scripts/g.extension

[svn_grass at osgeo.org]

Author: lucadelu
Date: 2012-08-23 00:54:38 -0700 (Thu, 23 Aug 2012)
New Revision: 52851

Modified:
   grass/trunk/scripts/g.extension/g.extension.html
   grass/trunk/scripts/g.extension/g.extension.py
Log:
fix rest documentation creation for scripts installed by g.extension

Modified: grass/trunk/scripts/g.extension/g.extension.html
===================================================================
--- grass/trunk/scripts/g.extension/g.extension.html	2012-08-23 07:47:12 UTC (rev 52850)
+++ grass/trunk/scripts/g.extension/g.extension.html	2012-08-23 07:54:38 UTC (rev 52851)
@@ -48,8 +48,7 @@
 <h2>AUTHOR</h2>
 
 Markus Neteler<br>
-<a href="http://geo.fsv.cvut.cz/gwiki/Landa">Martin
-Landa</a>, <a href="http://www.cvut.cz">Czech Technical University in
-Prague</a>, Czech Republic
+<a href="http://geo.fsv.cvut.cz/gwiki/Landa">Martin Landa</a>, 
+<a href="http://www.cvut.cz">Czech Technical University in Prague</a>, Czech Republic
 
 <p><i>Last changed: $Date$</i>

Modified: grass/trunk/scripts/g.extension/g.extension.py
===================================================================
--- grass/trunk/scripts/g.extension/g.extension.py	2012-08-23 07:47:12 UTC (rev 52850)
+++ grass/trunk/scripts/g.extension/g.extension.py	2012-08-23 07:54:38 UTC (rev 52851)
@@ -708,6 +708,7 @@
     dirs = { 'bin'     : os.path.join(tmpdir, name, 'bin'),
              'docs'    : os.path.join(tmpdir, name, 'docs'),
              'html'    : os.path.join(tmpdir, name, 'docs', 'html'),
+             'rest'    : os.path.join(tmpdir, name, 'docs', 'rest'),
              'man'     : os.path.join(tmpdir, name, 'docs', 'man', 'man1'),
              'scripts' : os.path.join(tmpdir, name, 'scripts'),
              'etc'     : os.path.join(tmpdir, name, 'etc'),
@@ -718,6 +719,7 @@
                    'MODULE_TOPDIR=%s' % gisbase.replace(' ', '\ '),
                    'BIN=%s' % dirs['bin'],
                    'HTMLDIR=%s' % dirs['html'],
+                   'RESTDIR=%s' % dirs['rest'],
                    'MANDIR=%s' % dirs['man'],
                    'SCRIPTDIR=%s' % dirs['scripts'],
                    'ETC=%s' % os.path.join(dirs['etc'],name)
@@ -748,6 +750,8 @@
                        stdout = outdev):
         grass.fatal(_('Compilation failed, sorry. Please check above error messages.'))
     
+    import pdb; pdb.set_trace()
+    
     if flags['i'] or classchar == 'wx':
         return 0
     
@@ -835,6 +839,7 @@
     for fpath in [os.path.join(options['prefix'], 'bin', name),
                   os.path.join(options['prefix'], 'scripts', name),
                   os.path.join(options['prefix'], 'docs', 'html', name + '.html'),
+                  os.path.join(options['prefix'], 'docs', 'rest', name + '.txt'),
                   os.path.join(options['prefix'], 'docs', 'man', 'man1', name + '.1')]:
         if os.path.isfile(fpath):
             if force:
@@ -910,6 +915,7 @@
 def check_dirs():
     create_dir(os.path.join(options['prefix'], 'bin'))           
     create_dir(os.path.join(options['prefix'], 'docs', 'html'))
+    create_dir(os.path.join(options['prefix'], 'docs', 'rest'))
     check_style_files('grass_logo.png')
     check_style_files('grassdocs.css')
     create_dir(os.path.join(options['prefix'], 'etc'))