From a9a0a7d107a6f0d960a3f6fb2bdd38fb3cc22244 Mon Sep 17 00:00:00 2001 From: Jean-Paul Chaput Date: Sun, 21 Feb 2016 11:58:54 +0100 Subject: [PATCH] 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 & . * Bug: in VLSISAPD, in the top CMakeLists.txt, do not requires the Hurricane cmake, it is build after (cycling dependency). --- bootstrap/socInstaller.py | 23 ++++++++++++++++------- vlsisapd/CMakeLists.txt | 1 - 2 files changed, 16 insertions(+), 8 deletions(-) diff --git a/bootstrap/socInstaller.py b/bootstrap/socInstaller.py index 27efc6fc..81918014 100755 --- a/bootstrap/socInstaller.py +++ b/bootstrap/socInstaller.py @@ -197,8 +197,8 @@ class GitRepository ( object ): class Configuration ( object ): PrimaryNames = \ - [ 'sender' , 'receiver' - , 'coriolisRepo', 'chamsRepo' , 'benchsRepo' + [ 'sender' , 'receivers' + , 'coriolisRepo', 'chamsRepo' , 'benchsRepo', 'supportRepos' , 'homeDir' , 'masterHost' , 'debugArg' , 'nightlyMode' , 'rmSource' , 'rmBuild', 'doGit', 'doBuild', 'doBenchs', 'doSendReport' @@ -210,7 +210,8 @@ class Configuration ( object ): def __init__ ( self ): 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._chamsRepo = 'file:///users/outil/chams/chams.git' self._benchsRepo = 'https://www-soc.lip6.fr/git/alliance-check-toolkit.git' @@ -321,16 +322,17 @@ class Report ( object ): def __init__ ( self, conf ): self.conf = conf - date = time.strftime( "%A %d %B %Y" ) - stateText = 'FAILED' - modeText = 'SoC installation' + commaspace = ', ' + date = time.strftime( "%A %d %B %Y" ) + stateText = 'FAILED' + modeText = 'SoC installation' if self.conf.success: stateText = 'SUCCESS' if self.conf.nightlyMode: modeText = 'Nightly build' self.message = MIMEMultipart() self.message['Subject'] = '[%s] Coriolis & Chams %s %s' % (stateText,modeText,date) self.message['From' ] = self.conf.sender - self.message['To' ] = self.conf.receiver + self.message['To' ] = commaspace.join( self.conf.receivers ) self.attachements = [] self.mainText = '\n' @@ -408,11 +410,18 @@ try: if options.rmSource or options.rmAll: conf.rmSource = 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 ) gitChams = GitRepository( conf.chamsRepo , conf.srcDir ) gitBenchs = GitRepository( conf.benchsRepo , conf.srcDir ) if conf.doGit: + for gitSupport in gitSupports: + if conf.rmSource: gitSupport.removeLocalRepo() + gitSupport.clone() + if conf.rmSource: gitCoriolis.removeLocalRepo() gitCoriolis.clone () gitCoriolis.checkout( 'devel' ) diff --git a/vlsisapd/CMakeLists.txt b/vlsisapd/CMakeLists.txt index 82b25d43..9799c64c 100644 --- a/vlsisapd/CMakeLists.txt +++ b/vlsisapd/CMakeLists.txt @@ -20,7 +20,6 @@ find_package(BISON REQUIRED) find_package(FLEX REQUIRED) find_package(Doxygen) - find_package(HURRICANE REQUIRED) add_subdirectory(src) add_subdirectory(cmake_modules)