Merge pull request The-OpenROAD-Project#4966 from The-OpenROAD-Projec…

…t-staging/odb-include4 various: last batch of odb include path changes
andyfox-rushc · Apr 17, 2024 · 10056c3 · 10056c3
2 parents fe7f4aa + cabe92c
commit 10056c3
Show file tree

Hide file tree

Showing 44 changed files with 73 additions and 74 deletions.
diff --git a/src/cts/src/Clock.h b/src/cts/src/Clock.h
@@ -43,7 +43,7 @@
 #include <vector>
 
 #include "Util.h"
-#include "db.h"
+#include "odb/db.h"
 
 namespace utl {
 class Logger;

diff --git a/src/cts/src/CtsOptions.h b/src/cts/src/CtsOptions.h
@@ -44,7 +44,7 @@
 
 #include "CtsObserver.h"
 #include "Util.h"
-#include "db.h"
+#include "odb/db.h"
 #include "utl/Logger.h"
 
 namespace stt {

diff --git a/src/cts/src/MakeTritoncts.cpp b/src/cts/src/MakeTritoncts.cpp
@@ -37,7 +37,7 @@
 
 #include "CtsOptions.h"
 #include "cts/TritonCTS.h"
-#include "db.h"
+#include "odb/db.h"
 #include "ord/OpenRoad.hh"
 #include "sta/StaMain.hh"
 

diff --git a/src/gpl/src/replace.cpp b/src/gpl/src/replace.cpp
@@ -35,7 +35,6 @@
 
 #include <iostream>
 
-#include "db.h"
 #include "db_sta/dbNetwork.hh"
 #include "db_sta/dbSta.hh"
 #include "initialPlace.h"

diff --git a/src/gui/src/dbDescriptors.cpp b/src/gui/src/dbDescriptors.cpp
@@ -42,10 +42,10 @@
 #include <sstream>
 
 #include "bufferTreeDescriptor.h"
-#include "db.h"
-#include "dbShape.h"
 #include "db_sta/dbNetwork.hh"
 #include "db_sta/dbSta.hh"
+#include "odb/db.h"
+#include "odb/dbShape.h"
 #include "sta/Liberty.hh"
 #include "utl/Logger.h"
 #include "utl/algorithms.h"

diff --git a/src/gui/src/displayControls.cpp b/src/gui/src/displayControls.cpp
@@ -44,10 +44,10 @@
 #include <random>
 #include <vector>
 
-#include "db.h"
 #include "dbDescriptors.h"
 #include "db_sta/dbNetwork.hh"
 #include "db_sta/dbSta.hh"
+#include "odb/db.h"
 #include "sta/Liberty.hh"
 #include "utl/Logger.h"
 

diff --git a/src/gui/src/gui.cpp b/src/gui/src/gui.cpp
@@ -38,17 +38,17 @@
 #include <string>
 
 #include "clockWidget.h"
-#include "db.h"
-#include "dbShape.h"
-#include "defin.h"
 #include "displayControls.h"
 #include "drcWidget.h"
-#include "geom.h"
 #include "heatMapPlacementDensity.h"
 #include "inspector.h"
 #include "layoutViewer.h"
-#include "lefin.h"
 #include "mainWindow.h"
+#include "odb/db.h"
+#include "odb/dbShape.h"
+#include "odb/defin.h"
+#include "odb/geom.h"
+#include "odb/lefin.h"
 #include "ord/OpenRoad.hh"
 #include "ruler.h"
 #include "scriptWidget.h"

diff --git a/src/gui/src/layoutViewer.cpp b/src/gui/src/layoutViewer.cpp
@@ -57,14 +57,14 @@
 #include <tuple>
 #include <vector>
 
-#include "db.h"
 #include "dbDescriptors.h"
-#include "dbShape.h"
-#include "dbTransform.h"
 #include "gui/gui.h"
 #include "gui_utils.h"
 #include "highlightGroupDialog.h"
 #include "mainWindow.h"
+#include "odb/db.h"
+#include "odb/dbShape.h"
+#include "odb/dbTransform.h"
 #include "painter.h"
 #include "ruler.h"
 #include "scriptWidget.h"

diff --git a/src/gui/src/search.cpp b/src/gui/src/search.cpp
@@ -35,7 +35,7 @@
 #include <tuple>
 #include <utility>
 
-#include "dbShape.h"
+#include "odb/dbShape.h"
 
 namespace gui {
 

diff --git a/src/gui/src/staGui.cpp b/src/gui/src/staGui.cpp
@@ -48,11 +48,11 @@
 #include <limits>
 #include <string>
 
-#include "db.h"
 #include "dbDescriptors.h"
-#include "dbShape.h"
 #include "db_sta/dbNetwork.hh"
 #include "db_sta/dbSta.hh"
+#include "odb/db.h"
+#include "odb/dbShape.h"
 #include "sta/Corner.hh"
 #include "sta/PatternMatch.hh"
 #include "sta/Units.hh"

diff --git a/src/mpl2/src/object.h b/src/mpl2/src/object.h
@@ -43,8 +43,8 @@
 #include <string>
 #include <vector>
 
-#include "odb.h"
 #include "odb/dbTypes.h"
+#include "odb/odb.h"
 
 namespace odb {
 class Rect;

diff --git a/src/odb/src/zutil/CMakeLists.txt b/src/odb/src/zutil/CMakeLists.txt
@@ -13,7 +13,6 @@ target_link_libraries(zutil
 
 target_include_directories(zutil
   PUBLIC
-    ${PROJECT_SOURCE_DIR}/include/odb
     ${PROJECT_SOURCE_DIR}/include
     ${TCL_INCLUDE_PATH}
 )

diff --git a/src/odb/test/cpp/CallBack.h b/src/odb/test/cpp/CallBack.h
@@ -36,8 +36,8 @@
 #include <string>
 #include <vector>
 
-#include "db.h"
-#include "dbBlockCallBackObj.h"
+#include "odb/db.h"
+#include "odb/dbBlockCallBackObj.h"
 #include "spdlog/fmt/fmt.h"
 
 namespace odb {

diff --git a/src/odb/test/cpp/TestAccessPoint.cpp b/src/odb/test/cpp/TestAccessPoint.cpp
@@ -2,9 +2,9 @@
 #include <boost/test/included/unit_test.hpp>
 #include <fstream>
 
-#include "db.h"
 #include "env.h"
 #include "helper.h"
+#include "odb/db.h"
 
 namespace odb {
 namespace {

diff --git a/src/odb/test/cpp/TestCallBacks.cpp b/src/odb/test/cpp/TestCallBacks.cpp
@@ -3,8 +3,8 @@
 #include <iostream>
 
 #include "CallBack.h"
-#include "db.h"
 #include "helper.h"
+#include "odb/db.h"
 
 namespace odb {
 namespace {

diff --git a/src/odb/test/cpp/TestGCellGrid.cpp b/src/odb/test/cpp/TestGCellGrid.cpp
@@ -1,8 +1,8 @@
 #define BOOST_TEST_MODULE TestGCellGrid
 #include <boost/test/included/unit_test.hpp>
 
-#include "db.h"
 #include "helper.h"
+#include "odb/db.h"
 
 namespace odb {
 namespace {

diff --git a/src/odb/test/cpp/TestGeom.cpp b/src/odb/test/cpp/TestGeom.cpp
@@ -2,8 +2,9 @@
 #include <boost/test/included/unit_test.hpp>
 #include <iostream>
 
-#include "db.h"
 #include "helper.h"
+#include "odb/db.h"
+
 namespace odb {
 namespace {
 

diff --git a/src/odb/test/cpp/TestGroup.cpp b/src/odb/test/cpp/TestGroup.cpp
@@ -3,8 +3,8 @@
 #include <iostream>
 #include <string>
 
-#include "db.h"
 #include "helper.h"
+#include "odb/db.h"
 
 namespace odb {
 namespace {

diff --git a/src/odb/test/cpp/TestGuide.cpp b/src/odb/test/cpp/TestGuide.cpp
@@ -1,8 +1,8 @@
 #define BOOST_TEST_MODULE TestGuide
 #include <boost/test/included/unit_test.hpp>
 
-#include "db.h"
 #include "helper.h"
+#include "odb/db.h"
 
 namespace odb {
 namespace {

diff --git a/src/odb/test/cpp/TestJournal.cpp b/src/odb/test/cpp/TestJournal.cpp
@@ -3,9 +3,9 @@
 #include <iostream>
 #include <string>
 
-#include "db.h"
 #include "env.h"
 #include "helper.h"
+#include "odb/db.h"
 
 namespace odb {
 namespace {

diff --git a/src/odb/test/cpp/TestLef58Properties.cpp b/src/odb/test/cpp/TestLef58Properties.cpp
@@ -5,12 +5,12 @@
 #include <fstream>
 #include <iostream>
 
-#include "db.h"
-#include "defin.h"
-#include "defout.h"
 #include "env.h"
-#include "lefin.h"
-#include "lefout.h"
+#include "odb/db.h"
+#include "odb/defin.h"
+#include "odb/defout.h"
+#include "odb/lefin.h"
+#include "odb/lefout.h"
 #include "utl/Logger.h"
 
 namespace odb {

diff --git a/src/odb/test/cpp/TestMaster.cpp b/src/odb/test/cpp/TestMaster.cpp
@@ -3,8 +3,8 @@
 #include <iostream>
 #include <string>
 
-#include "db.h"
 #include "helper.h"
+#include "odb/db.h"
 
 namespace odb {
 namespace {

diff --git a/src/odb/test/cpp/TestModule.cpp b/src/odb/test/cpp/TestModule.cpp
@@ -3,8 +3,8 @@
 #include <iostream>
 #include <string>
 
-#include "db.h"
 #include "helper.h"
+#include "odb/db.h"
 
 namespace odb {
 namespace {

diff --git a/src/odb/test/cpp/TestNetTrack.cpp b/src/odb/test/cpp/TestNetTrack.cpp
@@ -1,8 +1,8 @@
 #define BOOST_TEST_MODULE TestGuide
 #include <boost/test/included/unit_test.hpp>
 
-#include "db.h"
 #include "helper.h"
+#include "odb/db.h"
 
 namespace odb {
 namespace {

diff --git a/src/odb/test/cpp/helper/helper.cpp b/src/odb/test/cpp/helper/helper.cpp
@@ -32,7 +32,7 @@
 
 #include "helper.h"
 
-#include "db.h"
+#include "odb/db.h"
 #include "utl/Logger.h"
 
 namespace odb {

diff --git a/src/odb/test/cpp/helper/helper.h b/src/odb/test/cpp/helper/helper.h
@@ -30,7 +30,7 @@
 // ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 // POSSIBILITY OF SUCH DAMAGE.
 
-#include "db.h"
+#include "odb/db.h"
 
 namespace odb {
 

diff --git a/src/odb/test/cpp/scan/TestScanChain.cpp b/src/odb/test/cpp/scan/TestScanChain.cpp
@@ -32,11 +32,11 @@
 
 #include <fstream>
 
-#include "db.h"
 #include "env.h"
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
 #include "helper.h"
+#include "odb/db.h"
 
 namespace odb {
 namespace {

diff --git a/src/rcx/include/rcx/extRCap.h b/src/rcx/include/rcx/extRCap.h
@@ -34,16 +34,16 @@
 
 #include <map>
 
-#include "db.h"
-#include "dbExtControl.h"
-#include "dbShape.h"
-#include "dbUtil.h"
 #include "ext2dBox.h"
 #include "extprocess.h"
-#include "gseq.h"
-#include "odb.h"
-#include "util.h"
-#include "wire.h"
+#include "odb/db.h"
+#include "odb/dbExtControl.h"
+#include "odb/dbShape.h"
+#include "odb/dbUtil.h"
+#include "odb/gseq.h"
+#include "odb/odb.h"
+#include "odb/util.h"
+#include "odb/wire.h"
 
 namespace utl {
 class Logger;

diff --git a/src/rcx/include/rcx/extSpef.h b/src/rcx/include/rcx/extSpef.h
@@ -34,12 +34,12 @@
 
 #include <map>
 
-#include "array1.h"
-#include "db.h"
-#include "dbShape.h"
 #include "extRCap.h"
-#include "odb.h"
-#include "parse.h"
+#include "odb/array1.h"
+#include "odb/db.h"
+#include "odb/dbShape.h"
+#include "odb/odb.h"
+#include "odb/parse.h"
 
 namespace utl {
 class Logger;

diff --git a/src/rcx/include/rcx/extprocess.h b/src/rcx/include/rcx/extprocess.h
@@ -32,9 +32,9 @@
 
 #pragma once
 
-#include "array1.h"
-#include "odb.h"
-#include "parse.h"
+#include "odb/array1.h"
+#include "odb/odb.h"
+#include "odb/parse.h"
 
 namespace utl {
 class Logger;

diff --git a/src/rcx/src/extBenchDB.cpp b/src/rcx/src/extBenchDB.cpp
@@ -33,7 +33,7 @@
 #include <map>
 #include <vector>
 
-#include "db.h"
+#include "odb/db.h"
 #include "rcx/extRCap.h"
 #include "rcx/extSpef.h"
 #include "rcx/extprocess.h"

diff --git a/src/rcx/src/extCC.cpp b/src/rcx/src/extCC.cpp
@@ -32,8 +32,8 @@
 
 #include <algorithm>
 
-#include "gseq.h"
-#include "wire.h"
+#include "odb/gseq.h"
+#include "odb/wire.h"
 
 namespace rcx {
 CoupleOptions coupleOptionsNull{};

diff --git a/src/rcx/src/extCoords.cpp b/src/rcx/src/extCoords.cpp
@@ -30,10 +30,10 @@
 // ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 // POSSIBILITY OF SUCH DAMAGE.
 
-#include "parse.h"
+#include "odb/parse.h"
+#include "odb/wire.h"
 #include "rcx/extSpef.h"
 #include "utl/Logger.h"
-#include "wire.h"
 
 namespace rcx {