riscv
/
coriolis
mirror of https://gitlab.lip6.fr/vlsi-eda/coriolis.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix nightly build path finding in crlenv.py.

This commit is contained in:
Jean-Paul Chaput 2023-03-01 11:42:50 +01:00
parent 94323f28e0
commit 5546c2d89f
1 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
bootstrap/crlenv.py
View File

@ -129,18 +129,16 @@ def setupPaths ( verbose, debug=False ):
buildType = Path( 'Debug.Shared' if debug else 'Release.Shared' ) buildType = Path( 'Debug.Shared' if debug else 'Release.Shared' )
scriptPath = Path( __file__ ).resolve() scriptPath = Path( __file__ ).resolve()
topDirs = [] topDirs = []
if debug:
topDirs.append( homeDir / 'coriolis-2.x' / osDir / buildType / 'install' ) topDirs += [ homeDir / 'coriolis-2.x' / osDir / buildType / 'install'
if 'CORIOLIS_TOP' in os.environ: , Path( '/soc/coriolis2' )
topDirs.append( Path( os.environ['CORIOLIS_TOP'] ))
if not debug:
topDirs.append( homeDir / 'coriolis-2.x' / osDir / buildType / 'install' )
topDirs += [ Path( '/soc/coriolis2' )
, Path( '/usr' ) , Path( '/usr' )
] ]
if not debug and 'CORIOLIS_TOP' in os.environ:
topDirs.insert( 0, Path( os.environ['CORIOLIS_TOP'] ))
for part in scriptPath.parts: for part in scriptPath.parts:
if part == 'nightly': if part == 'nightly':
topDirs.append( homeDir / 'nightly' / 'coriolis-2.x' / osDir / buildType / 'install' ) topDirs.insert( 0, homeDir / 'nightly' / 'coriolis-2.x' / osDir / buildType / 'install' )
break break
if verbose: if verbose:
print( ' o Self locating Coriolis:' ) print( ' o Self locating Coriolis:' )
@ -156,8 +154,10 @@ def setupPaths ( verbose, debug=False ):
return False return False
os.environ[ 'CORIOLIS_TOP' ] = coriolisTop.as_posix() os.environ[ 'CORIOLIS_TOP' ] = coriolisTop.as_posix()
if coriolisTop == '/usr': sysconfDir = Path( 'etc', 'coriolis2' ) #if coriolisTop == '/usr': sysconfDir = Path( 'etc', 'coriolis2' )
else: sysconfDir = coriolisTop / 'etc' / 'coriolis2' #else: sysconfDir = coriolisTop / 'etc' / 'coriolis2'
if coriolisTop == '/usr': sysconfDir = Path( 'etc' )
else: sysconfDir = coriolisTop / 'etc'
# Setup PATH. # Setup PATH.
binPath = envWriteBack( 'PATH', (coriolisTop/'bin').as_posix() ) binPath = envWriteBack( 'PATH', (coriolisTop/'bin').as_posix() )
@ -205,11 +205,11 @@ def setupPaths ( verbose, debug=False ):
return False return False
pythonPath = '' pythonPath = ''
for packageDir in [ sitePackagesDir for packageDir in [ sitePackagesDir
, sitePackagesDir / 'crlcore' #, sitePackagesDir / 'crlcore'
, sitePackagesDir / 'cumulus' #, sitePackagesDir / 'cumulus'
, sitePackagesDir / 'cumulus/plugins' #, sitePackagesDir / 'cumulus/plugins'
, sitePackagesDir / 'status' #, sitePackagesDir / 'status'
, sysconfDir #, sysconfDir
]: ]:
sys.path.append( str(packageDir) ) sys.path.append( str(packageDir) )
if len(pythonPath): pythonPath += ':' if len(pythonPath): pythonPath += ':'
@ -220,7 +220,7 @@ def setupPaths ( verbose, debug=False ):
def printVariable ( name ): def printVariable ( name ):
if not name in os.environ: if not name in os.environ:
print( '{:<16}:'.format( name )) print( '{}:'.format( name ))
print( '- variable_not_set' ) print( '- variable_not_set' )
return return
values = os.environ[ name ].split( ':' ) values = os.environ[ name ].split( ':' )