[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gzz-commits] navidoc ./config.himalia ./config.py ./rst2any....
From: |
Asko Soukka |
Subject: |
[Gzz-commits] navidoc ./config.himalia ./config.py ./rst2any.... |
Date: |
Tue, 20 May 2003 05:49:19 -0400 |
CVSROOT: /cvsroot/navidoc
Module name: navidoc
Changes by: Asko Soukka <address@hidden> 03/05/20 05:49:19
Modified files:
. : config.himalia config.py rst2any.py
navidoc : parser.py
navidoc/link : __init__.py
Added files:
navidoc/link : docxx.py
Log message:
link module, docxx plugin
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/navidoc/navidoc/config.himalia.diff?tr1=1.12&tr2=1.13&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/navidoc/navidoc/config.py.diff?tr1=1.24&tr2=1.25&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/navidoc/navidoc/rst2any.py.diff?tr1=1.24&tr2=1.25&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/navidoc/navidoc/navidoc/parser.py.diff?tr1=1.12&tr2=1.13&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/navidoc/navidoc/navidoc/link/docxx.py?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/navidoc/navidoc/navidoc/link/__init__.py.diff?tr1=1.12&tr2=1.13&r1=text&r2=text
Patches:
Index: navidoc/config.himalia
diff -u navidoc/config.himalia:1.12 navidoc/config.himalia:1.13
--- navidoc/config.himalia:1.12 Wed Apr 30 06:34:39 2003
+++ navidoc/config.himalia Tue May 20 05:49:19 2003
@@ -19,7 +19,7 @@
# MA 02111-1307 USA
#
-# $Id: config.himalia,v 1.12 2003/04/30 10:34:39 humppake Exp $
+# $Id: config.himalia,v 1.13 2003/05/20 09:49:19 humppake Exp $
__docformat__ = 'reStructuredText'
@@ -57,6 +57,20 @@
'../ffdoc/navidoc/javadoc'
]
linkpackage = '' # dynamic
+link_redirection = {'navidoc': '../ffdoc/navidoc',
+ 'libvob': '../ffdoc/libvoc',
+ 'storm': '../ffdoc/storm',
+ 'alph': '../ffdoc/alph',
+ 'fenfire': '../ffdoc/fenfire',
+ 'loom': '../ffdoc/loom',
+ }
+docxx_directories = ['../ffdoc/libvob/docxx',
+ '../ffdoc/storm/docxx',
+ '../ffdoc/alph/docxx',
+ '../ffdoc/fenfire/docxx',
+ '../ffdoc/loom/docxx',
+ '../ffdoc/navidoc/docxx',
+ ]
# general debug filter
dbg = navidoc.util.debug.DebugFilter()
Index: navidoc/config.py
diff -u navidoc/config.py:1.24 navidoc/config.py:1.25
--- navidoc/config.py:1.24 Wed Apr 30 06:34:39 2003
+++ navidoc/config.py Tue May 20 05:49:19 2003
@@ -19,7 +19,7 @@
# MA 02111-1307 USA
#
-# $Id: config.py,v 1.24 2003/04/30 10:34:39 humppake Exp $
+# $Id: config.py,v 1.25 2003/05/20 09:49:19 humppake Exp $
__docformat__ = 'reStructuredText'
@@ -47,9 +47,23 @@
'../alph/doc/javadoc',
'../fenfire/docs/javadoc',
'../loom/doc/javadoc',
- '../navidoc/doc/javadoc'
+ '../navidoc/doc/javadoc',
]
linkpackage = '' # dynamic
+link_redirection = {'navidoc': '../navidoc/doc',
+ 'libvob': '../libvob/doc',
+ 'storm': '../storm/doc',
+ 'alph': '../alph/doc',
+ 'fenfire': '../fenfire/docs',
+ 'loom': '../loom/doc',
+ }
+docxx_directories = ['../libvob/doc/docxx',
+ '../storm/doc/docxx',
+ '../alph/doc/docxx',
+ '../fenfire/docs/docxx',
+ '../loom/doc/docxx',
+ '../navidoc/doc/docxx',
+ ]
# initializing dynamic settings
# should be kept up-to-date in code
Index: navidoc/navidoc/link/__init__.py
diff -u navidoc/navidoc/link/__init__.py:1.12
navidoc/navidoc/link/__init__.py:1.13
--- navidoc/navidoc/link/__init__.py:1.12 Fri Apr 25 13:03:09 2003
+++ navidoc/navidoc/link/__init__.py Tue May 20 05:49:19 2003
@@ -19,7 +19,7 @@
# MA 02111-1307 USA
#
-#$Id: __init__.py,v 1.12 2003/04/25 17:03:09 humppake Exp $
+#$Id: __init__.py,v 1.13 2003/05/20 09:49:19 humppake Exp $
#
# Written by Tuomas Lukka, Asko Soukka
@@ -36,6 +36,17 @@
dbg = config.dbg.shorthand('link')
+class JLinkPackage(navidoc.Element):
+ key = "linkpackage"
+
+ def __init__(self, var, s, list):
+ dbg("Set linkpackage to: "+s)
+ config.linkpackage = s
+
+ def setup_code(self): return ''
+
+ def draw_code(self): return ''
+
class Link (navidoc.Element):
key = 'link'
@@ -50,13 +61,27 @@
"""
Initilizes link.
"""
- dbg(self.key+" VAR: %s, S: %s, LIST: %s" % (var, s, list))
+ dbg(self.key+' VAR: %s, S: %s, LIST: %s' % (var, s, list))
+
+ redirection_path = config.working_directory
+ if (len(s.split(' ')) > 0):
+ """
+ The 'link' may be followed by an attributed, which is
+ interpreted as keyword for one of the redirections mapped
+ in config.
+ """
+ redirection = s.split(' ')[-1]
+ s = s[0:len(s)-len(redirection)-1]
+ if config.link_redirection.has_key(redirection):
+ redirection_path = config.link_redirection[redirection]
+ dbg('Redirection %s: %s' % (redirection, redirection_path))
+
self.title = s.strip()
if (len(list) > 0):
"""
Multiple link could be given.
- Let working link overwrite current.
+ Let the last working one overwrite others.
"""
for link in list:
if type(link) == type([]):
@@ -64,9 +89,9 @@
if self.target == None or \
not os.path.isfile(self.target):
if config.link_base_directory == None:
- self.target =
os.path.normpath(slashify(config.working_directory) + link)
+ self.target =
os.path.normpath(slashify(redirection_path) + link)
else:
- self.target =
os.path.normpath(slashify(config.link_base_directory) + link)
+ self.target =
os.path.normpath(slashify(redirection_path) + link)
"""
Final check and setting attributes.
Index: navidoc/navidoc/parser.py
diff -u navidoc/navidoc/parser.py:1.12 navidoc/navidoc/parser.py:1.13
--- navidoc/navidoc/parser.py:1.12 Fri Apr 25 14:00:02 2003
+++ navidoc/navidoc/parser.py Tue May 20 05:49:19 2003
@@ -19,7 +19,7 @@
# MA 02111-1307 USA
#
-# $Id: parser.py,v 1.12 2003/04/25 18:00:02 humppake Exp $
+# $Id: parser.py,v 1.13 2003/05/20 09:49:19 humppake Exp $
#
# Written by Tuomas Lukka, Asko Soukka
@@ -46,6 +46,7 @@
for module_path in module_paths:
dbg ("Checking module: "+str(module_path))
self.types.update(keys_for_classes(module_path, self.top_class))
+ print dir(module_path)
for module in dir(module_path):
module = getattr(module_path, module)
if type(module) == type(navidoc):
Index: navidoc/rst2any.py
diff -u navidoc/rst2any.py:1.24 navidoc/rst2any.py:1.25
--- navidoc/rst2any.py:1.24 Tue Apr 29 15:10:36 2003
+++ navidoc/rst2any.py Tue May 20 05:49:19 2003
@@ -21,7 +21,7 @@
# MA 02111-1307 USA
#
-#$Id: rst2any.py,v 1.24 2003/04/29 19:10:36 humppake Exp $
+#$Id: rst2any.py,v 1.25 2003/05/20 09:49:19 humppake Exp $
#
# Written by Asko Soukka
@@ -44,6 +44,7 @@
import navidoc.mp.uml
import navidoc.link.javadoc
+import navidoc.link.docxx
"""
The main frontend for running Navidoc.
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gzz-commits] navidoc ./config.himalia ./config.py ./rst2any....,
Asko Soukka <=