Skip to content

Commit 0dbc9cb

Browse files
robtaylorrobtaylor
committed
Move Script, PyErrorWidget and PyCellViewer into isobar to match namespace and resolve dependency order
1 parent f2f6525 commit 0dbc9cb

28 files changed

+72
-38
lines changed

‎Seabreeze/src/PySeabreezeEngine.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
#include <functional>
1818
#include "hurricane/isobar/PyCell.h"
19-
#include "hurricane/viewer/PyCellViewer.h"
19+
#include "hurricane/isobar/PyCellViewer.h"
2020
#include "hurricane/isobar/PyNet.h"
2121
#include "hurricane/viewer/ExceptionWidget.h"
2222
#include "hurricane/Cell.h"

‎bora/src/BoraEngine.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
#include "hurricane/Library.h"
3232
#include "hurricane/viewer/HApplication.h"
3333
#include "hurricane/viewer/ExceptionWidget.h"
34-
#include "hurricane/viewer/Script.h"
34+
#include "hurricane/isobar/Script.h"
3535
#include "hurricane/UpdateSession.h"
3636
#include "hurricane/analog/AnalogCellExtension.h"
3737
#include "hurricane/analog/LayoutGenerator.h"

‎crlcore/src/ccore/Utilities.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ namespace boptions = boost::program_options;
2828
#include "hurricane/configuration/Configuration.h"
2929
#include "hurricane/Backtrace.h"
3030
#include "hurricane/Warning.h"
31-
#include "hurricane/viewer/Script.h"
31+
#include "hurricane/isobar/Script.h"
3232
#include "crlcore/Utilities.h"
3333
#include "crlcore/AllianceFramework.h"
3434

‎etesian/src/PyEtesianEngine.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
#include "hurricane/isobar/PyBox.h"
1818
#include "hurricane/isobar/PyCell.h"
1919
#include "hurricane/isobar/PyInstance.h"
20-
#include "hurricane/viewer/PyCellViewer.h"
20+
#include "hurricane/isobar/PyCellViewer.h"
2121
#include "hurricane/Cell.h"
2222
#include "hurricane/viewer/ExceptionWidget.h"
2323
#include "etesian/PyEtesianEngine.h"

‎foehn/src/PyFoehnEngine.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
#include "hurricane/isobar/PyNet.h"
1919
#include "hurricane/isobar/PyCell.h"
2020
#include "hurricane/isobar/PyInstance.h"
21-
#include "hurricane/viewer/PyCellViewer.h"
21+
#include "hurricane/isobar/PyCellViewer.h"
2222
#include "hurricane/viewer/ExceptionWidget.h"
2323
#include "hurricane/Cell.h"
2424
#include "crlcore/Utilities.h"

‎hurricane/src/analog/LayoutGenerator.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
#include <fstream>
2323
#include "hurricane/Warning.h"
2424
#include "hurricane/isobar/PyBox.h"
25-
#include "hurricane/viewer/Script.h"
25+
#include "hurricane/isobar/Script.h"
2626
#include "hurricane/analog/Device.h"
2727
#include "hurricane/analog/PyDevice.h"
2828
#include "hurricane/analog/LayoutGenerator.h"

‎hurricane/src/configuration/meson.build

+34-3
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ mocs = qt.compile_moc(
1313
resources = qt.compile_resources(
1414
sources: 'Configuration.qrc'
1515
)
16-
configuration = library(
16+
configuration = shared_library(
1717
'configuration',
1818
'Parameter.cpp',
1919
'LayoutDescription.cpp',
@@ -27,11 +27,11 @@ configuration = library(
2727
mocs,
2828
resources,
2929
dependencies: [qt_deps, boost],
30-
link_with: [hurricane, isobar],
30+
link_with: [hurricane, isobar, utils],
3131
include_directories: includes
3232
)
3333

34-
pytypemanager = library(
34+
pytypemanager = shared_library(
3535
'pytypemanager',
3636
'ProxyProperty.cpp',
3737
'PyTypeManager.cpp',
@@ -40,3 +40,34 @@ pytypemanager = library(
4040
include_directories: includes
4141
)
4242

43+
py.extension_module(
44+
'Cfg',
45+
'PyParameter.cpp',
46+
'PyConfiguration.cpp',
47+
'PyLayoutDescription.cpp',
48+
'PyCfg.cpp',
49+
dependencies: [qt_deps, py_deps, boost],
50+
link_with: [isobar, hurricane, configuration, pytypemanager],
51+
include_directories: includes
52+
)
53+
54+
py.extension_module(
55+
'Hurricane3',
56+
'PyDbU.cpp',
57+
'PyPoint.cpp',
58+
'PyBox.cpp',
59+
'PyDataBase.cpp',
60+
'PyTechnology.cpp',
61+
'PyLayerMask.cpp',
62+
'PyLayer.cpp',
63+
'PyMaterial.cpp',
64+
'PyBasicLayer.cpp',
65+
'PyViaLayer.cpp',
66+
'PyRegularLayer.cpp',
67+
'PyDiffusionLayer.cpp',
68+
'PyTransistorLayer.cpp',
69+
'PyHurricane3.cpp',
70+
dependencies: hurricane_deps,
71+
link_with: [hurricane, configuration, pytypemanager],
72+
include_directories: includes
73+
)

‎hurricane/src/isobar/CMakeLists.txt

+6
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,9 @@
8585
PyUnitRule.cpp
8686
PyPhysicalRule.cpp
8787
PyTwoLayersPhysicalRule.cpp
88+
PyCellViewer.cpp
89+
PyErrorWidget.cpp
90+
Script.cpp
8891
)
8992
set( pyIncludes hurricane/isobar/ProxyProperty.h
9093
hurricane/isobar/PythonAttributes.h
@@ -164,6 +167,9 @@
164167
hurricane/isobar/PyUnitRule.h
165168
hurricane/isobar/PyPhysicalRule.h
166169
hurricane/isobar/PyTwoLayersPhysicalRule.h
170+
hurricane/viewer/PyCellViewer.h
171+
hurricane/viewer/PyErrorWidget.h
172+
hurricane/viewer/Script.h
167173
)
168174

169175
set( depLibs hurricane

‎hurricane/src/isobar/PyCellViewer.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
#include "hurricane/isobar/PyBox.h"
1818
#include "hurricane/isobar/PyCell.h"
1919
#include "hurricane/isobar/PyOccurrence.h"
20-
#include "hurricane/viewer/PyCellViewer.h"
20+
#include "hurricane/isobar/PyCellViewer.h"
2121
#include "hurricane/viewer/CellWidget.h"
2222

2323

‎hurricane/src/isobar/PyErrorWidget.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
// +-----------------------------------------------------------------+
1515

1616

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

1919

2020
namespace Isobar {

‎hurricane/src/isobar/Script.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@
2121
#include "hurricane/Error.h"
2222
#include "hurricane/Cell.h"
2323
#include "hurricane/isobar/PyCell.h"
24-
#include "hurricane/viewer/PyCellViewer.h"
25-
#include "hurricane/viewer/Script.h"
24+
#include "hurricane/isobar/PyCellViewer.h"
25+
#include "hurricane/isobar/Script.h"
2626

2727

2828
namespace Isobar {

‎hurricane/src/isobar/hurricane/isobar/PyCellViewer.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -53,4 +53,4 @@ extern "C" {
5353
} // End of extern "C".
5454

5555

56-
} // End of Isobar namespace.
56+
} // End of Hurricane namespace.

‎hurricane/src/isobar/hurricane/isobar/PyErrorWidget.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -51,4 +51,4 @@ extern "C" {
5151
} // extern "C".
5252

5353

54-
} // Isobar namespace.
54+
} // Hurricane namespace.

‎hurricane/src/isobar/hurricane/isobar/Script.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
// | Author : Jean-Paul Chaput |
1111
// | E-mail : [email protected] |
1212
// | =============================================================== |
13-
// | C++ Header : "./hurricane/viewer/Script.h" |
13+
// | C++ Header : "./hurricane/isobar/Script.h" |
1414
// +-----------------------------------------------------------------+
1515

1616

‎hurricane/src/viewer/CMakeLists.txt

+3-6
Original file line numberDiff line numberDiff line change
@@ -71,10 +71,10 @@
7171
hurricane/viewer/PyDisplayStyle.h
7272
hurricane/viewer/PyHApplication.h
7373
hurricane/viewer/PyGraphics.h
74-
hurricane/viewer/PyCellViewer.h
75-
hurricane/viewer/PyErrorWidget.h
7674
hurricane/viewer/PyAboutWindow.h
77-
hurricane/viewer/Script.h
75+
hurricane/isobar/PyCellViewer.h
76+
hurricane/isobar/PyErrorWidget.h
77+
hurricane/isobar/Script.h
7878
)
7979
set( cpps HApplication.cpp
8080
ScreenUtilities.cpp
@@ -134,10 +134,7 @@
134134
PyHApplication.cpp
135135
PyGraphics.cpp
136136
PyViewer.cpp
137-
PyCellViewer.cpp
138-
PyErrorWidget.cpp
139137
PyAboutWindow.cpp
140-
Script.cpp
141138
)
142139

143140
qtX_wrap_cpp( MOC_SRCS ${mocIncludes} )

‎hurricane/src/viewer/CellViewer.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
#include "hurricane/Cell.h"
3939
//#include "MapView.h"
4040
#include "hurricane/isobar/PyCell.h"
41-
#include "hurricane/viewer/Script.h"
41+
#include "hurricane/isobar/Script.h"
4242
#include "hurricane/viewer/Graphics.h"
4343
#include "hurricane/viewer/CellViewer.h"
4444
#include "hurricane/viewer/CellPrinter.h"
@@ -51,7 +51,7 @@
5151
#include "hurricane/viewer/DesignBlob.h"
5252
#include "hurricane/viewer/OpenBlobDialog.h"
5353
#include "hurricane/viewer/SelectCommand.h"
54-
#include "hurricane/viewer/PyCellViewer.h"
54+
#include "hurricane/isobar/PyCellViewer.h"
5555

5656

5757
namespace Hurricane {

‎hurricane/src/viewer/PyViewer.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@
2121
#include "hurricane/viewer/PyDrawingGroup.h"
2222
#include "hurricane/viewer/PyDisplayStyle.h"
2323
#include "hurricane/viewer/PyHSVr.h"
24-
#include "hurricane/viewer/PyErrorWidget.h"
25-
#include "hurricane/viewer/PyCellViewer.h"
24+
#include "hurricane/isobar/PyErrorWidget.h"
25+
#include "hurricane/isobar/PyCellViewer.h"
2626
#include "hurricane/viewer/PyAboutWindow.h"
2727

2828

‎hurricane/src/viewer/StratusWidget.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ using namespace std;
3030
#include <QVBoxLayout>
3131
#include "hurricane/utilities/Path.h"
3232
#include "hurricane/Warning.h"
33-
#include "hurricane/viewer/Script.h"
33+
#include "hurricane/isobar/Script.h"
3434
#include "hurricane/viewer/Graphics.h"
3535
#include "hurricane/viewer/StratusScript.h"
3636
#include "hurricane/viewer/StratusWidget.h"

‎hurricane/src/viewer/hurricane/viewer/PyAboutWindow.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -51,4 +51,4 @@ extern "C" {
5151
} // extern "C".
5252

5353

54-
} // Isobar namespace.
54+
} // Hurricane namespace.

‎hurricane/src/viewer/hurricane/viewer/StratusScript.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
#ifndef __VIEWER_STRATUS_SCRIPT__
1919
#define __VIEWER_STRATUS_SCRIPT__
2020

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

2323

2424
namespace Hurricane {

‎katana/src/KatanaEngine.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
#include "hurricane/Vertical.h"
3737
#include "hurricane/Horizontal.h"
3838
#include "hurricane/RoutingPad.h"
39-
#include "hurricane/viewer/Script.h"
39+
#include "hurricane/isobar/Script.h"
4040
#include "crlcore/Measures.h"
4141
#include "crlcore/AllianceFramework.h"
4242
#include "anabatic/AutoContact.h"

‎katana/src/PyKatanaEngine.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
#include "hurricane/isobar/PyNet.h"
1818
#include "hurricane/isobar/PyCell.h"
19-
#include "hurricane/viewer/PyCellViewer.h"
19+
#include "hurricane/isobar/PyCellViewer.h"
2020
#include "hurricane/viewer/ExceptionWidget.h"
2121
#include "hurricane/Cell.h"
2222
#include "katana/PyKatanaEngine.h"

‎tramontana/src/PyTramontanaEngine.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818

1919
#include "hurricane/isobar/PyNet.h"
2020
#include "hurricane/isobar/PyCell.h"
21-
#include "hurricane/viewer/PyCellViewer.h"
21+
#include "hurricane/isobar/PyCellViewer.h"
2222
#include "hurricane/viewer/ExceptionWidget.h"
2323
#include "hurricane/Cell.h"
2424
#include "crlcore/Utilities.h"

‎tramontana/src/TramontanaEngine.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
#include "hurricane/Vertical.h"
3838
#include "hurricane/Horizontal.h"
3939
#include "hurricane/RoutingPad.h"
40-
#include "hurricane/viewer/Script.h"
40+
#include "hurricane/isobar/Script.h"
4141
#include "crlcore/Measures.h"
4242
#include "crlcore/Utilities.h"
4343
#include "crlcore/AllianceFramework.h"

‎tutorial/src/PyTutorialEngine.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515

1616

1717
#include "hurricane/isobar/PyCell.h"
18-
#include "hurricane/viewer/PyCellViewer.h"
18+
#include "hurricane/isobar/PyCellViewer.h"
1919
#include "hurricane/viewer/ExceptionWidget.h"
2020
#include "hurricane/Cell.h"
2121
#include "crlcore/Utilities.h"

‎unicorn/src/CgtMain.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ namespace bopts = boost::program_options;
3131
#include "hurricane/Bug.h"
3232
#include "hurricane/Warning.h"
3333
#include "hurricane/UpdateSession.h"
34-
#include "hurricane/viewer/Script.h"
34+
#include "hurricane/isobar/Script.h"
3535

3636
#include <QtGui>
3737
#if (QT_VERSION >= QT_VERSION_CHECK(4,5,0)) and \

‎unicorn/src/UnicornGui.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@
2020
#include "hurricane/DebugSession.h"
2121
#include "hurricane/Warning.h"
2222
#include "hurricane/DataBase.h"
23-
#include "hurricane/viewer/Script.h"
23+
#include "hurricane/isobar/Script.h"
2424
#include "hurricane/viewer/CellViewer.h"
25-
#include "hurricane/viewer/PyCellViewer.h"
25+
#include "hurricane/isobar/PyCellViewer.h"
2626
#include "crlcore/Utilities.h"
2727
#include "crlcore/Catalog.h"
2828
#include "crlcore/AllianceFramework.h"

‎unicorn/src/unicorn/PyUnicornGui.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
#define __UNICORN_PY_UNICORN_GUI_H__
2020

2121
#include "hurricane/isobar/PyHurricane.h"
22-
#include "hurricane/viewer/PyCellViewer.h"
22+
#include "hurricane/isobar/PyCellViewer.h"
2323
#include "unicorn/UnicornGui.h"
2424

2525

0 commit comments

Comments
 (0)