[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gzz-commits] navidoc ./Makefile ./TODO-navidoc ./config.hima...
|
From: |
Asko Soukka |
|
Subject: |
[Gzz-commits] navidoc ./Makefile ./TODO-navidoc ./config.hima... |
|
Date: |
Mon, 07 Apr 2003 11:58:01 -0400 |
CVSROOT: /cvsroot/navidoc
Module name: navidoc
Changes by: Asko Soukka <address@hidden> 03/04/07 11:58:00
Modified files:
. : Makefile TODO-navidoc config.himalia config.py
rst2any.py
navidoc : __init__.py parser.py
navidoc/directives: mp.py pegboard.py
navidoc/link : __init__.py javadoc.py
navidoc/modules: metalink.py navbar.py
navidoc/mp : __init__.py uml.py
Added files:
navidoc/util : .cvsignore __init__.py debug.py parser.py
path.py
Removed files:
navidoc/utils : .cvsignore __init__.py debug.py parser.py
path.py
Log message:
updating targets, adding some exception catching for html-loop,
renaming utils
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/navidoc/navidoc/Makefile.diff?tr1=1.9&tr2=1.10&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/navidoc/navidoc/TODO-navidoc.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/navidoc/navidoc/config.himalia.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/navidoc/navidoc/config.py.diff?tr1=1.13&tr2=1.14&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/navidoc/navidoc/rst2any.py.diff?tr1=1.18&tr2=1.19&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/navidoc/navidoc/navidoc/__init__.py.diff?tr1=1.11&tr2=1.12&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/navidoc/navidoc/navidoc/parser.py.diff?tr1=1.8&tr2=1.9&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/navidoc/navidoc/navidoc/directives/mp.py.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/navidoc/navidoc/navidoc/directives/pegboard.py.diff?tr1=1.13&tr2=1.14&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/navidoc/navidoc/navidoc/link/__init__.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.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/navidoc/navidoc/navidoc/modules/metalink.py.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/navidoc/navidoc/navidoc/modules/navbar.py.diff?tr1=1.6&tr2=1.7&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/navidoc/navidoc/navidoc/mp/__init__.py.diff?tr1=1.9&tr2=1.10&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/navidoc/navidoc/navidoc/mp/uml.py.diff?tr1=1.8&tr2=1.9&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/navidoc/navidoc/navidoc/util/.cvsignore?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/navidoc/navidoc/navidoc/util/__init__.py?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/navidoc/navidoc/navidoc/util/debug.py?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/navidoc/navidoc/navidoc/util/parser.py?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/navidoc/navidoc/navidoc/util/path.py?rev=1.1
Patches:
Index: navidoc/Makefile
diff -u navidoc/Makefile:1.9 navidoc/Makefile:1.10
--- navidoc/Makefile:1.9 Wed Apr 2 02:50:16 2003
+++ navidoc/Makefile Mon Apr 7 11:58:00 2003
@@ -1,4 +1,4 @@
-#$Id: Makefile,v 1.9 2003/04/02 07:50:16 humppake Exp $
+#$Id: Makefile,v 1.10 2003/04/07 15:58:00 humppake Exp $
##########################################################################
CLASSPATH =$(NAVIDOC_DEPENDS)/jython.jar:$(shell echo $$CLASSPATH)
@@ -35,10 +35,10 @@
find . -name "*.class" | xargs rm -f
html:
- $(JYTHON) rst2any.py --html -d navidoc -d docutils -d pegboard.fail -d
mp.fail $(DBG) $(RST)
+ $(JYTHON) rst2any.py --html -d navidoc -d docutils -d pegboard -d
pegboard.fail -d mp.fail $(DBG) $(RST)
html-loop:
- $(JYTHON) rst2any.py --loop --html -d navidoc -d docutils -d
pegboard.fail -d mp.fail $(DBG) $(RST)
+ $(JYTHON) rst2any.py --loop --html -d navidoc -d docutils -d pegboard
-d pegboard.fail -d mp.fail $(DBG) $(RST)
latex:
$(JYTHON) rst2any.py --latex -d navidoc -d docutils $(DBG) $(RST)
@@ -46,9 +46,8 @@
latex-loop:
$(JYTHON) rst2any.py --loop --latex -d navidoc -d docutils $(DBG) $(RST)
-# !!NOTE!! navidoc make html is recursive
doc:
- make html RST="doc/" DBG="-d pegboard"
+ make html RST="doc/"
pegs:
- make html RST="doc/pegboard/" DBG="-d pegboard"
+ make html RST="doc/pegboard/"
Index: navidoc/TODO-navidoc
diff -u navidoc/TODO-navidoc:1.3 navidoc/TODO-navidoc:1.4
--- navidoc/TODO-navidoc:1.3 Wed Mar 26 10:36:17 2003
+++ navidoc/TODO-navidoc Mon Apr 7 11:58:00 2003
@@ -12,6 +12,8 @@
- add formal header
- probaly also template with recommended sectinos
- creates a proper .cvsignore
+ - make pegboard run with cpython, could be tested
+ with i.e. "./rst2any --html doc/"
0.2alpha1: Rewriting
anybody:
Index: navidoc/config.himalia
diff -u navidoc/config.himalia:1.2 navidoc/config.himalia:1.3
--- navidoc/config.himalia:1.2 Mon Apr 7 05:06:08 2003
+++ navidoc/config.himalia Mon Apr 7 11:58:00 2003
@@ -19,13 +19,13 @@
# MA 02111-1307 USA
#
-# $Id: config.himalia,v 1.2 2003/04/07 09:06:08 humppake Exp $
+# $Id: config.himalia,v 1.3 2003/04/07 15:58:00 humppake Exp $
__docformat__ = 'reStructuredText'
dbg = None
-import os, navidoc.utils.debug
+import os, navidoc.util.debug
#Environmental variable MPINPUTS should be relative to tmpdir,
#or be an absolute path.
@@ -42,7 +42,7 @@
output_filename = ''
# general debug filter
-dbg = navidoc.utils.debug.DebugFilter()
+dbg = navidoc.util.debug.DebugFilter()
# set the default docutils.conf
docutils = "./docutils.conf"
Index: navidoc/config.py
diff -u navidoc/config.py:1.13 navidoc/config.py:1.14
--- navidoc/config.py:1.13 Mon Apr 7 05:06:08 2003
+++ navidoc/config.py Mon Apr 7 11:58:00 2003
@@ -19,13 +19,13 @@
# MA 02111-1307 USA
#
-# $Id: config.py,v 1.13 2003/04/07 09:06:08 humppake Exp $
+# $Id: config.py,v 1.14 2003/04/07 15:58:00 humppake Exp $
__docformat__ = 'reStructuredText'
dbg = None
-import os, navidoc.utils.debug
+import os, navidoc.util.debug
#Environmental variable MPINPUTS should be relative to tmpdir,
#or be an absolute path.
@@ -42,7 +42,7 @@
output_filename = ''
# general debug filter
-dbg = navidoc.utils.debug.DebugFilter()
+dbg = navidoc.util.debug.DebugFilter()
# set the default docutils.conf
docutils = "./docutils.conf"
Index: navidoc/navidoc/__init__.py
diff -u navidoc/navidoc/__init__.py:1.11 navidoc/navidoc/__init__.py:1.12
--- navidoc/navidoc/__init__.py:1.11 Tue Apr 1 04:30:28 2003
+++ navidoc/navidoc/__init__.py Mon Apr 7 11:58:00 2003
@@ -19,7 +19,7 @@
# MA 02111-1307 USA
#
-#$Id: __init__.py,v 1.11 2003/04/01 09:30:28 humppake Exp $
+#$Id: __init__.py,v 1.12 2003/04/07 15:58:00 humppake Exp $
#
# Written by Asko Soukka
@@ -33,8 +33,15 @@
# Because docutils' own relative path has problems with
# paths beginning with '../', we use our own :-)
-import utils.path
-docutils.utils.relative_path = utils.path.relative_path
+import util.path
+docutils.utils.relative_path = util.path.relative_path
+
+class DocutilsException(Exception):
+ def __init__(self, system_message):
+ self.value = system_message.astext()
+ Exception.__init__(self, self.value)
+ def __str__(self):
+ return self.value
def docutils_system_message(self, level, message, *children, **kwargs):
"""
@@ -69,6 +76,7 @@
self.notify_observers(msg)
return msg
docutils.utils.Reporter.system_message = docutils_system_message
+docutils.utils.SystemMessage = DocutilsException
class Element:
"""
Index: navidoc/navidoc/directives/mp.py
diff -u navidoc/navidoc/directives/mp.py:1.3
navidoc/navidoc/directives/mp.py:1.4
--- navidoc/navidoc/directives/mp.py:1.3 Tue Apr 1 08:54:09 2003
+++ navidoc/navidoc/directives/mp.py Mon Apr 7 11:58:00 2003
@@ -19,7 +19,7 @@
# MA 02111-1307 USA
#
-# $Id: mp.py,v 1.3 2003/04/01 13:54:09 humppake Exp $
+# $Id: mp.py,v 1.4 2003/04/07 15:58:00 humppake Exp $
#
# Written by Asko Soukka, Benja Fallenstein
@@ -32,7 +32,7 @@
import config
-from navidoc.utils.path import *
+from navidoc.util.path import *
from navidoc.mp import mp2png, create_uml
dbg = config.dbg.shorthand('mp')
Index: navidoc/navidoc/directives/pegboard.py
diff -u navidoc/navidoc/directives/pegboard.py:1.13
navidoc/navidoc/directives/pegboard.py:1.14
--- navidoc/navidoc/directives/pegboard.py:1.13 Tue Apr 1 08:54:09 2003
+++ navidoc/navidoc/directives/pegboard.py Mon Apr 7 11:58:00 2003
@@ -19,7 +19,7 @@
# MA 02111-1307 USA
#
-# $Id: pegboard.py,v 1.13 2003/04/01 13:54:09 humppake Exp $
+# $Id: pegboard.py,v 1.14 2003/04/07 15:58:00 humppake Exp $
#
# Written by Benja Fallensten, Vesa Kaihlavirta, Asko Soukka
@@ -34,7 +34,7 @@
from docutils import nodes
from docutils.core import Publisher
-from navidoc.utils.path import *
+from navidoc.util.path import *
dbg = config.dbg.shorthand('pegboard')
dbg_fail = config.dbg.shorthand('pegboard.fail')
Index: navidoc/navidoc/link/__init__.py
diff -u navidoc/navidoc/link/__init__.py:1.5
navidoc/navidoc/link/__init__.py:1.6
--- navidoc/navidoc/link/__init__.py:1.5 Tue Apr 1 08:54:09 2003
+++ navidoc/navidoc/link/__init__.py Mon Apr 7 11:58:00 2003
@@ -19,7 +19,7 @@
# MA 02111-1307 USA
#
-#$Id: __init__.py,v 1.5 2003/04/01 13:54:09 humppake Exp $
+#$Id: __init__.py,v 1.6 2003/04/07 15:58:00 humppake Exp $
#
# Written by Tuomas Lukka, Asko Soukka
@@ -31,7 +31,7 @@
import navidoc
-from navidoc.utils.path import *
+from navidoc.util.path import *
dbg = config.dbg.shorthand('link')
Index: navidoc/navidoc/link/javadoc.py
diff -u navidoc/navidoc/link/javadoc.py:1.2 navidoc/navidoc/link/javadoc.py:1.3
--- navidoc/navidoc/link/javadoc.py:1.2 Tue Apr 1 08:54:09 2003
+++ navidoc/navidoc/link/javadoc.py Mon Apr 7 11:58:00 2003
@@ -19,7 +19,7 @@
# MA 02111-1307 USA
#
-#$Id: javadoc.py,v 1.2 2003/04/01 13:54:09 humppake Exp $
+#$Id: javadoc.py,v 1.3 2003/04/07 15:58:00 humppake Exp $
#
# Written by Asko Soukka
@@ -31,7 +31,7 @@
import navidoc
-from navidoc.utils.path import *
+from navidoc.util.path import *
dbg = config.dbg.shorthand('link')
Index: navidoc/navidoc/modules/metalink.py
diff -u navidoc/navidoc/modules/metalink.py:1.3
navidoc/navidoc/modules/metalink.py:1.4
--- navidoc/navidoc/modules/metalink.py:1.3 Fri Mar 28 08:08:57 2003
+++ navidoc/navidoc/modules/metalink.py Mon Apr 7 11:58:00 2003
@@ -19,7 +19,7 @@
# MA 02111-1307 USA
#
-#$Id: metalink.py,v 1.3 2003/03/28 13:08:57 humppake Exp $
+#$Id: metalink.py,v 1.4 2003/04/07 15:58:00 humppake Exp $
#
# Written by Asko Soukka
@@ -29,7 +29,7 @@
import os.path
-from navidoc.utils.path import *
+from navidoc.util.path import *
def postprocess(path):
"""
Index: navidoc/navidoc/modules/navbar.py
diff -u navidoc/navidoc/modules/navbar.py:1.6
navidoc/navidoc/modules/navbar.py:1.7
--- navidoc/navidoc/modules/navbar.py:1.6 Fri Mar 28 08:08:57 2003
+++ navidoc/navidoc/modules/navbar.py Mon Apr 7 11:58:00 2003
@@ -19,7 +19,7 @@
# MA 02111-1307 USA
#
-#$Id: navbar.py,v 1.6 2003/03/28 13:08:57 humppake Exp $
+#$Id: navbar.py,v 1.7 2003/04/07 15:58:00 humppake Exp $
#
# Written by Benja Fallenstein
@@ -31,7 +31,7 @@
import re, os
-from navidoc.utils.path import *
+from navidoc.util.path import *
dbg = config.dbg.shorthand('navbar')
Index: navidoc/navidoc/mp/__init__.py
diff -u navidoc/navidoc/mp/__init__.py:1.9 navidoc/navidoc/mp/__init__.py:1.10
--- navidoc/navidoc/mp/__init__.py:1.9 Tue Apr 1 08:54:09 2003
+++ navidoc/navidoc/mp/__init__.py Mon Apr 7 11:58:00 2003
@@ -19,7 +19,7 @@
# MA 02111-1307 USA
#
-# $Id: __init__.py,v 1.9 2003/04/01 13:54:09 humppake Exp $
+# $Id: __init__.py,v 1.10 2003/04/07 15:58:00 humppake Exp $
#
# Written by Tuomas Lukka, Asko Soukka
@@ -32,7 +32,7 @@
import os, os.path, re
import navidoc.link, navidoc.parser
-from navidoc.utils.path import *
+from navidoc.util.path import *
dbg = config.dbg.shorthand('mp')
dbg_fail = config.dbg.shorthand('mp.fail')
@@ -78,7 +78,7 @@
raise
MetapostException(slashify(config.mp_directory)+diagram+'.gen.mp'+' not found')
s = open(slashify(config.mp_directory)+diagram+'.gen.uml').read()
- l = navidoc.utils.parser.parse_indented(s)
+ l = navidoc.util.parser.parse_indented(s)
m = navidoc.parser.ElementList(l)
if len(extension) > 0: extension = '_'+extension
Index: navidoc/navidoc/mp/uml.py
diff -u navidoc/navidoc/mp/uml.py:1.8 navidoc/navidoc/mp/uml.py:1.9
--- navidoc/navidoc/mp/uml.py:1.8 Wed Apr 2 02:30:43 2003
+++ navidoc/navidoc/mp/uml.py Mon Apr 7 11:58:00 2003
@@ -19,7 +19,7 @@
# MA 02111-1307 USA
#
-# $Id: uml.py,v 1.8 2003/04/02 07:30:43 humppake Exp $
+# $Id: uml.py,v 1.9 2003/04/07 15:58:00 humppake Exp $
#
# Written by Tuomas Lukka, Asko Soukka
@@ -31,7 +31,7 @@
import re
-from navidoc.utils.parser import *
+from navidoc.util.parser import *
dbg = config.dbg.shorthand('uml')
Index: navidoc/navidoc/parser.py
diff -u navidoc/navidoc/parser.py:1.8 navidoc/navidoc/parser.py:1.9
--- navidoc/navidoc/parser.py:1.8 Tue Apr 1 04:30:28 2003
+++ navidoc/navidoc/parser.py Mon Apr 7 11:58:00 2003
@@ -19,7 +19,7 @@
# MA 02111-1307 USA
#
-# $Id: parser.py,v 1.8 2003/04/01 09:30:28 humppake Exp $
+# $Id: parser.py,v 1.9 2003/04/07 15:58:00 humppake Exp $
#
# Written by Tuomas Lukka, Asko Soukka
@@ -30,7 +30,7 @@
import config
import mp, link
-from utils.parser import *
+from util.parser import *
dbg = config.dbg.shorthand('parser')
Index: navidoc/rst2any.py
diff -u navidoc/rst2any.py:1.18 navidoc/rst2any.py:1.19
--- navidoc/rst2any.py:1.18 Tue Apr 1 08:54:09 2003
+++ navidoc/rst2any.py Mon Apr 7 11:58:00 2003
@@ -21,7 +21,7 @@
# MA 02111-1307 USA
#
-#$Id: rst2any.py,v 1.18 2003/04/01 13:54:09 humppake Exp $
+#$Id: rst2any.py,v 1.19 2003/04/07 15:58:00 humppake Exp $
#
# Written by Asko Soukka
@@ -38,7 +38,7 @@
#import navidoc.writers
import navidoc.modules
-from navidoc.utils.path import *
+from navidoc.util.path import *
import navidoc.mp.uml
import navidoc.link.javadoc
@@ -166,27 +166,36 @@
#the first pass, docutils
for filepath in sys.argv:
- run_docutils(filepath)
-
+ try:
+ run_docutils(filepath)
+ except navidoc.DocutilsException, e:
+ dbg("Fatal, DocutilsException: "+e.value)
+ break
+ except navidoc.parser.ParserException, e:
+ dbg("Fatal, ParserException: "+e.value)
+ break
+ except navidoc.mp.MetapostException, e:
+ dbg("Fatal, MetapostException: "+e.value)
+ break
+ except navidoc.mp.uml.UMLException, e:
+ dbg("Fatal, UMLException: "+e.value)
+ break
#the second pass, postprocess
for filepath in sys.argv:
- postprocess(filepath)
-
- # try:
- # run_convert(path)
- # except umltool.umlException, e:
- # print "umldoc: umlException exception occurred:", e.value
- # break
-
- #the second pass, link
- #for path in sys.argv[1:]:
- # run_linker(path)
-
- # try:
- # run_linker(path)
- # except umltool.umlException, e:
- # print "umldoc: umlException exception occurred:", e.value
- # break
+ try:
+ postprocess(filepath)
+ except navidoc.DocutilsException, e:
+ dbg("Fatal, DocutilsException: "+e.value)
+ break
+ except navidoc.parser.ParserException, e:
+ dbg("Fatal, ParserException: "+e.value)
+ break
+ except navidoc.mp.MetapostException, e:
+ dbg("Fatal, MetapostException: "+e.value)
+ break
+ except navidoc.mp.uml.UMLException, e:
+ dbg("Fatal, UMLException: "+e.value)
+ break
if not loop: break
print "\n\n"+'Navidoc finished. Press Enter to recompile.'+"\n"+ \
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gzz-commits] navidoc ./Makefile ./TODO-navidoc ./config.hima...,
Asko Soukka <=