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

Adapt Nix code to Python 3 switch. 

This commit also reduces the diff by not removing
some (unnecessary) error handling.
This commit is contained in:
Las Safin 2021-10-26 20:10:05 +00:00
parent e69da9aeb7 d0405d8152
commit 6e5c03434a
1334 changed files with 18306 additions and 7485 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
anabatic/CMakeLists.txt
View File

@ -7,6 +7,7 @@
option(BUILD_DOC "Build the documentation (doxygen)" OFF) option(BUILD_DOC "Build the documentation (doxygen)" OFF)
option(CHECK_DATABASE "Run database in full check mode (very slow)" OFF) option(CHECK_DATABASE "Run database in full check mode (very slow)" OFF)
option(USE_LIBBFD "Link with BFD libraries to print stack traces" OFF)
cmake_minimum_required(VERSION 2.8.9) cmake_minimum_required(VERSION 2.8.9)
@ -18,10 +19,9 @@
setup_boost() setup_boost()
setup_qt() setup_qt()
find_package(PythonLibs 2 REQUIRED) find_package(Python 3 REQUIRED COMPONENTS Interpreter Development)
find_package(PythonSitePackages REQUIRED) find_package(PythonSitePackages REQUIRED)
find_package(FLUTE REQUIRED) find_package(FLUTE REQUIRED)
find_package(VLSISAPD REQUIRED)
find_package(HURRICANE REQUIRED) find_package(HURRICANE REQUIRED)
find_package(CORIOLIS REQUIRED) find_package(CORIOLIS REQUIRED)
find_package(ETESIAN REQUIRED) find_package(ETESIAN REQUIRED)

7
anabatic/src/AntennaProtect.cpp
View File

@ -1109,12 +1109,17 @@ namespace Anabatic {
} }
EtesianEngine* etesian = static_cast<EtesianEngine*> EtesianEngine* etesian = static_cast<EtesianEngine*>
( ToolEngine::get( getCell(), EtesianEngine::staticGetName() )); ( ToolEngine::get( getCell(), EtesianEngine::staticGetName() ));
DbU::Unit segmentMaxWL = etesian->getAntennaDiodeMaxWL() / 2;
if (not etesian->getDiodeCell()) { if (not etesian->getDiodeCell()) {
cerr << Warning( "AnabaticEngine::antennaProtect(): No diode cell found, skipped." ) << endl; cerr << Warning( "AnabaticEngine::antennaProtect(): No diode cell found, skipped." ) << endl;
return; return;
} }
if (etesian->getAntennaDiodeMaxWL() <= 0) {
cerr << Warning( "AnabaticEngine::antennaProtect(): Maximum antenna diode WL not set, skipped." ) << endl;
return;
}
DbU::Unit segmentMaxWL = etesian->getAntennaDiodeMaxWL() / 2;
cmess1 << " o Antenna effect protection." << endl; cmess1 << " o Antenna effect protection." << endl;
startMeasures(); startMeasures();

4
anabatic/src/CMakeLists.txt
View File

@ -12,7 +12,7 @@ endif ( CHECK_DETERMINISM )
${FLUTE_INCLUDE_DIR} ${FLUTE_INCLUDE_DIR}
${Boost_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS}
${QtX_INCLUDE_DIR} ${QtX_INCLUDE_DIR}
${PYTHON_INCLUDE_PATH} ${Python_INCLUDE_DIRS}
) )
set( includes anabatic/Constants.h set( includes anabatic/Constants.h
anabatic/Configuration.h anabatic/Configuration.h
@ -86,7 +86,7 @@ endif ( CHECK_DETERMINISM )
${QtX_LIBRARIES} ${QtX_LIBRARIES}
${Boost_LIBRARIES} ${Boost_LIBRARIES}
${LIBXML2_LIBRARIES} ${LIBXML2_LIBRARIES}
${PYTHON_LIBRARIES} -lutil ${Python_LIBRARIES} -lutil
) )
add_library( anabatic ${cpps} ) add_library( anabatic ${cpps} )

2
anabatic/src/Configuration.cpp
View File

@ -17,7 +17,7 @@
#include <iostream> #include <iostream>
#include <iomanip> #include <iomanip>
#include <vector> #include <vector>
#include "vlsisapd/configuration/Configuration.h" #include "hurricane/configuration/Configuration.h"
#include "hurricane/Warning.h" #include "hurricane/Warning.h"
#include "hurricane/Error.h" #include "hurricane/Error.h"
#include "hurricane/Technology.h" #include "hurricane/Technology.h"

1
anabatic/src/GCell.cpp
View File

@ -298,6 +298,7 @@ namespace Anabatic {
, _contacts () , _contacts ()
, _depth (Session::getRoutingGauge()->getDepth()) , _depth (Session::getRoutingGauge()->getDepth())
, _pinDepth (0) , _pinDepth (0)
, _satProcessed (0)
, _rpCount (0) , _rpCount (0)
, _blockages (new DbU::Unit [_depth]) , _blockages (new DbU::Unit [_depth])
, _cDensity (0.0) , _cDensity (0.0)

5
anabatic/src/LayerAssign.cpp
View File

@ -368,10 +368,13 @@ namespace Anabatic {
if (not finished) { if (not finished) {
optimized = gcell->stepNetDesaturate( depth, globalNets, invalidateds ); optimized = gcell->stepNetDesaturate( depth, globalNets, invalidateds );
gcell->setSatProcessed( depth );
if (optimized) { if (optimized) {
for ( GCell* gcell : invalidateds ) { for ( GCell* gcell : invalidateds ) {
if (not gcell->isSatProcessed(depth))
queue.push( gcell->cloneKey(depth) ); queue.push( gcell->cloneKey(depth) );
} }
invalidateds.clear();
} }
} }
} }
@ -830,7 +833,7 @@ namespace Anabatic {
cmess1 << " o Balance Global Density " cmess1 << " o Balance Global Density "
<< Session::getRoutingGauge()->getRoutingLayer(depth)->getName() << endl; << Session::getRoutingGauge()->getRoutingLayer(depth)->getName() << endl;
GCellDensitySet queue ( depth, getGCells()) ); GCellDensitySet queue ( depth, getGCells() );
GCell::Set invalidateds; GCell::Set invalidateds;
bool optimized = true; bool optimized = true;

25
anabatic/src/PyAnabatic.cpp
View File

@ -55,17 +55,32 @@ extern "C" {
}; };
static PyModuleDef PyAnabatic_ModuleDef =
{ PyModuleDef_HEAD_INIT
, "Anabatic" /* m_name */
, "Low level database for global & detailed routing."
/* m_doc */
, -1 /* m_size */
, PyAnabatic_Methods /* m_methods */
, NULL /* m_reload */
, NULL /* m_traverse */
, NULL /* m_clear */
, NULL /* m_free */
};
// --------------------------------------------------------------- // ---------------------------------------------------------------
// Module Initialization : "initAnabatic ()" // Module Initialization : "initAnabatic ()"
DL_EXPORT(void) initAnabatic () { PyMODINIT_FUNC PyInit_Anabatic ( void )
cdebug_log(32,0) << "initAnabatic()" << endl; {
cdebug_log(32,0) << "PyInit_Anabatic()" << endl;
PyObject* module = Py_InitModule( "Anabatic", PyAnabatic_Methods ); PyObject* module = PyModule_Create( &PyAnabatic_ModuleDef );
if (module == NULL) { if (module == NULL) {
cerr << "[ERROR]\n" cerr << "[ERROR]\n"
<< " Failed to initialize Anabatic module." << endl; << " Failed to initialize Anabatic module." << endl;
return; return NULL;
} }
PyObject* dictionnary = PyModule_GetDict(module); PyObject* dictionnary = PyModule_GetDict(module);
@ -77,6 +92,8 @@ extern "C" {
LoadObjectConstant( dictionnary,EngineLayerAssignByTrunk ,"EngineLayerAssignByTrunk" ); LoadObjectConstant( dictionnary,EngineLayerAssignByTrunk ,"EngineLayerAssignByTrunk" );
LoadObjectConstant( dictionnary,EngineLayerAssignNoGlobalM2V,"EngineLayerAssignNoGlobalM2V" ); LoadObjectConstant( dictionnary,EngineLayerAssignNoGlobalM2V,"EngineLayerAssignNoGlobalM2V" );
LoadObjectConstant( dictionnary,EngineNoNetLayerAssign ,"EngineNoNetLayerAssign" ); LoadObjectConstant( dictionnary,EngineNoNetLayerAssign ,"EngineNoNetLayerAssign" );
return module;
} }

9
anabatic/src/anabatic/GCell.h
View File

@ -140,6 +140,7 @@ namespace Anabatic {
public: public:
static GCell* create ( AnabaticEngine* ); static GCell* create ( AnabaticEngine* );
public: public:
inline bool isSatProcessed ( size_t depth ) const;
inline bool isSaturated () const; inline bool isSaturated () const;
bool isSaturated ( size_t depth ) const; bool isSaturated ( size_t depth ) const;
inline bool isInvalidated () const; inline bool isInvalidated () const;
@ -257,6 +258,7 @@ namespace Anabatic {
size_t checkDensity () const; size_t checkDensity () const;
bool checkEdgeSaturation ( size_t hreserved, size_t vreserved) const; bool checkEdgeSaturation ( size_t hreserved, size_t vreserved) const;
void setType ( Flags ); void setType ( Flags );
inline void setSatProcessed ( size_t depth );
void addBlockage ( size_t depth, DbU::Unit ); void addBlockage ( size_t depth, DbU::Unit );
inline void addHSegment ( AutoSegment* ); inline void addHSegment ( AutoSegment* );
inline void addVSegment ( AutoSegment* ); inline void addVSegment ( AutoSegment* );
@ -334,6 +336,7 @@ namespace Anabatic {
vector<AutoContact*> _contacts; vector<AutoContact*> _contacts;
size_t _depth; size_t _depth;
size_t _pinDepth; size_t _pinDepth;
uint32_t _satProcessed;
int _rpCount; int _rpCount;
DbU::Unit* _blockages; DbU::Unit* _blockages;
float _cDensity; float _cDensity;
@ -486,6 +489,12 @@ namespace Anabatic {
inline void GCell::addContact ( AutoContact* contact ) inline void GCell::addContact ( AutoContact* contact )
{ _flags |= Flags::Invalidated; _contacts.push_back(contact); } { _flags |= Flags::Invalidated; _contacts.push_back(contact); }
inline bool GCell::isSatProcessed ( size_t depth ) const
{ return (_satProcessed & (1 << depth)); }
inline void GCell::setSatProcessed ( size_t depth )
{ _satProcessed |= (1 << depth); }
inline bool operator< ( const GCell& lhs, const GCell& rhs ) inline bool operator< ( const GCell& lhs, const GCell& rhs )
{ {

7
bootstrap/CMakeLists.txt
View File

@ -3,14 +3,15 @@
set(CMAKE_LEGACY_CYGWIN_WIN32 0) set(CMAKE_LEGACY_CYGWIN_WIN32 0)
project(Bootstrap) project(Bootstrap)
cmake_minimum_required(VERSION 2.4.0) cmake_minimum_required(VERSION 2.8.0)
set(ignoreVariables "${BUILD_DOC} ${CMAKE_INSTALL_DIR}") set(ignoreVariables USE_LIBBFD "${BUILD_DOC} ${CMAKE_INSTALL_DIR}")
add_subdirectory(cmake_modules) add_subdirectory(cmake_modules)
list(INSERT CMAKE_MODULE_PATH 0 "${Bootstrap_SOURCE_DIR}/cmake_modules/") list(INSERT CMAKE_MODULE_PATH 0 "${Bootstrap_SOURCE_DIR}/cmake_modules/")
find_package(Bootstrap REQUIRED) find_package(Bootstrap REQUIRED)
find_package(Python 3 REQUIRED COMPONENTS Interpreter Development )
find_package(PythonSitePackages REQUIRED) find_package(PythonSitePackages REQUIRED)
print_cmake_module_path() print_cmake_module_path()
@ -23,7 +24,7 @@
OWNER_EXECUTE GROUP_EXECUTE WORLD_EXECUTE) OWNER_EXECUTE GROUP_EXECUTE WORLD_EXECUTE)
install(DIRECTORY builder install(DIRECTORY builder
DESTINATION ${PYTHON_SITE_PACKAGES} ) DESTINATION ${Python_CORIOLISLIB} )
install(FILES ccb.py install(FILES ccb.py
DESTINATION bin DESTINATION bin

1
bootstrap/build.conf
View File

@ -15,7 +15,6 @@ projects = [
, 'tools' : [ "bootstrap" , 'tools' : [ "bootstrap"
, "lefdef" , "lefdef"
, "coloquinte" , "coloquinte"
, "vlsisapd"
, "hurricane" , "hurricane"
, "crlcore" , "crlcore"
, "flute" , "flute"

28
bootstrap/builder/AboutWidget.py
View File

@ -2,30 +2,23 @@
# -*- mode:Python -*- # -*- mode:Python -*-
# #
# This file is part of the Coriolis Software. # This file is part of the Coriolis Software.
# Copyright (c) UPMC/LIP6 2012-2018, All Rights Reserved # Copyright (c) Sorbonne Université 2012-2021, All Rights Reserved
# #
# +-----------------------------------------------------------------+ # +-----------------------------------------------------------------+
# | C O R I O L I S | # | C O R I O L I S |
# | C o r i o l i s / C h a m s B u i l d e r | # | T o o l c h a i n B u i l d e r |
# | | # | |
# | Author : Jean-Paul Chaput | # | Author : Jean-Paul Chaput |
# | E-mail : Jean-Paul.Chaput@asim.lip6.fr | # | E-mail : Jean-Paul.Chaput@lip6.fr |
# | =============================================================== | # | =============================================================== |
# | Python : "./builder/AboutWidget.py" | # | Python : "./builder/AboutWidget.py" |
# +-----------------------------------------------------------------+ # +-----------------------------------------------------------------+
from PyQt4.QtCore import Qt from PyQt4.QtCore import Qt
from PyQt4.QtGui import QPalette from PyQt4.QtGui import QPalette, QColor, QFont, QWidget, \
from PyQt4.QtGui import QColor QFrame, QLabel, QVBoxLayout, QAction, \
from PyQt4.QtGui import QFont QKeySequence, QApplication
from PyQt4.QtGui import QWidget
from PyQt4.QtGui import QFrame
from PyQt4.QtGui import QLabel
from PyQt4.QtGui import QVBoxLayout
from PyQt4.QtGui import QAction
from PyQt4.QtGui import QKeySequence
from PyQt4.QtGui import QApplication
class AboutWidget ( QWidget ): class AboutWidget ( QWidget ):
@ -49,12 +42,11 @@ class AboutWidget ( QWidget ):
font.setWeight ( QFont.Bold ) font.setWeight ( QFont.Bold )
title.setFont( font ) title.setFont( font )
subTitle = QLabel( 'Coriolis & Chams Builder for the Dummies' ) subTitle = QLabel( 'Coriolis Toolchain Builder for the Dummies' )
subTitle.setAlignment( Qt.AlignCenter ) subTitle.setAlignment( Qt.AlignCenter )
subTitle.setFont( QFont('Courier',10,QFont.Bold) ) subTitle.setFont( QFont('Courier',10,QFont.Bold) )
authors = QLabel( 'Coriolis CAD System 3.0 . . . . . . . . ccb 1.0\n'
authors = QLabel( 'Coriolis CAD System 1.0 . . . . . . . . ccb 1.0\n' 'Copyright (c) 2008-2021 . . Sorbonne Universite\n'
'Copyright (c) 2008-2016 . . . . . . . . . . UPMC\n'
'Authors . . . . . . . . . . . . . Damien Dupuis\n' 'Authors . . . . . . . . . . . . . Damien Dupuis\n'
' . . . . . . . . . . . . Jean-Paul Chaput\n' ' . . . . . . . . . . . . Jean-Paul Chaput\n'
'E-Mail . . . . . . . . Jean-Paul.Chaput@lip6.fr' 'E-Mail . . . . . . . . Jean-Paul.Chaput@lip6.fr'
@ -81,7 +73,6 @@ class AboutWidget ( QWidget ):
vLayout = QVBoxLayout() vLayout = QVBoxLayout()
vLayout.addWidget( frame ) vLayout.addWidget( frame )
self.setLayout( vLayout ) self.setLayout( vLayout )
self._exitAction = QAction( '&Exit', self ) self._exitAction = QAction( '&Exit', self )
@ -95,5 +86,4 @@ class AboutWidget ( QWidget ):
self._closeAction.setShortcut ( QKeySequence('CTRL+A') ) self._closeAction.setShortcut ( QKeySequence('CTRL+A') )
self._closeAction.triggered.connect( self.close ) self._closeAction.triggered.connect( self.close )
self.addAction( self._closeAction ) self.addAction( self._closeAction )
return return

122
bootstrap/builder/Builder.py
View File

@ -1,14 +1,14 @@
# -*- mode:Python -*- # -*- mode:Python -*-
# #
# This file is part of the Coriolis Software. # This file is part of the Coriolis Software.
# Copyright (c) UPMC/LIP6 2008-2018, All Rights Reserved # Copyright (c) Sorbonne Université 2008-2021, All Rights Reserved
# #
# +-----------------------------------------------------------------+ # +-----------------------------------------------------------------+
# | C O R I O L I S | # | C O R I O L I S |
# | C o r i o l i s / C h a m s B u i l d e r | # | T o o l c h a i n B u i l d e r |
# | | # | |
# | Author : Jean-Paul Chaput | # | Author : Jean-Paul Chaput |
# | E-mail : Jean-Paul.Chaput@asim.lip6.fr | # | E-mail : Jean-Paul.Chaput@lip6.fr |
# | =============================================================== | # | =============================================================== |
# | Python : "./builder/Builder.py" | # | Python : "./builder/Builder.py" |
# +-----------------------------------------------------------------+ # +-----------------------------------------------------------------+
@ -21,8 +21,8 @@ import os.path
import datetime import datetime
import subprocess import subprocess
from . import ErrorMessage from . import ErrorMessage
from Project import Project from .Project import Project
from Configuration import Configuration from .Configuration import Configuration
class Builder: class Builder:
@ -51,14 +51,11 @@ class Builder:
self._environment = os.environ self._environment = os.environ
return return
def __setattr__ ( self, attribute, value ): def __setattr__ ( self, attribute, value ):
if attribute[0] == "_": if attribute[0] == "_":
self.__dict__[attribute] = value self.__dict__[attribute] = value
return return
if attribute in self._conf.getAllIds(): setattr( self._conf, attribute, value ) if attribute in self._conf.getAllIds(): setattr( self._conf, attribute, value )
if attribute == "quiet": self._quiet = value if attribute == "quiet": self._quiet = value
elif attribute == "rmBuild": self._rmBuild = value elif attribute == "rmBuild": self._rmBuild = value
elif attribute == "doBuild": self._doBuild = value elif attribute == "doBuild": self._doBuild = value
@ -84,18 +81,15 @@ class Builder:
elif attribute == "makeArguments": self._makeArguments = value.split () elif attribute == "makeArguments": self._makeArguments = value.split ()
return return
def __getattr__ ( self, attribute ): def __getattr__ ( self, attribute ):
if attribute[0] != "_": if attribute[0] != "_":
if attribute == 'conf': return self._conf if attribute == 'conf': return self._conf
if attribute in self._conf.getAllIds(): if attribute in self._conf.getAllIds():
return getattr( self._conf, attribute ) return getattr( self._conf, attribute )
if not attribute in self.__dict__:
if not self.__dict__.has_key(attribute):
raise ErrorMessage( 1, 'Builder has no attribute <%s>.'%attribute ) raise ErrorMessage( 1, 'Builder has no attribute <%s>.'%attribute )
return self.__dict__[attribute] return self.__dict__[attribute]
def _guessGitHash ( self, project ): def _guessGitHash ( self, project ):
self.gitHash = 'x' self.gitHash = 'x'
os.chdir ( self.sourceDir+'/'+project.getName() ) os.chdir ( self.sourceDir+'/'+project.getName() )
@ -103,48 +97,39 @@ class Builder:
self.gitHash = subprocess.Popen ( command, stdout=subprocess.PIPE ).stdout.readlines()[0] self.gitHash = subprocess.Popen ( command, stdout=subprocess.PIPE ).stdout.readlines()[0]
return return
def _configure ( self, fileIn, fileOut ): def _configure ( self, fileIn, fileOut ):
fdFileIn = open ( fileIn , "r" ) fdFileIn = open ( fileIn , "r" )
fdFileOut = open ( fileOut, "w" ) fdFileOut = open ( fileOut, "w" )
for line in fdFileIn.readlines(): for line in fdFileIn.readlines():
stable = False stable = False
substituted0 = line substituted0 = line
while not stable: while not stable:
substituted1 = re.sub ( r"@revdate@" , self.revDate, substituted0 ) substituted1 = re.sub ( r"@revdate@" , self.revDate, substituted0 )
substituted1 = re.sub ( r"@githash@" , self.gitHash, substituted1 ) substituted1 = re.sub ( r"@githash@" , self.gitHash, substituted1 )
substituted1 = re.sub ( r"@coriolisTop@", "/usr" , substituted1 ) substituted1 = re.sub ( r"@coriolisTop@", "/usr" , substituted1 )
if substituted0 == substituted1: stable = True if substituted0 == substituted1: stable = True
else: substituted0 = substituted1 else: substituted0 = substituted1
fdFileOut.write ( substituted0 ) fdFileOut.write ( substituted0 )
fdFileIn.close () fdFileIn.close ()
fdFileOut.close () fdFileOut.close ()
return return
def _doSpec ( self ): def _doSpec ( self ):
self._configure ( self.specFileIn, self.specFile ) self._configure ( self.specFileIn, self.specFile )
return return
def _doDebChangelog ( self ): def _doDebChangelog ( self ):
self._configure ( self.debChangelogIn, self.debChangelog ) self._configure ( self.debChangelogIn, self.debChangelog )
return return
def _execute ( self, command, error ): def _execute ( self, command, error ):
collections = [] collections = []
if self._devtoolset: if self._devtoolset:
collections.append( 'devtoolset-%d' % self._devtoolset ) collections.append( 'devtoolset-{}'.format(self._devtoolset) )
print 'Using devtoolset-%(v)d (scl enable devtoolset-%(v)d ...)' % {'v':self._devtoolset} print( 'Using devtoolset-{0} (scl enable devtoolset-{0} ...)'.format(self._devtoolset) )
if self._llvmtoolset: if self._llvmtoolset:
collections.append( 'llvm-toolset-%d' % self._llvmtoolset ) collections.append( 'llvm-toolset-{}'.format(self._llvmtoolset) )
print 'Using llvm-toolset-%(v)d (scl enable llvm-toolset-%(v)d ...)' % {'v':self._llvmtoolset} print( 'Using llvm-toolset-{0} (scl enable llvm-toolset-{v} ...)'.format(self._llvmtoolset) )
if collections: if collections:
commandAsString = '' commandAsString = ''
for i in range(len(command)): for i in range(len(command)):
@ -154,7 +139,6 @@ class Builder:
command = [ 'scl', 'enable' ] command = [ 'scl', 'enable' ]
command += collections command += collections
command.append( commandAsString ) command.append( commandAsString )
sys.stdout.flush () sys.stdout.flush ()
sys.stderr.flush () sys.stderr.flush ()
child = subprocess.Popen ( command, env=self._environment, stdout=None ) child = subprocess.Popen ( command, env=self._environment, stdout=None )
@ -164,28 +148,26 @@ class Builder:
ErrorMessage( status, "%s (status:%d)."%(error,status) ).terminate() ErrorMessage( status, "%s (status:%d)."%(error,status) ).terminate()
return return
def _enableTool ( self, tool ): def _enableTool ( self, tool ):
return return
def _build ( self, tool ): def _build ( self, tool ):
toolSourceDir = os.path.join ( self.sourceDir, tool.getToolDir() ) toolSourceDir = os.path.join ( self.sourceDir, tool.getToolDir() )
toolBuildDir = os.path.join ( self.buildDir , tool.name ) toolBuildDir = os.path.join ( self.buildDir , tool.name )
cmakeInstallDir = os.path.join ( self.installDir, "share", "cmake", "Modules" ) cmakeInstallDir = os.path.join ( self.installDir, "share", "cmake", "Modules" )
# Supplied directly in the CMakeLists.txt. # Supplied directly in the CMakeLists.txt.
#cmakeModules = os.path.join ( self.installDir, "share", "cmake", "Modules" ) #cmakeModules = os.path.join ( self.installDir, "share", "cmake", "Modules" )
if not os.path.isdir(toolSourceDir): if not os.path.isdir(toolSourceDir):
print ErrorMessage( 0, "Missing tool source directory: \"%s\" (skipped)."%toolSourceDir ) print( ErrorMessage( 0, 'Missing tool source directory: "{}" (skipped).' \
.format(toolSourceDir) ))
return return
if self._rmBuild: if self._rmBuild:
print "Removing tool build directory: \"%s\"." % toolBuildDir print( 'Removing tool build directory: "{}".'.format(toolBuildDir) )
command = [ "/bin/rm", "-rf", toolBuildDir ] command = [ "/bin/rm", "-rf", toolBuildDir ]
self._execute ( command, "Removing tool build directory" ) self._execute ( command, "Removing tool build directory" )
command = [ 'cmake' ] command = [ 'cmake' ]
if self.libSuffix: command += [ "-D", "LIB_SUFFIX:STRING=%s" % self.libSuffix ]
if self._ninja: command += [ "-G", "Ninja" ] if self._ninja: command += [ "-G", "Ninja" ]
if self._macports: command += [ "-D", "WITH_MACPORTS:STRING=TRUE" ] if self._macports: command += [ "-D", "WITH_MACPORTS:STRING=TRUE" ]
if self._noSystemBoost: command += [ "-D", "Boost_NO_SYSTEM_PATHS:STRING=TRUE" if self._noSystemBoost: command += [ "-D", "Boost_NO_SYSTEM_PATHS:STRING=TRUE"
@ -195,7 +177,6 @@ class Builder:
if self._bfd: command += [ "-D", "USE_LIBBFD:STRING=%s" % self._bfd ] if self._bfd: command += [ "-D", "USE_LIBBFD:STRING=%s" % self._bfd ]
if self._qt5: command += [ "-D", "WITH_QT5:STRING=TRUE" ] if self._qt5: command += [ "-D", "WITH_QT5:STRING=TRUE" ]
if self._openmp: command += [ "-D", "WITH_OPENMP:STRING=TRUE" ] if self._openmp: command += [ "-D", "WITH_OPENMP:STRING=TRUE" ]
command += [ "-D", "CMAKE_BUILD_TYPE:STRING=%s" % self.buildMode command += [ "-D", "CMAKE_BUILD_TYPE:STRING=%s" % self.buildMode
#, "-D", "BUILD_SHARED_LIBS:STRING=%s" % self.enableShared #, "-D", "BUILD_SHARED_LIBS:STRING=%s" % self.enableShared
, "-D", "CMAKE_INSTALL_PREFIX:STRING=%s" % self.installDir , "-D", "CMAKE_INSTALL_PREFIX:STRING=%s" % self.installDir
@ -205,11 +186,10 @@ class Builder:
, toolSourceDir ] , toolSourceDir ]
if not os.path.isdir(toolBuildDir): if not os.path.isdir(toolBuildDir):
print "Creating tool build directory: \"%s\"." % toolBuildDir print( 'Creating tool build directory: "{}".'.format(toolBuildDir) )
os.makedirs ( toolBuildDir ) os.makedirs ( toolBuildDir )
os.chdir ( toolBuildDir ) os.chdir ( toolBuildDir )
self._execute ( command, "First CMake failed" ) self._execute ( command, "First CMake failed" )
os.chdir ( toolBuildDir ) os.chdir ( toolBuildDir )
if self._noCache: if self._noCache:
cmakeCache = os.path.join(toolBuildDir,"CMakeCache.txt") cmakeCache = os.path.join(toolBuildDir,"CMakeCache.txt")
@ -226,22 +206,19 @@ class Builder:
command += [ toolSourceDir ] command += [ toolSourceDir ]
self._execute ( command, "Second CMake failed" ) self._execute ( command, "Second CMake failed" )
if self._doBuild: if self._doBuild:
command = [ "make" ] command = [ "make" ]
if self._ninja: if self._ninja:
command = [ "ninja-build" ] command = [ "ninja-build" ]
#command += [ "DESTDIR=%s" % self.installDir ] #command += [ "DESTDIR=%s" % self.installDir ]
command += self._makeArguments command += self._makeArguments
print "Make/Ninja command:", command print( "Make/Ninja command:", command )
sys.stdout.flush () sys.stdout.flush ()
self._execute ( command, "Build failed" ) self._execute ( command, "Build failed" )
return return
def gitArchive ( self, projectName ): def gitArchive ( self, projectName ):
rawArchive = self.tarballDir+'/'+projectName+'.tar' rawArchive = self.tarballDir+'/'+projectName+'.tar'
os.chdir ( self.sourceDir+'/'+projectName ) os.chdir ( self.sourceDir+'/'+projectName )
command = [ 'git' command = [ 'git'
, 'archive' , 'archive'
@ -250,11 +227,10 @@ class Builder:
, 'devel' , 'devel'
] ]
self._execute ( command, "git archive of project %s" % projectName ) self._execute ( command, "git archive of project %s" % projectName )
if not os.path.isdir ( self.archiveDir ): if not os.path.isdir ( self.archiveDir ):
os.mkdir ( self.archiveDir ) os.mkdir ( self.archiveDir )
os.chdir ( self.archiveDir ) os.chdir ( self.archiveDir )
command = [ 'tar', 'xf', rawArchive ] command = [ 'tar', 'xf', rawArchive ]
self._execute ( command, "unpacking raw archive %s" % rawArchive ) self._execute ( command, "unpacking raw archive %s" % rawArchive )
@ -284,32 +260,27 @@ class Builder:
# , "--no-backup-if-mismatch" # , "--no-backup-if-mismatch"
# , "-p0", "-i", self.distribPatch ] # , "-p0", "-i", self.distribPatch ]
# self._execute ( command, "patch for distribution command failed" ) # self._execute ( command, "patch for distribution command failed" )
absSourceTarBz2 = '%s/%s' % (self.tarballDir,self.sourceTarBz2) absSourceTarBz2 = '%s/%s' % (self.tarballDir,self.sourceTarBz2)
os.chdir ( self.tarballDir ) os.chdir ( self.tarballDir )
command = [ 'tar', 'jcf', absSourceTarBz2, os.path.basename(self.archiveDir) ] command = [ 'tar', 'jcf', absSourceTarBz2, os.path.basename(self.archiveDir) ]
self._execute ( command, "Creating composite archive %s" % absSourceTarBz2 ) self._execute ( command, "Creating composite archive %s" % absSourceTarBz2 )
return return
def _setEnvironment ( self, systemVariable, userVariable ): def _setEnvironment ( self, systemVariable, userVariable ):
if not self._environment.has_key(systemVariable) or self._environment[systemVariable] == "": if not systemVariable in self._environment or self._environment[systemVariable] == "":
if not self._environment.has_key(userVariable) or self._environment[userVariable] == "" : if not userVariable in self._environment or self._environment[userVariable] == "" :
self._environment[ systemVariable ] = self.installDir self._environment[ systemVariable ] = self.installDir
print "[WARNING] Neither <%s> nor <%s> environment variables are sets." \ print( '[WARNING] Neither "{0}" nor "{1}" environment variables are sets.' \
% (systemVariable,userVariable) .format(systemVariable,userVariable) )
print " Setting <%s> to <%s>." % (systemVariable,self.installDir) print( ' Setting "{0}" to "{1}".'.format(systemVariable,self.installDir) )
else: else:
self._environment[ systemVariable ] = self._environment[ userVariable ] self._environment[ systemVariable ] = self._environment[ userVariable ]
if not self._quiet: if not self._quiet:
print "Setting <%s> to <%s>." % (systemVariable,self._environment[systemVariable]) print( 'Setting "{0}" to "{1}".'.format(systemVariable,self._environment[systemVariable]) )
if self._environment.has_key(userVariable): if userVariable in self._environment:
print "Transmitting <%s> as <%s>." % (userVariable,self._environment[userVariable]) print( 'Transmitting "{0}" as "{1}".'.format(userVariable,self._environment[userVariable]) )
return return
def _commandTemplate ( self, tools, projects, command ): def _commandTemplate ( self, tools, projects, command ):
if self._clang: if self._clang:
self._environment[ 'CC' ] = 'clang' self._environment[ 'CC' ] = 'clang'
@ -320,87 +291,70 @@ class Builder:
if self._macports: if self._macports:
self._environment[ 'BOOST_INCLUDEDIR' ] = '/opt/local/include' self._environment[ 'BOOST_INCLUDEDIR' ] = '/opt/local/include'
self._environment[ 'BOOST_LIBRARYDIR' ] = '/opt/local/lib' self._environment[ 'BOOST_LIBRARYDIR' ] = '/opt/local/lib'
# Set or guess the various projects TOP environment variables. # Set or guess the various projects TOP environment variables.
for project in self.projects: for project in self.projects:
topVariable = "%s_TOP" % project.getName().upper() topVariable = "%s_TOP" % project.getName().upper()
topUserVariable = "%s_USER_TOP" % project.getName().upper() topUserVariable = "%s_USER_TOP" % project.getName().upper()
self._setEnvironment ( topVariable, topUserVariable ) self._setEnvironment ( topVariable, topUserVariable )
if tools: if tools:
# Checks if the requested tools are in the various projects. # Checks if the requested tools are in the various projects.
self.standalones = tools self.standalones = tools
for project in self.projects: for project in self.projects:
self.standalones = project.activate ( self.standalones ) self.standalones = project.activate ( self.standalones )
for tool in self.standalones: for tool in self.standalones:
print "[WARNING] Tool \"%s\" is not part of any project." % tool print( '[WARNING] Tool "{}" is not part of any project.'.format(tool) )
if projects: if projects:
for projectName in projects: for projectName in projects:
project = self.getProject ( projectName ) project = self.getProject ( projectName )
if not project: if not project:
ErrorMessage( 1, "No project of name \"%s\"."%projectName ).terminate() ErrorMessage( 1, "No project of name \"%s\"."%projectName ).terminate()
project.activateAll() project.activateAll()
if not tools and not projects: if not tools and not projects:
for project in self.projects: for project in self.projects:
project.activateAll () project.activateAll ()
for project in self.projects: for project in self.projects:
for tool in project.getActives(): for tool in project.getActives():
print "\nProcessing tool: \"%s\"." % tool.name print( '\nProcessing tool: "{}".'.format(tool.name) )
getattr(self,command) ( tool ) getattr(self,command) ( tool )
return return
def enable ( self, tools, projects ): def enable ( self, tools, projects ):
self._commandTemplate ( tools, projects, "_enableTool" ) self._commandTemplate ( tools, projects, "_enableTool" )
return return
def enabledTools ( self ): def enabledTools ( self ):
tools = [] tools = []
for project in self.projects: for project in self.projects:
tools += project.getActives() tools += project.getActives()
return tools return tools
def build ( self, tools, projects ): def build ( self, tools, projects ):
self._commandTemplate ( tools, projects, "_build" ) self._commandTemplate ( tools, projects, "_build" )
return return
def gitTarball ( self, tools, projects ): def gitTarball ( self, tools, projects ):
if self.gitHash == "x": if self.gitHash == "x":
self._guessGitHash ( self.getProject(projects[0]) ) self._guessGitHash ( self.getProject(projects[0]) )
self._doSpec () self._doSpec ()
# self._doDebChangelog () # self._doDebChangelog ()
if os.path.isdir(self.tarballDir): if os.path.isdir(self.tarballDir):
print "Removing previous tarball directory: \"%s\"." % self.tarballDir print( 'Removing previous tarball directory: "{}".'.format(self.tarballDir) )
command = [ "/bin/rm", "-rf", self.tarballDir ] command = [ "/bin/rm", "-rf", self.tarballDir ]
self._execute ( command, "Removing top export (tarball) directory" ) self._execute ( command, "Removing top export (tarball) directory" )
print( 'Creating tarball directory: "{}".'.format(self.tarballDir) )
print "Creating tarball directory: \"%s\"." % self.tarballDir
os.makedirs ( self.tarballDir ) os.makedirs ( self.tarballDir )
self.gitArchive ( projects[0] ) self.gitArchive ( projects[0] )
return return
def userTarball ( self, tools, projects ): def userTarball ( self, tools, projects ):
self.enable( tools, projects ) self.enable( tools, projects )
userSourceTarBz2 = os.path.join ( self.tarballDir userSourceTarBz2 = os.path.join ( self.tarballDir
, datetime.date.today().strftime('%s-%s-%%Y%%m%%d.tar.bz2'% , datetime.date.today().strftime('%s-%s-%%Y%%m%%d.tar.bz2'%
(self.packageName (self.packageName
,self.packageVersion)) ) ,self.packageVersion)) )
excludes = [] excludes = []
for exclude in self.packageExcludes: for exclude in self.packageExcludes:
excludes += [ '--exclude='+exclude ] excludes += [ '--exclude='+exclude ]
os.chdir ( self.sourceDir ) os.chdir ( self.sourceDir )
command = [ "/bin/tar" command = [ "/bin/tar"
, "--exclude-backups" , "--exclude-backups"
@ -410,13 +364,10 @@ class Builder:
+ [ "-jcvf", userSourceTarBz2 ] \ + [ "-jcvf", userSourceTarBz2 ] \
+ self.enabledTools() + self.enabledTools()
self._execute ( command, "tar command failed" ) self._execute ( command, "tar command failed" )
return return
def doRpm ( self ): def doRpm ( self ):
self.gitTarball ( [], self.packageProjects ) self.gitTarball ( [], self.packageProjects )
for rpmDir in [ "SOURCES", "SPECS", "BUILD", "tmp" for rpmDir in [ "SOURCES", "SPECS", "BUILD", "tmp"
, "SRPMS", "RPMS/i386", "RPMS/i686", "RPMS/x86_64" ]: , "SRPMS", "RPMS/i386", "RPMS/i686", "RPMS/x86_64" ]:
rpmFullDir = os.path.join ( self.rpmbuildDir, rpmDir ) rpmFullDir = os.path.join ( self.rpmbuildDir, rpmDir )
@ -428,9 +379,8 @@ class Builder:
if os.path.islink(path): if os.path.islink(path):
realpath = os.path.realpath( os.readlink(path) ) realpath = os.path.realpath( os.readlink(path) )
if not os.path.isfile(realpath): if not os.path.isfile(realpath):
print 'Remove obsolete link: <%s>.' % path print( 'Remove obsolete link: "{}".'.format(path) )
os.unlink( path ) os.unlink( path )
rpmSpecFile = os.path.join ( self.rpmbuildDir, "SPECS" , "coriolis2.spec" ) rpmSpecFile = os.path.join ( self.rpmbuildDir, "SPECS" , "coriolis2.spec" )
rpmSourceFile = os.path.join ( self.rpmbuildDir, "SOURCES", self.sourceTarBz2 ) rpmSourceFile = os.path.join ( self.rpmbuildDir, "SOURCES", self.sourceTarBz2 )
sourceFile = os.path.join ( self.tarballDir , self.sourceTarBz2 ) sourceFile = os.path.join ( self.tarballDir , self.sourceTarBz2 )
@ -438,12 +388,10 @@ class Builder:
if os.path.isfile ( rpmSpecFile ): if os.path.isfile ( rpmSpecFile ):
os.unlink ( rpmSpecFile ) os.unlink ( rpmSpecFile )
os.symlink ( self.specFile, rpmSpecFile ) os.symlink ( self.specFile, rpmSpecFile )
if not os.path.islink ( rpmSourceFile ): if not os.path.islink ( rpmSourceFile ):
os.symlink ( sourceFile, rpmSourceFile ) os.symlink ( sourceFile, rpmSourceFile )
os.chdir ( self.rpmbuildDir ) os.chdir ( self.rpmbuildDir )
command = [ "/usr/bin/rpmbuild" command = [ "/usr/bin/rpmbuild"
, "--define", "_topdir %s" % self.rpmbuildDir , "--define", "_topdir %s" % self.rpmbuildDir
, "--define", "_tmppath %s" % self.tmppathDir , "--define", "_tmppath %s" % self.tmppathDir
@ -452,18 +400,13 @@ class Builder:
if self._devtoolset: if self._devtoolset:
command += [ "--define", "scl devtoolset-%d"%self._devtoolset ] command += [ "--define", "scl devtoolset-%d"%self._devtoolset ]
command += [ "-ba", "--clean", rpmSpecFile ] command += [ "-ba", "--clean", rpmSpecFile ]
self._execute ( command, "Rebuild rpm packages" ) self._execute ( command, "Rebuild rpm packages" )
return return
def doDeb ( self ): def doDeb ( self ):
self.svnTarball ( [], self.packageProjects ) self.svnTarball ( [], self.packageProjects )
if not os.path.isdir(self.debbuildDir): if not os.path.isdir(self.debbuildDir):
os.makedirs ( self.debbuildDir ) os.makedirs ( self.debbuildDir )
os.chdir ( self.debbuildDir ) os.chdir ( self.debbuildDir )
sourceFile = os.path.join ( self.tarballDir , self.sourceTarBz2 ) sourceFile = os.path.join ( self.tarballDir , self.sourceTarBz2 )
debOrigFile = os.path.join ( self.debbuildDir, "coriolis2_1.0.%s.orig.tar.bz2" % self.gitHash ) debOrigFile = os.path.join ( self.debbuildDir, "coriolis2_1.0.%s.orig.tar.bz2" % self.gitHash )
@ -478,17 +421,12 @@ class Builder:
packageDir = os.path.join ( self.debbuildDir, "coriolis2-1.0.%s" % self.gitHash ) packageDir = os.path.join ( self.debbuildDir, "coriolis2-1.0.%s" % self.gitHash )
os.chdir ( packageDir ) os.chdir ( packageDir )
self._environment["CFLAGS" ] = "-O2" self._environment["CFLAGS" ] = "-O2"
self._environment["CXXFLAGS"] = "-O2" self._environment["CXXFLAGS"] = "-O2"
command = [ "/usr/bin/debuild", "-us", "-uc" ] command = [ "/usr/bin/debuild", "-us", "-uc" ]
self._execute ( command, "Rebuild Debian packages" ) self._execute ( command, "Rebuild Debian packages" )
return return
def getProject ( self, name ): return self._conf.getProject(name) def getProject ( self, name ): return self._conf.getProject(name)
def loadConfiguration ( self, confFile ): self._conf.load( confFile ) def loadConfiguration ( self, confFile ): self._conf.load( confFile )
def showConfiguration ( self ): self._conf.show() def showConfiguration ( self ): self._conf.show()

23
bootstrap/builder/BuilderGui.py
View File

@ -2,35 +2,32 @@
# -*- mode:Python -*- # -*- mode:Python -*-
# #
# This file is part of the Coriolis Software. # This file is part of the Coriolis Software.
# Copyright (c) UPMC/LIP6 2012-2018, All Rights Reserved # Copyright (c) Sorbonne Université 2012-2021, All Rights Reserved
# #
# +-----------------------------------------------------------------+ # +-----------------------------------------------------------------+
# | C O R I O L I S | # | C O R I O L I S |
# | C o r i o l i s / C h a m s B u i l d e r | # | T o o l c h a i n B u i l d e r |
# | | # | |
# | Author : Damien Dupuis | # | Author : Damien Dupuis |
# | E-mail : Jean-Paul.Chaput@asim.lip6.fr | # | E-mail : Jean-Paul.Chaput@lip6.fr |
# | =============================================================== | # | =============================================================== |
# | Python : "./builder/BuilderGui.py" | # | Python : "./builder/BuilderGui.py" |
# +-----------------------------------------------------------------+ # +-----------------------------------------------------------------+
from PyQt4.QtGui import QTabWidget from PyQt4.QtGui import QTabWidget, QApplication, QMainWindow, \
from PyQt4.QtGui import QApplication QAction , QKeySequence
from PyQt4.QtGui import QMainWindow from .OptionsWidget import OptionsWidget
from PyQt4.QtGui import QAction from .CompileWidget import CompileWidget
from PyQt4.QtGui import QKeySequence from .ConfigureWidget import ConfigureWidget
from OptionsWidget import OptionsWidget from .AboutWidget import AboutWidget
from CompileWidget import CompileWidget
from ConfigureWidget import ConfigureWidget
from AboutWidget import AboutWidget
class BuilderGui ( QMainWindow ): class BuilderGui ( QMainWindow ):
def __init__ ( self, confFile, parent=None ): def __init__ ( self, confFile, parent=None ):
QMainWindow.__init__( self, parent ) QMainWindow.__init__( self, parent )
self.setWindowTitle( 'Coriolis/Chams Builder' ) self.setWindowTitle( 'Coriolis Toolchain Builder' )
self._tabWidget = QTabWidget() self._tabWidget = QTabWidget()
self._configureWidget = ConfigureWidget(confFile) self._configureWidget = ConfigureWidget(confFile)
self._optionsWidget = OptionsWidget(self._configureWidget.conf) self._optionsWidget = OptionsWidget(self._configureWidget.conf)

51
bootstrap/builder/CompileWidget.py
View File

@ -2,11 +2,11 @@
# -*- mode:Python -*- # -*- mode:Python -*-
# #
# This file is part of the Coriolis Software. # This file is part of the Coriolis Software.
# Copyright (c) UPMC/LIP6 2012-2018, All Rights Reserved # Copyright (c) Sorbonne Université 2012-2021, All Rights Reserved
# #
# +-----------------------------------------------------------------+ # +-----------------------------------------------------------------+
# | C O R I O L I S | # | C O R I O L I S |
# | C o r i o l i s / C h a m s B u i l d e r | # | T o o l c h a i n B u i l d e r |
# | | # | |
# | Author : Damien Dupuis | # | Author : Damien Dupuis |
# | E-mail : Jean-Paul.Chaput@asim.lip6.fr | # | E-mail : Jean-Paul.Chaput@asim.lip6.fr |
@ -17,30 +17,14 @@
import re import re
import subprocess import subprocess
from PyQt4.QtCore import Qt from PyQt4.QtCore import Qt, pyqtSignal, QSettings
from PyQt4.QtCore import pyqtSignal from PyQt4.QtGui import QFont, QColor, QPalette, QTextCharFormat, \
from PyQt4.QtCore import QSettings QWidget, QLabel, QPushButton, QCheckBox, \
from PyQt4.QtGui import QFont QGroupBox, QButtonGroup, QVBoxLayout, \
from PyQt4.QtGui import QColor QHBoxLayout, QGridLayout, QScrollArea, \
from PyQt4.QtGui import QPalette QComboBox, QLineEdit, QTextEdit, \
from PyQt4.QtGui import QTextCharFormat QFileDialog, QProgressBar, QApplication
from PyQt4.QtGui import QWidget from .Highlighter import Highlighter
from PyQt4.QtGui import QLabel
from PyQt4.QtGui import QPushButton
from PyQt4.QtGui import QCheckBox
from PyQt4.QtGui import QGroupBox
from PyQt4.QtGui import QButtonGroup
from PyQt4.QtGui import QVBoxLayout
from PyQt4.QtGui import QHBoxLayout
from PyQt4.QtGui import QGridLayout
from PyQt4.QtGui import QScrollArea
from PyQt4.QtGui import QComboBox
from PyQt4.QtGui import QLineEdit
from PyQt4.QtGui import QTextEdit
from PyQt4.QtGui import QFileDialog
from PyQt4.QtGui import QProgressBar
from PyQt4.QtGui import QApplication
from builder.Highlighter import Highlighter
class CompileWidget ( QWidget ): class CompileWidget ( QWidget ):
@ -105,7 +89,6 @@ class CompileWidget ( QWidget ):
self.readSettings() self.readSettings()
return return
def _setOptions ( self, options ): self._options = options def _setOptions ( self, options ): self._options = options
def _setConf ( self, conf ): self._conf = conf def _setConf ( self, conf ): self._conf = conf
def _getOptions ( self ): return self._options def _getOptions ( self ): return self._options
@ -114,7 +97,6 @@ class CompileWidget ( QWidget ):
options = property( _getOptions, _setOptions ) options = property( _getOptions, _setOptions )
conf = property( _getConf , _setConf ) conf = property( _getConf , _setConf )
def browseSaveLog ( self ): def browseSaveLog ( self ):
self._saveLogEdit.setText( QFileDialog.getSaveFileName( self self._saveLogEdit.setText( QFileDialog.getSaveFileName( self
, 'Select Log File Report' , 'Select Log File Report'
@ -129,16 +111,13 @@ class CompileWidget ( QWidget ):
fd.close() fd.close()
return return
def shellCommand ( self ): def shellCommand ( self ):
command = [ self.conf.bootstrapDir+'/ccb.py' ] command = [ self.conf.bootstrapDir+'/ccb.py' ]
for project in self.options.projects: for project in self.options.projects:
for tool in project.actives: for tool in project.actives:
command += [ '--tool='+tool ] command += [ '--tool='+tool ]
toolsCount = len(command) - 1 toolsCount = len(command) - 1
if self.conf.rootDir: command += [ '--root=%s'%self.conf.rootDir ] if self.conf.rootDir: command += [ '--root=%s'%self.conf.rootDir ]
#if self.options.svnUpdate: command += [ '--svn-update' ] #if self.options.svnUpdate: command += [ '--svn-update' ]
#if self.options.svnStatus: command += [ '--svn-update' ] #if self.options.svnStatus: command += [ '--svn-update' ]
if self.options.enableDoc: command += [ '--doc' ] if self.options.enableDoc: command += [ '--doc' ]
@ -150,21 +129,16 @@ class CompileWidget ( QWidget ):
if self.options.make: if self.options.make:
makeArguments='install '+self.options.threads makeArguments='install '+self.options.threads
command += [ '--make=%s'%makeArguments ] command += [ '--make=%s'%makeArguments ]
if self.options.buildMode == 'Debug': if self.options.buildMode == 'Debug':
command += [ '--debug' ] command += [ '--debug' ]
return toolsCount, command return toolsCount, command
def go ( self ): def go ( self ):
rePercentage = re.compile(r'^\[\s*(?P<percent>\d+)%\].*') rePercentage = re.compile(r'^\[\s*(?P<percent>\d+)%\].*')
reProcessTool = re.compile(r'^Processing tool:\s*"(?P<tool>.+)"') reProcessTool = re.compile(r'^Processing tool:\s*"(?P<tool>.+)"')
if not self.options or not self.conf: return if not self.options or not self.conf: return
toolsCount, command = self.shellCommand() toolsCount, command = self.shellCommand()
if not toolsCount: return if not toolsCount: return
self._progressBar.reset() self._progressBar.reset()
self._progressBar.setRange( 0, toolsCount*100 ) self._progressBar.setRange( 0, toolsCount*100 )
@ -181,7 +155,6 @@ class CompileWidget ( QWidget ):
while True: while True:
line = builderProcess.stdout.readline() line = builderProcess.stdout.readline()
if line == '': break if line == '': break
m = rePercentage.match( line ) m = rePercentage.match( line )
if m: if m:
self.progress.emit( toolsDone*100+int(m.group('percent')) ) self.progress.emit( toolsDone*100+int(m.group('percent')) )
@ -189,9 +162,7 @@ class CompileWidget ( QWidget ):
m = reProcessTool.match( line ) m = reProcessTool.match( line )
if m: if m:
toolsDone += 1 toolsDone += 1
self._console.insertPlainText( line ) self._console.insertPlainText( line )
scrollBar = self._console.verticalScrollBar() scrollBar = self._console.verticalScrollBar()
scrollBar.setValue( scrollBar.maximum() ) scrollBar.setValue( scrollBar.maximum() )
QApplication.processEvents() QApplication.processEvents()
@ -202,7 +173,7 @@ class CompileWidget ( QWidget ):
def readSettings ( self ): def readSettings ( self ):
settings = QSettings() settings = QSettings()
self._saveLogEdit.setText( settings.value('compile/saveLog').toString() ) self._saveLogEdit.setText( settings.value('compile/saveLog') )
return return
def saveSettings ( self ): def saveSettings ( self ):

133
bootstrap/builder/Configuration.py
View File

@ -2,14 +2,14 @@
# -*- mode:Python -*- # -*- mode:Python -*-
# #
# This file is part of the Coriolis Software. # This file is part of the Coriolis Software.
# Copyright (c) UPMC 2008-2018, All Rights Reserved # Copyright (c) Sorbonne Université 2008-2021, All Rights Reserved
# #
# +-----------------------------------------------------------------+ # +-----------------------------------------------------------------+
# | C O R I O L I S | # | C O R I O L I S |
# | C o r i o l i s / C h a m s B u i l d e r | # | T o o l c h a i n B u i l d e r |
# | | # | |
# | Author : Jean-Paul Chaput | # | Author : Jean-Paul Chaput |
# | E-mail : Jean-Paul.Chaput@asim.lip6.fr | # | E-mail : Jean-Paul.Chaput@lip6.fr |
# | =============================================================== | # | =============================================================== |
# | Python : "./builder/Configuration.py" | # | Python : "./builder/Configuration.py" |
# +-----------------------------------------------------------------+ # +-----------------------------------------------------------------+
@ -22,7 +22,7 @@ import os.path
import datetime import datetime
import subprocess import subprocess
from . import ErrorMessage from . import ErrorMessage
from Project import Project from .Project import Project
class Configuration ( object ): class Configuration ( object ):
@ -64,31 +64,26 @@ class Configuration ( object ):
self._updateSecondary() self._updateSecondary()
return return
def __setattr__ ( self, attribute, value ): def __setattr__ ( self, attribute, value ):
if attribute in Configuration.SecondaryNames: if attribute in Configuration.SecondaryNames:
print ErrorMessage( 1, 'Attempt to write in read-only attribute <%s> in Configuration.'%attribute ) print( ErrorMessage( 1, 'Attempt to write in read-only attribute "{}" in Configuration.' \
.format(attribute) ))
return return
if attribute[0] == '_': if attribute[0] == '_':
self.__dict__[attribute] = value self.__dict__[attribute] = value
return return
if attribute == 'rootDir': value = os.path.expanduser(value) if attribute == 'rootDir': value = os.path.expanduser(value)
elif attribute == 'enableShared' and value != 'ON': value = 'OFF' elif attribute == 'enableShared' and value != 'ON': value = 'OFF'
self.__dict__['_'+attribute] = value self.__dict__['_'+attribute] = value
self._updateSecondary() self._updateSecondary()
return return
def __getattr__ ( self, attribute ): def __getattr__ ( self, attribute ):
if attribute[0] != '_': attribute = '_'+attribute if attribute[0] != '_': attribute = '_'+attribute
if not self.__dict__.has_key(attribute): if not attribute in self.__dict__:
raise ErrorMessage( 1, 'Configuration has no attribute <%s>.'%attribute ) raise ErrorMessage( 1, 'Configuration has no attribute <%s>.'%attribute )
return self.__dict__[attribute] return self.__dict__[attribute]
def _updateSecondary ( self ): def _updateSecondary ( self ):
if self._enableShared == "ON": self._libMode = "Shared" if self._enableShared == "ON": self._libMode = "Shared"
else: self._libMode = "Static" else: self._libMode = "Static"
@ -109,7 +104,6 @@ class Configuration ( object ):
, "%s.%s" % (self._buildMode,self._libMode) ) , "%s.%s" % (self._buildMode,self._libMode) )
self._buildDir = os.path.join ( self._osDir, "build" ) self._buildDir = os.path.join ( self._osDir, "build" )
self._installDir = os.path.join ( self._osDir, "install" ) self._installDir = os.path.join ( self._osDir, "install" )
self._specFileIn = os.path.join ( self._bootstrapDir, "%s.spec.in"%self._packageName ) self._specFileIn = os.path.join ( self._bootstrapDir, "%s.spec.in"%self._packageName )
self._specFile = os.path.join ( self._bootstrapDir, "%s.spec" %self._packageName ) self._specFile = os.path.join ( self._bootstrapDir, "%s.spec" %self._packageName )
self._debianDir = os.path.join ( self._bootstrapDir, "debian" ) self._debianDir = os.path.join ( self._bootstrapDir, "debian" )
@ -126,7 +120,6 @@ class Configuration ( object ):
self._distribPatch = os.path.join ( self._sourceDir, "bootstrap", "%s-for-distribution.patch"%self._packageName ) self._distribPatch = os.path.join ( self._sourceDir, "bootstrap", "%s-for-distribution.patch"%self._packageName )
return return
def _guessOs ( self ): def _guessOs ( self ):
self._libSuffix = None self._libSuffix = None
self._osSlsoc7x_64 = re.compile (".*Linux.*(el7|slsoc7).*x86_64.*") self._osSlsoc7x_64 = re.compile (".*Linux.*(el7|slsoc7).*x86_64.*")
@ -151,93 +144,87 @@ class Configuration ( object ):
uname = subprocess.Popen ( ["uname", "-srm"], stdout=subprocess.PIPE ) uname = subprocess.Popen ( ["uname", "-srm"], stdout=subprocess.PIPE )
lines = uname.stdout.readlines() lines = uname.stdout.readlines()
osLine = lines[0].decode( 'ascii' )
if self._osSlsoc7x_64.match(lines[0]): if self._osSlsoc7x_64.match(osLine):
self._osType = "Linux.el7_64" self._osType = "Linux.el7_64"
self._libSuffix = "64" self._libSuffix = "64"
elif self._osSlsoc6x_64.match(lines[0]): elif self._osSlsoc6x_64.match(osLine):
self._osType = "Linux.slsoc6x_64" self._osType = "Linux.slsoc6x_64"
self._libSuffix = "64" self._libSuffix = "64"
elif self._osSlsoc6x .match(lines[0]): self._osType = "Linux.slsoc6x" elif self._osSlsoc6x .match(osLine): self._osType = "Linux.slsoc6x"
elif self._osSLSoC5x_64.match(lines[0]): elif self._osSLSoC5x_64.match(osLine):
self._osType = "Linux.SLSoC5x_64" self._osType = "Linux.SLSoC5x_64"
self._libSuffix = "64" self._libSuffix = "64"
elif self._osSLSoC5x .match(lines[0]): self._osType = "Linux.SLSoC5x" elif self._osSLSoC5x .match(osLine): self._osType = "Linux.SLSoC5x"
elif self._osFedora_64 .match(lines[0]): elif self._osFedora_64 .match(osLine):
self._osType = "Linux.fc_64" self._osType = "Linux.fc_64"
self._libSuffix = "64" self._libSuffix = "64"
elif self._osFedora .match(lines[0]): self._osType = "Linux.fc" elif self._osFedora .match(osLine): self._osType = "Linux.fc"
elif self._osLinux_64 .match(lines[0]): elif self._osLinux_64 .match(osLine):
self._osType = "Linux.x86_64" self._osType = "Linux.x86_64"
if os.path.exists("/usr/lib64/"): if os.path.exists("/usr/lib64/"):
self._libSuffix = "64" self._libSuffix = "64"
elif self._osLinux .match(lines[0]): self._osType = "Linux.i386" elif self._osLinux .match(osLine): self._osType = "Linux.i386"
elif self._osDarwin .match(lines[0]): self._osType = "Darwin" elif self._osDarwin .match(osLine): self._osType = "Darwin"
elif self._osFreeBSD8x_amd64.match(lines[0]): elif self._osFreeBSD8x_amd64.match(osLine):
self._osType = "FreeBSD.8x.amd64" self._osType = "FreeBSD.8x.amd64"
self._libSuffix = "64" self._libSuffix = "64"
elif self._osFreeBSD8x_64.match(lines[0]): elif self._osFreeBSD8x_64.match(osLine):
self._osType = "FreeBSD.8x.x86_64" self._osType = "FreeBSD.8x.x86_64"
self._libSuffix = "64" self._libSuffix = "64"
elif self._osFreeBSD8x .match(lines[0]): self._osType = "FreeBSD.8x.i386" elif self._osFreeBSD8x .match(osLine): self._osType = "FreeBSD.8x.i386"
elif self._osCygwinW7_64.match(lines[0]): elif self._osCygwinW7_64.match(osLine):
self._osType = "Cygwin.W7_64" self._osType = "Cygwin.W7_64"
self._libSuffix = "64" self._libSuffix = "64"
elif self._osCygwinW7.match(lines[0]): self._osType = "Cygwin.W7" elif self._osCygwinW7.match(osLine): self._osType = "Cygwin.W7"
elif self._osCygwinW8_64.match(lines[0]): elif self._osCygwinW8_64.match(osLine):
self._osType = "Cygwin.W8_64" self._osType = "Cygwin.W8_64"
self._libSuffix = "64" self._libSuffix = "64"
elif self._osCygwinW8.match(lines[0]): self._osType = "Cygwin.W8" elif self._osCygwinW8.match(osLine): self._osType = "Cygwin.W8"
elif self._osCygwinW10_64.match(lines[0]): elif self._osCygwinW10_64.match(osLine):
self._osType = "Cygwin.W10_64" self._osType = "Cygwin.W10_64"
self._libSuffix = "64" self._libSuffix = "64"
elif self._osCygwinW10.match(lines[0]): self._osType = "Cygwin.W10" elif self._osCygwinW10.match(osLine): self._osType = "Cygwin.W10"
else: else:
uname = subprocess.Popen ( ["uname", "-sr"], stdout=subprocess.PIPE ) uname = subprocess.Popen ( ["uname", "-sr"], stdout=subprocess.PIPE )
self._osType = uname.stdout.readlines()[0][:-1] self._osType = uname.stdout.readlines()[0][:-1]
print "[WARNING] Unrecognized OS: \"%s\"." % lines[0][:-1] print( '[WARNING] Unrecognized OS: "{}."'.format(osLine[:-1]) )
print " (using: \"%s\")" % self._osType print( ' (using: "{}")'.format(self._osType) )
if self._libSuffix == '64' and not os.path.exists('/usr/lib64'): if self._libSuffix == '64' and not os.path.exists('/usr/lib64'):
self._libSuffix = None self._libSuffix = None
return return
def getPrimaryIds ( self ): return Configuration.PrimaryNames def getPrimaryIds ( self ): return Configuration.PrimaryNames
def getSecondaryIds ( self ): return Configuration.SecondaryNames def getSecondaryIds ( self ): return Configuration.SecondaryNames
def getAllIds ( self ): return Configuration.PrimaryNames + Configuration.SecondaryNames def getAllIds ( self ): return Configuration.PrimaryNames + Configuration.SecondaryNames
def register ( self, project ): def register ( self, project ):
for registered in self._projects: for registered in self._projects:
if registered.getName() == project.getName(): if registered.getName() == project.getName():
print ErrorMessage( 0, "Project \"%s\" is already registered (ignored)." ) print( ErrorMessage( 0, 'Project "{}" is already registered (ignored).'.format(project.getName()) ))
return return
self._projects += [ project ] self._projects += [ project ]
return return
def getProject ( self, name ): def getProject ( self, name ):
for project in self._projects: for project in self._projects:
if project.getName() == name: if project.getName() == name:
return project return project
return None return None
def getToolProject ( self, name ): def getToolProject ( self, name ):
for project in self._projects: for project in self._projects:
if project.hasTool(name): if project.hasTool(name):
return project return project
return None return None
def load ( self, confFile ): def load ( self, confFile ):
moduleGlobals = globals() moduleGlobals = globals()
if not confFile: if not confFile:
print 'Making an educated guess to locate the configuration file:' print( 'Making an educated guess to locate the configuration file:' )
locations = [ os.path.abspath(os.path.dirname(sys.argv[0])) locations = [ os.path.abspath(os.path.dirname(sys.argv[0]))
, os.environ['HOME']+'/coriolis-2.x/src/coriolis/bootstrap' , os.environ['HOME']+'/coriolis-2.x/src/coriolis/bootstrap'
, os.environ['HOME']+'/coriolis/src/coriolis/bootstrap' , os.environ['HOME']+'/coriolis/src/coriolis/bootstrap'
@ -247,86 +234,82 @@ class Configuration ( object ):
for location in locations: for location in locations:
self._confFile = location + '/build.conf' self._confFile = location + '/build.conf'
print ' <%s>' % self._confFile print( ' "{}"'.format(self._confFile) )
if os.path.isfile(self._confFile): break if os.path.isfile(self._confFile): break
if not self._confFile: if not self._confFile:
ErrorMessage( 1, 'Cannot locate any configuration file.' ).terminate() ErrorMessage( 1, 'Cannot locate any configuration file.' ).terminate()
else: else:
print 'Using user-supplied configuration file:' print( 'Using user-supplied configuration file:' )
print ' <%s>' % confFile print( ' "{}"'.format(confFile) )
self._confFile = confFile self._confFile = confFile
if not os.path.isfile(self._confFile): if not os.path.isfile(self._confFile):
ErrorMessage( 1, 'Missing configuration file:', '<%s>'%self._confFile ).terminate() ErrorMessage( 1, 'Missing configuration file:', '<%s>'%self._confFile ).terminate()
print 'Reading configuration from:' print( 'Reading configuration from:' )
print ' <%s>' % self._confFile print( ' "{}"'.format(self._confFile) )
try: try:
execfile( self._confFile, moduleGlobals ) exec( open(self._confFile).read(), globals() )
except Exception, e: except Exception as e:
ErrorMessage( 1, 'An exception occured while loading the configuration file:' ErrorMessage( 1, 'An exception occured while loading the configuration file:'
, '<%s>\n' % (self._confFile) , '<%s>\n' % (self._confFile)
, 'You should check for simple python errors in this file.' , 'You should check for simple python errors in this file.'
, 'Error was:' , 'Error was:'
, '%s\n' % e ).terminate() , '%s\n' % e ).terminate()
if moduleGlobals.has_key('projects'): if 'projects' in moduleGlobals:
entryNb = 0 entryNb = 0
for entry in moduleGlobals['projects']: for entry in moduleGlobals['projects']:
entryNb += 1 entryNb += 1
if not entry.has_key('name'): if not 'name' in entry:
raise ErrorMessage( 1, 'Missing project name in project entry #%d.' % entryNb ) raise ErrorMessage( 1, 'Missing project name in project entry #%d.' % entryNb )
if not entry.has_key('tools'): if not 'tools' in entry:
raise ErrorMessage( 1, 'Missing tools list in project entry #%d (<%s>).' \ raise ErrorMessage( 1, 'Missing tools list in project entry #%d (<%s>).' \
% (entryNb,entry['name']) ) % (entryNb,entry['name']) )
if not isinstance(entry['tools'],list): if not isinstance(entry['tools'],list):
raise ErrorMessage( 1, 'Tools item of project entry #%d (<%s>) is not a list.' \ raise ErrorMessage( 1, 'Tools item of project entry #%d (<%s>) is not a list.' \
% (entryNb,entry['name']) ) % (entryNb,entry['name']) )
if not entry.has_key('repository'): if not 'repository' in entry:
raise ErrorMessage( 1, 'Missing project repository in project entry #%d.' \ raise ErrorMessage( 1, 'Missing project repository in project entry #%d.' \
% entryNb ) % entryNb )
self.register( Project(entry['name'],entry['tools'],entry['repository']) ) self.register( Project(entry['name'],entry['tools'],entry['repository']) )
else: else:
ErrorMessage( 1, 'Configuration file is missing the \'project\' symbol.' ErrorMessage( 1, 'Configuration file is missing the "project" symbol.'
, '<%s>'%self._confFile ).terminate() , '"{}"'.format(self._confFile) ).terminate()
if moduleGlobals.has_key('projectdir'): if 'projectdir' in moduleGlobals:
self.projectDir = moduleGlobals['projectdir'] self.projectDir = moduleGlobals['projectdir']
if 'svnconfig' in moduleGlobals:
if moduleGlobals.has_key('svnconfig'):
svnconfig = moduleGlobals['svnconfig'] svnconfig = moduleGlobals['svnconfig']
if svnconfig.has_key('method'): self._svnMethod = svnconfig['method'] if 'method' in svnconfig: self._svnMethod = svnconfig['method']
if 'package' in moduleGlobals:
if moduleGlobals.has_key('package'):
package = moduleGlobals['package'] package = moduleGlobals['package']
if package.has_key('name' ): self.packageName = package['name'] if 'name' in package: self.packageName = package['name']
if package.has_key('version' ): self.packageVersion = package['version'] if 'version' in package: self.packageVersion = package['version']
if package.has_key('excludes'): if 'excludes' in package:
if not isinstance(package['excludes'],list): if not isinstance(package['excludes'],list):
raise ErrorMessage( 1, 'Excludes of package configuration is not a list.') raise ErrorMessage( 1, 'Excludes of package configuration is not a list.')
self._packageExcludes = package['excludes'] self._packageExcludes = package['excludes']
if package.has_key('projects'): if 'projects' in package:
if not isinstance(package['projects'],list): if not isinstance(package['projects'],list):
raise ErrorMessage( 1, 'Projects to package is not a list.') raise ErrorMessage( 1, 'Projects to package is not a list.')
self._packageProjects = package['projects'] self._packageProjects = package['projects']
return return
def show ( self ): def show ( self ):
print 'CCB Configuration:' print( 'CCB Configuration:' )
if self._gitMethod: if self._gitMethod:
print ' Git Method: <%s>' % self._gitMethod print( ' Git Method: "{}"'.format(self._gitMethod) )
else: else:
print ' Git Method not defined, will not be able to push/pull.' print( ' Git Method not defined, will not be able to push/pull.' )
for project in self._projects: for project in self._projects:
print ' project:%-15s repository:<%s>' % ( ('<%s>'%project.getName()), project.getRepository() ) print( ' project:{0:>15} repository:"{1}"' \
.format( '"{}"'.format(project.getName()), project.getRepository() ))
toolOrder = 1 toolOrder = 1
for tool in project.getTools(): for tool in project.getTools():
print '%s%02d:<%s>' % (' '*26,toolOrder,tool) print( '{0}{1:02}:"{2}"'.format( ' '*26, toolOrder, tool ))
toolOrder += 1 toolOrder += 1
print print
return return

59
bootstrap/builder/ConfigureWidget.py
View File

@ -2,40 +2,27 @@
# -*- mode:Python -*- # -*- mode:Python -*-
# #
# This file is part of the Coriolis Software. # This file is part of the Coriolis Software.
# Copyright (c) UPMC/LIP6 2012-2018, All Rights Reserved # Copyright (c) Sorbonne Université 2012-2021, All Rights Reserved
# #
# +-----------------------------------------------------------------+ # +-----------------------------------------------------------------+
# | C O R I O L I S | # | C O R I O L I S |
# | C o r i o l i s / C h a m s B u i l d e r | # | T o o l c h a i n B u i l d e r |
# | | # | |
# | Author : Damien Dupuis | # | Author : Damien Dupuis |
# | E-mail : Jean-Paul.Chaput@asim.lip6.fr | # | E-mail : Jean-Paul.Chaput@lip6.fr |
# | =============================================================== | # | =============================================================== |
# | Python : "./builder/ConfigureWidget.py" | # | Python : "./builder/ConfigureWidget.py" |
# +-----------------------------------------------------------------+ # +-----------------------------------------------------------------+
from PyQt4.QtCore import Qt from PyQt4.QtCore import Qt, QVariant, pyqtSignal, QSettings, \
from PyQt4.QtCore import QVariant QModelIndex, QAbstractTableModel
from PyQt4.QtCore import pyqtSignal from PyQt4.QtGui import QFont, QWidget, QGridLayout, QHBoxLayout, \
from PyQt4.QtCore import QSettings QVBoxLayout, QLabel, QPushButton, \
from PyQt4.QtGui import QFont QLineEdit, QAbstractItemView, QHeaderView, \
from PyQt4.QtGui import QWidget QTableView, QGroupBox, QFileDialog, \
from PyQt4.QtGui import QGridLayout QApplication
from PyQt4.QtGui import QHBoxLayout from .Configuration import Configuration
from PyQt4.QtGui import QVBoxLayout
from PyQt4.QtGui import QLabel
from PyQt4.QtGui import QPushButton
from PyQt4.QtGui import QLineEdit
from PyQt4.QtCore import QModelIndex
from PyQt4.QtCore import QAbstractTableModel
from PyQt4.QtGui import QAbstractItemView
from PyQt4.QtGui import QHeaderView
from PyQt4.QtGui import QTableView
from PyQt4.QtGui import QGroupBox
from PyQt4.QtGui import QFileDialog
from PyQt4.QtGui import QApplication
from Configuration import Configuration
class ConfSettingsModel ( QAbstractTableModel ): class ConfSettingsModel ( QAbstractTableModel ):
@ -48,7 +35,6 @@ class ConfSettingsModel ( QAbstractTableModel ):
def __init__ ( self, conf, parent=None ): def __init__ ( self, conf, parent=None ):
ConfSettingsModel.HeaderFont.setBold( True ) ConfSettingsModel.HeaderFont.setBold( True )
ConfSettingsModel.SecondaryFont.setItalic( True ) ConfSettingsModel.SecondaryFont.setItalic( True )
QAbstractTableModel.__init__( self, parent ) QAbstractTableModel.__init__( self, parent )
self._conf = conf self._conf = conf
self._ids = self._conf.getAllIds() self._ids = self._conf.getAllIds()
@ -70,20 +56,15 @@ class ConfSettingsModel ( QAbstractTableModel ):
if row < self.rowCount(): if row < self.rowCount():
if index.column() == 0: return self._ids[row] if index.column() == 0: return self._ids[row]
elif index.column() == 1: return getattr( self._conf, self._ids[row] ) elif index.column() == 1: return getattr( self._conf, self._ids[row] )
return None
return QVariant()
def headerData ( self, section, orientation, role ): def headerData ( self, section, orientation, role ):
if orientation == Qt.Vertical: return QVariant() if orientation == Qt.Vertical: return None
if role == Qt.FontRole: return ConfSettingsModel.HeaderFont if role == Qt.FontRole: return ConfSettingsModel.HeaderFont
if role != Qt.DisplayRole: return QVariant() if role != Qt.DisplayRole: return None
if section == 0: return 'Setting' if section == 0: return 'Setting'
elif section == 1: return 'Value' elif section == 1: return 'Value'
return '?'
return QVariant('?')
def rowCount ( self, index=QModelIndex() ): return len(self._ids) def rowCount ( self, index=QModelIndex() ): return len(self._ids)
def columnCount ( self, index=QModelIndex() ): return 2 def columnCount ( self, index=QModelIndex() ): return 2
@ -119,7 +100,6 @@ class ConfSettingsWidget ( QWidget ):
peanoDataLayout = QGridLayout(); peanoDataLayout = QGridLayout();
peanoDataLayout.addWidget( self._view, 0, 0, 1, 1 ); peanoDataLayout.addWidget( self._view, 0, 0, 1, 1 );
self.setLayout ( peanoDataLayout ); self.setLayout ( peanoDataLayout );
return return
@ -144,7 +124,6 @@ class ConfigureWidget ( QWidget ):
gLayout.addWidget( rootDirBrowse , 0, 7, 1, 1 ) gLayout.addWidget( rootDirBrowse , 0, 7, 1, 1 )
groupDirs = QGroupBox( 'Directories' ) groupDirs = QGroupBox( 'Directories' )
groupDirs.setLayout( gLayout ) groupDirs.setLayout( gLayout )
gLayout = QGridLayout() gLayout = QGridLayout()
groupConf = QGroupBox( 'Configuration' ) groupConf = QGroupBox( 'Configuration' )
groupConf.setLayout( gLayout ) groupConf.setLayout( gLayout )
@ -155,16 +134,13 @@ class ConfigureWidget ( QWidget ):
#vLayout.addStretch() #vLayout.addStretch()
self.setLayout( vLayout ) self.setLayout( vLayout )
self._rootDirEdit.textChanged.connect( self.rootDirChanged ) self._rootDirEdit.textChanged.connect( self.rootDirChanged )
self.readSettings() self.readSettings()
noteLabel = QLabel( 'Those settings can be changed only by editing build.conf' ) noteLabel = QLabel( 'Those settings can be changed only by editing build.conf' )
gLayout.addWidget( noteLabel , 0, 0, 1, 1 ) gLayout.addWidget( noteLabel , 0, 0, 1, 1 )
gLayout.addWidget( ConfSettingsWidget(self._conf), 1, 0, 1, 1 ) gLayout.addWidget( ConfSettingsWidget(self._conf), 1, 0, 1, 1 )
def _getConf ( self ): return self._conf def _getConf ( self ): return self._conf
def _getRootDir ( self ): return self._rootDir def _getRootDir ( self ): return self._rootDir
def _getBootstrapDir ( self ): return self._getConf().bootstrapDir def _getBootstrapDir ( self ): return self._getConf().bootstrapDir
@ -173,7 +149,6 @@ class ConfigureWidget ( QWidget ):
rootDir = property( _getRootDir ) rootDir = property( _getRootDir )
bootstrapDir = property( _getBootstrapDir ) bootstrapDir = property( _getBootstrapDir )
def rootDirChanged ( self, rootDir ): def rootDirChanged ( self, rootDir ):
self._rootDir = rootDir self._rootDir = rootDir
return return
@ -184,9 +159,9 @@ class ConfigureWidget ( QWidget ):
def readSettings ( self ): def readSettings ( self ):
settings = QSettings() settings = QSettings()
self._rootDirEdit.setText( settings.value('conf/rootDir').toString() ) self._rootDirEdit.setText( settings.value('conf/rootDir') )
if not self._confFile and settings.value('conf/confFile'): if not self._confFile and settings.value('conf/confFile'):
self._confFile = str( settings.value('conf/confFile').toString() ) self._confFile = str( settings.value('conf/confFile') )
self._conf.load( self._confFile ) self._conf.load( self._confFile )
return return

13
bootstrap/builder/Highlighter.py
View File

@ -2,14 +2,14 @@
# -*- mode:Python -*- # -*- mode:Python -*-
# #
# This file is part of the Coriolis Software. # This file is part of the Coriolis Software.
# Copyright (c) UPMC/LIP6 2012-2018, All Rights Reserved # Copyright (c) Sorbonne Université 2012-2021, All Rights Reserved
# #
# +-----------------------------------------------------------------+ # +-----------------------------------------------------------------+
# | C O R I O L I S | # | C O R I O L I S |
# | C o r i o l i s / C h a m s B u i l d e r | # | T o o l c h a i n B u i l d e r |
# | | # | |
# | Author : Damien Dupuis | # | Author : Damien Dupuis |
# | E-mail : Jean-Paul.Chaput@asim.lip6.fr | # | E-mail : Jean-Paul.Chaput@lip6.fr |
# | =============================================================== | # | =============================================================== |
# | Python : "./builder/Highlighter.py" | # | Python : "./builder/Highlighter.py" |
# +-----------------------------------------------------------------+ # +-----------------------------------------------------------------+
@ -17,10 +17,7 @@
import re import re
from PyQt4.QtCore import Qt from PyQt4.QtCore import Qt
from PyQt4.QtGui import QFont from PyQt4.QtGui import QFont, QColor, QTextCharFormat, QSyntaxHighlighter
from PyQt4.QtGui import QColor
from PyQt4.QtGui import QTextCharFormat
from PyQt4.QtGui import QSyntaxHighlighter
class Highlighter ( QSyntaxHighlighter ): class Highlighter ( QSyntaxHighlighter ):
@ -73,7 +70,7 @@ class Highlighter ( QSyntaxHighlighter ):
for rule in Highlighter.Rules: for rule in Highlighter.Rules:
m = rule[2].match(line) m = rule[2].match(line)
if m: if m:
if m.groupdict().has_key('percent'): if 'percent' in m.groupdict():
self.setFormat( 7, len(line), rule[3] ) self.setFormat( 7, len(line), rule[3] )
else: else:
self.setFormat( 0, len(line), rule[3] ) self.setFormat( 0, len(line), rule[3] )

57
bootstrap/builder/OptionsWidget.py
View File

@ -2,14 +2,14 @@
# -*- mode:Python -*- # -*- mode:Python -*-
# #
# This file is part of the Coriolis Software. # This file is part of the Coriolis Software.
# Copyright (c) UPMC/LIP6 2012-2018, All Rights Reserved # Copyright (c) Sorbonne Université 2012-2021, All Rights Reserved
# #
# +-----------------------------------------------------------------+ # +-----------------------------------------------------------------+
# | C O R I O L I S | # | C O R I O L I S |
# | C o r i o l i s / C h a m s B u i l d e r | # | T o o l c h a i n B u i l d e r |
# | | # | |
# | Author : Damien Dupuis | # | Author : Damien Dupuis |
# | E-mail : Jean-Paul.Chaput@asim.lip6.fr | # | E-mail : Jean-Paul.Chaput@lip6.fr |
# | =============================================================== | # | =============================================================== |
# | Python : "./builder/OptionsWidget.py" | # | Python : "./builder/OptionsWidget.py" |
# +-----------------------------------------------------------------+ # +-----------------------------------------------------------------+
@ -17,23 +17,14 @@
import re import re
import subprocess import subprocess
from PyQt4.QtCore import Qt from PyQt4.QtCore import Qt, pyqtSignal, QSettings
from PyQt4.QtCore import pyqtSignal from PyQt4.QtGui import QColor, QWidget, QPushButton, \
from PyQt4.QtCore import QSettings QCheckBox, QGroupBox, QButtonGroup, \
from PyQt4.QtGui import QColor QVBoxLayout, QHBoxLayout, QGridLayout, \
from PyQt4.QtGui import QWidget QScrollArea, QComboBox
from PyQt4.QtGui import QPushButton from .Project import Project
from PyQt4.QtGui import QCheckBox from .ConfigureWidget import ConfigureWidget
from PyQt4.QtGui import QGroupBox from .ProjectWidgets import ProjectWidgets
from PyQt4.QtGui import QButtonGroup
from PyQt4.QtGui import QVBoxLayout
from PyQt4.QtGui import QHBoxLayout
from PyQt4.QtGui import QGridLayout
from PyQt4.QtGui import QScrollArea
from PyQt4.QtGui import QComboBox
from builder.Project import Project
from builder.ConfigureWidget import ConfigureWidget
from builder.ProjectWidgets import ProjectWidgets
class OptionsWidget ( QWidget ): class OptionsWidget ( QWidget ):
@ -122,7 +113,6 @@ class OptionsWidget ( QWidget ):
self.readSettings() self.readSettings()
return return
def _getProjects ( self ): return self._projects def _getProjects ( self ): return self._projects
def _getBuildMode ( self ): return self._buildMode.currentText() def _getBuildMode ( self ): return self._buildMode.currentText()
def _getThreads ( self ): return self._threads.currentText() def _getThreads ( self ): return self._threads.currentText()
@ -149,31 +139,29 @@ class OptionsWidget ( QWidget ):
rmBuild = property( _getRmBuild ) rmBuild = property( _getRmBuild )
verbose = property( _getVerbose ) verbose = property( _getVerbose )
def readSettings ( self ): def readSettings ( self ):
settings = QSettings() settings = QSettings()
#self._svnUpdate .setChecked( settings.value('builder/svnUpdate').toBool() ) #self._svnUpdate .setChecked( bool(settings.value('builder/svnUpdate' )) )
#self._svnStatus .setChecked( settings.value('builder/svnStatus').toBool() ) #self._svnStatus .setChecked( bool(settings.value('builder/svnStatus' )) )
self._make .setChecked( settings.value('builder/make' ).toBool() ) self._make .setChecked( bool(settings.value('builder/make' )) )
self._enableDoc .setChecked( settings.value('builder/enableDoc').toBool() ) self._enableDoc .setChecked( bool(settings.value('builder/enableDoc' )) )
self._devtoolset .setChecked( settings.value('builder/devtoolset').toBool() ) self._devtoolset .setChecked( bool(settings.value('builder/devtoolset')) )
self._qt5 .setChecked( settings.value('builder/qt5').toBool() ) self._qt5 .setChecked( bool(settings.value('builder/qt5' )) )
self._noCache .setChecked( settings.value('builder/noCache' ).toBool() ) self._noCache .setChecked( bool(settings.value('builder/noCache' )) )
self._rmBuild .setChecked( settings.value('builder/rmBuild' ).toBool() ) self._rmBuild .setChecked( bool(settings.value('builder/rmBuild' )) )
self._verbose .setChecked( settings.value('builder/verbose' ).toBool() ) self._verbose .setChecked( bool(settings.value('builder/verbose' )) )
buildModeName = settings.value('builder/buildMode').toString() buildModeName = settings.value('builder/buildMode')
index = self._buildMode.findText( buildModeName ) index = self._buildMode.findText( buildModeName )
if index >= 0: self._buildMode.setCurrentIndex( index ) if index >= 0: self._buildMode.setCurrentIndex( index )
threads = settings.value('builder/threads').toString() threads = settings.value('builder/threads')
index = self._threads.findText( threads ) index = self._threads.findText( threads )
if index >= 0: self._threads.setCurrentIndex( index ) if index >= 0: self._threads.setCurrentIndex( index )
for project in self._projects: project.readFromSettings() for project in self._projects: project.readFromSettings()
return return
def saveSettings ( self ): def saveSettings ( self ):
settings = QSettings() settings = QSettings()
#settings.setValue('builder/svnUpdate' , self._svnUpdate .isChecked() ) #settings.setValue('builder/svnUpdate' , self._svnUpdate .isChecked() )
@ -187,6 +175,5 @@ class OptionsWidget ( QWidget ):
settings.setValue('builder/rmBuild' , self._rmBuild .isChecked() ) settings.setValue('builder/rmBuild' , self._rmBuild .isChecked() )
settings.setValue('builder/verbose' , self._verbose .isChecked() ) settings.setValue('builder/verbose' , self._verbose .isChecked() )
settings.setValue('builder/threads' , self._threads .currentText() ) settings.setValue('builder/threads' , self._threads .currentText() )
for project in self._projects: project.saveToSettings() for project in self._projects: project.saveToSettings()
return return

6
bootstrap/builder/Project.py
View File

@ -2,14 +2,14 @@
# -*- mode:Python -*- # -*- mode:Python -*-
# #
# This file is part of the Coriolis Software. # This file is part of the Coriolis Software.
# Copyright (c) UPMC/LIP6 2012-2018, All Rights Reserved # Copyright (c) Sorbonne Université 2012-2021, All Rights Reserved
# #
# +-----------------------------------------------------------------+ # +-----------------------------------------------------------------+
# | C O R I O L I S | # | C O R I O L I S |
# | C o r i o l i s / C h a m s B u i l d e r | # | T o o l c h a i n B u i l d e r |
# | | # | |
# | Author : Jean-Paul Chaput | # | Author : Jean-Paul Chaput |
# | E-mail : Jean-Paul.Chaput@asim.lip6.fr | # | E-mail : Jean-Paul.Chaput@lip6.fr |
# | =============================================================== | # | =============================================================== |
# | Python : "./builder/Project.py" | # | Python : "./builder/Project.py" |
# +-----------------------------------------------------------------+ # +-----------------------------------------------------------------+

24
bootstrap/builder/ProjectWidgets.py
View File

@ -2,28 +2,23 @@
# -*- mode:Python -*- # -*- mode:Python -*-
# #
# This file is part of the Coriolis Software. # This file is part of the Coriolis Software.
# Copyright (c) UPMC/LIP6 2012-2018, All Rights Reserved # Copyright (c) Sorbonne Université 2012-2021, All Rights Reserved
# #
# +-----------------------------------------------------------------+ # +-----------------------------------------------------------------+
# | C O R I O L I S | # | C O R I O L I S |
# | C o r i o l i s / C h a m s B u i l d e r | # | T o o l c h a i n B u i l d e r |
# | | # | |
# | Author : Jean-Paul Chaput | # | Author : Jean-Paul Chaput |
# | E-mail : Jean-Paul.Chaput@asim.lip6.fr | # | E-mail : Jean-Paul.Chaput@lip6.fr |
# | =============================================================== | # | =============================================================== |
# | Python : "./builder/ProjectWidget.py" | # | Python : "./builder/ProjectWidget.py" |
# +-----------------------------------------------------------------+ # +-----------------------------------------------------------------+
import string import string
from PyQt4.QtCore import Qt from PyQt4.QtCore import Qt, QObject, QSettings
from PyQt4.QtCore import QObject from PyQt4.QtGui import QSizePolicy, QFrame, QPushButton, QCheckBox, \
from PyQt4.QtCore import QSettings QLabel
from PyQt4.QtGui import QSizePolicy
from PyQt4.QtGui import QFrame
from PyQt4.QtGui import QPushButton
from PyQt4.QtGui import QCheckBox
from PyQt4.QtGui import QLabel
class ProjectWidgets ( QObject ): class ProjectWidgets ( QObject ):
@ -34,11 +29,9 @@ class ProjectWidgets ( QObject ):
self._projectButton.setStyleSheet( 'font-weight: bold;' ) self._projectButton.setStyleSheet( 'font-weight: bold;' )
self._projectButton.setFrameShape( QFrame.Box ) self._projectButton.setFrameShape( QFrame.Box )
self._projectButton.setSizePolicy( QSizePolicy.Expanding, QSizePolicy.Preferred ) self._projectButton.setSizePolicy( QSizePolicy.Expanding, QSizePolicy.Preferred )
self._toolsCheckBoxes = [] self._toolsCheckBoxes = []
for tool in self._project.getTools(): for tool in self._project.getTools():
self._toolsCheckBoxes += [ QCheckBox( tool.name ) ] self._toolsCheckBoxes += [ QCheckBox( tool.name ) ]
#self._projectButton.clicked.connect( self.toggleToolsVisibility ) #self._projectButton.clicked.connect( self.toggleToolsVisibility )
return return
@ -62,15 +55,12 @@ class ProjectWidgets ( QObject ):
for row in range(toolsNb): for row in range(toolsNb):
layout.addWidget( self._toolsCheckBoxes[row], row+1, column, Qt.AlignTop ) layout.addWidget( self._toolsCheckBoxes[row], row+1, column, Qt.AlignTop )
return 1 return 1
columnSpan = toolsNb / 10 columnSpan = toolsNb / 10
if toolsNb % 10: columnSpan += 1 if toolsNb % 10: columnSpan += 1
layout.addWidget( self._projectButton, 0, column, 1, columnSpan, Qt.AlignJustify ) layout.addWidget( self._projectButton, 0, column, 1, columnSpan, Qt.AlignJustify )
for row in range(toolsNb): for row in range(toolsNb):
if row and row % 10 == 0: column += 1 if row and row % 10 == 0: column += 1
layout.addWidget( self._toolsCheckBoxes[row], row%10+1, column, Qt.AlignTop ) layout.addWidget( self._toolsCheckBoxes[row], row%10+1, column, Qt.AlignTop )
return columnSpan return columnSpan
#def toggleToolsVisibility ( self ): #def toggleToolsVisibility ( self ):
@ -83,7 +73,7 @@ class ProjectWidgets ( QObject ):
settings = QSettings() settings = QSettings()
for toolCb in self._toolsCheckBoxes: for toolCb in self._toolsCheckBoxes:
toolId = 'tools/'+self._project.getName()+'/'+toolCb.text() toolId = 'tools/'+self._project.getName()+'/'+toolCb.text()
toolCb.setChecked( settings.value(toolId).toBool() ) toolCb.setChecked( bool(settings.value(toolId)) )
return return
def saveToSettings ( self ): def saveToSettings ( self ):

17
bootstrap/builder/__init__.py
View File

@ -2,14 +2,14 @@
# -*- mode:Python -*- # -*- mode:Python -*-
# #
# This file is part of the Coriolis Software. # This file is part of the Coriolis Software.
# Copyright (c) UPMC/LIP6 2012-2018, All Rights Reserved # Copyright (c) Sorbonne Université 2012-2021, All Rights Reserved
# #
# +-----------------------------------------------------------------+ # +-----------------------------------------------------------------+
# | C O R I O L I S | # | C O R I O L I S |
# | C o r i o l i s / C h a m s B u i l d e r | # | T o o l c h a i n B u i l d e r |
# | | # | |
# | Author : Damien Dupuis | # | Author : Damien Dupuis |
# | E-mail : Jean-Paul.Chaput@asim.lip6.fr | # | E-mail : Jean-Paul.Chaput@lip6.fr |
# | =============================================================== | # | =============================================================== |
# | Python : "./builder/__init__.py" | # | Python : "./builder/__init__.py" |
# +-----------------------------------------------------------------+ # +-----------------------------------------------------------------+
@ -21,8 +21,7 @@ class ErrorMessage ( Exception ):
def __init__ ( self, code, *arguments ): def __init__ ( self, code, *arguments ):
self._code = code self._code = code
self._errors = [ 'Malformed call to ErrorMessage()' self._errors = [ 'Malformed call to ErrorMessage()', '{}'.format(arguments) ]
, '%s' % str(arguments) ]
text = None text = None
if len(arguments) == 1: if len(arguments) == 1:
@ -31,7 +30,6 @@ class ErrorMessage ( Exception ):
self._errors = arguments[0] self._errors = arguments[0]
elif len(arguments) > 1: elif len(arguments) > 1:
text = list(arguments) text = list(arguments)
if text: if text:
self._errors = [] self._errors = []
while len(text[0]) == 0: del text[0] while len(text[0]) == 0: del text[0]
@ -50,11 +48,10 @@ class ErrorMessage ( Exception ):
def __str__ ( self ): def __str__ ( self ):
if not isinstance(self._errors,list): if not isinstance(self._errors,list):
return "[ERROR] %s" % self._errors return "[ERROR] %s" % self._errors
formatted = "\n" formatted = "\n"
for i in range(len(self._errors)): for i in range(len(self._errors)):
if i == 0: formatted += "[ERROR] %s" % self._errors[i] if i == 0: formatted += "[ERROR] {}".format(self._errors[i] )
else: formatted += " %s" % self._errors[i] else: formatted += " {}".format(self._errors[i] )
if i+1 < len(self._errors): formatted += "\n" if i+1 < len(self._errors): formatted += "\n"
return formatted return formatted
@ -69,7 +66,7 @@ class ErrorMessage ( Exception ):
return return
def terminate ( self ): def terminate ( self ):
print self print( self )
sys.exit(self._code) sys.exit(self._code)
def _getCode ( self ): return self._code def _getCode ( self ): return self._code

124
bootstrap/ccb.py
View File

@ -1,17 +1,17 @@
#!/usr/bin/env python #!/usr/bin/env python3
# #
# -*- mode:Python -*- # -*- mode:Python -*-
# #
# This file is part of the Coriolis Software. # This file is part of the Coriolis Software.
# Copyright (c) UPMC 2008-2018, All Rights Reserved # Copyright (c) Sorbonne Université 2008-2021, All Rights Reserved
# #
# +-----------------------------------------------------------------+ # +-----------------------------------------------------------------+
# | C O R I O L I S | # | C O R I O L I S |
# | C o r i o l i s / C h a m s B u i l d e r | # | T o o l c h a i n B u i l d e r |
# | | # | |
# | Authors : Jean-Paul Chaput | # | Authors : Jean-Paul Chaput |
# | Damien Dupuis | # | Damien Dupuis |
# | E-mail : Jean-Paul.Chaput@asim.lip6.fr | # | E-mail : Jean-Paul.Chaput@lip6.fr |
# | =============================================================== | # | =============================================================== |
# | Python : "./ccb.py" | # | Python : "./ccb.py" |
# +-----------------------------------------------------------------+ # +-----------------------------------------------------------------+
@ -26,26 +26,25 @@ try:
import distutils.sysconfig import distutils.sysconfig
import subprocess import subprocess
import re import re
except ImportError, e: except ImportError as e:
module = str(e).split()[-1] module = str(e).split()[-1]
print( '[ERROR] The "{}" python module or symbol cannot be loaded.'.format(module) )
print '[ERROR] The <%s> python module or symbol cannot be loaded.' % module print( ' Please check your standard Python installation, it may have problems.' )
print ' Please check your standard Python installation, it may have problems.'
quit() quit()
def safeImport ( moduleName, symbol=None ): def safeImport ( moduleName, symbol=None ):
try: try:
module = __import__( moduleName, globals(), locals(), symbol ) module = __import__( moduleName, globals(), locals(), symbol )
except ImportError, e: except ImportError as e:
print '[ERROR] The <%s> python module or symbol cannot be loaded.' % moduleName print( '[ERROR] The "{}" python module or symbol cannot be loaded.'.format(moduleName) )
print ' Please check the integrity of the <coriolis/boostrap> package.' print( ' Please check the integrity of the "coriolis/boostrap" package.' )
if showTrace: traceback.print_tb(sys.exc_info()[2]) if showTrace: traceback.print_tb(sys.exc_info()[2])
sys.exit(1) sys.exit(1)
except Exception, e: except Exception as e:
print '[ERROR] An exception occured while importing module <%s>. Is is a bug,' % moduleName print( '[ERROR] An exception occured while importing module "{}". Is is a bug,'.format(moduleName) )
print ' you may want to report it...' print( ' you may want to report it...' )
print ' %s' % e print( ' {}'.format(e) )
if showTrace: traceback.print_tb(sys.exc_info()[2]) if showTrace: traceback.print_tb(sys.exc_info()[2])
sys.exit(2) sys.exit(2)
if symbol: return module.__dict__[symbol] if symbol: return module.__dict__[symbol]
@ -57,7 +56,7 @@ def checkCMake ():
(pid,status) = os.waitpid ( child.pid, 0 ) (pid,status) = os.waitpid ( child.pid, 0 )
status >>= 8 status >>= 8
if status != 0: if status != 0:
print '[ERROR] The <cmake> program has not been found, please install it.' print( '[ERROR] The "cmake" program has not been found, please install it.' )
sys.exit(1) sys.exit(1)
@ -85,62 +84,60 @@ def guessOs ():
uname = subprocess.Popen ( ["uname", "-srm"], stdout=subprocess.PIPE ) uname = subprocess.Popen ( ["uname", "-srm"], stdout=subprocess.PIPE )
lines = uname.stdout.readlines() lines = uname.stdout.readlines()
line = lines[0].decode( 'ascii' )
if osSlsoc7x_64.match(lines[0]): if osSlsoc7x_64.match(line):
osType = "Linux.el7_64" osType = "Linux.el7_64"
libDir = "lib64" libDir = "lib64"
elif osSlsoc6x_64.match(lines[0]): elif osSlsoc6x_64.match(line):
osType = "Linux.slsoc6x_64" osType = "Linux.slsoc6x_64"
libDir = "lib64" libDir = "lib64"
elif osSlsoc6x.match(lines[0]): elif osSlsoc6x.match(line):
osType = "Linux.slsoc6x" osType = "Linux.slsoc6x"
elif osSLSoC5x_64.match(lines[0]): elif osSLSoC5x_64.match(line):
osType = "Linux.SLSoC5x_64" osType = "Linux.SLSoC5x_64"
libDir = "lib64" libDir = "lib64"
elif osSLSoC5x .match(lines[0]): elif osSLSoC5x .match(line):
osType = "Linux.SLSoC5x" osType = "Linux.SLSoC5x"
elif osFedora_64.match(lines[0]): elif osFedora_64.match(line):
osType = "Linux.fc_64" osType = "Linux.fc_64"
libDir = "lib64" libDir = "lib64"
elif osFedora .match(lines[0]): elif osFedora .match(line):
osType = "Linux.fc" osType = "Linux.fc"
elif osLinux_64.match(lines[0]): elif osLinux_64.match(line):
osType = "Linux.x86_64" osType = "Linux.x86_64"
libDir = "lib64" libDir = "lib64"
elif osLinux .match(lines[0]): elif osLinux .match(line):
osType = "Linux.i386" osType = "Linux.i386"
elif osDarwin.match(lines[0]): elif osDarwin.match(line):
osType = "Darwin" osType = "Darwin"
elif osFreeBSD8x_amd64.match(lines[0]): elif osFreeBSD8x_amd64.match(line):
osType = "FreeBSD.8x.amd64" osType = "FreeBSD.8x.amd64"
libDir = "lib64" libDir = "lib64"
elif osFreeBSD8x_64.match(lines[0]): elif osFreeBSD8x_64.match(line):
osType = "FreeBSD.8x.x86_64" osType = "FreeBSD.8x.x86_64"
libDir = "lib64" libDir = "lib64"
elif osFreeBSD8x.match(lines[0]): elif osFreeBSD8x.match(line):
osType = "FreeBSD.8x.i386" osType = "FreeBSD.8x.i386"
elif osCygwinW7_64.match(lines[0]): elif osCygwinW7_64.match(line):
osType = "Cygwin.W7_64" osType = "Cygwin.W7_64"
libDir = "lib64" libDir = "lib64"
elif osCygwinW7.match(lines[0]): elif osCygwinW7.match(line):
osType = "Cygwin.W7" osType = "Cygwin.W7"
elif osCygwinW8_64.match(lines[0]): elif osCygwinW8_64.match(line):
osType = "Cygwin.W8_64" osType = "Cygwin.W8_64"
libDir = "lib64" libDir = "lib64"
elif osCygwinW8.match(lines[0]): elif osCygwinW8.match(line):
osType = "Cygwin.W8" osType = "Cygwin.W8"
elif osCygwinW10_64.match(lines[0]): elif osCygwinW10_64.match(line):
osType = "Cygwin.W10_64" osType = "Cygwin.W10_64"
libDir = "lib64" libDir = "lib64"
elif osCygwinW10.match(lines[0]): elif osCygwinW10.match(line):
osType = "Cygwin.W10" osType = "Cygwin.W10"
else: else:
uname = subprocess.Popen ( ["uname", "-sr"], stdout=subprocess.PIPE ) uname = subprocess.Popen ( ["uname", "-sr"], stdout=subprocess.PIPE )
osType = uname.stdout.readlines()[0][:-1] osType = uname.stdout.readlines()[0][:-1]
print( '[WARNING] Unrecognized OS: "{}".'.format(lines[0][:-1]) )
print "[WARNING] Unrecognized OS: \"%s\"." % lines[0][:-1] print( ' (using: "{}")'.format(osType) )
print " (using: \"%s\")" % osType
return osType, libDir return osType, libDir
@ -151,10 +148,9 @@ def guessPythonSitePackage ():
def autoLocate (): def autoLocate ():
osType, libDir = guessOs() osType, libDir = guessOs()
print 'Building for target: <%s>' % osType print( 'Building for target: "{}"'.format(osType) )
print 'Making an educated guess to locate myself:' print( 'Making an educated guess to locate myself:' )
sitePackage = guessPythonSitePackage() sitePackage = guessPythonSitePackage()
builderDir = None builderDir = None
locations = [ os.path.abspath(os.path.dirname(sys.argv[0])) locations = [ os.path.abspath(os.path.dirname(sys.argv[0]))
, os.environ['HOME']+'/coriolis-2.x/src/coriolis/bootstrap' , os.environ['HOME']+'/coriolis-2.x/src/coriolis/bootstrap'
@ -163,26 +159,22 @@ def autoLocate ():
, os.environ['HOME']+'/coriolis-2.x/'+osType+'/Release.Shared/install/'+libDir+'/'+sitePackage , os.environ['HOME']+'/coriolis-2.x/'+osType+'/Release.Shared/install/'+libDir+'/'+sitePackage
, '/users/outil/coriolis/coriolis-2.x/'+osType+'/Release.Shared/install/'+libDir+'/'+sitePackage , '/users/outil/coriolis/coriolis-2.x/'+osType+'/Release.Shared/install/'+libDir+'/'+sitePackage
] ]
for location in locations: for location in locations:
print ' <%s>' % location, print( ' "{}" '.format(location), end='' )
if os.path.isfile(location + '/builder/__init__.py'): if os.path.isfile(location + '/builder/__init__.py'):
if not builderDir: if not builderDir:
builderDir = location builderDir = location
print '(Found*)' print( '(Found*)' )
else: else:
print '(Found)' print( '(Found)' )
else: else:
print '(No)' print( '(No)' )
if not builderDir: if not builderDir:
print '[ERROR] Failed to locate the builder modules in any of the normal pathes.' print( '[ERROR] Failed to locate the builder modules in any of the normal pathes.' )
print ' Please check your Coriolis/Bootsrap installation.' print( ' Please check your Coriolis/Bootsrap installation.' )
if showTrace: traceback.print_tb(sys.exc_info()[2]) if showTrace: traceback.print_tb(sys.exc_info()[2])
sys.exit(1) sys.exit(1)
sys.path.insert( 0, builderDir ) sys.path.insert( 0, builderDir )
return return
@ -240,7 +232,6 @@ if options.gui:
ErrorMessage = safeImport( 'builder' , 'ErrorMessage' ) ErrorMessage = safeImport( 'builder' , 'ErrorMessage' )
QApplication = safeImport( 'PyQt4.QtGui' , 'QApplication' ) QApplication = safeImport( 'PyQt4.QtGui' , 'QApplication' )
BuilderGui = safeImport( 'builder.BuilderGui', 'BuilderGui' ) BuilderGui = safeImport( 'builder.BuilderGui', 'BuilderGui' )
try: try:
app = QApplication( sys.argv ) app = QApplication( sys.argv )
app.setOrganizationName ( 'UPMC' ) app.setOrganizationName ( 'UPMC' )
@ -250,29 +241,24 @@ if options.gui:
gui.show() gui.show()
rcode = app.exec_() rcode = app.exec_()
sys.exit( rcode ) sys.exit( rcode )
except ErrorMessage, e: except ErrorMessage as e:
print e print( e )
if showTrace: traceback.print_tb(sys.exc_info()[2]) if showTrace: traceback.print_tb(sys.exc_info()[2])
sys.exit(2) sys.exit(2)
except Exception, e: except Exception as e:
print '[ERROR] An exception occured while running the Qt application.' print( '[ERROR] An exception occured while running the Qt application.' )
print ' %s' % e print( ' {}'.format(e) )
if showTrace: traceback.print_tb(sys.exc_info()[2]) if showTrace: traceback.print_tb(sys.exc_info()[2])
sys.exit(2) sys.exit(2)
else: else:
ErrorMessage = safeImport( 'builder' , 'ErrorMessage' ) ErrorMessage = safeImport( 'builder' , 'ErrorMessage' )
Builder = safeImport( 'builder.Builder', 'Builder' ) Builder = safeImport( 'builder.Builder', 'Builder' )
try: try:
builder = Builder() builder = Builder()
builder.loadConfiguration( options.conf ) builder.loadConfiguration( options.conf )
if options.showConf: if options.showConf:
builder.showConfiguration () builder.showConfiguration ()
sys.exit(0) sys.exit(0)
if options.quiet: builder.quiet = True if options.quiet: builder.quiet = True
if options.release: builder.buildMode = "Release" if options.release: builder.buildMode = "Release"
if options.debug: builder.buildMode = "Debug" if options.debug: builder.buildMode = "Debug"
@ -296,7 +282,6 @@ else:
if options.makeArguments: builder.makeArguments = options.makeArguments if options.makeArguments: builder.makeArguments = options.makeArguments
#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
#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.svnDiff: builder.svnDiff ( tools=options.tools, projects=options.projects ) #elif options.svnDiff: builder.svnDiff ( tools=options.tools, projects=options.projects )
@ -306,12 +291,11 @@ else:
elif options.doRpm: builder.doRpm () elif options.doRpm: builder.doRpm ()
elif options.doDeb: builder.doDeb () elif options.doDeb: builder.doDeb ()
else: builder.build ( tools=options.tools, projects=options.projects ) else: builder.build ( tools=options.tools, projects=options.projects )
except ErrorMessage, e: except ErrorMessage as e:
print e print( e )
if showTrace: traceback.print_tb(sys.exc_info()[2]) if showTrace: traceback.print_tb(sys.exc_info()[2])
sys.exit(e.code) sys.exit(e.code)
except KeyboardInterrupt, e: except KeyboardInterrupt as e:
print '\n[ERROR] Interrupted by user\'s request (CTRL+C)' print( '\n[ERROR] Interrupted by user\'s request (CTRL+C)' )
sys.exit(1) sys.exit(1)
sys.exit(0) sys.exit(0)

44
bootstrap/cmake_modules/FindBootstrap.cmake
View File

@ -7,12 +7,12 @@
if(COMMAND CMAKE_POLICY) if(COMMAND CMAKE_POLICY)
cmake_policy(SET CMP0003 NEW) cmake_policy(SET CMP0003 NEW)
cmake_policy(SET CMP0005 NEW) cmake_policy(SET CMP0005 NEW)
if(NOT (CMAKE_VERSION VERSION_LESS 2.8.0)) #if(NOT (CMAKE_VERSION VERSION_LESS 2.8.0))
cmake_policy(SET CMP0014 OLD) # cmake_policy(SET CMP0014 OLD)
endif() #endif()
if(NOT (CMAKE_VERSION VERSION_LESS 2.8.12)) #if(NOT (CMAKE_VERSION VERSION_LESS 2.8.12))
cmake_policy(SET CMP0022 OLD) # cmake_policy(SET CMP0022 OLD)
endif() #endif()
endif(COMMAND CMAKE_POLICY) endif(COMMAND CMAKE_POLICY)
endmacro(set_cmake_policies) endmacro(set_cmake_policies)
@ -85,12 +85,12 @@
set(ADDTIONAL_FLAGS "") set(ADDTIONAL_FLAGS "")
set(CXX_STANDARD "c++11") set(CXX_STANDARD "c++11")
endif() endif()
set(CMAKE_C_FLAGS_DEBUG " -Wall -fsanitize=address ${ADDTIONAL_FLAGS} ${DEBUG_FLAGS}" CACHE STRING "C Compiler Debug options." FORCE) #set(CMAKE_C_FLAGS_DEBUG " -Wall -fsanitize=address ${ADDTIONAL_FLAGS} ${DEBUG_FLAGS}" CACHE STRING "C Compiler Debug options." FORCE)
#set(CMAKE_C_FLAGS_DEBUG " -Wall ${ADDTIONAL_FLAGS} ${DEBUG_FLAGS}" CACHE STRING "C Compiler Debug options." FORCE) set(CMAKE_C_FLAGS_DEBUG " -Wall ${ADDTIONAL_FLAGS} ${DEBUG_FLAGS}" CACHE STRING "C Compiler Debug options." FORCE)
set(CMAKE_C_FLAGS_RELEASE " -Wall -O2 ${ADDTIONAL_FLAGS} -DNDEBUG" CACHE STRING "C Compiler Release options." FORCE) set(CMAKE_C_FLAGS_RELEASE " -Wall -O2 ${ADDTIONAL_FLAGS} -DNDEBUG" CACHE STRING "C Compiler Release options." FORCE)
#set(CMAKE_C_FLAGS_RELEASE " -Wall -fsanitize=address ${ADDTIONAL_FLAGS} -DNDEBUG" CACHE STRING "C Compiler Release options." FORCE) #set(CMAKE_C_FLAGS_RELEASE " -Wall -fsanitize=address ${ADDTIONAL_FLAGS} -DNDEBUG" CACHE STRING "C Compiler Release options." FORCE)
set(CMAKE_CXX_FLAGS_DEBUG "-std=${CXX_STANDARD} -Wall -fsanitize=address ${ADDTIONAL_FLAGS} ${DEBUG_FLAGS}" CACHE STRING "C++ Compiler Debug options." FORCE) #set(CMAKE_CXX_FLAGS_DEBUG "-std=${CXX_STANDARD} -Wall -fsanitize=address ${ADDTIONAL_FLAGS} ${DEBUG_FLAGS}" CACHE STRING "C++ Compiler Debug options." FORCE)
#set(CMAKE_CXX_FLAGS_DEBUG "-std=${CXX_STANDARD} -Wall ${ADDTIONAL_FLAGS} ${DEBUG_FLAGS}" CACHE STRING "C++ Compiler Debug options." FORCE) set(CMAKE_CXX_FLAGS_DEBUG "-std=${CXX_STANDARD} -Wall ${ADDTIONAL_FLAGS} ${DEBUG_FLAGS}" CACHE STRING "C++ Compiler Debug options." FORCE)
set(CMAKE_CXX_FLAGS_RELEASE "-std=${CXX_STANDARD} -Wall -O2 ${ADDTIONAL_FLAGS} -DNDEBUG" CACHE STRING "C++ Compiler Release options." FORCE) set(CMAKE_CXX_FLAGS_RELEASE "-std=${CXX_STANDARD} -Wall -O2 ${ADDTIONAL_FLAGS} -DNDEBUG" CACHE STRING "C++ Compiler Release options." FORCE)
#set(CMAKE_CXX_FLAGS_RELEASE "-std=${CXX_STANDARD} -Wall -fsanitize=address ${ADDTIONAL_FLAGS} -DNDEBUG" CACHE STRING "C++ Compiler Release options." FORCE) #set(CMAKE_CXX_FLAGS_RELEASE "-std=${CXX_STANDARD} -Wall -fsanitize=address ${ADDTIONAL_FLAGS} -DNDEBUG" CACHE STRING "C++ Compiler Release options." FORCE)
@ -410,8 +410,30 @@
) )
target_link_libraries( ${pytarget} ${pyDeplibs} ) target_link_libraries( ${pytarget} ${pyDeplibs} )
install( TARGETS ${pytarget} DESTINATION ${PYTHON_SITE_PACKAGES} ) install( TARGETS ${pytarget} DESTINATION ${Python_CORIOLISARCH} )
if( NOT ("${pyIncludes}" STREQUAL "None") ) if( NOT ("${pyIncludes}" STREQUAL "None") )
install( FILES ${pyIncludes} DESTINATION ${inc_install_dir} ) install( FILES ${pyIncludes} DESTINATION ${inc_install_dir} )
endif() endif()
endmacro( add_python_module ) endmacro( add_python_module )
#
# Build a Python extention module (3rd version).
# Usage:
# * pyCpps: The list of C/C++ module files.
# * pyIncludes: The list of C/C++ header files (will be installed in
# "inc_install_dir").
# * pymodule: The name of the Python module (for "import PYMODULE").
# * deplibs: The list of dependencies.
# * inc_install_dir: The directory into which install the includes.
#
macro( add_python_module3 pyCpps pyIncludes pymodule deplibs inc_install_dir )
add_library( ${pymodule} MODULE ${pyCpps} )
set_target_properties( ${pymodule} PROPERTIES PREFIX "" )
target_link_libraries( ${pymodule} ${deplibs} )
install( TARGETS ${pymodule} DESTINATION ${Python_CORIOLISARCH} )
if( NOT ("${pyIncludes}" STREQUAL "None") )
install( FILES ${pyIncludes} DESTINATION ${inc_install_dir} )
endif()
endmacro( add_python_module3 )

32
bootstrap/cmake_modules/FindPythonSitePackages.cmake
View File

@ -1,13 +1,26 @@
if(UNIX) if(UNIX)
if(NOT Python_FOUND)
message(FATAL_ERROR "Python has not been found, maybe forgot to call find_package(Python). ")
endif()
# This way avoids newline in the script string. # This way avoids newline in the script string.
set(SCRIPT "import os.path,distutils.sysconfig") set(SCRIPT "import os.path,distutils.sysconfig")
set(SCRIPT "${SCRIPT}; pathes = distutils.sysconfig.get_python_lib().split('/')") set(SCRIPT "${SCRIPT}; pathes = distutils.sysconfig.get_python_lib('platstdlib').split('/')")
set(SCRIPT "${SCRIPT}; print os.path.join(pathes[-2],pathes[-1])") set(SCRIPT "${SCRIPT}; print( os.path.join(pathes[-2],pathes[-1]) )")
execute_process(COMMAND "python" "-c" "${SCRIPT}" execute_process(COMMAND "${Python_EXECUTABLE}" "-c" "${SCRIPT}"
RESULT_VARIABLE RETURN_CODE RESULT_VARIABLE RETURN_CODE
OUTPUT_VARIABLE PYTHON_SITE_PACKAGES OUTPUT_VARIABLE Python_CORIOLISARCH
OUTPUT_STRIP_TRAILING_WHITESPACE
)
set(SCRIPT "import os.path,distutils.sysconfig")
set(SCRIPT "${SCRIPT}; pathes = distutils.sysconfig.get_python_lib('stdlib').split('/')")
set(SCRIPT "${SCRIPT}; print( os.path.join(pathes[-2],pathes[-1]) )")
execute_process(COMMAND "${Python_EXECUTABLE}" "-c" "${SCRIPT}"
RESULT_VARIABLE RETURN_CODE
OUTPUT_VARIABLE Python_CORIOLISLIB
OUTPUT_STRIP_TRAILING_WHITESPACE OUTPUT_STRIP_TRAILING_WHITESPACE
) )
@ -17,14 +30,17 @@ if(UNIX)
set(FindPythonSitePackages_FOUND FALSE) set(FindPythonSitePackages_FOUND FALSE)
endif(RETURN_CODE EQUAL 0) endif(RETURN_CODE EQUAL 0)
set(PYTHON_SITE_PACKAGES "lib${LIB_SUFFIX}/${PYTHON_SITE_PACKAGES}" set(Python_CORIOLISARCH "lib${LIB_SUFFIX}/${Python_CORIOLISARCH}"
CACHE STRING "Python site packages directory." FORCE) CACHE STRING "Python platform dependent install directory." FORCE)
mark_as_advanced(PYTHON_SITE_PACKAGES) set(Python_CORIOLISLIB "lib${LIB_SUFFIX}/${Python_CORIOLISLIB}"
CACHE STRING "Python platform independent install directory." FORCE)
mark_as_advanced(Python_CORIOLISARCH)
mark_as_advanced(Python_CORIOLISLIB)
if(FindPythonSitePackages_FOUND) if(FindPythonSitePackages_FOUND)
if(NOT FindPythonSitePackages_FIND_QUIETLY) if(NOT FindPythonSitePackages_FIND_QUIETLY)
if(FindPythonSitePackages_FOUND) if(FindPythonSitePackages_FOUND)
message(STATUS "Found FindPythonSitePackages : ${PYTHON_SITE_PACKAGES}") message(STATUS "Found FindPythonSitePackages : ${Python_CORIOLISARCH}")
endif(FindPythonSitePackages_FOUND) endif(FindPythonSitePackages_FOUND)
endif(NOT FindPythonSitePackages_FIND_QUIETLY) endif(NOT FindPythonSitePackages_FIND_QUIETLY)
else(FindPythonSitePackages_FOUND) else(FindPythonSitePackages_FOUND)

153
bootstrap/coriolisEnv.py
View File

@ -1,4 +1,4 @@
#!/usr/bin/env python #!/usr/bin/env python3
import re import re
@ -19,8 +19,7 @@ reDebugStaticPattern = re.compile( r".*Debug\.Static.*" )
def scrubPath ( pathName ): def scrubPath ( pathName ):
pathEnv = os.getenv( pathName ) pathEnv = os.getenv( pathName )
if not pathEnv: return "" if not pathEnv: return ""
pathList = pathEnv.split( ':' )
pathList = string.split( pathEnv, ':' )
scrubbedList = [] scrubbedList = []
for pathElement in pathList: for pathElement in pathList:
if reCoriolisPattern .match(pathElement) \ if reCoriolisPattern .match(pathElement) \
@ -30,13 +29,10 @@ def scrubPath ( pathName ):
or reDebugStaticPattern .match(pathElement): or reDebugStaticPattern .match(pathElement):
continue continue
scrubbedList += [ pathElement ] scrubbedList += [ pathElement ]
if len(scrubbedList) == 0: return "" if len(scrubbedList) == 0: return ""
scrubbedEnv = scrubbedList[0] scrubbedEnv = scrubbedList[0]
for pathElement in scrubbedList[1:]: for pathElement in scrubbedList[1:]:
scrubbedEnv += ":" + pathElement scrubbedEnv += ":" + pathElement
return scrubbedEnv return scrubbedEnv
@ -67,78 +63,81 @@ def guessOs ():
uname = subprocess.Popen ( ["uname", "-srm"], stdout=subprocess.PIPE ) uname = subprocess.Popen ( ["uname", "-srm"], stdout=subprocess.PIPE )
lines = uname.stdout.readlines() lines = uname.stdout.readlines()
if osSlsoc7x_64.match(lines[0]): osType = "Linux.el7_64" line = lines[0].decode( 'ascii' )
elif osSlsoc6x_64.match(lines[0]): if osSlsoc7x_64.match(line): osType = "Linux.el7_64"
elif osSlsoc6x_64.match(line):
osType = "Linux.slsoc6x_64" osType = "Linux.slsoc6x_64"
useDevtoolset = True useDevtoolset = True
elif osSlsoc6x.match(lines[0]): elif osSlsoc6x.match(line):
osType = "Linux.slsoc6x" osType = "Linux.slsoc6x"
useDevtoolset = True useDevtoolset = True
elif osSLSoC5x_64 .match(lines[0]): osType = "Linux.SLSoC5x_64" elif osSLSoC5x_64 .match(line): osType = "Linux.SLSoC5x_64"
elif osSLSoC5x .match(lines[0]): osType = "Linux.SLSoC5x" elif osSLSoC5x .match(line): osType = "Linux.SLSoC5x"
elif osFedora_64 .match(lines[0]): osType = "Linux.fc_64" elif osFedora_64 .match(line): osType = "Linux.fc_64"
elif osFedora .match(lines[0]): osType = "Linux.fc" elif osFedora .match(line): osType = "Linux.fc"
elif osUbuntu1004 .match(lines[0]): osType = "Linux.Ubuntu1004" elif osUbuntu1004 .match(line): osType = "Linux.Ubuntu1004"
elif osUbuntu1004_64 .match(lines[0]): osType = "Linux.Ubuntu1004_64" elif osUbuntu1004_64 .match(line): osType = "Linux.Ubuntu1004_64"
elif osLinux_64 .match(lines[0]): osType = "Linux.x86_64" elif osLinux_64 .match(line): osType = "Linux.x86_64"
elif osLinux .match(lines[0]): osType = "Linux.i386" elif osLinux .match(line): osType = "Linux.i386"
elif osFreeBSD8x_64 .match(lines[0]): osType = "FreeBSD.8x.x86_64" elif osFreeBSD8x_64 .match(line): osType = "FreeBSD.8x.x86_64"
elif osFreeBSD8x_amd64.match(lines[0]): osType = "FreeBSD.8x.amd64" elif osFreeBSD8x_amd64.match(line): osType = "FreeBSD.8x.amd64"
elif osFreeBSD8x .match(lines[0]): osType = "FreeBSD.8x.i386" elif osFreeBSD8x .match(line): osType = "FreeBSD.8x.i386"
elif osDarwin .match(lines[0]): osType = "Darwin" elif osDarwin .match(line): osType = "Darwin"
elif osCygwinW7_64 .match(lines[0]): osType = "Cygwin.W7_64" elif osCygwinW7_64 .match(line): osType = "Cygwin.W7_64"
elif osCygwinW7 .match(lines[0]): osType = "Cygwin.W7" elif osCygwinW7 .match(line): osType = "Cygwin.W7"
elif osCygwinW8_64 .match(lines[0]): osType = "Cygwin.W8_64" elif osCygwinW8_64 .match(line): osType = "Cygwin.W8_64"
elif osCygwinW8 .match(lines[0]): osType = "Cygwin.W8" elif osCygwinW8 .match(line): osType = "Cygwin.W8"
elif osCygwinW10_64 .match(lines[0]): osType = "Cygwin.W10_64" elif osCygwinW10_64 .match(line): osType = "Cygwin.W10_64"
elif osCygwinW10 .match(lines[0]): osType = "Cygwin.W10" elif osCygwinW10 .match(line): osType = "Cygwin.W10"
else: else:
uname = subprocess.Popen ( ["uname", "-sr"], stdout=subprocess.PIPE ) uname = subprocess.Popen ( ["uname", "-sr"], stdout=subprocess.PIPE )
osType = uname.stdout.readlines()[0][:-1] osType = uname.stdout.readlines()[0][:-1]
print "[WARNING] Unrecognized OS: \"%s\"." % lines[0][:-1] print( "[WARNING] Unrecognized OS: \"{}\".".format( line[:-1] ))
print " (using: \"%s\")" % osType print( " (using: \"{}\")".format( osType ))
ldLibraryPath = os.getenv('LD_LIBRARY_PATH') ldLibraryPath = os.getenv('LD_LIBRARY_PATH')
if ldLibraryPath and 'devtoolset' in ldLibraryPath: useDevtoolset = False if ldLibraryPath and 'devtoolset' in ldLibraryPath: useDevtoolset = False
return ( osType, useDevtoolset ) return ( osType, useDevtoolset )
def guessShell (): def guessShell ( forcedShell ):
# This environement variable cannot be trusted as it is set once when # This environement variable cannot be trusted as it is set once when
# the user logs in. If aftewards it changes it that variable is *not* # the user logs in. If aftewards it changes it that variable is *not*
# affected :-(. # affected :-(.
#if os.environ.has_key('SHELL'): return os.environ['SHELL'] #if 'SHELL' in os.environ: return os.environ['SHELL']
psCommand = subprocess.Popen ( ['ps', '-p', str(os.getppid()) ], stdout=subprocess.PIPE )
shell = psCommand.stdout.readlines()[1][:-1].split()[3].lstrip('-')
whichCommand = subprocess.Popen ( ['which', shell ], stdout=subprocess.PIPE )
shellPath = whichCommand.stdout.readlines()[0][:-1]
isBourneShell = True isBourneShell = True
cshBins = [ '/usr/bin/tcsh' cshBins = [ u'/usr/bin/tcsh'
, '/bin/tcsh' , u'/bin/tcsh'
, '/usr/pkg/bin/tcsh' , u'/usr/pkg/bin/tcsh'
, '/usr/local/bin/tcsh' , u'/usr/local/bin/tcsh'
, '/usr/bin/csh' , u'/usr/bin/csh'
, '/bin/csh' , u'/bin/csh'
, '/usr/pkg/bin/csh' , u'/usr/pkg/bin/csh'
, '/usr/local/bin/csh' , u'/usr/local/bin/csh'
] ]
if shellPath in cshBins: isBourneShell = False if shellName is None:
#print 'GUESSED SHELL: "%s"' % shellPath psCommand = subprocess.Popen ( ['ps', '-p', str(os.getppid()) ], stdout=subprocess.PIPE )
shell = psCommand.stdout.readlines()[1].decode('utf8')[:-1].split()[3].lstrip('-')
whichCommand = subprocess.Popen ( ['which', shell ], stdout=subprocess.PIPE )
shellPath = whichCommand.stdout.readlines()[0][:-1].decode('utf8')
#print( 'GUESSED shellPath={}'.format(shellPath) )
else:
shellPath = forcedShell
#print( 'FORCED shellPath={}'.format(shellPath) )
if shellPath in cshBins:
#print( 'Matched C-Shell' )
isBourneShell = False
#print( 'isBourneShell={}\n'.format(isBourneShell) )
return shellPath, isBourneShell return shellPath, isBourneShell
if __name__ == "__main__": if __name__ == "__main__":
osType,useDevtoolset = guessOs() osType,useDevtoolset = guessOs()
buildType = "Release" buildType = "Release"
linkType = "Shared" linkType = "Shared"
rootDir = None rootDir = None
shellBin, isBourneShell = guessShell() shellName = None
parser = optparse.OptionParser() parser = optparse.OptionParser()
# Build relateds. # Build relateds.
@ -152,6 +151,7 @@ if __name__ == "__main__":
parser.add_option ( "--no-python" , action="store_true" , dest="nopython" ) parser.add_option ( "--no-python" , action="store_true" , dest="nopython" )
parser.add_option ( "--root" , action="store" , type="string", dest="rootDir" ) parser.add_option ( "--root" , action="store" , type="string", dest="rootDir" )
parser.add_option ( "--remove" , action="store_true" , dest="remove" ) parser.add_option ( "--remove" , action="store_true" , dest="remove" )
parser.add_option ( "--shell" , action="store" , type="string", dest="shell" )
( options, args ) = parser.parse_args() ( options, args ) = parser.parse_args()
if options.release: buildType = "Release" if options.release: buildType = "Release"
@ -160,25 +160,23 @@ if __name__ == "__main__":
if options.static: linkType = "Static" if options.static: linkType = "Static"
if options.shared: linkType = "Shared" if options.shared: linkType = "Shared"
if options.rootDir: rootDir = options.rootDir if options.rootDir: rootDir = options.rootDir
if options.shell: shellName = options.shell
shellBin, isBourneShell = guessShell( shellName )
scriptPath = os.path.abspath( os.path.dirname( sys.argv[0] )) scriptPath = os.path.abspath( os.path.dirname( sys.argv[0] ))
if 'Debug.' in scriptPath: buildType = 'Debug' if 'Debug.' in scriptPath: buildType = 'Debug'
if not shellBin: if not shellBin:
print 'echo "[ERROR] coriolisEnv.py was not able to guess/find the current shell interpeter."' print( 'echo "[ERROR] coriolisEnv.py was not able to guess/find the current shell interpeter."' )
sys.exit( 1 ) sys.exit( 1 )
strippedPath = scrubPath( "PATH" ) strippedPath = scrubPath( "PATH" )
strippedLibraryPath = scrubPath( "LD_LIBRARY_PATH" ) strippedLibraryPath = scrubPath( "LD_LIBRARY_PATH" )
strippedPythonPath = scrubPath( "PYTHONPATH" ) strippedPythonPath = scrubPath( "PYTHONPATH" )
if options.remove: if options.remove:
shellScript = 'echo "Removing Coriolis environment";' shellScript = 'echo "Removing Coriolis environment";'
if osType == "Darwin": if osType == "Darwin":
ldVar = 'DYLD_LIBRARY_PATH' ldVar = 'DYLD_LIBRARY_PATH'
else: else:
ldVar = 'LD_LIBRARY_PATH' ldVar = 'LD_LIBRARY_PATH'
if isBourneShell: if isBourneShell:
shellScript += 'export PATH={};hash -r;'.format(strippedPath) shellScript += 'export PATH={};hash -r;'.format(strippedPath)
shellScript += 'BOOTSTRAP_TOP="";CORIOLIS_TOP="";export -n BOOTSTRAP_TOP CORIOLIS_TOP;' shellScript += 'BOOTSTRAP_TOP="";CORIOLIS_TOP="";export -n BOOTSTRAP_TOP CORIOLIS_TOP;'
@ -193,12 +191,12 @@ if __name__ == "__main__":
shellScript += 'setenv {} {};'.format(ldVar, strippedLibraryPath) shellScript += 'setenv {} {};'.format(ldVar, strippedLibraryPath)
else: else:
shellScript += 'unsetenv {};'.format(ldVar) shellScript += 'unsetenv {};'.format(ldVar)
print( shellScript ) print( shellScript )
sys.exit(0) sys.exit(0)
shellScriptSh = \ shellScriptSh = \
'echo "Issuing commands for Bourne shell like interpreters";' \
'echo "%(MESSAGE)s";' \ 'echo "%(MESSAGE)s";' \
'echo "Switching to Coriolis 2.x (%(buildDir)s)";' \ 'echo "Switching to Coriolis 2.x (%(buildDir)s)";' \
'PATH="%(PATH)s";' \ 'PATH="%(PATH)s";' \
@ -209,6 +207,7 @@ if __name__ == "__main__":
# 'STRATUS_MAPPING_NAME="%(SYSCONF_DIR)s/stratus2sxlib.xml";' \ # 'STRATUS_MAPPING_NAME="%(SYSCONF_DIR)s/stratus2sxlib.xml";' \
shellScriptCsh = \ shellScriptCsh = \
'echo "Issuing commands for C-shell like interpreters";' \
'echo "%(MESSAGE)s";' \ 'echo "%(MESSAGE)s";' \
'echo "Switching to Coriolis 2.x (%(buildDir)s)";' \ 'echo "Switching to Coriolis 2.x (%(buildDir)s)";' \
'setenv PATH "%(PATH)s";' \ 'setenv PATH "%(PATH)s";' \
@ -221,7 +220,7 @@ if __name__ == "__main__":
buildDir = buildType + "." + linkType buildDir = buildType + "." + linkType
scriptDir = os.path.dirname ( os.path.abspath(__file__) ) scriptDir = os.path.dirname ( os.path.abspath(__file__) )
#print "echo \"Script Location: %s\";" % scriptDir, #print( "echo \"Script Location: {}\";".format( scriptDir ))
if scriptDir.startswith("/etc/coriolis2"): if scriptDir.startswith("/etc/coriolis2"):
coriolisTop = "/usr" coriolisTop = "/usr"
sysconfDir = scriptDir sysconfDir = scriptDir
@ -245,55 +244,57 @@ if __name__ == "__main__":
shellMessage = "Using SoC network-wide Coriolis 2 (/soc/coriolis2)" shellMessage = "Using SoC network-wide Coriolis 2 (/soc/coriolis2)"
else: else:
if not rootDir: if not rootDir:
scriptRoot = '/'.join( scriptDir.split('/')[:-2] )
if not os.path.exists(scriptRoot):
rootDir = os.getenv("HOME") + "/coriolis-2.x" rootDir = os.getenv("HOME") + "/coriolis-2.x"
coriolisTop = "%s/%s/%s/install" % ( rootDir, osType, buildDir ) coriolisTop = "%s/%s/%s/install" % ( rootDir, osType, buildDir )
sysconfDir = coriolisTop + "/etc/coriolis2" sysconfDir = coriolisTop + "/etc/coriolis2"
shellMessage = "Using user-selected Coriolis 2 (%s)" % rootDir shellMessage = "Using user-selected Coriolis 2 (%s)" % rootDir
else:
rootDir = scriptRoot
coriolisTop = rootDir
sysconfDir = coriolisTop + "/etc/coriolis2"
shellMessage = "Using script location Coriolis 2 (%s)" % rootDir
if osType.startswith("Cygwin"): if osType.startswith("Cygwin"):
strippedPath = "%s/lib:%s" % ( coriolisTop, libDir, strippedPath ) strippedPath = "%s/lib:%s" % ( coriolisTop, libDir, strippedPath )
if not os.path.exists(coriolisTop): if not os.path.exists(coriolisTop):
print 'echo "[ERROR] coriolisEnv.py, top directory <%s> do not exists."' % coriolisTop print( 'echo "[ERROR] coriolisEnv.py, top directory "{}" do not exists."'.format( coriolisTop ))
sys.exit( 1 ) sys.exit( 1 )
for lib in [ 'lib64', 'lib' ]: for lib in [ 'lib64', 'lib' ]:
libDir = lib libDir = lib
absLibDir = '{0}/{1}'.format( coriolisTop, lib ) absLibDir = '{0}/{1}'.format( coriolisTop, lib )
if os.path.isdir(absLibDir): break if os.path.isdir(absLibDir): break
libDir = None libDir = None
if libDir is None: if libDir is None:
print 'echo "[ERROR] coriolisEnv.py, library directory not found."' print( 'echo "[ERROR] coriolisEnv.py, library directory not found."' )
sys.exit( 1 ) sys.exit( 1 )
strippedPath = "%s/bin:%s" % ( coriolisTop, strippedPath ) strippedPath = "%s/bin:%s" % ( coriolisTop, strippedPath )
strippedLibraryPath = "%s:%s" % ( absLibDir , strippedLibraryPath ) strippedLibraryPath = "%s:%s" % ( absLibDir , strippedLibraryPath )
if not options.nopython: if not options.nopython:
pyVersion = sys.version_info pyVersion = sys.version_info
version = "%d.%d" % (pyVersion[0],pyVersion[1]) version = "%d.%d" % (pyVersion[0],pyVersion[1])
sitePackagesDir = "sitePackageDir_has_been_not_found" sitePackagesDir = "sitePackageDir_has_been_not_found"
for pyPackageDir in [ "%s/python%s/site-packages" % (absLibDir,version) for pyPackageDir in [ "%s/python%s.%s/site-packages" % (absLibDir,pyVersion[0],pyVersion[1])
, "%s/python%s/dist-packages" % (absLibDir,version) , "%s/python%s.%s/dist-packages" % (absLibDir,pyVersion[0],pyVersion[1])
, "%s/%s/site-packages" % (absLibDir,version) , "%s/%s.%s/site-packages" % (absLibDir,pyVersion[0],pyVersion[1])
, "%s/python%s/site-packages" % (absLibDir,pyVersion[0])
, "%s/python%s/dist-packages" % (absLibDir,pyVersion[0])
, "%s/%s/site-packages" % (absLibDir,pyVersion[0])
]: ]:
if os.path.isdir(pyPackageDir): if os.path.isdir(pyPackageDir):
sitePackagesDir = pyPackageDir sitePackagesDir = pyPackageDir
break break
strippedPythonPath = "%s:" % (sitePackagesDir) + strippedPythonPath strippedPythonPath = "%s:" % (sitePackagesDir) + strippedPythonPath
strippedPythonPath = "%s/crlcore:" % (sitePackagesDir) + strippedPythonPath strippedPythonPath = "%s/crlcore:" % (sitePackagesDir) + strippedPythonPath
strippedPythonPath = "%s/cumulus:" % (sitePackagesDir) + strippedPythonPath strippedPythonPath = "%s/cumulus:" % (sitePackagesDir) + strippedPythonPath
strippedPythonPath = "%s/cumulus/plugins:" % (sitePackagesDir) + strippedPythonPath strippedPythonPath = "%s/cumulus/plugins:" % (sitePackagesDir) + strippedPythonPath
strippedPythonPath = "%s/stratus:" % (sitePackagesDir) + strippedPythonPath strippedPythonPath = "%s/stratus:" % (sitePackagesDir) + strippedPythonPath
strippedPythonPath = "%s:" % (sysconfDir) + strippedPythonPath strippedPythonPath = "%s:" % (sysconfDir) + strippedPythonPath
shellScriptSh += 'PYTHONPATH="%(PYTHONPATH)s";' \ shellScriptSh += 'PYTHONPATH="%(PYTHONPATH)s";' \
'export PYTHONPATH;' 'export PYTHONPATH;'
shellScriptCsh += 'setenv PYTHONPATH "%(PYTHONPATH)s";' shellScriptCsh += 'setenv PYTHONPATH "%(PYTHONPATH)s";'
if osType == "Darwin": if osType == "Darwin":
shellScriptSh += 'DYLD_LIBRARY_PATH="%(LD_LIBRARY_PATH)s";' \ shellScriptSh += 'DYLD_LIBRARY_PATH="%(LD_LIBRARY_PATH)s";' \
'export DYLD_LIBRARY_PATH;' 'export DYLD_LIBRARY_PATH;'
@ -305,10 +306,8 @@ if __name__ == "__main__":
shellScriptSh += "hash -r;" shellScriptSh += "hash -r;"
shellScriptCsh += "rehash;" shellScriptCsh += "rehash;"
if isBourneShell: shellScript = shellScriptSh if isBourneShell: shellScript = shellScriptSh
else: shellScript = shellScriptCsh else: shellScript = shellScriptCsh
if useDevtoolset: if useDevtoolset:
shellScript += \ shellScript += \
' echo "Launching a devtoolset-8 subshell though scl (CTRL+D to exit).";' \ ' echo "Launching a devtoolset-8 subshell though scl (CTRL+D to exit).";' \
@ -325,12 +324,10 @@ if __name__ == "__main__":
, 'SHELL' : shellBin , 'SHELL' : shellBin
} }
if options.queryISysRoot: if options.queryISysRoot:
print '%s/%s' % (rootDir,osType) print( '{}/{}'.format( rootDir, osType ))
sys.exit( 0 ) sys.exit( 0 )
if options.queryInstRoot: if options.queryInstRoot:
print coriolisTop print( coriolisTop )
sys.exit( 0 ) sys.exit( 0 )
print( evalScript )
print evalScript
sys.exit( 0 ) sys.exit( 0 )

144
bootstrap/socInstaller.py
View File

@ -1,9 +1,9 @@
#!/usr/bin/env python #!/usr/bin/env python3
# #
# -*- mode:Python -*- # -*- mode:Python -*-
# #
# This file is part of the Coriolis Software. # This file is part of the Coriolis Software.
# Copyright (c) UPMC 2015-2018, All Rights Reserved # Copyright (c) Sorbonne Université 2015-2021, All Rights Reserved
# #
# +-----------------------------------------------------------------+ # +-----------------------------------------------------------------+
# | C O R I O L I S | # | C O R I O L I S |
@ -36,10 +36,11 @@ try:
import re import re
import bz2 import bz2
import smtplib import smtplib
from io import IOBase
from email.mime.text import MIMEText from email.mime.text import MIMEText
from email.mime.multipart import MIMEMultipart from email.mime.multipart import MIMEMultipart
from email.mime.application import MIMEApplication from email.mime.application import MIMEApplication
except ImportError, e: except ImportError as e:
module = str(e).split()[-1] module = str(e).split()[-1]
@ -47,8 +48,7 @@ class ErrorMessage ( Exception ):
def __init__ ( self, code, *arguments ): def __init__ ( self, code, *arguments ):
self._code = code self._code = code
self._errors = [ 'Malformed call to ErrorMessage()', '%s' % str(arguments) ] self._errors = [ 'Malformed call to ErrorMessage()', '{}'.format(arguments) ]
text = None text = None
if len(arguments) == 1: if len(arguments) == 1:
if isinstance(arguments[0],Exception): text = str(arguments[0]).split('\n') if isinstance(arguments[0],Exception): text = str(arguments[0]).split('\n')
@ -56,14 +56,11 @@ class ErrorMessage ( Exception ):
self._errors = arguments[0] self._errors = arguments[0]
elif len(arguments) > 1: elif len(arguments) > 1:
text = list(arguments) text = list(arguments)
if text: if text:
self._errors = [] self._errors = []
while len(text[0]) == 0: del text[0] while len(text[0]) == 0: del text[0]
lstrip = 0 lstrip = 0
if text[0].startswith('[ERROR]'): lstrip = 8 if text[0].startswith('[ERROR]'): lstrip = 8
for line in text: for line in text:
if line[0:lstrip ] == ' '*lstrip or \ if line[0:lstrip ] == ' '*lstrip or \
line[0:lstrip-1] == '[ERROR]': line[0:lstrip-1] == '[ERROR]':
@ -74,12 +71,11 @@ class ErrorMessage ( Exception ):
def __str__ ( self ): def __str__ ( self ):
if not isinstance(self._errors,list): if not isinstance(self._errors,list):
return "[ERROR] %s" % self._errors return "[ERROR] {}".format(self._errors)
formatted = "\n" formatted = "\n"
for i in range(len(self._errors)): for i in range(len(self._errors)):
if i == 0: formatted += "[ERROR] %s" % self._errors[i] if i == 0: formatted += "[ERROR] {}".format(self._errors[i])
else: formatted += " %s" % self._errors[i] else: formatted += " {}".format(self._errors[i])
if i+1 < len(self._errors): formatted += "\n" if i+1 < len(self._errors): formatted += "\n"
return formatted return formatted
@ -94,7 +90,7 @@ class ErrorMessage ( Exception ):
return return
def terminate ( self ): def terminate ( self ):
print self print( self )
sys.exit(self._code) sys.exit(self._code)
@property @property
@ -104,14 +100,14 @@ class ErrorMessage ( Exception ):
class BadBinary ( ErrorMessage ): class BadBinary ( ErrorMessage ):
def __init__ ( self, binary ): def __init__ ( self, binary ):
ErrorMessage.__init__( self, 1, "Binary not found: <%s>." % binary ) ErrorMessage.__init__( self, 1, 'Binary not found: "{}".'.format(binary) )
return return
class BadReturnCode ( ErrorMessage ): class BadReturnCode ( ErrorMessage ):
def __init__ ( self, status ): def __init__ ( self, status ):
ErrorMessage.__init__( self, 1, "Command returned status:%d." % status ) ErrorMessage.__init__( self, 1, 'Command returned status:{}.'.format(status) )
return return
@ -120,9 +116,8 @@ class Command ( object ):
def __init__ ( self, arguments, fdLog=None ): def __init__ ( self, arguments, fdLog=None ):
self.arguments = arguments self.arguments = arguments
self.fdLog = fdLog self.fdLog = fdLog
if self.fdLog != None and not isinstance(self.fdLog,IOBase):
if self.fdLog != None and not isinstance(self.fdLog,file): print( '[WARNING] Command.__init__(): "fdLog" is neither None or a file.' )
print '[WARNING] Command.__init__(): <fdLog> is neither None or a file.'
return return
def _argumentsToStr ( self, arguments ): def _argumentsToStr ( self, arguments ):
@ -133,12 +128,19 @@ class Command ( object ):
return s return s
def log ( self, text ): def log ( self, text ):
print text[:-1] if isinstance(self.fdLog,IOBase):
if isinstance(text,bytes):
print( text[:-1].decode('utf-8') )
self.fdLog.write( text.decode('utf-8') )
elif isinstance(text,str):
print( text[:-1] )
self.fdLog.write( text )
else:
print( '[ERROR] Command.log(): "text" is neither bytes or str.' )
print( ' {}'.format(text) )
self.fdLog.flush()
sys.stdout.flush() sys.stdout.flush()
sys.stderr.flush() sys.stderr.flush()
if isinstance(self.fdLog,file):
self.fdLog.write( text )
self.fdLog.flush()
return return
def execute ( self ): def execute ( self ):
@ -151,27 +153,24 @@ class Command ( object ):
if homeDir.startswith(homeDir): if homeDir.startswith(homeDir):
workDir = '~' + workDir[ len(homeDir) : ] workDir = '~' + workDir[ len(homeDir) : ]
user = 'root' user = 'root'
if os.environ.has_key('USER'): user = os.environ['USER'] if 'USER' in os.environ: user = os.environ['USER']
prompt = '%s@%s:%s$' % (user,conf.masterHost,workDir) prompt = '{}@{}:{}$'.format(user,conf.masterHost,workDir)
try: try:
self.log( '%s%s\n' % (prompt,self._argumentsToStr(self.arguments)) ) self.log( '{}{}\n'.format(prompt,self._argumentsToStr(self.arguments)) )
print self.arguments print( self.arguments )
child = subprocess.Popen( self.arguments, stdout=subprocess.PIPE, stderr=subprocess.STDOUT ) child = subprocess.Popen( self.arguments, stdout=subprocess.PIPE, stderr=subprocess.STDOUT )
while True: while True:
line = child.stdout.readline() line = child.stdout.readline()
if not line: break if not line: break
self.log( line ) self.log( line )
except OSError, e: except OSError as e:
raise BadBinary( self.arguments[0] ) raise BadBinary( self.arguments[0] )
(pid,status) = os.waitpid( child.pid, 0 ) (pid,status) = os.waitpid( child.pid, 0 )
status >>= 8 status >>= 8
if status != 0: if status != 0:
raise BadReturnCode( status ) raise BadReturnCode( status )
return return
@ -186,8 +185,7 @@ class CommandArg ( object ):
def __str__ ( self ): def __str__ ( self ):
s = '' s = ''
if self.wd: s = 'cd %s && ' % self.wd if self.wd: s = 'cd {} && '.format(self.wd)
for i in range(len(self.command)): for i in range(len(self.command)):
if i: s += ' ' if i: s += ' '
s += self.command[i] s += self.command[i]
@ -223,7 +221,7 @@ class CoriolisCommand ( CommandArg ):
CommandArg.__init__ ( self, [ ccbBin CommandArg.__init__ ( self, [ ccbBin
, '--root='+rootDir , '--root='+rootDir
, '--project=coriolis' , '--project=coriolis'
, '--make=-j%d install' % threads , '--make=-j{} install'.format(threads)
] + otherArgs ] + otherArgs
, fdLog=fdLog ) , fdLog=fdLog )
return return
@ -258,15 +256,14 @@ class GitRepository ( object ):
def removeLocalRepo ( self ): def removeLocalRepo ( self ):
if os.path.isdir(self.localRepoDir): if os.path.isdir(self.localRepoDir):
print 'Removing Git local repository: <%s>' % self.localRepoDir print( 'Removing Git local repository: "{}"'.format(self.localRepoDir) )
shutil.rmtree( self.localRepoDir ) shutil.rmtree( self.localRepoDir )
return return
def clone ( self ): def clone ( self ):
print 'Clone/pull from:', self.url print( 'Clone/pull from:', self.url )
if not os.path.isdir(self.cloneDir): if not os.path.isdir(self.cloneDir):
os.makedirs( self.cloneDir ) os.makedirs( self.cloneDir )
if not os.path.isdir(self.localRepoDir): if not os.path.isdir(self.localRepoDir):
os.chdir( self.cloneDir ) os.chdir( self.cloneDir )
Command( [ 'git', 'clone', self.url ], self.fdLog ).execute() Command( [ 'git', 'clone', self.url ], self.fdLog ).execute()
@ -323,27 +320,25 @@ class Configuration ( object ):
self._masterHost = self._detectMasterHost() self._masterHost = self._detectMasterHost()
self._success = False self._success = False
self._rcode = 0 self._rcode = 0
self._updateSecondaries() self._updateSecondaries()
return return
def __setattr__ ( self, attribute, value ): def __setattr__ ( self, attribute, value ):
if attribute in Configuration.SecondaryNames: if attribute in Configuration.SecondaryNames:
print ErrorMessage( 1, 'Attempt to write in read-only attribute <%s> in Configuration.'%attribute ) print( ErrorMessage( 1, 'Attempt to write in read-only attribute "{}" in Configuration.' \
.format(attribute) ))
return return
if attribute == 'masterHost' or attribute == '_masterHost': if attribute == 'masterHost' or attribute == '_masterHost':
if value == 'lepka': if value == 'lepka':
print 'Never touch the Git tree when running on <lepka>.' print( 'Never touch the Git tree when running on "lepka".' )
self._rmSource = False self._rmSource = False
self._rmBuild = False self._rmBuild = False
self._doGit = False self._doGit = False
self._doSendReport = False self._doSendReport = False
if attribute[0] == '_': if attribute[0] == '_':
self.__dict__[attribute] = value self.__dict__[attribute] = value
return return
if attribute == 'homeDir': value = os.path.expanduser(value) if attribute == 'homeDir': value = os.path.expanduser(value)
self.__dict__['_'+attribute] = value self.__dict__['_'+attribute] = value
@ -352,8 +347,8 @@ class Configuration ( object ):
def __getattr__ ( self, attribute ): def __getattr__ ( self, attribute ):
if attribute[0] != '_': attribute = '_'+attribute if attribute[0] != '_': attribute = '_'+attribute
if not self.__dict__.has_key(attribute): if not attribute in self.__dict__:
raise ErrorMessage( 1, 'Configuration has no attribute <%s>.'%attribute ) raise ErrorMessage( 1, 'Configuration has no attribute "{}".'.format(attribute) )
return self.__dict__[attribute] return self.__dict__[attribute]
def _updateSecondaries ( self ): def _updateSecondaries ( self ):
@ -373,11 +368,9 @@ class Configuration ( object ):
def _detectMasterHost ( self ): def _detectMasterHost ( self ):
if self._chrootMode is None: return 'unknown' if self._chrootMode is None: return 'unknown'
if self._chrootMode: return 'chrooted-host' if self._chrootMode: return 'chrooted-host'
masterHost = 'unknown' masterHost = 'unknown'
hostname = socket.gethostname() hostname = socket.gethostname()
hostAddr = socket.gethostbyname(hostname) hostAddr = socket.gethostbyname(hostname)
if hostname == 'lepka' and hostAddr == '127.0.0.1': if hostname == 'lepka' and hostAddr == '127.0.0.1':
masterHost = 'lepka' masterHost = 'lepka'
else: else:
@ -387,13 +380,12 @@ class Configuration ( object ):
def openLog ( self, stem ): def openLog ( self, stem ):
if not os.path.isdir(self._logDir): if not os.path.isdir(self._logDir):
os.makedirs( self._logDir ) os.makedirs( self._logDir )
index = 0 index = 0
timeTag = time.strftime( "%Y.%m.%d" ) timeTag = time.strftime( "%Y.%m.%d" )
while True: while True:
logFile = os.path.join(self._logDir,"%s-%s-%02d.log" % (stem,timeTag,index)) logFile = os.path.join(self._logDir,"{}-{}-{:02}.log".format(stem,timeTag,index))
if not os.path.isfile(logFile): if not os.path.isfile(logFile):
print "Report log: <%s>" % logFile print( 'Report log: "{}"'.format(logFile) )
break break
index += 1 index += 1
fd = open( logFile, "w" ) fd = open( logFile, "w" )
@ -409,44 +401,39 @@ class Configuration ( object ):
def compressLogs ( self ): def compressLogs ( self ):
for log in self._logs.values(): for log in self._logs.values():
if not log: continue if not log: continue
fd = open( log, 'r' ) fd = open( log, 'r' )
bzfd = bz2.BZ2File( log+'.bz2', 'w' ) bzfd = bz2.BZ2File( log+'.bz2', 'w' )
for line in fd.readlines():
for line in fd.readlines(): bzfd.write( line ) if isinstance(line,str):
bzfd.write( line.encode('utf-8') )
elif isinstance(line,bytes):
bzfd.write( line )
bzfd.close() bzfd.close()
fd.close() fd.close()
os.unlink( log ) os.unlink( log )
return return
def getCommands ( self, target ): def getCommands ( self, target ):
commands = [] commands = []
if self.doYosys: if self.doYosys:
if not os.path.isfile( self.yosysBin ): if not os.path.isfile( self.yosysBin ):
raise ErrorMessage( 1, [ 'Cannot find <yosysInstaller.sh>, should be here:' raise ErrorMessage( 1, [ 'Cannot find <yosysInstaller.sh>, should be here:'
, ' <%s>' % self.yosysBin , ' "{}"'.format(self.yosysBin)
] ) ] )
commands.append( YosysCommand( self.yosysBin, fdLog=self.fds['yosys'] ) ) commands.append( YosysCommand( self.yosysBin, fdLog=self.fds['yosys'] ) )
if self.doAlliance: if self.doAlliance:
if not os.path.isfile( self.alcBin ): if not os.path.isfile( self.alcBin ):
raise ErrorMessage( 1, [ 'Cannot find <allianceInstaller.sh>, should be here:' raise ErrorMessage( 1, [ 'Cannot find <allianceInstaller.sh>, should be here:'
, ' <%s>' % self.alcBin , ' "{}"'.format(self.alcBin)
] ) ] )
commands.append( AllianceCommand( self.alcBin, fdLog=self.fds['alliance'] ) ) commands.append( AllianceCommand( self.alcBin, fdLog=self.fds['alliance'] ) )
if self.doCoriolis: if self.doCoriolis:
if not os.path.isfile( self.ccbBin ): if not os.path.isfile( self.ccbBin ):
raise ErrorMessage( 1, [ 'Cannot find <ccb.py>, should be here:' raise ErrorMessage( 1, [ 'Cannot find <ccb.py>, should be here:'
, ' <%s>' % self.ccbBin , ' "{}"'.format(self.ccbBin)
] ) ] )
otherArgs = [] otherArgs = []
if self.debugArg: otherArgs.append( self.debugArg ) if self.debugArg: otherArgs.append( self.debugArg )
if target == 'SL7_64': if target == 'SL7_64':
otherArgs.append( '--project=support' ) otherArgs.append( '--project=support' )
commands.append( CoriolisCommand( self.ccbBin, self.rootDir, 3, otherArgs , fdLog=self.fds['coriolis'] ) ) commands.append( CoriolisCommand( self.ccbBin, self.rootDir, 3, otherArgs , fdLog=self.fds['coriolis'] ) )
@ -459,7 +446,6 @@ class Configuration ( object ):
elif target == 'Ubuntu18' or target == 'Debian9' or target == 'Debian10': elif target == 'Ubuntu18' or target == 'Debian9' or target == 'Debian10':
if target == 'Ubuntu18': otherArgs.append( '--qt5' ) if target == 'Ubuntu18': otherArgs.append( '--qt5' )
commands.append( CoriolisCommand( self.ccbBin, self.rootDir, 3, otherArgs, fdLog=self.fds['coriolis'] ) ) commands.append( CoriolisCommand( self.ccbBin, self.rootDir, 3, otherArgs, fdLog=self.fds['coriolis'] ) )
if self.doBenchs: if self.doBenchs:
commands.append( BenchsCommand( self.benchsDir, fdLog=self.fds['benchs'] ) ) commands.append( BenchsCommand( self.benchsDir, fdLog=self.fds['benchs'] ) )
return commands return commands
@ -469,20 +455,17 @@ class Report ( object ):
def __init__ ( self, conf ): def __init__ ( self, conf ):
self.conf = conf self.conf = conf
commaspace = ', ' commaspace = ', '
date = time.strftime( "%A %d %B %Y" ) date = time.strftime( "%A %d %B %Y" )
stateText = 'FAILED' stateText = 'FAILED'
modeText = 'SoC installation' 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 %s %s' % (stateText,modeText,date) self.message['Subject'] = '[{}] Coriolis {} {}'.format(stateText,modeText,date)
self.message['From' ] = self.conf.sender self.message['From' ] = self.conf.sender
self.message['To' ] = commaspace.join( self.conf.receivers ) self.message['To' ] = commaspace.join( self.conf.receivers )
self.attachements = [] self.attachements = []
self.mainText = '\n' self.mainText = '\n'
self.mainText += 'Salut le Crevard,\n' self.mainText += 'Salut le Crevard,\n'
self.mainText += '\n' self.mainText += '\n'
@ -490,7 +473,7 @@ class Report ( object ):
self.mainText += 'This is the nightly build report of Coriolis.\n' self.mainText += 'This is the nightly build report of Coriolis.\n'
else: else:
self.mainText += 'SoC installer report of Coriolis.\n' self.mainText += 'SoC installer report of Coriolis.\n'
self.mainText += '%s\n' % date self.mainText += '{}\n'.format(date)
self.mainText += '\n' self.mainText += '\n'
if self.conf.success: if self.conf.success:
self.mainText += 'Build was SUCCESSFUL\n' self.mainText += 'Build was SUCCESSFUL\n'
@ -506,17 +489,16 @@ class Report ( object ):
fd = open( logFile, 'rb' ) fd = open( logFile, 'rb' )
try: try:
fd.seek( -1024*100, os.SEEK_END ) fd.seek( -1024*100, os.SEEK_END )
except IOError, e: except IOError as e:
pass pass
tailLines = '' tailLines = ''
for line in fd.readlines()[1:]: for line in fd.readlines()[1:]:
tailLines += line tailLines += line.decode( 'latin_1' )
fd.close() fd.close()
self.mainText += ' <%s>\n' % logFile self.mainText += ' "{}"\n'.format(logFile)
attachement = MIMEApplication(tailLines) attachement = MIMEApplication(tailLines)
attachement.add_header( 'Content-Disposition', 'attachment', filename=os.path.basename(logFile) ) attachement.add_header( 'Content-Disposition', 'attachment', filename=os.path.basename(logFile) )
self.attachements.append( attachement ) self.attachements.append( attachement )
return return
@ -525,8 +507,8 @@ class Report ( object ):
for attachement in self.attachements: for attachement in self.attachements:
self.message.attach( attachement ) self.message.attach( attachement )
print "Sending mail report to:" print( "Sending mail report to:" )
for receiver in self.conf.receivers: print ' <%s>' % receiver for receiver in self.conf.receivers: print( ' <{}>'.format(receiver) )
session = smtplib.SMTP( 'localhost' ) session = smtplib.SMTP( 'localhost' )
session.sendmail( self.conf.sender, self.conf.receivers, self.message.as_string() ) session.sendmail( self.conf.sender, self.conf.receivers, self.message.as_string() )
session.quit() session.quit()
@ -577,7 +559,6 @@ try:
if conf.doAlliance: conf.openLog( 'alliance' ) if conf.doAlliance: conf.openLog( 'alliance' )
if conf.doCoriolis: conf.openLog( 'coriolis' ) if conf.doCoriolis: conf.openLog( 'coriolis' )
if conf.doBenchs: conf.openLog( 'benchs' ) if conf.doBenchs: conf.openLog( 'benchs' )
if conf.dockerMode: os.environ['USER'] = 'root' if conf.dockerMode: os.environ['USER'] = 'root'
gitSupports = [] gitSupports = []
@ -613,29 +594,28 @@ try:
for entry in os.listdir(conf.rootDir): for entry in os.listdir(conf.rootDir):
if entry.startswith('Linux.'): if entry.startswith('Linux.'):
buildDir = conf.rootDir+'/'+entry buildDir = conf.rootDir+'/'+entry
print 'Removing OS build directory: <%s>' % buildDir print( 'Removing OS build directory: "{}"'.format(buildDir) )
shutil.rmtree( buildDir ) shutil.rmtree( buildDir )
commands = conf.getCommands( options.profile ) commands = conf.getCommands( options.profile )
for command in commands: for command in commands:
if command.host: if command.host:
print 'Executing command on remote host <%s>:' % host print( 'Executing command on remote host "{}":'.format(host) )
else: else:
print 'Executing command on *local* host:' print( 'Executing command on *local* host:' )
print ' %s' % str(command) print( ' {}'.format(command) )
command.execute() command.execute()
conf.closeLogs() conf.closeLogs()
conf.success = True conf.success = True
except ErrorMessage, e: except ErrorMessage as e:
print e print( e )
conf.closeLogs() conf.closeLogs()
conf.success = False conf.success = False
if showTrace: if showTrace:
print '\nPython stack trace:' print( '\nPython stack trace:' )
traceback.print_tb( sys.exc_info()[2] ) traceback.print_tb( sys.exc_info()[2] )
conf.rcode = e.code conf.rcode = e.code

6
bora/CMakeLists.txt
View File

@ -4,6 +4,7 @@
project(BORA) project(BORA)
option(BUILD_DOC "Build the documentation (doxygen)" OFF) option(BUILD_DOC "Build the documentation (doxygen)" OFF)
option(USE_LIBBFD "Link with BFD libraries to print stack traces" OFF)
cmake_minimum_required(VERSION 2.8.9) cmake_minimum_required(VERSION 2.8.9)
@ -14,15 +15,14 @@
setup_project_paths(CORIOLIS) setup_project_paths(CORIOLIS)
set_cmake_policies() set_cmake_policies()
setup_boost(program_options filesystem python regex) setup_boost(program_options)
setup_qt() setup_qt()
setup_qwt() setup_qwt()
find_package(Libexecinfo REQUIRED) find_package(Libexecinfo REQUIRED)
find_package(PythonLibs 2 REQUIRED) find_package(Python 3 REQUIRED COMPONENTS Interpreter Development)
find_package(PythonSitePackages REQUIRED) find_package(PythonSitePackages REQUIRED)
find_package(LEFDEF REQUIRED) find_package(LEFDEF REQUIRED)
find_package(VLSISAPD REQUIRED)
find_package(FLUTE REQUIRED) find_package(FLUTE REQUIRED)
find_package(HURRICANE REQUIRED) find_package(HURRICANE REQUIRED)
find_package(CORIOLIS REQUIRED) find_package(CORIOLIS REQUIRED)

2
bora/python/CMakeLists.txt
View File

@ -1,2 +1,2 @@
install ( FILES boraInit.py DESTINATION ${PYTHON_SITE_PACKAGES}/bora ) install ( FILES boraInit.py DESTINATION ${Python_CORIOLISLIB}/bora )

12
bora/python/boraInit.py
View File

@ -1,4 +1,3 @@
#!/usr/bin/env python
try: try:
import sys import sys
@ -7,23 +6,22 @@ try:
from helpers.io import ErrorMessage from helpers.io import ErrorMessage
from helpers.io import WarningMessage from helpers.io import WarningMessage
import Viewer import Viewer
except Exception, e: except Exception as e:
helpers.io.catch( e ) helpers.io.catch( e )
sys.exit( 1 ) sys.exit( 1 )
def boraHook ( **kw ): def boraHook ( **kw ):
bora = None bora = None
if kw.has_key('bora'): if 'bora' in kw:
bora = kw['bora'] bora = kw['bora']
else: else:
print ErrorMessage( 3, 'boraHook(): Must be run from a BoraEngine.' ) print( ErrorMessage( 3, 'boraHook(): Must be run from a BoraEngine.' ))
return return
try: try:
userInit = os.path.join( os.getcwd(), 'coriolis2/bora.py' ) userInit = os.path.join( os.getcwd(), 'coriolis2/bora.py' )
if (os.path.exists(userInit)): if (os.path.exists(userInit)):
execfile( userInit ) exec( open(userInit).read() )
except Exception, e: except Exception as e:
helpers.io.catch( e ) helpers.io.catch( e )
return return

4
bora/src/CMakeLists.txt
View File

@ -9,7 +9,7 @@
${Boost_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS}
${QWT_INCLUDE_DIR} ${QWT_INCLUDE_DIR}
${QtX_INCLUDE_DIR} ${QtX_INCLUDE_DIR}
${PYTHON_INCLUDE_PATH} ${Python_INCLUDE_DIRS}
) )
set( includes bora/Constants.h set( includes bora/Constants.h
bora/ParameterRange.h bora/ParameterRange.h
@ -101,7 +101,7 @@
${QWT_LIBRARY} ${QWT_LIBRARY}
${QtX_LIBRARIES} ${QtX_LIBRARIES}
${Boost_LIBRARIES} ${Boost_LIBRARIES}
${PYTHON_LIBRARIES} -lutil ${Python_LIBRARIES} -lutil
) )
add_library( bora ${cpps} ${mocCpps} ${pyCpps} ) add_library( bora ${cpps} ${mocCpps} ${pyCpps} )

26
bora/src/PyBora.cpp
View File

@ -1,7 +1,7 @@
// -*- C++ -*- // -*- C++ -*-
// //
// This file is part of the Coriolis Software. // This file is part of the Coriolis Software.
// Copyright (c) UPMC 2016-2018, All Rights Reserved // Copyright (c) Sorbonne Université 2016-2021, All Rights Reserved
// //
// +-----------------------------------------------------------------+ // +-----------------------------------------------------------------+
// | C O R I O L I S | // | C O R I O L I S |
@ -63,12 +63,21 @@ extern "C" {
}; };
// --------------------------------------------------------------- static PyModuleDef PyBora_ModuleDef =
// Module Initialization : "initBora ()" { PyModuleDef_HEAD_INIT
, .m_name = "Bora"
, .m_doc = "Analog Place & Global Route."
, .m_size = -1
, .m_methods = PyBora_Methods
};
DL_EXPORT(void) initBora ()
// ---------------------------------------------------------------
// Module Initialization : "PyInit_Bora ()"
PyMODINIT_FUNC PyInit_Bora ( void )
{ {
cdebug.log(61) << "initBora()" << endl; cdebug.log(61) << "PyInit_Bora()" << endl;
PyParameterRange_LinkPyType(); PyParameterRange_LinkPyType();
PyStepParameterRange_LinkPyType(); PyStepParameterRange_LinkPyType();
@ -95,12 +104,11 @@ extern "C" {
PYTYPE_READY_SUB( BoraEngine , ToolEngine ); PYTYPE_READY_SUB( BoraEngine , ToolEngine );
PYTYPE_READY_SUB( GraphicBoraEngine , GraphicTool ); PYTYPE_READY_SUB( GraphicBoraEngine , GraphicTool );
PyObject* module = PyModule_Create( &PyBora_ModuleDef );
PyObject* module = Py_InitModule( "Bora", PyBora_Methods );
if (module == NULL) { if (module == NULL) {
cerr << "[ERROR]\n" cerr << "[ERROR]\n"
<< " Failed to initialize Bora module." << endl; << " Failed to initialize Bora module." << endl;
return; return NULL;
} }
Py_INCREF( &PyTypeParameterRange ); Py_INCREF( &PyTypeParameterRange );
@ -128,6 +136,8 @@ extern "C" {
PySlicingNode_postModuleInit(); PySlicingNode_postModuleInit();
PyBoraEngine_postModuleInit(); PyBoraEngine_postModuleInit();
return module;
} }

2
bora/src/PyDSlicingNode.cpp
View File

@ -62,7 +62,7 @@ extern "C" {
DSlicingNode* node = NULL; DSlicingNode* node = NULL;
HTRY HTRY
if (not PyArg_ParseTuple( args,"SOO|O:DSlicingNode.create" if (not PyArg_ParseTuple( args,"OOO|O:DSlicingNode.create"
, &pyInstance , &pyInstance
, &pyCell , &pyCell
, &pyParameterRange , &pyParameterRange

1
bora/src/SlicingPlotWidget.cpp
View File

@ -22,6 +22,7 @@
#include <QHBoxLayout> #include <QHBoxLayout>
#include <QVBoxLayout> #include <QVBoxLayout>
#include <qwt_scale_draw.h> #include <qwt_scale_draw.h>
#include <qwt_scale_map.h>
#include <qwt_scale_widget.h> #include <qwt_scale_widget.h>
#include <qwt_symbol.h> #include <qwt_symbol.h>
#include <qwt_plot_curve.h> #include <qwt_plot_curve.h>

1
bora/src/bora/NodeSets.h
View File

@ -17,6 +17,7 @@
#ifndef BORA_NODE_SETS_H #ifndef BORA_NODE_SETS_H
#define BORA_NODE_SETS_H #define BORA_NODE_SETS_H
#include <algorithm>
#include <cstddef> #include <cstddef>
#include <limits> #include <limits>
#include "BoxSet.h" #include "BoxSet.h"

5
coloquinte/CMakeLists.txt
View File

@ -3,9 +3,10 @@
set(CMAKE_LEGACY_CYGWIN_WIN32 0) set(CMAKE_LEGACY_CYGWIN_WIN32 0)
project(COLOQUINTE) project(COLOQUINTE)
set(ignoreVariables "${CMAKE_INSTALL_DIR}") set(ignoreVariables "${CMAKE_INSTALL_DIR}" "${BUILD_DOC}")
option(BUILD_DOC "Build the documentation (doxygen)" OFF) #option(BUILD_DOC "Build the documentation (doxygen)" OFF)
option(USE_LIBBFD "Link with BFD libraries to print stack traces" OFF)
cmake_minimum_required(VERSION 2.8.9) cmake_minimum_required(VERSION 2.8.9)

1
coloquinte/src/coloquinte/optimization_subproblems.hxx
View File

@ -9,6 +9,7 @@
#include <cassert> #include <cassert>
#include <numeric> #include <numeric>
#include <cmath> #include <cmath>
#include <limits>
namespace coloquinte{ namespace coloquinte{

1
coloquinte/src/solvers.cxx
View File

@ -4,6 +4,7 @@
#include <cassert> #include <cassert>
#include <stdexcept> #include <stdexcept>
#include <cmath> #include <cmath>
#include <limits>
namespace coloquinte{ namespace coloquinte{
namespace gp{ namespace gp{

1
coloquinte/src/topologies.cxx
View File

@ -9,6 +9,7 @@
#include <functional> #include <functional>
#include <cmath> #include <cmath>
#include <array> #include <array>
#include <limits>
namespace coloquinte{ namespace coloquinte{
using edge_t = std::pair<index_t, index_t>; using edge_t = std::pair<index_t, index_t>;

7
crlcore/CMakeLists.txt
View File

@ -19,20 +19,21 @@
set_cmake_policies() set_cmake_policies()
check_distribution() check_distribution()
setup_sysconfdir("${CMAKE_INSTALL_PREFIX}") setup_sysconfdir("${CMAKE_INSTALL_PREFIX}")
setup_boost(program_options python regex wave) setup_boost(program_options)
setup_qt() setup_qt()
cmake_policy(SET CMP0054 NEW)
if (USE_LIBBFD) if (USE_LIBBFD)
find_package(Libbfd) find_package(Libbfd)
endif() endif()
find_package(LibXml2 REQUIRED) find_package(LibXml2 REQUIRED)
find_package(PythonLibs 2 REQUIRED) find_package(Python 3 REQUIRED COMPONENTS Interpreter Development)
find_package(PythonSitePackages REQUIRED) find_package(PythonSitePackages REQUIRED)
find_package(BISON REQUIRED) find_package(BISON REQUIRED)
find_package(FLEX REQUIRED) find_package(FLEX REQUIRED)
find_package(LEFDEF) find_package(LEFDEF)
find_package(OPENACCESS) find_package(OPENACCESS)
find_package(VLSISAPD REQUIRED)
find_package(HURRICANE REQUIRED) find_package(HURRICANE REQUIRED)
find_package(Libexecinfo REQUIRED) find_package(Libexecinfo REQUIRED)
#include(UseLATEX) #include(UseLATEX)

2
crlcore/doc/crlcore/html/AcmSigda_8h_source.html
View File

@ -54,7 +54,7 @@ $(function() {
<hr> <hr>
<table class="footer1"> <table class="footer1">
<tr> <tr>
<td class="LFooter"><small>Generated by doxygen 1.8.14 on Thu Nov 12 2020</small></td> <td class="LFooter"><small>Generated by doxygen 1.8.14 on Fri Oct 1 2021</small></td>
<td class="RFooter"><a href='#pagetop'><small>Return to top of page</small></a></td> <td class="RFooter"><a href='#pagetop'><small>Return to top of page</small></a></td>
</tr> </tr>
</table> </table>

4
crlcore/doc/crlcore/html/AllianceFramework_8h_source.html
View File

@ -77,7 +77,7 @@ $(function() {
<div class="ttc" id="classCRL_1_1AllianceFramework_html_a036bd6fa8f837c81f60b9d424f817add"><div class="ttname"><a href="classCRL_1_1AllianceFramework.html#a036bd6fa8f837c81f60b9d424f817add">CRL::AllianceFramework::getCatalog</a></div><div class="ttdeci">Catalog * getCatalog()</div><div class="ttdef"><b>Definition:</b> AllianceFramework.h:176</div></div> <div class="ttc" id="classCRL_1_1AllianceFramework_html_a036bd6fa8f837c81f60b9d424f817add"><div class="ttname"><a href="classCRL_1_1AllianceFramework.html#a036bd6fa8f837c81f60b9d424f817add">CRL::AllianceFramework::getCatalog</a></div><div class="ttdeci">Catalog * getCatalog()</div><div class="ttdef"><b>Definition:</b> AllianceFramework.h:176</div></div>
<div class="ttc" id="classCRL_1_1AllianceFramework_html_a03ef94e043d2d25eb7a6a5f1ae176432a4a10630340ffb5b0aa9983f8b7f4cbe0"><div class="ttname"><a href="classCRL_1_1AllianceFramework.html#a03ef94e043d2d25eb7a6a5f1ae176432a4a10630340ffb5b0aa9983f8b7f4cbe0">CRL::AllianceFramework::IgnoreFeeds</a></div><div class="ttdef"><b>Definition:</b> AllianceFramework.h:49</div></div> <div class="ttc" id="classCRL_1_1AllianceFramework_html_a03ef94e043d2d25eb7a6a5f1ae176432a4a10630340ffb5b0aa9983f8b7f4cbe0"><div class="ttname"><a href="classCRL_1_1AllianceFramework.html#a03ef94e043d2d25eb7a6a5f1ae176432a4a10630340ffb5b0aa9983f8b7f4cbe0">CRL::AllianceFramework::IgnoreFeeds</a></div><div class="ttdef"><b>Definition:</b> AllianceFramework.h:49</div></div>
<div class="ttc" id="classCRL_1_1AllianceFramework_html_ae102d655820c5d0a29a0200c5e83d42c"><div class="ttname"><a href="classCRL_1_1AllianceFramework.html#ae102d655820c5d0a29a0200c5e83d42c">CRL::AllianceFramework::getRoutingGauge</a></div><div class="ttdeci">RoutingGauge * getRoutingGauge(const Name &amp;name=&quot;&quot;)</div></div> <div class="ttc" id="classCRL_1_1AllianceFramework_html_ae102d655820c5d0a29a0200c5e83d42c"><div class="ttname"><a href="classCRL_1_1AllianceFramework.html#ae102d655820c5d0a29a0200c5e83d42c">CRL::AllianceFramework::getRoutingGauge</a></div><div class="ttdeci">RoutingGauge * getRoutingGauge(const Name &amp;name=&quot;&quot;)</div></div>
<div class="ttc" id="classCRL_1_1Catalog_html"><div class="ttname"><a href="classCRL_1_1Catalog.html">CRL::Catalog</a></div><div class="ttdoc">A Registry to store Alliance Cell metadatas. </div><div class="ttdef"><b>Definition:</b> Catalog.h:56</div></div> <div class="ttc" id="classCRL_1_1Catalog_html"><div class="ttname"><a href="classCRL_1_1Catalog.html">CRL::Catalog</a></div><div class="ttdoc">A Registry to store Alliance Cell metadatas. </div><div class="ttdef"><b>Definition:</b> Catalog.h:54</div></div>
<div class="ttc" id="classCRL_1_1AllianceFramework_html_a4085f3bc96ca5e4bf2d41a4ada9658f2"><div class="ttname"><a href="classCRL_1_1AllianceFramework.html#a4085f3bc96ca5e4bf2d41a4ada9658f2">CRL::AllianceFramework::getAllianceLibrary</a></div><div class="ttdeci">AllianceLibrary * getAllianceLibrary(unsigned int index)</div></div> <div class="ttc" id="classCRL_1_1AllianceFramework_html_a4085f3bc96ca5e4bf2d41a4ada9658f2"><div class="ttname"><a href="classCRL_1_1AllianceFramework.html#a4085f3bc96ca5e4bf2d41a4ada9658f2">CRL::AllianceFramework::getAllianceLibrary</a></div><div class="ttdeci">AllianceLibrary * getAllianceLibrary(unsigned int index)</div></div>
<div class="ttc" id="classCRL_1_1AllianceFramework_html_a0ec1cd09dec34dfecfec22927b92cc25a8d9678631764327cbfe81f8184fa9e05"><div class="ttname"><a href="classCRL_1_1AllianceFramework.html#a0ec1cd09dec34dfecfec22927b92cc25a8d9678631764327cbfe81f8184fa9e05">CRL::AllianceFramework::HasCatalog</a></div><div class="ttdef"><b>Definition:</b> AllianceFramework.h:53</div></div> <div class="ttc" id="classCRL_1_1AllianceFramework_html_a0ec1cd09dec34dfecfec22927b92cc25a8d9678631764327cbfe81f8184fa9e05"><div class="ttname"><a href="classCRL_1_1AllianceFramework.html#a0ec1cd09dec34dfecfec22927b92cc25a8d9678631764327cbfe81f8184fa9e05">CRL::AllianceFramework::HasCatalog</a></div><div class="ttdef"><b>Definition:</b> AllianceFramework.h:53</div></div>
<div class="ttc" id="classCRL_1_1Environment_html"><div class="ttname"><a href="classCRL_1_1Environment.html">CRL::Environment</a></div><div class="ttdoc">Holds all the Alliance environment variables. </div><div class="ttdef"><b>Definition:</b> Environment.h:33</div></div> <div class="ttc" id="classCRL_1_1Environment_html"><div class="ttname"><a href="classCRL_1_1Environment.html">CRL::Environment</a></div><div class="ttdoc">Holds all the Alliance environment variables. </div><div class="ttdef"><b>Definition:</b> Environment.h:33</div></div>
@ -92,7 +92,7 @@ $(function() {
<hr> <hr>
<table class="footer1"> <table class="footer1">
<tr> <tr>
<td class="LFooter"><small>Generated by doxygen 1.8.14 on Thu Nov 12 2020</small></td> <td class="LFooter"><small>Generated by doxygen 1.8.14 on Fri Oct 1 2021</small></td>
<td class="RFooter"><a href='#pagetop'><small>Return to top of page</small></a></td> <td class="RFooter"><a href='#pagetop'><small>Return to top of page</small></a></td>
</tr> </tr>
</table> </table>

2
crlcore/doc/crlcore/html/AllianceLibrary_8h_source.html
View File

@ -59,7 +59,7 @@ $(function() {
<hr> <hr>
<table class="footer1"> <table class="footer1">
<tr> <tr>
<td class="LFooter"><small>Generated by doxygen 1.8.14 on Thu Nov 12 2020</small></td> <td class="LFooter"><small>Generated by doxygen 1.8.14 on Fri Oct 1 2021</small></td>
<td class="RFooter"><a href='#pagetop'><small>Return to top of page</small></a></td> <td class="RFooter"><a href='#pagetop'><small>Return to top of page</small></a></td>
</tr> </tr>
</table> </table>

2
crlcore/doc/crlcore/html/Banner_8h_source.html
View File

@ -66,7 +66,7 @@ $(function() {
<hr> <hr>
<table class="footer1"> <table class="footer1">
<tr> <tr>
<td class="LFooter"><small>Generated by doxygen 1.8.14 on Thu Nov 12 2020</small></td> <td class="LFooter"><small>Generated by doxygen 1.8.14 on Fri Oct 1 2021</small></td>
<td class="RFooter"><a href='#pagetop'><small>Return to top of page</small></a></td> <td class="RFooter"><a href='#pagetop'><small>Return to top of page</small></a></td>
</tr> </tr>
</table> </table>

102
crlcore/doc/crlcore/html/Catalog_8h_source.html
View File

File diff suppressed because one or more lines are too long

2
crlcore/doc/crlcore/html/Environment_8h_source.html
View File

@ -98,7 +98,7 @@ $(function() {
<hr> <hr>
<table class="footer1"> <table class="footer1">
<tr> <tr>
<td class="LFooter"><small>Generated by doxygen 1.8.14 on Thu Nov 12 2020</small></td> <td class="LFooter"><small>Generated by doxygen 1.8.14 on Fri Oct 1 2021</small></td>
<td class="RFooter"><a href='#pagetop'><small>Return to top of page</small></a></td> <td class="RFooter"><a href='#pagetop'><small>Return to top of page</small></a></td>
</tr> </tr>
</table> </table>

2
crlcore/doc/crlcore/html/GraphicToolEngine_8h_source.html
View File

@ -60,7 +60,7 @@ $(function() {
<hr> <hr>
<table class="footer1"> <table class="footer1">
<tr> <tr>
<td class="LFooter"><small>Generated by doxygen 1.8.14 on Thu Nov 12 2020</small></td> <td class="LFooter"><small>Generated by doxygen 1.8.14 on Fri Oct 1 2021</small></td>
<td class="RFooter"><a href='#pagetop'><small>Return to top of page</small></a></td> <td class="RFooter"><a href='#pagetop'><small>Return to top of page</small></a></td>
</tr> </tr>
</table> </table>

22
crlcore/doc/crlcore/html/RoutingGauge_8h_source.html
View File

File diff suppressed because one or more lines are too long

56
crlcore/doc/crlcore/html/RoutingLayerGauge_8h_source.html
View File

File diff suppressed because one or more lines are too long

2
crlcore/doc/crlcore/html/SearchPath_8h_source.html
View File

@ -68,7 +68,7 @@ $(function() {
<hr> <hr>
<table class="footer1"> <table class="footer1">
<tr> <tr>
<td class="LFooter"><small>Generated by doxygen 1.8.14 on Thu Nov 12 2020</small></td> <td class="LFooter"><small>Generated by doxygen 1.8.14 on Fri Oct 1 2021</small></td>
<td class="RFooter"><a href='#pagetop'><small>Return to top of page</small></a></td> <td class="RFooter"><a href='#pagetop'><small>Return to top of page</small></a></td>
</tr> </tr>
</table> </table>

2
crlcore/doc/crlcore/html/ToolEngine_8h_source.html
View File

@ -58,7 +58,7 @@ $(function() {
<hr> <hr>
<table class="footer1"> <table class="footer1">
<tr> <tr>
<td class="LFooter"><small>Generated by doxygen 1.8.14 on Thu Nov 12 2020</small></td> <td class="LFooter"><small>Generated by doxygen 1.8.14 on Fri Oct 1 2021</small></td>
<td class="RFooter"><a href='#pagetop'><small>Return to top of page</small></a></td> <td class="RFooter"><a href='#pagetop'><small>Return to top of page</small></a></td>
</tr> </tr>
</table> </table>

2
crlcore/doc/crlcore/html/ToolEngines_8h_source.html
View File

@ -57,7 +57,7 @@ $(function() {
<hr> <hr>
<table class="footer1"> <table class="footer1">
<tr> <tr>
<td class="LFooter"><small>Generated by doxygen 1.8.14 on Thu Nov 12 2020</small></td> <td class="LFooter"><small>Generated by doxygen 1.8.14 on Fri Oct 1 2021</small></td>
<td class="RFooter"><a href='#pagetop'><small>Return to top of page</small></a></td> <td class="RFooter"><a href='#pagetop'><small>Return to top of page</small></a></td>
</tr> </tr>
</table> </table>

2
crlcore/doc/crlcore/html/annotated.html
View File

@ -64,7 +64,7 @@ $(function() {
<hr> <hr>
<table class="footer1"> <table class="footer1">
<tr> <tr>
<td class="LFooter"><small>Generated by doxygen 1.8.14 on Thu Nov 12 2020</small></td> <td class="LFooter"><small>Generated by doxygen 1.8.14 on Fri Oct 1 2021</small></td>
<td class="RFooter"><a href='#pagetop'><small>Return to top of page</small></a></td> <td class="RFooter"><a href='#pagetop'><small>Return to top of page</small></a></td>
</tr> </tr>
</table> </table>

2
crlcore/doc/crlcore/html/classCRL_1_1AcmSigda-members.html
View File

@ -53,7 +53,7 @@ $(function() {
<hr> <hr>
<table class="footer1"> <table class="footer1">
<tr> <tr>
<td class="LFooter"><small>Generated by doxygen 1.8.14 on Thu Nov 12 2020</small></td> <td class="LFooter"><small>Generated by doxygen 1.8.14 on Fri Oct 1 2021</small></td>
<td class="RFooter"><a href='#pagetop'><small>Return to top of page</small></a></td> <td class="RFooter"><a href='#pagetop'><small>Return to top of page</small></a></td>
</tr> </tr>
</table> </table>

2
crlcore/doc/crlcore/html/classCRL_1_1AcmSigda.html
View File

@ -118,7 +118,7 @@ Static Public Member Functions</h2></td></tr>
<hr> <hr>
<table class="footer1"> <table class="footer1">
<tr> <tr>
<td class="LFooter"><small>Generated by doxygen 1.8.14 on Thu Nov 12 2020</small></td> <td class="LFooter"><small>Generated by doxygen 1.8.14 on Fri Oct 1 2021</small></td>
<td class="RFooter"><a href='#pagetop'><small>Return to top of page</small></a></td> <td class="RFooter"><a href='#pagetop'><small>Return to top of page</small></a></td>
</tr> </tr>
</table> </table>

2
crlcore/doc/crlcore/html/classCRL_1_1AllianceFramework-members.html
View File

@ -94,7 +94,7 @@ $(function() {
<hr> <hr>
<table class="footer1"> <table class="footer1">
<tr> <tr>
<td class="LFooter"><small>Generated by doxygen 1.8.14 on Thu Nov 12 2020</small></td> <td class="LFooter"><small>Generated by doxygen 1.8.14 on Fri Oct 1 2021</small></td>
<td class="RFooter"><a href='#pagetop'><small>Return to top of page</small></a></td> <td class="RFooter"><a href='#pagetop'><small>Return to top of page</small></a></td>
</tr> </tr>
</table> </table>

2
crlcore/doc/crlcore/html/classCRL_1_1AllianceFramework.html
View File

@ -905,7 +905,7 @@ Static Public Member Functions</h2></td></tr>
<hr> <hr>
<table class="footer1"> <table class="footer1">
<tr> <tr>
<td class="LFooter"><small>Generated by doxygen 1.8.14 on Thu Nov 12 2020</small></td> <td class="LFooter"><small>Generated by doxygen 1.8.14 on Fri Oct 1 2021</small></td>
<td class="RFooter"><a href='#pagetop'><small>Return to top of page</small></a></td> <td class="RFooter"><a href='#pagetop'><small>Return to top of page</small></a></td>
</tr> </tr>
</table> </table>

2
crlcore/doc/crlcore/html/classCRL_1_1AllianceLibrary-members.html
View File

@ -56,7 +56,7 @@ $(function() {
<hr> <hr>
<table class="footer1"> <table class="footer1">
<tr> <tr>
<td class="LFooter"><small>Generated by doxygen 1.8.14 on Thu Nov 12 2020</small></td> <td class="LFooter"><small>Generated by doxygen 1.8.14 on Fri Oct 1 2021</small></td>
<td class="RFooter"><a href='#pagetop'><small>Return to top of page</small></a></td> <td class="RFooter"><a href='#pagetop'><small>Return to top of page</small></a></td>
</tr> </tr>
</table> </table>

2
crlcore/doc/crlcore/html/classCRL_1_1AllianceLibrary.html
View File

@ -175,7 +175,7 @@ Public Member Functions</h2></td></tr>
<hr> <hr>
<table class="footer1"> <table class="footer1">
<tr> <tr>
<td class="LFooter"><small>Generated by doxygen 1.8.14 on Thu Nov 12 2020</small></td> <td class="LFooter"><small>Generated by doxygen 1.8.14 on Fri Oct 1 2021</small></td>
<td class="RFooter"><a href='#pagetop'><small>Return to top of page</small></a></td> <td class="RFooter"><a href='#pagetop'><small>Return to top of page</small></a></td>
</tr> </tr>
</table> </table>

2
crlcore/doc/crlcore/html/classCRL_1_1Banner-members.html
View File

@ -67,7 +67,7 @@ $(function() {
<hr> <hr>
<table class="footer1"> <table class="footer1">
<tr> <tr>
<td class="LFooter"><small>Generated by doxygen 1.8.14 on Thu Nov 12 2020</small></td> <td class="LFooter"><small>Generated by doxygen 1.8.14 on Fri Oct 1 2021</small></td>
<td class="RFooter"><a href='#pagetop'><small>Return to top of page</small></a></td> <td class="RFooter"><a href='#pagetop'><small>Return to top of page</small></a></td>
</tr> </tr>
</table> </table>

2
crlcore/doc/crlcore/html/classCRL_1_1Banner.html
View File

@ -495,7 +495,7 @@ Public Member Functions</h2></td></tr>
<hr> <hr>
<table class="footer1"> <table class="footer1">
<tr> <tr>
<td class="LFooter"><small>Generated by doxygen 1.8.14 on Thu Nov 12 2020</small></td> <td class="LFooter"><small>Generated by doxygen 1.8.14 on Fri Oct 1 2021</small></td>
<td class="RFooter"><a href='#pagetop'><small>Return to top of page</small></a></td> <td class="RFooter"><a href='#pagetop'><small>Return to top of page</small></a></td>
</tr> </tr>
</table> </table>

2
crlcore/doc/crlcore/html/classCRL_1_1Catalog-members.html
View File

@ -60,7 +60,7 @@ $(function() {
<hr> <hr>
<table class="footer1"> <table class="footer1">
<tr> <tr>
<td class="LFooter"><small>Generated by doxygen 1.8.14 on Thu Nov 12 2020</small></td> <td class="LFooter"><small>Generated by doxygen 1.8.14 on Fri Oct 1 2021</small></td>
<td class="RFooter"><a href='#pagetop'><small>Return to top of page</small></a></td> <td class="RFooter"><a href='#pagetop'><small>Return to top of page</small></a></td>
</tr> </tr>
</table> </table>

2
crlcore/doc/crlcore/html/classCRL_1_1Catalog.html
View File

@ -292,7 +292,7 @@ Public Member Functions</h2></td></tr>
<hr> <hr>
<table class="footer1"> <table class="footer1">
<tr> <tr>
<td class="LFooter"><small>Generated by doxygen 1.8.14 on Thu Nov 12 2020</small></td> <td class="LFooter"><small>Generated by doxygen 1.8.14 on Fri Oct 1 2021</small></td>
<td class="RFooter"><a href='#pagetop'><small>Return to top of page</small></a></td> <td class="RFooter"><a href='#pagetop'><small>Return to top of page</small></a></td>
</tr> </tr>
</table> </table>

2
crlcore/doc/crlcore/html/classCRL_1_1CatalogExtension-members.html
View File

@ -69,7 +69,7 @@ $(function() {
<hr> <hr>
<table class="footer1"> <table class="footer1">
<tr> <tr>
<td class="LFooter"><small>Generated by doxygen 1.8.14 on Thu Nov 12 2020</small></td> <td class="LFooter"><small>Generated by doxygen 1.8.14 on Fri Oct 1 2021</small></td>
<td class="RFooter"><a href='#pagetop'><small>Return to top of page</small></a></td> <td class="RFooter"><a href='#pagetop'><small>Return to top of page</small></a></td>
</tr> </tr>
</table> </table>

2
crlcore/doc/crlcore/html/classCRL_1_1CatalogExtension.html
View File

@ -691,7 +691,7 @@ Static Public Member Functions</h2></td></tr>
<hr> <hr>
<table class="footer1"> <table class="footer1">
<tr> <tr>
<td class="LFooter"><small>Generated by doxygen 1.8.14 on Thu Nov 12 2020</small></td> <td class="LFooter"><small>Generated by doxygen 1.8.14 on Fri Oct 1 2021</small></td>
<td class="RFooter"><a href='#pagetop'><small>Return to top of page</small></a></td> <td class="RFooter"><a href='#pagetop'><small>Return to top of page</small></a></td>
</tr> </tr>
</table> </table>

2
crlcore/doc/crlcore/html/classCRL_1_1Catalog_1_1State-members.html
View File

@ -83,7 +83,7 @@ $(function() {
<hr> <hr>
<table class="footer1"> <table class="footer1">
<tr> <tr>
<td class="LFooter"><small>Generated by doxygen 1.8.14 on Thu Nov 12 2020</small></td> <td class="LFooter"><small>Generated by doxygen 1.8.14 on Fri Oct 1 2021</small></td>
<td class="RFooter"><a href='#pagetop'><small>Return to top of page</small></a></td> <td class="RFooter"><a href='#pagetop'><small>Return to top of page</small></a></td>
</tr> </tr>
</table> </table>

2
crlcore/doc/crlcore/html/classCRL_1_1Catalog_1_1State.html
View File

@ -781,7 +781,7 @@ Public Member Functions</h2></td></tr>
<hr> <hr>
<table class="footer1"> <table class="footer1">
<tr> <tr>
<td class="LFooter"><small>Generated by doxygen 1.8.14 on Thu Nov 12 2020</small></td> <td class="LFooter"><small>Generated by doxygen 1.8.14 on Fri Oct 1 2021</small></td>
<td class="RFooter"><a href='#pagetop'><small>Return to top of page</small></a></td> <td class="RFooter"><a href='#pagetop'><small>Return to top of page</small></a></td>
</tr> </tr>
</table> </table>

2
crlcore/doc/crlcore/html/classCRL_1_1Environment-members.html
View File

@ -96,7 +96,7 @@ $(function() {
<hr> <hr>
<table class="footer1"> <table class="footer1">
<tr> <tr>
<td class="LFooter"><small>Generated by doxygen 1.8.14 on Thu Nov 12 2020</small></td> <td class="LFooter"><small>Generated by doxygen 1.8.14 on Fri Oct 1 2021</small></td>
<td class="RFooter"><a href='#pagetop'><small>Return to top of page</small></a></td> <td class="RFooter"><a href='#pagetop'><small>Return to top of page</small></a></td>
</tr> </tr>
</table> </table>

2
crlcore/doc/crlcore/html/classCRL_1_1Environment.html
View File

@ -1136,7 +1136,7 @@ Public Member Functions</h2></td></tr>
<hr> <hr>
<table class="footer1"> <table class="footer1">
<tr> <tr>
<td class="LFooter"><small>Generated by doxygen 1.8.14 on Thu Nov 12 2020</small></td> <td class="LFooter"><small>Generated by doxygen 1.8.14 on Fri Oct 1 2021</small></td>
<td class="RFooter"><a href='#pagetop'><small>Return to top of page</small></a></td> <td class="RFooter"><a href='#pagetop'><small>Return to top of page</small></a></td>
</tr> </tr>
</table> </table>

2
crlcore/doc/crlcore/html/classCRL_1_1GraphicTool-members.html
View File

@ -54,7 +54,7 @@ $(function() {
<hr> <hr>
<table class="footer1"> <table class="footer1">
<tr> <tr>
<td class="LFooter"><small>Generated by doxygen 1.8.14 on Thu Nov 12 2020</small></td> <td class="LFooter"><small>Generated by doxygen 1.8.14 on Fri Oct 1 2021</small></td>
<td class="RFooter"><a href='#pagetop'><small>Return to top of page</small></a></td> <td class="RFooter"><a href='#pagetop'><small>Return to top of page</small></a></td>
</tr> </tr>
</table> </table>

2
crlcore/doc/crlcore/html/classCRL_1_1GraphicTool.html
View File

@ -127,7 +127,7 @@ Public Member Functions</h2></td></tr>
<hr> <hr>
<table class="footer1"> <table class="footer1">
<tr> <tr>
<td class="LFooter"><small>Generated by doxygen 1.8.14 on Thu Nov 12 2020</small></td> <td class="LFooter"><small>Generated by doxygen 1.8.14 on Fri Oct 1 2021</small></td>
<td class="RFooter"><a href='#pagetop'><small>Return to top of page</small></a></td> <td class="RFooter"><a href='#pagetop'><small>Return to top of page</small></a></td>
</tr> </tr>
</table> </table>

2
crlcore/doc/crlcore/html/classCRL_1_1RoutingGauge-members.html
View File

@ -68,7 +68,7 @@ $(function() {
<hr> <hr>
<table class="footer1"> <table class="footer1">
<tr> <tr>
<td class="LFooter"><small>Generated by doxygen 1.8.14 on Thu Nov 12 2020</small></td> <td class="LFooter"><small>Generated by doxygen 1.8.14 on Fri Oct 1 2021</small></td>
<td class="RFooter"><a href='#pagetop'><small>Return to top of page</small></a></td> <td class="RFooter"><a href='#pagetop'><small>Return to top of page</small></a></td>
</tr> </tr>
</table> </table>

2
crlcore/doc/crlcore/html/classCRL_1_1RoutingGauge.html
View File

@ -451,7 +451,7 @@ Static Public Member Functions</h2></td></tr>
<hr> <hr>
<table class="footer1"> <table class="footer1">
<tr> <tr>
<td class="LFooter"><small>Generated by doxygen 1.8.14 on Thu Nov 12 2020</small></td> <td class="LFooter"><small>Generated by doxygen 1.8.14 on Fri Oct 1 2021</small></td>
<td class="RFooter"><a href='#pagetop'><small>Return to top of page</small></a></td> <td class="RFooter"><a href='#pagetop'><small>Return to top of page</small></a></td>
</tr> </tr>
</table> </table>

4
crlcore/doc/crlcore/html/classCRL_1_1RoutingLayerGauge-members.html
View File

@ -47,7 +47,7 @@ $(function() {
<p>This is the complete list of members for <a class="el" href="classCRL_1_1RoutingLayerGauge.html">CRL::RoutingLayerGauge</a>, including all inherited members.</p> <p>This is the complete list of members for <a class="el" href="classCRL_1_1RoutingLayerGauge.html">CRL::RoutingLayerGauge</a>, including all inherited members.</p>
<table class="directory"> <table class="directory">
<tr class="even"><td class="entry"><a class="el" href="classCRL_1_1RoutingLayerGauge.html#afe17db013bf6a933c2af4e847bfd7918">create</a>(const Layer *layer, Constant::Direction direction, Constant::LayerGaugeType type, unsigned int depth, double density, DbU::Unit offset, DbU::Unit pitch, DbU::Unit wireWidth, DbU::Unit viaWidth, DbU::Unit obsDw)</td><td class="entry"><a class="el" href="classCRL_1_1RoutingLayerGauge.html">CRL::RoutingLayerGauge</a></td><td class="entry"><span class="mlabel">static</span></td></tr> <tr class="even"><td class="entry"><a class="el" href="classCRL_1_1RoutingLayerGauge.html#afb41e7be2a6d258a691aacbe7a78154f">create</a>(const Layer *layer, Constant::Direction direction, Constant::LayerGaugeType type, unsigned int depth, double density, DbU::Unit offset, DbU::Unit pitch, DbU::Unit wireWidth, DbU::Unit pwireWidth, DbU::Unit viaWidth, DbU::Unit obsDw)</td><td class="entry"><a class="el" href="classCRL_1_1RoutingLayerGauge.html">CRL::RoutingLayerGauge</a></td><td class="entry"><span class="mlabel">static</span></td></tr>
<tr><td class="entry"><a class="el" href="classCRL_1_1RoutingLayerGauge.html#a323c68a66f89908a1376d5464655efe3">destroy</a>()</td><td class="entry"><a class="el" href="classCRL_1_1RoutingLayerGauge.html">CRL::RoutingLayerGauge</a></td><td class="entry"><span class="mlabel">virtual</span></td></tr> <tr><td class="entry"><a class="el" href="classCRL_1_1RoutingLayerGauge.html#a323c68a66f89908a1376d5464655efe3">destroy</a>()</td><td class="entry"><a class="el" href="classCRL_1_1RoutingLayerGauge.html">CRL::RoutingLayerGauge</a></td><td class="entry"><span class="mlabel">virtual</span></td></tr>
<tr class="even"><td class="entry"><a class="el" href="classCRL_1_1RoutingLayerGauge.html#ab8d5ae22c453605226b2695c2568c4f5">divide</a>(DbU::Unit dividend, long &amp;quotient, long &amp;modulo) const</td><td class="entry"><a class="el" href="classCRL_1_1RoutingLayerGauge.html">CRL::RoutingLayerGauge</a></td><td class="entry"></td></tr> <tr class="even"><td class="entry"><a class="el" href="classCRL_1_1RoutingLayerGauge.html#ab8d5ae22c453605226b2695c2568c4f5">divide</a>(DbU::Unit dividend, long &amp;quotient, long &amp;modulo) const</td><td class="entry"><a class="el" href="classCRL_1_1RoutingLayerGauge.html">CRL::RoutingLayerGauge</a></td><td class="entry"></td></tr>
<tr><td class="entry"><a class="el" href="classCRL_1_1RoutingLayerGauge.html#aa6c48e5acc6985997aa0417ef614f69d">getBlockageLayer</a>() const</td><td class="entry"><a class="el" href="classCRL_1_1RoutingLayerGauge.html">CRL::RoutingLayerGauge</a></td><td class="entry"><span class="mlabel">inline</span></td></tr> <tr><td class="entry"><a class="el" href="classCRL_1_1RoutingLayerGauge.html#aa6c48e5acc6985997aa0417ef614f69d">getBlockageLayer</a>() const</td><td class="entry"><a class="el" href="classCRL_1_1RoutingLayerGauge.html">CRL::RoutingLayerGauge</a></td><td class="entry"><span class="mlabel">inline</span></td></tr>
@ -70,7 +70,7 @@ $(function() {
<hr> <hr>
<table class="footer1"> <table class="footer1">
<tr> <tr>
<td class="LFooter"><small>Generated by doxygen 1.8.14 on Thu Nov 12 2020</small></td> <td class="LFooter"><small>Generated by doxygen 1.8.14 on Fri Oct 1 2021</small></td>
<td class="RFooter"><a href='#pagetop'><small>Return to top of page</small></a></td> <td class="RFooter"><a href='#pagetop'><small>Return to top of page</small></a></td>
</tr> </tr>
</table> </table>

16
crlcore/doc/crlcore/html/classCRL_1_1RoutingLayerGauge.html
View File

@ -91,14 +91,14 @@ Public Member Functions</h2></td></tr>
</table><table class="memberdecls"> </table><table class="memberdecls">
<tr class="heading"><td colspan="2"><h2 class="groupheader"><a name="pub-static-methods"></a> <tr class="heading"><td colspan="2"><h2 class="groupheader"><a name="pub-static-methods"></a>
Static Public Member Functions</h2></td></tr> Static Public Member Functions</h2></td></tr>
<tr class="memitem:afe17db013bf6a933c2af4e847bfd7918"><td class="memItemLeft" align="right" valign="top">static <a class="el" href="classCRL_1_1RoutingLayerGauge.html">RoutingLayerGauge</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="classCRL_1_1RoutingLayerGauge.html#afe17db013bf6a933c2af4e847bfd7918">create</a> (const <a class="elRef" doxygen="/dsk/l1/jpc/coriolis-2.x/src/coriolis/hurricane/doc/hurricane/html/hurricane.tag:../hurricane/" href="../hurricane/classHurricane_1_1Layer.html">Layer</a> *layer, <a class="el" href="namespaceConstant.html#ac081a99f2b64361919ed5d9f37c0f9af">Constant::Direction</a> direction, <a class="el" href="namespaceConstant.html#ab2e46a17cc373a268c5c24fa0e2067e5">Constant::LayerGaugeType</a> type, unsigned int depth, double density, <a class="elRef" doxygen="/dsk/l1/jpc/coriolis-2.x/src/coriolis/hurricane/doc/hurricane/html/hurricane.tag:../hurricane/" href="../hurricane/group__DbUGroup.html#ga4fbfa3e8c89347af76c9628ea06c4146">DbU::Unit</a> offset, <a class="elRef" doxygen="/dsk/l1/jpc/coriolis-2.x/src/coriolis/hurricane/doc/hurricane/html/hurricane.tag:../hurricane/" href="../hurricane/group__DbUGroup.html#ga4fbfa3e8c89347af76c9628ea06c4146">DbU::Unit</a> pitch, <a class="elRef" doxygen="/dsk/l1/jpc/coriolis-2.x/src/coriolis/hurricane/doc/hurricane/html/hurricane.tag:../hurricane/" href="../hurricane/group__DbUGroup.html#ga4fbfa3e8c89347af76c9628ea06c4146">DbU::Unit</a> wireWidth, <a class="elRef" doxygen="/dsk/l1/jpc/coriolis-2.x/src/coriolis/hurricane/doc/hurricane/html/hurricane.tag:../hurricane/" href="../hurricane/group__DbUGroup.html#ga4fbfa3e8c89347af76c9628ea06c4146">DbU::Unit</a> viaWidth, <a class="elRef" doxygen="/dsk/l1/jpc/coriolis-2.x/src/coriolis/hurricane/doc/hurricane/html/hurricane.tag:../hurricane/" href="../hurricane/group__DbUGroup.html#ga4fbfa3e8c89347af76c9628ea06c4146">DbU::Unit</a> obsDw)</td></tr> <tr class="memitem:afb41e7be2a6d258a691aacbe7a78154f"><td class="memItemLeft" align="right" valign="top">static <a class="el" href="classCRL_1_1RoutingLayerGauge.html">RoutingLayerGauge</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="classCRL_1_1RoutingLayerGauge.html#afb41e7be2a6d258a691aacbe7a78154f">create</a> (const <a class="elRef" doxygen="/dsk/l1/jpc/coriolis-2.x/src/coriolis/hurricane/doc/hurricane/html/hurricane.tag:../hurricane/" href="../hurricane/classHurricane_1_1Layer.html">Layer</a> *layer, <a class="el" href="namespaceConstant.html#ac081a99f2b64361919ed5d9f37c0f9af">Constant::Direction</a> direction, <a class="el" href="namespaceConstant.html#ab2e46a17cc373a268c5c24fa0e2067e5">Constant::LayerGaugeType</a> type, unsigned int depth, double density, <a class="elRef" doxygen="/dsk/l1/jpc/coriolis-2.x/src/coriolis/hurricane/doc/hurricane/html/hurricane.tag:../hurricane/" href="../hurricane/group__DbUGroup.html#ga4fbfa3e8c89347af76c9628ea06c4146">DbU::Unit</a> offset, <a class="elRef" doxygen="/dsk/l1/jpc/coriolis-2.x/src/coriolis/hurricane/doc/hurricane/html/hurricane.tag:../hurricane/" href="../hurricane/group__DbUGroup.html#ga4fbfa3e8c89347af76c9628ea06c4146">DbU::Unit</a> pitch, <a class="elRef" doxygen="/dsk/l1/jpc/coriolis-2.x/src/coriolis/hurricane/doc/hurricane/html/hurricane.tag:../hurricane/" href="../hurricane/group__DbUGroup.html#ga4fbfa3e8c89347af76c9628ea06c4146">DbU::Unit</a> wireWidth, <a class="elRef" doxygen="/dsk/l1/jpc/coriolis-2.x/src/coriolis/hurricane/doc/hurricane/html/hurricane.tag:../hurricane/" href="../hurricane/group__DbUGroup.html#ga4fbfa3e8c89347af76c9628ea06c4146">DbU::Unit</a> pwireWidth, <a class="elRef" doxygen="/dsk/l1/jpc/coriolis-2.x/src/coriolis/hurricane/doc/hurricane/html/hurricane.tag:../hurricane/" href="../hurricane/group__DbUGroup.html#ga4fbfa3e8c89347af76c9628ea06c4146">DbU::Unit</a> viaWidth, <a class="elRef" doxygen="/dsk/l1/jpc/coriolis-2.x/src/coriolis/hurricane/doc/hurricane/html/hurricane.tag:../hurricane/" href="../hurricane/group__DbUGroup.html#ga4fbfa3e8c89347af76c9628ea06c4146">DbU::Unit</a> obsDw)</td></tr>
<tr class="separator:afe17db013bf6a933c2af4e847bfd7918"><td class="memSeparator" colspan="2">&#160;</td></tr> <tr class="separator:afb41e7be2a6d258a691aacbe7a78154f"><td class="memSeparator" colspan="2">&#160;</td></tr>
</table> </table>
<a name="details" id="details"></a><h2 class="groupheader">Detailed Description</h2> <a name="details" id="details"></a><h2 class="groupheader">Detailed Description</h2>
<div class="textblock"><p>Gauge of a Layer for the detailed routing. </p> <div class="textblock"><p>Gauge of a Layer for the detailed routing. </p>
</div><h2 class="groupheader">Member Function Documentation</h2> </div><h2 class="groupheader">Member Function Documentation</h2>
<a id="afe17db013bf6a933c2af4e847bfd7918"></a> <a id="afb41e7be2a6d258a691aacbe7a78154f"></a>
<h2 class="memtitle"><span class="permalink"><a href="#afe17db013bf6a933c2af4e847bfd7918">&#9670;&nbsp;</a></span>create()</h2> <h2 class="memtitle"><span class="permalink"><a href="#afb41e7be2a6d258a691aacbe7a78154f">&#9670;&nbsp;</a></span>create()</h2>
<div class="memitem"> <div class="memitem">
<div class="memproto"> <div class="memproto">
@ -154,6 +154,12 @@ Static Public Member Functions</h2></td></tr>
<td class="paramtype"><a class="elRef" doxygen="/dsk/l1/jpc/coriolis-2.x/src/coriolis/hurricane/doc/hurricane/html/hurricane.tag:../hurricane/" href="../hurricane/group__DbUGroup.html#ga4fbfa3e8c89347af76c9628ea06c4146">DbU::Unit</a>&#160;</td> <td class="paramtype"><a class="elRef" doxygen="/dsk/l1/jpc/coriolis-2.x/src/coriolis/hurricane/doc/hurricane/html/hurricane.tag:../hurricane/" href="../hurricane/group__DbUGroup.html#ga4fbfa3e8c89347af76c9628ea06c4146">DbU::Unit</a>&#160;</td>
<td class="paramname"><em>wireWidth</em>, </td> <td class="paramname"><em>wireWidth</em>, </td>
</tr> </tr>
<tr>
<td class="paramkey"></td>
<td></td>
<td class="paramtype"><a class="elRef" doxygen="/dsk/l1/jpc/coriolis-2.x/src/coriolis/hurricane/doc/hurricane/html/hurricane.tag:../hurricane/" href="../hurricane/group__DbUGroup.html#ga4fbfa3e8c89347af76c9628ea06c4146">DbU::Unit</a>&#160;</td>
<td class="paramname"><em>pwireWidth</em>, </td>
</tr>
<tr> <tr>
<td class="paramkey"></td> <td class="paramkey"></td>
<td></td> <td></td>
@ -682,7 +688,7 @@ Static Public Member Functions</h2></td></tr>
<hr> <hr>
<table class="footer1"> <table class="footer1">
<tr> <tr>
<td class="LFooter"><small>Generated by doxygen 1.8.14 on Thu Nov 12 2020</small></td> <td class="LFooter"><small>Generated by doxygen 1.8.14 on Fri Oct 1 2021</small></td>
<td class="RFooter"><a href='#pagetop'><small>Return to top of page</small></a></td> <td class="RFooter"><a href='#pagetop'><small>Return to top of page</small></a></td>
</tr> </tr>
</table> </table>

2
crlcore/doc/crlcore/html/classCRL_1_1SearchPath-members.html
View File

@ -64,7 +64,7 @@ $(function() {
<hr> <hr>
<table class="footer1"> <table class="footer1">
<tr> <tr>
<td class="LFooter"><small>Generated by doxygen 1.8.14 on Thu Nov 12 2020</small></td> <td class="LFooter"><small>Generated by doxygen 1.8.14 on Fri Oct 1 2021</small></td>
<td class="RFooter"><a href='#pagetop'><small>Return to top of page</small></a></td> <td class="RFooter"><a href='#pagetop'><small>Return to top of page</small></a></td>
</tr> </tr>
</table> </table>

2
crlcore/doc/crlcore/html/classCRL_1_1SearchPath.html
View File

@ -452,7 +452,7 @@ Static Public Member Functions</h2></td></tr>
<hr> <hr>
<table class="footer1"> <table class="footer1">
<tr> <tr>
<td class="LFooter"><small>Generated by doxygen 1.8.14 on Thu Nov 12 2020</small></td> <td class="LFooter"><small>Generated by doxygen 1.8.14 on Fri Oct 1 2021</small></td>
<td class="RFooter"><a href='#pagetop'><small>Return to top of page</small></a></td> <td class="RFooter"><a href='#pagetop'><small>Return to top of page</small></a></td>
</tr> </tr>
</table> </table>

2
crlcore/doc/crlcore/html/classCRL_1_1SearchPath_1_1Element-members.html
View File

@ -56,7 +56,7 @@ $(function() {
<hr> <hr>
<table class="footer1"> <table class="footer1">
<tr> <tr>
<td class="LFooter"><small>Generated by doxygen 1.8.14 on Thu Nov 12 2020</small></td> <td class="LFooter"><small>Generated by doxygen 1.8.14 on Fri Oct 1 2021</small></td>
<td class="RFooter"><a href='#pagetop'><small>Return to top of page</small></a></td> <td class="RFooter"><a href='#pagetop'><small>Return to top of page</small></a></td>
</tr> </tr>
</table> </table>

2
crlcore/doc/crlcore/html/classCRL_1_1SearchPath_1_1Element.html
View File

@ -190,7 +190,7 @@ Public Member Functions</h2></td></tr>
<hr> <hr>
<table class="footer1"> <table class="footer1">
<tr> <tr>
<td class="LFooter"><small>Generated by doxygen 1.8.14 on Thu Nov 12 2020</small></td> <td class="LFooter"><small>Generated by doxygen 1.8.14 on Fri Oct 1 2021</small></td>
<td class="RFooter"><a href='#pagetop'><small>Return to top of page</small></a></td> <td class="RFooter"><a href='#pagetop'><small>Return to top of page</small></a></td>
</tr> </tr>
</table> </table>

2
crlcore/doc/crlcore/html/classCRL_1_1ToolEngine-members.html
View File

@ -64,7 +64,7 @@ $(function() {
<hr> <hr>
<table class="footer1"> <table class="footer1">
<tr> <tr>
<td class="LFooter"><small>Generated by doxygen 1.8.14 on Thu Nov 12 2020</small></td> <td class="LFooter"><small>Generated by doxygen 1.8.14 on Fri Oct 1 2021</small></td>
<td class="RFooter"><a href='#pagetop'><small>Return to top of page</small></a></td> <td class="RFooter"><a href='#pagetop'><small>Return to top of page</small></a></td>
</tr> </tr>
</table> </table>

2
crlcore/doc/crlcore/html/classCRL_1_1ToolEngine.html
View File

@ -198,7 +198,7 @@ Static Public Member Functions</h2></td></tr>
<hr> <hr>
<table class="footer1"> <table class="footer1">
<tr> <tr>
<td class="LFooter"><small>Generated by doxygen 1.8.14 on Thu Nov 12 2020</small></td> <td class="LFooter"><small>Generated by doxygen 1.8.14 on Fri Oct 1 2021</small></td>
<td class="RFooter"><a href='#pagetop'><small>Return to top of page</small></a></td> <td class="RFooter"><a href='#pagetop'><small>Return to top of page</small></a></td>
</tr> </tr>
</table> </table>

2
crlcore/doc/crlcore/html/classes.html
View File

@ -73,7 +73,7 @@ $(function() {
<hr> <hr>
<table class="footer1"> <table class="footer1">
<tr> <tr>
<td class="LFooter"><small>Generated by doxygen 1.8.14 on Thu Nov 12 2020</small></td> <td class="LFooter"><small>Generated by doxygen 1.8.14 on Fri Oct 1 2021</small></td>
<td class="RFooter"><a href='#pagetop'><small>Return to top of page</small></a></td> <td class="RFooter"><a href='#pagetop'><small>Return to top of page</small></a></td>
</tr> </tr>
</table> </table>

4
crlcore/doc/crlcore/html/crlcore.tag
View File

@ -1218,8 +1218,8 @@
<type>static RoutingLayerGauge *</type> <type>static RoutingLayerGauge *</type>
<name>create</name> <name>create</name>
<anchorfile>classCRL_1_1RoutingLayerGauge.html</anchorfile> <anchorfile>classCRL_1_1RoutingLayerGauge.html</anchorfile>
<anchor>afe17db013bf6a933c2af4e847bfd7918</anchor> <anchor>afb41e7be2a6d258a691aacbe7a78154f</anchor>
<arglist>(const Layer *layer, Constant::Direction direction, Constant::LayerGaugeType type, unsigned int depth, double density, DbU::Unit offset, DbU::Unit pitch, DbU::Unit wireWidth, DbU::Unit viaWidth, DbU::Unit obsDw)</arglist> <arglist>(const Layer *layer, Constant::Direction direction, Constant::LayerGaugeType type, unsigned int depth, double density, DbU::Unit offset, DbU::Unit pitch, DbU::Unit wireWidth, DbU::Unit pwireWidth, DbU::Unit viaWidth, DbU::Unit obsDw)</arglist>
</member> </member>
</compound> </compound>
<compound kind="class"> <compound kind="class">

2
crlcore/doc/crlcore/html/dir_1d3beb215ce2defdb52d6dee9d41bc7a.html
View File

@ -53,7 +53,7 @@ Directories</h2></td></tr>
<hr> <hr>
<table class="footer1"> <table class="footer1">
<tr> <tr>
<td class="LFooter"><small>Generated by doxygen 1.8.14 on Thu Nov 12 2020</small></td> <td class="LFooter"><small>Generated by doxygen 1.8.14 on Fri Oct 1 2021</small></td>
<td class="RFooter"><a href='#pagetop'><small>Return to top of page</small></a></td> <td class="RFooter"><a href='#pagetop'><small>Return to top of page</small></a></td>
</tr> </tr>
</table> </table>

2
crlcore/doc/crlcore/html/dir_68267d1309a1af8e8297ef4c3efbcdba.html
View File

@ -49,7 +49,7 @@ $(function() {
<hr> <hr>
<table class="footer1"> <table class="footer1">
<tr> <tr>
<td class="LFooter"><small>Generated by doxygen 1.8.14 on Thu Nov 12 2020</small></td> <td class="LFooter"><small>Generated by doxygen 1.8.14 on Fri Oct 1 2021</small></td>
<td class="RFooter"><a href='#pagetop'><small>Return to top of page</small></a></td> <td class="RFooter"><a href='#pagetop'><small>Return to top of page</small></a></td>
</tr> </tr>
</table> </table>

2
crlcore/doc/crlcore/html/dir_d23e13494685c82fafa9ef5abb5746af.html
View File

@ -49,7 +49,7 @@ $(function() {
<hr> <hr>
<table class="footer1"> <table class="footer1">
<tr> <tr>
<td class="LFooter"><small>Generated by doxygen 1.8.14 on Thu Nov 12 2020</small></td> <td class="LFooter"><small>Generated by doxygen 1.8.14 on Fri Oct 1 2021</small></td>
<td class="RFooter"><a href='#pagetop'><small>Return to top of page</small></a></td> <td class="RFooter"><a href='#pagetop'><small>Return to top of page</small></a></td>
</tr> </tr>
</table> </table>

2
crlcore/doc/crlcore/html/files.html
View File

@ -61,7 +61,7 @@ $(function() {
<hr> <hr>
<table class="footer1"> <table class="footer1">
<tr> <tr>
<td class="LFooter"><small>Generated by doxygen 1.8.14 on Thu Nov 12 2020</small></td> <td class="LFooter"><small>Generated by doxygen 1.8.14 on Fri Oct 1 2021</small></td>
<td class="RFooter"><a href='#pagetop'><small>Return to top of page</small></a></td> <td class="RFooter"><a href='#pagetop'><small>Return to top of page</small></a></td>
</tr> </tr>
</table> </table>

2
crlcore/doc/crlcore/html/functions.html
View File

@ -72,7 +72,7 @@ $(function() {
<hr> <hr>
<table class="footer1"> <table class="footer1">
<tr> <tr>
<td class="LFooter"><small>Generated by doxygen 1.8.14 on Thu Nov 12 2020</small></td> <td class="LFooter"><small>Generated by doxygen 1.8.14 on Fri Oct 1 2021</small></td>
<td class="RFooter"><a href='#pagetop'><small>Return to top of page</small></a></td> <td class="RFooter"><a href='#pagetop'><small>Return to top of page</small></a></td>
</tr> </tr>
</table> </table>

2
crlcore/doc/crlcore/html/functions_0x7e.html
View File

@ -54,7 +54,7 @@ $(function() {
<hr> <hr>
<table class="footer1"> <table class="footer1">
<tr> <tr>
<td class="LFooter"><small>Generated by doxygen 1.8.14 on Thu Nov 12 2020</small></td> <td class="LFooter"><small>Generated by doxygen 1.8.14 on Fri Oct 1 2021</small></td>
<td class="RFooter"><a href='#pagetop'><small>Return to top of page</small></a></td> <td class="RFooter"><a href='#pagetop'><small>Return to top of page</small></a></td>
</tr> </tr>
</table> </table>

2
crlcore/doc/crlcore/html/functions_b.html
View File

@ -48,7 +48,7 @@ $(function() {
<hr> <hr>
<table class="footer1"> <table class="footer1">
<tr> <tr>
<td class="LFooter"><small>Generated by doxygen 1.8.14 on Thu Nov 12 2020</small></td> <td class="LFooter"><small>Generated by doxygen 1.8.14 on Fri Oct 1 2021</small></td>
<td class="RFooter"><a href='#pagetop'><small>Return to top of page</small></a></td> <td class="RFooter"><a href='#pagetop'><small>Return to top of page</small></a></td>
</tr> </tr>
</table> </table>

4
crlcore/doc/crlcore/html/functions_c.html
View File

@ -51,7 +51,7 @@ $(function() {
<li>create() <li>create()
: <a class="el" href="classCRL_1_1AllianceFramework.html#a8cff32ced8cc163cadca885d8ed8a5fc">CRL::AllianceFramework</a> : <a class="el" href="classCRL_1_1AllianceFramework.html#a8cff32ced8cc163cadca885d8ed8a5fc">CRL::AllianceFramework</a>
, <a class="el" href="classCRL_1_1RoutingGauge.html#a7258273728f5db47e422d5914c1c36bd">CRL::RoutingGauge</a> , <a class="el" href="classCRL_1_1RoutingGauge.html#a7258273728f5db47e422d5914c1c36bd">CRL::RoutingGauge</a>
, <a class="el" href="classCRL_1_1RoutingLayerGauge.html#afe17db013bf6a933c2af4e847bfd7918">CRL::RoutingLayerGauge</a> , <a class="el" href="classCRL_1_1RoutingLayerGauge.html#afb41e7be2a6d258a691aacbe7a78154f">CRL::RoutingLayerGauge</a>
</li> </li>
<li>createCell() <li>createCell()
: <a class="el" href="classCRL_1_1AllianceFramework.html#ac4381ad0c3799d584ef3ea160846e2bb">CRL::AllianceFramework</a> : <a class="el" href="classCRL_1_1AllianceFramework.html#ac4381ad0c3799d584ef3ea160846e2bb">CRL::AllianceFramework</a>
@ -68,7 +68,7 @@ $(function() {
<hr> <hr>
<table class="footer1"> <table class="footer1">
<tr> <tr>
<td class="LFooter"><small>Generated by doxygen 1.8.14 on Thu Nov 12 2020</small></td> <td class="LFooter"><small>Generated by doxygen 1.8.14 on Fri Oct 1 2021</small></td>
<td class="RFooter"><a href='#pagetop'><small>Return to top of page</small></a></td> <td class="RFooter"><a href='#pagetop'><small>Return to top of page</small></a></td>
</tr> </tr>
</table> </table>

2
crlcore/doc/crlcore/html/functions_d.html
View File

@ -61,7 +61,7 @@ $(function() {
<hr> <hr>
<table class="footer1"> <table class="footer1">
<tr> <tr>
<td class="LFooter"><small>Generated by doxygen 1.8.14 on Thu Nov 12 2020</small></td> <td class="LFooter"><small>Generated by doxygen 1.8.14 on Fri Oct 1 2021</small></td>
<td class="RFooter"><a href='#pagetop'><small>Return to top of page</small></a></td> <td class="RFooter"><a href='#pagetop'><small>Return to top of page</small></a></td>
</tr> </tr>
</table> </table>

2
crlcore/doc/crlcore/html/functions_e.html
View File

@ -57,7 +57,7 @@ $(function() {
<hr> <hr>
<table class="footer1"> <table class="footer1">
<tr> <tr>
<td class="LFooter"><small>Generated by doxygen 1.8.14 on Thu Nov 12 2020</small></td> <td class="LFooter"><small>Generated by doxygen 1.8.14 on Fri Oct 1 2021</small></td>
<td class="RFooter"><a href='#pagetop'><small>Return to top of page</small></a></td> <td class="RFooter"><a href='#pagetop'><small>Return to top of page</small></a></td>
</tr> </tr>
</table> </table>

2
crlcore/doc/crlcore/html/functions_enum.html
View File

@ -55,7 +55,7 @@ $(function() {
<hr> <hr>
<table class="footer1"> <table class="footer1">
<tr> <tr>
<td class="LFooter"><small>Generated by doxygen 1.8.14 on Thu Nov 12 2020</small></td> <td class="LFooter"><small>Generated by doxygen 1.8.14 on Fri Oct 1 2021</small></td>
<td class="RFooter"><a href='#pagetop'><small>Return to top of page</small></a></td> <td class="RFooter"><a href='#pagetop'><small>Return to top of page</small></a></td>
</tr> </tr>
</table> </table>

2
crlcore/doc/crlcore/html/functions_eval.html
View File

@ -88,7 +88,7 @@ $(function() {
<hr> <hr>
<table class="footer1"> <table class="footer1">
<tr> <tr>
<td class="LFooter"><small>Generated by doxygen 1.8.14 on Thu Nov 12 2020</small></td> <td class="LFooter"><small>Generated by doxygen 1.8.14 on Fri Oct 1 2021</small></td>
<td class="RFooter"><a href='#pagetop'><small>Return to top of page</small></a></td> <td class="RFooter"><a href='#pagetop'><small>Return to top of page</small></a></td>
</tr> </tr>
</table> </table>

2
crlcore/doc/crlcore/html/functions_f.html
View File

@ -51,7 +51,7 @@ $(function() {
<hr> <hr>
<table class="footer1"> <table class="footer1">
<tr> <tr>
<td class="LFooter"><small>Generated by doxygen 1.8.14 on Thu Nov 12 2020</small></td> <td class="LFooter"><small>Generated by doxygen 1.8.14 on Fri Oct 1 2021</small></td>
<td class="RFooter"><a href='#pagetop'><small>Return to top of page</small></a></td> <td class="RFooter"><a href='#pagetop'><small>Return to top of page</small></a></td>
</tr> </tr>
</table> </table>

4
crlcore/doc/crlcore/html/functions_func.html
View File

@ -83,7 +83,7 @@ $(function() {
<li>create() <li>create()
: <a class="el" href="classCRL_1_1AllianceFramework.html#a8cff32ced8cc163cadca885d8ed8a5fc">CRL::AllianceFramework</a> : <a class="el" href="classCRL_1_1AllianceFramework.html#a8cff32ced8cc163cadca885d8ed8a5fc">CRL::AllianceFramework</a>
, <a class="el" href="classCRL_1_1RoutingGauge.html#a7258273728f5db47e422d5914c1c36bd">CRL::RoutingGauge</a> , <a class="el" href="classCRL_1_1RoutingGauge.html#a7258273728f5db47e422d5914c1c36bd">CRL::RoutingGauge</a>
, <a class="el" href="classCRL_1_1RoutingLayerGauge.html#afe17db013bf6a933c2af4e847bfd7918">CRL::RoutingLayerGauge</a> , <a class="el" href="classCRL_1_1RoutingLayerGauge.html#afb41e7be2a6d258a691aacbe7a78154f">CRL::RoutingLayerGauge</a>
</li> </li>
<li>createCell() <li>createCell()
: <a class="el" href="classCRL_1_1AllianceFramework.html#ac4381ad0c3799d584ef3ea160846e2bb">CRL::AllianceFramework</a> : <a class="el" href="classCRL_1_1AllianceFramework.html#ac4381ad0c3799d584ef3ea160846e2bb">CRL::AllianceFramework</a>
@ -579,7 +579,7 @@ $(function() {
<hr> <hr>
<table class="footer1"> <table class="footer1">
<tr> <tr>
<td class="LFooter"><small>Generated by doxygen 1.8.14 on Thu Nov 12 2020</small></td> <td class="LFooter"><small>Generated by doxygen 1.8.14 on Fri Oct 1 2021</small></td>
<td class="RFooter"><a href='#pagetop'><small>Return to top of page</small></a></td> <td class="RFooter"><a href='#pagetop'><small>Return to top of page</small></a></td>
</tr> </tr>
</table> </table>

2
crlcore/doc/crlcore/html/functions_g.html
View File

@ -258,7 +258,7 @@ $(function() {
<hr> <hr>
<table class="footer1"> <table class="footer1">
<tr> <tr>
<td class="LFooter"><small>Generated by doxygen 1.8.14 on Thu Nov 12 2020</small></td> <td class="LFooter"><small>Generated by doxygen 1.8.14 on Fri Oct 1 2021</small></td>
<td class="RFooter"><a href='#pagetop'><small>Return to top of page</small></a></td> <td class="RFooter"><a href='#pagetop'><small>Return to top of page</small></a></td>
</tr> </tr>
</table> </table>

2
crlcore/doc/crlcore/html/functions_h.html
View File

@ -54,7 +54,7 @@ $(function() {
<hr> <hr>
<table class="footer1"> <table class="footer1">
<tr> <tr>
<td class="LFooter"><small>Generated by doxygen 1.8.14 on Thu Nov 12 2020</small></td> <td class="LFooter"><small>Generated by doxygen 1.8.14 on Fri Oct 1 2021</small></td>
<td class="RFooter"><a href='#pagetop'><small>Return to top of page</small></a></td> <td class="RFooter"><a href='#pagetop'><small>Return to top of page</small></a></td>
</tr> </tr>
</table> </table>

2
crlcore/doc/crlcore/html/functions_i.html
View File

@ -96,7 +96,7 @@ $(function() {
<hr> <hr>
<table class="footer1"> <table class="footer1">
<tr> <tr>
<td class="LFooter"><small>Generated by doxygen 1.8.14 on Thu Nov 12 2020</small></td> <td class="LFooter"><small>Generated by doxygen 1.8.14 on Fri Oct 1 2021</small></td>
<td class="RFooter"><a href='#pagetop'><small>Return to top of page</small></a></td> <td class="RFooter"><a href='#pagetop'><small>Return to top of page</small></a></td>
</tr> </tr>
</table> </table>

2
crlcore/doc/crlcore/html/functions_l.html
View File

@ -63,7 +63,7 @@ $(function() {
<hr> <hr>
<table class="footer1"> <table class="footer1">
<tr> <tr>
<td class="LFooter"><small>Generated by doxygen 1.8.14 on Thu Nov 12 2020</small></td> <td class="LFooter"><small>Generated by doxygen 1.8.14 on Fri Oct 1 2021</small></td>
<td class="RFooter"><a href='#pagetop'><small>Return to top of page</small></a></td> <td class="RFooter"><a href='#pagetop'><small>Return to top of page</small></a></td>
</tr> </tr>
</table> </table>

Some files were not shown because too many files have changed in this diff Show More