Changeset 723 for CMIP6dreqbuild


Ignore:
Timestamp:
17/08/16 16:20:47 (3 years ago)
Author:
mjuckes
Message:

corrections to default directories with manifest

Location:
CMIP6dreqbuild/trunk/src/framework/dreqPy
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • CMIP6dreqbuild/trunk/src/framework/dreqPy/dreq.py

    r714 r723  
    99import re, shelve, os, sys 
    1010try: 
    11   from __init__ import DOC_DIR, version 
     11  from __init__ import DOC_DIR, version, PACKAGE_DIR 
    1212except: 
    13   from dreqPy.__init__ import DOC_DIR, version 
     13  from dreqPy.__init__ import DOC_DIR, version, PACKAGE_DIR 
    1414 
    1515python2 = True 
     
    530530        assert len( bits ) > 1, 'Failed to parse line in manifest %s: \n%s' % (manifest,l) 
    531531        for b in bits[:2]: 
     532          if not os.path.isfile( b ): 
     533             b = '%s/%s' % (PACKAGE_DIR,b) 
    532534          assert os.path.isfile( b ), 'File %s not found (listed in %s)' % (b,manifest ) 
    533535        docl.append( tuple( bits[:2] ) ) 
  • CMIP6dreqbuild/trunk/src/framework/dreqPy/packageConfig.py

    r711 r723  
    77import os 
    88 
    9 HERE = os.path.dirname(os.path.abspath(__file__) ) 
     9PACKAGE_DIR = os.path.dirname(os.path.abspath(__file__) ) 
    1010 
    1111##DOC_DEFAULT_DIR 
    12 DOC_DEFAULT_DIR = os.path.join(HERE, '../out') 
     12DOC_DEFAULT_DIR = os.path.join(PACKAGE_DIR, '../out') 
    1313 
    1414DOC_DIR = os.environ.get('DRQ_CONFIG_DIR', DOC_DEFAULT_DIR) 
Note: See TracChangeset for help on using the changeset viewer.