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

Update the socInstaller for the support repositories. 

* Change: In bootstrap, in socInstaller.py checkout the support git
    repositories (currently, only rapidjson). Send the report mail
    to <jpc> & <lao>.
* Bug: in VLSISAPD, in the top CMakeLists.txt, do not requires the
    Hurricane cmake, it is build after (cycling dependency).
This commit is contained in:
Jean-Paul Chaput 2016-02-21 11:58:54 +01:00
parent 6970e7e1c4
commit a9a0a7d107
2 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
bootstrap/socInstaller.py
View File

@ -197,8 +197,8 @@ class GitRepository ( object ):
class Configuration ( object ): class Configuration ( object ):
PrimaryNames = \ PrimaryNames = \
[ 'sender' , 'receiver' [ 'sender' , 'receivers'
, 'coriolisRepo', 'chamsRepo' , 'benchsRepo' , 'coriolisRepo', 'chamsRepo' , 'benchsRepo', 'supportRepos'
, 'homeDir' , 'masterHost' , 'homeDir' , 'masterHost'
, 'debugArg' , 'nightlyMode' , 'debugArg' , 'nightlyMode'
, 'rmSource' , 'rmBuild', 'doGit', 'doBuild', 'doBenchs', 'doSendReport' , 'rmSource' , 'rmBuild', 'doGit', 'doBuild', 'doBenchs', 'doSendReport'
@ -210,7 +210,8 @@ class Configuration ( object ):
def __init__ ( self ): def __init__ ( self ):
self._sender = 'Jean-Paul.Chaput@soc.lip6.fr' self._sender = 'Jean-Paul.Chaput@soc.lip6.fr'
self._receiver = 'Jean-Paul.Chaput@lip6.fr' self._receivers = [ 'Jean-Paul.Chaput@lip6.fr', 'Eric.Lao@lip6.fr' ]
self._supportRepos = [ 'http://github.com/miloyip/rapidjson' ]
self._coriolisRepo = 'https://www-soc.lip6.fr/git/coriolis.git' self._coriolisRepo = 'https://www-soc.lip6.fr/git/coriolis.git'
self._chamsRepo = 'file:///users/outil/chams/chams.git' self._chamsRepo = 'file:///users/outil/chams/chams.git'
self._benchsRepo = 'https://www-soc.lip6.fr/git/alliance-check-toolkit.git' self._benchsRepo = 'https://www-soc.lip6.fr/git/alliance-check-toolkit.git'
@ -321,16 +322,17 @@ class Report ( object ):
def __init__ ( self, conf ): def __init__ ( self, conf ):
self.conf = conf self.conf = conf
date = time.strftime( "%A %d %B %Y" ) commaspace = ', '
stateText = 'FAILED' date = time.strftime( "%A %d %B %Y" )
modeText = 'SoC installation' stateText = 'FAILED'
modeText = 'SoC installation'
if self.conf.success: stateText = 'SUCCESS' if self.conf.success: stateText = 'SUCCESS'
if self.conf.nightlyMode: modeText = 'Nightly build' if self.conf.nightlyMode: modeText = 'Nightly build'
self.message = MIMEMultipart() self.message = MIMEMultipart()
self.message['Subject'] = '[%s] Coriolis & Chams %s %s' % (stateText,modeText,date) self.message['Subject'] = '[%s] Coriolis & Chams %s %s' % (stateText,modeText,date)
self.message['From' ] = self.conf.sender self.message['From' ] = self.conf.sender
self.message['To' ] = self.conf.receiver self.message['To' ] = commaspace.join( self.conf.receivers )
self.attachements = [] self.attachements = []
self.mainText = '\n' self.mainText = '\n'
@ -408,11 +410,18 @@ try:
if options.rmSource or options.rmAll: conf.rmSource = True if options.rmSource or options.rmAll: conf.rmSource = True
if options.rmBuild or options.rmAll: conf.rmBuild = True if options.rmBuild or options.rmAll: conf.rmBuild = True
gitSupports = []
for supportRepo in conf.supportRepos:
gitSupports.append( GitRepository( supportRepo, conf.srcDir+'/support' ) )
gitCoriolis = GitRepository( conf.coriolisRepo, conf.srcDir ) gitCoriolis = GitRepository( conf.coriolisRepo, conf.srcDir )
gitChams = GitRepository( conf.chamsRepo , conf.srcDir ) gitChams = GitRepository( conf.chamsRepo , conf.srcDir )
gitBenchs = GitRepository( conf.benchsRepo , conf.srcDir ) gitBenchs = GitRepository( conf.benchsRepo , conf.srcDir )
if conf.doGit: if conf.doGit:
for gitSupport in gitSupports:
if conf.rmSource: gitSupport.removeLocalRepo()
gitSupport.clone()
if conf.rmSource: gitCoriolis.removeLocalRepo() if conf.rmSource: gitCoriolis.removeLocalRepo()
gitCoriolis.clone () gitCoriolis.clone ()
gitCoriolis.checkout( 'devel' ) gitCoriolis.checkout( 'devel' )

1
vlsisapd/CMakeLists.txt
View File

@ -20,7 +20,6 @@
find_package(BISON REQUIRED) find_package(BISON REQUIRED)
find_package(FLEX REQUIRED) find_package(FLEX REQUIRED)
find_package(Doxygen) find_package(Doxygen)
find_package(HURRICANE REQUIRED)
add_subdirectory(src) add_subdirectory(src)
add_subdirectory(cmake_modules) add_subdirectory(cmake_modules)