Changeset 6

Timestamp:

Oct 22, 2013, 4:32:01 PM (11 years ago)

Author:

cfuguet

Message:

Introducing a modelname paremeter on the mpygen
function to force the name of the entity to
generate

File:

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

src/mpy.py

@@ -61 +61 @@
    "if fname does not exist then returns ''"
    if fname == 'stdin':
+      return fname
+   elif os.path.isabs(fname):
       return fname
    else:
@@ -409 +411 @@
    hashnumber = _mpyhash(`param`)
    mpyout_base = '.'.join(mpyout[0:-2])
-   mpyout = mpyout_base+'_'+hashnumber+'.'+mpyout[-1]
-   mpymodelname = mpyout_base+'_'+hashnumber
-   param['mpymodelname'] = mpymodelname
+
+   if not param.has_key('modelname'):
+      mpyout = mpyout_base+'_'+hashnumber+'.'+mpyout[-1]
+      mpymodelname = mpyout_base+'_'+hashnumber
+      param['mpymodelname'] = mpymodelname
+   else:
+      mpyout = param['modelname']+'.'+mpyout[-1]
+      mpymodelname = param['modelname']
+      param['mpymodelname'] = mpymodelname
 
    # call the macro processor
@@ -502 +510 @@
                  , mpywdir = _options.wdir # working directory
                  , mpyidir = [_options.wdir]+_options.idir.split(':') # split pathes in a list
-                 , mpylevelgen = 1              # level of generation (tree deep)
+                 , mpylevelgen = 1      # level of generation (tree deep)
                  , mpylog  = _mpymetafile
                  , mpytree = _mpytreefile