[Modeling-cvs] ProjectModeling/Modeling/scripts mdl_generate_python_code.py,1.3,1.4

[<sbi...@us...>]

Update of /cvsroot/modeling/ProjectModeling/Modeling/scripts
In directory sc8-pr-cvs1:/tmp/cvs-serv30397/scripts

Modified Files:
	mdl_generate_python_code.py 
Log Message:
ModelMasons: added a new generation scheme. The existing one is named
'compact', the new one, 'base'. The latter generates two different modules
for a given entity, in modules <className> (which is not overwritten when
re-generating) and <className>Base (which IS overwritten upon
regeneration)

Updated scripts/mdl_generate_python_code.py


Index: mdl_generate_python_code.py
===================================================================
RCS file: /cvsroot/modeling/ProjectModeling/Modeling/scripts/mdl_generate_python_code.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** mdl_generate_python_code.py	20 Apr 2003 14:16:41 -0000	1.3
--- mdl_generate_python_code.py	20 Apr 2003 16:10:41 -0000	1.4
***************
*** 55,60 ****
      del tb
  
! def build_python_code(model, rootPath=None, typeOfCode='python',
!                       verbose_mode=0):
    """
    Builds the python-code templates for the supplied model
--- 55,60 ----
      del tb
  
! def build_python_code(model, generation_scheme,
!                       rootPath=None, typeOfCode='python', verbose_mode=0):
    """
    Builds the python-code templates for the supplied model
***************
*** 64,67 ****
--- 64,69 ----
      model -- an instance of Modeling.Model
  
+     generation_scheme --
+     
      rootPath -- where the files should be dropped
  
***************
*** 83,87 ****
    if typeOfCode=='python':
      from Modeling.ModelMasons.PyModelMason import PyModelMason
!     mason = PyModelMason(model, rootPath, verbose_mode=verbose_mode)
  
    mason.build()
--- 85,90 ----
    if typeOfCode=='python':
      from Modeling.ModelMasons.PyModelMason import PyModelMason
!     mason = PyModelMason(model, rootPath, verbose_mode=verbose_mode,
!                          generation_scheme=generation_scheme)
  
    mason.build()
***************
*** 99,109 ****
    
  
! Options:
! --------
    -h --help                   gives this help
    -v --verbose                verbose mode (default)
    -q --quiet                  quiet mode
  
  
  """ % prgName
    sys.stderr.write(_usage)
--- 102,120 ----
    
  
! General options:
! ----------------
    -h --help                   gives this help
    -v --verbose                verbose mode (default)
    -q --quiet                  quiet mode
  
+ Generation options:
+ -------------------
+   -B --base-generation-scheme       use the 'base' scheme
+   -C --compact-generation-scheme    use the 'compact' scheme (default)
  
+   -g<scheme>
+   --generation_scheme=<scheme>      use <scheme> as the generation scheme
+                                     (either 'base' or 'compact')
+   
  """ % prgName
    sys.stderr.write(_usage)
***************
*** 115,126 ****
    me=args[0]
    try: options, args = getopt.getopt(sys.argv[1:],
!                                      'hqv',
!                                      ["help", "quiet", "verbose"])
    except: usage(me); return 1
    global verbose
    for k, v in options:
      if k in ('-h', '--help'): usage(me); return 0
      if k in ('-q', '--quiet'): verbose=0; continue
!     if k in ('-v', '--verbose'): verbose=1; continue
    if len(args) not in (1,2): usage(me) ; return 1
    
--- 126,143 ----
    me=args[0]
    try: options, args = getopt.getopt(sys.argv[1:],
!                                      'BCg:hqv',
!                                      ["help", "quiet", "verbose",
!                                       "generation_scheme=",
!                                       "compact-generation-scheme",
!                                       "base-generation-scheme"])
    except: usage(me); return 1
    global verbose
+   generation_scheme='compact'
    for k, v in options:
      if k in ('-h', '--help'): usage(me); return 0
      if k in ('-q', '--quiet'): verbose=0; continue
!     if k in ('-g', '--generation-scheme'): generation_scheme=v; continue
!     if k in ('-C', '--compact-generation-scheme'): generation_scheme='compact'; continue
!     if k in ('-B', '--base-generation-scheme'): generation_scheme='base'; continue
    if len(args) not in (1,2): usage(me) ; return 1
    
***************
*** 142,146 ****
    model=ms.models()[0]
    try:
!     build_python_code(model, rootPath, verbose_mode=verbose)
    except TargetDirectoryAlreadyExists, exc:
      sys.stderr.write(str(sys.exc_info()[1])+'\n')
--- 159,163 ----
    model=ms.models()[0]
    try:
!     build_python_code(model, generation_scheme, rootPath, verbose_mode=verbose)
    except TargetDirectoryAlreadyExists, exc:
      sys.stderr.write(str(sys.exc_info()[1])+'\n')