[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gzz-commits] navidoc ./config.himalia ./config.py navidoc/pa...
From: |
Asko Soukka |
Subject: |
[Gzz-commits] navidoc ./config.himalia ./config.py navidoc/pa... |
Date: |
Tue, 20 May 2003 06:40:47 -0400 |
CVSROOT: /cvsroot/navidoc
Module name: navidoc
Changes by: Asko Soukka <address@hidden> 03/05/20 06:40:47
Modified files:
. : config.himalia config.py
navidoc : parser.py
navidoc/link : __init__.py docxx.py javadoc.py
Log message:
split linkpackage into clinkpakage and jlinkpackage
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/navidoc/navidoc/config.himalia.diff?tr1=1.13&tr2=1.14&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/navidoc/navidoc/config.py.diff?tr1=1.25&tr2=1.26&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/navidoc/navidoc/navidoc/parser.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.13&tr2=1.14&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/navidoc/navidoc/navidoc/link/docxx.py.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/navidoc/navidoc/navidoc/link/javadoc.py.diff?tr1=1.6&tr2=1.7&r1=text&r2=text
Patches:
Index: navidoc/config.himalia
diff -u navidoc/config.himalia:1.13 navidoc/config.himalia:1.14
--- navidoc/config.himalia:1.13 Tue May 20 05:49:19 2003
+++ navidoc/config.himalia Tue May 20 06:40:46 2003
@@ -19,7 +19,7 @@
# MA 02111-1307 USA
#
-# $Id: config.himalia,v 1.13 2003/05/20 09:49:19 humppake Exp $
+# $Id: config.himalia,v 1.14 2003/05/20 10:40:46 humppake Exp $
__docformat__ = 'reStructuredText'
@@ -49,6 +49,7 @@
# settings for linking javadoc
# the search order is ascending, sudden death
+linkpackages = {} # holder of packagenames, will members will be cleaned after
every diagram
javadoc_directories = ['../ffdoc/libvob/javadoc',
'../ffdoc/storm/javadoc',
'../ffdoc/alph/javadoc',
@@ -56,7 +57,6 @@
'../ffdoc/loom/javadoc',
'../ffdoc/navidoc/javadoc'
]
-linkpackage = '' # dynamic
link_redirection = {'navidoc': '../ffdoc/navidoc',
'libvob': '../ffdoc/libvoc',
'storm': '../ffdoc/storm',
Index: navidoc/config.py
diff -u navidoc/config.py:1.25 navidoc/config.py:1.26
--- navidoc/config.py:1.25 Tue May 20 05:49:19 2003
+++ navidoc/config.py Tue May 20 06:40:46 2003
@@ -19,7 +19,7 @@
# MA 02111-1307 USA
#
-# $Id: config.py,v 1.25 2003/05/20 09:49:19 humppake Exp $
+# $Id: config.py,v 1.26 2003/05/20 10:40:46 humppake Exp $
__docformat__ = 'reStructuredText'
@@ -42,6 +42,7 @@
# settings for linking javadoc
# the search order is ascending, sudden death
+linkpackages = {} # holder of packagenames, will members will be cleaned after
every diagram
javadoc_directories = ['../libvob/doc/javadoc',
'../storm/doc/javadoc',
'../alph/doc/javadoc',
@@ -49,7 +50,6 @@
'../loom/doc/javadoc',
'../navidoc/doc/javadoc',
]
-linkpackage = '' # dynamic
link_redirection = {'navidoc': '../navidoc/doc',
'libvob': '../libvob/doc',
'storm': '../storm/doc',
Index: navidoc/navidoc/link/__init__.py
diff -u navidoc/navidoc/link/__init__.py:1.13
navidoc/navidoc/link/__init__.py:1.14
--- navidoc/navidoc/link/__init__.py:1.13 Tue May 20 05:49:19 2003
+++ navidoc/navidoc/link/__init__.py Tue May 20 06:40:47 2003
@@ -19,7 +19,7 @@
# MA 02111-1307 USA
#
-#$Id: __init__.py,v 1.13 2003/05/20 09:49:19 humppake Exp $
+#$Id: __init__.py,v 1.14 2003/05/20 10:40:47 humppake Exp $
#
# Written by Tuomas Lukka, Asko Soukka
@@ -35,17 +35,6 @@
from navidoc.util.path import *
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'
Index: navidoc/navidoc/link/docxx.py
diff -u navidoc/navidoc/link/docxx.py:1.1 navidoc/navidoc/link/docxx.py:1.2
--- navidoc/navidoc/link/docxx.py:1.1 Tue May 20 05:49:19 2003
+++ navidoc/navidoc/link/docxx.py Tue May 20 06:40:47 2003
@@ -19,7 +19,7 @@
# MA 02111-1307 USA
#
-#$Id: docxx.py,v 1.1 2003/05/20 09:49:19 humppake Exp $
+#$Id: docxx.py,v 1.2 2003/05/20 10:40:47 humppake Exp $
#
# Written by Asko Soukka
@@ -35,8 +35,10 @@
from navidoc.util.path import *
dbg = config.dbg.shorthand('link')
+config.linkpackages['clink'] = ''
targets = {}
+
for docxx in config.docxx_directories:
if os.path.isfile(slashify(docxx)+'index.html'):
index = open(slashify(docxx)+'index.html')
@@ -46,6 +48,17 @@
for link, name in tuples:
targets[name] = slashify(docxx)+link#
+class CLinkPackage(navidoc.Element):
+ key = "clinkpackage"
+
+ def __init__(self, var, s, list):
+ dbg("Set clinkpackage to: "+s)
+ config.linkpackages['clink'] = s
+
+ def setup_code(self): return ''
+
+ def draw_code(self): return ''
+
class CLink(navidoc.link.Link):
key = "clink"
@@ -65,10 +78,10 @@
parts = self.target.split('.')
self.target = '::'.join(parts);
- if len(config.linkpackage) > 0:
- package_parts = config.linkpackage.split('.')
- linkpackage = '::'.join(package_parts)
- self.target = linkpackage+'::'+self.target
+ if len(config.linkpackages['clink']) > 0:
+ package_parts = config.linkpackages['clink'].split('.')
+ clinkpackage = '::'.join(package_parts)
+ self.target = clinkpackage+'::'+self.target
if targets.has_key(self.target):
self.target = targets[self.target]
Index: navidoc/navidoc/link/javadoc.py
diff -u navidoc/navidoc/link/javadoc.py:1.6 navidoc/navidoc/link/javadoc.py:1.7
--- navidoc/navidoc/link/javadoc.py:1.6 Fri Apr 25 14:00:02 2003
+++ navidoc/navidoc/link/javadoc.py Tue May 20 06:40:47 2003
@@ -19,7 +19,7 @@
# MA 02111-1307 USA
#
-#$Id: javadoc.py,v 1.6 2003/04/25 18:00:02 humppake Exp $
+#$Id: javadoc.py,v 1.7 2003/05/20 10:40:47 humppake Exp $
#
# Written by Asko Soukka
@@ -36,12 +36,14 @@
dbg = config.dbg.shorthand('link')
+config.linkpackages['jlink'] = ''
+
class JLinkPackage(navidoc.Element):
key = "jlinkpackage"
def __init__(self, var, s, list):
- dbg("Set linkpackage to: "+s)
- config.linkpackage = s
+ dbg("Set jlinkpackage to: "+s)
+ config.linkpackages['jlink'] = s
def setup_code(self): return ''
@@ -69,8 +71,8 @@
if re.match('^[a-z]', parts[-1]):
self.target = slashify(self.target) + 'package-summary.html'
else:
- if len(config.linkpackage) > 0:
- package_parts = config.linkpackage.split('.')
+ if len(config.linkpackages['jlink']) > 0:
+ package_parts = config.linkpackages['jlink'].split('.')
jlinkpackage = '/'.join(package_parts)
self.target = slashify(jlinkpackage)+self.target
self.target = self.target + '.html'
Index: navidoc/navidoc/parser.py
diff -u navidoc/navidoc/parser.py:1.13 navidoc/navidoc/parser.py:1.14
--- navidoc/navidoc/parser.py:1.13 Tue May 20 05:49:19 2003
+++ navidoc/navidoc/parser.py Tue May 20 06:40:46 2003
@@ -19,7 +19,7 @@
# MA 02111-1307 USA
#
-# $Id: parser.py,v 1.13 2003/05/20 09:49:19 humppake Exp $
+# $Id: parser.py,v 1.14 2003/05/20 10:40:46 humppake Exp $
#
# Written by Tuomas Lukka, Asko Soukka
@@ -81,7 +81,8 @@
Initializes ElementList by parsing all elements in list.
"""
dbg("List: "+str(list))
- config.linkpackage = ''
+ for key in config.linkpackages.keys():
+ config.linkpackages[key] = ''
config.element_list = self # XXX
self.factor = ElementFactor([mp, link])
self.list = []
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gzz-commits] navidoc ./config.himalia ./config.py navidoc/pa...,
Asko Soukka <=