From 60fb4ab7d6959415309078b3098f06edcf798e64 Mon Sep 17 00:00:00 2001 From: Jean-Paul Chaput Date: Wed, 21 May 2008 22:46:29 +0000 Subject: [PATCH] * ./hurricane/src : - Complete include re-organisation. include/hurricane/*.h : kernel. include/hurricane/viewer/*.h : hviewer. include/hurricane/inspector/*.h : hinspector. Includes have been moved into subdirectories of .cpp files (as in crlcore). - Now you must include files like this : #include #include #include - Suppressed viewer specific include path in FindHURRICANE.cmake. - Re-enabled documentation, with dot disabled as it seems to slow down doxygen. * ./crlcore/src/crlcore : - Adapted to new Hurricane include scheme. Corrected bugs in it's own include files (noticeably "Utilities.h"). --- hurricane/src/pyext/CMakeLists.txt | 124 +++++++++++++----- hurricane/src/pyext/ProxyProperty.cpp | 6 +- hurricane/src/pyext/PyBox.cpp | 4 +- hurricane/src/pyext/PyCell.cpp | 24 ++-- hurricane/src/pyext/PyCellLocator.cpp | 4 +- hurricane/src/pyext/PyComponent.cpp | 20 +-- hurricane/src/pyext/PyComponentLocator.cpp | 4 +- hurricane/src/pyext/PyContact.cpp | 10 +- hurricane/src/pyext/PyDataBase.cpp | 4 +- hurricane/src/pyext/PyEntity.cpp | 26 ++-- hurricane/src/pyext/PyHorizontal.cpp | 6 +- hurricane/src/pyext/PyHurricane.cpp | 72 +++++----- hurricane/src/pyext/PyHyperNet.cpp | 8 +- hurricane/src/pyext/PyInstance.cpp | 18 +-- hurricane/src/pyext/PyInstanceLocator.cpp | 4 +- hurricane/src/pyext/PyLayer.cpp | 6 +- hurricane/src/pyext/PyLibrary.cpp | 10 +- hurricane/src/pyext/PyName.cpp | 2 +- hurricane/src/pyext/PyNet.cpp | 18 +-- hurricane/src/pyext/PyNetLocator.cpp | 4 +- hurricane/src/pyext/PyOccurrence.cpp | 14 +- hurricane/src/pyext/PyOccurrenceLocator.cpp | 4 +- hurricane/src/pyext/PyPath.cpp | 12 +- hurricane/src/pyext/PyPin.cpp | 8 +- hurricane/src/pyext/PyPinLocator.cpp | 4 +- hurricane/src/pyext/PyPlug.cpp | 6 +- hurricane/src/pyext/PyPlugLocator.cpp | 4 +- hurricane/src/pyext/PyPoint.cpp | 2 +- hurricane/src/pyext/PyReference.cpp | 10 +- hurricane/src/pyext/PyReferenceLocator.cpp | 4 +- hurricane/src/pyext/PySegment.cpp | 12 +- hurricane/src/pyext/PySegmentLocator.cpp | 4 +- hurricane/src/pyext/PyTechnology.cpp | 8 +- hurricane/src/pyext/PyTransformation.cpp | 6 +- hurricane/src/pyext/PyUnit.cpp | 2 +- hurricane/src/pyext/PyUpdateSession.cpp | 2 +- hurricane/src/pyext/PyVertical.cpp | 6 +- .../{ => hurricane/isobar}/ProxyProperty.h | 4 +- .../src/pyext/{ => hurricane/isobar}/PyBox.h | 4 +- .../src/pyext/{ => hurricane/isobar}/PyCell.h | 4 +- .../{ => hurricane/isobar}/PyCellLocator.h | 6 +- .../{ => hurricane/isobar}/PyComponent.h | 4 +- .../isobar}/PyComponentLocator.h | 4 +- .../pyext/{ => hurricane/isobar}/PyContact.h | 4 +- .../pyext/{ => hurricane/isobar}/PyDataBase.h | 4 +- .../pyext/{ => hurricane/isobar}/PyEntity.h | 4 +- .../{ => hurricane/isobar}/PyHorizontal.h | 4 +- .../{ => hurricane/isobar}/PyHurricane.h | 6 +- .../pyext/{ => hurricane/isobar}/PyHyperNet.h | 6 +- .../pyext/{ => hurricane/isobar}/PyInstance.h | 4 +- .../isobar}/PyInstanceLocator.h | 6 +- .../pyext/{ => hurricane/isobar}/PyLayer.h | 4 +- .../pyext/{ => hurricane/isobar}/PyLibrary.h | 4 +- .../src/pyext/{ => hurricane/isobar}/PyName.h | 4 +- .../src/pyext/{ => hurricane/isobar}/PyNet.h | 4 +- .../{ => hurricane/isobar}/PyNetLocator.h | 6 +- .../{ => hurricane/isobar}/PyOccurrence.h | 4 +- .../isobar}/PyOccurrenceLocator.h | 4 +- .../src/pyext/{ => hurricane/isobar}/PyPath.h | 4 +- .../src/pyext/{ => hurricane/isobar}/PyPin.h | 4 +- .../{ => hurricane/isobar}/PyPinLocator.h | 6 +- .../src/pyext/{ => hurricane/isobar}/PyPlug.h | 4 +- .../{ => hurricane/isobar}/PyPlugLocator.h | 6 +- .../pyext/{ => hurricane/isobar}/PyPoint.h | 4 +- .../{ => hurricane/isobar}/PyReference.h | 4 +- .../isobar}/PyReferenceLocator.h | 6 +- .../pyext/{ => hurricane/isobar}/PySegment.h | 4 +- .../{ => hurricane/isobar}/PySegmentLocator.h | 6 +- .../{ => hurricane/isobar}/PyTechnology.h | 4 +- .../{ => hurricane/isobar}/PyTransformation.h | 4 +- .../src/pyext/{ => hurricane/isobar}/PyUnit.h | 4 +- .../{ => hurricane/isobar}/PyUpdateSession.h | 4 +- .../pyext/{ => hurricane/isobar}/PyVertical.h | 4 +- 73 files changed, 350 insertions(+), 294 deletions(-) rename hurricane/src/pyext/{ => hurricane/isobar}/ProxyProperty.h (98%) rename hurricane/src/pyext/{ => hurricane/isobar}/PyBox.h (97%) rename hurricane/src/pyext/{ => hurricane/isobar}/PyCell.h (98%) rename hurricane/src/pyext/{ => hurricane/isobar}/PyCellLocator.h (97%) rename hurricane/src/pyext/{ => hurricane/isobar}/PyComponent.h (97%) rename hurricane/src/pyext/{ => hurricane/isobar}/PyComponentLocator.h (97%) rename hurricane/src/pyext/{ => hurricane/isobar}/PyContact.h (97%) rename hurricane/src/pyext/{ => hurricane/isobar}/PyDataBase.h (97%) rename hurricane/src/pyext/{ => hurricane/isobar}/PyEntity.h (97%) rename hurricane/src/pyext/{ => hurricane/isobar}/PyHorizontal.h (97%) rename hurricane/src/pyext/{ => hurricane/isobar}/PyHurricane.h (99%) rename hurricane/src/pyext/{ => hurricane/isobar}/PyHyperNet.h (96%) rename hurricane/src/pyext/{ => hurricane/isobar}/PyInstance.h (97%) rename hurricane/src/pyext/{ => hurricane/isobar}/PyInstanceLocator.h (96%) rename hurricane/src/pyext/{ => hurricane/isobar}/PyLayer.h (97%) rename hurricane/src/pyext/{ => hurricane/isobar}/PyLibrary.h (97%) rename hurricane/src/pyext/{ => hurricane/isobar}/PyName.h (97%) rename hurricane/src/pyext/{ => hurricane/isobar}/PyNet.h (98%) rename hurricane/src/pyext/{ => hurricane/isobar}/PyNetLocator.h (97%) rename hurricane/src/pyext/{ => hurricane/isobar}/PyOccurrence.h (97%) rename hurricane/src/pyext/{ => hurricane/isobar}/PyOccurrenceLocator.h (97%) rename hurricane/src/pyext/{ => hurricane/isobar}/PyPath.h (97%) rename hurricane/src/pyext/{ => hurricane/isobar}/PyPin.h (98%) rename hurricane/src/pyext/{ => hurricane/isobar}/PyPinLocator.h (97%) rename hurricane/src/pyext/{ => hurricane/isobar}/PyPlug.h (97%) rename hurricane/src/pyext/{ => hurricane/isobar}/PyPlugLocator.h (97%) rename hurricane/src/pyext/{ => hurricane/isobar}/PyPoint.h (97%) rename hurricane/src/pyext/{ => hurricane/isobar}/PyReference.h (97%) rename hurricane/src/pyext/{ => hurricane/isobar}/PyReferenceLocator.h (96%) rename hurricane/src/pyext/{ => hurricane/isobar}/PySegment.h (97%) rename hurricane/src/pyext/{ => hurricane/isobar}/PySegmentLocator.h (97%) rename hurricane/src/pyext/{ => hurricane/isobar}/PyTechnology.h (97%) rename hurricane/src/pyext/{ => hurricane/isobar}/PyTransformation.h (97%) rename hurricane/src/pyext/{ => hurricane/isobar}/PyUnit.h (97%) rename hurricane/src/pyext/{ => hurricane/isobar}/PyUpdateSession.h (97%) rename hurricane/src/pyext/{ => hurricane/isobar}/PyVertical.h (97%) diff --git a/hurricane/src/pyext/CMakeLists.txt b/hurricane/src/pyext/CMakeLists.txt index 23663b60..87082aae 100644 --- a/hurricane/src/pyext/CMakeLists.txt +++ b/hurricane/src/pyext/CMakeLists.txt @@ -1,38 +1,94 @@ -INCLUDE_DIRECTORIES(${PYTHON_INCLUDE_PATH} ${HURRICANE_SOURCE_DIR}/src/hurricane) -SET(sources ProxyProperty.cpp PyBox.cpp PyCell.cpp PyCellLocator.cpp - PyComponent.cpp PyComponentLocator.cpp PyContact.cpp - PyDataBase.cpp PyEntity.cpp PyHorizontal.cpp - PyHurricane.cpp PyHyperNet.cpp PyInstance.cpp PyInstanceLocator.cpp - PyLayer.cpp PyLibrary.cpp PyName.cpp PyNet.cpp PyNetLocator.cpp - PyOccurrence.cpp PyOccurrenceLocator.cpp PyPath.cpp PyPin.cpp PyPinLocator.cpp - PyPlug.cpp PyPlugLocator.cpp PyPoint.cpp PyReference.cpp PyReferenceLocator.cpp - PySegment.cpp PySegmentLocator.cpp PyTechnology.cpp PyTransformation.cpp - PyUnit.cpp PyUpdateSession.cpp PyVertical.cpp -) + include_directories ( ${PYTHON_INCLUDE_PATH} + ${HURRICANE_SOURCE_DIR}/src/hurricane + ${HURRICANE_SOURCE_DIR}/src/pyext + ) + set ( sources ProxyProperty.cpp + PyBox.cpp + PyCell.cpp + PyCellLocator.cpp + PyComponent.cpp + PyComponentLocator.cpp + PyContact.cpp + PyDataBase.cpp + PyEntity.cpp + PyHorizontal.cpp + PyHurricane.cpp + PyHyperNet.cpp + PyInstance.cpp + PyInstanceLocator.cpp + PyLayer.cpp + PyLibrary.cpp + PyName.cpp + PyNet.cpp + PyNetLocator.cpp + PyOccurrence.cpp + PyOccurrenceLocator.cpp + PyPath.cpp + PyPin.cpp + PyPinLocator.cpp + PyPlug.cpp + PyPlugLocator.cpp + PyPoint.cpp + PyReference.cpp + PyReferenceLocator.cpp + PySegment.cpp + PySegmentLocator.cpp + PyTechnology.cpp + PyTransformation.cpp + PyUnit.cpp + PyUpdateSession.cpp + PyVertical.cpp + + ) + set ( includes hurricane/isobar/ProxyProperty.h + hurricane/isobar/PyBox.h + hurricane/isobar/PyCell.h + hurricane/isobar/PyCellLocator.h + hurricane/isobar/PyComponent.h + hurricane/isobar/PyComponentLocator.h + hurricane/isobar/PyContact.h + hurricane/isobar/PyDataBase.h + hurricane/isobar/PyEntity.h + hurricane/isobar/PyHorizontal.h + hurricane/isobar/PyHurricane.h + hurricane/isobar/PyHyperNet.h + hurricane/isobar/PyInstance.h + hurricane/isobar/PyInstanceLocator.h + hurricane/isobar/PyLayer.h + hurricane/isobar/PyLibrary.h + hurricane/isobar/PyName.h + hurricane/isobar/PyNet.h + hurricane/isobar/PyNetLocator.h + hurricane/isobar/PyOccurrence.h + hurricane/isobar/PyOccurrenceLocator.h + hurricane/isobar/PyPath.h + hurricane/isobar/PyPin.h + hurricane/isobar/PyPinLocator.h + hurricane/isobar/PyPlug.h + hurricane/isobar/PyPlugLocator.h + hurricane/isobar/PyPoint.h + hurricane/isobar/PyReference.h + hurricane/isobar/PyReferenceLocator.h + hurricane/isobar/PySegment.h + hurricane/isobar/PySegmentLocator.h + hurricane/isobar/PyTechnology.h + hurricane/isobar/PyTransformation.h + hurricane/isobar/PyUnit.h + hurricane/isobar/PyUpdateSession.h + hurricane/isobar/PyVertical.h + ) + add_library ( isobar SHARED ${sources} ) + target_link_libraries ( isobar hurricane ${PYTHON_LIBRARIES} ) -SET(includes ProxyProperty.h PyBox.h PyCell.h PyCellLocator.h - PyComponent.h PyComponentLocator.h PyContact.h - PyDataBase.h PyEntity.h PyHorizontal.h - PyHurricane.h PyHyperNet.h PyInstance.h PyInstanceLocator.h - PyLayer.h PyLibrary.h PyName.h PyNet.h PyNetLocator.h - PyOccurrence.h PyOccurrenceLocator.h PyPath.h PyPin.h PyPinLocator.h - PyPlug.h PyPlugLocator.h PyPoint.h PyReference.h PyReferenceLocator.h - PySegment.h PySegmentLocator.h PyTechnology.h PyTransformation.h - PyUnit.h PyUpdateSession.h PyVertical.h -) + add_library ( Hurricane MODULE ${sources} ) + set_target_properties ( Hurricane PROPERTIES + COMPILE_FLAGS "${COMPILE_FLAGS} -D__PYTHON_MODULE__=1" + PREFIX "" + ) + target_link_libraries ( Hurricane isobar hurricane ${PYTHON_LIBRARIES} ) -ADD_LIBRARY(isobar SHARED ${sources}) -TARGET_LINK_LIBRARIES(isobar hurricane ${PYTHON_LIBRARIES}) - -ADD_LIBRARY(Hurricane MODULE ${sources}) -SET_TARGET_PROPERTIES(Hurricane - PROPERTIES - COMPILE_FLAGS "${COMPILE_FLAGS} -D__PYTHON_MODULE__=1" - PREFIX "" -) -TARGET_LINK_LIBRARIES(Hurricane isobar hurricane ${PYTHON_LIBRARIES}) - -INSTALL(TARGETS isobar DESTINATION /lib) -INSTALL(TARGETS Hurricane DESTINATION /lib/python) + install ( TARGETS isobar DESTINATION /lib ) + install ( TARGETS Hurricane DESTINATION /lib/python ) + install ( FILES ${includes} DESTINATION /include/hurricane/isobar ) diff --git a/hurricane/src/pyext/ProxyProperty.cpp b/hurricane/src/pyext/ProxyProperty.cpp index a0e72045..7b070d8e 100644 --- a/hurricane/src/pyext/ProxyProperty.cpp +++ b/hurricane/src/pyext/ProxyProperty.cpp @@ -55,10 +55,10 @@ #include #include -#include "ProxyProperty.h" +#include "hurricane/isobar/ProxyProperty.h" -#include "Error.h" -#include "Warning.h" +#include "hurricane/Error.h" +#include "hurricane/Warning.h" using namespace Hurricane; diff --git a/hurricane/src/pyext/PyBox.cpp b/hurricane/src/pyext/PyBox.cpp index 75d09bf1..93f3467f 100644 --- a/hurricane/src/pyext/PyBox.cpp +++ b/hurricane/src/pyext/PyBox.cpp @@ -52,8 +52,8 @@ -#include "PyPoint.h" -#include "PyBox.h" +#include "hurricane/isobar/PyPoint.h" +#include "hurricane/isobar/PyBox.h" namespace Isobar { diff --git a/hurricane/src/pyext/PyCell.cpp b/hurricane/src/pyext/PyCell.cpp index 7f755c15..166c8ed3 100644 --- a/hurricane/src/pyext/PyCell.cpp +++ b/hurricane/src/pyext/PyCell.cpp @@ -49,18 +49,18 @@ // | | // x-----------------------------------------------------------------x -#include "PyCell.h" -#include "PyBox.h" -#include "PyName.h" -#include "PyLibrary.h" -#include "PyInstance.h" -#include "PyOccurrence.h" -#include "ProxyProperty.h" -#include "PyNet.h" -#include "PyNetLocator.h" -#include "PyReferenceLocator.h" -#include "PyInstanceLocator.h" -#include "PyOccurrenceLocator.h" +#include "hurricane/isobar/PyCell.h" +#include "hurricane/isobar/PyBox.h" +#include "hurricane/isobar/PyName.h" +#include "hurricane/isobar/PyLibrary.h" +#include "hurricane/isobar/PyInstance.h" +#include "hurricane/isobar/PyOccurrence.h" +#include "hurricane/isobar/ProxyProperty.h" +#include "hurricane/isobar/PyNet.h" +#include "hurricane/isobar/PyNetLocator.h" +#include "hurricane/isobar/PyReferenceLocator.h" +#include "hurricane/isobar/PyInstanceLocator.h" +#include "hurricane/isobar/PyOccurrenceLocator.h" namespace Isobar { diff --git a/hurricane/src/pyext/PyCellLocator.cpp b/hurricane/src/pyext/PyCellLocator.cpp index e3ed8389..8c379293 100644 --- a/hurricane/src/pyext/PyCellLocator.cpp +++ b/hurricane/src/pyext/PyCellLocator.cpp @@ -51,8 +51,8 @@ -# include "PyCellLocator.h" -# include "PyCell.h" +#include "hurricane/isobar/PyCellLocator.h" +#include "hurricane/isobar/PyCell.h" namespace Isobar { diff --git a/hurricane/src/pyext/PyComponent.cpp b/hurricane/src/pyext/PyComponent.cpp index 2d7bc1f1..730eb11b 100644 --- a/hurricane/src/pyext/PyComponent.cpp +++ b/hurricane/src/pyext/PyComponent.cpp @@ -49,16 +49,16 @@ // | | // x-----------------------------------------------------------------x -#include "PyNet.h" -#include "PyLayer.h" -#include "PyPoint.h" -#include "PyBox.h" -#include "PyComponent.h" -#include "PyPlug.h" -#include "PyHorizontal.h" -#include "PyVertical.h" -#include "PyContact.h" -#include "PyPin.h" +#include "hurricane/isobar/PyNet.h" +#include "hurricane/isobar/PyLayer.h" +#include "hurricane/isobar/PyPoint.h" +#include "hurricane/isobar/PyBox.h" +#include "hurricane/isobar/PyComponent.h" +#include "hurricane/isobar/PyPlug.h" +#include "hurricane/isobar/PyHorizontal.h" +#include "hurricane/isobar/PyVertical.h" +#include "hurricane/isobar/PyContact.h" +#include "hurricane/isobar/PyPin.h" namespace Isobar { diff --git a/hurricane/src/pyext/PyComponentLocator.cpp b/hurricane/src/pyext/PyComponentLocator.cpp index 64d8a2c1..af9fa0bb 100644 --- a/hurricane/src/pyext/PyComponentLocator.cpp +++ b/hurricane/src/pyext/PyComponentLocator.cpp @@ -50,8 +50,8 @@ -# include "PyComponentLocator.h" -# include "PyComponent.h" +#include "hurricane/isobar/PyComponentLocator.h" +#include "hurricane/isobar/PyComponent.h" namespace Isobar { diff --git a/hurricane/src/pyext/PyContact.cpp b/hurricane/src/pyext/PyContact.cpp index 75ae9bf2..1350a51c 100644 --- a/hurricane/src/pyext/PyContact.cpp +++ b/hurricane/src/pyext/PyContact.cpp @@ -52,11 +52,11 @@ -#include "PyNet.h" -#include "PyLayer.h" -#include "PyContact.h" -#include "PyHorizontal.h" -#include "PyVertical.h" +#include "hurricane/isobar/PyNet.h" +#include "hurricane/isobar/PyLayer.h" +#include "hurricane/isobar/PyContact.h" +#include "hurricane/isobar/PyHorizontal.h" +#include "hurricane/isobar/PyVertical.h" namespace Isobar { diff --git a/hurricane/src/pyext/PyDataBase.cpp b/hurricane/src/pyext/PyDataBase.cpp index 76398ee2..4e0c9e4b 100644 --- a/hurricane/src/pyext/PyDataBase.cpp +++ b/hurricane/src/pyext/PyDataBase.cpp @@ -52,8 +52,8 @@ -# include "PyDataBase.h" -# include "PyTechnology.h" +#include "hurricane/isobar/PyDataBase.h" +#include "hurricane/isobar/PyTechnology.h" namespace Isobar { diff --git a/hurricane/src/pyext/PyEntity.cpp b/hurricane/src/pyext/PyEntity.cpp index 8b5ae209..9e74710d 100644 --- a/hurricane/src/pyext/PyEntity.cpp +++ b/hurricane/src/pyext/PyEntity.cpp @@ -49,19 +49,19 @@ // | | // x-----------------------------------------------------------------x -#include "PyNet.h" -#include "PyLayer.h" -#include "PyPoint.h" -#include "PyBox.h" -#include "PyCell.h" -#include "PyInstance.h" -#include "PyReference.h" -#include "PyComponent.h" -#include "PyPlug.h" -#include "PyHorizontal.h" -#include "PyVertical.h" -#include "PyContact.h" -#include "PyPin.h" +#include "hurricane/isobar/PyNet.h" +#include "hurricane/isobar/PyLayer.h" +#include "hurricane/isobar/PyPoint.h" +#include "hurricane/isobar/PyBox.h" +#include "hurricane/isobar/PyCell.h" +#include "hurricane/isobar/PyInstance.h" +#include "hurricane/isobar/PyReference.h" +#include "hurricane/isobar/PyComponent.h" +#include "hurricane/isobar/PyPlug.h" +#include "hurricane/isobar/PyHorizontal.h" +#include "hurricane/isobar/PyVertical.h" +#include "hurricane/isobar/PyContact.h" +#include "hurricane/isobar/PyPin.h" namespace Isobar { diff --git a/hurricane/src/pyext/PyHorizontal.cpp b/hurricane/src/pyext/PyHorizontal.cpp index 8a09ed3e..4ef48a5a 100644 --- a/hurricane/src/pyext/PyHorizontal.cpp +++ b/hurricane/src/pyext/PyHorizontal.cpp @@ -52,9 +52,9 @@ -# include "PyNet.h" -# include "PyLayer.h" -# include "PyHorizontal.h" +#include "hurricane/isobar/PyNet.h" +#include "hurricane/isobar/PyLayer.h" +#include "hurricane/isobar/PyHorizontal.h" namespace Isobar { diff --git a/hurricane/src/pyext/PyHurricane.cpp b/hurricane/src/pyext/PyHurricane.cpp index 4a534397..67ed5c83 100644 --- a/hurricane/src/pyext/PyHurricane.cpp +++ b/hurricane/src/pyext/PyHurricane.cpp @@ -52,42 +52,42 @@ -#include "PyHurricane.h" -#include "PyUpdateSession.h" -#include "PyUnit.h" -#include "PyPoint.h" -#include "PyBox.h" -#include "PyTransformation.h" -#include "PyName.h" -#include "PyDataBase.h" -#include "PyLibrary.h" -#include "PyEntity.h" -#include "PyCell.h" -#include "PyLayer.h" -#include "PyPin.h" -#include "PyInstance.h" -#include "PyReference.h" -#include "PyNet.h" -#include "PyHyperNet.h" -#include "PyComponent.h" -#include "PyPlug.h" -#include "PySegment.h" -#include "PyContact.h" -#include "PyHorizontal.h" -#include "PyVertical.h" -#include "PyPath.h" -#include "PyOccurrence.h" -#include "PyInstanceLocator.h" -#include "PyPlugLocator.h" -#include "PyPinLocator.h" -#include "PySegmentLocator.h" -#include "PyComponentLocator.h" -#include "PyOccurrenceLocator.h" -#include "PyNetLocator.h" -#include "PyCellLocator.h" -#include "PyReferenceLocator.h" -#include "PyTechnology.h" -#include "NetExternalComponents.h" +#include "hurricane/isobar/PyHurricane.h" +#include "hurricane/isobar/PyUpdateSession.h" +#include "hurricane/isobar/PyUnit.h" +#include "hurricane/isobar/PyPoint.h" +#include "hurricane/isobar/PyBox.h" +#include "hurricane/isobar/PyTransformation.h" +#include "hurricane/isobar/PyName.h" +#include "hurricane/isobar/PyDataBase.h" +#include "hurricane/isobar/PyLibrary.h" +#include "hurricane/isobar/PyEntity.h" +#include "hurricane/isobar/PyCell.h" +#include "hurricane/isobar/PyLayer.h" +#include "hurricane/isobar/PyPin.h" +#include "hurricane/isobar/PyInstance.h" +#include "hurricane/isobar/PyReference.h" +#include "hurricane/isobar/PyNet.h" +#include "hurricane/isobar/PyHyperNet.h" +#include "hurricane/isobar/PyComponent.h" +#include "hurricane/isobar/PyPlug.h" +#include "hurricane/isobar/PySegment.h" +#include "hurricane/isobar/PyContact.h" +#include "hurricane/isobar/PyHorizontal.h" +#include "hurricane/isobar/PyVertical.h" +#include "hurricane/isobar/PyPath.h" +#include "hurricane/isobar/PyOccurrence.h" +#include "hurricane/isobar/PyInstanceLocator.h" +#include "hurricane/isobar/PyPlugLocator.h" +#include "hurricane/isobar/PyPinLocator.h" +#include "hurricane/isobar/PySegmentLocator.h" +#include "hurricane/isobar/PyComponentLocator.h" +#include "hurricane/isobar/PyOccurrenceLocator.h" +#include "hurricane/isobar/PyNetLocator.h" +#include "hurricane/isobar/PyCellLocator.h" +#include "hurricane/isobar/PyReferenceLocator.h" +#include "hurricane/isobar/PyTechnology.h" +#include "hurricane/NetExternalComponents.h" namespace Isobar { diff --git a/hurricane/src/pyext/PyHyperNet.cpp b/hurricane/src/pyext/PyHyperNet.cpp index ad3bba61..1342cf74 100644 --- a/hurricane/src/pyext/PyHyperNet.cpp +++ b/hurricane/src/pyext/PyHyperNet.cpp @@ -52,10 +52,10 @@ -#include "PyHyperNet.h" -#include "PyCell.h" -#include "PyOccurrence.h" -#include "PyOccurrenceLocator.h" +#include "hurricane/isobar/PyHyperNet.h" +#include "hurricane/isobar/PyCell.h" +#include "hurricane/isobar/PyOccurrence.h" +#include "hurricane/isobar/PyOccurrenceLocator.h" using namespace Hurricane; diff --git a/hurricane/src/pyext/PyInstance.cpp b/hurricane/src/pyext/PyInstance.cpp index 206ddc9f..0970b446 100644 --- a/hurricane/src/pyext/PyInstance.cpp +++ b/hurricane/src/pyext/PyInstance.cpp @@ -49,15 +49,15 @@ // | | // x-----------------------------------------------------------------x -#include "PyBox.h" -#include "PyName.h" -#include "PyTransformation.h" -#include "PyLibrary.h" -#include "PyCell.h" -#include "PyInstance.h" -#include "PyNet.h" -#include "PyPlug.h" -#include "PyPlugLocator.h" +#include "hurricane/isobar/PyBox.h" +#include "hurricane/isobar/PyName.h" +#include "hurricane/isobar/PyTransformation.h" +#include "hurricane/isobar/PyLibrary.h" +#include "hurricane/isobar/PyCell.h" +#include "hurricane/isobar/PyInstance.h" +#include "hurricane/isobar/PyNet.h" +#include "hurricane/isobar/PyPlug.h" +#include "hurricane/isobar/PyPlugLocator.h" namespace Isobar { diff --git a/hurricane/src/pyext/PyInstanceLocator.cpp b/hurricane/src/pyext/PyInstanceLocator.cpp index ff3c503b..5b880509 100644 --- a/hurricane/src/pyext/PyInstanceLocator.cpp +++ b/hurricane/src/pyext/PyInstanceLocator.cpp @@ -52,8 +52,8 @@ -# include "PyInstanceLocator.h" -# include "PyInstance.h" +#include "hurricane/isobar/PyInstanceLocator.h" +#include "hurricane/isobar/PyInstance.h" namespace Isobar { diff --git a/hurricane/src/pyext/PyLayer.cpp b/hurricane/src/pyext/PyLayer.cpp index e138a2c5..e30d2586 100644 --- a/hurricane/src/pyext/PyLayer.cpp +++ b/hurricane/src/pyext/PyLayer.cpp @@ -52,9 +52,9 @@ -#include "PyLayer.h" -#include "PyName.h" -#include "PyTechnology.h" +#include "hurricane/isobar/PyLayer.h" +#include "hurricane/isobar/PyName.h" +#include "hurricane/isobar/PyTechnology.h" namespace Isobar { diff --git a/hurricane/src/pyext/PyLibrary.cpp b/hurricane/src/pyext/PyLibrary.cpp index d7a2bd2d..0bbcb1c2 100644 --- a/hurricane/src/pyext/PyLibrary.cpp +++ b/hurricane/src/pyext/PyLibrary.cpp @@ -52,11 +52,11 @@ -#include "PyDataBase.h" -#include "PyName.h" -#include "PyLibrary.h" -#include "PyCell.h" -#include "PyCellLocator.h" +#include "hurricane/isobar/PyDataBase.h" +#include "hurricane/isobar/PyName.h" +#include "hurricane/isobar/PyLibrary.h" +#include "hurricane/isobar/PyCell.h" +#include "hurricane/isobar/PyCellLocator.h" namespace Isobar { diff --git a/hurricane/src/pyext/PyName.cpp b/hurricane/src/pyext/PyName.cpp index 1807cff1..06fd107d 100644 --- a/hurricane/src/pyext/PyName.cpp +++ b/hurricane/src/pyext/PyName.cpp @@ -49,7 +49,7 @@ // | | // x-----------------------------------------------------------------x -#include "PyName.h" +#include "hurricane/isobar/PyName.h" namespace Isobar { diff --git a/hurricane/src/pyext/PyNet.cpp b/hurricane/src/pyext/PyNet.cpp index ec9751c2..8c7f145a 100644 --- a/hurricane/src/pyext/PyNet.cpp +++ b/hurricane/src/pyext/PyNet.cpp @@ -52,16 +52,16 @@ -#include "PyNet.h" -#include "PyName.h" -#include "PyCell.h" -#include "PyPoint.h" -#include "PyPlugLocator.h" -#include "PySegmentLocator.h" -#include "PyComponentLocator.h" -#include "PyPinLocator.h" +#include "hurricane/isobar/PyNet.h" +#include "hurricane/isobar/PyName.h" +#include "hurricane/isobar/PyCell.h" +#include "hurricane/isobar/PyPoint.h" +#include "hurricane/isobar/PyPlugLocator.h" +#include "hurricane/isobar/PySegmentLocator.h" +#include "hurricane/isobar/PyComponentLocator.h" +#include "hurricane/isobar/PyPinLocator.h" -#include "NetExternalComponents.h" +#include "hurricane/NetExternalComponents.h" using namespace Hurricane; diff --git a/hurricane/src/pyext/PyNetLocator.cpp b/hurricane/src/pyext/PyNetLocator.cpp index f396e1e1..9ca5e3f4 100644 --- a/hurricane/src/pyext/PyNetLocator.cpp +++ b/hurricane/src/pyext/PyNetLocator.cpp @@ -50,8 +50,8 @@ -#include "PyNetLocator.h" -#include "PyNet.h" +#include "hurricane/isobar/PyNetLocator.h" +#include "hurricane/isobar/PyNet.h" namespace Isobar { diff --git a/hurricane/src/pyext/PyOccurrence.cpp b/hurricane/src/pyext/PyOccurrence.cpp index 0e9752ad..e567f830 100644 --- a/hurricane/src/pyext/PyOccurrence.cpp +++ b/hurricane/src/pyext/PyOccurrence.cpp @@ -49,13 +49,13 @@ // | | // x-----------------------------------------------------------------x -#include "PyBox.h" -#include "PyTransformation.h" -#include "PyName.h" -#include "PyPath.h" -#include "PyOccurrence.h" -#include "PyCell.h" -#include "PySegment.h" +#include "hurricane/isobar/PyBox.h" +#include "hurricane/isobar/PyTransformation.h" +#include "hurricane/isobar/PyName.h" +#include "hurricane/isobar/PyPath.h" +#include "hurricane/isobar/PyOccurrence.h" +#include "hurricane/isobar/PyCell.h" +#include "hurricane/isobar/PySegment.h" namespace Isobar { diff --git a/hurricane/src/pyext/PyOccurrenceLocator.cpp b/hurricane/src/pyext/PyOccurrenceLocator.cpp index 018dea3c..f28ca975 100644 --- a/hurricane/src/pyext/PyOccurrenceLocator.cpp +++ b/hurricane/src/pyext/PyOccurrenceLocator.cpp @@ -50,8 +50,8 @@ -#include "PyOccurrence.h" -#include "PyOccurrenceLocator.h" +#include "hurricane/isobar/PyOccurrence.h" +#include "hurricane/isobar/PyOccurrenceLocator.h" namespace Isobar { diff --git a/hurricane/src/pyext/PyPath.cpp b/hurricane/src/pyext/PyPath.cpp index 2ed3b729..a79ccde2 100644 --- a/hurricane/src/pyext/PyPath.cpp +++ b/hurricane/src/pyext/PyPath.cpp @@ -49,12 +49,12 @@ // | | // x-----------------------------------------------------------------x -#include "PyTransformation.h" -#include "PyName.h" -#include "PyPath.h" -#include "PyCell.h" -#include "PyInstance.h" -#include "PyInstanceLocator.h" +#include "hurricane/isobar/PyTransformation.h" +#include "hurricane/isobar/PyName.h" +#include "hurricane/isobar/PyPath.h" +#include "hurricane/isobar/PyCell.h" +#include "hurricane/isobar/PyInstance.h" +#include "hurricane/isobar/PyInstanceLocator.h" namespace Isobar { diff --git a/hurricane/src/pyext/PyPin.cpp b/hurricane/src/pyext/PyPin.cpp index f0a5a38e..b928d0c5 100644 --- a/hurricane/src/pyext/PyPin.cpp +++ b/hurricane/src/pyext/PyPin.cpp @@ -49,10 +49,10 @@ // | | // x-----------------------------------------------------------------x -#include "PyPin.h" -#include "PyNet.h" -#include "PyName.h" -#include "PyLayer.h" +#include "hurricane/isobar/PyPin.h" +#include "hurricane/isobar/PyNet.h" +#include "hurricane/isobar/PyName.h" +#include "hurricane/isobar/PyLayer.h" namespace Isobar { diff --git a/hurricane/src/pyext/PyPinLocator.cpp b/hurricane/src/pyext/PyPinLocator.cpp index 91c5656a..309287ec 100644 --- a/hurricane/src/pyext/PyPinLocator.cpp +++ b/hurricane/src/pyext/PyPinLocator.cpp @@ -52,8 +52,8 @@ -#include "PyPinLocator.h" -#include "PyPin.h" +#include "hurricane/isobar/PyPinLocator.h" +#include "hurricane/isobar/PyPin.h" namespace Isobar { diff --git a/hurricane/src/pyext/PyPlug.cpp b/hurricane/src/pyext/PyPlug.cpp index d6109aa7..396de3a9 100644 --- a/hurricane/src/pyext/PyPlug.cpp +++ b/hurricane/src/pyext/PyPlug.cpp @@ -52,9 +52,9 @@ -#include "PyPlug.h" -#include "PyInstance.h" -#include "PyNet.h" +#include "hurricane/isobar/PyPlug.h" +#include "hurricane/isobar/PyInstance.h" +#include "hurricane/isobar/PyNet.h" namespace Isobar { diff --git a/hurricane/src/pyext/PyPlugLocator.cpp b/hurricane/src/pyext/PyPlugLocator.cpp index 3422bed4..b6440eff 100644 --- a/hurricane/src/pyext/PyPlugLocator.cpp +++ b/hurricane/src/pyext/PyPlugLocator.cpp @@ -52,8 +52,8 @@ -#include "PyPlugLocator.h" -#include "PyPlug.h" +#include "hurricane/isobar/PyPlugLocator.h" +#include "hurricane/isobar/PyPlug.h" namespace Isobar { diff --git a/hurricane/src/pyext/PyPoint.cpp b/hurricane/src/pyext/PyPoint.cpp index e334c495..24b57972 100644 --- a/hurricane/src/pyext/PyPoint.cpp +++ b/hurricane/src/pyext/PyPoint.cpp @@ -52,7 +52,7 @@ -#include "PyPoint.h" +#include "hurricane/isobar/PyPoint.h" namespace Isobar { diff --git a/hurricane/src/pyext/PyReference.cpp b/hurricane/src/pyext/PyReference.cpp index 893af33a..e69ee9d3 100644 --- a/hurricane/src/pyext/PyReference.cpp +++ b/hurricane/src/pyext/PyReference.cpp @@ -52,11 +52,11 @@ -# include "PyReference.h" -# include "PyPoint.h" -# include "PyName.h" -# include "PyCell.h" -# include "PyNet.h" +#include "hurricane/isobar/PyReference.h" +#include "hurricane/isobar/PyPoint.h" +#include "hurricane/isobar/PyName.h" +#include "hurricane/isobar/PyCell.h" +#include "hurricane/isobar/PyNet.h" namespace Isobar { diff --git a/hurricane/src/pyext/PyReferenceLocator.cpp b/hurricane/src/pyext/PyReferenceLocator.cpp index 3e469d31..49d822d9 100644 --- a/hurricane/src/pyext/PyReferenceLocator.cpp +++ b/hurricane/src/pyext/PyReferenceLocator.cpp @@ -47,8 +47,8 @@ // | | // x-----------------------------------------------------------------x -#include "PyReferenceLocator.h" -#include "PyReference.h" +#include "hurricane/isobar/PyReferenceLocator.h" +#include "hurricane/isobar/PyReference.h" namespace Isobar { diff --git a/hurricane/src/pyext/PySegment.cpp b/hurricane/src/pyext/PySegment.cpp index f3cd5fc6..0005e10d 100644 --- a/hurricane/src/pyext/PySegment.cpp +++ b/hurricane/src/pyext/PySegment.cpp @@ -52,12 +52,12 @@ -#include "PyNet.h" -#include "PyLayer.h" -#include "PySegment.h" -#include "PyHorizontal.h" -#include "PyVertical.h" -#include "PyPoint.h" +#include "hurricane/isobar/PyNet.h" +#include "hurricane/isobar/PyLayer.h" +#include "hurricane/isobar/PySegment.h" +#include "hurricane/isobar/PyHorizontal.h" +#include "hurricane/isobar/PyVertical.h" +#include "hurricane/isobar/PyPoint.h" namespace Isobar { diff --git a/hurricane/src/pyext/PySegmentLocator.cpp b/hurricane/src/pyext/PySegmentLocator.cpp index 6912786c..98d9d603 100644 --- a/hurricane/src/pyext/PySegmentLocator.cpp +++ b/hurricane/src/pyext/PySegmentLocator.cpp @@ -52,8 +52,8 @@ -#include "PySegmentLocator.h" -#include "PySegment.h" +#include "hurricane/isobar/PySegmentLocator.h" +#include "hurricane/isobar/PySegment.h" namespace Isobar { diff --git a/hurricane/src/pyext/PyTechnology.cpp b/hurricane/src/pyext/PyTechnology.cpp index effe7b82..aefdaef7 100644 --- a/hurricane/src/pyext/PyTechnology.cpp +++ b/hurricane/src/pyext/PyTechnology.cpp @@ -52,10 +52,10 @@ -#include "PyDataBase.h" -#include "PyName.h" -#include "PyLayer.h" -#include "PyTechnology.h" +#include "hurricane/isobar/PyDataBase.h" +#include "hurricane/isobar/PyName.h" +#include "hurricane/isobar/PyLayer.h" +#include "hurricane/isobar/PyTechnology.h" namespace Isobar { diff --git a/hurricane/src/pyext/PyTransformation.cpp b/hurricane/src/pyext/PyTransformation.cpp index 2778e533..190e0301 100644 --- a/hurricane/src/pyext/PyTransformation.cpp +++ b/hurricane/src/pyext/PyTransformation.cpp @@ -52,9 +52,9 @@ -#include "PyPoint.h" -#include "PyBox.h" -#include "PyTransformation.h" +#include "hurricane/isobar/PyPoint.h" +#include "hurricane/isobar/PyBox.h" +#include "hurricane/isobar/PyTransformation.h" namespace Isobar { diff --git a/hurricane/src/pyext/PyUnit.cpp b/hurricane/src/pyext/PyUnit.cpp index 194b5ba6..3139b2ae 100644 --- a/hurricane/src/pyext/PyUnit.cpp +++ b/hurricane/src/pyext/PyUnit.cpp @@ -52,7 +52,7 @@ -#include "PyUnit.h" +#include "hurricane/isobar/PyUnit.h" namespace Isobar { diff --git a/hurricane/src/pyext/PyUpdateSession.cpp b/hurricane/src/pyext/PyUpdateSession.cpp index 1e739aa5..0c13d98a 100644 --- a/hurricane/src/pyext/PyUpdateSession.cpp +++ b/hurricane/src/pyext/PyUpdateSession.cpp @@ -49,7 +49,7 @@ // | | // x-----------------------------------------------------------------x -#include "PyUpdateSession.h" +#include "hurricane/isobar/PyUpdateSession.h" namespace Isobar { diff --git a/hurricane/src/pyext/PyVertical.cpp b/hurricane/src/pyext/PyVertical.cpp index 8ee0782d..aa343ed9 100644 --- a/hurricane/src/pyext/PyVertical.cpp +++ b/hurricane/src/pyext/PyVertical.cpp @@ -52,9 +52,9 @@ -#include "PyNet.h" -#include "PyLayer.h" -#include "PyVertical.h" +#include "hurricane/isobar/PyNet.h" +#include "hurricane/isobar/PyLayer.h" +#include "hurricane/isobar/PyVertical.h" namespace Isobar { diff --git a/hurricane/src/pyext/ProxyProperty.h b/hurricane/src/pyext/hurricane/isobar/ProxyProperty.h similarity index 98% rename from hurricane/src/pyext/ProxyProperty.h rename to hurricane/src/pyext/hurricane/isobar/ProxyProperty.h index cc1b9864..543eab21 100644 --- a/hurricane/src/pyext/ProxyProperty.h +++ b/hurricane/src/pyext/hurricane/isobar/ProxyProperty.h @@ -57,8 +57,8 @@ #define __PROXYPROPERTY__ -#include "DBo.h" -#include "Property.h" +#include "hurricane/DBo.h" +#include "hurricane/Property.h" namespace Isobar { diff --git a/hurricane/src/pyext/PyBox.h b/hurricane/src/pyext/hurricane/isobar/PyBox.h similarity index 97% rename from hurricane/src/pyext/PyBox.h rename to hurricane/src/pyext/hurricane/isobar/PyBox.h index 41dd847b..2916c99f 100644 --- a/hurricane/src/pyext/PyBox.h +++ b/hurricane/src/pyext/hurricane/isobar/PyBox.h @@ -57,9 +57,9 @@ # define __PYBOX__ -# include "PyHurricane.h" +#include "hurricane/isobar/PyHurricane.h" -# include "Box.h" +#include "hurricane/Box.h" namespace Isobar { diff --git a/hurricane/src/pyext/PyCell.h b/hurricane/src/pyext/hurricane/isobar/PyCell.h similarity index 98% rename from hurricane/src/pyext/PyCell.h rename to hurricane/src/pyext/hurricane/isobar/PyCell.h index 0d7e2f02..caf037cb 100644 --- a/hurricane/src/pyext/PyCell.h +++ b/hurricane/src/pyext/hurricane/isobar/PyCell.h @@ -57,9 +57,9 @@ #define __PYCELL__ -#include "PyEntity.h" +#include "hurricane/isobar/PyEntity.h" -#include "Cell.h" +#include "hurricane/Cell.h" namespace Isobar { diff --git a/hurricane/src/pyext/PyCellLocator.h b/hurricane/src/pyext/hurricane/isobar/PyCellLocator.h similarity index 97% rename from hurricane/src/pyext/PyCellLocator.h rename to hurricane/src/pyext/hurricane/isobar/PyCellLocator.h index 76155813..6581f331 100644 --- a/hurricane/src/pyext/PyCellLocator.h +++ b/hurricane/src/pyext/hurricane/isobar/PyCellLocator.h @@ -56,10 +56,10 @@ #define __PYCELLLOCATOR__ -#include "PyHurricane.h" +#include "hurricane/isobar/PyHurricane.h" -#include "Locator.h" -#include "Cell.h" +#include "hurricane/Locator.h" +#include "hurricane/Cell.h" namespace Isobar { diff --git a/hurricane/src/pyext/PyComponent.h b/hurricane/src/pyext/hurricane/isobar/PyComponent.h similarity index 97% rename from hurricane/src/pyext/PyComponent.h rename to hurricane/src/pyext/hurricane/isobar/PyComponent.h index 1aa22bea..315e3b87 100644 --- a/hurricane/src/pyext/PyComponent.h +++ b/hurricane/src/pyext/hurricane/isobar/PyComponent.h @@ -57,9 +57,9 @@ #define __PYCOMPONENT__ -#include "PyEntity.h" +#include "hurricane/isobar/PyEntity.h" -#include "Component.h" +#include "hurricane/Component.h" namespace Isobar { diff --git a/hurricane/src/pyext/PyComponentLocator.h b/hurricane/src/pyext/hurricane/isobar/PyComponentLocator.h similarity index 97% rename from hurricane/src/pyext/PyComponentLocator.h rename to hurricane/src/pyext/hurricane/isobar/PyComponentLocator.h index 6937eca1..ab81c741 100644 --- a/hurricane/src/pyext/PyComponentLocator.h +++ b/hurricane/src/pyext/hurricane/isobar/PyComponentLocator.h @@ -55,9 +55,9 @@ #define __PYCOMPONENTLOCATOR__ -#include "PyHurricane.h" +#include "hurricane/isobar/PyHurricane.h" -#include "Component.h" +#include "hurricane/Component.h" namespace Isobar { diff --git a/hurricane/src/pyext/PyContact.h b/hurricane/src/pyext/hurricane/isobar/PyContact.h similarity index 97% rename from hurricane/src/pyext/PyContact.h rename to hurricane/src/pyext/hurricane/isobar/PyContact.h index 3c2e2aad..322fa010 100644 --- a/hurricane/src/pyext/PyContact.h +++ b/hurricane/src/pyext/hurricane/isobar/PyContact.h @@ -57,9 +57,9 @@ #define __PYCONTACT__ -#include "PyComponent.h" +#include "hurricane/isobar/PyComponent.h" -#include "Contact.h" +#include "hurricane/Contact.h" namespace Isobar { diff --git a/hurricane/src/pyext/PyDataBase.h b/hurricane/src/pyext/hurricane/isobar/PyDataBase.h similarity index 97% rename from hurricane/src/pyext/PyDataBase.h rename to hurricane/src/pyext/hurricane/isobar/PyDataBase.h index a7702f37..0000f2f9 100644 --- a/hurricane/src/pyext/PyDataBase.h +++ b/hurricane/src/pyext/hurricane/isobar/PyDataBase.h @@ -57,9 +57,9 @@ #define __PYDATABASE__ -#include "PyHurricane.h" +#include "hurricane/isobar/PyHurricane.h" -#include "DataBase.h" +#include "hurricane/DataBase.h" namespace Isobar { diff --git a/hurricane/src/pyext/PyEntity.h b/hurricane/src/pyext/hurricane/isobar/PyEntity.h similarity index 97% rename from hurricane/src/pyext/PyEntity.h rename to hurricane/src/pyext/hurricane/isobar/PyEntity.h index c37eb7fb..0570110e 100644 --- a/hurricane/src/pyext/PyEntity.h +++ b/hurricane/src/pyext/hurricane/isobar/PyEntity.h @@ -57,9 +57,9 @@ #define __PYENTITY__ -#include "PyHurricane.h" +#include "hurricane/isobar/PyHurricane.h" -#include "Entity.h" +#include "hurricane/Entity.h" namespace Isobar { diff --git a/hurricane/src/pyext/PyHorizontal.h b/hurricane/src/pyext/hurricane/isobar/PyHorizontal.h similarity index 97% rename from hurricane/src/pyext/PyHorizontal.h rename to hurricane/src/pyext/hurricane/isobar/PyHorizontal.h index 437856c9..ceb1886b 100644 --- a/hurricane/src/pyext/PyHorizontal.h +++ b/hurricane/src/pyext/hurricane/isobar/PyHorizontal.h @@ -57,9 +57,9 @@ #define __PYHORIZONTAL__ -#include "PySegment.h" +#include "hurricane/isobar/PySegment.h" -#include "Horizontal.h" +#include "hurricane/Horizontal.h" namespace Isobar { diff --git a/hurricane/src/pyext/PyHurricane.h b/hurricane/src/pyext/hurricane/isobar/PyHurricane.h similarity index 99% rename from hurricane/src/pyext/PyHurricane.h rename to hurricane/src/pyext/hurricane/isobar/PyHurricane.h index 538c801c..5462434b 100644 --- a/hurricane/src/pyext/PyHurricane.h +++ b/hurricane/src/pyext/hurricane/isobar/PyHurricane.h @@ -64,10 +64,10 @@ #include #include -#include "Error.h" -#include "Warning.h" +#include "hurricane/Error.h" +#include "hurricane/Warning.h" -#include "ProxyProperty.h" +#include "hurricane/isobar/ProxyProperty.h" namespace Isobar { diff --git a/hurricane/src/pyext/PyHyperNet.h b/hurricane/src/pyext/hurricane/isobar/PyHyperNet.h similarity index 96% rename from hurricane/src/pyext/PyHyperNet.h rename to hurricane/src/pyext/hurricane/isobar/PyHyperNet.h index 4d1bb7ad..0bd4726c 100644 --- a/hurricane/src/pyext/PyHyperNet.h +++ b/hurricane/src/pyext/hurricane/isobar/PyHyperNet.h @@ -53,10 +53,10 @@ #define __PYHYPERNET__ -#include "PyHurricane.h" -#include "PyPlugLocator.h" +#include "hurricane/isobar/PyHurricane.h" +#include "hurricane/isobar/PyPlugLocator.h" -#include "HyperNet.h" +#include "hurricane/HyperNet.h" namespace Isobar { diff --git a/hurricane/src/pyext/PyInstance.h b/hurricane/src/pyext/hurricane/isobar/PyInstance.h similarity index 97% rename from hurricane/src/pyext/PyInstance.h rename to hurricane/src/pyext/hurricane/isobar/PyInstance.h index 6391839c..a38da11c 100644 --- a/hurricane/src/pyext/PyInstance.h +++ b/hurricane/src/pyext/hurricane/isobar/PyInstance.h @@ -57,9 +57,9 @@ #define __PYINSTANCE__ -#include "PyEntity.h" +#include "hurricane/isobar/PyEntity.h" -#include "Instance.h" +#include "hurricane/Instance.h" namespace Isobar { diff --git a/hurricane/src/pyext/PyInstanceLocator.h b/hurricane/src/pyext/hurricane/isobar/PyInstanceLocator.h similarity index 96% rename from hurricane/src/pyext/PyInstanceLocator.h rename to hurricane/src/pyext/hurricane/isobar/PyInstanceLocator.h index e471aa4f..f3cb6745 100644 --- a/hurricane/src/pyext/PyInstanceLocator.h +++ b/hurricane/src/pyext/hurricane/isobar/PyInstanceLocator.h @@ -57,10 +57,10 @@ #define __PYINSTANCELOCATOR__ -#include "PyHurricane.h" +#include "hurricane/isobar/PyHurricane.h" -#include "Locator.h" -#include "Instance.h" +#include "hurricane/Locator.h" +#include "hurricane/Instance.h" namespace Isobar { diff --git a/hurricane/src/pyext/PyLayer.h b/hurricane/src/pyext/hurricane/isobar/PyLayer.h similarity index 97% rename from hurricane/src/pyext/PyLayer.h rename to hurricane/src/pyext/hurricane/isobar/PyLayer.h index 787cb28e..3e25e435 100644 --- a/hurricane/src/pyext/PyLayer.h +++ b/hurricane/src/pyext/hurricane/isobar/PyLayer.h @@ -52,8 +52,8 @@ # ifndef __PYLAYER__ # define __PYLAYER__ -# include "PyHurricane.h" -# include "Layer.h" +#include "hurricane/isobar/PyHurricane.h" +#include "hurricane/Layer.h" namespace Isobar { diff --git a/hurricane/src/pyext/PyLibrary.h b/hurricane/src/pyext/hurricane/isobar/PyLibrary.h similarity index 97% rename from hurricane/src/pyext/PyLibrary.h rename to hurricane/src/pyext/hurricane/isobar/PyLibrary.h index e38fe05a..00dfb2e8 100644 --- a/hurricane/src/pyext/PyLibrary.h +++ b/hurricane/src/pyext/hurricane/isobar/PyLibrary.h @@ -53,9 +53,9 @@ #define __PYLIBRARY__ -#include "PyHurricane.h" +#include "hurricane/isobar/PyHurricane.h" -#include "Library.h" +#include "hurricane/Library.h" namespace Isobar { diff --git a/hurricane/src/pyext/PyName.h b/hurricane/src/pyext/hurricane/isobar/PyName.h similarity index 97% rename from hurricane/src/pyext/PyName.h rename to hurricane/src/pyext/hurricane/isobar/PyName.h index 03b6e4c6..eefd4a52 100644 --- a/hurricane/src/pyext/PyName.h +++ b/hurricane/src/pyext/hurricane/isobar/PyName.h @@ -57,9 +57,9 @@ #define __PYNAME__ -#include "PyHurricane.h" +#include "hurricane/isobar/PyHurricane.h" -#include "Name.h" +#include "hurricane/Name.h" namespace Isobar { diff --git a/hurricane/src/pyext/PyNet.h b/hurricane/src/pyext/hurricane/isobar/PyNet.h similarity index 98% rename from hurricane/src/pyext/PyNet.h rename to hurricane/src/pyext/hurricane/isobar/PyNet.h index 8786ce30..ec60ddb6 100644 --- a/hurricane/src/pyext/PyNet.h +++ b/hurricane/src/pyext/hurricane/isobar/PyNet.h @@ -57,9 +57,9 @@ #define __PYNET__ -#include "PyEntity.h" +#include "hurricane/isobar/PyEntity.h" -#include "Net.h" +#include "hurricane/Net.h" namespace Isobar { diff --git a/hurricane/src/pyext/PyNetLocator.h b/hurricane/src/pyext/hurricane/isobar/PyNetLocator.h similarity index 97% rename from hurricane/src/pyext/PyNetLocator.h rename to hurricane/src/pyext/hurricane/isobar/PyNetLocator.h index e8828d25..90bf3e5f 100644 --- a/hurricane/src/pyext/PyNetLocator.h +++ b/hurricane/src/pyext/hurricane/isobar/PyNetLocator.h @@ -55,10 +55,10 @@ # define __PYNETLOCATOR__ -# include "PyHurricane.h" +#include "hurricane/isobar/PyHurricane.h" -# include "Locator.h" -# include "Net.h" +#include "hurricane/Locator.h" +#include "hurricane/Net.h" namespace Isobar { diff --git a/hurricane/src/pyext/PyOccurrence.h b/hurricane/src/pyext/hurricane/isobar/PyOccurrence.h similarity index 97% rename from hurricane/src/pyext/PyOccurrence.h rename to hurricane/src/pyext/hurricane/isobar/PyOccurrence.h index 53bfcf72..5612d2e4 100644 --- a/hurricane/src/pyext/PyOccurrence.h +++ b/hurricane/src/pyext/hurricane/isobar/PyOccurrence.h @@ -57,9 +57,9 @@ # define __PYOCCURRENCE__ -# include "PyHurricane.h" +#include "hurricane/isobar/PyHurricane.h" -# include "Occurrence.h" +#include "hurricane/Occurrence.h" namespace Isobar { diff --git a/hurricane/src/pyext/PyOccurrenceLocator.h b/hurricane/src/pyext/hurricane/isobar/PyOccurrenceLocator.h similarity index 97% rename from hurricane/src/pyext/PyOccurrenceLocator.h rename to hurricane/src/pyext/hurricane/isobar/PyOccurrenceLocator.h index 4b653e18..be07fe51 100644 --- a/hurricane/src/pyext/PyOccurrenceLocator.h +++ b/hurricane/src/pyext/hurricane/isobar/PyOccurrenceLocator.h @@ -55,9 +55,9 @@ # define __PYOCCURRENCELOCATOR__ -# include "PyHurricane.h" +#include "hurricane/isobar/PyHurricane.h" -# include "Occurrence.h" +#include "hurricane/Occurrence.h" namespace Isobar { diff --git a/hurricane/src/pyext/PyPath.h b/hurricane/src/pyext/hurricane/isobar/PyPath.h similarity index 97% rename from hurricane/src/pyext/PyPath.h rename to hurricane/src/pyext/hurricane/isobar/PyPath.h index b9087962..a8b5d42e 100644 --- a/hurricane/src/pyext/PyPath.h +++ b/hurricane/src/pyext/hurricane/isobar/PyPath.h @@ -57,9 +57,9 @@ #define __PYPATH__ -#include "PyHurricane.h" +#include "hurricane/isobar/PyHurricane.h" -#include "Path.h" +#include "hurricane/Path.h" namespace Isobar { diff --git a/hurricane/src/pyext/PyPin.h b/hurricane/src/pyext/hurricane/isobar/PyPin.h similarity index 98% rename from hurricane/src/pyext/PyPin.h rename to hurricane/src/pyext/hurricane/isobar/PyPin.h index 22754a63..230baf40 100644 --- a/hurricane/src/pyext/PyPin.h +++ b/hurricane/src/pyext/hurricane/isobar/PyPin.h @@ -52,8 +52,8 @@ #ifndef __PYPIN__ #define __PYPIN__ -#include "PyContact.h" -#include "Pin.h" +#include "hurricane/isobar/PyContact.h" +#include "hurricane/Pin.h" namespace Isobar { diff --git a/hurricane/src/pyext/PyPinLocator.h b/hurricane/src/pyext/hurricane/isobar/PyPinLocator.h similarity index 97% rename from hurricane/src/pyext/PyPinLocator.h rename to hurricane/src/pyext/hurricane/isobar/PyPinLocator.h index da4e9222..3bb3d57e 100644 --- a/hurricane/src/pyext/PyPinLocator.h +++ b/hurricane/src/pyext/hurricane/isobar/PyPinLocator.h @@ -57,10 +57,10 @@ # define __PYPINLOCATOR__ -# include "PyHurricane.h" +#include "hurricane/isobar/PyHurricane.h" -# include "Locator.h" -# include "Pin.h" +#include "hurricane/Locator.h" +#include "hurricane/Pin.h" namespace Isobar { diff --git a/hurricane/src/pyext/PyPlug.h b/hurricane/src/pyext/hurricane/isobar/PyPlug.h similarity index 97% rename from hurricane/src/pyext/PyPlug.h rename to hurricane/src/pyext/hurricane/isobar/PyPlug.h index d4a16cdc..a2f1d67b 100644 --- a/hurricane/src/pyext/PyPlug.h +++ b/hurricane/src/pyext/hurricane/isobar/PyPlug.h @@ -57,9 +57,9 @@ # define __PYPLUG__ -# include "PyComponent.h" +#include "hurricane/isobar/PyComponent.h" -# include "Plug.h" +#include "hurricane/Plug.h" namespace Isobar { diff --git a/hurricane/src/pyext/PyPlugLocator.h b/hurricane/src/pyext/hurricane/isobar/PyPlugLocator.h similarity index 97% rename from hurricane/src/pyext/PyPlugLocator.h rename to hurricane/src/pyext/hurricane/isobar/PyPlugLocator.h index ffaa5d22..b931d702 100644 --- a/hurricane/src/pyext/PyPlugLocator.h +++ b/hurricane/src/pyext/hurricane/isobar/PyPlugLocator.h @@ -57,10 +57,10 @@ # define __PYPLUGLOCATOR__ -# include "PyHurricane.h" +#include "hurricane/isobar/PyHurricane.h" -# include "Locator.h" -# include "Plug.h" +#include "hurricane/Locator.h" +#include "hurricane/Plug.h" namespace Isobar { diff --git a/hurricane/src/pyext/PyPoint.h b/hurricane/src/pyext/hurricane/isobar/PyPoint.h similarity index 97% rename from hurricane/src/pyext/PyPoint.h rename to hurricane/src/pyext/hurricane/isobar/PyPoint.h index 9e32bbbf..a750267a 100644 --- a/hurricane/src/pyext/PyPoint.h +++ b/hurricane/src/pyext/hurricane/isobar/PyPoint.h @@ -57,9 +57,9 @@ # define __PYPOINT__ -# include "PyHurricane.h" +#include "hurricane/isobar/PyHurricane.h" -# include "Point.h" +#include "hurricane/Point.h" namespace Isobar { diff --git a/hurricane/src/pyext/PyReference.h b/hurricane/src/pyext/hurricane/isobar/PyReference.h similarity index 97% rename from hurricane/src/pyext/PyReference.h rename to hurricane/src/pyext/hurricane/isobar/PyReference.h index c7ae08b5..ef23cd22 100644 --- a/hurricane/src/pyext/PyReference.h +++ b/hurricane/src/pyext/hurricane/isobar/PyReference.h @@ -57,9 +57,9 @@ #define __PYREFERENCE__ -#include "PyEntity.h" +#include "hurricane/isobar/PyEntity.h" -#include "Reference.h" +#include "hurricane/Reference.h" namespace Isobar { diff --git a/hurricane/src/pyext/PyReferenceLocator.h b/hurricane/src/pyext/hurricane/isobar/PyReferenceLocator.h similarity index 96% rename from hurricane/src/pyext/PyReferenceLocator.h rename to hurricane/src/pyext/hurricane/isobar/PyReferenceLocator.h index 0dfcd59b..f1be0801 100644 --- a/hurricane/src/pyext/PyReferenceLocator.h +++ b/hurricane/src/pyext/hurricane/isobar/PyReferenceLocator.h @@ -55,10 +55,10 @@ # define __PYREFERENCELOCATOR__ -# include "PyHurricane.h" +#include "hurricane/isobar/PyHurricane.h" -# include "Locator.h" -# include "Reference.h" +#include "hurricane/Locator.h" +#include "hurricane/Reference.h" diff --git a/hurricane/src/pyext/PySegment.h b/hurricane/src/pyext/hurricane/isobar/PySegment.h similarity index 97% rename from hurricane/src/pyext/PySegment.h rename to hurricane/src/pyext/hurricane/isobar/PySegment.h index 5d4562e6..b6dac5d0 100644 --- a/hurricane/src/pyext/PySegment.h +++ b/hurricane/src/pyext/hurricane/isobar/PySegment.h @@ -57,9 +57,9 @@ # define __PYSEGMENT__ -# include "PyComponent.h" +#include "hurricane/isobar/PyComponent.h" -# include "Segment.h" +#include "hurricane/Segment.h" namespace Isobar { diff --git a/hurricane/src/pyext/PySegmentLocator.h b/hurricane/src/pyext/hurricane/isobar/PySegmentLocator.h similarity index 97% rename from hurricane/src/pyext/PySegmentLocator.h rename to hurricane/src/pyext/hurricane/isobar/PySegmentLocator.h index d39673b6..768de0b4 100644 --- a/hurricane/src/pyext/PySegmentLocator.h +++ b/hurricane/src/pyext/hurricane/isobar/PySegmentLocator.h @@ -57,10 +57,10 @@ # define __PYSEGMENTLOCATOR__ -# include "PyHurricane.h" +#include "hurricane/isobar/PyHurricane.h" -# include "Locator.h" -# include "Segment.h" +#include "hurricane/Locator.h" +#include "hurricane/Segment.h" namespace Isobar { diff --git a/hurricane/src/pyext/PyTechnology.h b/hurricane/src/pyext/hurricane/isobar/PyTechnology.h similarity index 97% rename from hurricane/src/pyext/PyTechnology.h rename to hurricane/src/pyext/hurricane/isobar/PyTechnology.h index cf67cbc6..6f394c0a 100644 --- a/hurricane/src/pyext/PyTechnology.h +++ b/hurricane/src/pyext/hurricane/isobar/PyTechnology.h @@ -53,8 +53,8 @@ # ifndef __PYTECHNOLOGY__ # define __PYTECHNOLOGY__ -# include "PyHurricane.h" -# include "Technology.h" +#include "hurricane/isobar/PyHurricane.h" +#include "hurricane/Technology.h" namespace Isobar { diff --git a/hurricane/src/pyext/PyTransformation.h b/hurricane/src/pyext/hurricane/isobar/PyTransformation.h similarity index 97% rename from hurricane/src/pyext/PyTransformation.h rename to hurricane/src/pyext/hurricane/isobar/PyTransformation.h index 586da6e4..6e9cc713 100644 --- a/hurricane/src/pyext/PyTransformation.h +++ b/hurricane/src/pyext/hurricane/isobar/PyTransformation.h @@ -57,9 +57,9 @@ #define __PYTRANSFORMATION__ -#include "PyHurricane.h" +#include "hurricane/isobar/PyHurricane.h" -#include "Transformation.h" +#include "hurricane/Transformation.h" namespace Isobar { diff --git a/hurricane/src/pyext/PyUnit.h b/hurricane/src/pyext/hurricane/isobar/PyUnit.h similarity index 97% rename from hurricane/src/pyext/PyUnit.h rename to hurricane/src/pyext/hurricane/isobar/PyUnit.h index 3069ebd9..8a692f0d 100644 --- a/hurricane/src/pyext/PyUnit.h +++ b/hurricane/src/pyext/hurricane/isobar/PyUnit.h @@ -57,9 +57,9 @@ #define __PYUNIT__ -#include "PyHurricane.h" +#include "hurricane/isobar/PyHurricane.h" -#include "Unit.h" +#include "hurricane/Unit.h" namespace Isobar { diff --git a/hurricane/src/pyext/PyUpdateSession.h b/hurricane/src/pyext/hurricane/isobar/PyUpdateSession.h similarity index 97% rename from hurricane/src/pyext/PyUpdateSession.h rename to hurricane/src/pyext/hurricane/isobar/PyUpdateSession.h index 8feab7bf..d1956af8 100644 --- a/hurricane/src/pyext/PyUpdateSession.h +++ b/hurricane/src/pyext/hurricane/isobar/PyUpdateSession.h @@ -57,9 +57,9 @@ #define __PYUPDATESESSION__ -#include "PyHurricane.h" +#include "hurricane/isobar/PyHurricane.h" -#include "UpdateSession.h" +#include "hurricane/UpdateSession.h" namespace Isobar { diff --git a/hurricane/src/pyext/PyVertical.h b/hurricane/src/pyext/hurricane/isobar/PyVertical.h similarity index 97% rename from hurricane/src/pyext/PyVertical.h rename to hurricane/src/pyext/hurricane/isobar/PyVertical.h index 770864cc..daaf4be6 100644 --- a/hurricane/src/pyext/PyVertical.h +++ b/hurricane/src/pyext/hurricane/isobar/PyVertical.h @@ -57,9 +57,9 @@ #define __PYVERTICAL__ -#include "PySegment.h" +#include "hurricane/isobar/PySegment.h" -#include "Vertical.h" +#include "hurricane/Vertical.h" namespace Isobar {