riscv
/
coriolis
mirror of https://gitlab.lip6.fr/vlsi-eda/coriolis.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

File & namespace renaming.

This commit is contained in:
Jean-Paul Chaput 2010-05-18 15:10:35 +00:00
parent 88b2a63c9a
commit 380f9470e4
26 changed files with 71 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
vlsisapd/CMakeLists.txt
View File

@ -1,8 +1,8 @@
PROJECT(IO)
PROJECT(VLSISAPD)
CMAKE_MINIMUM_REQUIRED(VERSION 2.4.0)
LIST(INSERT CMAKE_MODULE_PATH 0 "${IO_SOURCE_DIR}/cmake/Modules/")
LIST(INSERT CMAKE_MODULE_PATH 0 "${VLSISAPD_SOURCE_DIR}/cmake/Modules/")
FIND_PACKAGE(LibXml2 REQUIRED)

2
vlsisapd/agds/CMakeLists.txt
View File

@ -6,4 +6,4 @@ SET ( cpps GdsLibrary.cpp GdsStructure.cpp GdsRectangle.cpp )
ADD_LIBRARY(agds ${cpps})
INSTALL(TARGETS agds DESTINATION lib${LIB_SUFFIX})
INSTALL(FILES ${includes} DESTINATION include/io/agds)
INSTALL(FILES ${includes} DESTINATION include/vlsisapd/agds)

2
vlsisapd/agds/GdsElement.h
View File

@ -1,7 +1,7 @@
#ifndef __GDS_ELEMENT_H
#define __GDS_ELEMENT_H
namespace IO {
namespace vlsisapd {
class GdsElement {
protected:
inline GdsElement (int layer);

2
vlsisapd/agds/GdsLibrary.cpp
View File

@ -5,7 +5,7 @@ using namespace std;
#include "GdsLibrary.h"
namespace IO {
namespace vlsisapd {
GdsLibrary::GdsLibrary(string libName)
: _libName(libName)

2
vlsisapd/agds/GdsLibrary.h
View File

@ -6,7 +6,7 @@ using namespace std;
#include "GdsStructure.h"
namespace IO {
namespace vlsisapd {
class GdsLibrary {
public:
GdsLibrary(string libName);

2
vlsisapd/agds/GdsRectangle.cpp
View File

@ -4,7 +4,7 @@ using namespace std;
#include "GdsRectangle.h"
namespace IO {
namespace vlsisapd {
GdsElement::~GdsElement () { }
GdsRectangle::GdsRectangle(int layer, double xmin, double ymin, double xmax, double ymax)

2
vlsisapd/agds/GdsRectangle.h
View File

@ -5,7 +5,7 @@
#include "GdsElement.h"
namespace IO {
namespace vlsisapd {
class GdsRectangle : public GdsElement {
public:
GdsRectangle (int layer, double xmin, double ymin, double xmax, double ymax);

2
vlsisapd/agds/GdsStructure.cpp
View File

@ -4,7 +4,7 @@ using namespace std;
#include "GdsStructure.h"
namespace IO {
namespace vlsisapd {
GdsStructure::GdsStructure(string strName)
: _strName(strName) {}

2
vlsisapd/agds/GdsStructure.h
View File

@ -8,7 +8,7 @@ using namespace std;
#include "GdsElement.h"
namespace IO {
namespace vlsisapd {
class GdsStructure {
public:
GdsStructure(string strName);

2
vlsisapd/cif/CMakeLists.txt
View File

@ -6,4 +6,4 @@ SET ( cpps CifCircuit.cpp CifPolygon.cpp )
ADD_LIBRARY(cif ${cpps})
INSTALL(TARGETS cif DESTINATION lib${LIB_SUFFIX})
INSTALL(FILES ${includes} DESTINATION include/io/cif)
INSTALL(FILES ${includes} DESTINATION include/vlsisapd/cif)

4
vlsisapd/cif/CifCircuit.cpp
View File

@ -6,7 +6,7 @@ using namespace std;
#include "CifCircuit.h"
#include "CifPolygon.h"
namespace IO {
namespace vlsisapd {
CifCircuit::CifCircuit(string name, string unit, double scale) : _name(name), _unit(unit), _scale(scale) {}
@ -32,7 +32,7 @@ bool CifCircuit::write(string filename) {
ofstream file;
file.open(filename.c_str(), ios::out);
// Header
file << "(CIF file written on " << date << " by IO_CIF_DRIVER);" << endl
file << "(CIF file written on " << date << " by VLSISAPD_CIF_DRIVER);" << endl
<< "(Units: " << _unit << " - UU/DB Scale: " << _scale << ");" << endl
<< "DS 1 1 1;" << endl
<< "9 " << _name << ";" << endl;

2
vlsisapd/cif/CifCircuit.h
View File

@ -3,7 +3,7 @@
#include <vector>
namespace IO {
namespace vlsisapd {
class CifPolygon;
class CifCircuit {
public:

2
vlsisapd/cif/CifPolygon.cpp
View File

@ -5,7 +5,7 @@ using namespace std;
#include "CifPolygon.h"
namespace IO {
namespace vlsisapd {
CifPolygon::CifPolygon(long layer) : _layer(layer) {}

2
vlsisapd/cif/CifPolygon.h
View File

@ -4,7 +4,7 @@
#include <vector>
#include <fstream>
namespace IO {
namespace vlsisapd {
class CifPolygon {
public:
CifPolygon(long);

2
vlsisapd/cmake_modules/CMakeLists.txt
View File

@ -1 +1 @@
install(FILES FindIO.cmake DESTINATION share/cmake/Modules)
install(FILES FindVLSISAPD.cmake DESTINATION share/cmake/Modules)

66
vlsisapd/cmake_modules/FindVLSISAPD.cmake
View File

@ -1,11 +1,11 @@
# - Try to find the IO libraries
# - Try to find the VLSISAPD libraries
# Once done this will define
#
# IO_FOUND - system has the IO library
# IO_INCLUDE_DIR - the IO include directory
# IO_LIBRARIES - The libraries needed to use IO
# VLSISAPD_FOUND - system has the VLSISAPD library
# VLSISAPD_INCLUDE_DIR - the VLSISAPD include directory
# VLSISAPD_LIBRARIES - The libraries needed to use VLSISAPD
SET(IO_FOUND FALSE)
SET(VLSISAPD_FOUND FALSE)
# Setup the DIR_SEARCH_PATH.
MACRO(SETUP_SEARCH_DIR project)
@ -30,49 +30,49 @@ MACRO(SET_FOUND project)
ENDIF(${project}_INCLUDE_DIR AND ${project}_LIBRARY)
ENDMACRO(SET_FOUND project)
SETUP_SEARCH_DIR(IO)
SETUP_SEARCH_DIR(VLSISAPD)
IF(IO_DIR_SEARCH)
IF(VLSISAPD_DIR_SEARCH)
# AGDS
FIND_PATH (AGDS_INCLUDE_DIR NAMES io/agds/GdsLibrary.h PATHS ${IO_DIR_SEARCH} PATH_SUFFIXES include)
FIND_LIBRARY(AGDS_LIBRARY NAMES agds PATHS ${IO_DIR_SEARCH} PATH_SUFFIXES lib)
FIND_PATH (AGDS_INCLUDE_DIR NAMES vlsisapd/agds/GdsLibrary.h PATHS ${VLSISAPD_DIR_SEARCH} PATH_SUFFIXES include)
FIND_LIBRARY(AGDS_LIBRARY NAMES agds PATHS ${VLSISAPD_DIR_SEARCH} PATH_SUFFIXES lib)
SET_FOUND (AGDS)
# CIF
FIND_PATH (CIF_INCLUDE_DIR NAMES io/cif/CifCircuit.h PATHS ${IO_DIR_SEARCH} PATH_SUFFIXES include)
FIND_LIBRARY(CIF_LIBRARY NAMES cif PATHS ${IO_DIR_SEARCH} PATH_SUFFIXES lib)
FIND_PATH (CIF_INCLUDE_DIR NAMES vlsisapd/cif/CifCircuit.h PATHS ${VLSISAPD_DIR_SEARCH} PATH_SUFFIXES include)
FIND_LIBRARY(CIF_LIBRARY NAMES cif PATHS ${VLSISAPD_DIR_SEARCH} PATH_SUFFIXES lib)
SET_FOUND (CIF)
# OPENCHAMS
FIND_PATH (OPENCHAMS_INCLUDE_DIR NAMES io/openChams/Circuit.h PATHS ${IO_DIR_SEARCH} PATH_SUFFIXES include)
FIND_LIBRARY(OPENCHAMS_LIBRARY NAMES openChams PATHS ${IO_DIR_SEARCH} PATH_SUFFIXES lib)
FIND_PATH (OPENCHAMS_INCLUDE_DIR NAMES vlsisapd/openChams/Circuit.h PATHS ${VLSISAPD_DIR_SEARCH} PATH_SUFFIXES include)
FIND_LIBRARY(OPENCHAMS_LIBRARY NAMES openChams PATHS ${VLSISAPD_DIR_SEARCH} PATH_SUFFIXES lib)
SET_FOUND (OPENCHAMS)
# DTR
FIND_PATH (DTR_INCLUDE_DIR NAMES io/dtr/Techno.h PATHS ${IO_DIR_SEARCH} PATH_SUFFIXES include)
FIND_LIBRARY(DTR_LIBRARY NAMES dtr PATHS ${IO_DIR_SEARCH} PATH_SUFFIXES lib)
FIND_PATH (DTR_INCLUDE_DIR NAMES vlsisapd/dtr/Techno.h PATHS ${VLSISAPD_DIR_SEARCH} PATH_SUFFIXES include)
FIND_LIBRARY(DTR_LIBRARY NAMES dtr PATHS ${VLSISAPD_DIR_SEARCH} PATH_SUFFIXES lib)
SET_FOUND (DTR)
IF(AGDS_FOUND AND CIF_FOUND AND OPENCHAMS_FOUND AND DTR_FOUND)
SET(IO_FOUND TRUE)
SET(VLSISAPD_FOUND TRUE)
ELSE(AGDS_FOUND AND CIF_FOUND AND OPENCHAMS_FOUND AND DTR_FOUND)
SET(IO_FOUND FALSE)
SET(VLSISAPD_FOUND FALSE)
ENDIF(AGDS_FOUND AND CIF_FOUND AND OPENCHAMS_FOUND AND DTR_FOUND)
ELSE(IO_DIR_SEARCH)
MESSAGE("-- Cannot find IO_LIBRARIES since IO_DIR_SEARCH is not defined.")
ENDIF(IO_DIR_SEARCH)
ELSE(VLSISAPD_DIR_SEARCH)
MESSAGE("-- Cannot find VLSISAPD_LIBRARIES since VLSISAPD_DIR_SEARCH is not defined.")
ENDIF(VLSISAPD_DIR_SEARCH)
IF (NOT IO_FOUND)
SET(IO_MESSAGE
"IO libraries were not found. Make sure IO_TOP env variable is set.")
IF (NOT IO_FIND_QUIETLY)
MESSAGE(STATUS "${IO_MESSAGE}")
ELSE(NOT IO_FIND_QUIETLY)
IF(IO_FIND_REQUIRED)
MESSAGE(FATAL_ERROR "${IO_MESSAGE}")
ENDIF(IO_FIND_REQUIRED)
ENDIF(NOT IO_FIND_QUIETLY)
ELSE (NOT IO_FOUND)
MESSAGE(STATUS "IO library was found in ${IO_DIR_SEARCH}")
ENDIF (NOT IO_FOUND)
IF (NOT VLSISAPD_FOUND)
SET(VLSISAPD_MESSAGE
"VLSISAPD libraries were not found. Make sure VLSISAPD_TOP env variable is set.")
IF (NOT VLSISAPD_FIND_QUIETLY)
MESSAGE(STATUS "${VLSISAPD_MESSAGE}")
ELSE(NOT VLSISAPD_FIND_QUIETLY)
IF(VLSISAPD_FIND_REQUIRED)
MESSAGE(FATAL_ERROR "${VLSISAPD_MESSAGE}")
ENDIF(VLSISAPD_FIND_REQUIRED)
ENDIF(NOT VLSISAPD_FIND_QUIETLY)
ELSE (NOT VLSISAPD_FOUND)
MESSAGE(STATUS "VLSISAPD library was found in ${VLSISAPD_DIR_SEARCH}")
ENDIF (NOT VLSISAPD_FOUND)

12
vlsisapd/dtr/src/CMakeLists.txt
View File

@ -7,12 +7,12 @@ ELSE (Boost_FOUND)
ENDIF (Boost_FOUND)
INCLUDE_DIRECTORIES(${IO_SOURCE_DIR}/dtr/src ${LIBXML2_INCLUDE_DIR} ${Boost_INCLUDE_DIRS} ${PYTHON_INCLUDE_PATH})
INCLUDE_DIRECTORIES(${VLSISAPD_SOURCE_DIR}/dtr/src ${LIBXML2_INCLUDE_DIR} ${Boost_INCLUDE_DIRS} ${PYTHON_INCLUDE_PATH})
SET ( hpps io/dtr/Techno.h
io/dtr/Rules.h
io/dtr/Name.h
io/dtr/DTRException.h )
SET ( hpps vlsisapd/dtr/Techno.h
vlsisapd/dtr/Rules.h
vlsisapd/dtr/Name.h
vlsisapd/dtr/DTRException.h )
SET ( cpps Techno.cpp
Name.cpp )
@ -33,4 +33,4 @@ TARGET_LINK_LIBRARIES(pyDTR dtr ${LIBXML2_LIBRARIES} ${Boost_LIBRARIES} ${PYTHON
INSTALL(TARGETS pyDTR DESTINATION lib${LIB_SUFFIX}/python)
ENDIF(Boost_FOUND)
INSTALL(FILES ${hpps} DESTINATION include/io/dtr)
INSTALL(FILES ${hpps} DESTINATION include/vlsisapd/dtr)

2
vlsisapd/dtr/src/Name.cpp
View File

@ -9,7 +9,7 @@
using namespace std;
#include "io/dtr/Name.h"
#include "vlsisapd/dtr/Name.h"
namespace DTR {
unsigned long Name::_globalId = 0;

6
vlsisapd/dtr/src/PyTechno.cpp
View File

@ -1,9 +1,9 @@
#include <boost/python.hpp>
using namespace boost::python;
#include "io/dtr/Techno.h"
#include "io/dtr/Rules.h"
#include "io/dtr/DTRException.h"
#include "vlsisapd/dtr/Techno.h"
#include "vlsisapd/dtr/Rules.h"
#include "vlsisapd/dtr/DTRException.h"
namespace DTR {
void translator(DTRException const& e) {

6
vlsisapd/dtr/src/Techno.cpp
View File

@ -17,9 +17,9 @@ using namespace std;
#include <libxml/parser.h>
#include <libxml/tree.h>
#include "io/dtr/Techno.h"
#include "io/dtr/Rules.h"
#include "io/dtr/DTRException.h"
#include "vlsisapd/dtr/Techno.h"
#include "vlsisapd/dtr/Rules.h"
#include "vlsisapd/dtr/DTRException.h"
namespace {
template<class T> T getValue(xmlChar* str) {

0
vlsisapd/dtr/src/io/dtr/DTRException.h → vlsisapd/dtr/src/vlsisapd/dtr/DTRException.h
View File

2
vlsisapd/dtr/src/io/dtr/Name.h → vlsisapd/dtr/src/vlsisapd/dtr/Name.h
View File

@ -13,7 +13,7 @@
#include <string>
#include <map>
#include "io/dtr/DTRException.h"
#include "vlsisapd/dtr/DTRException.h"
namespace DTR {
class Name {

0
vlsisapd/dtr/src/io/dtr/Rules.h → vlsisapd/dtr/src/vlsisapd/dtr/Rules.h
View File

2
vlsisapd/dtr/src/io/dtr/Techno.h → vlsisapd/dtr/src/vlsisapd/dtr/Techno.h
View File

@ -15,7 +15,7 @@
#include <libxml/parser.h>
#include <libxml/tree.h>
#include "io/dtr/Name.h"
#include "vlsisapd/dtr/Name.h"
namespace DTR {
class Rule;

2
vlsisapd/openChams/CMakeLists.txt
View File

@ -30,4 +30,4 @@ TARGET_LINK_LIBRARIES(openChams ${LIBXML2_LIBRARIES})
INSTALL(TARGETS openChams DESTINATION lib${LIB_SUFFIX} )
INSTALL(FILES ${includes} DESTINATION include/io/openChams)
INSTALL(FILES ${includes} DESTINATION include/vlsisapd/openChams)

2
vlsisapd/openChams/Circuit.h
View File

@ -94,6 +94,6 @@ inline void Circuit::setSchematic(Schematic* schem) { _schematic = schem;
inline void Circuit::setSizing(Sizing* sizing) { _sizing = sizing; };
} // namespace IO
} // namespace OpenChams
#endif