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

* ./bootstrap/buildCoriolis.py 

- Change: When the configuration file is not given as argument, looks
        in all the places it is likely to be found.
This commit is contained in:
Jean-Paul Chaput 2012-11-17 15:01:05 +00:00
parent 501fe1e4d9
commit 0a4297e84d
1 changed files with 23 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
bootstrap/buildCoriolis.py
View File

@ -706,12 +706,31 @@ class ProjectBuilder:
def loadConfiguration ( self, confFile ): def loadConfiguration ( self, confFile ):
moduleGlobals = globals() moduleGlobals = globals()
print 'Reading configuration from:' if not confFile:
print ' <%s>' % options.conf print 'Making an educated guess to locate the configuration file:'
locations = [ os.path.abspath(os.path.dirname(sys.argv[0]))
, os.environ['HOME']+'/coriolis-2.x/src/bootstrap'
, os.environ['HOME']+'/coriolis/src/bootstrap'
, os.environ['HOME']+'/chams-2.x/src/bootstrap'
, os.environ['HOME']+'/chams/src/bootstrap'
, '/users/outil/coriolis/coriolis-2.x/src/bootstrap'
, self._rootDir+'/src/bootstrap'
]
for location in locations:
confFile = location + '/build.conf'
print ' <%s>' % confFile
if os.path.isfile(confFile): break
if not confFile:
ErrorMessage( 1, 'Cannot locate any configuration file.' ).terminate()
else:
if not os.path.isfile(confFile): if not os.path.isfile(confFile):
ErrorMessage( 1, 'Missing configuration file:', '<%s>'%confFile ).terminate() ErrorMessage( 1, 'Missing configuration file:', '<%s>'%confFile ).terminate()
print 'Reading configuration from:'
print ' <%s>' % options.conf
try: try:
execfile( confFile, moduleGlobals ) execfile( confFile, moduleGlobals )
except Exception, e: except Exception, e:
@ -790,8 +809,7 @@ if __name__ == "__main__":
parser = optparse.OptionParser () parser = optparse.OptionParser ()
# Build relateds. # Build relateds.
parser.add_option ( "-c", "--conf", type="string", dest="conf", default=os.path.join(scriptPath,'build.conf') parser.add_option ( "-c", "--conf", type="string", dest="conf" , help="Fichier de configuration." )
, help="Fichier de configuration." )
parser.add_option ( "--show-conf" , action="store_true" , dest="showConf" , help="Display the Project/Tools configuration, then exit." ) parser.add_option ( "--show-conf" , action="store_true" , dest="showConf" , help="Display the Project/Tools configuration, then exit." )
parser.add_option ( "-q", "--quiet" , action="store_true" , dest="quiet" , help="Do not print all the informative messages." ) parser.add_option ( "-q", "--quiet" , action="store_true" , dest="quiet" , help="Do not print all the informative messages." )
parser.add_option ( "-r", "--release" , action="store_true" , dest="release" , help="Build a <Release> aka optimized version." ) parser.add_option ( "-r", "--release" , action="store_true" , dest="release" , help="Build a <Release> aka optimized version." )
@ -845,8 +863,6 @@ if __name__ == "__main__":
if options.svnMethod: builder.svnMethod = options.svnMethod if options.svnMethod: builder.svnMethod = options.svnMethod
if options.svnTag: builder.svnTag = options.svnTag if options.svnTag: builder.svnTag = options.svnTag
packagedProjects = [ "bootstrap", "vlsisapd", "coriolis" ]
if options.svnStatus: builder.svnStatus ( tools=options.tools, projects=options.projects ) if options.svnStatus: builder.svnStatus ( tools=options.tools, projects=options.projects )
elif options.svnUpdate: builder.svnUpdate ( tools=options.tools, projects=options.projects ) elif options.svnUpdate: builder.svnUpdate ( tools=options.tools, projects=options.projects )
elif options.svnCheckout: builder.svnCheckout ( tools=options.tools, projects=options.projects ) elif options.svnCheckout: builder.svnCheckout ( tools=options.tools, projects=options.projects )