Changes in src/mpy.py [2:1]

File:

• src/mpy.py (modified) (6 diffs)

src/mpy.py

@@ -120 +120 @@
    global mpyglobals
    mpylog     = mpyglobals['mpylog']     # log file
-   mpylist    = mpyglobals['mpylist']    # file list log file
    mpydebug   = mpyglobals['mpydebug']   # True|False
    mpyverbose = mpyglobals['mpyverbose'] # True|False
@@ -134 +133 @@
          sys.stdout = open( mpywdir+'/'+mpyout, "w")
          mpyoutlist.append(mpywdir+'/'+mpyout)
-         mpylist.write(mpywdir+'/'+mpyout+'\n')
       except IOError, e: _exit(e)
 
@@ -455 +453 @@
 _parser.add_option("-o", "--output", dest = "ofile", default = 'stdout'
                   , help = "define output filename [default: %default] ")
-_parser.add_option("-n", "--name", dest = "name", default = 'mpy'
-                  , help = "define instance name, basename for logs [default: 'mpy']")
 _parser.add_option("-i", "--idir", dest = "idir" 
                   , help = "list of directories (separated with colon ':') "
@@ -479 +475 @@
    _exit('%s is not a working directory' % _options.wdir)
 try: 
-   _mpymetaname = os.path.join(_options.wdir,_options.name+"_meta.log")
-   _mpytreename = os.path.join(_options.wdir,_options.name+"_tree.log")
-   _mpylistname = os.path.join(_options.wdir,_options.name+".list")
+   _mpymetaname = os.path.join(_options.wdir,"mpy_meta.log")
+   _mpytreename = os.path.join(_options.wdir,"mpy_tree.log")
    _mpymetafile = open(_mpymetaname,"a")
    _mpytreefile = open(_mpytreename,"a")
-   _mpylistfile = open(_mpylistname,"a")
-   _logname = os.path.join(_options.wdir, _options.name+".log")
-   _htmlname = os.path.join(_options.wdir,_options.name+".html")
+   _logname = os.path.join(_options.wdir,"mpy.log")
+   _htmlname = os.path.join(_options.wdir,"mpy.html")
 except IOError, e: 
    _exit(e) 
@@ -497 +491 @@
                  , mpylog  = _mpymetafile
                  , mpytree = _mpytreefile
-                 , mpylist = _mpylistfile
                  , mpytabwidth = _options.tab
                  , mpyoutlist = [_options.ofile])
@@ -518 +511 @@
    try:
       os.system('cat '+_mpytreename+' '+_mpymetaname+' > '+_logname)
+      os.system('rst2html '+_logname+' '+_htmlname)
       os.remove(_mpytreename)
       os.remove(_mpymetaname)
-      os.system('rst2html '+_logname+' '+_htmlname+' 2> /dev/null')
    except:
       pass