[Gzz-commits] navidoc ./Makefile ./config.py navidoc/directiv...

[Asko Soukka]

CVSROOT:        /cvsroot/navidoc
Module name:    navidoc
Branch:         
Changes by:     Asko Soukka <address@hidden>    03/06/13 08:00:30

Modified files:
        .              : Makefile config.py 
        navidoc/directives: pegboard.py 
        navidoc/link   : docxx.py javadoc.py 
        navidoc/mp     : __init__.py 

Log message:
        target update

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/navidoc/navidoc/Makefile.diff?tr1=1.18&tr2=1.19&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/navidoc/navidoc/config.py.diff?tr1=1.37&tr2=1.38&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/navidoc/navidoc/navidoc/directives/pegboard.py.diff?tr1=1.21&tr2=1.22&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/navidoc/navidoc/navidoc/link/docxx.py.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/navidoc/navidoc/navidoc/link/javadoc.py.diff?tr1=1.9&tr2=1.10&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/navidoc/navidoc/navidoc/mp/__init__.py.diff?tr1=1.37&tr2=1.38&r1=text&r2=text

Patches:
Index: navidoc/Makefile
diff -u navidoc/Makefile:1.18 navidoc/Makefile:1.19
--- navidoc/Makefile:1.18       Mon Jun  2 08:43:58 2003
+++ navidoc/Makefile    Fri Jun 13 08:00:29 2003
@@ -1,4 +1,4 @@
-#$Id: Makefile,v 1.18 2003/06/02 12:43:58 humppake Exp $
+#$Id: Makefile,v 1.19 2003/06/13 12:00:29 humppake Exp $
 
 all: java docs
 
@@ -59,7 +59,7 @@
 
 ##########################################################################
 # General documentation targets
-docs: java-doc navi-doc navilink
+docs: java-doc navidoc navilink
 
 DOCPKGS= -subpackages org
 #DOCPKGS= org.nongnu.navidoc.util
@@ -71,12 +71,6 @@
        mkdir -p doc/javadoc
        javadoc $(JAVADOCOPTS) -d doc/javadoc -sourcepath . $(DOCPKGS)
 
-navi-doc: # Compiles ReST into HTML
-       make html RST="doc/"
-
-navilink: # Bi-directional linking using imagemaps
-       make imagemap HTML="doc/"
-
 peg: # Creates a new PEG, uses python for quick use
        make new-peg PEGDIR="doc/pegboard"
 
@@ -85,18 +79,28 @@
 #
 ##########################################################################
 # Navidoc targets
-new-peg: # Creates a new PEG, uses python for quick use
+navidoc: # Compiles reST into HTML
+       make html RST="doc/"
+
+navilink: # Bi-directional linking using imagemaps
+       make imagemap HTML="doc/"
+
+naviloop: # Compiles, links, loops
+       make html-loop DBG="--imagemap $(DBG)" RST="$(RST)"
+
+new-peg: # Creates a new PEG
        $(JYTHON) newpeg.py $(PEGDIR)
-html: # Compiles ReST into HTML, directories are processed recursively
-       $(JYTHON) rst2any.py --html -d navidoc -d docutils -d pegboard -d 
pegboard.fail -d mp.fail $(DBG) $(RST)
+
+html: # Compiles reST into HTML, directories are processed recursively
+       $(JYTHON) rst2any.py --html -d navidoc -d docutils -d pegboard -d 
mp.fail $(DBG) $(RST)
 
 html-loop: # Loop version for quick recompiling
-       $(JYTHON) rst2any.py --loop --html -d navidoc -d docutils -d pegboard 
-d pegboard.fail -d mp.fail $(DBG) $(RST)
+       $(JYTHON) rst2any.py --loop --html -d navidoc -d docutils -d pegboard 
-d mp.fail $(DBG) $(RST)
 
 imagemap: # Bi-directional linking using imagemaps
        $(JYTHON) rst2any.py --imagemap -d navidoc -d mp.fail $(DBG) $(HTML)
 
-latex: # Compiles ReST into LaTeX, directories are processed recursively
+latex: # Compiles reST into LaTeX, directories are processed recursively
        $(JYTHON) rst2any.py --latex -d navidoc -d docutils $(DBG) $(RST)
 
 latex-loop: # Loop version for quick recompiling
Index: navidoc/config.py
diff -u navidoc/config.py:1.37 navidoc/config.py:1.38
--- navidoc/config.py:1.37      Thu Jun  5 07:05:07 2003
+++ navidoc/config.py   Fri Jun 13 08:00:29 2003
@@ -19,7 +19,7 @@
 # MA  02111-1307  USA
 # 
 
-# $Id: config.py,v 1.37 2003/06/05 11:05:07 humppake Exp $
+# $Id: config.py,v 1.38 2003/06/13 12:00:29 humppake Exp $
 
 __docformat__ = 'reStructuredText'
 
@@ -39,7 +39,7 @@
 
 # initializing dynamic settings
 # should be kept up-to-date in code
-# always when compiling ReST or diagrams
+# always when compiling reST or diagrams
 working_directory = '.'
 input_filename = ''
 output_filename = ''
Index: navidoc/navidoc/directives/pegboard.py
diff -u navidoc/navidoc/directives/pegboard.py:1.21 
navidoc/navidoc/directives/pegboard.py:1.22
--- navidoc/navidoc/directives/pegboard.py:1.21 Wed Jun  4 08:42:06 2003
+++ navidoc/navidoc/directives/pegboard.py      Fri Jun 13 08:00:29 2003
@@ -19,7 +19,7 @@
 # MA  02111-1307  USA
 # 
 
-# $Id: pegboard.py,v 1.21 2003/06/04 12:42:06 humppake Exp $
+# $Id: pegboard.py,v 1.22 2003/06/13 12:00:29 humppake Exp $
 
 #
 # Written by Benja Fallensten, Vesa Kaihlavirta, Asko Soukka
@@ -175,7 +175,7 @@
                 
             except:
                 dbg_fail('PEG %s: Docutil raised an exception while converting 
%s. ' % (pegdir, rstfile))
-                dbg_fail('Conversion failed and HTML not created.\n')
+                dbg_fail('Conversion failed and pegbaord data could not be 
collected.\n')
 
         config.dbg.enable('docutils')
         config.mp_generate = 1
Index: navidoc/navidoc/link/docxx.py
diff -u navidoc/navidoc/link/docxx.py:1.5 navidoc/navidoc/link/docxx.py:1.6
--- navidoc/navidoc/link/docxx.py:1.5   Wed Jun 11 03:49:34 2003
+++ navidoc/navidoc/link/docxx.py       Fri Jun 13 08:00:30 2003
@@ -19,7 +19,7 @@
 # MA  02111-1307  USA
 # 
 
-#$Id: docxx.py,v 1.5 2003/06/11 07:49:34 humppake Exp $
+#$Id: docxx.py,v 1.6 2003/06/13 12:00:30 humppake Exp $
 
 #
 # Written by Asko Soukka
@@ -35,6 +35,7 @@
 from navidoc.util.path import *
 
 dbg = config.dbg.shorthand('link')
+dbg_navidoc = config.dbg.shorthand('navidoc')
 config.linkpackages['clink'] = ''
 
 targets = {}
@@ -76,6 +77,8 @@
             else: self.target = toks[0]
             self.set_target()
             self.set_status()
+            if self.error:
+                dbg_navidoc('[clink] Target not found: %s.' % (self.target))
             dbg(self.key+" Doc++ target: %s, error: %s" % (self.target, 
self.error))
 
     def set_target(self):
Index: navidoc/navidoc/link/javadoc.py
diff -u navidoc/navidoc/link/javadoc.py:1.9 navidoc/navidoc/link/javadoc.py:1.10
--- navidoc/navidoc/link/javadoc.py:1.9 Wed Jun 11 03:49:34 2003
+++ navidoc/navidoc/link/javadoc.py     Fri Jun 13 08:00:30 2003
@@ -19,7 +19,7 @@
 # MA  02111-1307  USA
 # 
 
-#$Id: javadoc.py,v 1.9 2003/06/11 07:49:34 humppake Exp $
+#$Id: javadoc.py,v 1.10 2003/06/13 12:00:30 humppake Exp $
 
 #
 # Written by Asko Soukka
@@ -35,6 +35,7 @@
 from navidoc.util.path import *
 
 dbg = config.dbg.shorthand('link')
+dbg_navidoc = config.dbg.shorthand('navidoc')
 
 config.linkpackages['jlink'] = ''
 
@@ -64,6 +65,9 @@
             else: self.target = toks[0]
             self.set_target()
             self.set_status()
+
+            if self.error:
+                dbg_navidoc('[jlink] Target not found: %s.' % (self.target))
             dbg(self.key+" Javadoc target: %s, error: %s" % (self.target, 
self.error))
 
     def set_target(self):
Index: navidoc/navidoc/mp/__init__.py
diff -u navidoc/navidoc/mp/__init__.py:1.37 navidoc/navidoc/mp/__init__.py:1.38
--- navidoc/navidoc/mp/__init__.py:1.37 Wed Jun 11 03:49:34 2003
+++ navidoc/navidoc/mp/__init__.py      Fri Jun 13 08:00:30 2003
@@ -19,7 +19,7 @@
 # MA  02111-1307  USA
 # 
 
-# $Id: __init__.py,v 1.37 2003/06/11 07:49:34 humppake Exp $
+# $Id: __init__.py,v 1.38 2003/06/13 12:00:30 humppake Exp $
 
 #
 # Written by Tuomas Lukka, Asko Soukka
@@ -36,6 +36,7 @@
 from navidoc.util.parser import random_var
 
 dbg = config.dbg.shorthand('mp')
+dbg_navidoc = config.dbg.shorthand('navidoc')
 dbg_fail = config.dbg.shorthand('mp.fail')
 
 rough_edges = []
@@ -253,7 +254,8 @@
 
     log = 
open(slashify(config.mp_directory)+diagram+config.midfix+'.mp.log').read()
     if log.find("\n"+'!') != -1:
-        dbg_fail('Error occurred while processing the diagram. The log is 
shown below.')
+        dbg_navidoc('[mp] Converting diagram %s failed.' % (diagram))
+        dbg_fail('An error was found from MetPost log when convertin diagram 
%s. The log is shown below.' % (diagram))
         dbg_fail(log)
     
     links = []