Move Script, PyErrorWidget and PyCellViewer into isobar to match namespace and resolve dependency order

2023-08-25 17:00:47 +01:00 · 2023-08-25 17:00:47 +01:00 · 0dbc9cba9e
parent f2f65254c9
commit 0dbc9cba9e
28 changed files with 72 additions and 38 deletions
--- a/Seabreeze/src/PySeabreezeEngine.cpp
+++ b/Seabreeze/src/PySeabreezeEngine.cpp
@ -16,7 +16,7 @@

 #include <functional>
 #include "hurricane/isobar/PyCell.h"
-#include "hurricane/viewer/PyCellViewer.h"
+#include "hurricane/isobar/PyCellViewer.h"
 #include "hurricane/isobar/PyNet.h"
 #include "hurricane/viewer/ExceptionWidget.h"
 #include "hurricane/Cell.h"
--- a/bora/src/BoraEngine.cpp
+++ b/bora/src/BoraEngine.cpp
@ -31,7 +31,7 @@
 #include "hurricane/Library.h"
 #include "hurricane/viewer/HApplication.h"
 #include "hurricane/viewer/ExceptionWidget.h"
-#include "hurricane/viewer/Script.h"
+#include "hurricane/isobar/Script.h"
 #include "hurricane/UpdateSession.h" 
 #include "hurricane/analog/AnalogCellExtension.h"
 #include "hurricane/analog/LayoutGenerator.h"
--- a/crlcore/src/ccore/Utilities.cpp
+++ b/crlcore/src/ccore/Utilities.cpp
@ -28,7 +28,7 @@ namespace boptions = boost::program_options;
 #include  "hurricane/configuration/Configuration.h"
 #include  "hurricane/Backtrace.h"
 #include  "hurricane/Warning.h"
-#include  "hurricane/viewer/Script.h"
+#include  "hurricane/isobar/Script.h"
 #include  "crlcore/Utilities.h"
 #include  "crlcore/AllianceFramework.h"

--- a/etesian/src/PyEtesianEngine.cpp
+++ b/etesian/src/PyEtesianEngine.cpp
@ -17,7 +17,7 @@
 #include "hurricane/isobar/PyBox.h"
 #include "hurricane/isobar/PyCell.h"
 #include "hurricane/isobar/PyInstance.h"
-#include "hurricane/viewer/PyCellViewer.h"
+#include "hurricane/isobar/PyCellViewer.h"
 #include "hurricane/Cell.h"
 #include "hurricane/viewer/ExceptionWidget.h"
 #include "etesian/PyEtesianEngine.h"
--- a/foehn/src/PyFoehnEngine.cpp
+++ b/foehn/src/PyFoehnEngine.cpp
@ -18,7 +18,7 @@
 #include "hurricane/isobar/PyNet.h"
 #include "hurricane/isobar/PyCell.h"
 #include "hurricane/isobar/PyInstance.h"
-#include "hurricane/viewer/PyCellViewer.h"
+#include "hurricane/isobar/PyCellViewer.h"
 #include "hurricane/viewer/ExceptionWidget.h"
 #include "hurricane/Cell.h"
 #include "crlcore/Utilities.h"
--- a/hurricane/src/analog/LayoutGenerator.cpp
+++ b/hurricane/src/analog/LayoutGenerator.cpp
@ -22,7 +22,7 @@
 #include <fstream>
 #include "hurricane/Warning.h"
 #include "hurricane/isobar/PyBox.h"
-#include "hurricane/viewer/Script.h"
+#include "hurricane/isobar/Script.h"
 #include "hurricane/analog/Device.h"
 #include "hurricane/analog/PyDevice.h"
 #include "hurricane/analog/LayoutGenerator.h"
--- a/hurricane/src/configuration/meson.build
+++ b/hurricane/src/configuration/meson.build
@ -13,7 +13,7 @@ mocs = qt.compile_moc(
 resources = qt.compile_resources(
  sources: 'Configuration.qrc'
 )
-configuration = library(
+configuration = shared_library(
  'configuration',
  'Parameter.cpp',
  'LayoutDescription.cpp',
@ -27,11 +27,11 @@ configuration = library(
  mocs,
  resources,
  dependencies: [qt_deps, boost],
-  link_with: [hurricane, isobar],
+  link_with: [hurricane, isobar, utils],
  include_directories: includes
 )

-pytypemanager = library(
+pytypemanager = shared_library(
  'pytypemanager',
  'ProxyProperty.cpp',
  'PyTypeManager.cpp',
@ -40,3 +40,34 @@ pytypemanager = library(
  include_directories: includes
 )

+py.extension_module(
+  'Cfg',
+  'PyParameter.cpp',
+  'PyConfiguration.cpp',
+  'PyLayoutDescription.cpp',
+  'PyCfg.cpp',
+  dependencies: [qt_deps, py_deps, boost],
+  link_with: [isobar, hurricane, configuration, pytypemanager],
+  include_directories: includes
+) 
+
+py.extension_module(
+  'Hurricane3',
+  'PyDbU.cpp',
+  'PyPoint.cpp',
+  'PyBox.cpp',
+  'PyDataBase.cpp',
+  'PyTechnology.cpp',
+  'PyLayerMask.cpp',
+  'PyLayer.cpp',
+  'PyMaterial.cpp',
+  'PyBasicLayer.cpp',
+  'PyViaLayer.cpp',
+  'PyRegularLayer.cpp',
+  'PyDiffusionLayer.cpp',
+  'PyTransistorLayer.cpp',
+  'PyHurricane3.cpp',
+  dependencies: hurricane_deps,
+  link_with: [hurricane, configuration, pytypemanager],
+  include_directories: includes
+)
--- a/hurricane/src/isobar/CMakeLists.txt
+++ b/hurricane/src/isobar/CMakeLists.txt
@ -85,6 +85,9 @@
                                   PyUnitRule.cpp
                                   PyPhysicalRule.cpp
                                   PyTwoLayersPhysicalRule.cpp
+                                   PyCellViewer.cpp
+                                   PyErrorWidget.cpp
+                                   Script.cpp
                      )	    
                   set( pyIncludes hurricane/isobar/ProxyProperty.h
                                   hurricane/isobar/PythonAttributes.h
@ -164,6 +167,9 @@
                                   hurricane/isobar/PyUnitRule.h
                                   hurricane/isobar/PyPhysicalRule.h
                                   hurricane/isobar/PyTwoLayersPhysicalRule.h
+                                   hurricane/viewer/PyCellViewer.h
+                                   hurricane/viewer/PyErrorWidget.h
+                                   hurricane/viewer/Script.h
                      )

                   set( depLibs    hurricane
--- a/hurricane/src/isobar/PyCellViewer.cpp
+++ b/hurricane/src/isobar/PyCellViewer.cpp
@ -17,7 +17,7 @@
 #include "hurricane/isobar/PyBox.h"
 #include "hurricane/isobar/PyCell.h"
 #include "hurricane/isobar/PyOccurrence.h"
-#include "hurricane/viewer/PyCellViewer.h"
+#include "hurricane/isobar/PyCellViewer.h"
 #include "hurricane/viewer/CellWidget.h"


--- a/hurricane/src/isobar/PyErrorWidget.cpp
+++ b/hurricane/src/isobar/PyErrorWidget.cpp
@ -14,7 +14,7 @@
 // +-----------------------------------------------------------------+


-#include "hurricane/viewer/PyErrorWidget.h"
+#include "hurricane/isobar/PyErrorWidget.h"


 namespace  Isobar {
--- a/hurricane/src/isobar/Script.cpp
+++ b/hurricane/src/isobar/Script.cpp
@ -21,8 +21,8 @@
 #include  "hurricane/Error.h"
 #include  "hurricane/Cell.h"
 #include  "hurricane/isobar/PyCell.h"
-#include  "hurricane/viewer/PyCellViewer.h"
-#include  "hurricane/viewer/Script.h"
+#include  "hurricane/isobar/PyCellViewer.h"
+#include  "hurricane/isobar/Script.h"


 namespace Isobar {
--- a/hurricane/src/isobar/hurricane/isobar/PyCellViewer.h
+++ b/hurricane/src/isobar/hurricane/isobar/PyCellViewer.h
@ -53,4 +53,4 @@ extern "C" {
 }  // End of extern "C".


-}  // End of Isobar namespace.
+}  // End of Hurricane namespace.
--- a/hurricane/src/isobar/hurricane/isobar/PyErrorWidget.h
+++ b/hurricane/src/isobar/hurricane/isobar/PyErrorWidget.h
@ -51,4 +51,4 @@ extern "C" {
 }  // extern "C".


-}  // Isobar namespace.
+}  // Hurricane namespace.
--- a/hurricane/src/isobar/hurricane/isobar/Script.h
+++ b/hurricane/src/isobar/hurricane/isobar/Script.h
@ -10,7 +10,7 @@
 // |  Author      :                    Jean-Paul Chaput              |
 // |  E-mail      :            Jean-Paul.Chaput@lip6.fr              |
 // | =============================================================== |
-// |  C++ Header  :  "./hurricane/viewer/Script.h"                   |
+// |  C++ Header  :  "./hurricane/isobar/Script.h"                   |
 // +-----------------------------------------------------------------+


--- a/hurricane/src/viewer/CMakeLists.txt
+++ b/hurricane/src/viewer/CMakeLists.txt
@ -71,10 +71,10 @@
                                    hurricane/viewer/PyDisplayStyle.h
                                    hurricane/viewer/PyHApplication.h
                                    hurricane/viewer/PyGraphics.h
-                                    hurricane/viewer/PyCellViewer.h
-                                    hurricane/viewer/PyErrorWidget.h
                                    hurricane/viewer/PyAboutWindow.h
-                                    hurricane/viewer/Script.h
+                                    hurricane/isobar/PyCellViewer.h
+                                    hurricane/isobar/PyErrorWidget.h
+                                    hurricane/isobar/Script.h
                      )
                   set( cpps        HApplication.cpp
                                    ScreenUtilities.cpp 
@ -134,10 +134,7 @@
                                    PyHApplication.cpp
                                    PyGraphics.cpp
                                    PyViewer.cpp
-                                    PyCellViewer.cpp
-                                    PyErrorWidget.cpp
                                    PyAboutWindow.cpp
-                                    Script.cpp
                      )

          qtX_wrap_cpp( MOC_SRCS    ${mocIncludes} )
--- a/hurricane/src/viewer/CellViewer.cpp
+++ b/hurricane/src/viewer/CellViewer.cpp
@ -38,7 +38,7 @@
 #include "hurricane/Cell.h"
 //#include  "MapView.h"
 #include "hurricane/isobar/PyCell.h"
-#include "hurricane/viewer/Script.h"
+#include "hurricane/isobar/Script.h"
 #include "hurricane/viewer/Graphics.h"
 #include "hurricane/viewer/CellViewer.h"
 #include "hurricane/viewer/CellPrinter.h"
@ -51,7 +51,7 @@
 #include "hurricane/viewer/DesignBlob.h"
 #include "hurricane/viewer/OpenBlobDialog.h"
 #include "hurricane/viewer/SelectCommand.h"
-#include "hurricane/viewer/PyCellViewer.h"
+#include "hurricane/isobar/PyCellViewer.h"


 namespace Hurricane {
--- a/hurricane/src/viewer/PyViewer.cpp
+++ b/hurricane/src/viewer/PyViewer.cpp
@ -21,8 +21,8 @@
 #include "hurricane/viewer/PyDrawingGroup.h"
 #include "hurricane/viewer/PyDisplayStyle.h"
 #include "hurricane/viewer/PyHSVr.h"
-#include "hurricane/viewer/PyErrorWidget.h"
-#include "hurricane/viewer/PyCellViewer.h"
+#include "hurricane/isobar/PyErrorWidget.h"
+#include "hurricane/isobar/PyCellViewer.h"
 #include "hurricane/viewer/PyAboutWindow.h"


--- a/hurricane/src/viewer/StratusWidget.cpp
+++ b/hurricane/src/viewer/StratusWidget.cpp
@ -30,7 +30,7 @@ using namespace std;
 #include  <QVBoxLayout>
 #include  "hurricane/utilities/Path.h"
 #include  "hurricane/Warning.h"
-#include  "hurricane/viewer/Script.h"
+#include  "hurricane/isobar/Script.h"
 #include  "hurricane/viewer/Graphics.h"
 #include  "hurricane/viewer/StratusScript.h"
 #include  "hurricane/viewer/StratusWidget.h"
--- a/hurricane/src/viewer/hurricane/viewer/PyAboutWindow.h
+++ b/hurricane/src/viewer/hurricane/viewer/PyAboutWindow.h
@ -51,4 +51,4 @@ extern "C" {
 }  // extern "C".


-}  // Isobar namespace.
+}  // Hurricane namespace.
--- a/hurricane/src/viewer/hurricane/viewer/StratusScript.h
+++ b/hurricane/src/viewer/hurricane/viewer/StratusScript.h
@ -18,7 +18,7 @@
 #ifndef  __VIEWER_STRATUS_SCRIPT__
 #define  __VIEWER_STRATUS_SCRIPT__

-#include  "hurricane/viewer/Script.h"
+#include  "hurricane/isobar/Script.h"


 namespace Hurricane {
--- a/katana/src/KatanaEngine.cpp
+++ b/katana/src/KatanaEngine.cpp
@ -36,7 +36,7 @@
 #include "hurricane/Vertical.h"
 #include "hurricane/Horizontal.h"
 #include "hurricane/RoutingPad.h"
-#include "hurricane/viewer/Script.h"
+#include "hurricane/isobar/Script.h"
 #include "crlcore/Measures.h"
 #include "crlcore/AllianceFramework.h"
 #include "anabatic/AutoContact.h"
--- a/katana/src/PyKatanaEngine.cpp
+++ b/katana/src/PyKatanaEngine.cpp
@ -16,7 +16,7 @@

 #include "hurricane/isobar/PyNet.h"
 #include "hurricane/isobar/PyCell.h"
-#include "hurricane/viewer/PyCellViewer.h"
+#include "hurricane/isobar/PyCellViewer.h"
 #include "hurricane/viewer/ExceptionWidget.h"
 #include "hurricane/Cell.h"
 #include "katana/PyKatanaEngine.h"
--- a/tramontana/src/PyTramontanaEngine.cpp
+++ b/tramontana/src/PyTramontanaEngine.cpp
@ -18,7 +18,7 @@

 #include "hurricane/isobar/PyNet.h"
 #include "hurricane/isobar/PyCell.h"
-#include "hurricane/viewer/PyCellViewer.h"
+#include "hurricane/isobar/PyCellViewer.h"
 #include "hurricane/viewer/ExceptionWidget.h"
 #include "hurricane/Cell.h"
 #include "crlcore/Utilities.h"
--- a/tramontana/src/TramontanaEngine.cpp
+++ b/tramontana/src/TramontanaEngine.cpp
@ -37,7 +37,7 @@
 #include "hurricane/Vertical.h"
 #include "hurricane/Horizontal.h"
 #include "hurricane/RoutingPad.h"
-#include "hurricane/viewer/Script.h"
+#include "hurricane/isobar/Script.h"
 #include "crlcore/Measures.h"
 #include "crlcore/Utilities.h"
 #include "crlcore/AllianceFramework.h"
--- a/tutorial/src/PyTutorialEngine.cpp
+++ b/tutorial/src/PyTutorialEngine.cpp
@ -15,7 +15,7 @@


 #include "hurricane/isobar/PyCell.h"
-#include "hurricane/viewer/PyCellViewer.h"
+#include "hurricane/isobar/PyCellViewer.h"
 #include "hurricane/viewer/ExceptionWidget.h"
 #include "hurricane/Cell.h"
 #include "crlcore/Utilities.h"
--- a/unicorn/src/CgtMain.cpp
+++ b/unicorn/src/CgtMain.cpp
@ -31,7 +31,7 @@ namespace bopts = boost::program_options;
 #include "hurricane/Bug.h"
 #include "hurricane/Warning.h"
 #include "hurricane/UpdateSession.h"
-#include "hurricane/viewer/Script.h"
+#include "hurricane/isobar/Script.h"

 #include <QtGui>
 #if (QT_VERSION >= QT_VERSION_CHECK(4,5,0)) and \
--- a/unicorn/src/UnicornGui.cpp
+++ b/unicorn/src/UnicornGui.cpp
@ -20,9 +20,9 @@
 #include "hurricane/DebugSession.h"
 #include "hurricane/Warning.h"
 #include "hurricane/DataBase.h"
-#include "hurricane/viewer/Script.h"
+#include "hurricane/isobar/Script.h"
 #include "hurricane/viewer/CellViewer.h"
-#include "hurricane/viewer/PyCellViewer.h"
+#include "hurricane/isobar/PyCellViewer.h"
 #include "crlcore/Utilities.h"
 #include "crlcore/Catalog.h"
 #include "crlcore/AllianceFramework.h"
--- a/unicorn/src/unicorn/PyUnicornGui.h
+++ b/unicorn/src/unicorn/PyUnicornGui.h
@ -19,7 +19,7 @@
 #define __UNICORN_PY_UNICORN_GUI_H__

 #include "hurricane/isobar/PyHurricane.h"
-#include "hurricane/viewer/PyCellViewer.h"
+#include "hurricane/isobar/PyCellViewer.h"
 #include "unicorn/UnicornGui.h"