[Gzz-commits] gzz metacode/mputils.py metacode/pegboard.py me...

[Asko Soukka]

CVSROOT:        /cvsroot/gzz
Module name:    gzz
Changes by:     Asko Soukka <address@hidden>    03/02/10 08:54:15

Modified files:
        metacode       : mputils.py pegboard.py umldoc.py umlpegboard.py 
                         umlrst.py umltool.py 
        doc/uml        : .cvsignore 

Log message:
        umltool path-problem fix, .gen.eps -> _gen.eps temporary fix to please 
jvk

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/metacode/mputils.py.diff?tr1=1.12&tr2=1.13&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/metacode/pegboard.py.diff?tr1=1.33&tr2=1.34&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/metacode/umldoc.py.diff?tr1=1.28&tr2=1.29&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/metacode/umlpegboard.py.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/metacode/umlrst.py.diff?tr1=1.32&tr2=1.33&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/metacode/umltool.py.diff?tr1=1.31&tr2=1.32&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/doc/uml/.cvsignore.diff?tr1=1.4&tr2=1.5&r1=text&r2=text

Patches:
Index: gzz/doc/uml/.cvsignore
diff -u gzz/doc/uml/.cvsignore:1.4 gzz/doc/uml/.cvsignore:1.5
--- gzz/doc/uml/.cvsignore:1.4  Thu Feb  6 16:57:42 2003
+++ gzz/doc/uml/.cvsignore      Mon Feb 10 08:54:15 2003
@@ -1,2 +1,3 @@
+*_gen.eps
 *.gen.* 
 *.log 
Index: gzz/metacode/mputils.py
diff -u gzz/metacode/mputils.py:1.12 gzz/metacode/mputils.py:1.13
--- gzz/metacode/mputils.py:1.12        Mon Feb 10 07:03:26 2003
+++ gzz/metacode/mputils.py     Mon Feb 10 08:54:13 2003
@@ -20,7 +20,7 @@
 """
 import os, sys, re
 import docutils.parsers.rst.directives, docutils.nodes, docutils.core
-import docutils
+import docutils, docutils.utils
 import uml
 
 
@@ -56,7 +56,7 @@
 Stores global settings for metapost actions.
 """
 settings = Settings()
-settings['tmpdir'] = os.path.abspath('doc/uml')
+settings['tmpdir'] = 'doc/uml'
 
 #Environmental variable MPINPUTS should be relative to tmpdir,
 #or be an absolute path.
@@ -85,6 +85,19 @@
     return path
 
 def transition_path(from_path, to_path):
+    """
+    The current implementation sucks, so why wouldn't use
+    something ready and working :)
+    """
+    #terrible kludge to avoid java.lang.NegativeArraySizeException with Jython
+    from_path = os.path.normpath(os.path.abspath(from_path))
+    to_path = os.path.normpath(os.path.abspath(to_path))
+#    print "from:", from_path, "to:", to_path+"/foo"
+    transition = docutils.utils.relative_path(from_path+"/foo", to_path)
+    transition = transition[3:len(transition)]
+#    print "transition:", transition
+    return transition
+
     """
     Returns the transition path from from_path to to_path.
     """
Index: gzz/metacode/pegboard.py
diff -u gzz/metacode/pegboard.py:1.33 gzz/metacode/pegboard.py:1.34
--- gzz/metacode/pegboard.py:1.33       Mon Feb 10 07:07:35 2003
+++ gzz/metacode/pegboard.py    Mon Feb 10 08:54:13 2003
@@ -176,7 +176,7 @@
         args = '-stg --stylesheet ../'+css+' %s.rst %s.gen.html' % (file,file)
 
         #saves using contexts for diagrams
-        settings['context'] = os.path.abspath(pegroot+'/'+pegdir+'/'+rstfile)
+        settings['context'] = pegroot+'/'+pegdir+'/'+rstfile
         umltool.set_transition_paths(settings['context'])
         pub.process_command_line(argv=args.split())
 
@@ -400,7 +400,7 @@
 args = '-stg --stylesheet '+css+' '+pegroot+'/pegboard.rst 
'+pegroot+'/pegboard.gen.html'
 
 #saves using contexts for diagrams
-settings['context'] = os.path.abspath(egroot+'/pegboard.rst')
+settings['context'] = pegroot+'/pegboard.rst'
 umltool.set_transition_paths(settings['context'])
 
 publish_cmdline(writer_name='html', argv=args.split())
Index: gzz/metacode/umldoc.py
diff -u gzz/metacode/umldoc.py:1.28 gzz/metacode/umldoc.py:1.29
--- gzz/metacode/umldoc.py:1.28 Mon Feb 10 07:03:26 2003
+++ gzz/metacode/umldoc.py      Mon Feb 10 08:54:13 2003
@@ -53,7 +53,7 @@
 
 # must be run in the main directory of gzz module
 settings = mputils.Settings()
-settings['css'] = os.path.abspath('doc/gzz.css')
+settings['css'] = 'doc/gzz.css'
 
 mputils.__rst_init__()
 umlrst.__rst_init__()
@@ -181,12 +181,12 @@
     
     #the first pass, create all diagram sources
     for path in sys.argv[1:]:
-        run_convert(os.path.abspath(path))
+        run_convert(path)
 
     #the second pass, compile and embed diagrams
     for path in sys.argv[1:]:
         try:
-            run_embed(os.path.abspath(path))
+            run_embed(path)
         except umltool.umlException, e:
             print "umldoc: umlException exception occurred:", e.value
             break
Index: gzz/metacode/umlpegboard.py
diff -u gzz/metacode/umlpegboard.py:1.3 gzz/metacode/umlpegboard.py:1.4
--- gzz/metacode/umlpegboard.py:1.3     Mon Feb 10 07:03:26 2003
+++ gzz/metacode/umlpegboard.py Mon Feb 10 08:54:13 2003
@@ -43,4 +43,4 @@
         file = mputils._slashify(pegroot)\
                +mputils._slashify(pegdir)\
                +rstfile
-        umlrst.embed_diagrams(os.path.abspath(file))
+        umlrst.embed_diagrams(file)
Index: gzz/metacode/umlrst.py
diff -u gzz/metacode/umlrst.py:1.32 gzz/metacode/umlrst.py:1.33
--- gzz/metacode/umlrst.py:1.32 Sun Feb  9 16:21:18 2003
+++ gzz/metacode/umlrst.py      Mon Feb 10 08:54:13 2003
@@ -60,7 +60,7 @@
     attributes = {'name': arguments[0]}
     trans = mputils._slashify(umltool.settings['to_tmpdir'])
     #print trans
-    src = trans+attributes['name']+".gen.eps"
+    src = trans+attributes['name']+"_gen.eps"
     uml_node = docutils.nodes.image(uri=src, alt="UML: "+attributes['name'],
                                     _uml=attributes['name'])
     if content:
@@ -98,8 +98,8 @@
         mp.close()
 
         create_diagram(name+'.gen')
-        os.rename(dir+name+'.gen.1', dir+name+'.gen.eps')
-##        open(dir+name+'.gen.eps', 'w').write(
+        os.rename(dir+name+'.gen.1', dir+name+'_gen.eps')
+##        open(dir+name+'_gen.eps', 'w').write(
 ##            open(dir+name+'.gen.1', 'r').read())
 
     add_refer_context(attributes['name'], 1)
@@ -140,7 +140,7 @@
     attributes = {'name': arguments[0]}
     trans = mputils._slashify(umltool.settings['to_tmpdir'])
     #print trans
-    src = trans+attributes['name']+".gen.eps"
+    src = trans+attributes['name']+"_gen.eps"
     uml_node =  docutils.nodes.image(_uml=attributes['name'], uri=src)
     add_refer_context(attributes['name'])
 
Index: gzz/metacode/umltool.py
diff -u gzz/metacode/umltool.py:1.31 gzz/metacode/umltool.py:1.32
--- gzz/metacode/umltool.py:1.31        Mon Feb 10 07:03:26 2003
+++ gzz/metacode/umltool.py     Mon Feb 10 08:54:13 2003
@@ -21,7 +21,7 @@
 import mputils
 
 settings = mputils.Settings()
-settings['javadoc'] = os.path.abspath('doc/javadoc')
+settings['javadoc'] = 'doc/javadoc'
 
 titles = {}