From 100342e640387bb96372d1880607de2bf4a46e5e Mon Sep 17 00:00:00 2001 From: Jean-Paul Chaput Date: Mon, 2 Jan 2023 11:47:45 +0100 Subject: [PATCH] Support for nightly build in booststrap/crlenv.py. --- bootstrap/crlenv.py | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/bootstrap/crlenv.py b/bootstrap/crlenv.py index dabb1239..70defceb 100755 --- a/bootstrap/crlenv.py +++ b/bootstrap/crlenv.py @@ -123,16 +123,19 @@ def setupPaths ( verbose ): print( '[WARNING] environment.setupPaths(): Unrecognized OS: "{}".'.format( line[:-1] )) print( ' (using: "{}")'.format( osDir )) - osDir = Path( osDir ) - homeDir = Path( os.environ['HOME'] ) - buildType = Path( 'Release.Debug' if useDebug else 'Release.Shared' ) - topDirs = [] + osDir = Path( osDir ) + homeDir = Path( os.environ['HOME'] ) + buildType = Path( 'Release.Debug' if useDebug else 'Release.Shared' ) + scriptPath = Path( __file__ ).resolve() + topDirs = [] if 'CORIOLIS_TOP' in os.environ: topDirs += [ Path( os.environ['CORIOLIS_TOP'] ) ] topDirs += [ homeDir / 'coriolis-2.x' / osDir / buildType / 'install' , Path( '/soc/coriolis2' ) , Path( '/usr' ) ] + if scriptPath.match('nightly/coriolis-2.x'): + topDirs.append( homeDir / 'nightly' / 'coriolis-2.x' / osDir / buildType / 'install' ) if verbose: print( ' o Self locating Coriolis:' ) coriolisTop = None