riscv
/
coriolis
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

New --install switch to corectly manage /asim/coriolis2

This commit is contained in:
Jean-Paul Chaput 2011-01-09 22:55:51 +00:00
parent e043fc6724
commit 9ab38b5651
1 changed files with 24 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
bootstrap/coriolisEnv.py
View File

@ -66,10 +66,11 @@ def guessOs ():
if __name__ == "__main__": if __name__ == "__main__":
(osDir,libDir) = guessOs() (osDir,libDir) = guessOs()
buildType = "Debug" buildType = "Release"
linkType = "Shared" linkType = "Shared"
coriolisVersion = None coriolisVersion = None
rootDir = None rootDir = None
installDir = None
parser = optparse.OptionParser () parser = optparse.OptionParser ()
# Build relateds. # Build relateds.
@ -82,6 +83,7 @@ if __name__ == "__main__":
parser.add_option ( "--shared" , action="store_true" , dest="shared" ) parser.add_option ( "--shared" , action="store_true" , dest="shared" )
parser.add_option ( "--python" , action="store_true" , dest="python" ) parser.add_option ( "--python" , action="store_true" , dest="python" )
parser.add_option ( "--root" , action="store" , type="string", dest="rootDir" ) parser.add_option ( "--root" , action="store" , type="string", dest="rootDir" )
parser.add_option ( "--install", action="store" , type="string", dest="installDir" )
( options, args ) = parser.parse_args () ( options, args ) = parser.parse_args ()
if options.v1: coriolisVersion = 1 if options.v1: coriolisVersion = 1
@ -124,8 +126,13 @@ fi
if not rootDir: if not rootDir:
rootDir = os.getenv("HOME") + "/coriolis-2.x" rootDir = os.getenv("HOME") + "/coriolis-2.x"
if installDir:
buildDir = "SYSTEM"
coriolisTop = installDir
else:
buildDir = buildType + "." + linkType buildDir = buildType + "." + linkType
coriolisTop = "%s/%s/%s/install" % ( rootDir, osDir, buildDir ) coriolisTop = "%s/%s/%s/install" % ( rootDir, osDir, buildDir )
absLibDir = "%s/%s" % ( coriolisTop, libDir ) absLibDir = "%s/%s" % ( coriolisTop, libDir )
strippedPath = "%s/bin:%s" % ( coriolisTop, strippedPath ) strippedPath = "%s/bin:%s" % ( coriolisTop, strippedPath )
strippedLibraryPath = "%s:%s" % ( absLibDir, strippedLibraryPath ) strippedLibraryPath = "%s:%s" % ( absLibDir, strippedLibraryPath )
@ -146,7 +153,8 @@ LD_LIBRARY_PATH=%(LD_LIBRARY_PATH)s;
PYTHONPATH=%(PYTHONPATH)s; PYTHONPATH=%(PYTHONPATH)s;
BOOTSTRAP_TOP=%(BOOTSTRAP_TOP)s; BOOTSTRAP_TOP=%(BOOTSTRAP_TOP)s;
CORIOLIS_TOP=%(CORIOLIS_TOP)s; CORIOLIS_TOP=%(CORIOLIS_TOP)s;
export PATH LD_LIBRARY_PATH PYTHONPATH BOOTSTRAP_TOP CORIOLIS_TOP; STRATUS_MAPPING_NAME=%(CORIOLIS_TOP)s/etc/coriolis2/stratus2sxlib.xml;
export PATH LD_LIBRARY_PATH PYTHONPATH BOOTSTRAP_TOP CORIOLIS_TOP STRATUS_MAPPING_NAME;
hash -r hash -r
""" """