diff --git a/src/buddies/src/bd/bd.pro b/src/buddies/src/bd/bd.pro index 21159ac37..4a11a6fdf 100644 --- a/src/buddies/src/bd/bd.pro +++ b/src/buddies/src/bd/bd.pro @@ -36,6 +36,7 @@ DEPENDPATH += $$TL_INC $$GSI_INC $$VERSION_INC $$DB_INC $$LIB_INC $$RDB_INC LIBS += -L$$DESTDIR -lklayout_tl -lklayout_db -lklayout_gsi -lklayout_lib -lklayout_rdb PLUGINPATH += \ + $$PWD/../../../plugins/common \ $$PWD/../../../plugins/streamers/gds2/db_plugin \ $$PWD/../../../plugins/streamers/cif/db_plugin \ $$PWD/../../../plugins/streamers/oasis/db_plugin \ diff --git a/src/buddies/unit_tests/unit_tests.pro b/src/buddies/unit_tests/unit_tests.pro index 3b93b38f7..2933e4283 100644 --- a/src/buddies/unit_tests/unit_tests.pro +++ b/src/buddies/unit_tests/unit_tests.pro @@ -22,6 +22,7 @@ DEPENDPATH += $$BD_INC $$DB_INC $$TL_INC $$GSI_INC LIBS += -L$$DESTDIR_UT -lklayout_bd -lklayout_db -lklayout_tl -lklayout_gsi PLUGINPATH += \ + $$PWD/../../plugins/common \ $$PWD/../../plugins/streamers/gds2/db_plugin \ $$PWD/../../plugins/streamers/cif/db_plugin \ $$PWD/../../plugins/streamers/oasis/db_plugin \ diff --git a/src/ext/ext.pro b/src/ext/ext.pro deleted file mode 100644 index 45d7ea1fc..000000000 --- a/src/ext/ext.pro +++ /dev/null @@ -1,6 +0,0 @@ - -TEMPLATE = subdirs -SUBDIRS = ext unit_tests - -unit_tests.depends += ext - diff --git a/src/ext/ext/ext.pro b/src/ext/ext/ext.pro deleted file mode 100644 index 23dbd42be..000000000 --- a/src/ext/ext/ext.pro +++ /dev/null @@ -1,53 +0,0 @@ - -DESTDIR = $$OUT_PWD/../.. -TARGET = klayout_ext - -include($$PWD/../../lib.pri) - -DEFINES += MAKE_EXT_LIBRARY - -HEADERS += \ - extBooleanOperationsDialogs.h \ - extDiffToolDialog.h \ - extStreamImportDialog.h \ - extStreamImporter.h \ - extXORToolDialog.h \ - extCommon.h \ - extForceLink.h \ - extXORProgress.h - -FORMS += \ - BooleanOptionsDialog.ui \ - DiffToolDialog.ui \ - SizingOptionsDialog.ui \ - StreamImportDialog.ui \ - MergeOptionsDialog.ui \ - XORToolDialog.ui - -SOURCES += \ - extBooleanOperationsDialogs.cc \ - extBooleanOperationsPlugin.cc \ - extDiffPlugin.cc \ - extDiffToolDialog.cc \ - extForceLink.cc \ - extStreamImport.cc \ - extStreamImportDialog.cc \ - extStreamImporter.cc \ - extXORPlugin.cc \ - extXORToolDialog.cc \ - extXORProgress.cc - -INCLUDEPATH += $$TL_INC $$GSI_INC $$LAYBASIC_INC $$LAY_INC $$DB_INC $$RDB_INC $$ANT_INC $$EDT_INC -DEPENDPATH += $$TL_INC $$GSI_INC $$LAYBASIC_INC $$LAY_INC $$DB_INC $$RDB_INC $$ANT_INC $$EDT_INC - -# Note: this accounts for UI-generated headers placed into the output folders in -# shadow builds: -INCLUDEPATH += $$DESTDIR/ext/ext $$DESTDIR/laybasic/laybasic -DEPENDPATH += $$DESTDIR/ext/ext $$DESTDIR/laybasic/laybasic - -LIBS += -L$$DESTDIR -lklayout_tl -lklayout_gsi -lklayout_laybasic -lklayout_db -lklayout_rdb -lklayout_ant -lklayout_edt - -# TODO: ideally this should not be there: -INCLUDEPATH += $$DESTDIR/lay/lay -DEPENDPATH += $$DESTDIR/lay/lay -LIBS += -L$$DESTDIR -lklayout_lay diff --git a/src/ext/ext/extCommon.h b/src/ext/ext/extCommon.h deleted file mode 100644 index 56d7ade8a..000000000 --- a/src/ext/ext/extCommon.h +++ /dev/null @@ -1,51 +0,0 @@ - -/* - - KLayout Layout Viewer - Copyright (C) 2006-2018 Matthias Koefferlein - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -*/ - - -#if !defined(HDR_extCommon_h) -# define HDR_extCommon_h - -# if defined _WIN32 || defined __CYGWIN__ - -# ifdef MAKE_EXT_LIBRARY -# define EXT_PUBLIC __declspec(dllexport) -# else -# define EXT_PUBLIC __declspec(dllimport) -# endif -# define EXT_LOCAL -# define EXT_PUBLIC_TEMPLATE - -# else - -# if __GNUC__ >= 4 || defined(__clang__) -# define EXT_PUBLIC __attribute__ ((visibility ("default"))) -# define EXT_PUBLIC_TEMPLATE __attribute__ ((visibility ("default"))) -# define EXT_LOCAL __attribute__ ((visibility ("hidden"))) -# else -# define EXT_PUBLIC -# define EXT_PUBLIC_TEMPLATE -# define EXT_LOCAL -# endif - -# endif - -#endif diff --git a/src/ext/ext/extForceLink.cc b/src/ext/ext/extForceLink.cc deleted file mode 100644 index cdc6d4c78..000000000 --- a/src/ext/ext/extForceLink.cc +++ /dev/null @@ -1,33 +0,0 @@ - -/* - - KLayout Layout Viewer - Copyright (C) 2006-2018 Matthias Koefferlein - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -*/ - - -#include "extForceLink.h" - -namespace ext -{ - int _force_link_f () - { - return 0; - } -} - diff --git a/src/ext/ext/extForceLink.h b/src/ext/ext/extForceLink.h deleted file mode 100644 index 8fd02ce4f..000000000 --- a/src/ext/ext/extForceLink.h +++ /dev/null @@ -1,40 +0,0 @@ - -/* - - KLayout Layout Viewer - Copyright (C) 2006-2018 Matthias Koefferlein - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -*/ - - -#ifndef HDR_extForceLink -#define HDR_extForceLink - -#include "extCommon.h" - -/** - * @file Include this function to force linking of the ext module - */ - -namespace ext -{ - EXT_PUBLIC int _force_link_f (); - static int _force_link_target = _force_link_f (); -} - -#endif - diff --git a/src/ext/unit_tests/unit_tests.pro b/src/ext/unit_tests/unit_tests.pro deleted file mode 100644 index 602a6ad9a..000000000 --- a/src/ext/unit_tests/unit_tests.pro +++ /dev/null @@ -1,25 +0,0 @@ - -DESTDIR_UT = $$OUT_PWD/../.. -DESTDIR = $$OUT_PWD/.. - -TARGET = ext_tests - -include($$PWD/../../lib_ut.pri) - -SOURCES = \ - -INCLUDEPATH += $$EXT_INC $$TL_INC $$LAYBASIC_INC $$DB_INC $$GSI_INC -DEPENDPATH += $$EXT_INC $$TL_INC $$LAYBASIC_INC $$DB_INC $$GSI_INC - -# Note: this accounts for UI-generated headers placed into the output folders in -# shadow builds: -INCLUDEPATH += $$DESTDIR_UT/ext/ext $$DESTDIR_UT/laybasic/laybasic -DEPENDPATH += $$DESTDIR_UT/ext/ext $$DESTDIR_UT/laybasic/laybasic - -LIBS += -L$$DESTDIR_UT -lklayout_ext -lklayout_laybasic -lklayout_db -lklayout_tl -lklayout_gsi - -# TODO: ideally this should not be there: -INCLUDEPATH += $$DESTDIR_UT/lay/lay -DEPENDPATH += $$DESTDIR_UT/lay/lay -LIBS += -L$$DESTDIR_UT -lklayout_lay - diff --git a/src/klayout.pro b/src/klayout.pro index e6c91bfbe..0cb2e2f2f 100644 --- a/src/klayout.pro +++ b/src/klayout.pro @@ -16,7 +16,6 @@ SUBDIRS = \ ant \ img \ edt \ - ext \ lib \ plugins \ buddies \ @@ -63,7 +62,6 @@ equals(HAVE_RUBY, "1") { lym.depends += gsi $$LANG_DEPENDS lay.depends += laybasic ant img edt lym -ext.depends += lay lib.depends += db buddies.depends += rdb lib $$LANG_DEPENDS @@ -74,7 +72,7 @@ equals(HAVE_QTBINDINGS, "1") { pymod.depends += gsiqt } -plugins.depends += lay ext lib +plugins.depends += lay lib rdb ant klayout_main.depends += plugins $$MAIN_DEPENDS unit_tests.depends += plugins $$MAIN_DEPENDS diff --git a/src/plugins/db_plugin.pri b/src/plugins/db_plugin.pri index 1160627e0..56657a942 100644 --- a/src/plugins/db_plugin.pri +++ b/src/plugins/db_plugin.pri @@ -3,7 +3,8 @@ include($$PWD/../klayout.pri) TEMPLATE = lib -INCLUDEPATH += $$DB_INC $$TL_INC $$GSI_INC -DEPENDPATH += $$DB_INC $$TL_INC $$GSI_INC +INCLUDEPATH += $$DB_INC $$TL_INC $$GSI_INC $$PWD/common +DEPENDPATH += $$DB_INC $$TL_INC $$GSI_INC $$PWD/common LIBS += -L$$DESTDIR/.. -lklayout_db -lklayout_tl -lklayout_gsi +DEFINES += MAKE_DB_PLUGIN_LIBRARY diff --git a/src/plugins/lay_plugin.pri b/src/plugins/lay_plugin.pri index 86ca9d6d5..3a36cc445 100644 --- a/src/plugins/lay_plugin.pri +++ b/src/plugins/lay_plugin.pri @@ -3,6 +3,8 @@ include($$PWD/../klayout.pri) TEMPLATE = lib -INCLUDEPATH += $$DB_INC $$TL_INC $$GSI_INC $$LAYBASIC_INC $$LAY_INC -DEPENDPATH += $$DB_INC $$TL_INC $$GSI_INC $$LAYBASIC_INC $$LAY_INC +INCLUDEPATH += $$DB_INC $$TL_INC $$GSI_INC $$LAYBASIC_INC $$LAY_INC $$PWD/common +DEPENDPATH += $$DB_INC $$TL_INC $$GSI_INC $$LAYBASIC_INC $$LAY_INC $$PWD/common LIBS += -L$$DESTDIR/.. -lklayout_db -lklayout_tl -lklayout_gsi -lklayout_laybasic -lklayout_lay + +DEFINES += MAKE_LAY_PLUGIN_LIBRARY diff --git a/src/plugins/plugins.pro b/src/plugins/plugins.pro index 298182841..1bc27fe33 100644 --- a/src/plugins/plugins.pro +++ b/src/plugins/plugins.pro @@ -5,5 +5,6 @@ SUBDIR_LIST = $$files($$PWD/*) SUBDIR_LIST -= $$PWD/plugins.pro SUBDIR_LIST -= $$PWD/db_plugin.pri SUBDIR_LIST -= $$PWD/lay_plugin.pri +SUBDIR_LIST -= $$PWD/common SUBDIRS = $$SUBDIR_LIST diff --git a/src/plugins/streamers/cif/db_plugin/dbCIF.h b/src/plugins/streamers/cif/db_plugin/dbCIF.h index a795befa5..7b560ba1f 100644 --- a/src/plugins/streamers/cif/db_plugin/dbCIF.h +++ b/src/plugins/streamers/cif/db_plugin/dbCIF.h @@ -34,9 +34,6 @@ #include #include -// place this macro to force linking of CIF plugin -#define FORCE_LINK_CIF void force_link_CIF_f () { extern int force_link_CIF; force_link_CIF = 0; } - namespace db { diff --git a/src/plugins/streamers/cif/db_plugin/dbCIFReader.h b/src/plugins/streamers/cif/db_plugin/dbCIFReader.h index 532bb6671..d2ce02c22 100644 --- a/src/plugins/streamers/cif/db_plugin/dbCIFReader.h +++ b/src/plugins/streamers/cif/db_plugin/dbCIFReader.h @@ -25,17 +25,18 @@ #ifndef HDR_dbCIFReader #define HDR_dbCIFReader +#include "dbPluginCommon.h" +#include "dbNamedLayerReader.h" +#include "dbLayout.h" +#include "dbCIF.h" +#include "dbStreamLayers.h" +#include "dbPropertiesRepository.h" + #include "tlException.h" #include "tlInternational.h" #include "tlProgress.h" #include "tlString.h" - -#include "dbNamedLayerReader.h" -#include "dbLayout.h" -#include "dbCIF.h" #include "tlStream.h" -#include "dbStreamLayers.h" -#include "dbPropertiesRepository.h" #include #include @@ -46,7 +47,7 @@ namespace db /** * @brief Structure that holds the CIF specific options for the reader */ -class DB_PUBLIC CIFReaderOptions +class DB_PLUGIN_PUBLIC CIFReaderOptions : public FormatSpecificReaderOptions { public: @@ -128,7 +129,7 @@ public: /** * @brief Generic base class of CIF reader exceptions */ -class DB_PUBLIC CIFReaderException +class DB_PLUGIN_PUBLIC CIFReaderException : public ReaderException { public: @@ -140,7 +141,7 @@ public: /** * @brief The CIF format stream reader */ -class DB_PUBLIC CIFReader +class DB_PLUGIN_PUBLIC CIFReader : public NamedLayerReader, public CIFDiagnostics { diff --git a/src/plugins/streamers/cif/db_plugin/dbCIFWriter.h b/src/plugins/streamers/cif/db_plugin/dbCIFWriter.h index 43d1924fd..9626f398e 100644 --- a/src/plugins/streamers/cif/db_plugin/dbCIFWriter.h +++ b/src/plugins/streamers/cif/db_plugin/dbCIFWriter.h @@ -25,6 +25,7 @@ #ifndef HDR_dbCIFWriter #define HDR_dbCIFWriter +#include "dbPluginCommon.h" #include "dbWriter.h" #include "dbCIF.h" #include "dbSaveLayoutOptions.h" @@ -44,7 +45,7 @@ class SaveLayoutOptions; /** * @brief Structure that holds the CIF specific options for the Writer */ -class DB_PUBLIC CIFWriterOptions +class DB_PLUGIN_PUBLIC CIFWriterOptions : public FormatSpecificWriterOptions { public: @@ -92,7 +93,7 @@ public: /** * @brief A CIF writer abstraction */ -class DB_PUBLIC CIFWriter +class DB_PLUGIN_PUBLIC CIFWriter : public db::WriterBase { public: diff --git a/src/plugins/streamers/cif/unit_tests/unit_tests.pro b/src/plugins/streamers/cif/unit_tests/unit_tests.pro index 12e3e2ce9..5fd833951 100644 --- a/src/plugins/streamers/cif/unit_tests/unit_tests.pro +++ b/src/plugins/streamers/cif/unit_tests/unit_tests.pro @@ -8,8 +8,8 @@ include($$PWD/../../../../lib_ut.pri) SOURCES = \ dbCIFReader.cc \ -INCLUDEPATH += $$LAY_INC $$TL_INC $$DB_INC $$GSI_INC $$PWD/../db_plugin -DEPENDPATH += $$LAY_INC $$TL_INC $$DB_INC $$GSI_INC $$PWD/../db_plugin +INCLUDEPATH += $$LAY_INC $$TL_INC $$DB_INC $$GSI_INC $$PWD/../db_plugin $$PWD/../../../common +DEPENDPATH += $$LAY_INC $$TL_INC $$DB_INC $$GSI_INC $$PWD/../db_plugin $$PWD/../../../common LIBS += -L$$DESTDIR_UT -lklayout_db -lklayout_tl -lklayout_gsi diff --git a/src/plugins/streamers/dxf/db_plugin/dbDXF.h b/src/plugins/streamers/dxf/db_plugin/dbDXF.h index 6b2cb79af..583c605af 100644 --- a/src/plugins/streamers/dxf/db_plugin/dbDXF.h +++ b/src/plugins/streamers/dxf/db_plugin/dbDXF.h @@ -34,9 +34,6 @@ #include #include -// place this macro to force linking of DXF plugin -#define FORCE_LINK_DXF void force_link_DXF_f () { extern int force_link_DXF; force_link_DXF = 0; } - namespace db { diff --git a/src/plugins/streamers/dxf/db_plugin/dbDXFReader.h b/src/plugins/streamers/dxf/db_plugin/dbDXFReader.h index 03a0bc36b..d0d24e77e 100644 --- a/src/plugins/streamers/dxf/db_plugin/dbDXFReader.h +++ b/src/plugins/streamers/dxf/db_plugin/dbDXFReader.h @@ -25,17 +25,18 @@ #ifndef HDR_dbDXFReader #define HDR_dbDXFReader +#include "dbPluginCommon.h" +#include "dbLayout.h" +#include "dbNamedLayerReader.h" +#include "dbDXF.h" +#include "dbStreamLayers.h" +#include "dbPropertiesRepository.h" + #include "tlException.h" #include "tlInternational.h" #include "tlProgress.h" #include "tlString.h" - -#include "dbLayout.h" -#include "dbNamedLayerReader.h" -#include "dbDXF.h" #include "tlStream.h" -#include "dbStreamLayers.h" -#include "dbPropertiesRepository.h" #include #include @@ -48,7 +49,7 @@ class Matrix3d; /** * @brief Structure that holds the DXF specific options for the reader */ -class DB_PUBLIC DXFReaderOptions +class DB_PLUGIN_PUBLIC DXFReaderOptions : public FormatSpecificReaderOptions { public: @@ -204,7 +205,7 @@ public: /** * @brief Generic base class of DXF reader exceptions */ -class DB_PUBLIC DXFReaderException +class DB_PLUGIN_PUBLIC DXFReaderException : public ReaderException { public: @@ -220,7 +221,7 @@ public: /** * @brief The DXF format stream reader */ -class DB_PUBLIC DXFReader +class DB_PLUGIN_PUBLIC DXFReader : public NamedLayerReader, public DXFDiagnostics { diff --git a/src/plugins/streamers/dxf/db_plugin/dbDXFWriter.h b/src/plugins/streamers/dxf/db_plugin/dbDXFWriter.h index 2f3d11182..0b768aa86 100644 --- a/src/plugins/streamers/dxf/db_plugin/dbDXFWriter.h +++ b/src/plugins/streamers/dxf/db_plugin/dbDXFWriter.h @@ -26,6 +26,7 @@ #ifndef HDR_dbDXFWriter #define HDR_dbDXFWriter +#include "dbPluginCommon.h" #include "dbWriter.h" #include "dbDXF.h" #include "dbSaveLayoutOptions.h" @@ -45,7 +46,7 @@ class SaveLayoutOptions; /** * @brief Structure that holds the DXF specific options for the Writer */ -class DB_PUBLIC DXFWriterOptions +class DB_PLUGIN_PUBLIC DXFWriterOptions : public FormatSpecificWriterOptions { public: @@ -89,7 +90,7 @@ public: /** * @brief A DXF writer abstraction */ -class DB_PUBLIC DXFWriter +class DB_PLUGIN_PUBLIC DXFWriter : public db::WriterBase { public: diff --git a/src/plugins/streamers/dxf/unit_tests/unit_tests.pro b/src/plugins/streamers/dxf/unit_tests/unit_tests.pro index 9e391a4e3..1b352e28e 100644 --- a/src/plugins/streamers/dxf/unit_tests/unit_tests.pro +++ b/src/plugins/streamers/dxf/unit_tests/unit_tests.pro @@ -8,8 +8,8 @@ include($$PWD/../../../../lib_ut.pri) SOURCES = \ dbDXFReader.cc \ -INCLUDEPATH += $$LAY_INC $$TL_INC $$DB_INC $$GSI_INC $$PWD/../db_plugin -DEPENDPATH += $$LAY_INC $$TL_INC $$DB_INC $$GSI_INC $$PWD/../db_plugin +INCLUDEPATH += $$LAY_INC $$TL_INC $$DB_INC $$GSI_INC $$PWD/../db_plugin $$PWD/../../../common +DEPENDPATH += $$LAY_INC $$TL_INC $$DB_INC $$GSI_INC $$PWD/../db_plugin $$PWD/../../../common LIBS += -L$$DESTDIR_UT -lklayout_db -lklayout_tl -lklayout_gsi diff --git a/src/plugins/streamers/gds2/db_plugin/contrib/dbGDS2TextReader.h b/src/plugins/streamers/gds2/db_plugin/contrib/dbGDS2TextReader.h index 2242c21ba..4af931c83 100644 --- a/src/plugins/streamers/gds2/db_plugin/contrib/dbGDS2TextReader.h +++ b/src/plugins/streamers/gds2/db_plugin/contrib/dbGDS2TextReader.h @@ -24,6 +24,7 @@ #ifndef HDR_dbGDS2ReaderText #define HDR_dbGDS2ReaderText +#include "dbPluginCommon.h" #include "dbGDS2Reader.h" #include @@ -34,7 +35,7 @@ namespace db /** * @brief Generic base class of GDS2 Text reader exceptions */ -class DB_PUBLIC GDS2ReaderTextException +class DB_PLUGIN_PUBLIC GDS2ReaderTextException : public ReaderException { public: @@ -46,7 +47,7 @@ public: /** * @brief The GDS2 text format stream reader */ -class DB_PUBLIC GDS2ReaderText +class DB_PLUGIN_PUBLIC GDS2ReaderText : public GDS2ReaderBase { diff --git a/src/plugins/streamers/gds2/db_plugin/contrib/dbGDS2TextWriter.h b/src/plugins/streamers/gds2/db_plugin/contrib/dbGDS2TextWriter.h index 43473ac61..0ff572f01 100644 --- a/src/plugins/streamers/gds2/db_plugin/contrib/dbGDS2TextWriter.h +++ b/src/plugins/streamers/gds2/db_plugin/contrib/dbGDS2TextWriter.h @@ -24,6 +24,7 @@ #ifndef HDR_dbGDS2WriterText #define HDR_dbGDS2WriterText +#include "dbPluginCommon.h" #include "dbGDS2WriterBase.h" #include #include @@ -32,7 +33,7 @@ namespace db { -class DB_PUBLIC GDS2WriterText +class DB_PLUGIN_PUBLIC GDS2WriterText : public db::GDS2WriterBase { diff --git a/src/plugins/streamers/gds2/db_plugin/dbGDS2Reader.h b/src/plugins/streamers/gds2/db_plugin/dbGDS2Reader.h index 21bb3e010..5d301fc93 100644 --- a/src/plugins/streamers/gds2/db_plugin/dbGDS2Reader.h +++ b/src/plugins/streamers/gds2/db_plugin/dbGDS2Reader.h @@ -25,17 +25,17 @@ #ifndef HDR_dbGDS2Reader #define HDR_dbGDS2Reader +#include "dbPluginCommon.h" +#include "dbLayout.h" +#include "dbGDS2ReaderBase.h" +#include "dbCommonReader.h" +#include "dbStreamLayers.h" + #include "tlException.h" #include "tlInternational.h" #include "tlProgress.h" #include "tlString.h" - -#include "dbLayout.h" -#include "dbGDS2ReaderBase.h" -#include "dbCommonReader.h" #include "tlStream.h" -#include "dbStreamLayers.h" - namespace db { @@ -43,7 +43,7 @@ namespace db /** * @brief Structure that holds the GDS2 specific options for the reader */ -class DB_PUBLIC GDS2ReaderOptions +class DB_PLUGIN_PUBLIC GDS2ReaderOptions : public FormatSpecificReaderOptions { public: @@ -104,7 +104,7 @@ public: /** * @brief Generic base class of GDS2 reader exceptions */ -class DB_PUBLIC GDS2ReaderException +class DB_PLUGIN_PUBLIC GDS2ReaderException : public ReaderException { public: @@ -116,7 +116,7 @@ public: /** * @brief The GDS2 format stream reader */ -class DB_PUBLIC GDS2Reader +class DB_PLUGIN_PUBLIC GDS2Reader : public GDS2ReaderBase { public: diff --git a/src/plugins/streamers/gds2/db_plugin/dbGDS2ReaderBase.h b/src/plugins/streamers/gds2/db_plugin/dbGDS2ReaderBase.h index 1bb748cf8..fc7026179 100644 --- a/src/plugins/streamers/gds2/db_plugin/dbGDS2ReaderBase.h +++ b/src/plugins/streamers/gds2/db_plugin/dbGDS2ReaderBase.h @@ -25,16 +25,16 @@ #ifndef HDR_dbGDS2ReaderBase #define HDR_dbGDS2ReaderBase +#include "dbPluginCommon.h" +#include "dbLayout.h" +#include "dbReader.h" +#include "dbStreamLayers.h" + #include "tlException.h" #include "tlInternational.h" #include "tlProgress.h" #include "tlString.h" - -#include "dbLayout.h" -#include "dbReader.h" #include "tlStream.h" -#include "dbStreamLayers.h" - namespace db { @@ -48,7 +48,7 @@ struct GDS2XY /** * @brief The GDS2 format basic stream reader */ -class DB_PUBLIC GDS2ReaderBase +class DB_PLUGIN_PUBLIC GDS2ReaderBase : public ReaderBase { public: diff --git a/src/plugins/streamers/gds2/db_plugin/dbGDS2Writer.h b/src/plugins/streamers/gds2/db_plugin/dbGDS2Writer.h index c29d963af..75675989f 100644 --- a/src/plugins/streamers/gds2/db_plugin/dbGDS2Writer.h +++ b/src/plugins/streamers/gds2/db_plugin/dbGDS2Writer.h @@ -24,6 +24,7 @@ #ifndef HDR_dbGDS2Writer #define HDR_dbGDS2Writer +#include "dbPluginCommon.h" #include "dbGDS2WriterBase.h" #include "dbWriterTools.h" #include "tlProgress.h" @@ -35,7 +36,7 @@ namespace db * @brief A GDS2 writer abstraction */ -class DB_PUBLIC GDS2Writer +class DB_PLUGIN_PUBLIC GDS2Writer : public db::GDS2WriterBase { public: diff --git a/src/plugins/streamers/gds2/db_plugin/dbGDS2WriterBase.h b/src/plugins/streamers/gds2/db_plugin/dbGDS2WriterBase.h index 47425c060..864db62e8 100644 --- a/src/plugins/streamers/gds2/db_plugin/dbGDS2WriterBase.h +++ b/src/plugins/streamers/gds2/db_plugin/dbGDS2WriterBase.h @@ -24,6 +24,7 @@ #ifndef HDR_dbGDS2WriterBase #define HDR_dbGDS2WriterBase +#include "dbPluginCommon.h" #include "dbWriter.h" #include "dbWriterTools.h" #include "tlProgress.h" @@ -42,7 +43,7 @@ class SaveLayoutOptions; /** * @brief Structure that holds the GDS2 specific options for the Writer */ -class DB_PUBLIC GDS2WriterOptions +class DB_PLUGIN_PUBLIC GDS2WriterOptions : public FormatSpecificWriterOptions { public: @@ -149,7 +150,7 @@ public: * @brief A GDS2 writer abstraction */ -class DB_PUBLIC GDS2WriterBase +class DB_PLUGIN_PUBLIC GDS2WriterBase : public db::WriterBase { public: diff --git a/src/plugins/streamers/gds2/unit_tests/unit_tests.pro b/src/plugins/streamers/gds2/unit_tests/unit_tests.pro index a46e85687..42535fca3 100644 --- a/src/plugins/streamers/gds2/unit_tests/unit_tests.pro +++ b/src/plugins/streamers/gds2/unit_tests/unit_tests.pro @@ -9,8 +9,8 @@ SOURCES = \ dbGDS2Reader.cc \ dbGDS2Writer.cc \ -INCLUDEPATH += $$LAY_INC $$TL_INC $$DB_INC $$GSI_INC $$PWD/../db_plugin -DEPENDPATH += $$LAY_INC $$TL_INC $$DB_INC $$GSI_INC $$PWD/../db_plugin +INCLUDEPATH += $$LAY_INC $$TL_INC $$DB_INC $$GSI_INC $$PWD/../db_plugin $$PWD/../../../common +DEPENDPATH += $$LAY_INC $$TL_INC $$DB_INC $$GSI_INC $$PWD/../db_plugin $$PWD/../../../common LIBS += -L$$DESTDIR_UT -lklayout_db -lklayout_tl -lklayout_gsi diff --git a/src/plugins/streamers/lefdef/db_plugin/dbDEFImporter.h b/src/plugins/streamers/lefdef/db_plugin/dbDEFImporter.h index ef91e6daf..170e9a55a 100644 --- a/src/plugins/streamers/lefdef/db_plugin/dbDEFImporter.h +++ b/src/plugins/streamers/lefdef/db_plugin/dbDEFImporter.h @@ -25,7 +25,7 @@ #ifndef HDR_dbDEFImporter #define HDR_dbDEFImporter -#include "dbCommon.h" +#include "dbPluginCommon.h" #include "dbLayout.h" #include "tlStream.h" #include "dbLEFImporter.h" @@ -39,7 +39,7 @@ namespace db /** * @brief The DEF importer object */ -class DB_PUBLIC DEFImporter +class DB_PLUGIN_PUBLIC DEFImporter : public LEFDEFImporter { public: diff --git a/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFImporter.h b/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFImporter.h index 36c1a6417..34f779e5b 100644 --- a/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFImporter.h +++ b/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFImporter.h @@ -24,7 +24,7 @@ #ifndef HDR_dbLEFDEFImporter #define HDR_dbLEFDEFImporter -#include "dbCommon.h" +#include "dbPluginCommon.h" #include "dbLayout.h" #include "dbReader.h" #include "dbStreamLayers.h" @@ -46,7 +46,7 @@ namespace db /** * @brief Generic base class of DXF reader exceptions */ -class DB_PUBLIC LEFDEFReaderException +class DB_PLUGIN_PUBLIC LEFDEFReaderException : public db::ReaderException { public: @@ -60,7 +60,7 @@ public: * * This component provides technology specific information for the LEF/DEF importer. */ -class DB_PUBLIC LEFDEFReaderOptions +class DB_PLUGIN_PUBLIC LEFDEFReaderOptions : public db::FormatSpecificReaderOptions { public: @@ -471,7 +471,7 @@ enum LayerPurpose * * This class will handle the creation and management of layers in the LEF/DEF reader context */ -class DB_PUBLIC LEFDEFLayerDelegate +class DB_PLUGIN_PUBLIC LEFDEFLayerDelegate { public: /** @@ -536,7 +536,7 @@ private: /** * @brief The LEF importer object */ -class DB_PUBLIC LEFDEFImporter +class DB_PLUGIN_PUBLIC LEFDEFImporter { public: /** diff --git a/src/plugins/streamers/lefdef/db_plugin/dbLEFImporter.h b/src/plugins/streamers/lefdef/db_plugin/dbLEFImporter.h index 85ad7cbed..2d47040ac 100644 --- a/src/plugins/streamers/lefdef/db_plugin/dbLEFImporter.h +++ b/src/plugins/streamers/lefdef/db_plugin/dbLEFImporter.h @@ -25,9 +25,9 @@ #ifndef HDR_dbLEFImporter #define HDR_dbLEFImporter +#include "dbPluginCommon.h" #include "dbLEFDEFImporter.h" -#include "dbCommon.h" #include "dbLayout.h" #include "dbReader.h" #include "dbStreamLayers.h" @@ -43,7 +43,7 @@ namespace db /** * @brief The LEF importer object */ -class DB_PUBLIC LEFImporter +class DB_PLUGIN_PUBLIC LEFImporter : public LEFDEFImporter { public: diff --git a/src/plugins/streamers/lefdef/lay_plugin/layLEFDEFImportDialogs.h b/src/plugins/streamers/lefdef/lay_plugin/layLEFDEFImportDialogs.h index f7ee72720..d8c158896 100644 --- a/src/plugins/streamers/lefdef/lay_plugin/layLEFDEFImportDialogs.h +++ b/src/plugins/streamers/lefdef/lay_plugin/layLEFDEFImportDialogs.h @@ -24,7 +24,7 @@ #ifndef HDR_dbLEFImportDialog #define HDR_dbLEFImportDialog -#include "layCommon.h" +#include "layPluginCommon.h" #include "layTechnology.h" #include "layStream.h" @@ -39,7 +39,7 @@ namespace lay /** * @brief A structure containing the LEF importer data */ -struct LAY_PUBLIC LEFDEFImportData +struct LAY_PLUGIN_PUBLIC LEFDEFImportData { LEFDEFImportData (); @@ -54,7 +54,7 @@ struct LAY_PUBLIC LEFDEFImportData /** * @brief The LEF importer dialog */ -class LAY_PUBLIC LEFDEFImportOptionsDialog +class LAY_PLUGIN_PUBLIC LEFDEFImportOptionsDialog : public QDialog, private Ui::LEFDEFImportOptionsDialog { diff --git a/src/plugins/streamers/lefdef/unit_tests/unit_tests.pro b/src/plugins/streamers/lefdef/unit_tests/unit_tests.pro index 5987edb48..9b9efb119 100644 --- a/src/plugins/streamers/lefdef/unit_tests/unit_tests.pro +++ b/src/plugins/streamers/lefdef/unit_tests/unit_tests.pro @@ -8,8 +8,8 @@ include($$PWD/../../../../lib_ut.pri) SOURCES = \ dbLEFDEFImport.cc -INCLUDEPATH += $$LAY_INC $$TL_INC $$DB_INC $$GSI_INC $$PWD/../db_plugin -DEPENDPATH += $$LAY_INC $$TL_INC $$DB_INC $$GSI_INC $$PWD/../db_plugin +INCLUDEPATH += $$LAY_INC $$TL_INC $$DB_INC $$GSI_INC $$PWD/../db_plugin $$PWD/../../../common +DEPENDPATH += $$LAY_INC $$TL_INC $$DB_INC $$GSI_INC $$PWD/../db_plugin $$PWD/../../../common LIBS += -L$$DESTDIR_UT -lklayout_db -lklayout_tl -lklayout_gsi diff --git a/src/plugins/streamers/oasis/db_plugin/dbOASIS.h b/src/plugins/streamers/oasis/db_plugin/dbOASIS.h index 23aaacbf2..2502074c3 100644 --- a/src/plugins/streamers/oasis/db_plugin/dbOASIS.h +++ b/src/plugins/streamers/oasis/db_plugin/dbOASIS.h @@ -24,6 +24,7 @@ #ifndef HDR_dbOASIS #define HDR_dbOASIS +#include "dbPluginCommon.h" #include "dbPoint.h" #include "dbVector.h" @@ -35,9 +36,6 @@ #include #include -// place this macro to force linking of OASIS plugin -#define FORCE_LINK_OASIS void force_link_OASIS_f () { extern int force_link_OASIS; force_link_OASIS = 0; } - namespace db { @@ -67,7 +65,7 @@ class OASISReader; /** * @brief A repetition iterator */ -class DB_PUBLIC RepetitionIterator +class DB_PLUGIN_PUBLIC RepetitionIterator { public: /** @@ -125,7 +123,7 @@ private: /** * @brief A class representing a repetition */ -class DB_PUBLIC Repetition +class DB_PLUGIN_PUBLIC Repetition { public: /** @@ -237,7 +235,7 @@ private: // Base classes -class DB_PUBLIC RepetitionBase +class DB_PLUGIN_PUBLIC RepetitionBase { public: RepetitionBase () diff --git a/src/plugins/streamers/oasis/db_plugin/dbOASISReader.h b/src/plugins/streamers/oasis/db_plugin/dbOASISReader.h index dad5dd2de..c30ea967b 100644 --- a/src/plugins/streamers/oasis/db_plugin/dbOASISReader.h +++ b/src/plugins/streamers/oasis/db_plugin/dbOASISReader.h @@ -25,19 +25,20 @@ #ifndef HDR_dbOASISReader #define HDR_dbOASISReader -#include "tlException.h" -#include "tlInternational.h" -#include "tlProgress.h" -#include "tlString.h" - +#include "dbPluginCommon.h" #include "dbLayout.h" #include "dbReader.h" #include "dbTypes.h" #include "dbOASIS.h" -#include "tlStream.h" #include "dbStreamLayers.h" #include "dbPropertiesRepository.h" +#include "tlException.h" +#include "tlInternational.h" +#include "tlProgress.h" +#include "tlString.h" +#include "tlStream.h" + #include #include @@ -47,7 +48,7 @@ namespace db /** * @brief Generic base class of OASIS reader exceptions */ -class DB_PUBLIC OASISReaderException +class DB_PLUGIN_PUBLIC OASISReaderException : public ReaderException { public: @@ -59,7 +60,7 @@ public: /** * @brief Structure that holds the OASIS specific options for the reader */ -class DB_PUBLIC OASISReaderOptions +class DB_PLUGIN_PUBLIC OASISReaderOptions : public FormatSpecificReaderOptions { public: @@ -115,7 +116,7 @@ public: /** * @brief The OASIS format stream reader */ -class DB_PUBLIC OASISReader +class DB_PLUGIN_PUBLIC OASISReader : public ReaderBase, public OASISDiagnostics { diff --git a/src/plugins/streamers/oasis/db_plugin/dbOASISWriter.h b/src/plugins/streamers/oasis/db_plugin/dbOASISWriter.h index 61331b423..4bdabc164 100644 --- a/src/plugins/streamers/oasis/db_plugin/dbOASISWriter.h +++ b/src/plugins/streamers/oasis/db_plugin/dbOASISWriter.h @@ -24,6 +24,7 @@ #ifndef HDR_dbOASISWriter #define HDR_dbOASISWriter +#include "dbPluginCommon.h" #include "dbWriter.h" #include "dbOASIS.h" #include "dbSaveLayoutOptions.h" @@ -49,7 +50,7 @@ class OASISWriter; /** * @brief Structure that holds the OASIS specific options for the Writer */ -class DB_PUBLIC OASISWriterOptions +class DB_PLUGIN_PUBLIC OASISWriterOptions : public FormatSpecificWriterOptions { public: @@ -190,7 +191,7 @@ private: /** * @brief A OASIS writer abstraction */ -class DB_PUBLIC OASISWriter +class DB_PLUGIN_PUBLIC OASISWriter : public db::WriterBase { public: diff --git a/src/plugins/streamers/oasis/unit_tests/unit_tests.pro b/src/plugins/streamers/oasis/unit_tests/unit_tests.pro index e77ba69b8..dc439f6dc 100644 --- a/src/plugins/streamers/oasis/unit_tests/unit_tests.pro +++ b/src/plugins/streamers/oasis/unit_tests/unit_tests.pro @@ -10,8 +10,8 @@ SOURCES = \ dbOASISWriter2.cc \ dbOASISWriter.cc \ -INCLUDEPATH += $$LAY_INC $$TL_INC $$DB_INC $$GSI_INC $$PWD/../db_plugin -DEPENDPATH += $$LAY_INC $$TL_INC $$DB_INC $$GSI_INC $$PWD/../db_plugin +INCLUDEPATH += $$LAY_INC $$TL_INC $$DB_INC $$GSI_INC $$PWD/../db_plugin $$PWD/../../../common +DEPENDPATH += $$LAY_INC $$TL_INC $$DB_INC $$GSI_INC $$PWD/../db_plugin $$PWD/../../../common LIBS += -L$$DESTDIR_UT -lklayout_db -lklayout_tl -lklayout_gsi diff --git a/src/plugins/streamers/pcb/db_plugin/dbGerberImporter.h b/src/plugins/streamers/pcb/db_plugin/dbGerberImporter.h index d8a613e86..6b61d52e1 100644 --- a/src/plugins/streamers/pcb/db_plugin/dbGerberImporter.h +++ b/src/plugins/streamers/pcb/db_plugin/dbGerberImporter.h @@ -24,8 +24,7 @@ #ifndef HDR_dbGerberImporter #define HDR_dbGerberImporter -#include "dbCommon.h" - +#include "dbPluginCommon.h" #include "dbLayout.h" #include "dbTrans.h" #include "dbEdgeProcessor.h" @@ -606,7 +605,7 @@ private: /** * @brief Represents one file in a Gerber stack. */ -class DB_PUBLIC GerberFile +class DB_PLUGIN_PUBLIC GerberFile { public: GerberFile (); @@ -770,7 +769,7 @@ private: * This class provides a importer for Gerber layer stacks. It can be * loaded from project files and saved to such. */ -class DB_PUBLIC GerberImporter +class DB_PLUGIN_PUBLIC GerberImporter { public: /** diff --git a/src/plugins/streamers/pcb/unit_tests/unit_tests.pro b/src/plugins/streamers/pcb/unit_tests/unit_tests.pro index ad60672e6..602c0b1b8 100644 --- a/src/plugins/streamers/pcb/unit_tests/unit_tests.pro +++ b/src/plugins/streamers/pcb/unit_tests/unit_tests.pro @@ -8,8 +8,8 @@ include($$PWD/../../../../lib_ut.pri) SOURCES = \ dbGerberImport.cc -INCLUDEPATH += $$LAY_INC $$TL_INC $$DB_INC $$GSI_INC $$PWD/../db_plugin -DEPENDPATH += $$LAY_INC $$TL_INC $$DB_INC $$GSI_INC $$PWD/../db_plugin +INCLUDEPATH += $$LAY_INC $$TL_INC $$DB_INC $$GSI_INC $$PWD/../db_plugin $$PWD/../../../common +DEPENDPATH += $$LAY_INC $$TL_INC $$DB_INC $$GSI_INC $$PWD/../db_plugin $$PWD/../../../common LIBS += -L$$DESTDIR_UT -lklayout_db -lklayout_tl -lklayout_gsi diff --git a/src/plugins/tools/bool/bool.pro b/src/plugins/tools/bool/bool.pro new file mode 100644 index 000000000..443b25958 --- /dev/null +++ b/src/plugins/tools/bool/bool.pro @@ -0,0 +1,5 @@ + +TEMPLATE = subdirs + +SUBDIRS = lay_plugin + diff --git a/src/ext/ext/BooleanOptionsDialog.ui b/src/plugins/tools/bool/lay_plugin/BooleanOptionsDialog.ui similarity index 100% rename from src/ext/ext/BooleanOptionsDialog.ui rename to src/plugins/tools/bool/lay_plugin/BooleanOptionsDialog.ui diff --git a/src/ext/ext/MergeOptionsDialog.ui b/src/plugins/tools/bool/lay_plugin/MergeOptionsDialog.ui similarity index 100% rename from src/ext/ext/MergeOptionsDialog.ui rename to src/plugins/tools/bool/lay_plugin/MergeOptionsDialog.ui diff --git a/src/ext/ext/SizingOptionsDialog.ui b/src/plugins/tools/bool/lay_plugin/SizingOptionsDialog.ui similarity index 100% rename from src/ext/ext/SizingOptionsDialog.ui rename to src/plugins/tools/bool/lay_plugin/SizingOptionsDialog.ui diff --git a/src/ext/ext/extBooleanOperationsDialogs.cc b/src/plugins/tools/bool/lay_plugin/layBooleanOperationsDialogs.cc similarity index 99% rename from src/ext/ext/extBooleanOperationsDialogs.cc rename to src/plugins/tools/bool/lay_plugin/layBooleanOperationsDialogs.cc index f8ed73595..7b82b35f3 100644 --- a/src/ext/ext/extBooleanOperationsDialogs.cc +++ b/src/plugins/tools/bool/lay_plugin/layBooleanOperationsDialogs.cc @@ -21,12 +21,12 @@ */ -#include "extBooleanOperationsDialogs.h" +#include "layBooleanOperationsDialogs.h" #include "layLayoutView.h" #include "tlExceptions.h" -namespace ext +namespace lay { // -------------------------------------------------------------------------------- diff --git a/src/ext/ext/extBooleanOperationsDialogs.h b/src/plugins/tools/bool/lay_plugin/layBooleanOperationsDialogs.h similarity index 97% rename from src/ext/ext/extBooleanOperationsDialogs.h rename to src/plugins/tools/bool/lay_plugin/layBooleanOperationsDialogs.h index 0760653a0..2250313f0 100644 --- a/src/ext/ext/extBooleanOperationsDialogs.h +++ b/src/plugins/tools/bool/lay_plugin/layBooleanOperationsDialogs.h @@ -21,8 +21,8 @@ */ -#ifndef HDR_extDialogs -#define HDR_extDialogs +#ifndef HDR_layDialogs +#define HDR_layDialogs #include "ui_BooleanOptionsDialog.h" #include "ui_SizingOptionsDialog.h" @@ -33,7 +33,7 @@ namespace db class Layout; } -namespace ext +namespace lay { class CellView; diff --git a/src/ext/ext/extBooleanOperationsPlugin.cc b/src/plugins/tools/bool/lay_plugin/layBooleanOperationsPlugin.cc similarity index 96% rename from src/ext/ext/extBooleanOperationsPlugin.cc rename to src/plugins/tools/bool/lay_plugin/layBooleanOperationsPlugin.cc index 36d326830..f8ef971f9 100644 --- a/src/ext/ext/extBooleanOperationsPlugin.cc +++ b/src/plugins/tools/bool/lay_plugin/layBooleanOperationsPlugin.cc @@ -22,7 +22,7 @@ -#include "extBooleanOperationsDialogs.h" +#include "layBooleanOperationsDialogs.h" #include "layPlugin.h" #include "layTipDialog.h" @@ -32,7 +32,7 @@ #include -namespace ext +namespace lay { class BooleanOperationsPlugin @@ -63,11 +63,11 @@ public: void menu_activated (const std::string &symbol) { - if (symbol == "ext::boolean") { + if (symbol == "lay::boolean") { boolean (); - } else if (symbol == "ext::merge") { + } else if (symbol == "lay::merge") { merge (); - } else if (symbol == "ext::size") { + } else if (symbol == "lay::size") { size (); } } @@ -100,7 +100,7 @@ public: } - ext::BooleanOptionsDialog dialog (mp_view); + lay::BooleanOptionsDialog dialog (mp_view); if (dialog.exec_dialog (mp_view, m_boolean_cva, m_boolean_layera, m_boolean_cvb, m_boolean_layerb, m_boolean_cvr, m_boolean_layerr, m_boolean_mode, m_boolean_hier_mode, m_boolean_mincoh)) { mp_view->cancel (); @@ -237,7 +237,7 @@ public: } - ext::MergeOptionsDialog dialog (mp_view); + lay::MergeOptionsDialog dialog (mp_view); if (dialog.exec_dialog (mp_view, m_boolean_cva, m_boolean_layera, m_boolean_cvr, m_boolean_layerr, m_boolean_minwc, m_boolean_hier_mode, m_boolean_mincoh)) { mp_view->cancel (); @@ -352,7 +352,7 @@ public: } - ext::SizingOptionsDialog dialog (mp_view); + lay::SizingOptionsDialog dialog (mp_view); if (dialog.exec_dialog (mp_view, m_boolean_cva, m_boolean_layera, m_boolean_cvr, m_boolean_layerr, m_boolean_sizex, m_boolean_sizey, m_boolean_size_mode, m_boolean_hier_mode, m_boolean_mincoh)) { mp_view->cancel (); @@ -479,9 +479,9 @@ public: { lay::PluginDeclaration::get_menu_entries (menu_entries); menu_entries.push_back (lay::MenuEntry ("ops_group", "edit_menu.layer_menu.end")); - menu_entries.push_back (lay::MenuEntry ("ext::boolean", "boolean:edit:edit_mode", "edit_menu.layer_menu.end", tl::to_string (QObject::tr ("Boolean Operations")))); - menu_entries.push_back (lay::MenuEntry ("ext::merge", "merge:edit:edit_mode", "edit_menu.layer_menu.end", tl::to_string (QObject::tr ("Merge")))); - menu_entries.push_back (lay::MenuEntry ("ext::size", "size:edit:edit_mode", "edit_menu.layer_menu.end", tl::to_string (QObject::tr ("Size")))); + menu_entries.push_back (lay::MenuEntry ("lay::boolean", "boolean:edit:edit_mode", "edit_menu.layer_menu.end", tl::to_string (QObject::tr ("Boolean Operations")))); + menu_entries.push_back (lay::MenuEntry ("lay::merge", "merge:edit:edit_mode", "edit_menu.layer_menu.end", tl::to_string (QObject::tr ("Merge")))); + menu_entries.push_back (lay::MenuEntry ("lay::size", "size:edit:edit_mode", "edit_menu.layer_menu.end", tl::to_string (QObject::tr ("Size")))); } virtual bool configure (const std::string & /*name*/, const std::string & /*value*/) @@ -500,7 +500,7 @@ public: } }; -static tl::RegisteredClass config_decl (new ext::BooleanOperationsPluginDeclaration (), 3010, "ext::BooleanOperationsPlugin"); +static tl::RegisteredClass config_decl (new lay::BooleanOperationsPluginDeclaration (), 3010, "lay::BooleanOperationsPlugin"); } diff --git a/src/plugins/tools/bool/lay_plugin/lay_plugin.pro b/src/plugins/tools/bool/lay_plugin/lay_plugin.pro new file mode 100644 index 000000000..cb6587ca3 --- /dev/null +++ b/src/plugins/tools/bool/lay_plugin/lay_plugin.pro @@ -0,0 +1,17 @@ + +TARGET = bool +DESTDIR = $$OUT_PWD/../../../../lay_plugins + +include($$PWD/../../../lay_plugin.pri) + +HEADERS = \ + layBooleanOperationsDialogs.h + +SOURCES = \ + layBooleanOperationsDialogs.cc \ + layBooleanOperationsPlugin.cc + +FORMS = \ + BooleanOptionsDialog.ui \ + SizingOptionsDialog.ui \ + MergeOptionsDialog.ui \ diff --git a/src/plugins/tools/diff/diff.pro b/src/plugins/tools/diff/diff.pro new file mode 100644 index 000000000..443b25958 --- /dev/null +++ b/src/plugins/tools/diff/diff.pro @@ -0,0 +1,5 @@ + +TEMPLATE = subdirs + +SUBDIRS = lay_plugin + diff --git a/src/ext/ext/DiffToolDialog.ui b/src/plugins/tools/diff/lay_plugin/DiffToolDialog.ui similarity index 100% rename from src/ext/ext/DiffToolDialog.ui rename to src/plugins/tools/diff/lay_plugin/DiffToolDialog.ui diff --git a/src/ext/ext/extDiffPlugin.cc b/src/plugins/tools/diff/lay_plugin/layDiffPlugin.cc similarity index 88% rename from src/ext/ext/extDiffPlugin.cc rename to src/plugins/tools/diff/lay_plugin/layDiffPlugin.cc index b08324cec..035fa32aa 100644 --- a/src/ext/ext/extDiffPlugin.cc +++ b/src/plugins/tools/diff/lay_plugin/layDiffPlugin.cc @@ -23,11 +23,11 @@ -#include "extDiffToolDialog.h" +#include "layDiffToolDialog.h" #include "layPlugin.h" -namespace ext +namespace lay { class DiffPlugin @@ -37,7 +37,7 @@ public: DiffPlugin (Plugin *parent, lay::LayoutView *view) : lay::Plugin (parent), mp_view (view) { - mp_dialog = new ext::DiffToolDialog (0); + mp_dialog = new lay::DiffToolDialog (0); } ~DiffPlugin () @@ -48,11 +48,11 @@ public: void menu_activated (const std::string &symbol) { - if (symbol == "ext::diff_tool") { + if (symbol == "lay::diff_tool") { if (mp_dialog->exec_dialog (mp_view)) { - // ... implementation is in extDiffToolDialog.cc ... + // ... implementation is in layDiffToolDialog.cc ... } @@ -61,7 +61,7 @@ public: private: lay::LayoutView *mp_view; - ext::DiffToolDialog *mp_dialog; + lay::DiffToolDialog *mp_dialog; }; class DiffPluginDeclaration @@ -91,7 +91,7 @@ public: virtual void get_menu_entries (std::vector &menu_entries) const { lay::PluginDeclaration::get_menu_entries (menu_entries); - menu_entries.push_back (lay::MenuEntry ("ext::diff_tool", "diff_tool:edit", "tools_menu.post_verification_group", tl::to_string (QObject::tr ("Diff Tool")))); + menu_entries.push_back (lay::MenuEntry ("lay::diff_tool", "diff_tool:edit", "tools_menu.post_verification_group", tl::to_string (QObject::tr ("Diff Tool")))); } virtual bool configure (const std::string & /*name*/, const std::string & /*value*/) @@ -110,7 +110,7 @@ public: } }; -static tl::RegisteredClass config_decl (new ext::DiffPluginDeclaration (), 3001, "ext::DiffPlugin"); +static tl::RegisteredClass config_decl (new lay::DiffPluginDeclaration (), 3001, "lay::DiffPlugin"); } diff --git a/src/ext/ext/extDiffToolDialog.cc b/src/plugins/tools/diff/lay_plugin/layDiffToolDialog.cc similarity index 99% rename from src/ext/ext/extDiffToolDialog.cc rename to src/plugins/tools/diff/lay_plugin/layDiffToolDialog.cc index 5c55dfb52..c718a33da 100644 --- a/src/ext/ext/extDiffToolDialog.cc +++ b/src/plugins/tools/diff/lay_plugin/layDiffToolDialog.cc @@ -22,7 +22,7 @@ -#include "extDiffToolDialog.h" +#include "layDiffToolDialog.h" #include "rdb.h" #include "dbLayoutDiff.h" #include "dbRecursiveShapeIterator.h" @@ -37,7 +37,7 @@ #include -namespace ext +namespace lay { std::string cfg_diff_run_xor ("diff-run-xor"); diff --git a/src/ext/ext/extDiffToolDialog.h b/src/plugins/tools/diff/lay_plugin/layDiffToolDialog.h similarity index 95% rename from src/ext/ext/extDiffToolDialog.h rename to src/plugins/tools/diff/lay_plugin/layDiffToolDialog.h index d6c66c066..d903bbae3 100644 --- a/src/ext/ext/extDiffToolDialog.h +++ b/src/plugins/tools/diff/lay_plugin/layDiffToolDialog.h @@ -23,8 +23,8 @@ -#ifndef HDR_extDiffToolDialog -#define HDR_extDiffToolDialog +#ifndef HDR_layDiffToolDialog +#define HDR_layDiffToolDialog #include #include @@ -39,7 +39,7 @@ namespace lay class LayoutView; } -namespace ext +namespace lay { extern std::string cfg_diff_run_xor; diff --git a/src/plugins/tools/diff/lay_plugin/lay_plugin.pro b/src/plugins/tools/diff/lay_plugin/lay_plugin.pro new file mode 100644 index 000000000..b1bd29f5e --- /dev/null +++ b/src/plugins/tools/diff/lay_plugin/lay_plugin.pro @@ -0,0 +1,19 @@ + +TARGET = diff +DESTDIR = $$OUT_PWD/../../../../lay_plugins + +include($$PWD/../../../lay_plugin.pri) + +INCLUDEPATH += $$RDB_INC $$ANT_INC +DEPENDPATH += $$RDB_INC $$ANT_INC +LIBS += -L$$DESTDIR/.. -lklayout_rdb -lklayout_ant + +HEADERS = \ + layDiffToolDialog.h + +SOURCES = \ + layDiffPlugin.cc \ + layDiffToolDialog.cc + +FORMS = \ + DiffToolDialog.ui \ diff --git a/src/plugins/tools/import/import.pro b/src/plugins/tools/import/import.pro new file mode 100644 index 000000000..443b25958 --- /dev/null +++ b/src/plugins/tools/import/import.pro @@ -0,0 +1,5 @@ + +TEMPLATE = subdirs + +SUBDIRS = lay_plugin + diff --git a/src/ext/ext/StreamImportDialog.ui b/src/plugins/tools/import/lay_plugin/StreamImportDialog.ui similarity index 100% rename from src/ext/ext/StreamImportDialog.ui rename to src/plugins/tools/import/lay_plugin/StreamImportDialog.ui diff --git a/src/ext/ext/extStreamImport.cc b/src/plugins/tools/import/lay_plugin/layStreamImport.cc similarity index 94% rename from src/ext/ext/extStreamImport.cc rename to src/plugins/tools/import/lay_plugin/layStreamImport.cc index 2a7e242b4..b7aa911ae 100644 --- a/src/ext/ext/extStreamImport.cc +++ b/src/plugins/tools/import/lay_plugin/layStreamImport.cc @@ -21,8 +21,8 @@ */ -#include "extStreamImportDialog.h" -#include "extStreamImporter.h" +#include "layStreamImportDialog.h" +#include "layStreamImporter.h" #include "dbStream.h" @@ -33,7 +33,7 @@ #include -namespace ext +namespace lay { static const std::string cfg_stream_import_spec ("stream-import-spec2"); @@ -61,7 +61,7 @@ public: virtual void get_menu_entries (std::vector &menu_entries) const { lay::PluginDeclaration::get_menu_entries (menu_entries); - menu_entries.push_back (lay::MenuEntry ("ext::import_stream", "import_stream:edit", "file_menu.import_menu.end", tl::to_string (QObject::tr ("Other File Into Current")))); + menu_entries.push_back (lay::MenuEntry ("lay::import_stream", "import_stream:edit", "file_menu.import_menu.end", tl::to_string (QObject::tr ("Other File Into Current")))); } virtual bool configure (const std::string &name, const std::string &value) @@ -81,7 +81,7 @@ public: virtual bool menu_activated (const std::string &symbol) const { - if (symbol == "ext::import_stream") { + if (symbol == "lay::import_stream") { lay::LayoutView *view = lay::LayoutView::current (); if (! view) { @@ -98,7 +98,7 @@ public: lay::PluginRoot *config_root = lay::PluginRoot::instance (); StreamImportDialog dialog (QApplication::activeWindow (), &data); - ext::StreamImporter importer; + lay::StreamImporter importer; bool ok = false; while (! ok && dialog.exec ()) { @@ -167,7 +167,7 @@ private: std::string m_import_spec; }; -static tl::RegisteredClass config_decl (new ext::StreamImportPluginDeclaration (), 1300, "ext::StreamImportPlugin"); +static tl::RegisteredClass config_decl (new lay::StreamImportPluginDeclaration (), 1300, "lay::StreamImportPlugin"); } diff --git a/src/ext/ext/extStreamImportDialog.cc b/src/plugins/tools/import/lay_plugin/layStreamImportDialog.cc similarity index 95% rename from src/ext/ext/extStreamImportDialog.cc rename to src/plugins/tools/import/lay_plugin/layStreamImportDialog.cc index c7cf56340..8652fba39 100644 --- a/src/ext/ext/extStreamImportDialog.cc +++ b/src/plugins/tools/import/lay_plugin/layStreamImportDialog.cc @@ -22,8 +22,8 @@ #include "ui_StreamImportDialog.h" -#include "extStreamImporter.h" -#include "extStreamImportDialog.h" +#include "layStreamImporter.h" +#include "layStreamImportDialog.h" #include "tlExceptions.h" #include "layFileDialog.h" @@ -39,17 +39,17 @@ namespace { static struct { const char *string; - ext::StreamImportData::mode_type value; + lay::StreamImportData::mode_type value; } mode_strings [] = { - { "simple", ext::StreamImportData::Simple }, - { "instantiate", ext::StreamImportData::Instantiate }, - { "extra", ext::StreamImportData::Extra }, - { "merge", ext::StreamImportData::Merge } + { "simple", lay::StreamImportData::Simple }, + { "instantiate", lay::StreamImportData::Instantiate }, + { "extra", lay::StreamImportData::Extra }, + { "merge", lay::StreamImportData::Merge } }; struct ModeConverter { - std::string to_string (ext::StreamImportData::mode_type t) const + std::string to_string (lay::StreamImportData::mode_type t) const { for (unsigned int i = 0; i < sizeof (mode_strings) / sizeof (mode_strings [0]); ++i) { if (mode_strings [i].value == t) { @@ -59,7 +59,7 @@ struct ModeConverter return std::string (); } - void from_string (const std::string &s, ext::StreamImportData::mode_type &t) const + void from_string (const std::string &s, lay::StreamImportData::mode_type &t) const { for (unsigned int i = 0; i < sizeof (mode_strings) / sizeof (mode_strings [0]); ++i) { if (s == mode_strings [i].string) { @@ -74,15 +74,15 @@ struct ModeConverter static struct { const char *string; - ext::StreamImportData::layer_mode_type value; + lay::StreamImportData::layer_mode_type value; } layer_mode_strings [] = { - { "original", ext::StreamImportData::Original }, - { "offset", ext::StreamImportData::Offset } + { "original", lay::StreamImportData::Original }, + { "offset", lay::StreamImportData::Offset } }; struct LayerModeConverter { - std::string to_string (ext::StreamImportData::layer_mode_type t) const + std::string to_string (lay::StreamImportData::layer_mode_type t) const { for (unsigned int i = 0; i < sizeof (layer_mode_strings) / sizeof (layer_mode_strings [0]); ++i) { if (layer_mode_strings [i].value == t) { @@ -92,7 +92,7 @@ struct LayerModeConverter return std::string (); } - void from_string (const std::string &s, ext::StreamImportData::layer_mode_type &t) const + void from_string (const std::string &s, lay::StreamImportData::layer_mode_type &t) const { for (unsigned int i = 0; i < sizeof (layer_mode_strings) / sizeof (layer_mode_strings [0]); ++i) { if (s == layer_mode_strings [i].string) { @@ -107,7 +107,7 @@ struct LayerModeConverter } -namespace ext +namespace lay { // ----------------------------------------------------------------------------------------- diff --git a/src/ext/ext/extStreamImportDialog.h b/src/plugins/tools/import/lay_plugin/layStreamImportDialog.h similarity index 96% rename from src/ext/ext/extStreamImportDialog.h rename to src/plugins/tools/import/lay_plugin/layStreamImportDialog.h index 7bf9ecb83..636466bf3 100644 --- a/src/ext/ext/extStreamImportDialog.h +++ b/src/plugins/tools/import/lay_plugin/layStreamImportDialog.h @@ -21,8 +21,8 @@ */ -#ifndef HDR_extStreamImportDialog -#define HDR_extStreamImportDialog +#ifndef HDR_layStreamImportDialog +#define HDR_layStreamImportDialog #include #include @@ -59,7 +59,7 @@ namespace lay class PluginRoot; } -namespace ext +namespace lay { class StreamImporter; diff --git a/src/ext/ext/extStreamImporter.cc b/src/plugins/tools/import/lay_plugin/layStreamImporter.cc similarity index 99% rename from src/ext/ext/extStreamImporter.cc rename to src/plugins/tools/import/lay_plugin/layStreamImporter.cc index 2f7bcacbb..3deb6ea48 100644 --- a/src/ext/ext/extStreamImporter.cc +++ b/src/plugins/tools/import/lay_plugin/layStreamImporter.cc @@ -21,7 +21,7 @@ */ -#include "extStreamImporter.h" +#include "layStreamImporter.h" #include "layLayoutView.h" #include "tlStream.h" #include "tlString.h" @@ -37,7 +37,7 @@ #include -namespace ext +namespace lay { // --------------------------------------------------------------------------------------- diff --git a/src/ext/ext/extStreamImporter.h b/src/plugins/tools/import/lay_plugin/layStreamImporter.h similarity index 95% rename from src/ext/ext/extStreamImporter.h rename to src/plugins/tools/import/lay_plugin/layStreamImporter.h index 00868deba..6f6cf6ad9 100644 --- a/src/ext/ext/extStreamImporter.h +++ b/src/plugins/tools/import/lay_plugin/layStreamImporter.h @@ -21,17 +21,17 @@ */ -#ifndef HDR_extStreamImporter -#define HDR_extStreamImporter +#ifndef HDR_layStreamImporter +#define HDR_layStreamImporter -#include "extCommon.h" +#include "layPluginCommon.h" #include "dbLayout.h" #include "dbTrans.h" #include "dbLoadLayoutOptions.h" #include "tlStream.h" #include "tlProgress.h" -#include "extStreamImportDialog.h" +#include "layStreamImportDialog.h" #include @@ -45,13 +45,13 @@ namespace lay class LayoutView; } -namespace ext +namespace lay { /** * @brief The Stream importer object */ -class EXT_PUBLIC StreamImporter +class LAY_PLUGIN_PUBLIC StreamImporter { public: /** diff --git a/src/plugins/tools/import/lay_plugin/lay_plugin.pro b/src/plugins/tools/import/lay_plugin/lay_plugin.pro new file mode 100644 index 000000000..e4aa4df18 --- /dev/null +++ b/src/plugins/tools/import/lay_plugin/lay_plugin.pro @@ -0,0 +1,17 @@ + +TARGET = import +DESTDIR = $$OUT_PWD/../../../../lay_plugins + +include($$PWD/../../../lay_plugin.pri) + +HEADERS = \ + layStreamImporter.h \ + layStreamImportDialog.h + +SOURCES = \ + layStreamImporter.cc \ + layStreamImportDialog.cc \ + layStreamImport.cc + +FORMS = \ + StreamImportDialog.ui \ diff --git a/src/plugins/tools/net_tracer/db_plugin/dbNetTracer.h b/src/plugins/tools/net_tracer/db_plugin/dbNetTracer.h index 29358bfa6..eee79d42f 100644 --- a/src/plugins/tools/net_tracer/db_plugin/dbNetTracer.h +++ b/src/plugins/tools/net_tracer/db_plugin/dbNetTracer.h @@ -25,7 +25,7 @@ #ifndef HDR_dbNetTracer #define HDR_dbNetTracer -#include "dbCommon.h" +#include "dbPluginCommon.h" #include "dbShapes.h" #include "dbShape.h" @@ -52,7 +52,7 @@ class NetTracerData; * the data and second, this guarantees that the Shape references delivered point to the same object * for identical shapes. */ -class DB_PUBLIC NetTracerShapeHeap +class DB_PLUGIN_PUBLIC NetTracerShapeHeap { public: /** @@ -81,7 +81,7 @@ private: * This class describes a shape in the hierarchy by the transformation into the top cell, the shape reference, the cell * index and the layer the shape resides on. */ -class DB_PUBLIC NetTracerShape +class DB_PLUGIN_PUBLIC NetTracerShape { public: /** @@ -252,7 +252,7 @@ typedef db::box_tree::const_iterator iterator; diff --git a/src/plugins/tools/net_tracer/db_plugin/dbNetTracerIO.h b/src/plugins/tools/net_tracer/db_plugin/dbNetTracerIO.h index def2c1db6..07b940b27 100644 --- a/src/plugins/tools/net_tracer/db_plugin/dbNetTracerIO.h +++ b/src/plugins/tools/net_tracer/db_plugin/dbNetTracerIO.h @@ -23,6 +23,7 @@ #ifndef HDR_dbNetTracerIO #define HDR_dbNetTracerIO +#include "dbPluginCommon.h" #include "dbNetTracer.h" #include "dbLayerProperties.h" #include "dbTechnology.h" @@ -34,7 +35,7 @@ namespace db class NetTracerTechnologyComponent; -class DB_PUBLIC NetTracerLayerExpressionInfo +class DB_PLUGIN_PUBLIC NetTracerLayerExpressionInfo { public: NetTracerLayerExpressionInfo (); @@ -72,7 +73,7 @@ private: NetTracerLayerExpression *get_expr (const db::LayerProperties &lp, const db::Layout &layout, const NetTracerTechnologyComponent &tech, const std::set &used_symbols) const; }; -class DB_PUBLIC NetTracerConnectionInfo +class DB_PLUGIN_PUBLIC NetTracerConnectionInfo { public: NetTracerConnectionInfo (); @@ -118,7 +119,7 @@ private: NetTracerLayerExpressionInfo m_la, m_via, m_lb; }; -class DB_PUBLIC NetTracerSymbolInfo +class DB_PLUGIN_PUBLIC NetTracerSymbolInfo { public: NetTracerSymbolInfo (); @@ -152,7 +153,7 @@ private: std::string m_expression; }; -class DB_PUBLIC Net +class DB_PLUGIN_PUBLIC Net { public: typedef std::vector ::const_iterator iterator; @@ -355,7 +356,7 @@ private: void define_layer (unsigned int l, const db::LayerProperties &lp, const db::LayerProperties &lp_representative); }; -class DB_PUBLIC NetTracerTechnologyComponent +class DB_PLUGIN_PUBLIC NetTracerTechnologyComponent : public db::TechnologyComponent { public: diff --git a/src/plugins/tools/net_tracer/unit_tests/unit_tests.pro b/src/plugins/tools/net_tracer/unit_tests/unit_tests.pro index 3aceeaa01..18d9e88a4 100644 --- a/src/plugins/tools/net_tracer/unit_tests/unit_tests.pro +++ b/src/plugins/tools/net_tracer/unit_tests/unit_tests.pro @@ -8,8 +8,8 @@ include($$PWD/../../../../lib_ut.pri) SOURCES = \ dbNetTracer.cc \ -INCLUDEPATH += $$LAY_INC $$TL_INC $$DB_INC $$GSI_INC $$PWD/../db_plugin -DEPENDPATH += $$LAY_INC $$TL_INC $$DB_INC $$GSI_INC $$PWD/../db_plugin +INCLUDEPATH += $$LAY_INC $$TL_INC $$DB_INC $$GSI_INC $$PWD/../db_plugin $$PWD/../../../common +DEPENDPATH += $$LAY_INC $$TL_INC $$DB_INC $$GSI_INC $$PWD/../db_plugin $$PWD/../../../common LIBS += -L$$DESTDIR_UT -lklayout_db -lklayout_tl -lklayout_gsi diff --git a/src/ext/ext/XORToolDialog.ui b/src/plugins/tools/xor/lay_plugin/XORToolDialog.ui similarity index 100% rename from src/ext/ext/XORToolDialog.ui rename to src/plugins/tools/xor/lay_plugin/XORToolDialog.ui diff --git a/src/ext/ext/extXORPlugin.cc b/src/plugins/tools/xor/lay_plugin/layXORPlugin.cc similarity index 90% rename from src/ext/ext/extXORPlugin.cc rename to src/plugins/tools/xor/lay_plugin/layXORPlugin.cc index 2a63f9d0e..1610716ed 100644 --- a/src/ext/ext/extXORPlugin.cc +++ b/src/plugins/tools/xor/lay_plugin/layXORPlugin.cc @@ -22,11 +22,11 @@ -#include "extXORToolDialog.h" +#include "layXORToolDialog.h" #include "layPlugin.h" -namespace ext +namespace lay { class XORPlugin @@ -36,7 +36,7 @@ public: XORPlugin (Plugin *parent, lay::LayoutView *view) : lay::Plugin (parent), mp_view (view) { - mp_dialog = new ext::XORToolDialog (0); + mp_dialog = new lay::XORToolDialog (0); } ~XORPlugin () @@ -47,11 +47,11 @@ public: void menu_activated (const std::string &symbol) { - if (symbol == "ext::xor_tool") { + if (symbol == "lay::xor_tool") { if (mp_dialog->exec_dialog (mp_view)) { - // ... implementation is in extXORToolDialog.cc ... + // ... implementation is in layXORToolDialog.cc ... } @@ -60,7 +60,7 @@ public: private: lay::LayoutView *mp_view; - ext::XORToolDialog *mp_dialog; + lay::XORToolDialog *mp_dialog; }; class XORPluginDeclaration @@ -96,7 +96,7 @@ public: virtual void get_menu_entries (std::vector &menu_entries) const { lay::PluginDeclaration::get_menu_entries (menu_entries); - menu_entries.push_back (lay::MenuEntry ("ext::xor_tool", "xor_tool:edit", "tools_menu.post_verification_group", tl::to_string (QObject::tr ("XOR Tool")))); + menu_entries.push_back (lay::MenuEntry ("lay::xor_tool", "xor_tool:edit", "tools_menu.post_verification_group", tl::to_string (QObject::tr ("XOR Tool")))); } virtual bool configure (const std::string & /*name*/, const std::string & /*value*/) @@ -115,7 +115,7 @@ public: } }; -static tl::RegisteredClass config_decl (new ext::XORPluginDeclaration (), 3000, "ext::XORPlugin"); +static tl::RegisteredClass config_decl (new lay::XORPluginDeclaration (), 3000, "lay::XORPlugin"); } diff --git a/src/ext/ext/extXORProgress.cc b/src/plugins/tools/xor/lay_plugin/layXORProgress.cc similarity index 99% rename from src/ext/ext/extXORProgress.cc rename to src/plugins/tools/xor/lay_plugin/layXORProgress.cc index 8d04dba81..032cfbe5e 100644 --- a/src/ext/ext/extXORProgress.cc +++ b/src/plugins/tools/xor/lay_plugin/layXORProgress.cc @@ -20,7 +20,7 @@ */ -#include "extXORProgress.h" +#include "layXORProgress.h" #include "tlString.h" @@ -29,7 +29,7 @@ #include #include -namespace ext +namespace lay { static inline void merge (size_t &a, size_t b) diff --git a/src/ext/ext/extXORProgress.h b/src/plugins/tools/xor/lay_plugin/layXORProgress.h similarity index 96% rename from src/ext/ext/extXORProgress.h rename to src/plugins/tools/xor/lay_plugin/layXORProgress.h index 13c7163cf..14741ddf4 100644 --- a/src/ext/ext/extXORProgress.h +++ b/src/plugins/tools/xor/lay_plugin/layXORProgress.h @@ -20,8 +20,8 @@ */ -#ifndef HDR_extXORToolProgress -#define HDR_extXORToolProgress +#ifndef HDR_layXORToolProgress +#define HDR_layXORToolProgress #include "tlProgress.h" @@ -34,7 +34,7 @@ class QWidget; -namespace ext +namespace lay { const size_t missing_in_a = std::numeric_limits::max (); diff --git a/src/ext/ext/extXORToolDialog.cc b/src/plugins/tools/xor/lay_plugin/layXORToolDialog.cc similarity index 99% rename from src/ext/ext/extXORToolDialog.cc rename to src/plugins/tools/xor/lay_plugin/layXORToolDialog.cc index 4bd5ae6a9..243e27753 100644 --- a/src/ext/ext/extXORToolDialog.cc +++ b/src/plugins/tools/xor/lay_plugin/layXORToolDialog.cc @@ -21,8 +21,8 @@ */ -#include "extXORToolDialog.h" -#include "extXORProgress.h" +#include "layXORToolDialog.h" +#include "layXORProgress.h" #include "antService.h" #include "rdb.h" #include "dbShapeProcessor.h" @@ -46,7 +46,7 @@ #include -namespace ext +namespace lay { std::string cfg_xor_input_mode ("xor-input-mode"); diff --git a/src/ext/ext/extXORToolDialog.h b/src/plugins/tools/xor/lay_plugin/layXORToolDialog.h similarity index 95% rename from src/ext/ext/extXORToolDialog.h rename to src/plugins/tools/xor/lay_plugin/layXORToolDialog.h index 4e1720111..ca09e77d8 100644 --- a/src/ext/ext/extXORToolDialog.h +++ b/src/plugins/tools/xor/lay_plugin/layXORToolDialog.h @@ -20,8 +20,8 @@ */ -#ifndef HDR_extXORToolDialog -#define HDR_extXORToolDialog +#ifndef HDR_layXORToolDialog +#define HDR_layXORToolDialog #include @@ -37,7 +37,7 @@ namespace lay class LayoutView; } -namespace ext +namespace lay { extern std::string cfg_xor_input_mode; diff --git a/src/plugins/tools/xor/lay_plugin/lay_plugin.pro b/src/plugins/tools/xor/lay_plugin/lay_plugin.pro new file mode 100644 index 000000000..335200947 --- /dev/null +++ b/src/plugins/tools/xor/lay_plugin/lay_plugin.pro @@ -0,0 +1,21 @@ + +TARGET = xor +DESTDIR = $$OUT_PWD/../../../../lay_plugins + +include($$PWD/../../../lay_plugin.pri) + +INCLUDEPATH += $$RDB_INC $$ANT_INC +DEPENDPATH += $$RDB_INC $$ANT_INC +LIBS += -L$$DESTDIR/.. -lklayout_rdb -lklayout_ant + +HEADERS = \ + layXORToolDialog.h \ + layXORProgress.h + +SOURCES = \ + layXORToolDialog.cc \ + layXORProgress.cc \ + layXORPlugin.cc + +FORMS = \ + XORToolDialog.ui \ diff --git a/src/plugins/tools/xor/xor.pro b/src/plugins/tools/xor/xor.pro new file mode 100644 index 000000000..443b25958 --- /dev/null +++ b/src/plugins/tools/xor/xor.pro @@ -0,0 +1,5 @@ + +TEMPLATE = subdirs + +SUBDIRS = lay_plugin +