From f6ab7b87f0336c731112e57c1416c3dfaab7ec38 Mon Sep 17 00:00:00 2001 From: Jean-Paul Chaput Date: Sat, 15 Mar 2014 10:47:37 +0100 Subject: [PATCH] Compliance with g++ 4.8.1, support for devtoolset-2 Details: * New: in : add support for devtoolset-2 in ccb. Run the cmake commands through 'scl', set shell environment variables BOOST_INCLUDEDIR & BOOST_LIBRARYDIR and disable the default system path search. * Change: In various flex scanners add the %nounput to suppress compiler warnings. * Change: Little cleanup for g++ 4.8.1 as it's more strict. * Change: In various top CMakeLists.txt, suppress extraneous '/' after DESTDIR. --- bootstrap/build.conf | 6 +- bootstrap/builder/Builder.py | 28 ++++++-- bootstrap/ccb.py | 68 ++++++++++--------- bootstrap/cmake_modules/FindBootstrap.cmake | 7 +- crlcore/CMakeLists.txt | 2 +- crlcore/src/ccore/Memory.cpp | 2 - .../ccore/acmsigda/AcmSigdaParserScanner.ll | 2 + crlcore/src/ccore/alliance/ap/ApParser.cpp | 22 +++--- .../ccore/alliance/vst/VstParserScanner.ll | 4 +- crlcore/src/ccore/ioc/IocParserScanner.ll | 3 + crlcore/src/pyCRL/PyToolEngine.cpp | 4 +- cumulus/CMakeLists.txt | 2 +- documentation/CMakeLists.txt | 2 +- documentation/UsersGuide/CMakeLists.txt | 2 +- equinox/CMakeLists.txt | 2 +- hurricane/CMakeLists.txt | 2 +- hurricane/src/hurricane/hurricane/Timer.h | 1 + .../src/isobar/PyNetExternalComponents.cpp | 2 - hurricane/src/viewer/ExceptionWidget.cpp | 3 +- hurricane/src/viewer/PyDrawingStyle.cpp | 10 +-- hurricane/src/viewer/PyGraphics.cpp | 2 +- hurricane/src/viewer/Script.cpp | 2 +- hurricane/src/viewer/SelectCommand.cpp | 3 +- katabatic/CMakeLists.txt | 2 +- katabatic/src/AutoSegment.cpp | 4 +- katabatic/src/GCell.cpp | 18 ++--- katabatic/src/GCellGrid.cpp | 2 +- katabatic/src/LoadGrByNet.cpp | 17 +++-- katabatic/src/katabatic/AutoSegments.h | 2 +- katabatic/src/katabatic/GridCollections.h | 6 +- kite/CMakeLists.txt | 2 +- kite/src/KiteEngine.cpp | 2 +- kite/src/Manipulator.cpp | 8 +-- knik/CMakeLists.txt | 2 +- knik/src/Graph.cpp | 11 +-- knik/src/GraphicKnikEngine.cpp | 6 +- mauka/CMakeLists.txt | 2 +- metis/CMakeLists.txt | 2 +- nimbus/CMakeLists.txt | 2 +- nimbus/src/HFence.cpp | 2 + nimbus/src/VFence.cpp | 2 + solstice/CMakeLists.txt | 2 +- stratus1/CMakeLists.txt | 2 +- unicorn/CMakeLists.txt | 2 +- unicorn/src/CMakeLists.txt | 1 + vlsisapd/CMakeLists.txt | 3 +- vlsisapd/src/bookshelf/src/Circuit.cpp | 2 +- .../src/configuration/src/PyConfiguration.cpp | 20 +++--- .../src/liberty/src/LibertyParserScanner.ll | 3 +- 49 files changed, 175 insertions(+), 133 deletions(-) diff --git a/bootstrap/build.conf b/bootstrap/build.conf index 576b817e..8291a894 100644 --- a/bootstrap/build.conf +++ b/bootstrap/build.conf @@ -5,7 +5,11 @@ projectdir = 'coriolis-2.x' -projects = [ { 'name' : "coriolis" +projects = [ { 'name' : "axep" + , 'tools' : [ "AXE_Placer" ] + , 'repository': 'https://github.com/alnurn/AXE_Placer' } + + , { 'name' : "coriolis" , 'tools' : [ "bootstrap" , "vlsisapd" , "hurricane" diff --git a/bootstrap/builder/Builder.py b/bootstrap/builder/Builder.py index b51c0547..780c6e58 100644 --- a/bootstrap/builder/Builder.py +++ b/bootstrap/builder/Builder.py @@ -34,6 +34,7 @@ class Builder: self._rmBuild = False self._doBuild = True self._noCache = False + self._devtoolset2 = False self._enableShared = "ON" self._enableDoc = "OFF" self._checkDatabase = "OFF" @@ -55,6 +56,7 @@ class Builder: elif attribute == "rmBuild": self._rmBuild = value elif attribute == "doBuild": self._doBuild = value elif attribute == "noCache": self._noCache = value + elif attribute == "devtoolset2": self._devtoolset2 = value elif attribute == "enableDoc": self._enableDoc = value elif attribute == "enableShared": self._enableShared = value elif attribute == "checkDatabase": self._checkDatabase = value @@ -127,6 +129,13 @@ class Builder: def _execute ( self, command, error ): + if self._devtoolset2 == True: + commandAsString = '' + for i in range(len(command)): + if i: commandAsString += ' ' + commandAsString += command[i] + command = [ 'scl', 'enable', 'devtoolset-2', commandAsString ] + sys.stdout.flush () sys.stderr.flush () child = subprocess.Popen ( command, env=self._environment, stdout=None ) @@ -151,6 +160,10 @@ class Builder: print ErrorMessage( 0, "Missing tool source directory: \"%s\" (skipped)."%toolSourceDir ) return + boostNoSystemPaths = 'FALSE' + if self._devtoolset2 == True: + boostNoSystemPaths = 'TRUE' + if self._rmBuild: print "Removing tool build directory: \"%s\"." % toolBuildDir command = [ "/bin/rm", "-rf", toolBuildDir ] @@ -161,9 +174,10 @@ class Builder: os.makedirs ( toolBuildDir ) os.chdir ( toolBuildDir ) - command = ["cmake", "-D", "CMAKE_BUILD_TYPE:STRING=%s" % self.buildMode - , "-D", "BUILD_SHARED_LIBS:STRING=%s" % self.enableShared - #, "-D", "CMAKE_MODULE_PATH:STRING=%s" % cmakeModules + command = ["cmake", "-D", "Boost_NO_SYSTEM_PATHS:STRING=%s" % boostNoSystemPaths + , "-D", "CMAKE_BUILD_TYPE:STRING=%s" % self.buildMode + , "-D", "BUILD_SHARED_LIBS:STRING=%s" % self.enableShared + #, "-D", "CMAKE_MODULE_PATH:STRING=%s" % cmakeModules , toolSourceDir ] self._execute ( command, "First CMake failed" ) @@ -172,7 +186,8 @@ class Builder: cmakeCache = os.path.join(toolBuildDir,"CMakeCache.txt") if os.path.isfile ( cmakeCache ): os.unlink ( cmakeCache ) - command = ["cmake", "-D", "CMAKE_BUILD_TYPE:STRING=%s" % self.buildMode + command = ["cmake", "-D", "Boost_NO_SYSTEM_PATHS:STRING=%s" % boostNoSystemPaths + , "-D", "CMAKE_BUILD_TYPE:STRING=%s" % self.buildMode , "-D", "BUILD_SHARED_LIBS:STRING=%s" % self.enableShared , "-D", "BUILD_DOC:STRING=%s" % self._enableDoc , "-D", "CHECK_DATABASE:STRING=%s" % self._checkDatabase @@ -183,6 +198,7 @@ class Builder: if self.libSuffix: command += [ "-D", "LIB_SUFFIX:STRING=%s" % self.libSuffix ] command += [ toolSourceDir ] + self._execute ( command, "Second CMake failed" ) if self._doBuild: @@ -321,6 +337,10 @@ class Builder: def _commandTemplate ( self, tools, projects, command ): + if self._devtoolset2: + self._environment[ 'BOOST_INCLUDEDIR' ] = '/opt/rh/devtoolset-2/root/usr/include' + self._environment[ 'BOOST_LIBRARYDIR' ] = '/opt/rh/devtoolset-2/root/usr/lib' + # Set or guess the various projects TOP environment variables. for project in self.projects: topVariable = "%s_TOP" % project.getName().upper() diff --git a/bootstrap/ccb.py b/bootstrap/ccb.py index 17bece46..6a44b10f 100755 --- a/bootstrap/ccb.py +++ b/bootstrap/ccb.py @@ -155,39 +155,40 @@ def autoLocate (): autoLocate() parser = optparse.OptionParser () -parser.add_option ( "-g", "--gui" , action="store_true" , dest="gui" , help="Lauch the graphical interface." ) -# Build relateds. -parser.add_option ( "-c", "--conf", type="string", dest="conf" , help="Fichier de configuration." ) -parser.add_option ( "--show-conf" , action="store_true" , dest="showConf" , help="Display the Project/Tools configuration, then exit." ) -parser.add_option ( "-q", "--quiet" , action="store_true" , dest="quiet" , help="Do not print all the informative messages." ) -parser.add_option ( "-r", "--release" , action="store_true" , dest="release" , help="Build a aka optimized version." ) -parser.add_option ( "-d", "--debug" , action="store_true" , dest="debug" , help="Build a aka (-g) version." ) -parser.add_option ( "-s", "--static" , action="store_true" , dest="static" , help="Try to link statically, as much as possible." ) -parser.add_option ( "--doc" , action="store_true" , dest="doc" , help="Enable the documentation building (uses with -j1)." ) -parser.add_option ( "-v", "--verbose" , action="store_true" , dest="verboseMakefile" , help="Tells CMake to print all compilation commands." ) -parser.add_option ( "--root" , action="store" , type="string", dest="rootDir" , help="The root directory (default: <~/coriolis-2.x/>)." ) -parser.add_option ( "--no-build" , action="store_true" , dest="noBuild" , help="Do *not* build anything (by default: build)." ) -parser.add_option ( "--no-cache" , action="store_true" , dest="noCache" , help="Remove previous CMake cache before building." ) -parser.add_option ( "--rm-build" , action="store_true" , dest="rmBuild" , help="Remove previous build directoty before building." ) -parser.add_option ( "--make" , action="store" , type="string", dest="makeArguments", help="Arguments to pass to make (ex: \"-j4 install\")." ) -parser.add_option ( "--project" , action="append" , type="string", dest="projects" , help="The name of a project to build (may appears any number of time)." ) -parser.add_option ( "-t", "--tool" , action="append" , type="string", dest="tools" , help="The name of a tool to build (may appears any number of time)." ) -# SVN repository relateds. -# Have to be ported to Git. -#parser.add_option ( "--svn-tag" , action="store" , type="string", dest="svnTag" , help="Explicitly select a SVN tag (for SVN related commands)." ) -#parser.add_option ( "--svn-method" , action="store" , type="string", dest="svnMethod" , help="Allows to sets the svn checkout method (svn+ssh://coriolis.soc.lip6.fr)." ) -#parser.add_option ( "--svn-status" , action="store_true" , dest="svnStatus" , help="Check status against the SVN repository." ) -#parser.add_option ( "--svn-diff" , action="store_true" , dest="svnDiff" , help="Perform a diff against the SVN repository." ) -#parser.add_option ( "--svn-update" , action="store_true" , dest="svnUpdate" , help="Update to the latest SVN version *or* the one given by svn-tag." ) -#parser.add_option ( "--svn-checkout" , action="store_true" , dest="svnCheckout", help="Checkout the latest SVN version *or* the one given by svn-tag." ) -# Miscellaneous. -parser.add_option ( "--user-tarball" , action="store_true" , dest="userTarball", help="Regenerate a tarball from checked out sources (in /tarball/." ) -parser.add_option ( "--tarball" , action="store_true" , dest="tarball" , help="Regenerate a tarball (in /tarball/." ) -parser.add_option ( "--rpm" , action="store_true" , dest="doRpm" , help="Regenerate RPM packages." ) -parser.add_option ( "--deb" , action="store_true" , dest="doDeb" , help="Regenerate Debian/Ubuntu packages." ) -# Katabatic/Kite specific options. -parser.add_option ( "-D", "--check-db" , action="store_true" , dest="checkDb" , help="Enable Katabatic/Kite data-base checking (*very* slow)." ) -parser.add_option ( "-u", "--check-deter", action="store_true" , dest="checkDeterminism", help="Enable Katabatic/Kite determinism checking (*very* slow)." ) +parser.add_option ( "-g", "--gui" , action="store_true" , dest="gui" , help="Lauch the graphical interface." ) +# Build relateds. +parser.add_option ( "-c", "--conf" , type="string", dest="conf" , help="Fichier de configuration." ) +parser.add_option ( "--show-conf" , action="store_true" , dest="showConf" , help="Display the Project/Tools configuration, then exit." ) +parser.add_option ( "-q", "--quiet" , action="store_true" , dest="quiet" , help="Do not print all the informative messages." ) +parser.add_option ( "-r", "--release" , action="store_true" , dest="release" , help="Build a aka optimized version." ) +parser.add_option ( "-d", "--debug" , action="store_true" , dest="debug" , help="Build a aka (-g) version." ) +parser.add_option ( "-s", "--static" , action="store_true" , dest="static" , help="Try to link statically, as much as possible." ) +parser.add_option ( "--doc" , action="store_true" , dest="doc" , help="Enable the documentation building (uses with -j1)." ) +parser.add_option ( "-v", "--verbose" , action="store_true" , dest="verboseMakefile" , help="Tells CMake to print all compilation commands." ) +parser.add_option ( "--root" , action="store" , type="string", dest="rootDir" , help="The root directory (default: <~/coriolis-2.x/>)." ) +parser.add_option ( "--no-build" , action="store_true" , dest="noBuild" , help="Do *not* build anything (by default: build)." ) +parser.add_option ( "--no-cache" , action="store_true" , dest="noCache" , help="Remove previous CMake cache before building." ) +parser.add_option ( "--rm-build" , action="store_true" , dest="rmBuild" , help="Remove previous build directoty before building." ) +parser.add_option ( "--devtoolset-2", action="store_true" , dest="devtoolset2" , help="Build against TUV Dev Toolset 2." ) +parser.add_option ( "--make" , action="store" , type="string", dest="makeArguments", help="Arguments to pass to make (ex: \"-j4 install\")." ) +parser.add_option ( "--project" , action="append" , type="string", dest="projects" , help="The name of a project to build (may appears any number of time)." ) +parser.add_option ( "-t", "--tool" , action="append" , type="string", dest="tools" , help="The name of a tool to build (may appears any number of time)." ) +# SVN repository relateds. +# Have to be ported to Git. +#parser.add_option ( "--svn-tag" , action="store" , type="string", dest="svnTag" , help="Explicitly select a SVN tag (for SVN related commands)." ) +#parser.add_option ( "--svn-method" , action="store" , type="string", dest="svnMethod" , help="Allows to sets the svn checkout method (svn+ssh://coriolis.soc.lip6.fr)." ) +#parser.add_option ( "--svn-status" , action="store_true" , dest="svnStatus" , help="Check status against the SVN repository." ) +#parser.add_option ( "--svn-diff" , action="store_true" , dest="svnDiff" , help="Perform a diff against the SVN repository." ) +#parser.add_option ( "--svn-update" , action="store_true" , dest="svnUpdate" , help="Update to the latest SVN version *or* the one given by svn-tag." ) +#parser.add_option ( "--svn-checkout" , action="store_true" , dest="svnCheckout" , help="Checkout the latest SVN version *or* the one given by svn-tag." ) +# Miscellaneous. +parser.add_option ( "--user-tarball" , action="store_true" , dest="userTarball" , help="Regenerate a tarball from checked out sources (in /tarball/." ) +parser.add_option ( "--tarball" , action="store_true" , dest="tarball" , help="Regenerate a tarball (in /tarball/." ) +parser.add_option ( "--rpm" , action="store_true" , dest="doRpm" , help="Regenerate RPM packages." ) +parser.add_option ( "--deb" , action="store_true" , dest="doDeb" , help="Regenerate Debian/Ubuntu packages." ) +# Katabatic/Kite specific options. +parser.add_option ( "-D", "--check-db" , action="store_true" , dest="checkDb" , help="Enable Katabatic/Kite data-base checking (*very* slow)." ) +parser.add_option ( "-u", "--check-deter" , action="store_true" , dest="checkDeterminism", help="Enable Katabatic/Kite determinism checking (*very* slow)." ) (options, args) = parser.parse_args () if options.gui: @@ -239,6 +240,7 @@ else: if options.noBuild: builder.doBuild = False if options.noCache: builder.noCache = True if options.rmBuild: builder.rmBuild = True + if options.devtoolset2: builder.devtoolset2 = True if options.makeArguments: builder.makeArguments = options.makeArguments #if options.svnMethod: builder.svnMethod = options.svnMethod #if options.svnTag: builder.svnTag = options.svnTag diff --git a/bootstrap/cmake_modules/FindBootstrap.cmake b/bootstrap/cmake_modules/FindBootstrap.cmake index 6417e2b9..37a9bca3 100644 --- a/bootstrap/cmake_modules/FindBootstrap.cmake +++ b/bootstrap/cmake_modules/FindBootstrap.cmake @@ -72,8 +72,8 @@ # # Adds -Wall to the C/C++ flags. # - set(CMAKE_C_FLAGS_DEBUG "-Wall -g" CACHE STRING "C Compiler Debug options." FORCE) - set(CMAKE_C_FLAGS_RELEASE "-Wall -O2 -DNDEBUG" CACHE STRING "C Compiler Release options." FORCE) + set(CMAKE_C_FLAGS_DEBUG "-std=c++0x -Wall -g" CACHE STRING "C Compiler Debug options." FORCE) + set(CMAKE_C_FLAGS_RELEASE "-std=c++0x -Wall -O2 -DNDEBUG" CACHE STRING "C Compiler Release options." FORCE) set(CMAKE_CXX_FLAGS_DEBUG "-std=c++0x -Wall -g" CACHE STRING "C++ Compiler Debug options." FORCE) set(CMAKE_CXX_FLAGS_RELEASE "-std=c++0x -Wall -O2 -DNDEBUG" CACHE STRING "C++ Compiler Release options." FORCE) @@ -193,7 +193,8 @@ find_package(Boost 1.33.1 COMPONENTS ${ARGV} REQUIRED) endif(NOT Boost_FOUND) endif(ARGC LESS 1) - message(STATUS "Found Boost libraries ${Boost_LIB_VERSION} in ${Boost_INCLUDE_DIR}") + message(STATUS "Found Boost includes ${Boost_LIB_VERSION} in ${Boost_INCLUDE_DIR}") + message(STATUS "Found Boost libraries ${Boost_LIB_VERSION} in ${Boost_LIBRARY_DIRS}") foreach(LIBRARY ${Boost_LIBRARIES}) message(STATUS " ${LIBRARY}") endforeach(LIBRARY) diff --git a/crlcore/CMakeLists.txt b/crlcore/CMakeLists.txt index ad6a4350..e06ff06f 100644 --- a/crlcore/CMakeLists.txt +++ b/crlcore/CMakeLists.txt @@ -6,7 +6,7 @@ OPTION(BUILD_DOC "Build the documentation (latex+doxygen)" OFF) - list(INSERT CMAKE_MODULE_PATH 0 "${DESTDIR}/$ENV{CORIOLIS_TOP}/share/cmake/Modules/") + list(INSERT CMAKE_MODULE_PATH 0 "${DESTDIR}$ENV{CORIOLIS_TOP}/share/cmake/Modules/") find_package(Bootstrap REQUIRED) setup_project_paths(CORIOLIS) list(INSERT CMAKE_MODULE_PATH 0 "${CRLCORE_SOURCE_DIR}/cmake_modules/") diff --git a/crlcore/src/ccore/Memory.cpp b/crlcore/src/ccore/Memory.cpp index d9f4905c..4be8dc20 100644 --- a/crlcore/src/ccore/Memory.cpp +++ b/crlcore/src/ccore/Memory.cpp @@ -133,7 +133,6 @@ double getMemoryUsageEstimate() return -1; #endif static int prevMem=0; - static int extra; static int fail=0; if (fail) return -1; @@ -187,7 +186,6 @@ double getMemoryUsageEstimate() // FIFO destruction for (int i=0; i!=numAllocs; ++i) free(ptr[i]); - extra=memused()-last; // handle extra correctly: // in some cases we need to add its prev value to current, // in some just store the new value diff --git a/crlcore/src/ccore/acmsigda/AcmSigdaParserScanner.ll b/crlcore/src/ccore/acmsigda/AcmSigdaParserScanner.ll index bc0a84c8..12d61c22 100644 --- a/crlcore/src/ccore/acmsigda/AcmSigdaParserScanner.ll +++ b/crlcore/src/ccore/acmsigda/AcmSigdaParserScanner.ll @@ -1,4 +1,6 @@ +%option nounput + %{ #include diff --git a/crlcore/src/ccore/alliance/ap/ApParser.cpp b/crlcore/src/ccore/alliance/ap/ApParser.cpp index 126d4cee..f48b2bab 100644 --- a/crlcore/src/ccore/alliance/ap/ApParser.cpp +++ b/crlcore/src/ccore/alliance/ap/ApParser.cpp @@ -448,7 +448,7 @@ namespace { static int index; string pinName; static Net* net; - static Pin* pin; + //static Pin* pin; static LayerInformation* layerInfo; static Pin::AccessDirection accessDirection; static Name orientation; @@ -496,16 +496,16 @@ namespace { if (layerInfo and net) { net->setExternal( true ); - pin = Pin::create( net - , pinName - , accessDirection - , Pin::PlacementStatus::PLACED - , layerInfo->getLayer() - , XCON - , YCON - , WIDTH - , WIDTH - ); + /*pin =*/ Pin::create( net + , pinName + , accessDirection + , Pin::PlacementStatus::PLACED + , layerInfo->getLayer() + , XCON + , YCON + , WIDTH + , WIDTH + ); } if (not net ) _printError( false, "Unknown net name %s." , fields[5] ); if (not layerInfo ) _printError( false, "Unknown layer name %s.", fields[6] ); diff --git a/crlcore/src/ccore/alliance/vst/VstParserScanner.ll b/crlcore/src/ccore/alliance/vst/VstParserScanner.ll index d64a56be..977dbdb7 100644 --- a/crlcore/src/ccore/alliance/vst/VstParserScanner.ll +++ b/crlcore/src/ccore/alliance/vst/VstParserScanner.ll @@ -1,5 +1,7 @@ -%{ +%option nounput + +%{ // This file is part of the Coriolis Project. // Copyright (C) Laboratoire LIP6 - Departement ASIM diff --git a/crlcore/src/ccore/ioc/IocParserScanner.ll b/crlcore/src/ccore/ioc/IocParserScanner.ll index 5cc37168..a978225a 100644 --- a/crlcore/src/ccore/ioc/IocParserScanner.ll +++ b/crlcore/src/ccore/ioc/IocParserScanner.ll @@ -1,3 +1,6 @@ + +%option nounput + %{ #include #include diff --git a/crlcore/src/pyCRL/PyToolEngine.cpp b/crlcore/src/pyCRL/PyToolEngine.cpp index d83d046b..bc0cf603 100644 --- a/crlcore/src/pyCRL/PyToolEngine.cpp +++ b/crlcore/src/pyCRL/PyToolEngine.cpp @@ -49,8 +49,8 @@ extern "C" { trace << "PyToolEngine_get()" << endl; HTRY - PyObject* pyCell = NULL; - char* name = NULL; + PyObject* pyCell = NULL; + char* name = NULL; static char* keywords[] = { "cell", "name", NULL }; diff --git a/cumulus/CMakeLists.txt b/cumulus/CMakeLists.txt index cf78a823..0046f7f1 100644 --- a/cumulus/CMakeLists.txt +++ b/cumulus/CMakeLists.txt @@ -3,7 +3,7 @@ project(CUMULUS) cmake_minimum_required(VERSION 2.4.0) - list(INSERT CMAKE_MODULE_PATH 0 "${DESTDIR}/$ENV{CORIOLIS_TOP}/share/cmake/Modules/") + list(INSERT CMAKE_MODULE_PATH 0 "${DESTDIR}$ENV{CORIOLIS_TOP}/share/cmake/Modules/") find_package(Bootstrap REQUIRED) setup_project_paths(CORIOLIS) diff --git a/documentation/CMakeLists.txt b/documentation/CMakeLists.txt index d9e11d06..f01e2d35 100644 --- a/documentation/CMakeLists.txt +++ b/documentation/CMakeLists.txt @@ -6,7 +6,7 @@ OPTION(BUILD_DOC "Build the documentation (html+latex)" OFF) - list(INSERT CMAKE_MODULE_PATH 0 "${DESTDIR}/$ENV{CORIOLIS_TOP}/share/cmake/Modules/") + list(INSERT CMAKE_MODULE_PATH 0 "${DESTDIR}$ENV{CORIOLIS_TOP}/share/cmake/Modules/") find_package(Bootstrap REQUIRED) setup_project_paths(CORIOLIS) list(INSERT CMAKE_MODULE_PATH 0 "${CRLCORE_SOURCE_DIR}/cmake_modules/") diff --git a/documentation/UsersGuide/CMakeLists.txt b/documentation/UsersGuide/CMakeLists.txt index bd3a201a..39cb85d5 100644 --- a/documentation/UsersGuide/CMakeLists.txt +++ b/documentation/UsersGuide/CMakeLists.txt @@ -9,7 +9,7 @@ add_custom_target ( doc_LaTeX ALL cd ${DOCUMENTATION_SOURCE_DIR}/UsersGuide && rst2latex --use-latex-toc --stylesheet=./socstyle.tex UsersGuide_LaTeX.rst UsersGuide-raw.tex - && sed 's, \& \\\\multicolumn{2}{l|}{, \& \\\\multicolumn{2}{p{0.6\\\\DUtablewidth}|}{,' UsersGuide-raw.tex > UsersGuide.tex ) + && sed 's, \\& \\\\multicolumn{2}{l|}{, \\& \\\\multicolumn{2}{p{0.6\\\\DUtablewidth}|}{,' UsersGuide-raw.tex > UsersGuide.tex ) install ( DIRECTORY images/ DESTINATION ${htmlInstallDir}/images diff --git a/equinox/CMakeLists.txt b/equinox/CMakeLists.txt index a92ee3bb..ffef8271 100644 --- a/equinox/CMakeLists.txt +++ b/equinox/CMakeLists.txt @@ -4,7 +4,7 @@ cmake_minimum_required(VERSION 2.4.0) - list(INSERT CMAKE_MODULE_PATH 0 "${DESTDIR}/$ENV{CORIOLIS_TOP}/share/cmake/Modules/") + list(INSERT CMAKE_MODULE_PATH 0 "${DESTDIR}$ENV{CORIOLIS_TOP}/share/cmake/Modules/") find_package(Bootstrap REQUIRED) setup_project_paths(CORIOLIS) diff --git a/hurricane/CMakeLists.txt b/hurricane/CMakeLists.txt index dcd6d4d2..ba3f03e5 100644 --- a/hurricane/CMakeLists.txt +++ b/hurricane/CMakeLists.txt @@ -6,7 +6,7 @@ cmake_minimum_required(VERSION 2.4.0) - list(INSERT CMAKE_MODULE_PATH 0 "${DESTDIR}/$ENV{CORIOLIS_TOP}/share/cmake/Modules") + list(INSERT CMAKE_MODULE_PATH 0 "${DESTDIR}$ENV{CORIOLIS_TOP}/share/cmake/Modules") find_package(Bootstrap REQUIRED) setup_project_paths(CORIOLIS) list(INSERT CMAKE_MODULE_PATH 0 "${HURRICANE_SOURCE_DIR}/cmake_modules/") diff --git a/hurricane/src/hurricane/hurricane/Timer.h b/hurricane/src/hurricane/hurricane/Timer.h index a1d0addc..e16eaab9 100644 --- a/hurricane/src/hurricane/hurricane/Timer.h +++ b/hurricane/src/hurricane/hurricane/Timer.h @@ -39,6 +39,7 @@ #include #include +#include #include #include diff --git a/hurricane/src/isobar/PyNetExternalComponents.cpp b/hurricane/src/isobar/PyNetExternalComponents.cpp index 692c23b7..ce160931 100644 --- a/hurricane/src/isobar/PyNetExternalComponents.cpp +++ b/hurricane/src/isobar/PyNetExternalComponents.cpp @@ -66,8 +66,6 @@ extern "C" { { trace << "PyNetExternalComponents_setExternal()" << endl; - bool isExternal = false; - HTRY PyObject* pyComponent; if (PyArg_ParseTuple( args, "O", &pyComponent )) { diff --git a/hurricane/src/viewer/ExceptionWidget.cpp b/hurricane/src/viewer/ExceptionWidget.cpp index 010b183d..c231e26e 100644 --- a/hurricane/src/viewer/ExceptionWidget.cpp +++ b/hurricane/src/viewer/ExceptionWidget.cpp @@ -2,7 +2,7 @@ // -*- C++ -*- // // This file is part of the Coriolis Software. -// Copyright (c) UPMC/LIP6 2008-2013, All Rights Reserved +// Copyright (c) UPMC/LIP6 2008-2014, All Rights Reserved // // +-----------------------------------------------------------------+ // | C O R I O L I S | @@ -15,6 +15,7 @@ // +-----------------------------------------------------------------+ +#include #include #include #include diff --git a/hurricane/src/viewer/PyDrawingStyle.cpp b/hurricane/src/viewer/PyDrawingStyle.cpp index 44db5569..263d5bc3 100644 --- a/hurricane/src/viewer/PyDrawingStyle.cpp +++ b/hurricane/src/viewer/PyDrawingStyle.cpp @@ -37,11 +37,11 @@ extern "C" { // #undef GENERIC_METHOD_HEAD -// #define GENERIC_METHOD_HEAD(SELF_TYPE,SELF_OBJECT,function) \ -// if ( self->ACCESS_OBJECT.get() == NULL ) { \ -// PyErr_SetString ( ProxyError, "Attempt to call " function " on an unbound hurricane object" ); \ -// return NULL; \ -// } \ +// #define GENERIC_METHOD_HEAD(SELF_TYPE,SELF_OBJECT,function) +// if ( self->ACCESS_OBJECT.get() == NULL ) { +// PyErr_SetString ( ProxyError, "Attempt to call " function " on an unbound hurricane object" ); +// return NULL; +// } // SELF_TYPE SELF_OBJECT = self->ACCESS_OBJECT; // // #define METHOD_HEAD(function) GENERIC_METHOD_HEAD(DrawingStyle,ds,function) diff --git a/hurricane/src/viewer/PyGraphics.cpp b/hurricane/src/viewer/PyGraphics.cpp index aa2c872f..02583bbd 100644 --- a/hurricane/src/viewer/PyGraphics.cpp +++ b/hurricane/src/viewer/PyGraphics.cpp @@ -135,7 +135,7 @@ extern "C" { { trace << "PyGraphics_getGroup()" << endl; - const char* group; + const char* group = "NoGroup"; HTRY Graphics* graphics = Graphics::getGraphics (); diff --git a/hurricane/src/viewer/Script.cpp b/hurricane/src/viewer/Script.cpp index 31864d66..954d62c5 100644 --- a/hurricane/src/viewer/Script.cpp +++ b/hurricane/src/viewer/Script.cpp @@ -142,7 +142,7 @@ namespace Isobar { _finalize(); - return true; + return returnCode; } diff --git a/hurricane/src/viewer/SelectCommand.cpp b/hurricane/src/viewer/SelectCommand.cpp index 3e4179f1..270acb76 100644 --- a/hurricane/src/viewer/SelectCommand.cpp +++ b/hurricane/src/viewer/SelectCommand.cpp @@ -227,7 +227,8 @@ namespace Hurricane { { if ( event->key() == Qt::Key_N ) { event->accept(); - _selectMode = (++_selectMode) % 3; + _selectMode++; + _selectMode = _selectMode % 3; } } diff --git a/katabatic/CMakeLists.txt b/katabatic/CMakeLists.txt index 4a2296ef..23c028ba 100644 --- a/katabatic/CMakeLists.txt +++ b/katabatic/CMakeLists.txt @@ -7,7 +7,7 @@ cmake_minimum_required(VERSION 2.4.0) - list(INSERT CMAKE_MODULE_PATH 0 "${DESTDIR}/$ENV{CORIOLIS_TOP}/share/cmake/Modules/") + list(INSERT CMAKE_MODULE_PATH 0 "${DESTDIR}$ENV{CORIOLIS_TOP}/share/cmake/Modules/") find_package(Bootstrap REQUIRED) setup_project_paths(CORIOLIS) diff --git a/katabatic/src/AutoSegment.cpp b/katabatic/src/AutoSegment.cpp index 69c337a4..ab7103d9 100644 --- a/katabatic/src/AutoSegment.cpp +++ b/katabatic/src/AutoSegment.cpp @@ -1288,11 +1288,11 @@ namespace Katabatic { return true; } - bool hasGlobalSegment = false; + //bool hasGlobalSegment = false; if ((flags & KbPropagate) and not isNotAligned()) { forEach ( AutoSegment*, isegment, const_cast(this)->getAligneds(flags) ) { if (isegment->isFixed ()) return false; - if (isegment->isGlobal()) hasGlobalSegment = true; + //if (isegment->isGlobal()) hasGlobalSegment = true; isegment->getGCells( gcells ); if ( (*gcells.begin ())->getIndex() < begin->getIndex() ) begin = *gcells.begin (); diff --git a/katabatic/src/GCell.cpp b/katabatic/src/GCell.cpp index b9df4460..6c019cda 100644 --- a/katabatic/src/GCell.cpp +++ b/katabatic/src/GCell.cpp @@ -1111,7 +1111,7 @@ namespace Katabatic { if ( not (flags & KbForceMove) and not isSaturated(depth) ) return false; - float capacity; + //float capacity; vector::iterator isegment; vector::iterator iend; @@ -1119,12 +1119,12 @@ namespace Katabatic { case Constant::Horizontal: iend = _hsegments.end (); isegment = _hsegments.begin (); - capacity = getHCapacity (); + //capacity = getHCapacity (); break; case Constant::Vertical: iend = _vsegments.end (); isegment = _vsegments.begin (); - capacity = getVCapacity (); + //capacity = getVCapacity (); break; } @@ -1155,7 +1155,7 @@ namespace Katabatic { updateDensity (); - float capacity; + //float capacity; vector::iterator isegment; vector::iterator iend; set globalNets; @@ -1164,12 +1164,12 @@ namespace Katabatic { case Constant::Horizontal: iend = _hsegments.end (); isegment = _hsegments.begin (); - capacity = getHCapacity (); + //capacity = getHCapacity (); break; case Constant::Vertical: iend = _vsegments.end (); isegment = _vsegments.begin (); - capacity = getVCapacity (); + //capacity = getVCapacity (); break; } @@ -1201,7 +1201,7 @@ namespace Katabatic { updateDensity (); - float capacity; + //float capacity; vector::iterator isegment; vector::iterator iend; @@ -1209,12 +1209,12 @@ namespace Katabatic { case Constant::Horizontal: iend = _hsegments.end (); isegment = _hsegments.begin (); - capacity = getHCapacity (); + //capacity = getHCapacity (); break; case Constant::Vertical: iend = _vsegments.end (); isegment = _vsegments.begin (); - capacity = getVCapacity (); + //capacity = getVCapacity (); break; } diff --git a/katabatic/src/GCellGrid.cpp b/katabatic/src/GCellGrid.cpp index e77b168d..6038de52 100644 --- a/katabatic/src/GCellGrid.cpp +++ b/katabatic/src/GCellGrid.cpp @@ -56,7 +56,7 @@ namespace Katabatic { void GCellGrid::_postCreate () { - KnikEngine::KnikEngine* knik; + KnikEngine* knik; knik = KnikEngine::get ( getCell() ); if ( !knik ) throw Error ( missingKnikEngine, "GCellGrid::_postCreate()", getString(getCell()).c_str() ); diff --git a/katabatic/src/LoadGrByNet.cpp b/katabatic/src/LoadGrByNet.cpp index aec727b7..27e02177 100644 --- a/katabatic/src/LoadGrByNet.cpp +++ b/katabatic/src/LoadGrByNet.cpp @@ -1134,8 +1134,8 @@ namespace { viaLayer = Session::getContactLayer(1); - AutoContact* subContact1 = AutoContactTurn::create( gcell, rp1->getNet(), Session::getContactLayer(1) ); - AutoContact* subContact2 = AutoContactTurn::create( gcell, rp1->getNet(), Session::getContactLayer(1) ); + AutoContact* subContact1 = AutoContactTurn::create( gcell, rp1->getNet(), viaLayer ); + AutoContact* subContact2 = AutoContactTurn::create( gcell, rp1->getNet(), viaLayer ); AutoSegment::create( rp1ContactTarget, subContact1 , KbHorizontal ); AutoSegment::create( subContact1 , subContact2 , KbVertical ); @@ -1168,8 +1168,8 @@ namespace { viaLayer = Session::getContactLayer(1); - AutoContact* subContact1 = AutoContactTurn::create( gcell, rp1->getNet(), Session::getContactLayer(1) ); - AutoContact* subContact2 = AutoContactTurn::create( gcell, rp1->getNet(), Session::getContactLayer(1) ); + AutoContact* subContact1 = AutoContactTurn::create( gcell, rp1->getNet(), viaLayer ); + AutoContact* subContact2 = AutoContactTurn::create( gcell, rp1->getNet(), viaLayer ); AutoSegment::create( rp1ContactTarget, subContact1 , KbVertical ); AutoSegment::create( subContact1 , subContact2 , KbHorizontal ); @@ -1318,11 +1318,10 @@ namespace { ltracein(99); unsigned int flags = NoFlags; - Hook* globalHook = NULL; - if (_east ) { globalHook = _east; flags |= HAccess; } - else if (_west ) { globalHook = _west; flags |= HAccess; } - else if (_north) { globalHook = _north; flags |= VSmall; } - else if (_south) { globalHook = _south; flags |= VSmall; } + if (_east ) { flags |= HAccess; } + else if (_west ) { flags |= HAccess; } + else if (_north) { flags |= VSmall; } + else if (_south) { flags |= VSmall; } _southWestContact = _northEastContact = doRp_Access( _gcell, _routingPads[0], flags ); diff --git a/katabatic/src/katabatic/AutoSegments.h b/katabatic/src/katabatic/AutoSegments.h index 2722eb09..b15c85c7 100644 --- a/katabatic/src/katabatic/AutoSegments.h +++ b/katabatic/src/katabatic/AutoSegments.h @@ -432,7 +432,7 @@ namespace Katabatic { inline AutoSegments_InDirection::AutoSegments_InDirection ( unsigned int direction ) : AutoSegmentHF() - , _direction(_direction) + , _direction(direction) {} diff --git a/katabatic/src/katabatic/GridCollections.h b/katabatic/src/katabatic/GridCollections.h index fa5f322f..07fc69ec 100644 --- a/katabatic/src/katabatic/GridCollections.h +++ b/katabatic/src/katabatic/GridCollections.h @@ -2,7 +2,7 @@ // -*- C++ -*- // // This file is part of the Coriolis Software. -// Copyright (c) UPMC/LIP6 2008-2013, All Rights Reserved +// Copyright (c) UPMC/LIP6 2008-2014, All Rights Reserved // // +-----------------------------------------------------------------+ // | C O R I O L I S | @@ -172,7 +172,7 @@ namespace Katabatic { _stop = 0; } else { _start = grid->getIndex ( column, rowStart ); - _stop = grid->getIndex ( column, min(rowStop,grid->getRows()) ); + _stop = grid->getIndex ( column, std::min(rowStop,grid->getRows()) ); } } @@ -344,7 +344,7 @@ namespace Katabatic { _stop = 0; } else { _start = grid->getIndex ( columnStart, row ); - _stop = grid->getIndex ( min(columnStop,grid->getColumns()), row ); + _stop = grid->getIndex ( std::min(columnStop,grid->getColumns()), row ); } } diff --git a/kite/CMakeLists.txt b/kite/CMakeLists.txt index 0b7b4a77..e501717d 100644 --- a/kite/CMakeLists.txt +++ b/kite/CMakeLists.txt @@ -7,7 +7,7 @@ cmake_minimum_required(VERSION 2.4.0) - list(INSERT CMAKE_MODULE_PATH 0 "${DESTDIR}/$ENV{CORIOLIS_TOP}/share/cmake/Modules/") + list(INSERT CMAKE_MODULE_PATH 0 "${DESTDIR}$ENV{CORIOLIS_TOP}/share/cmake/Modules/") find_package(Bootstrap REQUIRED) setup_project_paths(CORIOLIS) diff --git a/kite/src/KiteEngine.cpp b/kite/src/KiteEngine.cpp index 30d60ec2..387fede1 100644 --- a/kite/src/KiteEngine.cpp +++ b/kite/src/KiteEngine.cpp @@ -233,7 +233,7 @@ namespace Kite { void KiteEngine::createGlobalGraph ( unsigned int mode ) { Cell* cell = getCell(); - Box cellBb = cell->getBoundingBox(); + //Box cellBb = cell->getBoundingBox(); if (not _knik) { cell->flattenNets( mode & KtBuildGlobalRouting ); diff --git a/kite/src/Manipulator.cpp b/kite/src/Manipulator.cpp index 5a8f8eb9..9a7ce4a3 100644 --- a/kite/src/Manipulator.cpp +++ b/kite/src/Manipulator.cpp @@ -632,7 +632,7 @@ namespace Kite { size_t end = _fsm.getEnd (itrack); Net* ownerNet = _segment->getNet(); Interval toFree (_segment->getCanonicalInterval()); - Net* ripupNet = NULL; + //Net* ripupNet = NULL; set canonicals; DbU::Unit rightAxisHint = 0; DbU::Unit leftAxisHint = 0; @@ -661,7 +661,7 @@ namespace Kite { // ltrace(200) << "Ovelap has an Id superior to AutoSegment::maxId:" << maxId << "." << endl; // continue; // } - ripupNet = segment2->getNet(); + // ripupNet = segment2->getNet(); DataNegociate* data2 = segment2->getDataNegociate(); if ( !data2 ) { @@ -803,7 +803,7 @@ namespace Kite { size_t end = _fsm.getEnd (itrack); Net* ownerNet = _segment->getNet(); Interval toFree (_segment->getCanonicalInterval()); - Net* ripupNet = NULL; + //Net* ripupNet = NULL; set canonicals; bool success = true; @@ -820,7 +820,7 @@ namespace Kite { success = false; continue; } - ripupNet = segment2->getNet(); + //ripupNet = segment2->getNet(); DataNegociate* data2 = segment2->getDataNegociate(); if (not data2 ) { diff --git a/knik/CMakeLists.txt b/knik/CMakeLists.txt index 875d66da..edbfcc0a 100644 --- a/knik/CMakeLists.txt +++ b/knik/CMakeLists.txt @@ -4,7 +4,7 @@ cmake_minimum_required(VERSION 2.4.0) - list(INSERT CMAKE_MODULE_PATH 0 "${DESTDIR}/$ENV{CORIOLIS_TOP}/share/cmake/Modules/") + list(INSERT CMAKE_MODULE_PATH 0 "${DESTDIR}$ENV{CORIOLIS_TOP}/share/cmake/Modules/") find_package(Bootstrap REQUIRED) setup_project_paths(CORIOLIS) print_cmake_module_path() diff --git a/knik/src/Graph.cpp b/knik/src/Graph.cpp index ca430531..2fcb98e2 100644 --- a/knik/src/Graph.cpp +++ b/knik/src/Graph.cpp @@ -609,13 +609,15 @@ void Graph::initConnexComp ( Vertex* vertex, Edge* arrivalEdge, int newConnexID if ( newConnexID != -1 ) { vertex->setConnexID ( newConnexID ); } - if ( VTuple* vtuple = vertex->getVTuple() ) { + + VTuple* vtuple = vertex->getVTuple(); + if ( vtuple ) { //cerr << " Vertex " << vertex << " already has a vtuple : " << vtuple << endl; assert ( vtuple->getVertex() == vertex ); increaseVTuplePriority ( vtuple, 0 ); } else { - VTuple* vtuple = VTuple::create ( vertex, 0 ); + vtuple = VTuple::create ( vertex, 0 ); //cerr << " Vertex " << vertex << " has now a new vtuple : " << vtuple << endl; addVTupleToPriorityQueue ( vtuple ); } @@ -672,11 +674,12 @@ void Graph::UpdateConnexComp ( VertexList reachedVertexes, Vertex* firstVertex ) currentVertex->setDistance(0); currentVertex->setConnexID(firstConnexID); - if ( VTuple* vtuple = currentVertex->getVTuple() ) { + VTuple* vtuple = currentVertex->getVTuple(); + if ( vtuple ) { increaseVTuplePriority ( vtuple, 0); } else { - VTuple* vtuple = VTuple::create ( currentVertex, 0 ); + vtuple = VTuple::create ( currentVertex, 0 ); addVTupleToPriorityQueue ( vtuple ); } } diff --git a/knik/src/GraphicKnikEngine.cpp b/knik/src/GraphicKnikEngine.cpp index 2ca18930..4cf8a5f2 100644 --- a/knik/src/GraphicKnikEngine.cpp +++ b/knik/src/GraphicKnikEngine.cpp @@ -94,8 +94,8 @@ namespace Knik { painter.setFont(font); //QString text = QString("%1%2%3").arg(edge->getConnexID()).arg(",").arg(edge->getConstCost()); QString text = QString("%1").arg(edge->getConnexID()); - Point fromPos = edge->getFrom()->getPosition(); - Point toPos = edge->getTo()->getPosition(); + //Point fromPos = edge->getFrom()->getPosition(); + //Point toPos = edge->getTo()->getPosition(); //painter.drawText ( widget->dbuToDisplayPoint ( (fromPos.getX()+toPos.getX())/2+DbU::lambda(0.5), (fromPos.getY()+toPos.getY())/2+DbU::lambda(0.5) ), text ); if ( edge->isVertical() ) { @@ -146,7 +146,7 @@ namespace Knik { painter.setFont(font); //QString text = QString("%1%2%3").arg(edge->getConnexID()).arg(",").arg(edge->getConstCost()); QString text = QString("%1 / %2").arg(vertex->getConnexID()).arg(vertex->getDistance()); - Point center = vertex->getPosition(); + //Point center = vertex->getPosition(); Box textBox = Box(vertex->getXMin(), vertex->getYMin(), vertex->getXMax(), vertex->getYMax()); painter.drawText ( widget->dbuToDisplayRect ( textBox,false ), text, QTextOption (Qt::AlignCenter) ); painter.setPen(Qt::NoPen); diff --git a/mauka/CMakeLists.txt b/mauka/CMakeLists.txt index 59f2cb9a..71e7e9e8 100644 --- a/mauka/CMakeLists.txt +++ b/mauka/CMakeLists.txt @@ -4,7 +4,7 @@ cmake_minimum_required(VERSION 2.4.0) - list(INSERT CMAKE_MODULE_PATH 0 "${DESTDIR}/$ENV{CORIOLIS_TOP}/share/cmake/Modules/") + list(INSERT CMAKE_MODULE_PATH 0 "${DESTDIR}$ENV{CORIOLIS_TOP}/share/cmake/Modules/") find_package(Bootstrap REQUIRED) setup_project_paths(CORIOLIS) print_cmake_module_path() diff --git a/metis/CMakeLists.txt b/metis/CMakeLists.txt index eb6c195f..b8661f11 100644 --- a/metis/CMakeLists.txt +++ b/metis/CMakeLists.txt @@ -4,7 +4,7 @@ cmake_minimum_required(VERSION 2.4.0) - list(INSERT CMAKE_MODULE_PATH 0 "${DESTDIR}/$ENV{CORIOLIS_TOP}/share/cmake/Modules/") + list(INSERT CMAKE_MODULE_PATH 0 "${DESTDIR}$ENV{CORIOLIS_TOP}/share/cmake/Modules/") find_package(Bootstrap REQUIRED) setup_project_paths(CORIOLIS) print_cmake_module_path() diff --git a/nimbus/CMakeLists.txt b/nimbus/CMakeLists.txt index fb89e928..6758cc01 100644 --- a/nimbus/CMakeLists.txt +++ b/nimbus/CMakeLists.txt @@ -4,7 +4,7 @@ cmake_minimum_required(VERSION 2.4.0) - list(INSERT CMAKE_MODULE_PATH 0 "${DESTDIR}/$ENV{CORIOLIS_TOP}/share/cmake/Modules/") + list(INSERT CMAKE_MODULE_PATH 0 "${DESTDIR}$ENV{CORIOLIS_TOP}/share/cmake/Modules/") find_package(Bootstrap REQUIRED) setup_project_paths(CORIOLIS) diff --git a/nimbus/src/HFence.cpp b/nimbus/src/HFence.cpp index 32bdcc14..7ff2612c 100644 --- a/nimbus/src/HFence.cpp +++ b/nimbus/src/HFence.cpp @@ -35,6 +35,7 @@ HFence* HFence::create (Grid* grid, GCell* gcup, GCell* gcdown) { if ( (!gcup) && (!gcdown) ) throw Error("cannot create a flying fence"); +#if THIS_IS_DISABLED unsigned step; if (gcup) { step = gcup->getStep(); @@ -43,6 +44,7 @@ HFence* HFence::create (Grid* grid, GCell* gcup, GCell* gcdown) { } else { step = 0; } +#endif HFence* hfence = new HFence (grid, gcup, gcdown); diff --git a/nimbus/src/VFence.cpp b/nimbus/src/VFence.cpp index 545dd00e..eed5f11e 100644 --- a/nimbus/src/VFence.cpp +++ b/nimbus/src/VFence.cpp @@ -34,6 +34,7 @@ VFence* VFence::create (Grid* grid, GCell* gcleft, GCell* gcright) { if ( (!gcleft) && (!gcright) ) throw Error("cannot create a flying fence"); +#if THIS_IS_DISABLED unsigned step; if (gcleft) { step = gcleft->getStep(); @@ -42,6 +43,7 @@ VFence* VFence::create (Grid* grid, GCell* gcleft, GCell* gcright) { } else { step = 0; } +#endif VFence* vfence = new VFence (grid, gcleft, gcright); diff --git a/solstice/CMakeLists.txt b/solstice/CMakeLists.txt index 5d67c22d..c4963db7 100644 --- a/solstice/CMakeLists.txt +++ b/solstice/CMakeLists.txt @@ -4,7 +4,7 @@ cmake_minimum_required(VERSION 2.4.0) - list(INSERT CMAKE_MODULE_PATH 0 "${DESTDIR}/$ENV{CORIOLIS_TOP}/share/cmake/Modules/") + list(INSERT CMAKE_MODULE_PATH 0 "${DESTDIR}$ENV{CORIOLIS_TOP}/share/cmake/Modules/") find_package(Bootstrap REQUIRED) setup_project_paths(CORIOLIS) diff --git a/stratus1/CMakeLists.txt b/stratus1/CMakeLists.txt index 8351f64c..269e2c89 100644 --- a/stratus1/CMakeLists.txt +++ b/stratus1/CMakeLists.txt @@ -5,7 +5,7 @@ option(BUILD_DOC "Build the documentation (latex2html)" OFF) cmake_minimum_required(VERSION 2.4.0) - list(INSERT CMAKE_MODULE_PATH 0 "${DESTDIR}/$ENV{CORIOLIS_TOP}/share/cmake/Modules/") + list(INSERT CMAKE_MODULE_PATH 0 "${DESTDIR}$ENV{CORIOLIS_TOP}/share/cmake/Modules/") find_package(Bootstrap REQUIRED) setup_project_paths(CORIOLIS) diff --git a/unicorn/CMakeLists.txt b/unicorn/CMakeLists.txt index 084b062d..e3802832 100644 --- a/unicorn/CMakeLists.txt +++ b/unicorn/CMakeLists.txt @@ -4,7 +4,7 @@ cmake_minimum_required(VERSION 2.4.0) - list(INSERT CMAKE_MODULE_PATH 0 "${DESTDIR}/$ENV{CORIOLIS_TOP}/share/cmake/Modules/") + list(INSERT CMAKE_MODULE_PATH 0 "${DESTDIR}$ENV{CORIOLIS_TOP}/share/cmake/Modules/") find_package(Bootstrap REQUIRED) setup_project_paths(CORIOLIS) diff --git a/unicorn/src/CMakeLists.txt b/unicorn/src/CMakeLists.txt index f233c70e..5de02375 100644 --- a/unicorn/src/CMakeLists.txt +++ b/unicorn/src/CMakeLists.txt @@ -61,6 +61,7 @@ ${BOOKSHELF_LIBRARY} ${AGDS_LIBRARY} ${CIF_LIBRARY} + ${UTILITIES_LIBRARY} ${CONFIGURATION_LIBRARY} ${LEFDEF_LIBRARIES} ${OA_LIBRARIES} diff --git a/vlsisapd/CMakeLists.txt b/vlsisapd/CMakeLists.txt index 932fe8ee..c015e5d3 100644 --- a/vlsisapd/CMakeLists.txt +++ b/vlsisapd/CMakeLists.txt @@ -4,11 +4,12 @@ cmake_minimum_required(VERSION 2.4.0) - list(INSERT CMAKE_MODULE_PATH 0 "${DESTDIR}/$ENV{CORIOLIS_TOP}/share/cmake/Modules/") + list(INSERT CMAKE_MODULE_PATH 0 "${DESTDIR}$ENV{CORIOLIS_TOP}/share/cmake/Modules/") find_package(Bootstrap REQUIRED) list(INSERT CMAKE_MODULE_PATH 0 "${VLSISAPD_SOURCE_DIR}/cmake_modules/") print_cmake_module_path() + message(STATUS "Boost_NO_SYSTEM_PATHS: ${Boost_NO_SYSTEM_PATHS}") set_cmake_policies() setup_boost(program_options python regex) diff --git a/vlsisapd/src/bookshelf/src/Circuit.cpp b/vlsisapd/src/bookshelf/src/Circuit.cpp index 97e242cc..cdb08ca2 100644 --- a/vlsisapd/src/bookshelf/src/Circuit.cpp +++ b/vlsisapd/src/bookshelf/src/Circuit.cpp @@ -108,7 +108,7 @@ namespace Bookshelf { << _maxPinId << " founds." << std::endl; success = false; } - return false; + return success; } diff --git a/vlsisapd/src/configuration/src/PyConfiguration.cpp b/vlsisapd/src/configuration/src/PyConfiguration.cpp index bc9e066d..f27efdbf 100644 --- a/vlsisapd/src/configuration/src/PyConfiguration.cpp +++ b/vlsisapd/src/configuration/src/PyConfiguration.cpp @@ -2,7 +2,7 @@ // -*- C++ -*- // // This file is part of the VSLSI Stand-Alone Software. -// Copyright (c) UPMC/LIP6 2008-2012, All Rights Reserved +// Copyright (c) UPMC/LIP6 2008-2014, All Rights Reserved // // +-----------------------------------------------------------------+ // | V L S I Stand - Alone Parsers / Drivers | @@ -165,17 +165,17 @@ namespace Cfg { VectorWrapper< std::vector >::wrap ( "StringVector" ); VectorWrapper< std::vector >::wrap ( "EnumValueVector" ); - typedef void (Parameter::* VoidIntPrioritySign )(int ,Parameter::Priority) ; - typedef void (Parameter::* VoidDoublePrioritySign )(double,Parameter::Priority) ; - typedef void (Parameter::* VoidIntSign )(int ); - typedef void (Parameter::* VoidDoubleSign )(double); + //typedef void (Parameter::* VoidIntPrioritySign )(int ,Parameter::Priority); + //typedef void (Parameter::* VoidDoublePrioritySign )(double,Parameter::Priority); + //typedef void (Parameter::* VoidIntSign )(int ); + //typedef void (Parameter::* VoidDoubleSign )(double); typedef bool (Parameter::* BoolIntConstSign )(int ) const; typedef bool (Parameter::* BoolDoubleConstSign )(double) const; - typedef bool (Parameter::* BoolBoolSign )(bool ); - typedef bool (Parameter::* BoolIntSign )(int ); - typedef bool (Parameter::* BoolDoubleSign )(double); - typedef bool (Parameter::* BoolStringSign )(std::string); - typedef bool (Parameter::* BoolStringFlagsSign )(std::string,unsigned int); + //typedef bool (Parameter::* BoolBoolSign )(bool ); + //typedef bool (Parameter::* BoolIntSign )(int ); + //typedef bool (Parameter::* BoolDoubleSign )(double); + //typedef bool (Parameter::* BoolStringSign )(std::string); + //typedef bool (Parameter::* BoolStringFlagsSign )(std::string,unsigned int); // Parameter overloaded function members. BoolIntConstSign paramCheckValueInt = (BoolIntConstSign) &Parameter::checkValue; diff --git a/vlsisapd/src/liberty/src/LibertyParserScanner.ll b/vlsisapd/src/liberty/src/LibertyParserScanner.ll index 228ed28d..c69bf809 100644 --- a/vlsisapd/src/liberty/src/LibertyParserScanner.ll +++ b/vlsisapd/src/liberty/src/LibertyParserScanner.ll @@ -1,4 +1,6 @@ +%option nounput + %{ #include @@ -147,7 +149,6 @@ cell_footprint { return CELL_FOOTPRINT; } dont_use { return DONT_USE; } pin { return PIN; } direction { return DIRECTION; } -capacitance { return CAPACITANCE; } fanout_load { return FANOUT_LOAD; } max_fanout { return MAX_FANOUT; } function { return FUNCTION; }