Support for nightly build in booststrap/crlenv.py.

This commit is contained in:
Jean-Paul Chaput 2023-01-02 11:47:45 +01:00
parent e590400ebb
commit 100342e640
1 changed files with 7 additions and 4 deletions

View File

@ -123,16 +123,19 @@ def setupPaths ( verbose ):
print( '[WARNING] environment.setupPaths(): Unrecognized OS: "{}".'.format( line[:-1] )) print( '[WARNING] environment.setupPaths(): Unrecognized OS: "{}".'.format( line[:-1] ))
print( ' (using: "{}")'.format( osDir )) print( ' (using: "{}")'.format( osDir ))
osDir = Path( osDir ) osDir = Path( osDir )
homeDir = Path( os.environ['HOME'] ) homeDir = Path( os.environ['HOME'] )
buildType = Path( 'Release.Debug' if useDebug else 'Release.Shared' ) buildType = Path( 'Release.Debug' if useDebug else 'Release.Shared' )
topDirs = [] scriptPath = Path( __file__ ).resolve()
topDirs = []
if 'CORIOLIS_TOP' in os.environ: if 'CORIOLIS_TOP' in os.environ:
topDirs += [ Path( os.environ['CORIOLIS_TOP'] ) ] topDirs += [ Path( os.environ['CORIOLIS_TOP'] ) ]
topDirs += [ homeDir / 'coriolis-2.x' / osDir / buildType / 'install' topDirs += [ homeDir / 'coriolis-2.x' / osDir / buildType / 'install'
, Path( '/soc/coriolis2' ) , Path( '/soc/coriolis2' )
, Path( '/usr' ) , Path( '/usr' )
] ]
if scriptPath.match('nightly/coriolis-2.x'):
topDirs.append( homeDir / 'nightly' / 'coriolis-2.x' / osDir / buildType / 'install' )
if verbose: if verbose:
print( ' o Self locating Coriolis:' ) print( ' o Self locating Coriolis:' )
coriolisTop = None coriolisTop = None